Make testing for change in selection more robust to insignificant cha…

…nges
PavlidisLab · Mar 19, 2024 · 193d063 · 193d063
1 parent 47e77b9
commit 193d063
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/src/components/AnnotationSelector.vue b/src/components/AnnotationSelector.vue
@@ -234,17 +234,17 @@ export default {
      */
     computeSelectedAnnotations(newVal, selectedCategories) {
       let sc = new Set(selectedCategories.map(sc => getCategoryId(sc)));
-      let selectedAnnotations = newVal
+      return newVal
         // exclude annotations from selected categories
         .filter(a => !sc.has(a.split(SEPARATOR, 2)[0]))
-        .map(a => this.annotationById[a]);
-      selectedAnnotations.forEach(a => {
-        if (!a) {
-          console.warn("Term is not selectable");
-        }
-      });
-
-      return selectedAnnotations.filter(a => a);
+        .map(id => {
+          let a = this.annotationById[id];
+          if (!a) {
+            console.warn(`Term ${id} is not selectable`);
+          }
+          return a;
+        })
+        .filter(a => a !== null);
     },
     /**
      * Selected categories.
@@ -295,10 +295,10 @@ export default {
       let sa = this.computeSelectedAnnotations(newVal, sc);
       let scOld = this.computeSelectedCategories(oldVal);
       let saOld = this.computeSelectedAnnotations(oldVal, scOld);
-      if (!isEqual(sa, saOld)) {
+      if (!isEqual(sa.map(this.getId), saOld.map(this.getId))) {
         this.$emit("input", sa);
       }
-      if (!isEqual(sc, scOld)) {
+      if (!isEqual(sc.map(getCategoryId), scOld.map(getCategoryId))) {
         this.$emit("update:selectedCategories", sc);
       }
     }

diff --git a/src/components/TaxonSelector.vue b/src/components/TaxonSelector.vue
@@ -34,8 +34,8 @@
 </template>
 
 <script>
-import { isEqual } from "lodash";
 import { formatNumber } from "@/lib/utils";
+import { isEqual } from "lodash";
 
 export default {
   name: "TaxonSelector",
@@ -84,6 +84,9 @@ export default {
         items[0].children.push(taxonItem);
       }
       return items[0].children;
+    },
+    selectedTaxa() {
+      return this.taxon.filter(taxon => this.selectedTaxaIds.includes(taxon.id));
     }
   },
   methods: {
@@ -102,9 +105,9 @@ export default {
     value(newVal) {
       this.selectedTaxaIds = newVal && newVal.map(t => t.id) || [];
     },
-    selectedTaxaIds(newVal, oldVal) {
-      if (!isEqual(newVal, oldVal)) {
-        this.$emit("input", this.taxon.filter(taxon => newVal.includes(taxon.id)));
+    selectedTaxa(newVal, oldVal) {
+      if (!isEqual(newVal.map(t => t.id), oldVal.map(t => t.id))) {
+        this.$emit("input", newVal);
       }
     }
   }

diff --git a/src/components/TechnologyTypeSelector.vue b/src/components/TechnologyTypeSelector.vue
@@ -103,7 +103,7 @@ export default {
   },
   watch: {
     value(newVal) {
-      this.selectedValues = newVal.map(t => t.id)
+      this.selectedValues = newVal.map(t => t.id);
     },
     selectedValues(newVal, oldVal) {
       let ids = new Set(newVal.filter(id => !TECHNOLOGY_TYPES.includes(id)));
@@ -112,7 +112,7 @@ export default {
       let oldIds = new Set(oldVal.filter(id => !TECHNOLOGY_TYPES.includes(id)));
       let oldSelectedTechnologyTypes = this.computeSelectedTechnologyTypes(oldIds);
       let oldSelectedPlatforms = this.computeSelectedPlatforms(oldIds, oldSelectedTechnologyTypes);
-      if (!isEqual(selectedPlatforms, oldSelectedPlatforms)) {
+      if (!isEqual(selectedPlatforms.map(p => p.id), oldSelectedPlatforms.map(p => p.id))) {
         this.$emit("input", selectedPlatforms);
       }
       if (!isEqual(selectedTechnologyTypes, oldSelectedTechnologyTypes)) {