@abi-software/map-side-bar 2.10.0-beta.7 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.10.0-beta.7",
+  "version": "2.10.0",
   "files": [
     "dist/*",
     "src/*",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@abi-software/gallery": "^1.1.2",
-    "@abi-software/map-utilities": "1.6.1-beta.6",
+    "@abi-software/map-utilities": "^1.7.0",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",

package/src/algolia/algolia.js

@@ -59,7 +59,7 @@ export class AlgoliaClient {
               : responseFacets[facetPropPath]
           const allSubfacets = parentFacet && responseFacets[parentFacet.facetSubpropPath] ? Object.keys(responseFacets[parentFacet.facetSubpropPath]) : []
           const allSubsubfacets = (parentFacet && parentFacet.facetSubsubpropPath &&
-            responseFacets[parentFacet.facetSubsubpropPath]) ? 
+            responseFacets[parentFacet.facetSubsubpropPath]) ?
             Object.keys(responseFacets[parentFacet.facetSubsubpropPath]) : []
           const subFacetsMap = getFacetsChildrenMap(allSubfacets, 2);
           const subSubFacetsMap = getFacetsChildrenMap(allSubsubfacets, 3);
@@ -107,7 +107,7 @@ export class AlgoliaClient {
               facetPropPath: facetPropPath
             }
             if (childrenSubfacets.length > 0) {
-              
+
               newChild.children = childrenSubfacets
             }
             children.push(newChild)
@@ -258,22 +258,73 @@ export class AlgoliaClient {
           // Saving the line below incase we want to starty using keywords again
           // let anatomyAsUberons = this._processAnatomy(response.hits)
           resolve({
-            forFlatmap: this.processResultsForFlatmap(response.hits),
+            forFlatmap: this.processResultsForFlatmap(response.facets ,response.hits),
             forScaffold: this.processResultsForScaffold(response.hits)
           })
         })
     })
   }
