v4.0.22-beta

jemu75 · Mar 1, 2024 · 31fc34c · 31fc34c
1 parent 221c9e1
commit 31fc34c
Show file tree

Hide file tree

Showing 15 changed files with 387 additions and 352 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v4.0.22-beta (01.03.2024)
+## Framework
+- Bugfix for vuetify3 extention panel -> version rollback
+## Settings
+- Bugfix for synchronisation between raw-mode and ui-mode
+## Core
+- Bugfix for reconnect
 # v4.0.21-beta (26.02.2024)
 ## Settings
 - Bugfix for fhem commands in Header Settings

diff --git a/src/components/SettingsProps.vue b/src/components/SettingsProps.vue
@@ -203,6 +203,12 @@
         return highlight(code, languages.js)
     }
 
+    function loadJsonDef(evt) {
+        if(evt) {
+            settings.value.jsonDef = JSON.stringify(fhem.app.config[props.type][settings.value.itemIdx], null, '\t')
+        }
+    }
+
     function changed() {
         let res = fhem.stringToJson(settings.value.jsonDef, true)
 
@@ -326,7 +332,8 @@
                                 v-model="settings.rawMode"
                                 :label="$t('_app.settings.panels.rawMode')"
                                 color="blue"
-                                hide-details 
+                                hide-details
+                                @update:model-value="loadJsonDef($event)"
                                 >
                             </v-switch>
                         </v-col>

diff --git a/src/stores/fhem.js b/src/stores/fhem.js
@@ -204,7 +204,7 @@ export const useFhemStore = defineStore('fhem', () => {
 
         return await fetch(createURL(params), options)
             .then((res) => {
-                if(type === 'token') result = res.headers.get('x-fhem-csrftoken')
+                if(type === 'token') result = { token: res.headers.get('x-fhem-csrftoken') }
                 if(type === 'json') result = res.json()
                 if(type === 'text') result = res.text()
 
@@ -218,7 +218,11 @@ export const useFhemStore = defineStore('fhem', () => {
 
     //coreFunction fill settings (session)
     async function getToken() {
-        stat.csrf = await request('token')
+        let res = await request('token')
+
+        if(!res) return false
+        stat.csrf = res.token
+
         return true
     }
 

diff --git a/www/fhemapp4/CHANGELOG.md b/www/fhemapp4/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v4.0.22-beta (01.03.2024)
+## Framework
+- Bugfix for vuetify3 extention panel -> version rollback
+## Settings
+- Bugfix for synchronisation between raw-mode and ui-mode
+## Core
+- Bugfix for reconnect
 # v4.0.21-beta (26.02.2024)
 ## Settings
 - Bugfix for fhem commands in Header Settings

diff --git a/www/fhemapp4/assets/DevicesView-f0fc74e2.js → www/fhemapp4/assets/DevicesView-4d21626c.js b/www/fhemapp4/assets/DevicesView-f0fc74e2.js → www/fhemapp4/assets/DevicesView-4d21626c.js
diff --git a/...fhemapp4/assets/InternalsView-85e94e7d.js → ...fhemapp4/assets/InternalsView-cc07cc9a.js b/...fhemapp4/assets/InternalsView-85e94e7d.js → ...fhemapp4/assets/InternalsView-cc07cc9a.js
diff --git a/www/fhemapp4/assets/PanelCard-c3fb0d1a.js → www/fhemapp4/assets/PanelCard-23880320.js b/www/fhemapp4/assets/PanelCard-c3fb0d1a.js → www/fhemapp4/assets/PanelCard-23880320.js