From 3641fb3c3b11768ff2f3ff54b6bcfa754e3064ec Mon Sep 17 00:00:00 2001
From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Tue, 2 Nov 2021 14:28:32 +0100
Subject: [PATCH] SONAR-15508 Fix upgrade being display in the modal

---
 .../js/components/upgrade/SystemUpgradeForm.tsx  | 10 +++++++++-
 .../js/components/upgrade/SystemUpgradeItem.tsx  |  2 +-
 .../SystemUpgradeItem-test.tsx.snap              | 16 ++++++++--------
 .../resources/org/sonar/l10n/core.properties     |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeForm.tsx b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeForm.tsx
index eb6e85ca6b8..985f8d4600f 100644
--- a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeForm.tsx
+++ b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeForm.tsx
@@ -54,7 +54,7 @@ export class SystemUpgradeForm extends React.PureComponent<Props, State> {
   render() {
     const { upgrading } = this.state;
     const { appState, systemUpgrades, latestLTS, updateUseCase } = this.props;
-    let systemUpgradesWithPatch = systemUpgrades;
+    let systemUpgradesWithPatch: SystemUpgrade[][] = [];
     const alertVariant = updateUseCase ? MAP_ALERT[updateUseCase] : undefined;
     const header = translate('system.system_upgrade');
     const parsedVersion = this.versionParser.exec(appState.version);
@@ -69,6 +69,14 @@ export class SystemUpgradeForm extends React.PureComponent<Props, State> {
         .map(upgrades => upgrades.filter(upgrade => !upgrade.version.startsWith(majoMinorVersion)))
         .filter(negate(isEmpty));
       systemUpgradesWithPatch.push(patches);
+    } else {
+      let untilLTS = false;
+      for (const upgrades of systemUpgrades) {
+        if (untilLTS === false) {
+          systemUpgradesWithPatch.push(upgrades);
+          untilLTS = upgrades.some(upgrade => upgrade.version.startsWith(latestLTS));
+        }
+      }
     }
 
     return (
diff --git a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
index 049bfa96d86..ffbc2b718f2 100644
--- a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
+++ b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
@@ -55,7 +55,7 @@ export default function SystemUpgradeItem(props: SystemUpgradeItemProps) {
     <div className="system-upgrade-version it__upgrade-list-item">
       <h3 className="h1 spacer-bottom">
         <strong>{header}</strong>
-        {!isLTSVersion && (
+        {!isPatch && (
           <a
             className="spacer-left medium"
             href="https://www.sonarqube.org/whats-new/?referrer=sonarqube"
diff --git a/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap b/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
index 697c8eb3375..849ff677a1d 100644
--- a/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
@@ -113,6 +113,14 @@ exports[`should display correctly 2`] = `
     <strong>
       system.lts_version
     </strong>
+    <a
+      className="spacer-left medium"
+      href="https://www.sonarqube.org/whats-new/?referrer=sonarqube"
+      rel="noopener noreferrer"
+      target="_blank"
+    >
+      system.see_whats_new
+    </a>
   </h3>
   <p>
     <FormattedMessage
@@ -208,14 +216,6 @@ exports[`should display correctly 3`] = `
     <strong>
       system.latest_patch
     </strong>
-    <a
-      className="spacer-left medium"
-      href="https://www.sonarqube.org/whats-new/?referrer=sonarqube"
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      system.see_whats_new
-    </a>
   </h3>
   <p>
     <FormattedMessage
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 57e43771745..3ee7dde2d20 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3020,8 +3020,8 @@ system.forcing_shutdown_not_recommended=Forcing the shutdown is not recommended
 system.hide_intermediate_versions=Hide intermediate versions
 system.how_to_upgrade=How to upgrade?
 system.latest_version=Latest Version
-system.latest_patch=Latest Patch Release
-system.lts_version=LTS Version
+system.latest_patch=Patch Release
+system.lts_version=Latest LTS Version
 system.log_level.warning=This level has performance impacts, please make sure to get back to INFO level once your investigation is done. Please note that when the server is restarted, logging will revert to the level configured in sonar.properties.
 system.log_level.warning.short=Current logs level has performance impacts, get back to INFO level.
 system.log_level.info=Your selection does not affect the Search Engine.
-- 
2.39.5