Update wording for search engine in system info

diff --git a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
index 60d9e1ba6aaaadd241684a198878997d806794c9..c27c7dd452163700b32817de11e68726bb2152d1 100644 (file)
--- a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
+++ b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
@@ -120,7 +120,7 @@ export default class PageActions extends React.PureComponent<Props, State> {
                   id="es-logs-link"
                   download="sonarqube_es.log"
                   target="_blank">
-                  Elasticsearch
+                  Search Engine
                 </a>
               </li>
               <li>
@@ -153,7 +153,7 @@ export default class PageActions extends React.PureComponent<Props, State> {
           </button>
         )}
         {this.props.canRestart &&
-        this.state.openRestartForm && <RestartForm onClose={this.handleServerRestartClose} />}
+          this.state.openRestartForm && <RestartForm onClose={this.handleServerRestartClose} />}
         {this.state.openLogsLevelForm && (
           <ChangeLogLevelForm
             infoMsg={translate(

diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
index 7677001d16fdc70c6f78cb637f4fed9ac6ccebb9..d665e37ec15649766be8875ff7f624f5778ad30a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
@@ -64,7 +64,7 @@ exports[`should render correctly 1`] = `
           id="es-logs-link"
           target="_blank"
         >
-          Elasticsearch
+          Search Engine
         </a>
       </li>
       <li>

diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
index b7a2d4285c16e7a2c9597908e559bffc9f94c821..ba562c42b3b86b8e1a8d17c55a3aa717a181e180 100644 (file)
--- a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
@@ -45,7 +45,7 @@ exports[`should render correctly 1`] = `
     }
   />
   <HealthCard
-    name="Search"
+    name="Search Engine"
     onClick={[Function]}
     open={false}
     sysInfoData={

diff --git a/server/sonar-web/src/main/js/apps/system/utils.ts b/server/sonar-web/src/main/js/apps/system/utils.ts
index 1f5367bd5f9388e3473c02fa997e7c7fd14de6a9..7048439a6783eef10eaba969604fd8c101427ace 100644 (file)
--- a/server/sonar-web/src/main/js/apps/system/utils.ts
+++ b/server/sonar-web/src/main/js/apps/system/utils.ts
@@ -160,7 +160,7 @@ export function getStandaloneSecondarySections(sysInfoData: SysInfo): SysInfoSec
   return {
     Web: pickBy(sysInfoData, (_, key) => key.startsWith('Web')),
     'Compute Engine': pickBy(sysInfoData, (_, key) => key.startsWith('Compute Engine')),
-    Search: pickBy(sysInfoData, (_, key) => key.startsWith('Search'))
+    'Search Engine': pickBy(sysInfoData, (_, key) => key.startsWith('Search'))
   };
 }
 

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 5533b2f3cc65cba3782b8531a146370677c53f78..dfa7b4532c2718dd80cc0d07bfe5a178247d3ce6 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2184,7 +2184,7 @@ background_tasks.failing_count=Count of projects where processing of most recent
 #------------------------------------------------------------------------------
 system.application_nodes_title=Application Nodes
 system.are_you_sure_to_restart=Are you sure you want to restart the server?
-system.cluster_log_level.info=Changes apply to all Application nodes but not to Search nodes.
+system.cluster_log_level.info=Your selection affect all Application nodes but not the Search nodes.
 system.current_health_of_x=Current health status of {0}
 system.download_logs=Download Logs
 system.download_system_info=Download System Info
@@ -2196,7 +2196,7 @@ system.latest_version=Latest Version
 system.lts_version=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=Changes don't apply to Search.
+system.log_level.info=Your selection does not affect the Search Engine.
 system.logs_level=Logs level
 system.new_version_available=A new version of SonarQube is available.
 system.release_notes=Release Notes

diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
index 960946d0632562749a9a32971df5805b18ab5e83..ae11a552e858f2aedc934d727450852d9f79a3d6 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
@@ -76,7 +76,7 @@ public class SystemInfoTest {
       .shouldHaveSection("Compute Engine Logging")
       .shouldHaveSection("Compute Engine Tasks");
 
-    page.getCardItem("Search")
+    page.getCardItem("Search Engine")
       .shouldHaveSection("Search State")
       .shouldHaveSection("Search Indexes");
   }