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

Dashboard: removes variables property (#23107)

Browse Source
This commit is contained in:
Hugo Häggmark
2020-03-30 07:52:00 +02:00
committed by GitHub
parent 5307cfeabd
commit 3feb4e71c5
5 changed files with 20 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard/state/initDashboard.ts
View File

@@ -24,7 +24,6 @@ import { DashboardModel } from './DashboardModel';
import { DataQuery } from '@grafana/data';
import { getConfig } from '../../../core/config';
import { initDashboardTemplating, processVariables } from '../../variables/state/actions';
import { variableAdapters } from '../../variables/adapters';
import { emitDashboardViewEvent } from './analyticsProcessor';
export interface InitDashboardArgs {
@@ -186,11 +185,7 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
await variableSrv.init(dashboard);
}
if (getConfig().featureToggles.newVariables) {
const list =
dashboard.variables.list.length > 0
? dashboard.variables.list
: dashboard.templating.list.filter(v => variableAdapters.getIfExists(v.type));
await dispatch(initDashboardTemplating(list));
await dispatch(initDashboardTemplating(dashboard.templating.list));
await dispatch(processVariables());
}
} catch (err) {