Single listing with SCKAN as the primary listing

src/components/FlatmapVuer.vue

@@ -1943,7 +1943,9 @@ export default {
         }
 
         // Emit error message for connectivity
-        this.emitConnectivityError(errorData);
+        if (errorData.length) {
+          this.emitConnectivityError(errorData);
+        }
 
         // highlight all available features
         const connectivityFeatures = featuresToHighlight.reduce((arr, path) => {

src/services/flatmapQueries.js

@@ -1,4 +1,6 @@
 /* eslint-disable no-alert, no-console */
+import { querySingleConnectivityList } from '@abi-software/map-utilities';
+
 // remove duplicates by stringifying the objects
 const removeDuplicates = function (arrayOfAnything) {
   if (!arrayOfAnything) return []
@@ -99,6 +101,14 @@ let FlatmapQueries = function () {
     this.destinations = []
     this.origins = []
     this.components = []
+    this.destinationsWithDatasets = []
+    this.originsWithDatasets = []
+    this.componentsWithDatasets = []
+    this.destinationsCombinations = []
+    this.originsCombinations = []
+    this.componentsCombinations = []
+    this.singleConnectivityList = []
+    this.hasSingleConnectivityList = false
     this.rawURLs = []
     this.controller = undefined
     this.uberons = []
@@ -140,6 +150,10 @@ let FlatmapQueries = function () {
       destinationsWithDatasets: this.destinationsWithDatasets,
       originsWithDatasets: this.originsWithDatasets,
       componentsWithDatasets: this.componentsWithDatasets,
+      destinationsCombinations: this.destinationsCombinations,
+      originsCombinations: this.originsCombinations,
+      componentsCombinations: this.componentsCombinations,
+      hasSingleConnectivityList: this.singleConnectivityList.length > 0,
       title: eventData.label,
       featureId: eventData.resource,
       hyperlinks: hyperlinks,
@@ -160,6 +174,9 @@ let FlatmapQueries = function () {
       componentsWithDatasets: this.componentsWithDatasets,
       destinations: this.destinations,
       destinationsWithDatasets: this.destinationsWithDatasets,
+      destinationsCombinations: this.destinationsCombinations,
+      originsCombinations: this.originsCombinations,
+      componentsCombinations: this.componentsCombinations,
       connectivitySource: this.connectivitySource,
       noMapConnectivity: this.noMapConnectivity,
     };
@@ -285,25 +302,43 @@ let FlatmapQueries = function () {
     this.destinations = []
     this.origins = []
     this.components = []
+    this.destinationsWithDatasets = []
+    this.originsWithDatasets = []
+    this.componentsWithDatasets = []
+    this.destinationsCombinations = []
+    this.originsCombinations = []
+    this.componentsCombinations = []
+    this.singleConnectivityList = []
     this.rawURLs = []
     if (!keastIds || keastIds.length === 0 || !keastIds[0]) return
 
-    let prom1 = this.queryForConnectivityNew(mapImp, keastIds[0]) // This on returns a promise so dont need 'await'
+    let prom1 = await this.queryForConnectivityNew(mapImp, keastIds[0]) // This on returns a promise so dont need 'await'
     let results = await Promise.all([prom1])
     return results
   }
 
-  this.queryForConnectivityNew = function (mapImp, keastId, connectivitySource = 'map', processConnectivity = true) {
-    this.connectivitySource = connectivitySource
+  this.queryForConnectivityNew = async function (mapImp, keastId, connectivitySource = 'map', processConnectivity = true) {
+    // The new service, CQ27, is available for SCKAN knowledge sources from 2026 onward.
+    const sourceMatch = /^sckan-(\d{4})/.exec(mapImp.knowledgeSource || '');
+    const sourceYear = sourceMatch ? Number(sourceMatch[1]) : 0;
+    const isCq27ServiceAvailable = sourceYear >= 2026;
+    const mapUUID = mapImp.mapMetadata.uuid;
+    const flatmapAPI = this.flatmapAPI;
+    this.connectivitySource = isCq27ServiceAvailable ? 'sckan' : connectivitySource;
+
+    if (isCq27ServiceAvailable) {
+      this.singleConnectivityList = await querySingleConnectivityList(flatmapAPI, mapUUID, keastId);
+    }
+
     return new Promise((resolve) => {
-      const queryAPI = connectivitySource === 'map'
+      const queryAPI = this.connectivitySource === 'map'
         ? this.queryMapConnectivity(mapImp.mapMetadata.uuid, keastId)
         : mapImp.queryKnowledge(keastId);
 
       queryAPI
         .then((response) => {
           if (this.checkConnectivityExists(response)) {
-            if (connectivitySource === 'map') {
+            if (this.connectivitySource === 'map') {
               this.noMapConnectivity = false;
             }
             let connectivity = response;
@@ -318,7 +353,7 @@ let FlatmapQueries = function () {
               })
             }
             else resolve(connectivity)
-          } else if (connectivitySource === 'map') {
+          } else if (this.connectivitySource === 'map') {
             // switch to SCKAN
             // when there has no connectivity data from Map
             // and add the noMapConnectivity flag to disable the option
@@ -485,6 +520,66 @@ let FlatmapQueries = function () {
     this.destinationsWithDatasets = this.uberons.filter(
       (ub) => axonsFlat.indexOf(ub.id) !== -1
     ).sort(compareNames);
+
+    // Get combinations of SCKAN and Map
+    if (this.singleConnectivityList.length > 0) {
+      this.singleConnectivityList.forEach((value) => {
+        const { sckanNodeId, sckanNodeLabel, mapNodeId, mapNodeLabel } = value;
+
+        // The base ID is SCKAN ID
+        if (axons.find(axon => JSON.stringify(axon) === JSON.stringify(sckanNodeId))) {
+          this.destinationsCombinations.push({
+            sckanId: sckanNodeId,
+            sckanLabel: sckanNodeLabel,
+            mapId: mapNodeId,
+            mapLabel: mapNodeLabel,
+          })
+          mapNodeId.forEach((id, i) => {
+            const stringId = typeof id === 'string' ? id : id[0];
+            if (stringId) {
+              this.destinationsWithDatasets.push({
+                id: stringId,
+                name: mapNodeLabel.split(',')[i]
+              });
+            }
+          });
+        }
+        if (dendrites.find(dendrite => JSON.stringify(dendrite) === JSON.stringify(sckanNodeId))) {
+          this.originsCombinations.push({
+            sckanId: sckanNodeId,
+            sckanLabel: sckanNodeLabel,
+            mapId: mapNodeId,
+            mapLabel: mapNodeLabel,
+          })
+          mapNodeId.forEach((id, i) => {
+            const stringId = typeof id === 'string' ? id : id[0];
+            if (stringId) {
+              this.originsWithDatasets.push({
+                id: stringId,
+                name: mapNodeLabel.split(',')[i]
+              });
+            }
+          });
+        }
+        if (components.find(component => JSON.stringify(component) === JSON.stringify(sckanNodeId))) {
+          this.componentsCombinations.push({
+            sckanId: sckanNodeId,
+            sckanLabel: sckanNodeLabel,
+            mapId: mapNodeId,
+            mapLabel: mapNodeLabel,
+          })
+          mapNodeId.forEach((id, i) => {
+            const stringId = typeof id === 'string' ? id : id[0];
+            if (stringId) {
+              this.componentsWithDatasets.push({
+                id: stringId,
+                name: mapNodeLabel.split(',')[i]
+              });
+            }
+          });
+        }
+      });
+    }
   }
 
   this.processConnectivity = function (mapImp, connectivity) {
@@ -569,14 +664,14 @@ let FlatmapQueries = function () {
   }
 
   this.queryKnowledge = async (sql, params) => {
-    const url = `${this.flatmapAPI}/knowledge/query/`;
+    const url = `${this.flatmapAPI}knowledge/query/`;
     const query = { sql, params };
     const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            "Accept": "application/json"
-        },
-        body: JSON.stringify(query),
+      method: 'POST',
+      headers: {
+        "Accept": "application/json"
+      },
+      body: JSON.stringify(query),
     })
     if (!response.ok) {
         throw new Error(`Cannot access ${url}`);