v.4.0.19-beta

public/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.0.19-beta (25.02.2024)
+## Core
+- Bugfix for Navigation if panel is not showed
+- Bugfix Sorting Panelview
 # v4.0.18-beta (11.02.2024)
 ## Settings
 - Optimization Panel and Template Settings

src/components/PanelCard.vue

@@ -27,6 +27,10 @@
         return fhem.handleDefs(item.panel.status.imageUrl, ['url'],[''])
     })
 
+    const sortby = computed(() => {
+        return fhem.handleDefs(item.panel.panel.sortby, ['sortby'], [null])
+    })
+
     const title = computed(() => {
         return fhem.handleDefs(item.panel.status.title, ['title'],[''])        
     })
@@ -129,6 +133,9 @@
                             {{  title.title }}
                         </v-col>
                         <v-spacer></v-spacer>
+                        <v-col v-if="fhem.app.settings.loglevel > 6" class="text-right">
+                            {{ sortby.sortby }}
+                        </v-col>
                         <v-col v-if="expandIcon" cols="1" class="text-right">
                             <v-btn :icon="expandIcon" size="small" variant="plain" density="compact" @click="levelSwitch(false)"></v-btn>
                         </v-col>

src/stores/fhem.js

@@ -128,7 +128,6 @@ export const useFhemStore = defineStore('fhem', () => {
     //coreFunction to open online HelpPage (README.md)
     function help(anchor) {
         window.open(app.helpURL + anchor, '_blank')
-        //console.log(app.helpURL + anchor)
     }
 
     //coreFunction to handle url params and query-string
@@ -836,7 +835,10 @@ export const useFhemStore = defineStore('fhem', () => {
         for(const panel of app.panelList) {
             if(panel.panel.navigation) {
                 routes = handleDefs(panel.panel.navigation, ['route'], [''], true, ',')
-                for(const item of routes) createNavItems(item.route, app.navigation)
+
+                if(handleDefs(panel.panel.show, ['show'], [true]).show) {
+                    for(const item of routes) createNavItems(item.route, app.navigation)
+                } 
             }
         }
 
@@ -873,7 +875,7 @@ export const useFhemStore = defineStore('fhem', () => {
         let res = true
         let tid = thread()
 
-        log(4, 'Create Session...')
+        log(4, connect ? 'Create Session...' : 'Refresh Session...')
 
         app.isReady = false
         stat.panelMap = []
@@ -892,21 +894,21 @@ export const useFhemStore = defineStore('fhem', () => {
         } else {
             app.message = false
             app.isReady = true
-            log(1, 'FHEMApp launched.', app)
+            log(1, connect ? 'FHEMApp launched.' : 'Session refreshed.', app)
         }        
 
         thread(tid)
         return res
     }
-
-    //mainFunction to Initialze FHEMApp
+      
+    //Initialize FHEMApp
     function init() {
         log(1, 'FHEMApp launching...')
 
         //register eventHandler
         router.afterEach((to) => {
             let res = handleURL(to)
-            
+
             if(res.langChanged) i18n.locale.value = app.settings.lang
             if(res.darkChanged) theme.global.name.value = app.settings.dark === '0' ? 'light' : 'dark'
             if(res.connChanged || !app.isReady) return createSession(true)
@@ -918,9 +920,8 @@ export const useFhemStore = defineStore('fhem', () => {
         initClock()
     }
 
-    //Initialize FHEMApp
+    //FHEMApp entryPoint
     router.isReady().then(init())
 
-    //only for production
     return { app, getEl, handleDefs, getIcon, replacer, createSession, request, thread, stringToJson, log, help }
-})
+})

src/views/DevicesView.vue

@@ -31,7 +31,7 @@
   })
 
   function s(obj) {
-    return fhem.handleDefs(obj.panel.sortby, ['sortby'], ['999']).sortby
+    return fhem.handleDefs(obj.panel.sortby, ['sortby'], [null]).sortby || '999'
   }
 </script>
 

src/views/InternalsView.vue

@@ -1,22 +1,18 @@
 <script setup>
-  import { ref, computed } from 'vue'
+  import { ref } from 'vue'
   import VueJsonPretty from 'vue-json-pretty'
   import 'vue-json-pretty/lib/styles.css'
   import { useFhemStore } from '@/stores/fhem' 
   import useClipboard from 'vue-clipboard3'
 
-  const cfgOnly = ref(false)
+  const cfgOnly = ref(true)
   
   const fhem = useFhemStore()
 
   const { toClipboard } = useClipboard()
 
-  const jsonData = computed(() => {
-    return cfgOnly.value ? fhem.app.config : fhem.app
-  })
-
   function copyBtn() {
-    toClipboard(JSON.stringify(jsonData.value, null, '  '))
+    toClipboard(JSON.stringify(cfgOnly.value ? fhem.app.config : fhem.app, null, '  '))
   }
 </script>
 
@@ -42,7 +38,7 @@
           </v-col>
         </v-row>
         <v-divider class="pb-3"></v-divider>
-        <vue-json-pretty :data="jsonData" :deep="cfgOnly ? 2 : 1" :showLine="false" :showIcon="true" :showLength="true"/>
+        <vue-json-pretty :data="cfgOnly ? fhem.app.config : fhem.app" :deep="1" :showLine="false" :showIcon="true" :showLength="true"/>
       </v-card-text>
   </v-card>
 </template>

www/fhemapp4/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.0.19-beta (25.02.2024)
+## Core
+- Bugfix for Navigation if panel is not showed
+- Bugfix Sorting Panelview
 # v4.0.18-beta (11.02.2024)
 ## Settings
 - Optimization Panel and Template Settings