From dc76cc1a26177ddf764c5f7418c7976566f10191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Tue, 17 Mar 2020 13:28:14 +0100 Subject: [PATCH] Variables: fixes so order in list is preserved after save (#22805) --- public/app/features/dashboard/state/DashboardModel.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts index 04042daa77d..3bafdefbc43 100644 --- a/public/app/features/dashboard/state/DashboardModel.ts +++ b/public/app/features/dashboard/state/DashboardModel.ts @@ -15,7 +15,7 @@ import { UrlQueryValue } from '@grafana/runtime'; import { CoreEvents, DashboardMeta, KIOSK_MODE_TV } from 'app/types'; import { VariableModel } from '../../templating/variable'; import { getConfig } from '../../../core/config'; -import { getVariables } from 'app/features/variables/state/selectors'; +import { getVariableClones, getVariables } from 'app/features/variables/state/selectors'; import { variableAdapters } from 'app/features/variables/adapters'; export interface CloneOptions { @@ -241,7 +241,7 @@ export class DashboardModel { defaults: { saveTimerange: boolean; saveVariables: boolean } & CloneOptions ) { const originalVariables = this.variables.list; - const currentVariables = getVariables(); + const currentVariables = getVariableClones(); copy.variables = { list: currentVariables.map(variable => variableAdapters.get(variable.type).getSaveModel(variable)),