From 49890071dcb4c859194d48cd1cc14b3f6a40d320 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Thu, 12 May 2022 13:48:48 +0200
Subject: [PATCH] SONAR-15059 Re-order the service connection fields to match
 what is shown on Azure

---
 .../azure-pipelines/ServiceEndpointStepContent.tsx   | 12 ++++++------
 .../ServiceEndpointStepContent-test.tsx.snap         | 12 ++++++------
 .../main/resources/org/sonar/l10n/core.properties    |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx
index e9e3f7a60cd..00a9cd4e40e 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx
@@ -53,15 +53,12 @@ export default function ServiceEndpointStepContent(props: ServiceEndpointStepPro
             highlightKeys={['type']}
           />
         </li>
-        <li>
-          {translate('onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence')}
-        </li>
         <li>
           <FormattedMessage
             defaultMessage={translate(
-              'onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence'
+              'onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence'
             )}
-            id="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence"
+            id="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence"
             values={{
               url: <code className="rule">{baseUrl}</code>,
               button: <ClipboardIconButton copyValue={baseUrl} />
@@ -70,12 +67,15 @@ export default function ServiceEndpointStepContent(props: ServiceEndpointStepPro
         </li>
         <li>
           <span>
-            {translate('onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence')}:
+            {translate('onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence')}:
           </span>
           <Button className="spacer-left" onClick={() => toggleModal(true)}>
             {translate('onboarding.token.generate_token')}
           </Button>
         </li>
+        <li>
+          {translate('onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence')}
+        </li>
         <li>
           {translate('onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step6.sentence')}
         </li>
diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/ServiceEndpointStepContent-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/ServiceEndpointStepContent-test.tsx.snap
index 7b52581aa12..468ec3df83c 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/ServiceEndpointStepContent-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/ServiceEndpointStepContent-test.tsx.snap
@@ -25,13 +25,10 @@ exports[`should render correctly 1`] = `
         translationKey="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step2"
       />
     </li>
-    <li>
-      onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence
-    </li>
     <li>
       <FormattedMessage
-        defaultMessage="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence"
-        id="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence"
+        defaultMessage="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence"
+        id="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence"
         values={
           Object {
             "button": <ClipboardIconButton
@@ -48,7 +45,7 @@ exports[`should render correctly 1`] = `
     </li>
     <li>
       <span>
-        onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence
+        onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence
         :
       </span>
       <Button
@@ -58,6 +55,9 @@ exports[`should render correctly 1`] = `
         onboarding.token.generate_token
       </Button>
     </li>
+    <li>
+      onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence
+    </li>
     <li>
       onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step6.sentence
     </li>
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index aaf1bf7ec60..5f7195eb3d2 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3890,9 +3890,9 @@ onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step1.sentence=In Azure
 onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step1.sentence.menu=Project settings > Service connections
 onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step2.sentence=Add a new service connection of type {type}
 onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step2.sentence.type=SonarQube
-onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence=Enter a memorable connection name
-onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence=Enter your SonarQube server url: {url} {button}
-onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence=Enter an existing token, or a newly generated one
+onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step3.sentence=Enter your SonarQube server url: {url} {button}
+onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step4.sentence=Enter an existing token, or a newly generated one
+onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step5.sentence=Enter a memorable connection name
 onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.step6.sentence=Create the service connection
 onboarding.tutorial.with.azure_pipelines.BranchAnalysis.title=Configure analysis
 onboarding.tutorial.with.azure_pipelines.BranchAnalysis.info=The following steps assume you are using the Azure Pipelines classic editor. Check out our {doc_link} for the YAML counterpart.
-- 
2.39.5