Add "Show name" and "Show tags" options to Model Picker Popup

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
openhab · Feb 7, 2024 · c0106d0 · c0106d0
1 parent 1d5d217
commit c0106d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue b/bundles/org.openhab.ui/web/src/components/model/model-picker-popup.vue
@@ -34,12 +34,17 @@
         <div class="padding-right text-align-right">
           <f7-checkbox :checked="includeNonSemantic" @change="toggleNonSemantic" />
           <label @click="toggleNonSemantic" class="advanced-label">Show non-semantic</label>
+          <f7-checkbox style="margin-left: 5px" :checked="includeItemName" @change="toggleItemName" />
+          <label @click="toggleItemName" class="advanced-label">Show name</label>
+          <f7-checkbox style="margin-left: 5px" :checked="includeItemTags" @change="toggleItemTags" />
+          <label @click="toggleItemTags" class="advanced-label">Show tags</label>
         </div>
         <span />
         <!-- <f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up"></f7-link> -->
       </f7-toolbar>
       <f7-block strong class="no-padding" v-if="ready">
         <model-treeview class="model-picker-treeview" :root-nodes="rootNodes"
+                        :includeItemName="includeItemName" :includeItemTags="includeItemTags"
                         :selected-item="selectedItem" @selected="selectItem" @checked="checkItem" />
       </f7-block>
       <f7-block v-else-if="!ready" class="text-align-center">
@@ -79,6 +84,8 @@ export default {
       loading: false,
       initSearchbar: false,
       includeNonSemantic: false,
+      includeItemName: false,
+      includeItemTags: false,
       expanded: false,
       items: [],
       links: [],
@@ -283,6 +290,14 @@ export default {
       this.includeNonSemantic = !this.includeNonSemantic
       this.load()
     },
+    toggleItemName () {
+      this.includeItemName = !this.includeItemName
+      this.load()
+    },
+    toggleItemTags () {
+      this.includeItemTags = !this.includeItemTags
+      this.load()
+    },
     toggleExpanded () {
       this.expanded = !this.expanded
 

diff --git a/bundles/org.openhab.ui/web/src/components/model/model-treeview.vue b/bundles/org.openhab.ui/web/src/components/model/model-treeview.vue
@@ -2,6 +2,7 @@
   <f7-treeview class="model-treeview">
     <model-treeview-item v-for="node in rootNodes"
                          :key="node.item.name" :model="node"
+                         :includeItemName="includeItemName" :includeItemTags="includeItemTags"
                          @selected="nodeSelected" :selected="selectedItem"
                          @checked="(item, check) => $emit('checked', item, check)" />
   </f7-treeview>
@@ -21,7 +22,7 @@
 
 <script>
 export default {
-  props: ['rootNodes', 'selectedItem'],
+  props: ['rootNodes', 'selectedItem', 'includeItemName', 'includeItemTags'],
   methods: {
     nodeSelected (node) {
       this.$emit('selected', node)