Merge branch 'main' into use-widget-context

Author: jsjames

bundles/org.openhab.ui/web/src/js/stores/useThingEditStore.ts

@@ -98,18 +98,18 @@ export const useThingEditStore = defineStore('thingEditStore', () => {
             thingType.value = thingTypeResult.value && Object.keys(thingTypeResult.value).length > 0 ? thingTypeResult.value : null
           } else {
             thingType.value = null
-            const message = `Cannot load thing-type '${data.thingTypeUID}': `
-            console.error(message + getErrorMessage(thingTypeResult.reason, true))
-            f7.dialog.alert(message + getErrorMessage(thingTypeResult.reason))
+            const message = `Cannot load thing-type '${data.thingTypeUID}'`
+            console.error(message, thingTypeResult.reason)
+            f7.dialog.alert(message + ': ' + getErrorMessage(thingTypeResult.reason))
           }
 
           if (channelTypesResult.status === 'fulfilled') {
-            channelTypes.value = channelTypesResult.value || []
+            channelTypes.value = channelTypesResult.value ?? []
           } else {
             channelTypes.value = null
-            const message = `Cannot load channel-types for thing-type '${data.thingTypeUID}': `
-            console.error(message + getErrorMessage(channelTypesResult.reason, true))
-            f7.dialog.alert(message + getErrorMessage(channelTypesResult.reason))
+            const message = `Cannot load channel-types for thing-type '${data.thingTypeUID}'`
+            console.error(message, channelTypesResult.reason)
+            f7.dialog.alert(message + ': ' + getErrorMessage(channelTypesResult.reason))
           }
 
           if (actionsResult.status === 'fulfilled') {
@@ -123,8 +123,7 @@ export const useThingEditStore = defineStore('thingEditStore', () => {
             }
           } else {
             thingActions.value = []
-            const message = getErrorMessage(actionsResult.reason, true)
-            console.error(`Cannot load '${thingUID}' thing actions: ${message}`)
+            console.error(`Cannot load '${thingUID}' thing actions`, actionsResult.reason)
           }
 
           if (configDescResult.status === 'fulfilled') {
@@ -140,20 +139,23 @@ export const useThingEditStore = defineStore('thingEditStore', () => {
             if (!applyThingTypeConfigDescriptions()) {
               configDescriptions.value = null
             }
-            console.error(`Cannot load '${thingUID}' config descriptions: ` + getErrorMessage(configDescResult.reason, true))
+            console.error(`Cannot load '${thingUID}' config descriptions`, configDescResult.reason)
           }
+
           if (firmwareResult.status === 'fulfilled') {
             firmwares.value = firmwareResult.value && Object.keys(firmwareResult.value).length > 0 ? firmwareResult.value : null
           } else {
             firmwares.value = null
-            console.error(`Cannot load '${thingUID}' firmwares: ` + getErrorMessage(firmwareResult.reason, true))
+            console.error(`Cannot load '${thingUID}' firmwares`, firmwareResult.reason)
           }
+
           if (configStatusResult.status === 'fulfilled') {
             configStatusInfo.value = configStatusResult.value ?? null
           } else {
             configStatusInfo.value = null
-            console.error(`Cannot load '${thingUID}' config status: ` + getErrorMessage(configStatusResult.reason, true))
+            console.error(`Cannot load '${thingUID}' config status`, configStatusResult.reason)
           }
+
           savedThing.value = cloneDeep(thing.value)
           loadingFinishedCallback(true)
           loading.value = false

bundles/org.openhab.ui/web/src/pages/settings/model/add-from-thing.vue

@@ -392,6 +392,7 @@ export default {
             })
           }
         }).catch((err) => {
+          console.error('Error loading thing type or channel type', err)
           f7.dialog.alert('Error loading thing type or channel types: ' + err)
 
           this.selectedThingId = ''

bundles/org.openhab.ui/web/src/pages/settings/things/add/thing-add.vue

@@ -129,6 +129,7 @@ export default {
           this.ready = true
         })
       }).catch((err) => {
+        console.error('Error loading thing type', err)
         f7.dialog.alert('Error loading thing type: ' + err)
         this.f7router.back()
       })

bundles/org.openhab.ui/web/src/pages/settings/things/channel/channel-add.vue

@@ -82,6 +82,7 @@ export default {
         this.channelTypes = ct
         this.ready = true
       }).catch((err) => {
+        console.error('Error loading channel types', err)
         f7.dialog.alert('Error loading channel type: ' + err)
         this.f7router.back()
       })

bundles/org.openhab.ui/web/src/pages/settings/things/link/link-add.vue

@@ -392,6 +392,7 @@ export default {
           this.selectedThingChannelTypes = data2[1]
           this.ready = true
         }).catch((err) => {
+          console.error('Error loading thing type or channel types', err)
           f7.dialog.alert('Error loading thing type or channel types: ' + err)
           this.selectedThingId = ''
           this.ready = true

bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue

@@ -211,6 +211,7 @@ export default {
             })
           })
         }).catch((err) => {
+          console.error('Error loading profile type or channel type', err)
           f7.dialog.alert('Error loading profile type or channel type: ' + err)
           this.f7router.back()
         })

bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue

@@ -483,8 +483,8 @@ export default {
       return this.thingActions && Array.isArray(this.thingActions) ? this.thingActions.filter((a) => a.visibility === 'EXPERT').length : 0
     },
     filteredThingActions () {
-      if (this.showAdvancedThingActions) return this.thingActions
-      return this.thingActions && Array.isArray(this.thingActions) ? this.thingActions.filter((a) => a.visibility !== 'EXPERT') : []
+      if (this.showAdvancedThingActions) return this.thingActions ?? []
+      return this.thingActions?.filter((a) => a.visibility !== 'EXPERT') ?? []
     },
     ...mapState(useThingEditStore, ['configDirty', 'thingDirty', 'thing', 'thingType', 'channelTypes', 'configDescriptions', 'configStatusInfo', 'thingActions', 'firmwares', 'editable', 'isExtensible', 'hasLinkedItems'])
   },
@@ -565,9 +565,9 @@ export default {
           return
         }
 
-        if (useThingEditStore().thing.configDescription) {
+        if (this.configDescription) {
           // gather actions (rendered as buttons at the bottom)
-          this.configActionsByGroup = this.getBindingActions(useThingEditStore().configDescriptions)
+          this.configActionsByGroup = this.getBindingActions(this.configDescriptions)
         }
 
         if (!this.eventSource) this.startEventSource()