Moved delete folder into facade hook

grafana · aocenas · Aug 6, 2025 · Jun 18, 2025 · Jun 19, 2025 · Jun 19, 2025
commit 449a2a24ad414d7e4edc02c29e0988c71426407e
@@ -1,7 +1,12 @@
 import { QueryStatus, skipToken } from '@reduxjs/toolkit/query';
 
-import { config } from '@grafana/runtime';
-import { useGetFolderQuery as useGetFolderQueryLegacy } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
+import { AppEvents } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { config, getAppEvents } from '@grafana/runtime';
+import {
+  useDeleteFolderMutation as useDeleteFolderMutationLegacy,
+  useGetFolderQuery as useGetFolderQueryLegacy,
+} from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { FolderDTO } from 'app/types/folders';
 
 import kbn from '../../../../core/utils/kbn';
@@ -14,12 +19,15 @@ import {
   DeprecatedInternalId,
   ManagerKind,
 } from '../../../../features/apiserver/types';
+import { PAGE_SIZE } from '../../../../features/browse-dashboards/api/services';
+import { refetchChildren } from '../../../../features/browse-dashboards/state/actions';
 import { GENERAL_FOLDER_UID } from '../../../../features/search/constants';
+import { useDispatch } from '../../../../types/store';
 import { useGetDisplayMappingQuery } from '../../iam/v0alpha1';
 
 import { rootFolder, sharedWithMeFolder } from './virtualFolders';
 
-import { useGetFolderQuery, useGetFolderParentsQuery } from './index';
+import { useGetFolderQuery, useGetFolderParentsQuery, useDeleteFolderMutation } from './index';
 
 function getFolderUrl(uid: string, title: string): string {
   // mimics https://github.com/grafana/grafana/blob/79fe8a9902335c7a28af30e467b904a4ccfac503/pkg/services/dashboards/models.go#L188
@@ -150,6 +158,38 @@ export function useGetFolderQueryFacade(uid?: string) {
   };
 }
 
+export function useDeleteFolderMutationFacade() {
+  const [deleteFolder] = useDeleteFolderMutation();
+  const [deleteFolderLegacy] = useDeleteFolderMutationLegacy();
+  const dispatch = useDispatch();
+
+  return async (folder: FolderDTO) => {
+    if (config.featureToggles.foldersAppPlatformAPI) {
+      const result = await deleteFolder({ name: folder.uid });
+      if (!result.error) {
+        // We need to update a legacy version of the folder storage for now until all is in the new API.
+        // we could do it in the enhanceEndpoint method but we would also need to change the args as we need parentUID
+        // here and so it seemed easier to do it here.
+        dispatch(
+          refetchChildren({
+            parentUID: folder.parentUid || GENERAL_FOLDER_UID,
+            pageSize: PAGE_SIZE,
+          })
+        );
+        // Before this was done in backend srv automatically because the old API sent a message wiht 200 request. see
+        // public/app/core/services/backend_srv.ts#L341-L361. New API does not do that so we do it here.
+        getAppEvents().publish({
+          type: AppEvents.alertSuccess.name,
+          payload: [t('folders.api.folder-deleted-success', 'Folder deleted')],
+        });
+      }
+      return result;
+    } else {
+      return deleteFolderLegacy(folder);
+    }
+  };
+}
+
 function combinedState(
   result: ReturnType<typeof useGetFolderQuery>,
   resultParents: ReturnType<typeof useGetFolderParentsQuery>,

@@ -1,28 +1,8 @@
-import { PAGE_SIZE } from '../../../../features/browse-dashboards/api/services';
-import { refetchChildren } from '../../../../features/browse-dashboards/state/actions';
-import { GENERAL_FOLDER_UID } from '../../../../features/search/constants';
-
 import { generatedAPI } from './endpoints.gen';
 
-export const folderAPIv1beta1 = generatedAPI.enhanceEndpoints({
-  endpoints: {
-    deleteFolder: {
-      onQueryStarted: (args, { queryFulfilled, dispatch }) => {
-        // Refetch for anything using the old API.
-        queryFulfilled.then(() => {
-          dispatch(
-            refetchChildren({
-              parentUID: GENERAL_FOLDER_UID,
-              pageSize: PAGE_SIZE,
-            })
-          );
-        });
-      },
-    },
-  },
-});
+export const folderAPIv1beta1 = generatedAPI.enhanceEndpoints({});
 
-export const { useGetFolderQuery, useGetFolderParentsQuery, useGetFolderAccessQuery } = folderAPIv1beta1;
+export const { useGetFolderQuery, useGetFolderParentsQuery, useDeleteFolderMutation } = folderAPIv1beta1;
 
 // eslint-disable-next-line no-barrel-files/no-barrel-files
 export { type Folder, type FolderList } from './endpoints.gen';
@@ -4,14 +4,14 @@ import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { config, locationService, reportInteraction } from '@grafana/runtime';
 import { Button, Drawer, Dropdown, Icon, Menu, MenuItem } from '@grafana/ui';
-import { folderAPIv1beta1 } from 'app/api/clients/folder/v1beta1';
 import { Permissions } from 'app/core/components/AccessControl';
 import { appEvents } from 'app/core/core';
 import { ShowModalReactEvent } from 'app/types/events';
 import { FolderDTO } from 'app/types/folders';
 
+import { useDeleteFolderMutationFacade } from '../../../api/clients/folder/v1beta1/hooks';
 import { ManagerKind } from '../../apiserver/types';
-import { useDeleteFolderMutation, useMoveFolderMutation } from '../api/browseDashboardsAPI';
+import { useMoveFolderMutation } from '../api/browseDashboardsAPI';
 import { getFolderPermissions } from '../permissions';
 
 import { DeleteModal } from './BrowseActions/DeleteModal';
@@ -28,8 +28,7 @@ export function FolderActionsButton({ folder }: Props) {
   const [showDeleteProvisionedFolderDrawer, setShowDeleteProvisionedFolderDrawer] = useState(false);
   const [moveFolder] = useMoveFolderMutation();
 
-  const [deleteFolderAppPlatform] = folderAPIv1beta1.useDeleteFolderMutation();
-  const [deleteFolderLegacy] = useDeleteFolderMutation();
+  const deleteFolder = useDeleteFolderMutationFacade();
 
   const { canEditFolders, canDeleteFolders, canViewPermissions, canSetPermissions } = getFolderPermissions(folder);
   const isProvisionedFolder = folder.managedBy === ManagerKind.Repo;
@@ -48,9 +47,7 @@ export function FolderActionsButton({ folder }: Props) {
   };
 
   const onDelete = async () => {
-    const result = await (config.featureToggles.foldersAppPlatformAPI
-      ? deleteFolderAppPlatform({ name: folder.uid })
-      : deleteFolderLegacy(folder));
+    const result = await deleteFolder(folder);
 
     if (result.error) {
       appEvents.publish({

diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
@@ -7434,6 +7434,9 @@
     "badge-text": "Provisioned"
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": "Folder deleted"
+    },
     "get-loading-nav": {
       "main": {
         "title": {