@abi-software/map-side-bar 2.2.1-alpha-1 → 2.2.1-alpha-3

package/src/algolia/algolia.js

@@ -148,29 +148,6 @@ export class AlgoliaClient {
     return ub.replace('_', ':')
   }
 
-  getAnatomyForDatasets(filter, query = '',){
-    return new Promise(resolve => {
-      this.index
-        .search(query, {
-          facets: ['*'],
-          filters: filter,
-          attributesToRetrieve: [
-            'objectID',
-            'anatomy.organ.curie',
-          ],
-          hitsPerPage: 999999,
-        })
-        .then(response => {
-          // The line below restructures the response to be an array of objects with the dataset id and the curie
-          let curieForDatsets = response.hits.map(h=>({
-            id: h.objectID,
-            terms: h.anatomy? h.anatomy.organ.map(o=>o.curie) : []
-          }))
-          resolve(curieForDatsets)
-        })
-    })
-  }
-
   /**
    * Get Search results
    * This is using fetch from the Algolia API
@@ -220,15 +197,46 @@ export class AlgoliaClient {
           filters: filter,
           attributesToHighlight: [],
           attributesToRetrieve: [
+            'objectID',
             'item.keywords.keyword',
             'anatomy.organ.name',
             'anatomy.organ.curie'
           ],
         })
         .then(response => {
-          let anatomyAsUberons = this._processAnatomy(response.hits)
-          resolve(anatomyAsUberons)
+          // Saving the line below incase we want to starty using keywords again
+          // let anatomyAsUberons = this._processAnatomy(response.hits)
+
+          resolve({
+            forFlatmap: this.processResultsForFlatmap(response.hits),
+            forScaffold: this.processResultsForScaffold(response.hits)
+          })
+        })
+    })
+  }
+  processResultsForFlatmap(hits) {
+    let curieForDatsets = hits.map(h=>({
+      id: h.objectID,
+      terms: h.anatomy? h.anatomy.organ.map(o=>o.curie) : []
+    }))
+    return curieForDatsets 
+  }
+  processResultsForScaffold(hits) {
+    let numberOfDatasetsForAnatomy = {}
+    hits.forEach(hit => {
+      if (hit.anatomy && hit.anatomy.organ ) {
+        hit.anatomy.organ.forEach(anatomy => {
+          if (anatomy.name) {
+            if (numberOfDatasetsForAnatomy[anatomy.name]) {
+              numberOfDatasetsForAnatomy[anatomy.name]++
+            } else {
+              numberOfDatasetsForAnatomy[anatomy.name] = 1
+            }
+          }
         })
+      }
     })
+    return numberOfDatasetsForAnatomy
   }
+
 }

package/src/components/SideBar.vue

@@ -205,16 +205,16 @@ export default {
        */
       this.$emit('actionClick', payLoad)
     })
-    EventBus.on('available-facets', (payLoad) => {
-      this.$emit('search-changed', {
-        type: 'available-facets',
-        value: payLoad,
-      })
+    EventBus.on('number-of-datasets-for-anatomies', (payLoad) => {
+      /**
+       * This emits a object with keys as anatomy and values as number of datasets for that anatomy.
+       * @arg payload
+       */
+      this.$emit('number-of-datasets-for-anatomies', payLoad)
     })
     EventBus.on('anatomy-in-datasets', (payLoad) => {
        /**
-       * This event is emitted when the context is updated.
-       * Example, context update on first load.
+       * This emits a lis of datasets, with the anatomy for each one. Used by flatmap for markers
        * @arg payload
        */
       this.$emit('anatomy-in-datasets', payLoad)

package/src/components/SidebarContent.vue

@@ -250,17 +250,12 @@ export default {
       // Algolia search
       
       this.loadingCards = true
-      this.algoliaClient.getAnatomyForDatasets(getFilters(filters), query)
-        .then((datasets) => {
-          EventBus.emit('anatomy-in-datasets', datasets)
-        })
       this.algoliaClient
         .anatomyInSearch(getFilters(filters), query)
-        .then((anatomy) => {
-          EventBus.emit('available-facets', {
-            uberons: anatomy,
-            labels: this.algoliaClient.anatomyFacetLabels,
-          })
+        .then((r) => {
+          // Send result anatomy to the scaffold and flatmap
+          EventBus.emit('anatomy-in-datasets', r.forFlatmap)
+          EventBus.emit('number-of-datasets-for-anatomies', r.forScaffold)
         })
       this.algoliaClient
         .search(getFilters(filters), query, this.numberPerPage, this.page)