From 7a42a7c80528cf1f8867d8df3f7d8c12f36a1704 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Fri, 13 Oct 2017 14:58:52 +0200 Subject: [PATCH] SONAR-9863 Drop web app licenses and server id code --- server/sonar-web/src/main/js/api/licenses.ts | 36 ---- server/sonar-web/src/main/js/api/settings.ts | 8 - .../components/nav/settings/SettingsNav.js | 10 -- .../__snapshots__/SettingsNav-test.js.snap | 16 -- .../src/main/js/app/utils/startReactApp.js | 2 - .../settings/licenses/LicenseChangeForm.js | 109 ------------ .../js/apps/settings/licenses/LicenseRow.js | 65 ------- .../settings/licenses/LicenseRowContainer.js | 29 ---- .../apps/settings/licenses/LicenseStatus.js | 43 ----- .../js/apps/settings/licenses/LicensesApp.js | 34 ---- .../settings/licenses/LicensesAppHeader.js | 33 ---- .../js/apps/settings/licenses/LicensesList.js | 59 ------- .../licenses/LicensesListContainer.js | 29 ---- .../__tests__/LicenseChangeForm-test.js | 27 --- .../licenses/__tests__/LicenseRow-test.js | 125 -------------- .../licenses/__tests__/LicenseStatus-test.js | 50 ------ .../licenses/__tests__/LicensesApp-test.js | 30 ---- .../__tests__/LicensesAppHeader-test.js | 28 --- .../licenses/__tests__/LicensesList-test.js | 51 ------ .../js/apps/settings/licenses/licenseUtils.js | 26 --- .../src/main/js/apps/settings/routes.ts | 12 -- .../js/apps/settings/serverId/ServerIdApp.js | 161 ------------------ .../settings/serverId/ServerIdAppContainer.js | 24 --- .../apps/settings/store/licenses/actions.js | 70 -------- .../apps/settings/store/licenses/reducer.js | 36 ---- .../js/apps/settings/store/rootReducer.js | 9 - .../src/main/js/store/rootReducer.js | 6 - .../resources/org/sonar/l10n/core.properties | 32 ---- 28 files changed, 1160 deletions(-) delete mode 100644 server/sonar-web/src/main/js/api/licenses.ts delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicenseRow.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicenseRowContainer.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicenseStatus.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicensesApp.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicensesAppHeader.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicensesList.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/LicensesListContainer.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicenseChangeForm-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicenseRow-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicenseStatus-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicensesApp-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicensesAppHeader-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/__tests__/LicensesList-test.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/licenses/licenseUtils.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/serverId/ServerIdApp.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/serverId/ServerIdAppContainer.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/store/licenses/actions.js delete mode 100644 server/sonar-web/src/main/js/apps/settings/store/licenses/reducer.js diff --git a/server/sonar-web/src/main/js/api/licenses.ts b/server/sonar-web/src/main/js/api/licenses.ts deleted file mode 100644 index 8df37f10ed1..00000000000 --- a/server/sonar-web/src/main/js/api/licenses.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2017 SonarSource SA - * mailto:info 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 { getJSON, post } from '../helpers/request'; - -export function getLicenses(): Promise { - return getJSON('/api/licenses/list').then(r => r.licenses); -} - -export function setLicense(key: string, value: string): Promise { - const url = '/api/settings/set'; - const data = { key, value }; - return post(url, data); -} - -export function resetLicense(key: string): Promise { - const url = '/api/settings/reset'; - const data = { keys: key }; - return post(url, data); -} diff --git a/server/sonar-web/src/main/js/api/settings.ts b/server/sonar-web/src/main/js/api/settings.ts index dd257cea597..c388e4eb32a 100644 --- a/server/sonar-web/src/main/js/api/settings.ts +++ b/server/sonar-web/src/main/js/api/settings.ts @@ -93,11 +93,3 @@ export function generateSecretKey(): Promise { export function encryptValue(value: string): Promise { return postJSON('/api/settings/encrypt', { value }); } - -export function getServerId(): Promise { - return getJSON('/api/server_id/show'); -} - -export function generateServerId(organization: string, ip: string): Promise { - return postJSON('/api/server_id/generate', { organization, ip }); -} 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 36a74fdef7a..6f2c84d6e6e 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 @@ -99,21 +99,11 @@ class SettingsNav extends React.PureComponent { {translate('settings.page')} -
  • - - {translate('property.category.licenses')} - -
  • {translate('property.category.security.encryption')}
  • -
  • - - {translate('property.category.server_id')} - -
  • {translate('custom_metrics.page')} diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.js.snap b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.js.snap index ca0145b11c8..d70451a6f1d 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.js.snap +++ b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsNav-test.js.snap @@ -39,14 +39,6 @@ exports[`should work with extensions 1`] = ` settings.page
  • -
  • - - property.category.licenses - -
  • -
  • - - property.category.server_id - -
  • { - - 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 deleted file mode 100644 index afea2682e97..00000000000 --- a/server/sonar-web/src/main/js/apps/settings/licenses/LicenseChangeForm.js +++ /dev/null @@ -1,109 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2017 SonarSource SA - * mailto:info 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 PropTypes from 'prop-types'; -import Modal from 'react-modal'; -import { translate, translateWithParameters } from '../../../helpers/l10n'; - -export default class LicenseChangeForm extends React.PureComponent { - static propTypes = { - license: PropTypes.object.isRequired, - onChange: PropTypes.func.isRequired - }; - - state = { - loading: false, - modalOpen: false - }; - - onClick(e) { - e.preventDefault(); - e.target.blur(); - this.setState({ modalOpen: true }); - } - - closeModal = () => this.setState({ modalOpen: false }); - - handleSubmit = event => { - event.preventDefault(); - if (this.textarea) { - const { value } = this.textarea; - this.setState({ loading: true }); - this.props - .onChange(value) - .then( - () => this.setState({ loading: false, modalOpen: false }), - () => this.setState({ loading: false }) - ); - } - }; - - handleCancelClick = event => { - event.preventDefault(); - this.closeModal(); - }; - - render() { - const { license } = this.props; - const productName = license.name || license.key; - - return ( -