From f8b0c49b9a2eea3f0838f4c0be3d50b7e4ec9c1a Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Fri, 16 Aug 2024 09:04:56 +0200
Subject: [PATCH] dashboard: CPU graph selection consistency

---
 src/opnsense/www/js/opnsense_widget_manager.js | 4 ++--
 src/opnsense/www/js/widgets/Cpu.js             | 5 +++--
 src/opnsense/www/js/widgets/Traffic.js         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/www/js/opnsense_widget_manager.js b/src/opnsense/www/js/opnsense_widget_manager.js
index 2f37a727f..a586eb1d2 100644
--- a/src/opnsense/www/js/opnsense_widget_manager.js
+++ b/src/opnsense/www/js/opnsense_widget_manager.js
@@ -665,7 +665,7 @@ class WidgetManager  {
             buttons: [{
                 label: this.gettext.ok,
                 hotkey: 13,
-                action: (dialog) => {
+                action: async (dialog) => {
                     let values = {};
                     for (const [key, value] of Object.entries(options)) {
                         switch (value.type) {
@@ -681,7 +681,7 @@ class WidgetManager  {
                     }
 
                     widget.setWidgetConfig(values);
-                    widget.onWidgetOptionsChanged(values);
+                    await widget.onWidgetOptionsChanged(values);
                     $('#save-grid').show();
                     dialog.close();
                 }
diff --git a/src/opnsense/www/js/widgets/Cpu.js b/src/opnsense/www/js/widgets/Cpu.js
index 617bad0d6..a6d847746 100644
--- a/src/opnsense/www/js/widgets/Cpu.js
+++ b/src/opnsense/www/js/widgets/Cpu.js
@@ -75,9 +75,10 @@ export default class Cpu extends BaseWidget {
         }
     }
 
-    onWidgetOptionsChanged(options) {
+    async onWidgetOptionsChanged(options) {
         this.graphs.filter(x => !options.graphs.includes(x)).forEach(graph => $(`#cpu-${graph}`).hide());
-        this.graphs = options.graphs;
+        const config = await this.getWidgetConfig();
+        this.graphs = config.graphs
         this.graphs.forEach(graph => $(`#cpu-${graph}`).show());
     }
 
diff --git a/src/opnsense/www/js/widgets/Traffic.js b/src/opnsense/www/js/widgets/Traffic.js
index e2c04e197..26e6a6b12 100644
--- a/src/opnsense/www/js/widgets/Traffic.js
+++ b/src/opnsense/www/js/widgets/Traffic.js
@@ -235,7 +235,7 @@ export default class Traffic extends BaseWidget {
         };
     }
 
-    onWidgetOptionsChanged(options) {
+    async onWidgetOptionsChanged(options) {
         this.configChanged = true;
     }