refine unit autocomplete

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
openhab · Feb 16, 2024 · 795816c · 795816c
1 parent c9cd107
commit 795816c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/item/group-form.vue b/bundles/org.openhab.ui/web/src/components/item/group-form.vue
@@ -62,8 +62,7 @@ export default {
   data () {
     return {
       types,
-      unitAutocomplete: null,
-      unitInitialized: !this.createMode
+      unitAutocomplete: null
     }
   },
   computed: {
@@ -189,13 +188,16 @@ export default {
         openIn: 'dropdown',
         typeahead: true,
         source (query, render) {
-          if (!query || !query.length || !this.unitInitialized) {
+          if (!query || !query.length) {
           // Render curated list by default
             render(curatedUnits)
-            this.unitInitialized = true
           } else {
-            // Always show currated units on top (don't filter them)
-            let units = [...new Set(curatedUnits.concat(allUnits.filter(u => u.indexOf(query) >= 0)))]
+            // First filter on curated list
+            let units = curatedUnits.filter(u => u.indexOf(query) >= 0)
+            if (!units.length) {
+              // If no match filter on full list
+              units = allUnits.filter(u => u.indexOf(query) >= 0)
+            }
             render(units)
           }
         }

diff --git a/bundles/org.openhab.ui/web/src/components/item/item-form.vue b/bundles/org.openhab.ui/web/src/components/item/item-form.vue
@@ -120,7 +120,6 @@ export default {
     return {
       types,
       unitAutocomplete: null,
-      unitInitialized: !this.createMode,
       categoryInputId: '',
       categoryAutocomplete: null,
       nameErrorMessage: ''
@@ -178,13 +177,16 @@ export default {
         typeahead: true,
         dropdownPlaceHolderText: this.getUnitHint(dimension.name),
         source (query, render) {
-          if (!query || !query.length || !this.unitInitialized) {
+          if (!query || !query.length) {
           // Render curated list by default
             render(curatedUnits)
-            this.unitInitialized = true
           } else {
-            // Always show currated units on top (don't filter them)
-            let units = [...new Set(curatedUnits.concat(allUnits.filter(u => u.indexOf(query) >= 0)))]
+            // First filter on curated list
+            let units = curatedUnits.filter(u => u.indexOf(query) >= 0)
+            if (!units.length) {
+              // If no match filter on full list
+              units = allUnits.filter(u => u.indexOf(query) >= 0)
+            }
             render(units)
           }
         }