From 66dddb415e2b7eb89b9ba6e2a9594e4a9277decd Mon Sep 17 00:00:00 2001 From: Alex Khomenko Date: Thu, 9 Oct 2025 15:20:02 +0200 Subject: [PATCH] Restore dashboards: Update delete modal text (#112148) * Restore dashboards: Update delete modal text * Update subheader --- public/app/core/utils/navBarItem-translations.ts | 2 +- .../components/BrowseActions/DeleteModal.tsx | 7 ++++--- public/locales/en-US/grafana.json | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/app/core/utils/navBarItem-translations.ts b/public/app/core/utils/navBarItem-translations.ts index 80f1d36aa34..0fab359de4e 100644 --- a/public/app/core/utils/navBarItem-translations.ts +++ b/public/app/core/utils/navBarItem-translations.ts @@ -220,7 +220,7 @@ export function getNavSubTitle(navId: string | undefined) { case 'dashboards/recently-deleted': return t( 'nav.recently-deleted.subtitle', - 'Any items listed here for more than 30 days will be automatically deleted.' + 'Deleted dashboards are kept for up to 12 months or until the history limit of 1000 dashboards is reached.' ); case 'alerting': return t('nav.alerting.subtitle', 'Learn about problems in your systems moments after they occur'); diff --git a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx index bcd489477ad..be238108e7f 100644 --- a/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx +++ b/public/app/features/browse-dashboards/components/BrowseActions/DeleteModal.tsx @@ -48,9 +48,10 @@ export const DeleteModal = ({ onConfirm, onDismiss, selectedItems, ...props }: P <> - This action will delete the selected folders immediately but the selected dashboards will be marked - for deletion in 30 days. Your organization administrator can restore the dashboards anytime before the - 30 days expire. Folders cannot be restored. + This action will delete the selected folders immediately. Deleted dashboards will be kept in the + history for up to 12 months and can be restored by your organization administrator during that time. + The history is limited to 1000 dashboards — older ones may be removed sooner if the limit is reached. + Folders cannot be restored. diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index 009c3daf324..5f0f34d651d 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -3504,7 +3504,7 @@ "delete-button": "Delete", "delete-modal-invalid-text": "One or more folders contain library panels or alert rules. Delete these first in order to proceed.", "delete-modal-invalid-title": "Cannot delete folder", - "delete-modal-restore-dashboards-text": "This action will delete the selected folders immediately but the selected dashboards will be marked for deletion in 30 days. Your organization administrator can restore the dashboards anytime before the 30 days expire. Folders cannot be restored.", + "delete-modal-restore-dashboards-text": "This action will delete the selected folders immediately. Deleted dashboards will be kept in the history for up to 12 months and can be restored by your organization administrator during that time. The history is limited to 1000 dashboards — older ones may be removed sooner if the limit is reached. Folders cannot be restored.", "delete-modal-text": "This action will delete the following content:", "delete-modal-title": "Delete", "delete-provisioned-folder": "Delete provisioned folder", @@ -10368,7 +10368,7 @@ "title": "Profiles" }, "recently-deleted": { - "subtitle": "Any items listed here for more than 30 days will be automatically deleted.", + "subtitle": "Deleted dashboards are kept for up to 12 months or until the history limit of 1000 dashboards is reached.", "title": "Recently deleted" }, "recorded-queries": {