From 7e3b43eabb64da1b2f529cfe8d61229daa0b8a74 Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peterholmberg@users.noreply.github.com>
Date: Sat, 4 Apr 2020 14:55:41 +0200
Subject: [PATCH] Dashboard: Save json should preserve folderId (#23314)

---
 public/app/features/dashboard/services/DashboardSrv.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index b066b88ba8d..3ba67385410 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -79,7 +79,10 @@ export class DashboardSrv {
   };
 
   saveJSONDashboard(json: string) {
-    return getBackendSrv().saveDashboard(JSON.parse(json), {});
+    const parsedJson = JSON.parse(json);
+    return getBackendSrv().saveDashboard(parsedJson, {
+      folderId: this.dashboard.meta.folderId || parsedJson.folderId,
+    });
   }
 
   starDashboard(dashboardId: string, isStarred: any) {