From 75efda3dd83b392b39a09ccf61b848a141fec9e2 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 11 Jul 2016 17:06:07 +0200 Subject: [PATCH] SONAR-7880 Put actions on permissions on the Projects Management page --- .../sonar-web/src/main/js/api/permissions.js | 6 +- .../templates/ApplyTemplateTemplate.hbs | 45 +++++--- .../project/views/ApplyTemplateView.js | 7 +- .../src/main/js/apps/projects/header.js | 53 +++++++-- .../src/main/js/apps/projects/main.js | 16 ++- .../src/main/js/apps/projects/projects.js | 77 ++++++++++--- .../templates/BulkApplyTemplateTemplate.hbs | 68 +++++++++++ .../projects/views/BulkApplyTemplateView.js | 108 ++++++++++++++++++ server/sonar-web/src/main/js/helpers/urls.js | 9 ++ .../resources/org/sonar/l10n/core.properties | 3 + 10 files changed, 339 insertions(+), 53 deletions(-) create mode 100644 server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs create mode 100644 server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js diff --git a/server/sonar-web/src/main/js/api/permissions.js b/server/sonar-web/src/main/js/api/permissions.js index 80a77e56539..e7ea01ed4b7 100644 --- a/server/sonar-web/src/main/js/api/permissions.js +++ b/server/sonar-web/src/main/js/api/permissions.js @@ -114,9 +114,9 @@ export function applyTemplateToProject (data) { return post(url, data); } -export function bulkApplyTemplateToProject (options) { - const url = window.baseUrl + '/api/permissions/bulk_apply_template'; - return request(_.extend({ type: 'POST', url }, options)); +export function bulkApplyTemplate (data) { + const url = '/api/permissions/bulk_apply_template'; + return post(url, data); } export function addProjectCreatorToTemplate (templateName, permission) { diff --git a/server/sonar-web/src/main/js/apps/permissions/project/templates/ApplyTemplateTemplate.hbs b/server/sonar-web/src/main/js/apps/permissions/project/templates/ApplyTemplateTemplate.hbs index c7307670cbe..82c157e5d53 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/templates/ApplyTemplateTemplate.hbs +++ b/server/sonar-web/src/main/js/apps/permissions/project/templates/ApplyTemplateTemplate.hbs @@ -5,26 +5,37 @@
- {{#notNull permissionTemplates}} -
- - + + {{#if done}} +
+ {{t 'projects_role.apply_template.success'}}
- {{else}} - - {{/notNull}} + {{/if}} + + {{#unless done}} + {{#notNull permissionTemplates}} +
+ + +
+ {{else}} + + {{/notNull}} + {{/unless}}
- {{#notNull permissionTemplates}} - - {{/notNull}} - Cancel + {{#unless done}} + {{#notNull permissionTemplates}} + + {{/notNull}} + {{/unless}} + Close
diff --git a/server/sonar-web/src/main/js/apps/permissions/project/views/ApplyTemplateView.js b/server/sonar-web/src/main/js/apps/permissions/project/views/ApplyTemplateView.js index 6aa2537c3f6..14817206db7 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/views/ApplyTemplateView.js +++ b/server/sonar-web/src/main/js/apps/permissions/project/views/ApplyTemplateView.js @@ -29,6 +29,7 @@ export default ModalForm.extend({ initialize () { this.loadPermissionTemplates(); + this.done = false; }, loadPermissionTemplates () { @@ -56,7 +57,8 @@ export default ModalForm.extend({ templateId: permissionTemplate }).then(() => { this.trigger('done'); - this.destroy(); + this.done = true; + this.render(); }).catch(function (e) { e.response.json().then(r => { this.showErrors(r.errors, r.warnings); @@ -68,7 +70,8 @@ export default ModalForm.extend({ serializeData () { return { permissionTemplates: this.permissionTemplates, - project: this.options.project + project: this.options.project, + done: this.done }; } }); diff --git a/server/sonar-web/src/main/js/apps/projects/header.js b/server/sonar-web/src/main/js/apps/projects/header.js index eb11aceb0c2..1d4200e3aa5 100644 --- a/server/sonar-web/src/main/js/apps/projects/header.js +++ b/server/sonar-web/src/main/js/apps/projects/header.js @@ -19,34 +19,65 @@ */ import React from 'react'; import CreateView from './create-view'; +import BulkApplyTemplateView from './views/BulkApplyTemplateView'; -export default React.createClass({ - propTypes: { +export default class Header extends React.Component { + static propTypes = { hasProvisionPermission: React.PropTypes.bool.isRequired - }, + }; - createProject() { + createProject () { new CreateView({ refresh: this.props.refresh }).render(); - }, + } + + bulkApplyTemplate () { + new BulkApplyTemplateView({ + total: this.props.total, + selection: this.props.selection, + query: this.props.query, + qualifier: this.props.qualifier + }).render(); + } - renderCreateButton() { + renderCreateButton () { if (!this.props.hasProvisionPermission) { return null; } - return ; - }, + return ( +
  • + +
    • + ); + } + + renderBulkApplyTemplateButton () { + return ( +
  • + +
    • + ); + } - render() { + render () { return (

    Projects Management

    -
    {this.renderCreateButton()}
    +
    +
      + {this.renderCreateButton()} + {this.renderBulkApplyTemplateButton()} +
    +

    Use this page to delete multiple projects at once, or to provision projects if you would like to configure them before the first analysis. Note that once a project is provisioned, you have access to perform all project configurations on it.

    ); } -}); +} diff --git a/server/sonar-web/src/main/js/apps/projects/main.js b/server/sonar-web/src/main/js/apps/projects/main.js index adfc332c8d1..900cfba2502 100644 --- a/server/sonar-web/src/main/js/apps/projects/main.js +++ b/server/sonar-web/src/main/js/apps/projects/main.js @@ -23,7 +23,12 @@ import Header from './header'; import Search from './search'; import Projects from './projects'; import { PAGE_SIZE, TYPE } from './constants'; -import { getComponents, getProvisioned, getGhosts, deleteComponents } from '../../api/components'; +import { + getComponents, + getProvisioned, + getGhosts, + deleteComponents +} from '../../api/components'; import ListFooter from '../../components/controls/ListFooter'; export default React.createClass({ @@ -77,7 +82,7 @@ export default React.createClass({ break; default: - // should never happen + // should never happen } }, @@ -120,7 +125,8 @@ export default React.createClass({ }, loadMore() { - this.setState({ ready: false, page: this.state.page + 1 }, this.requestProjects); + this.setState({ ready: false, page: this.state.page + 1 }, + this.requestProjects); }, onSearch(query) { @@ -187,6 +193,10 @@ export default React.createClass({
    @@ -50,25 +67,51 @@ export default React.createClass({ checked={this.isProjectSelected(project)} onCheck={this.onProjectCheck.bind(this, project)}/> - - - - {project.name} + + + {' '} + {project.name} + {project.key} + + + ); - }, + } + + render () { + const className = classNames('data', 'zebra', + { 'new-loading': !this.props.ready } + ); - render() { - const className = classNames('data', 'zebra', { 'new-loading': !this.props.ready }); return ( {this.props.projects.map(this.renderProject)}
    ); } -}); +} diff --git a/server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs b/server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs new file mode 100644 index 00000000000..b4933eb193c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs @@ -0,0 +1,68 @@ +
    +
    +

    Bulk Apply Permission Template

    +
    + +
    +
    + + {{#if done}} +
    + {{t 'projects_role.apply_template.success'}} +
    + {{/if}} + + {{#unless done}} + {{#notNull permissionTemplates}} +
    + + +
    + {{else}} + + {{/notNull}} + + +
    + +
      + {{#if selectionTotal}} +
    • + + +
      • + {{/if}} +
    • + + +
      • +
    +
    + {{/unless}} +
    + +
    + {{#unless done}} + {{#notNull permissionTemplates}} + + {{/notNull}} + {{/unless}} + Close +
    +
    diff --git a/server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js b/server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js new file mode 100644 index 00000000000..d2fc1aba72e --- /dev/null +++ b/server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js @@ -0,0 +1,108 @@ +/* + * 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 ModalForm from '../../../components/common/modal-form'; +import { + applyTemplateToProject, + bulkApplyTemplate, + getPermissionTemplates +} from '../../../api/permissions'; +import Template from '../templates/BulkApplyTemplateTemplate.hbs'; + +export default ModalForm.extend({ + template: Template, + + initialize () { + this.loadPermissionTemplates(); + this.done = false; + }, + + loadPermissionTemplates () { + return getPermissionTemplates().then(r => { + this.permissionTemplates = r.permissionTemplates; + this.render(); + }); + }, + + onRender () { + ModalForm.prototype.onRender.apply(this, arguments); + this.$('#project-permissions-template').select2({ + width: '250px', + minimumResultsForSearch: 20 + }); + }, + + bulkApplyToAll (permissionTemplate) { + const data = { templateId: permissionTemplate }; + + if (this.options.query) { + data.q = this.options.query; + } + + if (this.options.qualifier) { + data.qualifier = this.options.qualifier; + } + + return bulkApplyTemplate(data); + }, + + bulkApplyToSelected(permissionTemplate) { + const { selection } = this.options; + let lastRequest = Promise.resolve(); + + selection.forEach(projectId => { + const data = { templateId: permissionTemplate, projectId }; + lastRequest = lastRequest.then(() => applyTemplateToProject(data)); + }); + + return lastRequest; + }, + + onFormSubmit () { + ModalForm.prototype.onFormSubmit.apply(this, arguments); + const permissionTemplate = this.$('#project-permissions-template').val(); + const applyTo = this.$('[name="apply-to"]:checked').val(); + this.disableForm(); + + const request = applyTo === 'all' ? + this.bulkApplyToAll(permissionTemplate) : + this.bulkApplyToSelected(permissionTemplate); + + request.then(() => { + this.trigger('done'); + this.done = true; + this.render(); + }).catch(function (e) { + e.response.json().then(r => { + this.showErrors(r.errors, r.warnings); + this.enableForm(); + }); + }); + }, + + serializeData () { + return { + permissionTemplates: this.permissionTemplates, + selection: this.options.selection, + selectionTotal: this.options.selection.length, + total: this.options.total, + done: this.done + }; + } +}); diff --git a/server/sonar-web/src/main/js/helpers/urls.js b/server/sonar-web/src/main/js/helpers/urls.js index 17c424ab9e7..ef25fe9a952 100644 --- a/server/sonar-web/src/main/js/helpers/urls.js +++ b/server/sonar-web/src/main/js/helpers/urls.js @@ -84,6 +84,15 @@ export function getComponentDashboardManagementUrl (componentKey) { return window.baseUrl + '/dashboards?resource=' + encodeURIComponent(componentKey); } +/** + * Generate URL for a component's permissions page + * @param {string} componentKey + * @returns {string} + */ +export function getComponentPermissionsUrl (componentKey) { + return window.baseUrl + '/project_roles?id=' + encodeURIComponent(componentKey); +} + /** * Generate URL for a quality profile * @param {string} key 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 c8257a3b8c4..824ffab5078 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -207,6 +207,7 @@ added_since_previous_version_detailed=Added since previous version ({0}) added_since_version=Added since version {0} all_violations=All violations all_issues=All issues +apply_template are_you_sure=Are you sure? assigned_to=Assigned to bulk_change=Bulk Change @@ -221,6 +222,7 @@ default_error_message=The request cannot be processed. Try again later. default_severity=Default severity default_sort_on=Default sort on disable_treemap=Disable treemap +edit_permissions=Edit Permissions enable_treemap=Enable treemap equals=Equals false_positive=False positive @@ -2695,6 +2697,7 @@ projects_role.scan.desc=Ability to get all settings required to perform an analy projects_role.bulk_change=Bulk Change projects_role.apply_template=Apply Permission Template projects_role.apply_template_to_xxx=Apply Permission Template To "{0}" +projects_role.apply_template.success=Permission template was successfully applied. projects_role.no_projects=There are currently no results to apply the permission template to. -- 2.39.5