Merge 763eedb into a4b0678

openhab · May 8, 2023 · c2c93cd · c2c93cd
2 parents a4b0678 + 763eedb
commit c2c93cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/pages/pages-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/pages/pages-list.vue
@@ -181,7 +181,7 @@ export default {
           return prev
         }, {})
       } else {
-        return this.pages.reduce((prev, page, i, things) => {
+        const typeGroups = this.pages.reduce((prev, page, i, things) => {
           const type = this.getPageType(page).label
           if (!prev[type]) {
             prev[type] = []
@@ -190,6 +190,10 @@ export default {
 
           return prev
         }, {})
+        return Object.keys(typeGroups).sort().reduce((objEntries, key) => {
+          objEntries[key] = typeGroups[key]
+          return objEntries
+        }, {})
       }
     },
     searchPlaceholder () {

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue
@@ -153,7 +153,7 @@ export default {
           return prev
         }, {})
       } else {
-        return filteredInbox.reduce((prev, entry, i, inbox) => {
+        const bindingGroups = filteredInbox.reduce((prev, entry, i, inbox) => {
           const binding = entry.thingUID.split(':')[0]
           if (!prev[binding]) {
             prev[binding] = []
@@ -162,6 +162,10 @@ export default {
 
           return prev
         }, {})
+        return Object.keys(bindingGroups).sort().reduce((objEntries, key) => {
+          objEntries[key] = bindingGroups[key]
+          return objEntries
+        }, {})
       }
     }
   },

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue
@@ -163,7 +163,7 @@ export default {
           return prev
         }, {})
       } else {
-        return this.things.reduce((prev, thing, i, things) => {
+        const bindingGroups = this.things.reduce((prev, thing, i, things) => {
           const binding = thing.thingTypeUID.split(':')[0]
           if (!prev[binding]) {
             prev[binding] = []
@@ -172,6 +172,10 @@ export default {
 
           return prev
         }, {})
+        return Object.keys(bindingGroups).sort().reduce((objEntries, key) => {
+          objEntries[key] = bindingGroups[key]
+          return objEntries
+        }, {})
       }
     },
     inboxCount () {