@abi-software/flatmapvuer 1.13.2 → 1.13.3-demo.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.13.2",
+  "version": "1.13.3-demo.0",
   "license": "Apache-2.0",
   "files": [
     "dist/*",

package/src/components/FlatmapVuer.vue

@@ -630,7 +630,7 @@ import {
   getKnowledgeSource,
   getReferenceConnectivitiesByAPI,
 } from '../services/flatmapKnowledge.js'
-import { capitalise } from './utilities.js'
+import { capitalise, normaliseAlertToStringArray } from './utilities.js'
 import yellowstar from '../icons/yellowstar'
 import ResizeSensor from 'css-element-queries/src/ResizeSensor'
 import flatmap from '../services/flatmapLoader.js'
@@ -1283,6 +1283,11 @@ export default {
         if (this.$refs.pathwaysSelection) {
           this.$refs.pathwaysSelection.reset()
         }
+
+        this.trackEvent({
+          'event_name': `portal_maps_zoom`,
+          'category': 'reset',
+        });
       }
     },
     /**
@@ -1293,6 +1298,11 @@ export default {
     zoomIn: function () {
       if (this.mapImp) {
         this.mapImp.zoomIn()
+
+        this.trackEvent({
+          'event_name': `portal_maps_zoom`,
+          'category': 'zoom_in',
+        });
       }
     },
     /**
@@ -1303,6 +1313,11 @@ export default {
     zoomOut: function () {
       if (this.mapImp) {
         this.mapImp.zoomOut()
+
+        this.trackEvent({
+          'event_name': `portal_maps_zoom`,
+          'category': 'zoom_out',
+        });
       }
     },
     onSelectionsDataChanged: function (data) {
@@ -1723,7 +1738,7 @@ export default {
           const resource = [data.models]
           const taxonomy = this.entry
           const biologicalSex = this.biologicalSex
-          const featuresAlert = data.alert
+          const featuresAlert = normaliseAlertToStringArray(data.alert)
           const taxons = this.getTaxons(data)
           let payload = [{
             dataset: data.dataset,
@@ -1765,7 +1780,7 @@ export default {
                     userData: args,
                     eventType: eventType,
                     provenanceTaxonomy: taxons,
-                    alert: value.alert,
+                    alert: normaliseAlertToStringArray(value.alert),
                     mapUUID: mapuuid
                   })
                 }
@@ -2224,7 +2239,7 @@ export default {
       // The line below only creates the tooltip if some data was found on the path
       // the pubmed URLs are in knowledge response.references
       if ((results && results[0]) || (data.feature.hyperlinks && data.feature.hyperlinks.length > 0)) {
-        tooltip['featuresAlert'] = data.alert;
+        tooltip['featuresAlert'] = normaliseAlertToStringArray(data.alert);
         tooltip['knowledgeSource'] = getKnowledgeSource(this.mapImp);
         // Map id and uuid to load connectivity information from the map
         tooltip['mapId'] = this.mapImp.mapMetadata.id;
@@ -3104,7 +3119,7 @@ export default {
                   feature: feature,
                   label: feature.label,
                   provenanceTaxonomy: feature.taxons,
-                  alert: feature.alert,
+                  alert: normaliseAlertToStringArray(feature.alert),
                 }
                 // Show popup for all modes
                 this.checkAndCreatePopups([data], mapclick)
@@ -3153,6 +3168,19 @@ 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,6 +93,7 @@
       :showLocalSettings="showLocalSettings"
       :showOpenMapButton="showOpenMapButton"
       :showPathwayFilter="showPathwayFilter"
+      @trackEvent="trackEvent"
       :externalLegends="externalLegends"
     />
 
@@ -643,6 +644,19 @@ 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/utilities.js

@@ -4,6 +4,41 @@ const capitalise = term => {
   return term;
 };
 
+const normaliseAlertToStringArray = (value) => {
+  if (value === undefined || value === null) {
+    return [];
+  }
+
+  if (Array.isArray(value)) {
+    return value.flatMap((item) => normaliseAlertToStringArray(item));
+  }
+
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if (!trimmed) {
+      return [];
+    }
+
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (parsed !== value) {
+        return normaliseAlertToStringArray(parsed);
+      }
+    } catch (_) {
+      // Not a JSON string; use the trimmed value as-is.
+    }
+
+    return [trimmed];
+  }
+
+  if (typeof value === 'number' || typeof value === 'boolean') {
+    return [String(value)];
+  }
+
+  return [];
+};
+
 export {
   capitalise,
+  normaliseAlertToStringArray,
 };