@abi-software/mapintegratedvuer 0.7.2-vue3.0-alpha.0 → 1.0.1

package/src/mixins/DynamicMarkerMixin.js

@@ -1,88 +1,88 @@
-
-import markerZoomLevels from "../components/markerZoomLevelsHardCoded.js";
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '../stores/settings';
-
-
-/*
-* Function to check markers visibility at the given zoom level.
-* I have modified it to make sure the marker is displayed
-* if the uberon is not present in the hardcoded zoom-level list.
-*/
-const checkMarkersAtZoomLevel = (flatmapImp, markers, zoomLevel) => {
-  if (markers) {
-    markers.forEach(id => {
-      let foundInArray = false;
-      // First check if uberon is in the list, check for zoom level
-      // if true. Note: markerZoomLevels is imported.
-      for (let i = 0; i < markerZoomLevels.length; i++) {
-        if (markerZoomLevels[i].id === id) {
-          foundInArray = true;
-          if (zoomLevel >= markerZoomLevels[i].showAtZoom) {
-            flatmapImp.addMarker(id, {className: "standard-marker"});
-          }
-          break;
-        }
-      }
-      // Did not match, add it regardless so we do not lose any
-      // markers.
-      if (!foundInArray) {
-        flatmapImp.addMarker(id, {className: "standard-marker"});
-      }
-    });
-  }
-};
-  
-/* eslint-disable no-alert, no-console */
-export default {
-  computed: {
-    ...mapStores(useSettingsStore),
-  },
-  methods: {
-    flatmapPanZoomCallback: function (payload) {
-      if (this.mouseHovered) {
-        const result = {
-          paneIndex: this.entry.id,
-          eventType: "panZoom",
-          payload: payload,
-          type: this.entry.type,
-        };
-        this.flatmapMarkerZoomUpdate(false, undefined);
-        this.$emit("resource-selected", result);
-      }
-    },
-        /**
-     * Function used for updating the flatmap markers.
-     * It will only update the markers if zoom level has changed or
-     * the force flag is true.
-     */
-    flatmapMarkerZoomUpdate(force, flatmap) {
-      if (!this.flatmapReady) return;
-
-      let flatmapImp = flatmap;
-      if (!flatmapImp)
-        flatmapImp = this.getFlatmapImp();
-
-      if (flatmapImp) {
-        let currentZoom = flatmapImp.getZoom()["zoom"];
-        if (force || this.zoomLevel !== currentZoom) {
-          this.zoomLevel = currentZoom;
-          flatmapImp.clearMarkers();
-          let markers = this.settingsStore.markers;
-          checkMarkersAtZoomLevel(flatmapImp, markers, this.zoomLevel);
-          if (this.entry.type === "MultiFlatmap") {
-            this.restoreFeaturedMarkers(flatmapImp);
-          }
-        }
-      }
-    },
-    flatmapReadyForMarkerUpdates: function (flatmap) {
-      if (flatmap) {
-        flatmap.enablePanZoomEvents(true); // Use zoom events for dynamic markers
-        this.flatmapReady = true;
-        const flatmapImp = flatmap.mapImp;
-        this.flatmapMarkerZoomUpdate(true, flatmapImp);
-      }
-    },
-  }
-}
+
+import markerZoomLevels from "../components/markerZoomLevelsHardCoded.js";
+import { mapStores } from 'pinia';
+import { useSettingsStore } from '../stores/settings';
+
+
+/*
+* Function to check markers visibility at the given zoom level.
+* I have modified it to make sure the marker is displayed
+* if the uberon is not present in the hardcoded zoom-level list.
+*/
+const checkMarkersAtZoomLevel = (flatmapImp, markers, zoomLevel) => {
+  if (markers) {
+    markers.forEach(id => {
+      let foundInArray = false;
+      // First check if uberon is in the list, check for zoom level
+      // if true. Note: markerZoomLevels is imported.
+      for (let i = 0; i < markerZoomLevels.length; i++) {
+        if (markerZoomLevels[i].id === id) {
+          foundInArray = true;
+          if (zoomLevel >= markerZoomLevels[i].showAtZoom) {
+            flatmapImp.addMarker(id, {className: "standard-marker"});
+          }
+          break;
+        }
+      }
+      // Did not match, add it regardless so we do not lose any
+      // markers.
+      if (!foundInArray) {
+        flatmapImp.addMarker(id, {className: "standard-marker"});
+      }
+    });
+  }
+};
+  
+/* eslint-disable no-alert, no-console */
+export default {
+  computed: {
+    ...mapStores(useSettingsStore),
+  },
+  methods: {
+    flatmapPanZoomCallback: function (payload) {
+      if (this.mouseHovered) {
+        const result = {
+          paneIndex: this.entry.id,
+          eventType: "panZoom",
+          payload: payload,
+          type: this.entry.type,
+        };
+        this.flatmapMarkerZoomUpdate(false, undefined);
+        this.$emit("resource-selected", result);
+      }
+    },
+        /**
+     * Function used for updating the flatmap markers.
+     * It will only update the markers if zoom level has changed or
+     * the force flag is true.
+     */
+    flatmapMarkerZoomUpdate(force, flatmap) {
+      if (!this.flatmapReady) return;
+
+      let flatmapImp = flatmap;
+      if (!flatmapImp)
+        flatmapImp = this.getFlatmapImp();
+
+      if (flatmapImp) {
+        let currentZoom = flatmapImp.getZoom()["zoom"];
+        if (force || this.zoomLevel !== currentZoom) {
+          this.zoomLevel = currentZoom;
+          flatmapImp.clearMarkers();
+          let markers = this.settingsStore.markers;
+          checkMarkersAtZoomLevel(flatmapImp, markers, this.zoomLevel);
+          if (this.entry.type === "MultiFlatmap") {
+            this.restoreFeaturedMarkers(flatmapImp);
+          }
+        }
+      }
+    },
+    flatmapReadyForMarkerUpdates: function (flatmap) {
+      if (flatmap) {
+        flatmap.enablePanZoomEvents(true); // Use zoom events for dynamic markers
+        this.flatmapReady = true;
+        const flatmapImp = flatmap.mapImp;
+        this.flatmapMarkerZoomUpdate(true, flatmapImp);
+      }
+    },
+  }
+}

