From ebc1a2d2a0b0c6792fcde8b78fabb1f5e14c05d4 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 9 Sep 2016 15:31:51 +0200 Subject: [PATCH] SONAR-7980 apply feedback --- .../settings/licenses/LicenseChangeForm.js | 2 +- .../js/apps/settings/licenses/LicenseRow.js | 8 ++-- .../apps/settings/licenses/LicenseStatus.js | 3 +- .../settings/licenses/LicenseValueView.hbs | 2 +- .../js/apps/settings/licenses/licenseUtils.js | 27 ++++++++++++ .../apps/settings/store/licenses/actions.js | 42 ++++++++++++------- .../resources/org/sonar/l10n/core.properties | 4 +- 7 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/licenseUtils.js diff --git a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js index 8976c35593f..ce354ca1201 100644 --- a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js +++ b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js @@ -42,7 +42,7 @@ export default class LicenseChangeForm extends React.Component { render () { return ( - + ); } } diff --git a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseRow.js b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseRow.js index 2b095f0bec7..afb705ae6c7 100644 --- a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseRow.js +++ b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseRow.js @@ -50,9 +50,11 @@ export default class LicenseRow extends React.Component { {license.organization} -
- {moment(license.expiration).format('LL')} -
+ {license.expiration != null && ( +
+ {moment(license.expiration).format('LL')} +
+ )} {license.type} diff --git a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseStatus.js b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseStatus.js index 657435686d7..9f9abb4e302 100644 --- a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseStatus.js +++ b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseStatus.js @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import React from 'react'; +import { isLicenseInvalid } from './licenseUtils'; export default class LicenseStatus extends React.Component { static propTypes = { @@ -31,7 +32,7 @@ export default class LicenseStatus extends React.Component { return null; } - const isInvalid = !!license.invalidProduct || !!license.invalidExpiration || !!license.invalidServerId; + const isInvalid = isLicenseInvalid(license); if (isInvalid) { return ; } diff --git a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseValueView.hbs b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseValueView.hbs index c472b282dda..c4aab7ea6f7 100644 --- a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseValueView.hbs +++ b/server/sonar-web/src/main/js/apps/settings/licenses/LicenseValueView.hbs @@ -1,6 +1,6 @@
-

{{tp 'licenses.change_license_for_x' productName}}

+

{{tp 'licenses.update_license_for_x' productName}}

diff --git a/server/sonar-web/src/main/js/apps/settings/licenses/licenseUtils.js b/server/sonar-web/src/main/js/apps/settings/licenses/licenseUtils.js new file mode 100644 index 00000000000..5b32668943c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/settings/licenses/licenseUtils.js @@ -0,0 +1,27 @@ +/* + * 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. + */ +export const isLicenseInvalid = license => ( + !!license.invalidProduct || !!license.invalidExpiration || !!license.invalidServerId +); + +export const isLicenseFromListInvalid = (licenses, key) => { + const license = licenses.find(license => license.key === key); + return license ? isLicenseInvalid(license) : false; +}; diff --git a/server/sonar-web/src/main/js/apps/settings/store/licenses/actions.js b/server/sonar-web/src/main/js/apps/settings/store/licenses/actions.js index d94b51a5902..9071be540b5 100644 --- a/server/sonar-web/src/main/js/apps/settings/store/licenses/actions.js +++ b/server/sonar-web/src/main/js/apps/settings/store/licenses/actions.js @@ -21,6 +21,7 @@ import * as licenses from '../../../../api/licenses'; import { parseError } from '../../../code/utils'; import { addGlobalSuccessMessage, addGlobalErrorMessage } from '../../../../components/store/globalMessages'; import { translate } from '../../../../helpers/l10n'; +import { isLicenseFromListInvalid, isLicenseInvalid } from '../../licenses/licenseUtils'; export const RECEIVE_LICENSES = 'RECEIVE_LICENSES'; @@ -29,26 +30,37 @@ const receiveLicenses = licenses => ({ licenses }); -export const fetchLicenses = () => dispatch => - licenses.getLicenses() - .then(licenses => { - dispatch(receiveLicenses(licenses)); - }) - .catch(e => { - parseError(e).then(message => dispatch(addGlobalErrorMessage(key, message))); - return Promise.reject(); - }); +const handleError = dispatch => error => { + parseError(error).then(message => dispatch(addGlobalErrorMessage(message))); + return Promise.reject(); +}; + +export const fetchLicenses = () => dispatch => { + return licenses.getLicenses() + .then(licenses => { + dispatch(receiveLicenses(licenses)); + /* eslint import/namespace: 0 */ + const invalidLicenses = licenses.some(isLicenseInvalid); + if (invalidLicenses) { + dispatch(addGlobalErrorMessage(translate('licenses.there_are_invalid'))); + } + }) + .catch(handleError(dispatch)); +}; export const setLicense = (key, value) => dispatch => { const request = value ? licenses.setLicense(key, value) : licenses.resetLicense(key); return request .then(() => { - dispatch(fetchLicenses()); - dispatch(addGlobalSuccessMessage(translate('licenses.success_message'))); + licenses.getLicenses().then(licenses => { + dispatch(receiveLicenses(licenses)); + if (isLicenseFromListInvalid(licenses, key)) { + dispatch(addGlobalErrorMessage(translate('licenses.error_message'))); + } else { + dispatch(addGlobalSuccessMessage(translate('licenses.success_message'))); + } + }); }) - .catch(e => { - parseError(e).then(message => dispatch(addGlobalErrorMessage(message))); - return Promise.reject(); - }); + .catch(handleError(dispatch)); }; 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 d41ef6ed74f..275b964654a 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2077,10 +2077,12 @@ licenses.list.organization=Organization licenses.list.expiration=Expiration licenses.list.type=Type licenses.list.server=Server -licenses.change_license_for_x=Change License for {0} +licenses.update_license_for_x=Update License for {0} licenses.license_input_label=Insert the license text below: licenses.license_input_note=Keep empty if you want to unset this license. licenses.success_message=New license has been set. +licenses.error_message=The license you have just set is invalid. +licenses.there_are_invalid=There are licenses that are not valid. Please check details below. #------------------------------------------------------------------------------ -- 2.39.5