From 1f35bc83469811350c98591cec0b0742cd072089 Mon Sep 17 00:00:00 2001
From: Laura Benz <48948963+L-M-K-B@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:13:48 +0200
Subject: [PATCH] RestoreDashboards: Make confirmation text consistent (#92388)

* refactor: change wording

* refactor: change API

* refactor: clean up
---
 pkg/api/dashboard.go                                 |  2 +-
 .../DeleteDashboard/DeleteDashboardModal.tsx         | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index df13025462d..6f1b9820784 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -370,7 +370,7 @@ func (hs *HTTPServer) SoftDeleteDashboard(c *contextmodel.ReqContext) response.R
 
 	return response.JSON(http.StatusOK, util.DynMap{
 		"title":   dash.Title,
-		"message": fmt.Sprintf("Dashboard %s moved to trash", dash.Title),
+		"message": fmt.Sprintf("Dashboard %s moved to Recently deleted", dash.Title),
 		"uid":     dash.UID,
 	})
 }
diff --git a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
index acc8cc1e12a..fd265a3c0b6 100644
--- a/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
+++ b/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
@@ -6,9 +6,9 @@ import { locationService, config, reportInteraction } from '@grafana/runtime';
 import { Modal, ConfirmModal, Button, Text, Space, TextLink } from '@grafana/ui';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { cleanUpDashboardAndVariables } from 'app/features/dashboard/state/actions';
-import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
 
 import { Trans, t } from '../../../../core/internationalization';
+import { useDeleteItemsMutation } from '../../../browse-dashboards/api/browseDashboardsAPI';
 
 type DeleteDashboardModalProps = {
   hideModal(): void;
@@ -25,6 +25,7 @@ type Props = DeleteDashboardModalProps & ConnectedProps<typeof connector>;
 
 const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariables, dashboard }: Props) => {
   const isProvisioned = dashboard.meta.provisioned;
+  const [deleteItems] = useDeleteItemsMutation();
 
   const [, onConfirm] = useAsyncFn(async () => {
     reportInteraction('grafana_manage_dashboards_delete_clicked', {
@@ -34,7 +35,14 @@ const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariabl
       source: 'dashboard_settings',
       restore_enabled: config.featureToggles.dashboardRestoreUI,
     });
-    await deleteDashboard(dashboard.uid, true);
+    await deleteItems({
+      selectedItems: {
+        dashboard: {
+          [dashboard.uid]: true,
+        },
+        folder: {},
+      },
+    });
     cleanUpDashboardAndVariables();
     hideModal();
     locationService.replace('/');