From 7c7818dd76dff3d54b6eccadfa0f6a2d27e89e51 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Wed, 3 May 2023 02:12:14 +0200
Subject: [PATCH] Fixed entity search.

It was broken by the previous refactor of the entities panel, which no
longer triggers the `watch` callback on the upstream `entityGroups`.

The new approach listens for entity updates on the frontend bus and
dynamically creates the entity groupings in `selectedGroups` if they are
missing.
---
 .../components/panels/Entities/Selector.vue   | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
index 6b9b3872ec..d5b2ebaf9a 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
@@ -29,6 +29,7 @@ import Dropdown from "@/components/elements/Dropdown";
 import DropdownItem from "@/components/elements/DropdownItem";
 import meta from './meta.json'
 import pluginIcons from '@/assets/icons.json'
+import { bus } from "@/bus";
 
 export default {
   name: "Selector",
@@ -74,12 +75,12 @@ export default {
     },
 
     selectedEntities() {
+      const searchTerm = this.searchTerm?.toLowerCase()
       return Object.values(this.entityGroups.id).filter((entity) => {
         if (!this.selectedGroups[entity[this.value?.grouping]])
          return false
 
-        if (this.searchTerm?.length) {
-          const searchTerm = this.searchTerm.toLowerCase()
+        if (searchTerm?.length) {
           return (
             ((entity.name || '').toLowerCase()).indexOf(searchTerm) >= 0 ||
             ((entity.plugin || '').toLowerCase()).indexOf(searchTerm) >= 0 ||
@@ -135,21 +136,15 @@ export default {
       this.$emit('input', value)
     },
 
-    refreshGroupFilter(reset) {
-      if (reset)
-        this.selectedGroups = Object.keys(
-          this.entityGroups[this.value?.grouping] || {}
-        ).reduce(
-          (obj, group) => {
-            obj[group] = true
-            return obj
-          }, {}
-        )
-      else {
-        for (const group of Object.keys(this.entityGroups[this.value?.grouping]))
-          if (this.selectedGroups[group] == null)
-            this.selectedGroups[group] = true
-      }
+    refreshGroupFilter() {
+      this.selectedGroups = Object.keys(
+        this.entityGroups[this.value?.grouping] || {}
+      ).reduce(
+        (obj, group) => {
+          obj[group] = true
+          return obj
+        }, {}
+      )
 
       this.synchronizeSelectedEntities()
     },
@@ -159,6 +154,13 @@ export default {
       this.synchronizeSelectedEntities()
     },
 
+    processEntityUpdate(entity) {
+      const group = entity[this.value?.grouping]
+      if (group && this.selectedGroups[entity[group]] == null) {
+        this.selectedGroups[group] = true
+      }
+    },
+
     onGroupingChanged(grouping) {
       if (!this.entityGroups[grouping] || grouping === this.value?.grouping)
         return false
@@ -170,10 +172,10 @@ export default {
   },
 
   mounted() {
-    this.refreshGroupFilter(true)
-    this.$watch(() => this.value?.grouping, () => { this.refreshGroupFilter(true) })
+    this.refreshGroupFilter()
+    this.$watch(() => this.value?.grouping, () => { this.refreshGroupFilter() })
     this.$watch(() => this.searchTerm, this.updateSearchTerm)
-    this.$watch(() => this.entityGroups, () => { this.refreshGroupFilter(false) })
+    bus.onEntity(this.processEntityUpdate)
   },
 }
 </script>