From 54445562f1415d155c90eec93faedfc5eacf40ef Mon Sep 17 00:00:00 2001
From: Pascal Mugnier <pascal.mugnier@sonarsource.com>
Date: Fri, 26 Oct 2018 11:37:21 +0200
Subject: [PATCH] SONARCLOUD-158 Update message when system is starting

---
 .../js/apps/maintenance/components/App.tsx    | 50 +++++++++++--------
 .../__tests__/__snapshots__/App-test.tsx.snap | 24 ++++++---
 .../resources/org/sonar/l10n/core.properties  | 10 ++--
 3 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
index 4777ab4372c..5d682a3a54d 100644
--- a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
@@ -25,7 +25,9 @@ import DateFromNow from '../../../components/intl/DateFromNow';
 import TimeFormatter from '../../../components/intl/TimeFormatter';
 import { Button } from '../../../components/ui/buttons';
 import { translate } from '../../../helpers/l10n';
+import InstanceMessage from '../../../components/common/InstanceMessage';
 import { getBaseUrl } from '../../../helpers/urls';
+import { isSonarCloud } from '../../../helpers/system';
 import '../styles.css';
 
 interface Props {
@@ -141,11 +143,13 @@ export default class App extends React.PureComponent<Props, State> {
             {status === 'OFFLINE' && (
               <>
                 <h1 className="maintenance-title text-danger">
-                  {translate('maintenance.sonarqube_is_offline')}
+                  <InstanceMessage message={translate('maintenance.is_offline')} />
                 </h1>
-                <p className="maintenance-text">
-                  {translate('maintenance.sonarqube_is_offline.text')}
-                </p>
+                {!isSonarCloud() && (
+                  <p className="maintenance-text">
+                    {translate('maintenance.sonarqube_is_offline.text')}
+                  </p>
+                )}
                 <p className="maintenance-text text-center">
                   <a href={getBaseUrl() + '/'}>{translate('maintenance.try_again')}</a>
                 </p>
@@ -154,7 +158,9 @@ export default class App extends React.PureComponent<Props, State> {
 
             {status === 'UP' && (
               <>
-                <h1 className="maintenance-title">{translate('maintenance.sonarqube_is_up')}</h1>
+                <h1 className="maintenance-title">
+                  <InstanceMessage message={translate('maintenance.is_up')} />
+                </h1>
                 <p className="maintenance-text text-center">
                   {translate('maintenance.all_systems_opetational')}
                 </p>
@@ -167,7 +173,7 @@ export default class App extends React.PureComponent<Props, State> {
             {status === 'STARTING' && (
               <>
                 <h1 className="maintenance-title">
-                  {translate('maintenance.sonarqube_is_starting')}
+                  <InstanceMessage message={translate('maintenance.is_starting')} />
                 </h1>
                 <p className="maintenance-spinner">
                   <i className="spinner" />
@@ -178,7 +184,7 @@ export default class App extends React.PureComponent<Props, State> {
             {status === 'DOWN' && (
               <>
                 <h1 className="maintenance-title text-danger">
-                  {translate('maintenance.sonarqube_is_down')}
+                  <InstanceMessage message={translate('maintenance.is_down')} />
                 </h1>
                 <p className="maintenance-text">
                   {translate('maintenance.sonarqube_is_down.text')}
@@ -192,20 +198,24 @@ export default class App extends React.PureComponent<Props, State> {
             {(status === 'DB_MIGRATION_NEEDED' || status === 'DB_MIGRATION_RUNNING') && (
               <>
                 <h1 className="maintenance-title">
-                  {translate('maintenance.sonarqube_is_under_maintenance')}
+                  <InstanceMessage message={translate('maintenance.is_under_maintenance')} />
                 </h1>
-                <p
-                  className="maintenance-text"
-                  dangerouslySetInnerHTML={{
-                    __html: translate('maintenance.sonarqube_is_under_maintenance.1')
-                  }}
-                />
-                <p
-                  className="maintenance-text"
-                  dangerouslySetInnerHTML={{
-                    __html: translate('maintenance.sonarqube_is_under_maintenance.2')
-                  }}
-                />
+                {!isSonarCloud() && (
+                  <>
+                    <p
+                      className="maintenance-text"
+                      dangerouslySetInnerHTML={{
+                        __html: translate('maintenance.sonarqube_is_under_maintenance.1')
+                      }}
+                    />
+                    <p
+                      className="maintenance-text"
+                      dangerouslySetInnerHTML={{
+                        __html: translate('maintenance.sonarqube_is_under_maintenance.2')
+                      }}
+                    />
+                  </>
+                )}
               </>
             )}
 
diff --git a/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap b/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap
index f1a5a71a29c..7c718fdcb7e 100644
--- a/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap
@@ -18,7 +18,9 @@ exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
       <h1
         className="maintenance-title"
       >
-        maintenance.sonarqube_is_under_maintenance
+        <InstanceMessage
+          message="maintenance.is_under_maintenance"
+        />
       </h1>
       <p
         className="maintenance-text"
@@ -59,7 +61,9 @@ exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
       <h1
         className="maintenance-title"
       >
-        maintenance.sonarqube_is_under_maintenance
+        <InstanceMessage
+          message="maintenance.is_under_maintenance"
+        />
       </h1>
       <p
         className="maintenance-text"
@@ -100,7 +104,9 @@ exports[`Maintenance Page should render DOWN status 1`] = `
       <h1
         className="maintenance-title text-danger"
       >
-        maintenance.sonarqube_is_down
+        <InstanceMessage
+          message="maintenance.is_down"
+        />
       </h1>
       <p
         className="maintenance-text"
@@ -139,7 +145,9 @@ exports[`Maintenance Page should render OFFLINE status 1`] = `
       <h1
         className="maintenance-title text-danger"
       >
-        maintenance.sonarqube_is_offline
+        <InstanceMessage
+          message="maintenance.is_offline"
+        />
       </h1>
       <p
         className="maintenance-text"
@@ -178,7 +186,9 @@ exports[`Maintenance Page should render STARTING status 1`] = `
       <h1
         className="maintenance-title"
       >
-        maintenance.sonarqube_is_starting
+        <InstanceMessage
+          message="maintenance.is_starting"
+        />
       </h1>
       <p
         className="maintenance-spinner"
@@ -210,7 +220,9 @@ exports[`Maintenance Page should render UP status 1`] = `
       <h1
         className="maintenance-title"
       >
-        maintenance.sonarqube_is_up
+        <InstanceMessage
+          message="maintenance.is_up"
+        />
       </h1>
       <p
         className="maintenance-text text-center"
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 04de8134d70..7687de09648 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2979,16 +2979,16 @@ maintenance.upgrade_database.3=Make sure you have followed the steps from the So
 maintenance.upgrade=Upgrade
 maintenance.database_migration=Database Migration
 maintenance.database_is_up_to_date=Database is up-to-date
-maintenance.sonarqube_is_down=SonarQube is down
+maintenance.is_down={instance} is down
 maintenance.sonarqube_is_down.text=Something went wrong. Please contact your system administrator.
 maintenance.try_again=Try Again
-maintenance.sonarqube_is_under_maintenance=SonarQube is under maintenance
+maintenance.is_under_maintenance={instance} is under maintenance
 maintenance.sonarqube_is_under_maintenance.1=While waiting, you might want to investigate <a href="https://redirect.sonarsource.com/doc/plugin-library.html">new plugins</a> to extend the current functionality.
 maintenance.sonarqube_is_under_maintenance.2=If you are an administrator and have no idea why this message is being shown, you should read the <a href="https://redirect.sonarsource.com/doc/upgrading.html">upgrade guide</a>.
-maintenance.sonarqube_is_starting=SonarQube is starting
-maintenance.sonarqube_is_up=SonarQube is up
+maintenance.is_starting={instance} is starting
+maintenance.is_up={instance} is up
 maintenance.all_systems_opetational=All systems operational.
-maintenance.sonarqube_is_offline=SonarQube is offline
+maintenance.is_offline={instance} is offline
 maintenance.sonarqube_is_offline.text=The connection to SonarQube is lost. Please contact your system administrator.
 
 
-- 
2.39.5