From 36560aa67933631eca5bf62a9af985b0809abfbc Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Mon, 5 Aug 2024 16:34:50 +0200
Subject: [PATCH] dashboard: use importmap to force cache safe imports of base
 classes (https://github.com/opnsense/core/issues/7244)

---
 .../mvc/app/views/OPNsense/Core/dashboard.volt         | 10 ++++++++++
 src/opnsense/www/js/widgets/Announcements.js           |  2 +-
 src/opnsense/www/js/widgets/Carp.js                    |  2 +-
 src/opnsense/www/js/widgets/Cpu.js                     |  2 +-
 src/opnsense/www/js/widgets/Disk.js                    |  2 +-
 src/opnsense/www/js/widgets/Firewall.js                |  2 +-
 src/opnsense/www/js/widgets/FirewallStates.js          |  2 +-
 src/opnsense/www/js/widgets/Gateways.js                |  2 +-
 src/opnsense/www/js/widgets/InterfaceStatistics.js     |  2 +-
 src/opnsense/www/js/widgets/Interfaces.js              |  2 +-
 src/opnsense/www/js/widgets/IpsecLeases.js             |  2 +-
 src/opnsense/www/js/widgets/IpsecTunnels.js            |  2 +-
 src/opnsense/www/js/widgets/LiveLog.js                 |  2 +-
 src/opnsense/www/js/widgets/Mbuf.js                    |  2 +-
 src/opnsense/www/js/widgets/Memory.js                  |  2 +-
 src/opnsense/www/js/widgets/Monit.js                   |  2 +-
 src/opnsense/www/js/widgets/OpenVPNClients.js          |  2 +-
 src/opnsense/www/js/widgets/OpenVPNServers.js          |  2 +-
 src/opnsense/www/js/widgets/Services.js                |  2 +-
 src/opnsense/www/js/widgets/Swap.js                    |  2 +-
 src/opnsense/www/js/widgets/SystemInformation.js       |  2 +-
 src/opnsense/www/js/widgets/ThermalSensors.js          |  2 +-
 src/opnsense/www/js/widgets/Traffic.js                 |  2 +-
 src/opnsense/www/js/widgets/Wireguard.js               |  2 +-
 24 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/dashboard.volt b/src/opnsense/mvc/app/views/OPNsense/Core/dashboard.volt
index bdf5a5b7e..386a88206 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/dashboard.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/dashboard.volt
@@ -40,6 +40,16 @@
 <script src="{{ cache_safe('/ui/js/smoothie.js') }}"></script>
 <link rel="stylesheet" type="text/css" href="{{ cache_safe(theme_file_or_default('/css/dashboard.css', theme_name)) }}" rel="stylesheet" />
 
+<script type="importmap">
+    {
+        "imports": {
+            "widget-base": "{{ cache_safe('/ui/js/widgets/BaseWidget.js') }}",
+            "widget-base-table": "{{ cache_safe('/ui/js/widgets/BaseTableWidget.js') }}",
+            "widget-base-gauge": "{{ cache_safe('/ui/js/widgets/BaseGaugeWidget.js') }}"
+        }
+    }
+</script>
+
 <script>
 $( document ).ready(function() {
     let chartBackgroundColor = getComputedStyle(document.body).getPropertyValue('--chart-js-background-color').trim();
diff --git a/src/opnsense/www/js/widgets/Announcements.js b/src/opnsense/www/js/widgets/Announcements.js
index 18a7da4c2..d0dcaff62 100644
--- a/src/opnsense/www/js/widgets/Announcements.js
+++ b/src/opnsense/www/js/widgets/Announcements.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Announcements extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Carp.js b/src/opnsense/www/js/widgets/Carp.js
index c6b54c98b..6f199118c 100644
--- a/src/opnsense/www/js/widgets/Carp.js
+++ b/src/opnsense/www/js/widgets/Carp.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Carp extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Cpu.js b/src/opnsense/www/js/widgets/Cpu.js
index cbc3b8d0b..0ab273126 100644
--- a/src/opnsense/www/js/widgets/Cpu.js
+++ b/src/opnsense/www/js/widgets/Cpu.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseWidget from "./BaseWidget.js";
+import BaseWidget from 'widget-base';
 
 export default class Cpu extends BaseWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Disk.js b/src/opnsense/www/js/widgets/Disk.js
index ed5d9d085..483e59f91 100644
--- a/src/opnsense/www/js/widgets/Disk.js
+++ b/src/opnsense/www/js/widgets/Disk.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseGaugeWidget from "./BaseGaugeWidget.js";
+import BaseGaugeWidget from 'widget-base-gauge';
 
 export default class Disk extends BaseGaugeWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Firewall.js b/src/opnsense/www/js/widgets/Firewall.js
index ecb17bbb5..2c642ea98 100644
--- a/src/opnsense/www/js/widgets/Firewall.js
+++ b/src/opnsense/www/js/widgets/Firewall.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Firewall extends BaseTableWidget {
     constructor(config) {
diff --git a/src/opnsense/www/js/widgets/FirewallStates.js b/src/opnsense/www/js/widgets/FirewallStates.js
index a5b0d2e74..3247079b5 100644
--- a/src/opnsense/www/js/widgets/FirewallStates.js
+++ b/src/opnsense/www/js/widgets/FirewallStates.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseGaugeWidget from "./BaseGaugeWidget.js";
+import BaseGaugeWidget from 'widget-base-gauge';
 
 export default class FirewallStates extends BaseGaugeWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Gateways.js b/src/opnsense/www/js/widgets/Gateways.js
index b36ca2969..4a94e7d14 100644
--- a/src/opnsense/www/js/widgets/Gateways.js
+++ b/src/opnsense/www/js/widgets/Gateways.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Gateways extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/InterfaceStatistics.js b/src/opnsense/www/js/widgets/InterfaceStatistics.js
index a27bab279..0f7e5f5b9 100644
--- a/src/opnsense/www/js/widgets/InterfaceStatistics.js
+++ b/src/opnsense/www/js/widgets/InterfaceStatistics.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseWidget from "./BaseWidget.js";
+import BaseWidget from 'widget-base';
 
 export default class InterfaceStatistics extends BaseWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Interfaces.js b/src/opnsense/www/js/widgets/Interfaces.js
index d33d27e37..a65d3091c 100644
--- a/src/opnsense/www/js/widgets/Interfaces.js
+++ b/src/opnsense/www/js/widgets/Interfaces.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Interfaces extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/IpsecLeases.js b/src/opnsense/www/js/widgets/IpsecLeases.js
index 549bdb11e..f3296ffaa 100644
--- a/src/opnsense/www/js/widgets/IpsecLeases.js
+++ b/src/opnsense/www/js/widgets/IpsecLeases.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class IpsecLeases extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/IpsecTunnels.js b/src/opnsense/www/js/widgets/IpsecTunnels.js
index 8f5ddb95f..b54c119d4 100644
--- a/src/opnsense/www/js/widgets/IpsecTunnels.js
+++ b/src/opnsense/www/js/widgets/IpsecTunnels.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class IpsecTunnels extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/LiveLog.js b/src/opnsense/www/js/widgets/LiveLog.js
index 593aaceda..b2c68df87 100644
--- a/src/opnsense/www/js/widgets/LiveLog.js
+++ b/src/opnsense/www/js/widgets/LiveLog.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class LiveLog extends BaseTableWidget {
     constructor(config) {
diff --git a/src/opnsense/www/js/widgets/Mbuf.js b/src/opnsense/www/js/widgets/Mbuf.js
index b726f1f63..e545423fd 100644
--- a/src/opnsense/www/js/widgets/Mbuf.js
+++ b/src/opnsense/www/js/widgets/Mbuf.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseGaugeWidget from "./BaseGaugeWidget.js";
+import BaseGaugeWidget from 'widget-base-gauge';
 
 export default class Mbuf extends BaseGaugeWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Memory.js b/src/opnsense/www/js/widgets/Memory.js
index 76606894f..f552eba97 100644
--- a/src/opnsense/www/js/widgets/Memory.js
+++ b/src/opnsense/www/js/widgets/Memory.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseGaugeWidget from "./BaseGaugeWidget.js";
+import BaseGaugeWidget from 'widget-base-gauge';
 
 export default class Memory extends BaseGaugeWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Monit.js b/src/opnsense/www/js/widgets/Monit.js
index 931c7442e..54b3ede4f 100644
--- a/src/opnsense/www/js/widgets/Monit.js
+++ b/src/opnsense/www/js/widgets/Monit.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Monit extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/OpenVPNClients.js b/src/opnsense/www/js/widgets/OpenVPNClients.js
index ee75a3422..6b37e6c40 100644
--- a/src/opnsense/www/js/widgets/OpenVPNClients.js
+++ b/src/opnsense/www/js/widgets/OpenVPNClients.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class OpenVPNClients extends BaseTableWidget {
     constructor(config) {
diff --git a/src/opnsense/www/js/widgets/OpenVPNServers.js b/src/opnsense/www/js/widgets/OpenVPNServers.js
index db84c5686..7ca0a044c 100644
--- a/src/opnsense/www/js/widgets/OpenVPNServers.js
+++ b/src/opnsense/www/js/widgets/OpenVPNServers.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class OpenVPNServers extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Services.js b/src/opnsense/www/js/widgets/Services.js
index 7983d81f5..a42227bfb 100644
--- a/src/opnsense/www/js/widgets/Services.js
+++ b/src/opnsense/www/js/widgets/Services.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Services extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Swap.js b/src/opnsense/www/js/widgets/Swap.js
index 5e08a8e63..d7b846ed0 100644
--- a/src/opnsense/www/js/widgets/Swap.js
+++ b/src/opnsense/www/js/widgets/Swap.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseGaugeWidget from "./BaseGaugeWidget.js";
+import BaseGaugeWidget from 'widget-base-gauge';
 
 export default class Swap extends BaseGaugeWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/SystemInformation.js b/src/opnsense/www/js/widgets/SystemInformation.js
index d8912cb6c..f6ee3930e 100644
--- a/src/opnsense/www/js/widgets/SystemInformation.js
+++ b/src/opnsense/www/js/widgets/SystemInformation.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class SystemInformation extends BaseTableWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/ThermalSensors.js b/src/opnsense/www/js/widgets/ThermalSensors.js
index a47e0288f..b401cf352 100644
--- a/src/opnsense/www/js/widgets/ThermalSensors.js
+++ b/src/opnsense/www/js/widgets/ThermalSensors.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseWidget from "./BaseWidget.js";
+import BaseWidget from 'widget-base';
 
 export default class ThermalSensors extends BaseWidget {
     constructor() {
diff --git a/src/opnsense/www/js/widgets/Traffic.js b/src/opnsense/www/js/widgets/Traffic.js
index c693e930b..f9815ade9 100644
--- a/src/opnsense/www/js/widgets/Traffic.js
+++ b/src/opnsense/www/js/widgets/Traffic.js
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseWidget from "./BaseWidget.js";
+import BaseWidget from 'widget-base';
 
 export default class Traffic extends BaseWidget {
     constructor(config) {
diff --git a/src/opnsense/www/js/widgets/Wireguard.js b/src/opnsense/www/js/widgets/Wireguard.js
index 2dd46d7ba..115a5bd91 100644
--- a/src/opnsense/www/js/widgets/Wireguard.js
+++ b/src/opnsense/www/js/widgets/Wireguard.js
@@ -25,7 +25,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-import BaseTableWidget from "./BaseTableWidget.js";
+import BaseTableWidget from 'widget-base-table';
 
 export default class Wireguard extends BaseTableWidget {
     constructor() {