public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PanelLinks: fixed issue with old panel links and grafana behind a subpath (#20298)

Browse Source 
(cherry picked from commit 6f3f0bf3e0)
This commit is contained in:
Torkel Ödegaard
2019-11-14 08:33:19 -05:00
committed by Kyle Brandt
parent 7b517bcb10
commit d6f352cdf5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/state/DashboardMigrator.test.ts
+1 -1
View File
@@ -438,7 +438,7 @@ describe('DashboardModel', () => {
});
it('should slugify dashboard name', () => {
expect(model.panels[0].links[3].url).toBe(`/dashboard/db/my-other-dashboard`);
expect(model.panels[0].links[3].url).toBe(`dashboard/db/my-other-dashboard`);
});
});
public/app/features/dashboard/state/DashboardMigrator.ts
+2 -2
View File
@@ -685,11 +685,11 @@ function upgradePanelLink(link: any): DataLink {
let url = link.url;
if (!url && link.dashboard) {
url = `/dashboard/db/${kbn.slugifyForUrl(link.dashboard)}`;
url = `dashboard/db/${kbn.slugifyForUrl(link.dashboard)}`;
}
if (!url && link.dashUri) {
url = `/dashboard/${link.dashUri}`;
url = `dashboard/${link.dashUri}`;
}
// some models are incomplete and have no dashboard or dashUri