From f9f4cf9c336f79c3bef4233cb391ae7d06511e78 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 2 Feb 2017 11:11:10 +0100 Subject: [PATCH] display organization key on project dashboard --- .../src/main/js/apps/overview/meta/Meta.js | 17 +++++++- .../apps/overview/meta/MetaOrganizationKey.js | 39 +++++++++++++++++++ .../resources/org/sonar/l10n/core.properties | 1 + 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 server/sonar-web/src/main/js/apps/overview/meta/MetaOrganizationKey.js diff --git a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js index a0b76bf0690..6709840632d 100644 --- a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js +++ b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js @@ -18,14 +18,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import React from 'react'; +import { connect } from 'react-redux'; import MetaKey from './MetaKey'; +import MetaOrganizationKey from './MetaOrganizationKey'; import MetaLinks from './MetaLinks'; import MetaQualityGate from './MetaQualityGate'; import MetaQualityProfiles from './MetaQualityProfiles'; import AnalysesList from '../events/AnalysesList'; import MetaSize from './MetaSize'; +import { areThereCustomOrganizations } from '../../../store/rootReducer'; -const Meta = ({ component, measures }) => { +const Meta = ({ component, measures, areThereCustomOrganizations }) => { const { qualifier, description, qualityProfiles, qualityGate } = component; const isProject = qualifier === 'TRK'; @@ -39,6 +42,8 @@ const Meta = ({ component, measures }) => { const shouldShowQualityProfiles = !isView && !isDeveloper && hasQualityProfiles; const shouldShowQualityGate = !isView && !isDeveloper && hasQualityGate; + const shouldShowOrganizationKey = component.organization != null && areThereCustomOrganizations; + return (
{hasDescription && ( @@ -61,6 +66,10 @@ const Meta = ({ component, measures }) => { + {shouldShowOrganizationKey && ( + + )} + {isProject && ( )} @@ -68,4 +77,8 @@ const Meta = ({ component, measures }) => { ); }; -export default Meta; +const mapStateToProps = state => ({ + areThereCustomOrganizations: areThereCustomOrganizations(state) +}); + +export default connect(mapStateToProps)(Meta); diff --git a/server/sonar-web/src/main/js/apps/overview/meta/MetaOrganizationKey.js b/server/sonar-web/src/main/js/apps/overview/meta/MetaOrganizationKey.js new file mode 100644 index 00000000000..f438365f3a4 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/overview/meta/MetaOrganizationKey.js @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +import React from 'react'; +import { translate } from '../../../helpers/l10n'; + +const MetaOrganizationKey = ({ component }) => { + return ( +
+

+ {translate('organization_key')} +

+ e.target.select()}/> +
+ ); +}; + +export default MetaOrganizationKey; 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 822ce59ee01..d3b386694da 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -109,6 +109,7 @@ never=Never none=None off=Off on=On +organization_key=Organization Key open=Open open_verb=Open operations=Operations -- 2.39.5