From 7e8dcbf63a1c80dd7031d8b24793384d04361b0f Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 19 Oct 2017 11:34:05 +0200 Subject: [PATCH] LICENSE-75 display support page in administration --- .../components/nav/settings/SettingsNav.js | 19 +++++++++++++++++-- .../resources/org/sonar/l10n/core.properties | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js index 6f2c84d6e6e..69cbec3e6dd 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js @@ -70,14 +70,21 @@ class SettingsNav extends React.PureComponent { const isSecurity = this.isSecurityActive(); const isProjects = this.isProjectsActive(); const isSystem = this.isSystemActive(); + const isSupport = this.isSomethingActive(['/admin/extension/license/support']); const securityClassName = classNames('dropdown-toggle', { active: isSecurity }); const projectsClassName = classNames('dropdown-toggle', { active: isProjects }); const systemClassName = classNames('dropdown-toggle', { active: isSystem }); const configurationClassNames = classNames('dropdown-toggle', { - active: !isSecurity && !isProjects && !isSystem + active: !isSecurity && !isProjects && !isSystem && !isSupport }); + const extensionsWithoutSupport = this.props.extensions.filter( + extension => extension.key !== 'license/support' + ); + + const hasSupportExtension = extensionsWithoutSupport.length < this.props.extensions.length; + return (

@@ -109,7 +116,7 @@ class SettingsNav extends React.PureComponent { {translate('custom_metrics.page')} - {this.props.extensions.map(this.renderExtension)} + {extensionsWithoutSupport.map(this.renderExtension)} @@ -184,6 +191,14 @@ class SettingsNav extends React.PureComponent { + + {hasSupportExtension && ( +
  • + + {translate('support')} + +
  • + )} ); 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 06b017e85f6..6d02a1caaf8 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -147,6 +147,7 @@ x_selected={0} selected x_of_y_shown={0} of {1} shown size=Size status=Status +support=Support table=Table tags=Tags technical_debt=Technical Debt -- 2.39.5