Merge branch 'fix/54-CE-bis' of https://github.com/SolidLabResearch/generic-data-viewer-react-admin into fix/54-CE-bis

Author: EmilioTR

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Forced CSS's to not return content type application/ld+json, which induced a CORS error on some CSS server versions (#131).
+- Queries based on index file now work for any variable, not just ?object (#136).
 
 ## [1.2.1] - 2024-06-17
 

README.md

@@ -141,7 +141,7 @@ The set of sources over which a query will be executed is derived from two *opti
 
 If both inputs are present, the query will be executed over the superset of sources.
 
-The (auxiliary) query provided in `sourceIndex.queryLocation` is executed on `sourceIndex.url` and must result in the list of sources.
+The (auxiliary) query provided in `sourceIndex.queryLocation` is executed on `sourceIndex.url` and must result in the list of source URLs.
 
 If `sourceIndex` is used and there is no `comunicaContext.lenient` property found, one will be created with value `true`.
 This makes sure that the (main) query can succeed if not all obtained sources are accessible.

src/components/Dashboard/CustomQueryEditor/customEditor.jsx

@@ -42,9 +42,9 @@ WHERE {
   ?s ?p ?o
 }`;
   const defaultSparqlQueryIndexSources = `PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-SELECT ?object
+SELECT ?source
 WHERE {
-  ?s rdfs:seeAlso ?object
+  ?s rdfs:seeAlso ?source
 }`;
   const defaultExtraComunicaContext = JSON.stringify({ "lenient": true }, null, 2);
   const defaultAskQueryDetails = JSON.stringify({"trueText": "this displays when true.", "falseText": "this displays when false."}, null, 2);

src/dataProvider/SparqlDataProvider.js

@@ -356,10 +356,15 @@ const addComunicaContextSourcesFromSourcesIndex = async (sourcesIndex) => {
     });
 
     await new Promise((resolve, reject) => {
-      bindingsStream.on('data', (binding) => {
-        const source = binding.get('object').value;
-        if (!sourcesList.includes(source)) {
-          sourcesList.push(source);
+      bindingsStream.on('data', (bindings) => {
+        // the bindings should have exactly one key (any name is allowed) and we accept the value as a source
+        if (bindings.size == 1) {
+          for (const term of bindings.values()) {
+            const source = term.value;
+            if (!sourcesList.includes(source)) {
+              sourcesList.push(source);
+            }
+          }
         }
       });
       bindingsStream.on('end', resolve);
@@ -370,6 +375,10 @@ const addComunicaContextSourcesFromSourcesIndex = async (sourcesIndex) => {
     throw new Error(`Error adding sources from index: ${error.message}`);
   }
 
+  if (sourcesList.length == 0) {
+    throw new Error(`The resulting list of sources is empty`);
+  }
+
   return sourcesList;
 };