@abi-software/mapintegratedvuer 1.9.0 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -50,8 +50,8 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.9.0",
-    "@abi-software/map-side-bar": "^2.8.0",
+    "@abi-software/flatmapvuer": "^1.9.1",
+    "@abi-software/map-side-bar": "^2.8.1",
     "@abi-software/map-utilities": "^1.5.0",
     "@abi-software/plotvuer": "1.0.4",
     "@abi-software/scaffoldvuer": "^1.9.0",

package/src/components/SplitDialog.vue

@@ -213,30 +213,18 @@ export default {
 
       // mix connectivites of available maps
       if (uuids.length) {
-        uuids.forEach((_uuid) => {
-          if (_uuid in this.connectivitiesStore.globalConnectivities) {
-            const connectivity = this.connectivitiesStore.globalConnectivities[_uuid];
-            combinedConnectivities.push(...connectivity);
-          }
-        });
-
-        const uniqueConnectivities = Array.from(
-          new Map(combinedConnectivities.map((item) => [item.id, item])).values()
-        );
+        this.connectivitiesStore.updateActiveConnectivityKeys(uuids);
+        const uniqueConnectivities = this.connectivitiesStore.getUniqueConnectivitiesByKeys;
 
         EventBus.emit("connectivity-knowledge", {
           data: uniqueConnectivities
         });
-
-        if (uuids.length === 1) {
-          this.connectivitiesStore.updateActiveConnectivityKey(uuid);
-        }
       } else {
         if (sckanVersion) {
           EventBus.emit("connectivity-knowledge", {
             data: this.connectivitiesStore.globalConnectivities[sckanVersion]
           });
-          this.connectivitiesStore.updateActiveConnectivityKey(sckanVersion);
+          this.connectivitiesStore.updateActiveConnectivityKeys([sckanVersion]);
         } else {
           console.warn(`There has no connectivity to show!`);
         }

package/src/components/SplitFlow.vue

@@ -653,6 +653,11 @@ export default {
       }
       this.connectivityExplorerClicked.pop();
     });