package/src/mixins/S3Bucket.vue

@@ -1,37 +1,37 @@
-<script>
-export default {
-  name: "S3Bucket",
-  data() {
-    return {
-      s3Bucket: undefined,
-      s3Prefix: "",
-    };
-  },
-  methods: {
-    updateS3Bucket: function(s3uri) {
-      this.s3Bucket = undefined;
-      if (s3uri) {
-        const substring = s3uri.split("//")[1];
-        if (substring) {
-          this.s3Bucket = substring.split("/")[0];
-          const n = substring.indexOf('/');
-          this.s3Prefix = substring.substring(n + 1);
-          return;
-        }
-      }
-    },
-    getS3Args: function() {
-      if (this.s3Bucket) {
-        return `?s3BucketName=${this.s3Bucket}`
-      }
-      return "";
-    },
-    getS3Prefix: function() {
-      return this.s3Prefix;
-    }
-  },
-
-};
-</script>
-
-
+<script>
+export default {
+  name: "S3Bucket",
+  data() {
+    return {
+      s3Bucket: undefined,
+      s3Prefix: "",
+    };
+  },
+  methods: {
+    updateS3Bucket: function(s3uri) {
+      this.s3Bucket = undefined;
+      if (s3uri) {
+        const substring = s3uri.split("//")[1];
+        if (substring) {
+          this.s3Bucket = substring.split("/")[0];
+          const n = substring.indexOf('/');
+          this.s3Prefix = substring.substring(n + 1);
+          return;
+        }
+      }
+    },
+    getS3Args: function() {
+      if (this.s3Bucket) {
+        return `?s3BucketName=${this.s3Bucket}`
+      }
+      return "";
+    },
+    getS3Prefix: function() {
+      return this.s3Prefix;
+    }
+  },
+
+};
+</script>
+
+

package/src/stores/entries.js

