delete portfolios with api/views/delete

diff --git a/server/sonar-web/src/main/js/api/components.ts b/server/sonar-web/src/main/js/api/components.ts
index 42e3b05ea6ea2cf6f230dcdd8423c8821276ed4d..2d03c4f0db44cb983e03af012f81d57bdf0d5999 100644 (file)
--- a/server/sonar-web/src/main/js/api/components.ts
+++ b/server/sonar-web/src/main/js/api/components.ts
@@ -61,8 +61,12 @@ export function bulkDeleteProjects(parameters: BaseSearchProjectsParameters): Pr
   return post('/api/projects/bulk_delete', parameters);
 }
 
-export function deleteProject(project: string): Promise<void> {
-  return post('/api/projects/delete', { project });
+export function deleteProject(project: string): Promise<void | Response> {
+  return post('/api/projects/delete', { project }).catch(throwGlobalError);
+}
+
+export function deletePortfolio(portfolio: string): Promise<void | Response> {
+  return post('/api/views/delete', { key: portfolio }).catch(throwGlobalError);
 }
 
 export function createProject(data: {

diff --git a/server/sonar-web/src/main/js/apps/project-admin/deletion/Form.js b/server/sonar-web/src/main/js/apps/project-admin/deletion/Form.js
index e07afba43c5915c279418cdafdc771fcb976afda..c2dd276e85b8881af5a3e125c1473a183c163524 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-admin/deletion/Form.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/deletion/Form.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Modal from 'react-modal';
-import { deleteProject } from '../../../api/components';
+import { deleteProject, deletePortfolio } from '../../../api/components';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 
 export default class Form extends React.PureComponent {
@@ -58,7 +58,9 @@ export default class Form extends React.PureComponent {
   handleSubmit = event => {
     event.preventDefault();
     this.setState({ loading: true });
-    deleteProject(this.props.component.key)
+    const { component } = this.props;
+    const deleteMethod = component.qualifier === 'TRK' ? deleteProject : deletePortfolio;
+    deleteMethod(component.key)
       .then(() => this.context.router.replace('/'))
       .catch(this.stopLoading);
   };