From 65a6eda93b82913e37602ade39b16b185dd0ce3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 30 Aug 2019 15:23:38 +0200 Subject: [PATCH] DashboardMigrator: Fixed issue migrating incomplete panel link models (#18786) --- .../app/features/dashboard/state/DashboardMigrator.test.ts | 4 ++++ public/app/features/dashboard/state/DashboardMigrator.ts | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts index fedc4e17fd2..c1764522d32 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.test.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts @@ -415,6 +415,10 @@ describe('DashboardModel', () => { dashUri: '', title: 'test', }, + { + type: 'dashboard', + keepTime: true, + }, ], }, ], diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts index e7811c6dcff..c57d75ab754 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.ts @@ -643,6 +643,11 @@ function upgradePanelLink(link: any): DataLink { url = `/dashboard/${link.dashUri}`; } + // some models are incomplete and have no dashboard or dashUri + if (!url) { + url = '/'; + } + if (link.keepTime) { url = appendQueryToUrl(url, `$${DataLinkBuiltInVars.keepTime}`); }