Fix SparnaturalFormElement

sparna-git · Nov 22, 2024 · cd113df · cd113df
1 parent 3d76efb
commit cd113df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/SparnaturalFormElement.ts b/src/SparnaturalFormElement.ts
@@ -141,11 +141,12 @@ export class SparnaturalFormElement extends HTMLElement {
     callback: (data: any) => void,
     errorCallback?: (error: any) => void
   ) {
-    let sparqlFetcherFactory: SparqlHandlerFactory = new SparqlHandlerFactory(
-      this.sparnaturalForm.catalog,
+    let sparqlFetcherFactory: SparqlHandlerFactory = new SparqlHandlerFactory(      
       getSettings().language,
       getSettings().localCacheDataTtl,
-      getSettings().customization.headers
+      getSettings().customization.headers,
+      getSettings().customization.sparqlHandler,
+      this.sparnaturalForm.catalog
     );
 
     let sparqlFetcher: SparqlHandlerIfc =

diff --git a/src/sparnatural-form/settings/ISettings.ts b/src/sparnatural-form/settings/ISettings.ts
@@ -1,4 +1,5 @@
 import { AutocompleteConfiguration } from "../../sparnatural/components/widgets/AutoCompleteWidget";
+import { SparqlHandlerIfc } from "../../sparnatural/components/widgets/data/SparqlHandler";
 import { ListConfiguration } from "../../sparnatural/components/widgets/ListWidget";
 import { MapConfiguration } from "../../sparnatural/components/widgets/MapWidget";
 import { NumberConfiguration } from "../../sparnatural/components/widgets/NumberWidget";
@@ -25,6 +26,7 @@ interface ISettings {
     tree?: Partial<TreeConfiguration>;
     number?: Partial<NumberConfiguration>;
     map?: Partial<MapConfiguration>;
+    sparqlHandler?: SparqlHandlerIfc;
   };
 }
 

diff --git a/...al/components/builder-section/groupwrapper/criteriagroup/edit-components/WidgetFactory.ts b/...al/components/builder-section/groupwrapper/criteriagroup/edit-components/WidgetFactory.ts
@@ -51,7 +51,7 @@ export class WidgetFactory {
     parentComponent:HTMLComponent;
     specProvider: any;
     settings: WidgetFactorySettings;
-    catalog:Catalog;
+    catalog?:Catalog;
 
     private sparqlFetcherFactory:SparqlHandlerFactory;
     private sparqlPostProcessor:{ semanticPostProcess: (sparql:string)=>string };
@@ -68,12 +68,12 @@ export class WidgetFactory {
         this.catalog = catalog;
 
         // how to fetch a SPARQL query
-        this.sparqlFetcherFactory = new SparqlHandlerFactory(
-            this.catalog,
+        this.sparqlFetcherFactory = new SparqlHandlerFactory(            
             this.settings.language,
             this.settings.localCacheDataTtl,
             this.settings.customization.headers,
-            this.settings.customization.sparqlHandler
+            this.settings.customization.sparqlHandler,
+            this.catalog
         );
 
         // how to post-process the generated SPARQL after it is constructed and before it is send