SONAR-21001 Change wording for DevOps platform settings description

This reverts commit 6b4e7c32c25fd3df015e2abee6cc986454bcb27d.

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
index a2b69e25b91e234cda9840f5a7b58e84ec4b7bda..6fb1ffbd903d746997ccb1fb7d8259177a5c26fd 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
@@ -19,9 +19,6 @@
  */
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import withAppStateContext, {
-  WithAppStateContextProps,
-} from '../../../../app/components/app-state/withAppStateContext';
 import Link from '../../../../components/common/Link';
 import { getTabId, getTabPanelId } from '../../../../components/controls/BoxedTabs';
 import { Button } from '../../../../components/controls/buttons';
@@ -35,7 +32,6 @@ import {
   AlmSettingsBindingStatus,
   isBitbucketCloudBindingDefinition,
 } from '../../../../types/alm-settings';
-import { EditionKey } from '../../../../types/editions';
 import { Dict } from '../../../../types/types';
 import AlmBindingDefinitionBox from './AlmBindingDefinitionBox';
 import AlmBindingDefinitionForm from './AlmBindingDefinitionForm';
@@ -66,10 +62,9 @@ const AUTHENTICATION_AVAILABLE_PLATFORMS = [
   AlmKeys.BitbucketServer,
 ];
 
-function AlmTabRenderer(props: AlmTabRendererProps & WithAppStateContextProps) {
+export default function AlmTabRenderer(props: Readonly<AlmTabRendererProps>) {
   const {
     almTab,
-    appState: { edition },
     branchesEnabled,
     definitions,
     definitionStatus,
@@ -82,8 +77,6 @@ function AlmTabRenderer(props: AlmTabRendererProps & WithAppStateContextProps) {
 
   const preventCreation = loadingProjectCount || (!multipleAlmEnabled && definitions.length > 0);
 
-  const isCommunityEdition = edition === EditionKey.community;
-
   return (
     <div
       className="bordered"
@@ -135,11 +128,7 @@ function AlmTabRenderer(props: AlmTabRendererProps & WithAppStateContextProps) {
         <Alert variant="info" className="spacer">
           <FormattedMessage
             id="settings.almintegration.tabs.authentication-moved"
-            defaultMessage={
-              isCommunityEdition
-                ? translate('settings.almintegration.tabs.community_edition_cannot_delegate_auth')
-                : translate('settings.almintegration.tabs.authentication_moved')
-            }
+            defaultMessage={translate('settings.almintegration.tabs.authentication_moved')}
             values={{
               link: (
                 <Link
@@ -158,5 +147,3 @@ function AlmTabRenderer(props: AlmTabRendererProps & WithAppStateContextProps) {
     </div>
   );
 }
-
-export default withAppStateContext(AlmTabRenderer);

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 b280d8d0824c87bfa947ee306d0055b9cae023bc..755c961394820a231cacc0888bbf6471094aed37 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1492,7 +1492,6 @@ settings.almintegration.feature.alm_repo_import.description=Select repositories
 settings.almintegration.feature.alm_repo_import.disabled=Disabled
 settings.almintegration.feature.alm_repo_import.disabled.no_url=This feature is disabled because your configured instance has no URL.
 settings.almintegration.tabs.authentication_moved=You can delegate authentication to this DevOps Platform. The relevant settings are under the {link} section.
-settings.almintegration.tabs.community_edition_cannot_delegate_auth=You cannot delegate authentication to this DevOps Platform with the Community Edition of SonarQube.
 
 # Authentication Common
 settings.authentication.title=Authentication