-  processResultsForFlatmap(hits) {
+  processResultsForFlatmap(facets, hits) {
+    const filteredOrganNames = this.filterAvailableAnatomies(facets);
+
     let curieForDatasets = hits.map(h=>{
       const data = {
         id: h.objectID,
-        terms: h.anatomy? h.anatomy.organ.map(o=>o.curie) : []
+        terms: h.anatomy
+          ? h.anatomy.organ.map(o => {
+              if (filteredOrganNames.includes(o.name.toLowerCase())) {
+                return o.curie
+              }
+            }).filter(Boolean)
+          : []
       }
       return data
     })
 
-    return curieForDatasets 
+    return curieForDatasets
+  }
+  filterAvailableAnatomies(facets) {
+    const anatomyOrganName = facets['anatomy.organ.name']
+    const anatomyOrganCategoryName = facets['anatomy.organ.category.name']
+    const anatomyOrganSubcategoryName = facets['anatomy.organ.subcategory.name']
+    const anatomyOrganSubsubcategoryName = facets['anatomy.organ.subsubcategory.name']
+    const anatomyOrganNames = anatomyOrganName ? Object.keys(anatomyOrganName) : []
+    const anatomyOrganCategoryNames = anatomyOrganCategoryName ? Object.keys(anatomyOrganCategoryName) : []
+    const anatomyOrganSubcategoryNames = anatomyOrganSubcategoryName ? Object.keys(anatomyOrganSubcategoryName) : []
+    const anatomyOrganSubsubcategoryNames = anatomyOrganSubsubcategoryName ? Object.keys(anatomyOrganSubsubcategoryName) : []
+
+    const filteredOrganNames = [];
+    anatomyOrganCategoryNames.forEach((_categoryName) => {
+      const categoryName = _categoryName.toLowerCase();
+      anatomyOrganNames.forEach((_organName) => {
+        const organName = _organName.toLowerCase();
+        const fullName = `${categoryName}.${organName}`
+        const foundNamesInSubsub = []
+
+        const found = anatomyOrganSubcategoryNames.some((_subcategoryName) => {
+          const subcategoryName = _subcategoryName.toLowerCase();
+          if (subcategoryName === fullName) {
+            const foundNameInSubsub = anatomyOrganSubsubcategoryNames.find((name) => name.toLocaleLowerCase().includes(subcategoryName))
+            if (foundNameInSubsub) {
+              const subsubOrganName = foundNameInSubsub.replace(`${subcategoryName}.`, '');
+              if (anatomyOrganNames.map((name) => name.toLowerCase()).includes(subsubOrganName)) {
+                foundNamesInSubsub.push(subsubOrganName)
+              }
+            }
+            return true
+          }
+        });
+
+        if (foundNamesInSubsub.length) {
+          filteredOrganNames.push(...foundNamesInSubsub.map(name => name.toLowerCase()))
+        }
+
+        if (found) {
+          filteredOrganNames.push(organName);
+        }
+      })
+    })
+    return filteredOrganNames;
   }
   processResultsForScaffold(hits) {
     let numberOfDatasetsForAnatomy = {}

package/src/components/ConnectivityExplorer.vue

@@ -366,7 +366,11 @@ export default {
     },
     onResetClick: function () {
       this.openSearch([], '');
-      this.$emit('connectivity-explorer-reset', []);
+      this.$emit('search-changed', {
+        value: [],
+        tabType: 'dataset',
+        type: 'reset-update',
+      })
     },
     openSearch: function (filter, search = "") {
       this.searchInput = search;
@@ -374,7 +378,9 @@ export default {
       //Proceed normally if cascader is ready
       if (this.cascaderIsReady) {
         const validatedFilters = this.$refs.filtersRef.getHierarchicalValidatedFilters(filter);
-        const notFoundItems = validatedFilters.notFound || [];
+        const notFoundItems = validatedFilters.notFound
+          ? validatedFilters.notFound.filter(item => item.facet.toLowerCase() !== 'show all')
+          : [];
         this.filter = validatedFilters.result;
 
         // Show not found filter items warning message
@@ -401,7 +407,11 @@ export default {
         });
 
         if (notFoundItems.length) {
-          this.$emit('connectivity-explorer-reset', notFoundItems);
+          this.$emit('search-changed', {
+            value: notFoundItems,
+            tabType: 'dataset',
+            type: 'reset-update',
+          })
         }
 
         //Facets provided but cannot find at least one valid

package/src/components/DatasetExplorer.vue

@@ -21,7 +21,7 @@
         <el-button
           link
           class="el-button-link"
-          @click="openSearch([], '')"
+          @click="onResetClick"
           size="large"
         >
           Reset
@@ -195,7 +195,9 @@ export default {
       //Proceed normally if cascader is ready
       if (this.cascaderIsReady) {
         const validatedFilters = this.$refs.filtersRef.getHierarchicalValidatedFilters(filter);
-        const notFoundItems = validatedFilters.notFound || [];
+        const notFoundItems = validatedFilters.notFound
+          ? validatedFilters.notFound.filter(item => item.facet.toLowerCase() !== 'show all')
+          : [];
         this.filter = validatedFilters.result;
 
         // Show not found filter items warning message
@@ -238,14 +240,14 @@ export default {
       if (this.cascaderIsReady) {
         this.resetPageNavigation()
         if (filter) {
-          if (this.$refs.filtersRef.addFilter(filter))
+          if (this.$refs.filtersRef.addFilters(filter))
             this.$refs.filtersRef.initiateSearch()
         }
       } else {
         if (Array.isArray(this.filter)) {
-          this.filter.push(filter)
+          this.filter.push(...filter)
         } else {
-          this.filter = [filter]
+          this.filter = [...filter]
         }
       }
     },
@@ -257,6 +259,14 @@ export default {
       this.searchInput = '';
       this.searchAndFilterUpdate();
     },
+    onResetClick: function () {
+      this.openSearch([], '')
+      this.$emit('search-changed', {
+        value: this.searchInput,
+        tabType: 'dataset',
+        type: 'reset-update',
+      })
+    },
     searchEvent: function (event = false) {
       if (event.keyCode === 13 || event instanceof MouseEvent) {
         this.searchInput = this.searchInput.trim();

package/src/components/SearchFilters.vue

@@ -290,7 +290,7 @@ export default {
     createChildrenCascaderValue: function(children, facet, facets) {
       if (children?.length) {
         children.forEach((facetItem, i) => {
-          //copy the facets into 
+          //copy the facets into
           if (children[i].facetPropPath !== 'pennsieve.organization.name') {
             children[i].label = convertReadableLabel(
               facetItem.label
@@ -488,12 +488,12 @@ export default {
         // term and facets will be the keys
         // values will be either empty object or another object with next level's facet as key
         if (term && this.correctnessCheck.term.has(term)) {
-          if (!(term in this.cascaderTags)) {            
+          if (!(term in this.cascaderTags)) {
             this.cascaderTags[term] = {}
             this.cascaderTagsClone[term] = {}
           }
           if (facetLabel && this.correctnessCheck.facet.has(facetLabel)) {
-            if (!(facetLabel in this.cascaderTags[term])) {            
+            if (!(facetLabel in this.cascaderTags[term])) {
               this.cascaderTags[term][facetLabel] = {}
               if (termId) {
                 this.cascaderTagsClone[term][termId + ':' + facetLabel] = {}
@@ -502,12 +502,12 @@ export default {
               }
             }
             if (facet2 && this.correctnessCheck.facet2.has(facet2)) {
-              if (!(facet2 in this.cascaderTags[term][facetLabel])) {            
+              if (!(facet2 in this.cascaderTags[term][facetLabel])) {
                 this.cascaderTags[term][facetLabel][facet2] = {}
                 this.cascaderTagsClone[term][facetLabel][facet2] = {}
               }
               if (facet3 && this.correctnessCheck.facet3.has(facet3)) {
-                if (!(facet3 in this.cascaderTags[term][facetLabel][facet2])) {            
+                if (!(facet3 in this.cascaderTags[term][facetLabel][facet2])) {
                   this.cascaderTags[term][facetLabel][facet2][facet3] = {}
                   this.cascaderTagsClone[term][facetLabel][facet2][facet3] = {}
                 }
@@ -677,11 +677,12 @@ export default {
           hString = cascadeEventItem[layers - 1]
         } else {
           hString = cascadeEventItem[layers - 2]
-          bString = cascadeEventItem[layers - 1]
         }
       } else {
         hString = cascadeEventItem[1]
-        bString = undefined
+      }
+      if (layers >= 3 && typeof cascadeEventItem[layers - 1] === "boolean") {
+        bString = cascadeEventItem[layers - 1]
       }
       return { hString, bString }
     },
@@ -922,6 +923,15 @@ export default {
         }
       }
     },
+    addFilters: function (filters) {
+      let filterHasChanged = false
+      if (this.cascaderIsReady) {
+        filters.forEach(filter => {
+          filterHasChanged = filterHasChanged || this.addFilter(filter)
+        })
+      }
+      return filterHasChanged
+    },
     initiateSearch: function () {
       this.cascadeEvent(this.cascadeSelectedWithBoolean)
     },
@@ -991,8 +1001,11 @@ export default {
                 facet,
                 facetPropPath: filter.facetPropPath,
                 ...(facet2 && { facet2 }),
-                ...(facet3 && { facet3 })
+                ...(facet3 && { facet3 }),
               };
+              if ('AND' in filter) {
+                fObject.AND = filter.AND
+              }
               // all the child fact will be checked if parent is matched
               if (previousMatched || labelMatched) {
                 if (isConnectivity) {

package/src/components/SideBar.vue

@@ -55,7 +55,6 @@
                 :showVisibilityFilter="showVisibilityFilter"
                 @search-changed="searchChanged(tab.id, $event)"
                 @hover-changed="hoverChanged(tab.id, $event)"
-                @connectivity-explorer-reset="onConnectivityExplorerReset"
                 @show-connectivity="showConnectivity"
                 @show-reference-connectivities="onShowReferenceConnectivities"
                 @connectivity-hovered="onConnectivityHovered"
@@ -230,12 +229,6 @@ export default {
         this.activeAnnotationData = data;
       }
     },
-    /**
-     * This event is emitted after clicking reset button in connectivity explorer
-     */
-    onConnectivityExplorerReset: function (payload) {
-      this.$emit('connectivity-explorer-reset', payload);
-    },
     /**
      * This event is emitted when the show connectivity button is clicked.
      * @arg featureIds
@@ -320,14 +313,21 @@ export default {
      * @public
      */
     addFilter: function (filter) {
-      this.drawerOpen = true
-      filter.AND = true // When we add a filter external, it is currently only with an AND boolean
-
-      // Because refs are in v-for, nextTick is needed here
-      this.$nextTick(() => {
-        const datasetExplorerTabRef = this.getTabRef(undefined, 'datasetExplorer', true);
-        datasetExplorerTabRef.addFilter(filter)
-      })
+      if (filter) {
+        this.drawerOpen = true
+        let filterToAdd = filter;
+        if (Array.isArray(filter)) {
+          filterToAdd.forEach(item => item.AND = true);
+        } else {
+          filter.AND = true // When we add a filter external, it is currently only with an AND boolean
+          filterToAdd = [filter]
+        }
+        // Because refs are in v-for, nextTick is needed here
+        this.$nextTick(() => {
+          const datasetExplorerTabRef = this.getTabRef(undefined, 'datasetExplorer', true);
+          datasetExplorerTabRef.addFilter(filterToAdd)
+        })
+      }
     },
     openNeuronSearch: function (neuron) {
       this.drawerOpen = true