From 51dcece050be0fb2e479d023d248bca0ca87dcf8 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 9 Feb 2021 12:00:27 +0100
Subject: [PATCH] SONAR-13838 Clean up GitLab onboarding project list

---
 .../project/GitlabProjectSelectionForm.tsx    | 39 ++++----
 .../GitlabProjectSelectionForm-test.tsx.snap  | 94 ++++++++-----------
 2 files changed, 56 insertions(+), 77 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx
index 57fc84e7267..d87c95f825c 100644
--- a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx
@@ -101,7 +101,17 @@ export default function GitlabProjectSelectionForm(props: GitlabProjectSelection
                 <td>
                   <Tooltip overlay={project.slug}>
                     <strong className="project-name display-inline-block text-ellipsis">
-                      {project.name}
+                      {project.sqProjectKey ? (
+                        <Link to={getProjectUrl(project.sqProjectKey)}>
+                          <QualifierIcon
+                            className="spacer-right"
+                            qualifier={ComponentQualifier.Project}
+                          />
+                          {project.sqProjectName}
+                        </Link>
+                      ) : (
+                        project.name
+                      )}
                     </strong>
                   </Tooltip>
                   <br />
@@ -122,27 +132,14 @@ export default function GitlabProjectSelectionForm(props: GitlabProjectSelection
                   </a>
                 </td>
                 {project.sqProjectKey ? (
-                  <>
-                    <td>
-                      <span className="display-flex-center display-flex-justify-end already-set-up">
-                        <CheckIcon className="little-spacer-right" size={12} />
-                        {translate('onboarding.create_project.repository_imported')}:
-                      </span>
-                    </td>
-                    <td>
-                      <div className="sq-project-link text-ellipsis">
-                        <Link to={getProjectUrl(project.sqProjectKey)}>
-                          <QualifierIcon
-                            className="spacer-right"
-                            qualifier={ComponentQualifier.Project}
-                          />
-                          {project.sqProjectName}
-                        </Link>
-                      </div>
-                    </td>
-                  </>
+                  <td>
+                    <span className="display-flex-center display-flex-justify-end already-set-up">
+                      <CheckIcon className="little-spacer-right" size={12} />
+                      {translate('onboarding.create_project.repository_imported')}
+                    </span>
+                  </td>
                 ) : (
-                  <td colSpan={2} className="text-right">
+                  <td className="text-right">
                     <Button
                       disabled={!!importingGitlabProjectId}
                       onClick={() => props.onImport(project.id)}>
diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/GitlabProjectSelectionForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/GitlabProjectSelectionForm-test.tsx.snap
index 7c2d25d78ce..b416707e214 100644
--- a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/GitlabProjectSelectionForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/GitlabProjectSelectionForm-test.tsx.snap
@@ -55,7 +55,6 @@ exports[`should render correctly: importing 1`] = `
         </td>
         <td
           className="text-right"
-          colSpan={2}
         >
           <Button
             disabled={true}
@@ -75,7 +74,25 @@ exports[`should render correctly: importing 1`] = `
             <strong
               className="project-name display-inline-block text-ellipsis"
             >
-              Awesome Project !
+              <Link
+                onlyActiveOnIndex={false}
+                style={Object {}}
+                to={
+                  Object {
+                    "pathname": "/dashboard",
+                    "query": Object {
+                      "branch": undefined,
+                      "id": "already-imported",
+                    },
+                  }
+                }
+              >
+                <QualifierIcon
+                  className="spacer-right"
+                  qualifier="TRK"
+                />
+                Already Imported
+              </Link>
             </strong>
           </Tooltip>
           <br />
@@ -111,34 +128,8 @@ exports[`should render correctly: importing 1`] = `
               size={12}
             />
             onboarding.create_project.repository_imported
-            :
           </span>
         </td>
-        <td>
-          <div
-            className="sq-project-link text-ellipsis"
-          >
-            <Link
-              onlyActiveOnIndex={false}
-              style={Object {}}
-              to={
-                Object {
-                  "pathname": "/dashboard",
-                  "query": Object {
-                    "branch": undefined,
-                    "id": "already-imported",
-                  },
-                }
-              }
-            >
-              <QualifierIcon
-                className="spacer-right"
-                qualifier="TRK"
-              />
-              Already Imported
-            </Link>
-          </div>
-        </td>
       </tr>
     </tbody>
   </table>
@@ -263,7 +254,6 @@ exports[`should render correctly: projects 1`] = `
         </td>
         <td
           className="text-right"
-          colSpan={2}
         >
           <Button
             disabled={false}
@@ -283,7 +273,25 @@ exports[`should render correctly: projects 1`] = `
             <strong
               className="project-name display-inline-block text-ellipsis"
             >
-              Awesome Project !
+              <Link
+                onlyActiveOnIndex={false}
+                style={Object {}}
+                to={
+                  Object {
+                    "pathname": "/dashboard",
+                    "query": Object {
+                      "branch": undefined,
+                      "id": "already-imported",
+                    },
+                  }
+                }
+              >
+                <QualifierIcon
+                  className="spacer-right"
+                  qualifier="TRK"
+                />
+                Already Imported
+              </Link>
             </strong>
           </Tooltip>
           <br />
@@ -319,34 +327,8 @@ exports[`should render correctly: projects 1`] = `
               size={12}
             />
             onboarding.create_project.repository_imported
-            :
           </span>
         </td>
-        <td>
-          <div
-            className="sq-project-link text-ellipsis"
-          >
-            <Link
-              onlyActiveOnIndex={false}
-              style={Object {}}
-              to={
-                Object {
-                  "pathname": "/dashboard",
-                  "query": Object {
-                    "branch": undefined,
-                    "id": "already-imported",
-                  },
-                }
-              }
-            >
-              <QualifierIcon
-                className="spacer-right"
-                qualifier="TRK"
-              />
-              Already Imported
-            </Link>
-          </div>
-        </td>
       </tr>
     </tbody>
   </table>
-- 
2.39.5