From c3599d9236a6309143dd26dae464e6ccafa61323 Mon Sep 17 00:00:00 2001 From: Karl Persson <23356117+kalleep@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:46:26 +0100 Subject: [PATCH] Dashboards: Use uid instead of id to determine if dashboard exists or not (#99890) Use uid instead of id to determine if dashboard exists or not --- public/app/features/dashboard-scene/settings/utils.ts | 4 ++-- .../components/DashboardSettings/DashboardSettings.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashboard-scene/settings/utils.ts b/public/app/features/dashboard-scene/settings/utils.ts index d726085c7b3..88a3be11ad6 100644 --- a/public/app/features/dashboard-scene/settings/utils.ts +++ b/public/app/features/dashboard-scene/settings/utils.ts @@ -64,7 +64,7 @@ export function useDashboardEditPageNav(dashboard: DashboardScene, currentEditVi }); } - if (dashboard.state.id && dashboard.state.meta.canSave) { + if (dashboard.state.uid && dashboard.state.meta.canSave) { pageNav.children!.push({ text: t('dashboard-settings.versions.title', 'Versions'), url: locationUtil.getUrlForPartial(location, { editview: 'versions', editIndex: null }), @@ -72,7 +72,7 @@ export function useDashboardEditPageNav(dashboard: DashboardScene, currentEditVi }); } - if (dashboard.state.id && dashboard.state.meta.canAdmin) { + if (dashboard.state.uid && dashboard.state.meta.canAdmin) { if (contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsRead)) { pageNav.children!.push({ text: t('dashboard-settings.permissions.title', 'Permissions'), diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx index adb6af01c37..e940de38441 100644 --- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx +++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx @@ -134,7 +134,7 @@ function getSettingsPages(dashboard: DashboardModel) { }); } - if (dashboard.id && dashboard.meta.canSave) { + if (dashboard.uid && dashboard.meta.canSave) { pages.push({ title: t('dashboard-settings.versions.title', 'Versions'), id: 'versions', @@ -145,7 +145,7 @@ function getSettingsPages(dashboard: DashboardModel) { const permissionsTitle = t('dashboard-settings.permissions.title', 'Permissions'); - if (dashboard.id && dashboard.meta.canAdmin) { + if (dashboard.uid && dashboard.meta.canAdmin) { if (contextSrv.hasPermission(AccessControlAction.DashboardsPermissionsRead)) { pages.push({ title: permissionsTitle,