@abi-software/mapintegratedvuer 0.7.0-vue3.8 → 0.7.1-auth.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.7.0-vue3.8",
+  "version": "0.7.1-auth.0",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -42,12 +42,12 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^0.6.0-vue3.8",
+    "@abi-software/flatmapvuer": "^0.6.1-auth.0",
     "@abi-software/map-side-bar": "^1.7.0-vue3.4",
     "@abi-software/plotvuer": "^0.4.0-vue-3-alpha.10",
     "@abi-software/scaffoldvuer": "^0.4.0-vue3.6",
     "@abi-software/simulationvuer": "^0.7.0-vue-3-alpha.5",
-    "@abi-software/svg-sprite": "^0.4.0-vue3-beta.0",
+    "@abi-software/svg-sprite": "^0.4.0-vue3.3",
     "@cypress/vite-dev-server": "^5.0.7",
     "@element-plus/icons-vue": "^2.3.1",
     "@pinia/testing": "^0.1.3",
@@ -126,6 +126,9 @@
       }
     ]
   },
+  "overrides": {
+    "@abi-software/flatmapvuer": "$@abi-software/flatmapvuer"
+  },
   "browserslist": [
     "> 1%",
     "last 2 versions"

package/src/App.vue

@@ -85,6 +85,7 @@ export default {
         flatmapAPI: import.meta.env.VITE_FLATMAPAPI_LOCATION,
         nlLinkPrefix: import.meta.env.VITE_NL_LINK_PREFIX,
         rootUrl: import.meta.env.VITE_ROOT_URL,
+        userToken: '',
       }
     }
   },

package/src/components/MapContent.vue

@@ -233,6 +233,7 @@ export default {
       this.options.flatmapAPI ? this.settingsStore.updateFlatmapAPI(this.options.flatmapAPI) : null,
       this.options.nlLinkPrefix ? this.settingsStore.updateNLLinkPrefix(this.options.nlLinkPrefix) : null
       this.options.rootUrl ? this.settingsStore.updateRootUrl(this.options.rootUrl) : null
+      this.options.userToken ? this.settingsStore.updateUserToken(this.options.userToken) : null
     }
   },
   mounted: async function() {

package/src/components/viewers/Flatmap.vue

@@ -16,6 +16,7 @@
     :enableOpenMapUI="true"
     :flatmapAPI="flatmapAPI"
     :sparcAPI="apiLocation"
+    :userApiKey="userApiKey"
     @open-map="openMap"
   />
 </template>

package/src/components/viewers/MultiFlatmap.vue

@@ -15,6 +15,7 @@
     :openMapOptions="openMapOptions"
     :flatmapAPI="flatmapAPI"
     :sparcAPI="apiLocation"
+    :userApiKey="userApiKey"
     @pan-zoom-callback="flatmapPanZoomCallback"
     @open-map="openMap"
   />
@@ -305,13 +306,17 @@ export default {
       }
 
       if (flatmapImp) {
+        // create the star marker
         let wrapperElement = document.createElement("div");
         wrapperElement.innerHTML = YellowStar;
 
+        // add it to the flatmap
         const markerIdentifier = flatmapImp.addMarker(marker, {
           element: wrapperElement,
           className: "highlight-marker"
         });
+
+        // update the store with the marker identifier
         this.settingsStore.updateFeaturedMarkerIdentifier({
           index,
           markerIdentifier,
@@ -362,9 +367,12 @@ export default {
 
 :deep(.maplibregl-marker) {
   &.standard-marker {
+    cursor: pointer !important;
     z-index: 2;
   }
   &.highlight-marker {
+    visibility: visible !important;
+    cursor: pointer !important;
     z-index: 1;
     div {
       scale: 0.5;

package/src/mixins/ContentMixin.js

@@ -278,6 +278,7 @@ export default {
           } catch (error) {
             markerSpecies = undefined;
           }
+          this.updateFeatureMarkers([markerCurie], undefined)
           this.settingsStore.updateFeaturedMarker({
             identifier,
             marker: markerCurie,
@@ -286,19 +287,45 @@ export default {
           });
         });
     },
+    // Check if the old featured dataset api has any info
+    oldFeaturedDatasetApiHasInfo: async function () {
+      let response = await fetch(`${this.apiLocation}get_featured_datasets_identifiers`)
+      let data = await response.json()
+      if (!data.identifiers || data.identifiers.length == 0) {
+        return false;
+      } else {
+        return data.identifiers;
+      }
+    },
+    // Check if the new featured dataset api has any info
+    newFeaturedDatasetApiHasInfo: async function () {
+      let response = await fetch(`${this.apiLocation}get_featured_dataset`)
+      let data = await response.json()
+      if (!data.datasets || data.datasets.length == 0) {
+        return false;
+      } else {
+        return data.datasets.map(d => d.id);
+      }
+    },
+
     /**
      * Get a list of featured datasets to display.
      */
-    getFeaturedDatasets: function () {
-      const local_this = this;
-      fetch(`${this.apiLocation}get_featured_datasets_identifiers`)
-        .then(response => response.json())
-        .then(data => {
-          this.settingsStore.updateFeatured(data.identifiers);
-          data.identifiers.forEach(element => {
-            local_this.getDatasetAnatomyInfo(element);
-          });
-        });
+    getFeaturedDatasets: async function () {
+      let datasetIds = [];
+
+      // Check the two api endpoints for featured datasets, old one first
+      let oldInfo = await this.oldFeaturedDatasetApiHasInfo();
+      if (oldInfo) datasetIds = oldInfo;
+      else {
+        let newInfo = await this.newFeaturedDatasetApiHasInfo();
+        if (newInfo) datasetIds = newInfo;
+      }
+      // Update the store with the new list of featured datasets
+      this.settingsStore.updateFeatured(datasetIds);
+      datasetIds.forEach(element => {
+        this.getDatasetAnatomyInfo(element)
+      });
     },
     zoomToFeatures: function () {
       return;
@@ -403,9 +430,12 @@ export default {
   created: function () {
     this.flatmapAPI = undefined;
     this.apiLocation = undefined;
+    this.userApiKey = undefined;
     if (this.settingsStore.flatmapAPI)
       this.flatmapAPI = this.settingsStore.flatmapAPI;
     if (this.settingsStore.sparcApi)
       this.apiLocation = this.settingsStore.sparcApi;
+    if (this.settingsStore.userToken)
+      this.userApiKey = this.settingsStore.userToken;
   },
 };

package/src/stores/settings.js

@@ -14,6 +14,7 @@ export const useSettingsStore = defineStore('settings', {
       flatmapAPI: undefined,
       nlLinkPrefix: undefined,
       rootUrl: undefined,
+      userToken: undefined,
       facets: { species: [], gender: [], organ: [] },
       facetLabels: [],
       markers: [],
@@ -64,6 +65,9 @@ export const useSettingsStore = defineStore('settings', {
     updateRootUrl(rootUrl) {
       this.rootUrl = rootUrl;
     },
+    updateUserToken(userToken) {
+      this.userToken = userToken;
+    },
     updateMarkers(markers) {
       this.markers = markers;
     },

package/vite.config.js

@@ -11,7 +11,7 @@ export default defineConfig(({ command, mode }) => {
     css: {
         preprocessorOptions: {
           scss: {
-            additionalData: `@use '${pathSrc}/assets/styles' as *;`
+            additionalData: `@use './src/assets/styles' as *;`
           },
         },
     },