IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 8692f574c9)

Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot) 2021-11-29 09:59:17 -05:00 committed by GitHub
parent b25038df2e
commit cd17f65a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/folders/state/actions.ts
View File

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

6
public/app/features/manage-dashboards/state/actions.ts
View File

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