fix tests

Signed-off-by: Mark Herwege <[email protected]>
openhab · Nov 18, 2024 · 800c925 · 800c925
1 parent df523f3
commit 800c925
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/sitemap-mixin.js b/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/sitemap-mixin.js
@@ -63,13 +63,13 @@ export default {
       { key: 'datetime', value: 'Date and Time' }
     ]
 
-    if (!this.itemsList || !this.itemsList.length) {
+    if (!this.itemsList) {
       this.$oh.api.get('/rest/items?staticDataOnly=true').then((items) => {
         this.items = items
         this.itemsReady = true
       })
     } else {
-      this.items = this.itemsList
+      this.items = this.itemsList ?? []
       this.itemsReady = true
     }
   },
@@ -89,7 +89,7 @@ export default {
     },
     widgetItemLabel (includeItemName) {
       const item = this.items.find(i => i.name === this.widget.config.item)
-      return item.label + (includeItemName ? ' (' + item.name + ')' : '')
+      return (item?.label ?? this.widget.config.item) + (includeItemName ? ' (' + item?.name ?? '' + ')' : '')
     },
     widgetConfigDescription (includeItemName) {
       const buttonPosition = this.widget.component === 'Button' ? ' (' + (this.widget.config?.row ?? '-') + ',' + (this.widget.config?.column ?? '-') + ')' : ''

diff --git a/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue b/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue
@@ -9,7 +9,7 @@
                            :key="idx"
                            :includeItemName="includeItemName"
                            :widget="childwidget" :parent-widget="widget"
-                           :itemsList="itemsList"
+                           :itemsList="items"
                            @selected="(event) => $emit('selected', event)"
                            :selected="selected" />
     <div slot="label" class="subtitle">

diff --git a/...s/org.openhab.ui/web/src/pages/settings/pages/sitemap/__tests__/sitemap-edit_jest.spec.js b/...s/org.openhab.ui/web/src/pages/settings/pages/sitemap/__tests__/sitemap-edit_jest.spec.js
@@ -1,4 +1,3 @@
-import PagesList from '../../pages-list.vue'
 import SitemapEdit from '../sitemap-edit.vue'
 import { shallowMount, createLocalVue } from '@vue/test-utils'
 import Framework7 from 'framework7'
@@ -24,7 +23,8 @@ describe('SitemapEdit', () => {
               open: () => { }
             }
           }
-        }
+        },
+        data: { sitemap: {} }
       }
     }
   })
@@ -34,7 +34,8 @@ describe('SitemapEdit', () => {
       localVue,
       propsData: {
         createMode: true,
-        uid: 'test'
+        uid: 'test',
+        itemsList: []
       }
     })
   })

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue
@@ -292,7 +292,7 @@ export default {
     WidgetDetails,
     AttributeDetails
   },
-  props: ['createMode', 'uid'],
+  props: ['createMode', 'uid', 'itemsList'],
   data () {
     if (!this.$f7.data.sitemap) this.$f7.data.sitemap = {}
     return {