From a67ed6fe5638dc2b5e44e3d82370583173901a5a Mon Sep 17 00:00:00 2001 From: Victor Marin <36818606+mdvictor@users.noreply.github.com> Date: Mon, 18 Aug 2025 17:03:15 +0300 Subject: [PATCH] [release-11.6.6] Dashboard: Resume tracking changes after save from JSON model page (#109794) Dashboard: Resume tracking changes after save from JSON model page (#109607) (cherry picked from commit e285cc2ddcd690b931983c6aa2ac57dd1ada1f5b) Co-authored-by: Bogdan Matei --- .../features/dashboard-scene/settings/JsonModelEditView.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx index c1a4b3edeea..16a5996ec47 100644 --- a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx +++ b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx @@ -70,13 +70,16 @@ export class JsonModelEditView extends SceneObjectBase i meta: dashboard.state.meta, }; const newDashboardScene = transformSaveModelToScene(rsp); - const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state); + const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state, { key: dashboard.state.key }); dashboard.pauseTrackingChanges(); dashboard.setInitialSaveModel(rsp.dashboard); dashboard.setState(newState); this.setState({ jsonText: this.getJsonText() }); + + // We also need to resume tracking changes since the change handler won't see any later edit + dashboard.resumeTrackingChanges(); }; static Component = ({ model }: SceneComponentProps) => {