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

Fix: playlist now preserve the correct url query params (#16403)

Browse Source 
Fixes #16377
This commit is contained in:
Torkel Ödegaard 2019-04-05 11:09:57 +02:00 committed by GitHub
parent 173e7fd839
commit 6d3b6f3c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/playlist/playlist_srv.ts
View File

@ -9,6 +9,12 @@ import locationUtil from 'app/core/utils/location_util';
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
import { store } from 'app/store/store'; import { store } from 'app/store/store';
export const queryParamsToPreserve: { [key: string]: boolean } = {
kiosk: true,
autofitpanels: true,
orgId: true,
};
export class PlaylistSrv { export class PlaylistSrv {
private cancelPromise: any; private cancelPromise: any;
private dashboards: Array<{ url: string }>; private dashboards: Array<{ url: string }>;
@ -41,9 +47,7 @@ export class PlaylistSrv {
const dash = this.dashboards[this.index]; const dash = this.dashboards[this.index];
const queryParams = this.$location.search(); const queryParams = this.$location.search();
const filteredParams = _.pickBy(queryParams, key => { const filteredParams = _.pickBy(queryParams, (value: any, key: string) => queryParamsToPreserve[key]);
return key === 'kiosk' || key === 'autofitpanels' || key === 'orgId';
});
const nextDashboardUrl = locationUtil.stripBaseFromUrl(dash.url); const nextDashboardUrl = locationUtil.stripBaseFromUrl(dash.url);
// this is done inside timeout to make sure digest happens after // this is done inside timeout to make sure digest happens after