@abi-software/map-side-bar 2.7.2 → 2.7.3-beta.0

package/package.json

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

package/src/App.vue

@@ -213,10 +213,11 @@ export default {
             facetPropPath: 'attributes.subject.sex.value',
           },
           {
-            facet: 'Cardiovascular system',
-            facet2: 'Heart',
+            facet: 'Heart',
             term: 'Anatomical structure',
+            facetSubPropPath: "anatomy.organ.name",
             facetPropPath: 'anatomy.organ.category.name',
+            label :'Heart',
             AND: true,
           },
           {

package/src/algolia/utils.js

@@ -68,7 +68,7 @@ export function getFilters(selectedFacetArray=undefined) {
   }
 
   // Switch the 'term' attribute to 'label' if 'label' does not exist
-  selectedFacetArray.forEach(f=>f.label=f.facet)
+  selectedFacetArray.forEach(f=>f.label = f.facet2 ? f.facet2 : f.facet)
 
 
   let facets = removeShowAllFacets(selectedFacetArray)

package/src/components/ConnectivityInfo.vue

@@ -61,6 +61,21 @@
     <div class="content-container population-display">
       <div class="block attribute-title-container">
         <span class="attribute-title">Population Display</span>
+        <el-popover
+          v-if="activeView === 'listView'"
+          width="250"
+          trigger="hover"
+          :teleported="false"
+          popper-class="popover-origin-help"
+        >
+          <template #reference>
+            <el-icon class="info"><el-icon-warning /></el-icon>
+          </template>
+          <span style="word-break: keep-all">
+            This list is ordered alphabetically,
+            switch to graph view for path details.
+          </span>
+        </el-popover>
       </div>
       <div class="block buttons-row">
         <el-button
@@ -126,20 +141,6 @@
       >
         <div class="attribute-title-container">
           <span class="attribute-title">Components</span>
-          <el-popover
-            width="250"
-            trigger="hover"
-            :teleported="false"
-            popper-class="popover-origin-help"
-          >
-            <template #reference>
-              <el-icon class="info"><el-icon-warning /></el-icon>
-            </template>
-            <span style="word-break: keep-all">
-              The list is not in any specific order.<br>
-              Specific paths can be viewed using Graph View.
-            </span>
-          </el-popover>
         </div>
         <div
           v-for="(component, i) in entry.components"

package/src/components/SidebarContent.vue

@@ -196,6 +196,7 @@ export default {
             this.searchAlgolia(this.filter, search)
           }
           this.$refs.filtersRef.setCascader(this.filter)
+          this.searchHistoryUpdate(this.filter, search);
         }
       } else {
         //cascader is not ready, perform search if no filter is set,
@@ -203,6 +204,7 @@ export default {
         this.filter = filter
         if ((!filter || filter.length == 0) && option.withSearch) {
           this.searchAlgolia(this.filter, search)
+          this.searchHistoryUpdate(this.filter, search);
         }
       }
     },
@@ -260,12 +262,16 @@ export default {
       this.resetPageNavigation();
       const transformedFilters = this.transformFiltersBeforeSearch(this.filters);
       this.searchAlgolia(transformedFilters, this.searchInput);
+      this.searchHistoryUpdate(this.filters, this.searchInput);
+    },
+    searchHistoryUpdate: function (filters, search) {
       this.$refs.searchHistory.selectValue = 'Search history';
       // save history only if there has value
-      if (this.filters.length || this.searchInput?.trim()) {
+      if (filters.length || search?.trim()) {
+        const transformedFilters = this.transformFiltersBeforeSearch(filters);
         this.$refs.searchHistory.addSearchToHistory(
-          this.filters,
-          this.searchInput
+          transformedFilters,
+          search
         );
       }
     },

package/src/services/flatmapKnowledge.js

@@ -1,94 +0,0 @@
-async function getReferenceConnectivitiesFromStorage(resource) {
-  const flatmapKnowledgeRaw = sessionStorage.getItem('flatmap-knowledge');
-
-  if (flatmapKnowledgeRaw) {
-    const flatmapKnowledge = JSON.parse(flatmapKnowledgeRaw);
-    const dataWithRefs = flatmapKnowledge.filter((x) => x.references && x.references.length);
-    const foundData = dataWithRefs.filter((x) => x.references.includes(resource));
-
-    if (foundData.length) {
-      const featureIds = foundData.map((x) => x.id);
-      return featureIds;
-    }
-  }
-  return [];
-}
-
-async function getReferenceConnectivitiesByAPI(mapImp, resource, flatmapQueries) {
-  const knowledgeSource = getKnowledgeSource(mapImp);
-  const sql = `select knowledge from knowledge
-    where source="${knowledgeSource}" and
-    knowledge like "%${resource}%" order by source desc`;
-  console.log(sql)
-  const response = await flatmapQueries.flatmapQuery(sql);
-  const mappedData = response.values.map((x) => x[0]);
-  const parsedData = mappedData.map((x) => JSON.parse(x));
-  const featureIds = parsedData.map((x) => x.id);
-  return featureIds;
-}
-
-function getKnowledgeSource(mapImp) {
-  let mapKnowledgeSource = '';
-  if (mapImp.provenance?.connectivity) {
-    const sckanProvenance = mapImp.provenance.connectivity;
-    if ('knowledge-source' in sckanProvenance) {
-      mapKnowledgeSource = sckanProvenance['knowledge-source'];
-    } else if ('npo' in sckanProvenance) {
-      mapKnowledgeSource = `${sckanProvenance.npo.release}-npo`;
-    }
-  }
-
-  return mapKnowledgeSource;
-}
-
-function loadAndStoreKnowledge(mapImp, flatmapQueries) {
-  const knowledgeSource = getKnowledgeSource(mapImp);
-  const sql = `select knowledge from knowledge
-    where source="${knowledgeSource}"
-    order by source desc`;
-  const flatmapKnowledge = sessionStorage.getItem('flatmap-knowledge');
-
-  if (!flatmapKnowledge) {
-    flatmapQueries.flatmapQuery(sql).then((response) => {
-      const mappedData = response.values.map(x => x[0]);
-      const parsedData = mappedData.map(x => JSON.parse(x));
-      sessionStorage.setItem('flatmap-knowledge', JSON.stringify(parsedData));
-      updateFlatmapKnowledgeCache();
-    });
-  }
-}
-
-function updateFlatmapKnowledgeCache() {
-  const CACHE_LIFETIME = 24 * 60 * 60 * 1000; // One day
-  const now = new Date();
-  const expiry = now.getTime() + CACHE_LIFETIME;
-
-  sessionStorage.setItem('flatmap-knowledge-expiry', expiry);
-}
-
-function removeFlatmapKnowledgeCache() {
-  const keys = [
-    'flatmap-knowledge',
-    'flatmap-knowledge-expiry',
-  ];
-  keys.forEach((key) => {
-    sessionStorage.removeItem(key);
-  });
-}
-
-function refreshFlatmapKnowledgeCache() {
-  const expiry = sessionStorage.getItem('flatmap-knowledge-expiry');
-  const now = new Date();
-
-  if (now.getTime() > expiry) {
-    removeFlatmapKnowledgeCache();
-  }
-}
-
-export {
-  getReferenceConnectivitiesFromStorage,
-  getReferenceConnectivitiesByAPI,
-  loadAndStoreKnowledge,
-  getKnowledgeSource,
-  refreshFlatmapKnowledgeCache,
-}