@abi-software/flatmapvuer 1.10.3-beta.0 → 1.10.3-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.10.3-beta.0",
+  "version": "1.10.3-beta.2",
   "license": "Apache-2.0",
   "files": [
     "dist/*",

package/src/components/FlatmapVuer.vue

@@ -2067,7 +2067,17 @@ export default {
           const featureId = data[0].feature?.featureId;
           const annotation = this.mapImp.annotations.get(featureId);
           const anatomicalNodes = annotation?.['anatomical-nodes'];
-          const uniqueResource = anatomicalNodes ? JSON.parse(anatomicalNodes[0]) : transformResources;
+          let anatomicalNode;
+          let uniqueResource = transformResources;
+          const models = annotation?.['models'];
+          if (anatomicalNodes?.length) {
+            anatomicalNode = anatomicalNodes[anatomicalNodes.length - 1];
+          }
+          if (anatomicalNode) {
+            uniqueResource = JSON.parse(anatomicalNode);
+          } else if (models) {
+            uniqueResource = [models, []];
+          }
 
           // if (this.connectionType === 'Origin') {
             // Competency Query API
@@ -2986,6 +2996,23 @@ export default {
         }
         const connectionFilters = [];
         const flatmapKnowledge = _flatmapKnowledge || this.getFlatmapKnowledge();
+        const mapKnowledge = this.mapImp.pathways.paths;
+        flatmapKnowledge.forEach((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];
+              for (let key in knowledge['node-phenotypes']) {
+                if (mapNodePhenotypes[key]) {
+                  knowledge['node-phenotypes'][key].push(...mapNodePhenotypes[key]);
+                }
+              }
+            }
+          }
+        })
         const originItems = await extractOriginItems(this.flatmapAPI, flatmapKnowledge);
         const viaItems = await extractViaItems(this.flatmapAPI, flatmapKnowledge);
         const destinationItems = await extractDestinationItems(this.flatmapAPI, flatmapKnowledge);
@@ -2994,7 +3021,7 @@ export default {
           const key = JSON.stringify(item.key);
           return {
             key: `flatmap.connectivity.source.${facet}.${key}`,
-            label: item.label
+            label: item.label || key
           };
         }
 
@@ -3008,6 +3035,18 @@ export default {
             childrenList = destinationItems.map((item) => transformItem(facet, item));
           }
 
+          // Those without label but key should be below
+          childrenList = childrenList.sort((a, b) => {
+            const isAlpha = (str) => /^[a-zA-Z]/.test(str);
+            const aAlpha = isAlpha(a.label);
+            const bAlpha = isAlpha(b.label);
+
+            if (aAlpha && !bAlpha) return -1;
+            if (!aAlpha && bAlpha) return 1;
+
+            return a.label.localeCompare(b.label);
+          });
+
           connectionFilters.push({
             key: `flatmap.connectivity.source.${facet}`,
             label: facet,