Merge pull request #133 from jemu75/dev-v4

v4.5.1
jemu75 · Dec 9, 2024 · aa4bdec · aa4bdec
2 parents a4902cd + e813afa
commit aa4bdec
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 32 deletions.
diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v4.5.1 (09.12.2024)
+## Core
+- bugfix for changing darkmode
 # v4.5.0 (08.12.2024)
 ## Core
 - new settings for parameter diff into replacer %d (nozero and numeric)

diff --git a/src/stores/fhem.js b/src/stores/fhem.js
@@ -484,7 +484,9 @@ export const useFhemStore = defineStore('fhem', () => {
                     for(const path of stat.panelMap[idx].items) {
                         doUpdate(app.panelList, path, evt.value)
                     }
-                } else {
+                } 
+
+                if(stat.panelMap[idx].task) {
                     handleInternalTask(stat.panelMap[idx].task, evt.value)
                 }
 
@@ -662,6 +664,7 @@ export const useFhemStore = defineStore('fhem', () => {
             panels = JSON.parse(JSON.stringify(app.config.panels)),
             templates = JSON.parse(JSON.stringify(app.config.templates)),
             templateIdx,
+            taskIdx,
             darkModeDef
 
         if(app.config.panels.length === 0) log(3, 'No Panels defined.', null, 'noPanels')
@@ -708,10 +711,21 @@ export const useFhemStore = defineStore('fhem', () => {
         }
 
         //add watching for updates
-        stat.panelMap.push({ reading: app.fhemDevice + '-update_available', task: 'update' })
-        if(app.header.darkModeOverFhem) {
-            darkModeDef = app.header.darkModeOverFhem.split(':')
-            if(darkModeDef.length === 2) stat.panelMap.push({ reading: darkModeDef[0], task: 'darkMode'})
+        taskIdx = stat.panelMap.map((e) => e.reading).indexOf(app.fhemDevice + '-update_available')
+        if(taskIdx !== -1) {
+            stat.panelMap[taskIdx].task = 'update'
+        } else {
+            stat.panelMap.push({ reading: app.fhemDevice + '-update_available', task: 'update' })
+        }
+
+        darkModeDef = app.header.darkModeOverFhem.split(':')
+        if(darkModeDef.length === 2) {
+            taskIdx = stat.panelMap.map((e) => e.reading).indexOf(darkModeDef[0])
+            if(taskIdx !== -1) {
+                stat.panelMap[taskIdx].task = 'darkMode'
+            } else {
+                stat.panelMap.push({ reading: darkModeDef[0], task: 'darkMode'})
+            }
         }
 
         log(4, 'PanelList and PanelMapping created.', { panelList: app.panelList, panelMap: stat.panelMap })
@@ -772,7 +786,9 @@ export const useFhemStore = defineStore('fhem', () => {
 
             if(item.items) {
                 for(const path of item.items) doUpdate(panelList, path, val)
-            } else {
+            }
+
+            if(item.task) {
                 handleInternalTask(item.task, val)
             }
         }

diff --git a/www/fhemapp4/CHANGELOG.md b/www/fhemapp4/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v4.5.1 (09.12.2024)
+## Core
+- bugfix for changing darkmode
 # v4.5.0 (08.12.2024)
 ## Core
 - new settings for parameter diff into replacer %d (nozero and numeric)

diff --git a/www/fhemapp4/assets/DevicesView-FJHLHjVE.js → www/fhemapp4/assets/DevicesView-BXrZzncO.js b/www/fhemapp4/assets/DevicesView-FJHLHjVE.js → www/fhemapp4/assets/DevicesView-BXrZzncO.js
diff --git a/...fhemapp4/assets/InternalsView-DCrve5NC.js → ...fhemapp4/assets/InternalsView-Btpm_Y2R.js b/...fhemapp4/assets/InternalsView-DCrve5NC.js → ...fhemapp4/assets/InternalsView-Btpm_Y2R.js
diff --git a/www/fhemapp4/assets/PanelCard-CL21y_Aa.js → www/fhemapp4/assets/PanelCard-0KRtoqkb.js b/www/fhemapp4/assets/PanelCard-CL21y_Aa.js → www/fhemapp4/assets/PanelCard-0KRtoqkb.js
diff --git a/www/fhemapp4/assets/SettingsView-QzGge9MQ.js → www/fhemapp4/assets/SettingsView-D4z0eDmZ.js b/www/fhemapp4/assets/SettingsView-QzGge9MQ.js → www/fhemapp4/assets/SettingsView-D4z0eDmZ.js