SONAR-23742 Update edition name in footer

diff --git a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.tsx
index b9976eb3e213232b942e42e51de5882c22190734..004b857d03409f56573ee6237c0ae1e788928023 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.tsx
+++ b/server/sonar-web/src/main/js/app/components/__tests__/GlobalFooter-test.tsx
@@ -21,6 +21,7 @@
 import { addDays, subDays } from 'date-fns';
 import { byRole, byText } from '~sonar-aligned/helpers/testSelector';
 import SystemServiceMock from '../../../api/mocks/SystemServiceMock';
+import { getEdition } from '../../../helpers/editions';
 import { mockAppState } from '../../../helpers/testMocks';
 import { renderComponent } from '../../../helpers/testReactTestingUtils';
 import { AppState } from '../../../types/appstate';
@@ -30,6 +31,8 @@ import GlobalFooter from '../GlobalFooter';
 
 const systemMock = new SystemServiceMock();
 
+const COMMUNITY = getEdition(EditionKey.community).name;
+
 afterEach(() => {
   systemMock.reset();
 });
@@ -41,7 +44,7 @@ it('should render the logged-in information', async () => {
 
   expect(ui.footerListItems.getAll()).toHaveLength(7);
 
-  expect(byText('Community Edition').get()).toBeInTheDocument();
+  expect(byText(COMMUNITY).get()).toBeInTheDocument();
   expect(await ui.versionLabel('4.2').find()).toBeInTheDocument();
   expect(ui.ltaDocumentationLinkActive.query()).not.toBeInTheDocument();
   expect(ui.apiLink.get()).toBeInTheDocument();
@@ -80,7 +83,7 @@ it('should not render missing logged-in information', () => {
 
   expect(ui.footerListItems.getAll()).toHaveLength(5);
 
-  expect(byText('Community Edition').query()).not.toBeInTheDocument();
+  expect(byText(COMMUNITY).query()).not.toBeInTheDocument();
   expect(ui.versionLabel().query()).not.toBeInTheDocument();
 });
 
@@ -91,7 +94,7 @@ it('should not render the logged-in information', () => {
 
   expect(ui.footerListItems.getAll()).toHaveLength(4);
 
-  expect(byText('Community Edition').query()).not.toBeInTheDocument();
+  expect(byText(COMMUNITY).query()).not.toBeInTheDocument();
   expect(ui.versionLabel().query()).not.toBeInTheDocument();
   expect(ui.apiLink.query()).not.toBeInTheDocument();
 });

diff --git a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
index 0fe62d2a16c5af0ead8080fcdb8b20749fcea750..7a80d674f83053319218c41d46c4ce40f7152795 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
+++ b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
@@ -21,6 +21,7 @@
 import userEvent from '@testing-library/user-event';
 import { byRole, byText } from '~sonar-aligned/helpers/testSelector';
 import { showLicense } from '../../../api/editions';
+import { getEdition } from '../../../helpers/editions';
 import { save } from '../../../helpers/storage';
 import { mockAppState, mockCurrentUser } from '../../../helpers/testMocks';
 import { renderApp } from '../../../helpers/testReactTestingUtils';
@@ -74,7 +75,7 @@ it('should check license and open on its own', async () => {
 
 it.each([
   [
-    'community edition',
+    getEdition(EditionKey.community).name,
     { appState: mockAppState({ canAdmin: true, edition: EditionKey.community }) },
   ],
   ['Cannot admin', { appState: mockAppState({ canAdmin: false, edition: EditionKey.enterprise }) }],

diff --git a/server/sonar-web/src/main/js/apps/marketplace/App.tsx b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
index f2eed6871380c5ee743eccc02d0f0b3995a19bad..35841b24c62644332940505ac52a758cc79f13ce 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/App.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
@@ -158,7 +158,7 @@ class App extends React.PureComponent<Props, State> {
 
     /*
      * standalone mode is true when cluster mode is not active. We preserve this
-     * condition if it ever becomes possible to have a community edition NOT in standalone mode.
+     * condition if it ever becomes possible to have a community build NOT in standalone mode.
      */
     const allowActions =
       currentEdition === EditionKey.community &&

diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
index dd74dddb1ef0cb491d34364926a990c8a1a8eca7..2116011b35168dfaaa2231c6ab84820b0fc0cd47 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
@@ -94,7 +94,7 @@ export default function EditionBox({ edition }: Readonly<Props>) {
           <p className="sw-mt-4">
             <em>Built for Developers by Developers</em>
           </p>
-          <p className="sw-mt-4">Community Edition functionality plus:</p>
+          <p className="sw-mt-4">Community Build functionality plus:</p>
           <UnorderedList className="sw-ml-8" ticks>
             <li>
               <span>PR / MR decoration &amp; Quality Gate</span>

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-it.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-it.tsx
index f044f926600f7f8964894d69827ef5e6a89cda1d..f82be896a34f12746039251693ed088c9f2e2707 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-it.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-it.tsx
@@ -24,8 +24,10 @@ import { byRole, byText } from '~sonar-aligned/helpers/testSelector';
 import AlmSettingsServiceMock from '../../../../../api/mocks/AlmSettingsServiceMock';
 import SettingsServiceMock from '../../../../../api/mocks/SettingsServiceMock';
 import { AvailableFeaturesContext } from '../../../../../app/components/available-features/AvailableFeaturesContext';
+import { getEdition } from '../../../../../helpers/editions';
 import { renderComponent } from '../../../../../helpers/testReactTestingUtils';
 import { AlmKeys } from '../../../../../types/alm-settings';
+import { EditionKey } from '../../../../../types/editions';
 import { Feature } from '../../../../../types/features';
 import { SettingsKey } from '../../../../../types/settings';
 import AlmIntegration from '../AlmIntegration';
@@ -54,7 +56,7 @@ it('should not display the serverBaseURL message when it is defined', async () =
   expect(ui.serverBaseUrlMissingInformation.query()).not.toBeInTheDocument();
 });
 
-it('should not display the serverBaseURL message for Community edition', async () => {
+it(`should not display the serverBaseURL message for ${getEdition(EditionKey.community).name}`, async () => {
   const { ui } = getPageObjects();
   renderAlmIntegration();
   expect(await ui.almHeading.find()).toBeInTheDocument();

diff --git a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/DoneNextSteps-it.tsx b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/DoneNextSteps-it.tsx
index 9edff911e5b89c804432b3cb309b492cc500f944..9993b87a16992150e9c372c906a20f583eb4d9b9 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/DoneNextSteps-it.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/DoneNextSteps-it.tsx
@@ -19,6 +19,7 @@
  */
 
 import { byRole, byText } from '~sonar-aligned/helpers/testSelector';
+import { getEdition } from '../../../../helpers/editions';
 import { mockAppState } from '../../../../helpers/testMocks';
 import { renderApp } from '../../../../helpers/testReactTestingUtils';
 import { EditionKey } from '../../../../types/editions';
@@ -34,7 +35,7 @@ const ui = {
   nextStepLinks: byRole('link'),
 };
 
-describe('Community Edition', () => {
+describe(`${getEdition(EditionKey.community).name}`, () => {
   it('should inform the user about available next steps', async () => {
     renderDoneNextSteps();
 

diff --git a/server/sonar-web/src/main/js/helpers/editions.ts b/server/sonar-web/src/main/js/helpers/editions.ts
index aec5f2ca9329cb2e7b577fe8eed1ff64eea067a4..4509bb3913a436c96efbb526a5958b0f1dcb22b4 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/editions.ts
+++ b/server/sonar-web/src/main/js/helpers/editions.ts
@@ -25,7 +25,7 @@ import { SystemUpgrade } from '../types/system';
 const EDITIONS: { [x in EditionKey]: Edition } = {
   community: {
     key: EditionKey.community,
-    name: 'Community Edition',
+    name: 'Community Build',
     homeUrl: 'https://www.sonarsource.com/open-source-editions/',
     downloadProperty: 'downloadUrl',
   },

diff --git a/sonar-application/src/main/assembly/extensions/plugins/README.txt b/sonar-application/src/main/assembly/extensions/plugins/README.txt
index 26fc4b3cac9f054719769118bc323e15d8205115..6df863903cc51dcdeec5d5021408d81a93c83abf 100644 (file)
--- a/sonar-application/src/main/assembly/extensions/plugins/README.txt
+++ b/sonar-application/src/main/assembly/extensions/plugins/README.txt
@@ -3,7 +3,7 @@ DISCLAIMER
 Plugins are not provided by SonarSource and are therefore installed at your own risk. SonarSource disclaims all liability for installing and using such plugins.
 
 
-COMMUNITY EDITION
+COMMUNITY BUILD
 
 Administrators can either:
 

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 5360fc658631aa83e30ddf22064f5e7f0dda3995..7f7d67ad26d0b1773df8692ca26532220cfbf0f1 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -4087,7 +4087,7 @@ workspace.no_rule=The rule has been removed or never existed.
 marketplace.page=Marketplace
 marketplace.page.description=Discover the additional benefits offered in SonarQube Server Commercial Editions
 marketplace.page.description_best_edition=This edition includes access to all the SonarQube Server-SonarQube for IDE Ecosystem features!
-marketplace.page.you_are_running.community=You are currently running a Community Edition.
+marketplace.page.you_are_running.community=You are currently running a Community Build.
 marketplace.page.you_are_running.developer=You are currently running a Developer Edition.
 marketplace.page.you_are_running.enterprise=You are currently running an Enterprise Edition.
 marketplace.page.you_are_running.datacenter=You are currently running a Data Center Edition.