@abi-software/map-side-bar 2.13.0-acupoint.1 → 2.13.0-acupoint.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.13.0-acupoint.1",
+  "version": "2.13.0-acupoint.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/components/AcupointsInfoSearch.vue

@@ -163,9 +163,9 @@ export default {
               "term": "Visualized"
           },
           {
-              "facetPropPath": "acupoints.implied",
+              "facetPropPath": "acupoints.onMRI",
               "facet": "Show all",
-              "term": "Implied"
+              "term": "onMRI"
           },
           {
               "facetPropPath": "acupoints.userDefined",
@@ -191,18 +191,18 @@ export default {
           ],
         },
         {
-          "key": "acupoints.implied",
-          "label": "Implied",
+          "key": "acupoints.onMRI",
+          "label": "Spotted On MRI",
           "children": [
             {
-                "key": "acupoints.implied.yes",
-                "label": "Implied",
-                "value": "Implied>Yes"
+                "key": "acupoints.onMRI.yes",
+                "label": "Spotted",
+                "value": "onMRI>Yes"
             },
             {
-              "key": "acupoints.implied.no",
-              "label": "Non Implied",
-              "value": "Implied>No"
+              "key": "acupoints.onMRI.no",
+              "label": "Not spotted",
+              "value": "onMRI>No"
             },
           ],
         },
@@ -285,11 +285,11 @@ export default {
             this.currentFilters['curated'] = 'Both'
           }
         }
-        if (filter.facetPropPath === "acupoints.implied") {
-          if (filter.facet === "Implied") {
-            this.currentFilters['mri'] = 'Off'
-          } else if (filter.facet === 'Non Implied') {
+        if (filter.facetPropPath === "acupoints.onMRI") {
+          if (filter.facet === "Spotted") {
             this.currentFilters['mri'] = 'On'
+          } else if (filter.facet === 'Not spotted') {
+            this.currentFilters['mri'] = 'Off'
           } else {
             this.currentFilters['mri'] = 'Both'
           }
@@ -323,13 +323,6 @@ export default {
       });
 
       this.search( this.searchInput)
-
-      //this.search();
-      // this.$emit("search-changed", {
-      //   value: filters,
-      //   tabType: "connectivity",
-      //   type: "filter-update",
-      // });
     },
     numberPerPageUpdate: function (val) {
       this.numberPerPage = val;
@@ -355,8 +348,7 @@ export default {
       }
       if (this.currentFilters['mri'] !== "Both") {
         const mri = this.currentFilters['mri'] === "On" ? true : false
-        filteredList = filteredList.filter(
-          item => (item.onMRI ? true : false) === mri)
+        filteredList = filteredList.filter(item => (item.onMRI ? true : false) === mri)
       }
       if (this.currentFilters['who'] !== "Both") {
         const who = this.currentFilters['who'] === "Yes" ? true : false
@@ -425,6 +417,10 @@ export default {
         list: this.results
       });
     },
+    openSearch: function (filters, searchTerm = '') {
+      this.searchInput = searchTerm
+      this.filterUpdate(filters)
+    },
     numberPerPageUpdate: function (val) {
       this.numberPerPage = val
       this.pageChange(1)

package/src/components/SideBar.vue

@@ -299,6 +299,15 @@ export default {
     toggleDrawer: function () {
       this.drawerOpen = !this.drawerOpen
     },
+    openAcupointsSearch: function (facets, query) {
+      this.drawerOpen = true
+      // Because refs are in v-for, nextTick is needed here
+      this.$nextTick(() => {
+        console.log("broken")
+        const acupointTabRef = this.getTabRef(undefined, 'acupoints', true);
+        acupointTabRef.openSearch(facets, query)
+      })
+    },
     openConnectivitySearch: function (facets, query) {
       this.drawerOpen = true;
       // Because refs are in v-for, nextTick is needed here
@@ -430,14 +439,6 @@ export default {
     updateConnectivityError: function (errorInfo) {
       EventBus.emit('connectivity-error', errorInfo);
     },
-    openAcupointsSearch: function (term) {
-      this.drawerOpen = true
-      // Because refs are in v-for, nextTick is needed here
-      this.$nextTick(() => {
-        const tabRef = this.getTabRef(undefined, 'acupoints', true);
-        tabRef.search(term);
-      })
-    },
     /**
      * Store available anatomy facets data for connectivity list component
      */