From 6b766c730dfd5fdc2c98ff4e13d5f740da3719e9 Mon Sep 17 00:00:00 2001
From: Kevin Silva <kevin.silva@sonarsource.com>
Date: Mon, 4 Dec 2023 20:08:56 +0100
Subject: [PATCH] SONAR-21018 - Improve layout Import & Export

---
 .../main/js/apps/projectDump/ProjectDumpApp.tsx    | 14 +++++++++++---
 .../projectDump/__tests__/ProjectDumpApp-it.tsx    |  4 ++--
 .../main/js/apps/projectDump/components/Export.tsx |  2 +-
 .../main/resources/org/sonar/l10n/core.properties  |  6 ++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/projectDump/ProjectDumpApp.tsx b/server/sonar-web/src/main/js/apps/projectDump/ProjectDumpApp.tsx
index c16e59f84cc..c05c2b39d4a 100644
--- a/server/sonar-web/src/main/js/apps/projectDump/ProjectDumpApp.tsx
+++ b/server/sonar-web/src/main/js/apps/projectDump/ProjectDumpApp.tsx
@@ -171,9 +171,17 @@ export class ProjectDumpApp extends React.Component<Props, State> {
             <Helmet defer={false} title={translate('project_dump.page')} />
             <Title className="sw-mb-4">{translate('project_dump.page')}</Title>
             <p>
-              {projectImportFeatureEnabled
-                ? translate('project_dump.page.description')
-                : translate('project_dump.page.description_without_import')}
+              {projectImportFeatureEnabled ? (
+                <>
+                  <p>{translate('project_dump.page.description1')}</p>
+                  <p>{translate('project_dump.page.description2')}</p>
+                </>
+              ) : (
+                <>
+                  <p>{translate('project_dump.page.description_without_import1')}</p>
+                  <p>{translate('project_dump.page.description_without_import2')}</p>
+                </>
+              )}
             </p>
           </header>
 
diff --git a/server/sonar-web/src/main/js/apps/projectDump/__tests__/ProjectDumpApp-it.tsx b/server/sonar-web/src/main/js/apps/projectDump/__tests__/ProjectDumpApp-it.tsx
index e4d0ab4f66f..07e7db7df29 100644
--- a/server/sonar-web/src/main/js/apps/projectDump/__tests__/ProjectDumpApp-it.tsx
+++ b/server/sonar-web/src/main/js/apps/projectDump/__tests__/ProjectDumpApp-it.tsx
@@ -34,8 +34,8 @@ const handler = new ProjectDumpServiceMock(computeEngineHandler);
 const COMPONENT_KEY = 'test';
 
 const ui = {
-  pageDescriptionWithImport: byText('project_dump.page.description'),
-  pageDescriptionWithoutImport: byText('project_dump.page.description_without_import'),
+  pageDescriptionWithImport: byText('project_dump.page.description1'),
+  pageDescriptionWithoutImport: byText('project_dump.page.description_without_import1'),
 
   disabledImportFeatureMsg: byText('project_dump.import_form_description_disabled'),
 
diff --git a/server/sonar-web/src/main/js/apps/projectDump/components/Export.tsx b/server/sonar-web/src/main/js/apps/projectDump/components/Export.tsx
index b32bad35a38..9b94d5dd28b 100644
--- a/server/sonar-web/src/main/js/apps/projectDump/components/Export.tsx
+++ b/server/sonar-web/src/main/js/apps/projectDump/components/Export.tsx
@@ -136,7 +136,7 @@ export default function Export(props: Readonly<Props>) {
           <div>
             {!task && <div>{translate('project_dump.export_available')}</div>}
 
-            <code tabIndex={0}>{status.exportedDump}</code>
+            <p className="sw-mt-2">{status.exportedDump}</p>
           </div>
         </div>
       </FlagMessage>
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 9fb52c27090..8eca9013ca9 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3698,8 +3698,10 @@ background_tasks.failing_count=Count of projects where processing of most recent
 #
 #------------------------------------------------------------------------------
 project_dump.page=Import / Export
-project_dump.page.description=Moving a project from one SonarQube instance to another is a 3 step operation: export the project, copy the generated dump on the target server, and finally import that dump from this page on the target SonarQube instance.
-project_dump.page.description_without_import=Export project issues, measures and measure history for import into an Enterprise Edition or higher instance of the same version and similar configuration. The export file will be generated to the file system. It must then be copied to the target file system for import.
+project_dump.page.description1=Moving a project from one SonarQube instance to another is a 3 step operation:
+project_dump.page.description2=Export the project, copy the generated dump on the target server, and finally import that dump from this page on the target SonarQube instance.
+project_dump.page.description_without_import1=Export project issues, measures and measure history for import into an Enterprise Edition or higher instance of the same version and similar configuration. The export file will be generated to the file system. It must then be copied to the target file system for import.
+project_dump.page.description_without_import2=The export file will be generated to the file system. It must then be copied to the target file system for import.
 project_dump.refresh=Refresh
 project_dump.see_details=See Details
 project_dump.export=Export
-- 
2.39.5