From 3a469f6ca25fa7bb56c58f9921dfe02e82df4d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 25 May 2020 13:33:44 +0200
Subject: [PATCH] MoveDashboard: Fix for moving dashboard caused all variables
 to be lost (#25005)

* MoveDashboard: Fix moving caused all variables to be lost

* fix typescript issue
---
 public/app/core/services/backend_srv.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index e99cd1ee8bf..3acab6ed56d 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -6,10 +6,9 @@ import { AppEvents } from '@grafana/data';
 
 import appEvents from 'app/core/app_events';
 import config from 'app/core/config';
-import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { DataSourceResponse } from 'app/types/events';
 import { DashboardSearchHit } from 'app/features/search/types';
-import { CoreEvents, DashboardDTO, FolderInfo } from 'app/types';
+import { CoreEvents, DashboardDTO, FolderInfo, DashboardDataDTO } from 'app/types';
 import { coreModule } from 'app/core/core_module';
 import { ContextSrv, contextSrv } from './context_srv';
 import { Emitter } from '../utils/emitter';
@@ -260,11 +259,11 @@ export class BackendSrv implements BackendService {
   }
 
   saveDashboard(
-    dash: DashboardModel,
+    dashboard: DashboardDataDTO,
     { message = '', folderId, overwrite = false }: { message?: string; folderId?: number; overwrite?: boolean } = {}
   ) {
     return this.post('/api/dashboards/db/', {
-      dashboard: dash,
+      dashboard,
       folderId,
       overwrite,
       message,
@@ -319,13 +318,12 @@ export class BackendSrv implements BackendService {
 
   private async moveDashboard(uid: string, toFolder: FolderInfo) {
     const fullDash: DashboardDTO = await this.getDashboardByUid(uid);
-    const model = new DashboardModel(fullDash.dashboard, fullDash.meta);
 
     if ((!fullDash.meta.folderId && toFolder.id === 0) || fullDash.meta.folderId === toFolder.id) {
       return { alreadyInFolder: true };
     }
 
-    const clone = model.getSaveModelClone();
+    const clone = fullDash.dashboard;
     const options = {
       folderId: toFolder.id,
       overwrite: false,