@@ -1,40 +1,40 @@
-import { defineStore } from 'pinia';
-import { initialDefaultState } from "../components/scripts/utilities";
-
-/* eslint-disable no-alert, no-console */
-
-export const useEntriesStore = defineStore('entries', {
-  state: () => {
-    return initialDefaultState();
-  },
-  getters: {
-    findIndexOfId: (state) => id => {
-      for (let i = 0; i < state.entries.length; i++) {
-        if (state.entries[i].id == id) {
-          return i;
-        }
-      }
-      return -1;
-    },
-  },
-  actions: {
-    addNewEntry(entry) {
-      this.entries.push(entry);
-    },
-    destroyEntry(index) {
-      if (index > -1) {
-        this.entries.splice(index, 1);
-      }
-    },
-    setAll(newEntries) {
-      this.entries = [];
-      Object.assign(this.entries, newEntries);
-    },
-    updateViewForEntry( {id, viewUrl}) {
-      // Update the scaffold with a view url
-      const entry = this.entries.find(entry => entry.id === id);
-      entry.viewUrl = viewUrl;
-    },
-
-  }
-});
+import { defineStore } from 'pinia';
+import { initialDefaultState } from "../components/scripts/utilities";
+
+/* eslint-disable no-alert, no-console */
+
+export const useEntriesStore = defineStore('entries', {
+  state: () => {
+    return initialDefaultState();
+  },
+  getters: {
+    findIndexOfId: (state) => id => {
+      for (let i = 0; i < state.entries.length; i++) {
+        if (state.entries[i].id == id) {
+          return i;
+        }
+      }
+      return -1;
+    },
+  },
+  actions: {
+    addNewEntry(entry) {
+      this.entries.push(entry);
+    },
+    destroyEntry(index) {
+      if (index > -1) {
+        this.entries.splice(index, 1);
+      }
+    },
+    setAll(newEntries) {
+      this.entries = [];
+      Object.assign(this.entries, newEntries);
+    },
+    updateViewForEntry( {id, viewUrl}) {
+      // Update the scaffold with a view url
+      const entry = this.entries.find(entry => entry.id === id);
+      entry.viewUrl = viewUrl;
+    },
+
+  }
+});

package/src/stores/index.js

