소스 검색

SONAR-19600 Change wording for DevOps platform settings description depending on edition

tags/10.2.0.77647
David Cho-Lerat 9 달 전
부모
커밋
504189b5ff

+ 15
- 2
server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx 파일 보기

@@ -19,6 +19,9 @@
*/
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';
@@ -32,6 +35,7 @@ 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';
@@ -62,9 +66,10 @@ const AUTHENTICATION_AVAILABLE_PLATFORMS = [
AlmKeys.BitbucketServer,
];

export default function AlmTabRenderer(props: AlmTabRendererProps) {
function AlmTabRenderer(props: AlmTabRendererProps & WithAppStateContextProps) {
const {
almTab,
appState: { edition },
branchesEnabled,
definitions,
definitionStatus,
@@ -77,6 +82,8 @@ export default function AlmTabRenderer(props: AlmTabRendererProps) {

const preventCreation = loadingProjectCount || (!multipleAlmEnabled && definitions.length > 0);

const isCommunityEdition = edition === EditionKey.community;

return (
<div
className="bordered"
@@ -128,7 +135,11 @@ export default function AlmTabRenderer(props: AlmTabRendererProps) {
<Alert variant="info" className="spacer">
<FormattedMessage
id="settings.almintegration.tabs.authentication-moved"
defaultMessage={translate('settings.almintegration.tabs.authentication_moved')}
defaultMessage={
isCommunityEdition
? translate('settings.almintegration.tabs.community_edition_cannot_delegate_auth')
: translate('settings.almintegration.tabs.authentication_moved')
}
values={{
link: (
<Link
@@ -147,3 +158,5 @@ export default function AlmTabRenderer(props: AlmTabRendererProps) {
</div>
);
}

export default withAppStateContext(AlmTabRenderer);

+ 1
- 0
sonar-core/src/main/resources/org/sonar/l10n/core.properties 파일 보기

@@ -1469,6 +1469,7 @@ 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

Loading…
취소
저장