IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DashboardMigrator: Fixed issue migrating incomplete panel link models (#18786)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-08-30 15:23:38 +02:00 committed by GitHub
parent 8e9cb5c81a
commit 65a6eda93b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/dashboard/state/DashboardMigrator.test.ts
View File

@ -415,6 +415,10 @@ describe('DashboardModel', () => {
dashUri: '', dashUri: '',
title: 'test', title: 'test',
}, },
{
type: 'dashboard',
keepTime: true,
},
], ],
}, },
], ],

5
public/app/features/dashboard/state/DashboardMigrator.ts
View File

@ -643,6 +643,11 @@ function upgradePanelLink(link: any): DataLink {
url = `/dashboard/${link.dashUri}`; url = `/dashboard/${link.dashUri}`;
} }
// some models are incomplete and have no dashboard or dashUri
if (!url) {
url = '/';
}
if (link.keepTime) { if (link.keepTime) {
url = appendQueryToUrl(url, `$${DataLinkBuiltInVars.keepTime}`); url = appendQueryToUrl(url, `$${DataLinkBuiltInVars.keepTime}`);
} }