@abi-software/mapintegratedvuer 1.9.0-beta.2 → 1.9.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.9.0-beta.2",
+  "version": "1.9.0-beta.4",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -50,11 +50,11 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.9.0-beta.2",
-    "@abi-software/map-side-bar": "^2.7.3-beta.3",
-    "@abi-software/map-utilities": "^1.5.0-beta.2",
+    "@abi-software/flatmapvuer": "^1.9.0-beta.3",
+    "@abi-software/map-side-bar": "^2.7.3-beta.6",
+    "@abi-software/map-utilities": "^1.5.0-beta.3",
     "@abi-software/plotvuer": "^1.0.3",
-    "@abi-software/scaffoldvuer": "^1.9.0-beta.1",
+    "@abi-software/scaffoldvuer": "^1.9.0-beta.3",
     "@abi-software/simulationvuer": "1.0.1",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "^1.0.1",

package/src/components/DialogToolbarContent.vue

@@ -113,46 +113,32 @@
       >
         <template v-if="displayShareOptions">
           <el-row>
-            <el-col :span="8">
-              <el-popover class="tooltip"
-                content="Create a permanent link for current views and settings." 
-                placement="bottom-end"
-                :show-after="helpDelay" :teleported=false trigger="hover"
-                popper-class="header-popper"
+            <el-col :offset="3" :span="8">
+              <el-button
+                type="primary"
+                size="small"
+                @click="getShareLink(exportAnnotation)"
+                class="share-options"
               >
-                <template #reference>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    @click="getShareLink(false)"
-                    class="share-options"
-                  >
-                    Settings Only
-                  </el-button>
-                </template>
-              </el-popover>
+                Create Permalink
+              </el-button>
             </el-col>
-            <el-col :span="14">
+            <el-col :span="10">
               <el-popover class="tooltip"
                 placement="bottom-end"
                 :show-after="helpDelay" :teleported=false trigger="hover"
                 popper-class="header-popper"
               >
                 <template #reference>
-                  <el-button
-                    type="primary"
+                  <el-checkbox
+                    v-model="exportAnnotation"
                     size="small"
-                    @click="getShareLink(true)"
-                    class="share-options"
                   >
-                    Settings with Annotations
-                    (Valid for 30 days)
-                  </el-button>
+                    Export Annotations
+                  </el-checkbox>
                 </template>
                 <template #default>
-                  Create a link for current views settings 
-                  <br>
-                  and anonymous annotations.
+                  Create a permalink with anonymous annotations.
                   <br>
                   NOTE: Annotations will only be stored for
                   <br>
@@ -286,6 +272,7 @@ import {
 } from '@element-plus/icons-vue';
 import {
   ElButton as Button,
+  ElCheckbox as Checkbox,
   ElCol as Col,
   ElIcon as Icon,
   ElInput as Input,
@@ -303,6 +290,7 @@ export default {
   name: "DialogToolbarContent",
   components: {
     Button,
+    Checkbox,
     Col,
     Icon,
     Input,
@@ -371,16 +359,17 @@ export default {
   },
   data: function() {
     return {
-      isFullscreen: false,
-      loadingLink: true,
-      displayShareOptions: false,
-      independent: true,
-      failedSearch: undefined,
       activeViewRef: undefined,
-      permalinkRef: undefined,
-      globalSettingRef: undefined,
+      displayShareOptions: false,
       ElIconCopyDocument: shallowRef(ElIconCopyDocument),
+      exportAnnotation: false,
+      failedSearch: undefined,
       globalSettings: {},
+      globalSettingRef: undefined,
+      independent: true,
+      isFullscreen: false,
+      loadingLink: true,
+      permalinkRef: undefined,
     }
   },
   methods: {

package/src/components/SplitFlow.vue

@@ -647,9 +647,9 @@ export default {
       }
       this.connectivityExplorerClicked = false;
     });
-    EventBus.on('connectivity-graph-error', payload => {
+    EventBus.on('connectivity-error', payload => {
       if (this.$refs.sideBar) {
-        this.$refs.sideBar.updateConnectivityGraphError(payload.data);
+        this.$refs.sideBar.updateConnectivityError(payload.data);
       }
     });
     EventBus.on("OpenNewMap", type => {

package/src/components/viewers/Flatmap.vue

@@ -20,7 +20,7 @@
       @annotation-close="onAnnotationClose"
       :annotationSidebar="annotationSidebar"
       @connectivity-info-open="onConnectivityInfoOpen"
-      @connectivity-graph-error="onConnectivityGraphError"
+      @connectivity-error="onConnectivityError"
       :connectivityInfoSidebar="connectivityInfoSidebar"
       :pathControls="true"
       ref="flatmap"

package/src/components/viewers/MultiFlatmap.vue

@@ -19,7 +19,7 @@
       @annotation-close="onAnnotationClose"
       :annotationSidebar="annotationSidebar"
       @connectivity-info-open="onConnectivityInfoOpen"
-      @connectivity-graph-error="onConnectivityGraphError"
+      @connectivity-error="onConnectivityError"
       :connectivityInfoSidebar="connectivityInfoSidebar"
       ref="multiflatmap"
       :displayMinimap="true"

package/src/components.d.ts

@@ -16,6 +16,7 @@ declare module 'vue' {
     DialogToolbarContent: typeof import('./components/DialogToolbarContent.vue')['default']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElHeader: typeof import('element-plus/es')['ElHeader']

package/src/mixins/ContentMixin.js

@@ -539,8 +539,8 @@ export default {
     onConnectivityInfoOpen: function (connectivityInfoData) {
       EventBus.emit('connectivity-info-open', connectivityInfoData);
     },
-    onConnectivityGraphError: function (errorInfo) {
-      EventBus.emit('connectivity-graph-error', errorInfo);
+    onConnectivityError: function (errorInfo) {
+      EventBus.emit('connectivity-error', errorInfo);
     },
     loadConnectivityKnowledge: async function (flatmap) {
       const sckanVersion = getKnowledgeSource(flatmap);
@@ -551,13 +551,16 @@ export default {
       const mapPathsData = await flatmapQueries.queryMapPaths(uuid);
       const pathsFromMap = mapPathsData ? mapPathsData.paths : {};
 
-      this.connectivityKnowledge[uuid] = knowledge.filter((item) => {
-        if (item.source === sckanVersion && item.connectivity?.length && item.id in pathsFromMap) {
-          return true;
-        }
-        return false;
-      });
-      EventBus.emit("connectivity-knowledge", { type: "default", data: this.connectivityKnowledge[uuid] });
+      this.connectivityKnowledge[uuid] = knowledge
+        .filter((item) => {
+          return (
+            item.source === sckanVersion &&
+            item.connectivity?.length &&
+            item.id in pathsFromMap
+          );
+        })
+        .sort((a, b) => a.label.localeCompare(b.label));
+      EventBus.emit("connectivity-knowledge", { data: this.connectivityKnowledge[uuid] });
     },
     getSearchedId: function (flatmap, term) {
       let ids = [];
@@ -600,7 +603,6 @@ export default {
         let paths = await flatmap.retrieveConnectedPaths(ids, options);
         paths = [...ids, ...paths.filter((path) => !ids.includes(path))];
         let results = this.connectivityKnowledge[uuid].filter((item) => paths.includes(item.id));
-        results.sort((a, b) => paths.indexOf(a.id) - paths.indexOf(b.id));
         payload.data = results;
       }
       EventBus.emit("connectivity-knowledge", payload);