SONAR-14572 Update under maintenance message

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 2f3a3573a6a09085a02ad38605942a8b754517f5..3e620caf7eb82f3ff7c8c72b8b337017ffaea3e8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
@@ -200,36 +200,38 @@ export default class App extends React.PureComponent<Props, State> {
                 <h1 className="maintenance-title">
                   <InstanceMessage message={translate('maintenance.is_under_maintenance')} />
                 </h1>
-                {!isSonarCloud() && (
-                  <>
-                    <p className="maintenance-text">
-                      <FormattedMessage
-                        defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.1')}
-                        id="maintenance.sonarqube_is_under_maintenance.1"
-                        values={{
-                          link: (
-                            <a href="https://redirect.sonarsource.com/doc/plugin-library.html">
-                              {translate('maintenance.sonarqube_is_under_maintenance_link.1')}
-                            </a>
-                          )
-                        }}
-                      />
-                    </p>
-                    <p className="maintenance-text">
-                      <FormattedMessage
-                        defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.2')}
-                        id="maintenance.sonarqube_is_under_maintenance.2"
-                        values={{
-                          link: (
-                            <a href="https://redirect.sonarsource.com/doc/upgrading.html">
-                              {translate('maintenance.sonarqube_is_under_maintenance_link.2')}
-                            </a>
-                          )
-                        }}
-                      />
-                    </p>
-                  </>
-                )}
+                <p className="maintenance-text">
+                  <FormattedMessage
+                    defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.1')}
+                    id="maintenance.sonarqube_is_under_maintenance.1"
+                    values={{
+                      link: (
+                        <a
+                          href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
+                          target="_blank"
+                          rel="noopener noreferrer">
+                          {translate('maintenance.sonarqube_is_under_maintenance_link.1')}
+                        </a>
+                      )
+                    }}
+                  />
+                </p>
+                <p className="maintenance-text">
+                  <FormattedMessage
+                    defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.2')}
+                    id="maintenance.sonarqube_is_under_maintenance.2"
+                    values={{
+                      link: (
+                        <a
+                          href="https://redirect.sonarsource.com/doc/upgrading.html"
+                          target="_blank"
+                          rel="noopener noreferrer">
+                          {translate('maintenance.sonarqube_is_under_maintenance_link.2')}
+                        </a>
+                      )
+                    }}
+                  />
+                </p>
               </>
             )}
 

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 1c9dbb2b24e5c489e01460e7b9f8ed3ad6d97907..2120741ddd2359f5e04f94c218c6f6b2b7a87060 100644 (file)
--- 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
@@ -31,7 +31,9 @@ exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
           values={
             Object {
               "link": <a
-                href="https://redirect.sonarsource.com/doc/plugin-library.html"
+                href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 maintenance.sonarqube_is_under_maintenance_link.1
               </a>,
@@ -49,6 +51,8 @@ exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
             Object {
               "link": <a
                 href="https://redirect.sonarsource.com/doc/upgrading.html"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 maintenance.sonarqube_is_under_maintenance_link.2
               </a>,
@@ -92,7 +96,9 @@ exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
           values={
             Object {
               "link": <a
-                href="https://redirect.sonarsource.com/doc/plugin-library.html"
+                href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 maintenance.sonarqube_is_under_maintenance_link.1
               </a>,
@@ -110,6 +116,8 @@ exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
             Object {
               "link": <a
                 href="https://redirect.sonarsource.com/doc/upgrading.html"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 maintenance.sonarqube_is_under_maintenance_link.2
               </a>,

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 9dd484cc5468a838c559a8fdc7e74e0094e00523..c1135d61efc04e33c30fb067e6cc53034dc0c104 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3935,8 +3935,8 @@ 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.is_under_maintenance={instance} is under maintenance
-maintenance.sonarqube_is_under_maintenance.1=While waiting, you might want to investigate {link} to extend the current functionality.
-maintenance.sonarqube_is_under_maintenance_link.1=new plugins
+maintenance.sonarqube_is_under_maintenance.1=While waiting, install {link} in your IDE!
+maintenance.sonarqube_is_under_maintenance_link.1=SonarLint
 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 {link}.
 maintenance.sonarqube_is_under_maintenance_link.2=upgrade guide
 maintenance.is_starting={instance} is starting