From b0d1020d586f1dd6538daa69e3a08ed225c61d9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Mon, 6 Aug 2018 15:11:31 +0200
Subject: [PATCH] SONAR-11029 Add missing projectKey param for maven and gradle
 tutorials

---
 .../components/commands/AnalysisCommand.tsx   | 22 ++++++--
 .../components/commands/JavaGradle.tsx        |  2 +
 .../components/commands/JavaMaven.tsx         |  2 +
 .../commands/__tests__/JavaGradle-test.tsx    |  6 +++
 .../commands/__tests__/JavaMaven-test.tsx     |  6 +++
 .../__snapshots__/JavaGradle-test.tsx.snap    | 52 +++++++++++++++++++
 .../__snapshots__/JavaMaven-test.tsx.snap     | 46 ++++++++++++++++
 7 files changed, 132 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx
index 3bcdb9bdbdb..9f40deec8cd 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx
@@ -42,19 +42,33 @@ export default class AnalysisCommand extends React.PureComponent<Props> {
   };
 
   renderCommandForMaven = () => {
-    const { token } = this.props;
+    const { component, token } = this.props;
     if (!token) {
       return null;
     }
-    return <JavaMaven host={getHostUrl()} organization={this.props.organization} token={token} />;
+    return (
+      <JavaMaven
+        host={getHostUrl()}
+        organization={this.props.organization}
+        projectKey={component && component.key}
+        token={token}
+      />
+    );
   };
 
   renderCommandForGradle = () => {
-    const { token } = this.props;
+    const { component, token } = this.props;
     if (!token) {
       return null;
     }
-    return <JavaGradle host={getHostUrl()} organization={this.props.organization} token={token} />;
+    return (
+      <JavaGradle
+        host={getHostUrl()}
+        organization={this.props.organization}
+        projectKey={component && component.key}
+        token={token}
+      />
+    );
   };
 
   renderCommandForDotNet = () => {
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx
index fa95c27bf5e..c9d4df0a735 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx
@@ -25,6 +25,7 @@ import { translate } from '../../../../helpers/l10n';
 interface Props {
   host: string;
   organization?: string;
+  projectKey?: string;
   token: string;
 }
 
@@ -33,6 +34,7 @@ export default function JavaGradle(props: Props) {
 
   const command = [
     './gradlew sonarqube',
+    props.projectKey && `-Dsonar.projectKey=${props.projectKey}`,
     props.organization && `-Dsonar.organization=${props.organization}`,
     `-Dsonar.host.url=${props.host}`,
     `-Dsonar.login=${props.token}`
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx
index 8ade1b432bd..20aaf6a2946 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx
@@ -25,12 +25,14 @@ import { translate } from '../../../../helpers/l10n';
 interface Props {
   host: string;
   organization?: string;
+  projectKey?: string;
   token: string;
 }
 
 export default function JavaMaven(props: Props) {
   const command = [
     'mvn sonar:sonar',
+    props.projectKey && `-Dsonar.projectKey=${props.projectKey}`,
     props.organization && `-Dsonar.organization=${props.organization}`,
     `-Dsonar.host.url=${props.host}`,
     `-Dsonar.login=${props.token}`
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaGradle-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaGradle-test.tsx
index f0d130a248d..dae75367e95 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaGradle-test.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaGradle-test.tsx
@@ -28,3 +28,9 @@ it('renders correctly', () => {
     shallow(<JavaGradle host="host" organization="organization" token="token" />)
   ).toMatchSnapshot();
 });
+
+it('renders with projectKey', () => {
+  expect(
+    shallow(<JavaGradle host="host" organization="organization" projectKey="foo" token="token" />)
+  ).toMatchSnapshot();
+});
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaMaven-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaMaven-test.tsx
index dbda16ca13e..18a6c994bbf 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaMaven-test.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/JavaMaven-test.tsx
@@ -28,3 +28,9 @@ it('renders correctly', () => {
     shallow(<JavaMaven host="host" organization="organization" token="token" />)
   ).toMatchSnapshot();
 });
+
+it('renders with projectKey', () => {
+  expect(
+    shallow(<JavaMaven host="host" organization="organization" projectKey="foo" token="token" />)
+  ).toMatchSnapshot();
+});
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
index c5ff1eb813c..04de1338a6c 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
@@ -25,6 +25,7 @@ exports[`renders correctly 1`] = `
       Array [
         "./gradlew sonarqube",
         undefined,
+        undefined,
         "-Dsonar.host.url=host",
         "-Dsonar.login=token",
       ]
@@ -73,6 +74,57 @@ exports[`renders correctly 2`] = `
     snippet={
       Array [
         "./gradlew sonarqube",
+        undefined,
+        "-Dsonar.organization=organization",
+        "-Dsonar.host.url=host",
+        "-Dsonar.login=token",
+      ]
+    }
+  />
+  <p
+    className="big-spacer-top markdown"
+    dangerouslySetInnerHTML={
+      Object {
+        "__html": "onboarding.analysis.java.gradle.docs",
+      }
+    }
+  />
+  <p
+    className="big-spacer-top markdown"
+    dangerouslySetInnerHTML={
+      Object {
+        "__html": "onboarding.analysis.browse_url_after_analysis",
+      }
+    }
+  />
+</div>
+`;
+
+exports[`renders with projectKey 1`] = `
+<div>
+  <h4
+    className="spacer-bottom"
+  >
+    onboarding.analysis.java.gradle.header
+  </h4>
+  <InstanceMessage
+    message="onboarding.analysis.java.gradle.text.1"
+  />
+  <CodeSnippet
+    snippet="plugins {
+  id \\"org.sonarqube\\" version \\"2.6\\"
+}"
+  />
+  <p
+    className="spacer-top spacer-bottom markdown"
+  >
+    onboarding.analysis.java.gradle.text.2
+  </p>
+  <CodeSnippet
+    snippet={
+      Array [
+        "./gradlew sonarqube",
+        "-Dsonar.projectKey=foo",
         "-Dsonar.organization=organization",
         "-Dsonar.host.url=host",
         "-Dsonar.login=token",
diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
index 7993a392397..af3ff510ca6 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
@@ -19,6 +19,7 @@ exports[`renders correctly 1`] = `
       Array [
         "mvn sonar:sonar",
         undefined,
+        undefined,
         "-Dsonar.host.url=host",
         "-Dsonar.login=token",
       ]
@@ -61,6 +62,51 @@ exports[`renders correctly 2`] = `
     snippet={
       Array [
         "mvn sonar:sonar",
+        undefined,
+        "-Dsonar.organization=organization",
+        "-Dsonar.host.url=host",
+        "-Dsonar.login=token",
+      ]
+    }
+  />
+  <p
+    className="big-spacer-top markdown"
+    dangerouslySetInnerHTML={
+      Object {
+        "__html": "onboarding.analysis.java.maven.docs",
+      }
+    }
+  />
+  <p
+    className="big-spacer-top markdown"
+    dangerouslySetInnerHTML={
+      Object {
+        "__html": "onboarding.analysis.browse_url_after_analysis",
+      }
+    }
+  />
+</div>
+`;
+
+exports[`renders with projectKey 1`] = `
+<div>
+  <h4
+    className="spacer-bottom"
+  >
+    onboarding.analysis.java.maven.header
+  </h4>
+  <p
+    className="spacer-bottom markdown"
+  >
+    <InstanceMessage
+      message="onboarding.analysis.java.maven.text"
+    />
+  </p>
+  <CodeSnippet
+    snippet={
+      Array [
+        "mvn sonar:sonar",
+        "-Dsonar.projectKey=foo",
         "-Dsonar.organization=organization",
         "-Dsonar.host.url=host",
         "-Dsonar.login=token",
-- 
2.39.5