Alerting: Prevent folders from being deleted when they contain alerts (#42307)

pull/42428/head
Peter Holmberg 4 years ago committed by GitHub
parent a65e0be110
commit 8692f574c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      public/app/features/folders/state/actions.ts
  2. 6
      public/app/features/manage-dashboards/state/actions.ts

@ -30,8 +30,8 @@ export function saveFolder(folder: FolderState): ThunkResult<void> {
} }
export function deleteFolder(uid: string): ThunkResult<void> { export function deleteFolder(uid: string): ThunkResult<void> {
return async (dispatch) => { return async () => {
await backendSrv.delete(`/api/folders/${uid}?forceDeleteRules=true`); await backendSrv.delete(`/api/folders/${uid}?forceDeleteRules=false`);
locationService.push('/dashboards'); locationService.push('/dashboards');
}; };
} }

@ -277,8 +277,8 @@ export function saveDashboard(options: SaveDashboardOptions) {
function deleteFolder(uid: string, showSuccessAlert: boolean) { function deleteFolder(uid: string, showSuccessAlert: boolean) {
return getBackendSrv().request({ return getBackendSrv().request({
method: 'DELETE', method: 'DELETE',
url: `/api/folders/${uid}?forceDeleteRules=true`, url: `/api/folders/${uid}?forceDeleteRules=false`,
showSuccessAlert: showSuccessAlert === true, showSuccessAlert: showSuccessAlert,
}); });
} }
@ -298,7 +298,7 @@ export function deleteDashboard(uid: string, showSuccessAlert: boolean) {
return getBackendSrv().request({ return getBackendSrv().request({
method: 'DELETE', method: 'DELETE',
url: `/api/dashboards/uid/${uid}`, url: `/api/dashboards/uid/${uid}`,
showSuccessAlert: showSuccessAlert === true, showSuccessAlert: showSuccessAlert,
}); });
} }

Loading…
Cancel
Save