@abi-software/flatmapvuer 1.10.3-beta.4 → 1.10.3-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.10.3-beta.4",
+  "version": "1.10.3-beta.6",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -44,7 +44,7 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/map-utilities": "^1.6.1-beta.3",
+    "@abi-software/map-utilities": "^1.6.1-beta.4",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",

package/src/components/FlatmapVuer.vue

@@ -2110,7 +2110,25 @@ export default {
           if (!isNewFilterItemExist) {
             this.connectivityfilters.push(newConnectivityfilter);
           }
-          this.$emit('neuron-connection-feature-click', this.connectivityfilters);
+
+          if (this.connectionType.toLowerCase() === 'all') {
+            const searchTerms = uniqueTerms.join();
+            this.$emit('neuron-connection-feature-click', {
+              filters: [],
+              search: searchTerms,
+            });
+          } else {
+            this.$emit('neuron-connection-feature-click', {
+              filters: this.connectivityfilters,
+              search: '',
+            });
+          }
+        } else {
+          const searchTerms = resources.join();
+          this.$emit('neuron-connection-feature-click', {
+            filters: [],
+            search: searchTerms,
+          });
         }
       } else {
         // load and store knowledge
@@ -2867,7 +2885,7 @@ export default {
       }
       return filterSources
     },
-    getFilterOptions: async function (_flatmapKnowledge) {
+    getFilterOptions: async function (providedKnowledge) {
       let filterOptions = [];
       if (this.mapImp) {
         const filterRanges = this.mapImp.featureFilterRanges()
@@ -2923,24 +2941,29 @@ export default {
           }
         }
         const connectionFilters = [];
-        const flatmapKnowledge = _flatmapKnowledge || this.getFlatmapKnowledge();
+        const baseFlatmapKnowledge = providedKnowledge || this.getFlatmapKnowledge();
         const mapKnowledge = this.mapImp.pathways.paths;
-        flatmapKnowledge.forEach((knowledge) => {
+        const flatmapKnowledge = baseFlatmapKnowledge.reduce((arr, knowledge) => {
           const id = knowledge.id;
           if (id) {
-            const matchObj = mapKnowledge[id];
-            if (matchObj) {
-              const mapConnectivity = matchObj.connectivity;
-              const mapNodePhenotypes = matchObj['node-phenotypes'];
-              knowledge.connectivity = [...knowledge.connectivity, ...mapConnectivity];
+            const mapKnowledgeObj = mapKnowledge[id];
+            if (mapKnowledgeObj) {
+              const mapConnectivity = mapKnowledgeObj.connectivity;
+              const mapNodePhenotypes = mapKnowledgeObj['node-phenotypes'];
+              // take only map connectivity
+              knowledge.connectivity = [...mapConnectivity];
               for (let key in knowledge['node-phenotypes']) {
                 if (mapNodePhenotypes[key]) {
-                  knowledge['node-phenotypes'][key].push(...mapNodePhenotypes[key]);
+                  // take only map node-phenotypes
+                  knowledge['node-phenotypes'][key] = [...mapNodePhenotypes[key]];
                 }
               }
+              // to avoid mutation
+              arr.push(JSON.parse(JSON.stringify(knowledge)));
             }
           }
-        })
+          return arr;
+        }, []);
         const knowledgeSource = this.mapImp.knowledgeSource;
         const originItems = await extractOriginItems(this.flatmapAPI, knowledgeSource, flatmapKnowledge);
         const viaItems = await extractViaItems(this.flatmapAPI, knowledgeSource, flatmapKnowledge);