From cd17f65a05ba1bb82c0bd44a5470c5b1c5733161 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 29 Nov 2021 09:59:17 -0500
Subject: [PATCH] Alerting: Prevent folders from being deleted when they
 contain alerts (#42307) (#42439)

(cherry picked from commit 8692f574c98c6fdd847f58f3044aa9174ddaa2ac)

Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com>
---
 public/app/features/folders/state/actions.ts           | 4 ++--
 public/app/features/manage-dashboards/state/actions.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts
index 26d32b46bb7..5bdc51b2236 100644
--- a/public/app/features/folders/state/actions.ts
+++ b/public/app/features/folders/state/actions.ts
@@ -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');
   };
 }
diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts
index 7c1f977906d..c0bf60743e3 100644
--- a/public/app/features/manage-dashboards/state/actions.ts
+++ b/public/app/features/manage-dashboards/state/actions.ts
@@ -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,
   });
 }