+    EventBus.on('connectivity-info-close', payload => {
+      if (this.$refs.sideBar) {
+        this.$refs.sideBar.resetConnectivitySearch();
+      }
+    });
     EventBus.on('connectivity-error', payload => {
       if (this.$refs.sideBar) {
         this.$refs.sideBar.updateConnectivityError(payload.data);

package/src/components/viewers/Flatmap.vue

@@ -21,7 +21,7 @@
       :annotationSidebar="annotationSidebar"
       @connectivity-info-open="onConnectivityInfoOpen"
       @connectivity-error="onConnectivityError"
-      :connectivityInfoSidebar="connectivityInfoSidebar"
+      @connectivity-info-close="onConnectivityInfoClose"
       :pathControls="true"
       ref="flatmap"
       @ready="flatmapReadyCall"
@@ -74,7 +74,7 @@ export default {
      * Perform a local search on this contentvuer
      */
     search: function (term) {
-      return this.$refs.flatmap.searchAndShowResult(term);
+      return this.$refs.flatmap.searchAndShowResult(term, true);
     },
     getFlatmapImp() {
       return this.$refs.flatmap?.mapImp;
@@ -102,9 +102,11 @@ export default {
     },
     flatmapReadyCall: function (flatmap) {
       let provClone = {id: this.entry.id, prov: this.getFlatmapImp().provenance}; //create clone of provenance and add id
+      const flatmapImp = flatmap.mapImp;
       EventBus.emit("mapImpProv", provClone); // send clone to context card
       this.$emit("flatmap-provenance-ready", provClone);
       this.flatmapReadyForMarkerUpdates(flatmap);
+      this.loadConnectivityKnowledge(flatmapImp);
       EventBus.emit("mapLoaded", flatmap);
     },
     onPathwaySelectionChanged: function (data) {
@@ -200,6 +202,12 @@ export default {
         currentFlatmap.showConnectivitiesByReference(payload);
       }
     });
+    EventBus.on("connectivity-query-filter", (payload) => {
+      const currentFlatmap = this.$refs.flatmap;
+      if (currentFlatmap && currentFlatmap.mapImp) {
+        this.connectivityQueryFilter(currentFlatmap, payload)
+      }
+    });
   },
 };
 </script>

package/src/components/viewers/MultiFlatmap.vue

@@ -20,6 +20,7 @@
       :annotationSidebar="annotationSidebar"
       @connectivity-info-open="onConnectivityInfoOpen"
       @connectivity-error="onConnectivityError"
+      @connectivity-info-close="onConnectivityInfoClose"
       :connectivityInfoSidebar="connectivityInfoSidebar"
       ref="multiflatmap"
       :displayMinimap="true"

package/src/mixins/ContentMixin.js

@@ -556,6 +556,9 @@ export default {
     onConnectivityError: function (errorInfo) {
       EventBus.emit('connectivity-error', errorInfo);
     },
+    onConnectivityInfoClose: function () {
+      EventBus.emit('connectivity-info-close');
+    },
     loadConnectivityKnowledge: async function (flatmapImp) {
       const sckanVersion = getKnowledgeSource(flatmapImp);
       const flatmapQueries = markRaw(new FlatmapQueries());
@@ -610,14 +613,12 @@ export default {
       return ids;
     },
     connectivityQueryFilter: async function (flatmap, data) {
-      const uuid = flatmap.mapImp.uuid;
-      // to search from sckan or uuid based on the maps showing on split screens
-      const activeConnectivityKey = this.connectivitiesStore.activeConnectivityKey || uuid;
+      const uniqueConnectivities = this.connectivitiesStore.getUniqueConnectivitiesByKeys;
       // only for those flatmaps that are shown on the split screen
       if (flatmap.$el.checkVisibility()) {
         let payload = {
           state: "default",
-          data: [...this.connectivityKnowledge[activeConnectivityKey]],
+          data: [...uniqueConnectivities],
         };
         if (data) {
           if (data.type === "query-update") {
@@ -638,7 +639,7 @@ export default {
           const ids = [...new Set(nestedIds.flat())];
           let paths = await flatmap.retrieveConnectedPaths(ids, options);
           paths = [...ids, ...paths.filter((path) => !ids.includes(path))];
-          let results = this.connectivityKnowledge[activeConnectivityKey].filter((item) => paths.includes(item.id));
+          let results = uniqueConnectivities.filter((item) => paths.includes(item.id));
           payload.data = results;
         }
         EventBus.emit("connectivity-knowledge", payload);

package/src/stores/connectivities.js

@@ -4,18 +4,32 @@ export const useConnectivitiesStore = defineStore('connectivities', {
   state: () => {
     return {
       globalConnectivities: {},
-      activeConnectivityKey: '',
+      activeConnectivityKeys: [],
     }
   },
   getters: {
+    getUniqueConnectivitiesByKeys: (state) => {
+      let combinedConnectivities = [];
+      state.activeConnectivityKeys.forEach((uuid) => {
+        if (uuid in state.globalConnectivities) {
+          const connectivity = state.globalConnectivities[uuid];
+          combinedConnectivities.push(...connectivity);
+        }
+      });
 
+      const uniqueConnectivities = Array.from(
+        new Map(combinedConnectivities.map((item) => [item.id, item])).values()
+      );
+
+      return uniqueConnectivities;
+    },
   },
   actions: {
     updateGlobalConnectivities(globalConnectivities) {
       this.globalConnectivities = globalConnectivities;
     },
-    updateActiveConnectivityKey(activeConnectivityKey) {
-      this.activeConnectivityKey = activeConnectivityKey;
+    updateActiveConnectivityKeys(activeConnectivityKeys) {
+      this.activeConnectivityKeys = activeConnectivityKeys;
     },
   }
 });