fix: better handling of new filters

jakowenko · Sep 20, 2021 · 3fffa6e · 3fffa6e
1 parent 19215ad
commit 3fffa6e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
@@ -375,15 +375,14 @@ export default {
   watch: {
     dropdowns: {
       handler(value) {
-        this.selected.names = this.selected.names
-          ? this.selected.names.flatMap((item) => (value.names.includes(item) ? item : []))
-          : value.names;
-        this.selected.detectors = this.selected.detectors
-          ? this.selected.detectors.flatMap((item) => (value.detectors.includes(item) ? item : []))
-          : value.detectors;
-        this.selected.matches = this.selected.matches
-          ? this.selected.matches.flatMap((item) => (value.matches.includes(item) ? item : []))
-          : value.matches;
+        ['names', 'detectors', 'matches'].forEach((key) => {
+          this.selected[key] =
+            JSON.stringify(
+              this.selected[key] ? this.selected[key].flatMap((item) => (value[key].includes(item) ? item : [])) : [],
+            ) !== JSON.stringify(value[key])
+              ? value[key]
+              : this.selected[key];
+        });
 
         if (!this.selected.names.length && !this.selected.detectors.length && !this.selected.matches.length) {
           this.selected.names = value.names;

diff --git a/frontend/src/views/Match.vue b/frontend/src/views/Match.vue
@@ -71,9 +71,10 @@ export default {
     },
     folders: [],
     loading: {
-      folders: true,
-      files: true,
+      folders: false,
+      files: false,
       createFolder: false,
+      filter: false,
     },
     matches: {
       source: [],
@@ -124,9 +125,11 @@ export default {
     this.socket.off('recognize');
   },
   created() {
-    this.emitter.on('updateFilter', () => {
+    this.emitter.on('updateFilter', async () => {
       this.clear(['source', 'selected', 'disabled', 'loaded']);
-      this.get().matches();
+      this.loading.filter = true;
+      await this.get().matches();
+      this.loading.filter = false;
     });
     this.emitter.on('trainingFolder', (value) => {
       this.trainingFolder = value;
@@ -154,9 +157,11 @@ export default {
       return {
         async matches(delay = 0) {
           try {
+            if ($this.loading.files) return;
             $this.loading.files = true;
             await Sleep(delay);
-            await $this.get().filters();
+
+            if (!$this.loading.filter) await $this.get().filters();
             $this.filters = $this.$refs?.header?.getFilters() || {};
             const sinceId =
               // eslint-disable-next-line no-nested-ternary