@abi-software/flatmapvuer 1.13.3-demo.1 → 1.13.4-simulation.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.13.3-demo.1",
+  "version": "1.13.4-simulation.0",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -44,7 +44,7 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/map-utilities": "1.8.2",
+    "@abi-software/map-utilities": "1.8.3",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "1.0.3",
     "@element-plus/icons-vue": "^2.3.1",

package/src/App.vue

@@ -80,6 +80,7 @@
       :enableOpenMapUI="true"
       :flatmapAPI="flatmapAPI"
       :disableUI="disableUI"
+      :sparcAPI="sparcAPI"
       @open-pubmed-url="onOpenPubmedUrl"
       @pathway-selection-changed="onPathwaySelectionChanged"
       @flatmapChanged="onFlatmapChanged"
@@ -231,6 +232,15 @@ export default {
       }
     },
   },
+  computed : {
+    testDataLocation() {
+      return import.meta.env.VITE_TEST_DATA_LOCATION
+
+    },
+    sparcAPI() {
+      return import.meta.env.VITE_API_LOCATION
+    },
+  },
   provide() {
     return {
       $annotator: this.annotator,
@@ -290,6 +300,10 @@ export default {
           "taxo": "NCBITaxon:1",
           "displayWarning": true
         },
+        FC: {
+          taxo: 'FC',
+          uuid: "7720709d-683c-5def-a1e5-8d7c3b0784f7",
+        },
       },
       tooltipContent: undefined,
       tStyle: {

package/src/assets/styles.scss

@@ -3,3 +3,15 @@
 @import url('https://fonts.googleapis.com/css?family=Asap:400,400i,500,600,700&display=swap');
 
 $--color-primary: $app-primary-color !default;
+
+.flatmap-dropdown {
+  min-width: 160px !important;
+  .el-select-dropdown__item {
+    white-space: nowrap;
+    text-align: left;
+    &.is-selected {
+      color: $app-primary-color;
+      font-weight: normal;
+    }
+  }
+}

package/src/components/FlatmapVuer.vue

@@ -314,7 +314,7 @@ Please use `const` to assign meaningful names to them...
               />
               <selections-group
                 v-if="containsAlert && alertOptions && showPathwayFilter"
-                title="Alert"
+                title="Notes"
                 labelKey="label"
                 identifierKey="key"
                 :selections="alertOptions"
@@ -1283,11 +1283,6 @@ export default {
         if (this.$refs.pathwaysSelection) {
           this.$refs.pathwaysSelection.reset()
         }
-
-        this.trackEvent({
-          'event_name': `portal_maps_zoom`,
-          'category': 'reset',
-        });
       }
     },
     /**
@@ -1298,11 +1293,6 @@ export default {
     zoomIn: function () {
       if (this.mapImp) {
         this.mapImp.zoomIn()
-
-        this.trackEvent({
-          'event_name': `portal_maps_zoom`,
-          'category': 'zoom_in',
-        });
       }
     },
     /**
@@ -1313,11 +1303,6 @@ export default {
     zoomOut: function () {
       if (this.mapImp) {
         this.mapImp.zoomOut()
-
-        this.trackEvent({
-          'event_name': `portal_maps_zoom`,
-          'category': 'zoom_out',
-        });
       }
     },
     onSelectionsDataChanged: function (data) {
@@ -3168,19 +3153,6 @@ export default {
     setConnectionType: function (type) {
       this.connectionType = type;
     },
-    /**
-     * @public
-     * Function to track events.
-     * @arg {Object} `data`
-     */
-    trackEvent: function (data) {
-      const taggingData = {
-        'event': 'interaction_event',
-        'location': 'flatmap',
-        ...data,
-      };
-      this.$emit('trackEvent', taggingData);
-    },
   },
   props: {
     /**

package/src/components/MultiFlatmapVuer.vue

@@ -93,7 +93,6 @@
       :showLocalSettings="showLocalSettings"
       :showOpenMapButton="showOpenMapButton"
       :showPathwayFilter="showPathwayFilter"
-      @trackEvent="trackEvent"
       :externalLegends="externalLegends"
     />
 
@@ -107,6 +106,7 @@
 import { markRaw } from 'vue'
 import EventBus from './EventBus'
 import FlatmapVuer from './FlatmapVuer.vue'
+import FlatmapError from './FlatmapError.vue'
 import flatmap from '../services/flatmapLoader.js'
 import {
   ElCol as Col,
@@ -136,6 +136,7 @@ export default {
     Select,
     Popover,
     FlatmapVuer,
+    FlatmapError,
   },
   created: function () {
     this.loadMapManager();
@@ -644,19 +645,6 @@ export default {
       let map = this.getCurrentFlatmap();
       map.setConnectionType(type);
     },
-    /**
-     * @public
-     * Function to track events.
-     * @arg {Object} `data`
-     */
-    trackEvent: function (data) {
-      const taggingData = {
-        'event': 'interaction_event',
-        'location': 'flatmap',
-        ...data,
-      };
-      this.$emit('trackEvent', taggingData);
-    },
   },
   props: {
     /**

package/src/components/index.js

@@ -1,6 +1,20 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
-import FlatmapVuer from "./FlatmapVuer.vue";
-import MultiFlatmapVuer from "./MultiFlatmapVuer.vue";
+import FlatmapVuer from './FlatmapVuer.vue'
+import MultiFlatmapVuer from './MultiFlatmapVuer.vue'
+import { FlatmapQueries } from '../services/flatmapQueries.js'
+import {
+  getKnowledgeSource,
+  getKnowledgeSourceFromProvenance,
+  loadAndStoreKnowledge,
+} from '../services/flatmapKnowledge.js'
 
-export { FlatmapVuer, MultiFlatmapVuer };
+export {
+  FlatmapQueries,
+  FlatmapVuer,
+  getKnowledgeSource,
+  getKnowledgeSourceFromProvenance,
+  loadAndStoreKnowledge,
+  MultiFlatmapVuer,
+}
+// export { FlatmapVuer, MultiFlatmapVuer };

package/src/services/apsTestData.js

@@ -0,0 +1,40 @@
+const resolveURL = (relative, base) => {
+  const resolved = new URL(relative, base);
+  return resolved.href;
+}
+
+const retrieveOmexData = async (url, uuid) => {
+  if (url) {
+    const response = await fetch(url);
+    const data = await response.json();
+    const simulation = [];
+    for (const entry of data) {
+      let found = false;
+      if (entry.flatmaps) {
+        for (const flatmap of entry.flatmaps) {
+          if (flatmap.associated_flatmap?.identifier === uuid) {
+            found = true;
+          }
+        }
+      }
+      if (found && ('simulation' in entry)) {
+        entry.simulation.forEach((item) => {
+          if (item.resource?.url) {
+            item.resource.url = resolveURL(item.resource.url, url);
+          }
+          item.datasetId = entry.datasetId;
+        });
+        simulation.push(...entry.simulation);
+      }
+    }
+    if (simulation.length) {
+      return {testData: true, simulation};
+    }
+  }
+  return undefined;
+}
+
+
+export {
+  retrieveOmexData,
+};

package/src/services/flatmapKnowledge.js

@@ -141,6 +141,7 @@ export {
   getReferenceConnectivitiesFromStorage,
   getReferenceConnectivitiesByAPI,
   loadAndStoreKnowledge,
+  getFlatmapKnowledge,
   getKnowledgeSource,
   getKnowledgeSourceFromProvenance,
   refreshFlatmapKnowledgeCache,

package/src/services/flatmapLoader.js

@@ -1,6 +1,6 @@
 /**
  * a single source for the flatmap-viewer library import
  */
-import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.4.3/+esm';
+import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.6.4/+esm';
 
 export default flatmap;