Updated performance (+2 squashed commits)

Squashed commits:
[f3ea89d7a] Performance metrics
[3e02a0f3c] WIP (+5 squashed commits)
Squashed commits:
[f07c59d] WIP
[20ffc61] WIP
[1638608] WIP
[b42cfd0] WIP
[7feb909] WIP (+3 squashed commits)
Squashed commits:
[63a4a18] working
[408705a] WIP
[7be6336] WIP

Signed-off-by: Jeff James <[email protected]>

Author: jsjames

bundles/org.openhab.ui/web/eslint.config.js

@@ -41,6 +41,7 @@ const rules = {
     'no-case-declarations': 'off',
     'no-console': 'off',
     'no-debugger': 'off',
+    'no-unsed-vars': 'off',
     'no-irregular-whitespace': 'off',
     // 'es/no-regexp-lookbehind-assertions': 'error', // Supported in Safari  >= 16.4, which breaks iOS 15.x.
     'no-trailing-spaces': 'error',
@@ -72,6 +73,7 @@ const rules = {
     'vue/singleline-html-element-content-newline': 'error',
     'vue/v-on-style': 'error',
     'vue/v-slot-style': 'error',
+    '@typescript-eslint/no-unused-vars': 'warn',
 
     // The following rules should be activated successively. Due to the large amount
     // of required changes, the activations should be clustered in several pull requests.

bundles/org.openhab.ui/web/package-lock.json

@@ -812,6 +812,9 @@ export default {
         }).then(() => {
         // finished with loading
           this.ready = true
+          performance.mark('loadDataEnd')
+          const measure = performance.measure('loadData', 'loadDataStart', 'loadDataEnd')
+          console.info(`Init data loading: ${measure.duration.toFixed(2)} ms`)
           return Promise.resolve()
         })
     },
@@ -1003,7 +1006,6 @@ export default {
       this.$f7dim.width = f7.width
       this.$f7dim.height = f7.height
 
-      performance.mark('f7ready')
       this.updateThemeOptions()
 
       this.tryExchangeAuthorizationCode().then((user) => {

bundles/org.openhab.ui/web/src/App.vue

@@ -1,26 +1,15 @@
-import mixin from '@/components/widgets/widget-mixin'
 import { f7 } from 'framework7-vue'
+import { useWidgetContext } from '@/components/widgets/useWidgetContext'
 
 // TODO: Restore functionality to close card with browser back.
 // This has been removed as the history manipulation caused double-back navigation to the overview page from the analyzer
 export default {
-  mixins: [mixin],
-  props: {
-    type: String,
-    element: Object
-  },
   data() {
     return {
       opened: false,
       cardId: this.title
     }
   },
-  mounted() {
-    // window.addEventListener('popstate', this.back)
-  },
-  beforeUnmount() {
-    // window.removeEventListener('popstate', this.back)
-  },
   computed: {
     title() {
       if (this.config.title) return this.config.title

bundles/org.openhab.ui/web/src/components/cards/card-mixin.js

@@ -28,21 +28,31 @@
 </style>
 
 <script>
-import mixin from '@/components/widgets/widget-mixin'
+import { useWidgetContext } from '@/components/widgets/useWidgetContext'
 import { equipmentListComponent } from '@/components/widgets/standard/list/default-list-item'
 import CardMixin from './card-mixin'
 import ModelCard from './model-card.vue'
 
 import { useStatesStore } from '@/js/stores/useStatesStore'
 
 export default {
-  mixins: [mixin, CardMixin],
+  mixins: [CardMixin],
   props: {
-    tabContext: Object
+    context: Object,
+    tabContext: Object,
+    type: String,
+    element: Object
   },
   components: {
     ModelCard
   },
+  setup (props) {
+    const { config, childContext } = useWidgetContext(props.context)
+    return {
+      config,
+      childContext
+    }
+  },
   computed: {
     listContext () {
       const contextLabelDefaults = { contextLabelSource: 'path' }

bundles/org.openhab.ui/web/src/components/cards/equipment-card.vue

@@ -83,7 +83,7 @@
 </style>
 
 <script>
-import mixin from '@/components/widgets/widget-mixin'
+import { useWidgetContext } from '@/components/widgets/useWidgetContext'
 import itemDefaultListComponent, { equipmentListComponent } from '@/components/widgets/standard/list/default-list-item'
 import CardMixin from './card-mixin'
 import ModelCard from './model-card.vue'
@@ -93,16 +93,26 @@ import MeasurementBadge from './glance/location/measurement-badge.vue'
 import { useStatesStore } from '@/js/stores/useStatesStore'
 
 export default {
-  mixins: [mixin, CardMixin],
+  mixins: [CardMixin],
   props: {
+    context: Object,
     parentLocation: String,
-    tabContext: Object
+    tabContext: Object,
+    type: String,
+    element: Object
   },
   components: {
     ModelCard,
     StatusBadge,
     MeasurementBadge
   },
+  setup (props) {
+    const { config, childContext } = useWidgetContext(props.context)
+    return {
+      config,
+      childContext
+    }
+  },
   data () {
     return {
       activeTab: (this.element.equipment.length === 0 && this.element.properties.length > 0) ? 'properties' : 'equipment'

bundles/org.openhab.ui/web/src/components/cards/location-card.vue

@@ -100,13 +100,25 @@
 <script>
 import { mapStores } from 'pinia'
 import CardMixin from './card-mixin'
+import { useWidgetContext } from '@/components/widgets/useWidgetContext'
 
 import { useUIOptionsStore } from '@/js/stores/useUIOptionsStore'
 
 export default {
   mixins: [CardMixin],
   props: {
-    headerHeight: [String, Number]
+    context: Object,
+    headerHeight: [String, Number],
+    type: String,
+    element: Object
+  },
+  setup (props) {
+    const { config, childContext, visible } = useWidgetContext(props.context)
+    return {
+      config,
+      childContext,
+      visible
+    }
   },
   computed: {
     ...mapStores(useUIOptionsStore)