@@ -1,24 +1,24 @@
-import { defineStore } from 'pinia'
-
-/**
- * Activate the store when run the application individually.
- * If the store exist in parent application, 
- * instead of creating a new store it will access the parent main store.
- */
-export const useMainStore = defineStore('main', {
-  state: () => ({
-    userProfile: {
-      token: ''
-    },
-  }),
-  getters: {
-    userToken(state) {
-      return state.userProfile.token
-    },
-  },
-  actions: {
-    setUserToken(value) {
-      this.userProfile.token = value
-    },
-  }
+import { defineStore } from 'pinia'
+
+/**
+ * Activate the store when run the application individually.
+ * If the store exist in parent application, 
+ * instead of creating a new store it will access the parent main store.
+ */
+export const useMainStore = defineStore('main', {
+  state: () => ({
+    userProfile: {
+      token: ''
+    },
+  }),
+  getters: {
+    userToken(state) {
+      return state.userProfile.token
+    },
+  },
+  actions: {
+    setUserToken(value) {
+      this.userProfile.token = value
+    },
+  }
 })

package/src/stores/settings.js

@@ -1,144 +1,144 @@
-import { defineStore } from 'pinia';
-
-/* eslint-disable no-alert, no-console */
-
-export const useSettingsStore = defineStore('settings', {
-  state: () => {
-    return {
-      shareLink: undefined,
-      sparcApi: undefined,
-      algoliaIndex: "k-core_dev_published_time_desc",
-      algoliaKey: undefined,
-      algoliaId: undefined,
-      pennsieveApi: undefined,
-      flatmapAPI: undefined,
-      nlLinkPrefix: undefined,
-      rootUrl: undefined,
-      facets: { species: [], gender: [], organ: [] },
-      facetLabels: [],
-      markers: [],
-      featuredMarkers: [],
-      featuredMarkerIdentifiers: [],
-      featuredMarkerDois: [],
-      featuredMarkerSpecies: [],
-      featuredDatasetIdentifiers: [],
-      helpDelay: 0,
-    }
-  },
-  getters: {
-    isFeaturedMarkerIdentifier: state => identifier => {
-      return state.featuredMarkerIdentifiers.includes(identifier);
-    },
-    featuredMarkerDoi: state => identifier => {
-      const index = state.featuredMarkerIdentifiers.findIndex(
-        element => element == identifier
-      );
-      return state.featuredMarkerDois[index];
-    },
-  },
-  actions: {
-    updateShareLink(newLink) {
-      this.shareLink = newLink;
-    },
-    updateSparcAPI(api) {
-      this.sparcApi = api;
-    },
-    updateAlgoliaIndex(algoliaIndex) {
-      this.algoliaIndex = algoliaIndex;
-    },
-    updateAlgoliaKey(algoliaKey) {
-      this.algoliaKey = algoliaKey;
-    },
-    updateAlgoliaId(algoliaId) {
-      this.algoliaId = algoliaId;
-    },
-    updatePennsieveApi(pennsieveApi) {
-      this.pennsieveApi = pennsieveApi;
-    },
-    updateFlatmapAPI(flatmapAPI) {
-      this.flatmapAPI = flatmapAPI;
-    },
-    updateNLLinkPrefix(nlLinkPrefix) {
-      this.nlLinkPrefix = nlLinkPrefix;
-    },
-    updateRootUrl(rootUrl) {
-      this.rootUrl = rootUrl;
-    },
-    updateMarkers(markers) {
-      this.markers = markers;
-    },
-    updateFeatured(datasetIdentifiers) {
-      this.featuredMarkerIdentifiers = new Array(datasetIdentifiers.length);
-      this.featuredMarkers = new Array(datasetIdentifiers.length);
-      this.featuredMarkerDois = new Array(datasetIdentifiers.length);
-      this.featuredMarkerSpecies = new Array(datasetIdentifiers.length);
-      this.featuredDatasetIdentifiers = datasetIdentifiers;
-    },
-    updateFeaturedMarker(payload) {
-      const index = this.featuredDatasetIdentifiers.findIndex(
-        element => element == payload.identifier
-      );
-      this.featuredMarkers[index] = payload.marker;
-      this.featuredMarkerDois[index] = payload.doi;
-      this.featuredMarkerSpecies[index] = payload.species;
-    },
-    updateFeaturedMarkerIdentifier(payload) {
-      this.featuredMarkerIdentifiers[payload.index] = payload.markerIdentifier;
-    },
-    resetFeaturedMarkerIdentifier() {
-      this.featuredMarkerIdentifiers = new Array(
-        this.featuredDatasetIdentifiers.length
-      );
-    },
-    updateFacets(facetsIn) {
-      // The following codes aim to minimise changes on the array
-      let facets = { species: [], gender: [], organ: [] };
-      //First add missing item
-      if (facetsIn) {
-        facetsIn.forEach(e => {
-          switch (e.term.toLowerCase()) {
-            case "species":
-              if (e.facet.toLowerCase() !== "show all") {
-                facets.species.push(e.facet);
-                if (!this.facets.species.includes(e.facet)) {
-                  this.facets.species.push(e.facet);
-                }
-              } else {
-                this.facets.species = [];
-              }
-              break;
-            case "gender":
-              if (e.facet.toLowerCase() !== "show all") {
-                facets.gender.push(e.facet);
-                if (!this.facets.species.includes(e.facet))
-                  this.facets.gender.push(e.facet);
-              }
-              break;
-            case "organ":
-              if (e.facet.toLowerCase() !== "show all") {
-                facets.organ.push(e.facet);
-                if (!this.facets.species.includes(e.facet))
-                  this.facets.organ.push(e.facet);
-              }
-              break;
-            default:
-              break;
-          }
-        });
-        //Remove item not in list
-        for (const [key, arr] of Object.entries(this.facets)) {
-          let i = 0;
-          for (i = arr.length - 1; i >= 0; i -= 1) {
-            const index = facets[key].indexOf(arr[i]);
-            if (index == -1) {
-              arr.splice(i, 1);
-            }
-          }
-        }
-      }
-    },
-    updateFacetLabels(facetLabels) {
-      this.facetLabels = facetLabels;
-    }
-  }
-});
+import { defineStore } from 'pinia';
+
+/* eslint-disable no-alert, no-console */
+
+export const useSettingsStore = defineStore('settings', {
+  state: () => {
+    return {
+      shareLink: undefined,
+      sparcApi: undefined,
+      algoliaIndex: "k-core_dev_published_time_desc",
+      algoliaKey: undefined,
+      algoliaId: undefined,
+      pennsieveApi: undefined,
+      flatmapAPI: undefined,
+      nlLinkPrefix: undefined,
+      rootUrl: undefined,
+      facets: { species: [], gender: [], organ: [] },
+      facetLabels: [],
+      markers: [],
+      featuredMarkers: [],
+      featuredMarkerIdentifiers: [],
+      featuredMarkerDois: [],
+      featuredMarkerSpecies: [],
+      featuredDatasetIdentifiers: [],
+      helpDelay: 0,
+    }
+  },
+  getters: {
+    isFeaturedMarkerIdentifier: state => identifier => {
+      return state.featuredMarkerIdentifiers.includes(identifier);
+    },
+    featuredMarkerDoi: state => identifier => {
+      const index = state.featuredMarkerIdentifiers.findIndex(
+        element => element == identifier
+      );
+      return state.featuredMarkerDois[index];
+    },
+  },
+  actions: {
+    updateShareLink(newLink) {
+      this.shareLink = newLink;
+    },
+    updateSparcAPI(api) {
+      this.sparcApi = api;
+    },
+    updateAlgoliaIndex(algoliaIndex) {
+      this.algoliaIndex = algoliaIndex;
+    },
+    updateAlgoliaKey(algoliaKey) {
+      this.algoliaKey = algoliaKey;
+    },
+    updateAlgoliaId(algoliaId) {
+      this.algoliaId = algoliaId;
+    },
+    updatePennsieveApi(pennsieveApi) {
+      this.pennsieveApi = pennsieveApi;
+    },
+    updateFlatmapAPI(flatmapAPI) {
+      this.flatmapAPI = flatmapAPI;
+    },
+    updateNLLinkPrefix(nlLinkPrefix) {
+      this.nlLinkPrefix = nlLinkPrefix;
+    },
+    updateRootUrl(rootUrl) {
+      this.rootUrl = rootUrl;
+    },
+    updateMarkers(markers) {
+      this.markers = markers;
+    },
+    updateFeatured(datasetIdentifiers) {
+      this.featuredMarkerIdentifiers = new Array(datasetIdentifiers.length);
+      this.featuredMarkers = new Array(datasetIdentifiers.length);
+      this.featuredMarkerDois = new Array(datasetIdentifiers.length);
+      this.featuredMarkerSpecies = new Array(datasetIdentifiers.length);
+      this.featuredDatasetIdentifiers = datasetIdentifiers;
+    },
+    updateFeaturedMarker(payload) {
+      const index = this.featuredDatasetIdentifiers.findIndex(
+        element => element == payload.identifier
+      );
+      this.featuredMarkers[index] = payload.marker;
+      this.featuredMarkerDois[index] = payload.doi;
+      this.featuredMarkerSpecies[index] = payload.species;
+    },
+    updateFeaturedMarkerIdentifier(payload) {
+      this.featuredMarkerIdentifiers[payload.index] = payload.markerIdentifier;
+    },
+    resetFeaturedMarkerIdentifier() {
+      this.featuredMarkerIdentifiers = new Array(
+        this.featuredDatasetIdentifiers.length
+      );
+    },
+    updateFacets(facetsIn) {
+      // The following codes aim to minimise changes on the array
+      let facets = { species: [], gender: [], organ: [] };
+      //First add missing item
+      if (facetsIn) {
+        facetsIn.forEach(e => {
+          switch (e.term.toLowerCase()) {
+            case "species":
+              if (e.facet.toLowerCase() !== "show all") {
+                facets.species.push(e.facet);
+                if (!this.facets.species.includes(e.facet)) {
+                  this.facets.species.push(e.facet);
+                }
+              } else {
+                this.facets.species = [];
+              }
+              break;
+            case "gender":
+              if (e.facet.toLowerCase() !== "show all") {
+                facets.gender.push(e.facet);
+                if (!this.facets.species.includes(e.facet))
+                  this.facets.gender.push(e.facet);
+              }
+              break;
+            case "organ":
+              if (e.facet.toLowerCase() !== "show all") {
+                facets.organ.push(e.facet);
+                if (!this.facets.species.includes(e.facet))
+                  this.facets.organ.push(e.facet);
+              }
+              break;
+            default:
+              break;
+          }
+        });
+        //Remove item not in list
+        for (const [key, arr] of Object.entries(this.facets)) {
+          let i = 0;
+          for (i = arr.length - 1; i >= 0; i -= 1) {
+            const index = facets[key].indexOf(arr[i]);
+            if (index == -1) {
+              arr.splice(i, 1);
+            }
+          }
+        }
+      }
+    },
+    updateFacetLabels(facetLabels) {
+      this.facetLabels = facetLabels;
+    }
+  }
+});