From 9582a47befb743f6fec4432e9022591f7f4cff41 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Thu, 7 Jun 2018 11:21:31 +0200
Subject: [PATCH] SONAR-10656 Fix {instance} messages in onboarding page

---
 .../tutorials/onboarding/commands/ClangGCC.js | 15 ++++++-----
 .../tutorials/onboarding/commands/DotNet.js   | 15 ++++++-----
 .../tutorials/onboarding/commands/Msvc.js     | 15 ++++++-----
 .../tutorials/onboarding/commands/Other.js    | 15 ++++++-----
 .../__snapshots__/ClangGCC-test.js.snap       | 27 +++++--------------
 .../__snapshots__/DotNet-test.js.snap         | 18 +++----------
 .../__tests__/__snapshots__/Msvc-test.js.snap | 18 +++----------
 .../__snapshots__/Other-test.js.snap          | 27 +++++--------------
 8 files changed, 56 insertions(+), 94 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js
index 26d3596d2e9..0c1fdab16cf 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js
@@ -22,6 +22,7 @@ import React from 'react';
 import SQScanner from './SQScanner';
 import BuildWrapper from './BuildWrapper';
 import CodeSnippet from '../../../../components/common/CodeSnippet';
+import InstanceMessage from '../../../../components/common/InstanceMessage';
 import { translate } from '../../../../helpers/l10n';
 
 /*::
@@ -61,12 +62,14 @@ export default function ClangGCC(props /*: Props */) {
       <h4 className="huge-spacer-top spacer-bottom">
         {translate('onboarding.analysis.sq_scanner.execute')}
       </h4>
-      <p
-        className="spacer-bottom markdown"
-        dangerouslySetInnerHTML={{
-          __html: translate('onboarding.analysis.sq_scanner.execute.text')
-        }}
-      />
+      <InstanceMessage message={translate('onboarding.analysis.sq_scanner.execute.text')}>
+        {transformedMessage => (
+          <p
+            className="spacer-bottom markdown"
+            dangerouslySetInnerHTML={{ __html: transformedMessage }}
+          />
+        )}
+      </InstanceMessage>
       <CodeSnippet isOneLine={true} snippet={command1} />
       <CodeSnippet isOneLine={props.os === 'win'} snippet={command2} />
       <p
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js
index 7e5fd4f24e0..a5bd3fd4285 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js
@@ -21,6 +21,7 @@
 import React from 'react';
 import MSBuildScanner from './MSBuildScanner';
 import CodeSnippet from '../../../../components/common/CodeSnippet';
+import InstanceMessage from '../../../../components/common/InstanceMessage';
 import { translate } from '../../../../helpers/l10n';
 
 /*::
@@ -52,12 +53,14 @@ export default function DotNet(props /*: Props */) {
       <h4 className="huge-spacer-top spacer-bottom">
         {translate('onboarding.analysis.msbuild.execute')}
       </h4>
-      <p
-        className="spacer-bottom markdown"
-        dangerouslySetInnerHTML={{
-          __html: translate('onboarding.analysis.msbuild.execute.text')
-        }}
-      />
+      <InstanceMessage message={translate('onboarding.analysis.msbuild.execute.text')}>
+        {transformedMessage => (
+          <p
+            className="spacer-bottom markdown"
+            dangerouslySetInnerHTML={{ __html: transformedMessage }}
+          />
+        )}
+      </InstanceMessage>
       <CodeSnippet isOneLine={true} snippet={command1} />
       <CodeSnippet isOneLine={true} snippet={command2} />
       <CodeSnippet isOneLine={true} snippet={command3} />
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js
index 756c2daea31..03f5fe3eb63 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js
@@ -22,6 +22,7 @@ import React from 'react';
 import MSBuildScanner from './MSBuildScanner';
 import BuildWrapper from './BuildWrapper';
 import CodeSnippet from '../../../../components/common/CodeSnippet';
+import InstanceMessage from '../../../../components/common/InstanceMessage';
 import { translate } from '../../../../helpers/l10n';
 
 /*::
@@ -55,12 +56,14 @@ export default function Msvc(props /*: Props */) {
       <h4 className="huge-spacer-top spacer-bottom">
         {translate('onboarding.analysis.msbuild.execute')}
       </h4>
-      <p
-        className="spacer-bottom markdown"
-        dangerouslySetInnerHTML={{
-          __html: translate('onboarding.analysis.msbuild.execute.text')
-        }}
-      />
+      <InstanceMessage message={translate('onboarding.analysis.msbuild.execute.text')}>
+        {transformedMessage => (
+          <p
+            className="spacer-bottom markdown"
+            dangerouslySetInnerHTML={{ __html: transformedMessage }}
+          />
+        )}
+      </InstanceMessage>
       <CodeSnippet isOneLine={true} snippet={command1} />
       <CodeSnippet isOneLine={true} snippet={command2} />
       <CodeSnippet isOneLine={true} snippet={command3} />
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js
index 47be65b1952..5bb0d0dd649 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js
@@ -21,6 +21,7 @@
 import React from 'react';
 import SQScanner from './SQScanner';
 import CodeSnippet from '../../../../components/common/CodeSnippet';
+import InstanceMessage from '../../../../components/common/InstanceMessage';
 import { translate } from '../../../../helpers/l10n';
 
 /*::
@@ -50,12 +51,14 @@ export default function Other(props /*: Props */) {
       <h4 className="huge-spacer-top spacer-bottom">
         {translate('onboarding.analysis.sq_scanner.execute')}
       </h4>
-      <p
-        className="spacer-bottom markdown"
-        dangerouslySetInnerHTML={{
-          __html: translate('onboarding.analysis.sq_scanner.execute.text')
-        }}
-      />
+      <InstanceMessage message={translate('onboarding.analysis.sq_scanner.execute.text')}>
+        {transformedMessage => (
+          <p
+            className="spacer-bottom markdown"
+            dangerouslySetInnerHTML={{ __html: transformedMessage }}
+          />
+        )}
+      </InstanceMessage>
       <CodeSnippet isOneLine={props.os === 'win'} snippet={command} />
       <p
         className="big-spacer-top markdown"
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap
index 4375df814f3..cdffd4c2061 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap
@@ -14,13 +14,8 @@ exports[`renders correctly 1`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
@@ -65,13 +60,8 @@ exports[`renders correctly 2`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
@@ -116,13 +106,8 @@ exports[`renders correctly 3`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap
index e21df31e564..89b57fa28b4 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap
@@ -8,13 +8,8 @@ exports[`renders correctly 1`] = `
   >
     onboarding.analysis.msbuild.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.msbuild.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.msbuild.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
@@ -60,13 +55,8 @@ exports[`renders correctly 2`] = `
   >
     onboarding.analysis.msbuild.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.msbuild.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.msbuild.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap
index a5e4f91b4e3..2240a13995c 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap
@@ -12,13 +12,8 @@ exports[`renders correctly 1`] = `
   >
     onboarding.analysis.msbuild.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.msbuild.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.msbuild.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
@@ -69,13 +64,8 @@ exports[`renders correctly 2`] = `
   >
     onboarding.analysis.msbuild.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.msbuild.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.msbuild.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap
index 7c7ae719489..73aba357dca 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap
@@ -10,13 +10,8 @@ exports[`renders correctly 1`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={true}
@@ -52,13 +47,8 @@ exports[`renders correctly 2`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={false}
@@ -94,13 +84,8 @@ exports[`renders correctly 3`] = `
   >
     onboarding.analysis.sq_scanner.execute
   </h4>
-  <p
-    className="spacer-bottom markdown"
-    dangerouslySetInnerHTML={
-      Object {
-        "__html": "onboarding.analysis.sq_scanner.execute.text",
-      }
-    }
+  <InstanceMessage
+    message="onboarding.analysis.sq_scanner.execute.text"
   />
   <CodeSnippet
     isOneLine={false}
-- 
2.39.5