Merge pull request #477 from ifpen/475-wrong-dashboard-rendering-at-r…

…untime assignValueChangeHandlers needs "constants" datanodes processed
ifpen · Dec 16, 2024 · 6bd8a2a · 6bd8a2a
2 parents dfba73e + 2d89554
commit 6bd8a2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/front-end/source/angular/modules/dashboard/services/edit-play-switch.js b/front-end/source/angular/modules/dashboard/services/edit-play-switch.js
@@ -15,6 +15,7 @@ export function showPlayMode() {
     const { dashboard, display, pages } = editorSingletons.widgetEditor.serialize();
     widgetViewer.reset();
     widgetViewer.deserialize({ dashboard, display, pages, connections: {} });
+    widgetViewer.assignValueChangeHandlers();
   } catch (e) {
     console.error(e);
     // FIXME ?

diff --git a/front-end/source/kernel/base/xdash-main.js b/front-end/source/kernel/base/xdash-main.js
@@ -190,6 +190,7 @@ export const Xdash = function () {
       htmlExport.navBarNotification = jsonObject.navBarNotification ?? false;
 
       datanodesManager.startScheduler();
+      widgetViewer.assignValueChangeHandlers();
 
       return true;
     } catch (ex) {

diff --git a/front-end/source/kernel/dashboard/rendering/widget-viewer.js b/front-end/source/kernel/dashboard/rendering/widget-viewer.js
@@ -154,11 +154,6 @@ class WidgetWiewer {
     for (const [instanceId, desc] of Object.entries(dashboard)) {
       this.#createWidget(desc.container.modelJsonId, instanceId, desc.layout);
     }
-
-    // assign change value handlers
-    if (datanodesManager.getAllDataNodes().length != 0) {
-      this.assignValueChangeHandlers();
-    }
   }
 
   reRenderWidget(instanceId) {

diff --git a/front-end/source/kernel/runtime/xdash-runtime-main.js b/front-end/source/kernel/runtime/xdash-runtime-main.js
@@ -194,6 +194,11 @@ export function loadDashboard(jsonContent) {
     widgetViewer.deserialize(jsonContent);
 
     datanodesManager.startScheduler();
+
+    // Not done during deserialize as we need startScheduler to be done.
+    // Specificaly, datanodes with "constant" values (en short, json variables) must be marked evaluated
+    // so that widgets can read a value instead of setting a default one.
+    widgetViewer.assignValueChangeHandlers();
   };
 
   // Main logic begins here