@lblod/ember-rdfa-editor-lblod-plugins 22.4.0 → 22.4.1-dev.1c9dd1119670ee35f04f8a0d0677e6a4230acd84

package/.changeset/yellow-tables-live.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Add error handling to lmb-plugin

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 22.4.1
+
+### Patch Changes
+
+- [#474](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/474) [`714f260`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/714f260e2c9024fe8ea3f031b42b746fd2ac0c26) Thanks [@elpoelma](https://github.com/elpoelma)! - LMB-plugin: query mandatees using `application/x-www-form-urlencoded` approach
+
 ## 22.4.0
 
 ### Minor Changes

package/addon/components/lmb-plugin/list.hbs

@@ -37,7 +37,7 @@
     </tr>
   </:header>
   <:body>
-    {{#unless (or @services.isRunning @error)}}
+    {{#unless @services.isRunning}}
       {{#if @services.value.totalCount}}
         {{#each @services.value.results as |row|}}
           <tr>

package/addon/components/lmb-plugin/search-modal.hbs

@@ -36,13 +36,16 @@
       </mc.sidebar>
       <mc.content @scroll={{true}}>
         <div class='worship-modal--list-container'>
-          <LmbPlugin::List
-            @error={{this.error}}
-            @services={{this.servicesResource}}
-            @sort={{this.sort}}
-            @setSort={{this.setSort}}
-            @insert={{@onInsert}}
-          />
+          {{#if this.error}}
+            <Common::Search::AlertLoadError @error={{this.error}} />
+          {{else}}
+            <LmbPlugin::List
+              @services={{this.servicesResource}}
+              @sort={{this.sort}}
+              @setSort={{this.setSort}}
+              @insert={{@onInsert}}
+            />
+          {{/if}}
         </div>
         {{#if this.servicesResource.value.totalCount}}
           {{#let

package/addon/components/lmb-plugin/search-modal.ts

@@ -42,10 +42,17 @@ export default class LmbPluginSearchModalComponent extends Component<Args> {
     return fetchMandatees({ endpoint: this.args.config.endpoint });
   });
 
+  // TODO Either make this a trackedFunction or do filtering on the query and correctly pass an
+  // AbortController
   search = restartableTask(async () => {
     // Can't do what I want, so if the user modifies the filter before resolving the query will run again
     if (!this.fetchData.lastComplete) {
-      await this.fetchData.perform();
+      try {
+        await this.fetchData.perform();
+      } catch (err) {
+        console.error('Got an error fetching LMB data', err);
+        this.error = err;
+      }
     }
 
     if (!this.fetchData.lastComplete?.value) return;

package/addon/plugins/lmb-plugin/utils/fetchMandatees.ts

@@ -1,24 +1,12 @@
 import Mandatee from '@lblod/ember-rdfa-editor-lblod-plugins/models/mandatee';
-import { IBindings } from 'fetch-sparql-endpoint';
-
-type SparqlResponse = {
-  results: {
-    bindings: IBindings[];
-  };
-};
+import { executeQuery } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 
 type FetchMandateesArgs = {
   endpoint: string;
 };
 
 export async function fetchMandatees({ endpoint }: FetchMandateesArgs) {
-  const queryResponse = await fetch(endpoint, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query: `
+  const query = `
       PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
       PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
       PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
@@ -46,10 +34,11 @@ export async function fetchMandatees({ endpoint }: FetchMandateesArgs) {
           }
           filter (!bound(?endDate) || ?endDate > now()).
       }
-      `,
-    }),
+      `;
+  const response = await executeQuery({
+    query,
+    endpoint,
   });
-  const queryJson: SparqlResponse = await queryResponse.json();
-  const mandatees = queryJson.results.bindings.map(Mandatee.fromBinding);
+  const mandatees = response.results.bindings.map(Mandatee.fromBinding);
   return mandatees;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "22.4.0",
+  "version": "22.4.1-dev.1c9dd1119670ee35f04f8a0d0677e6a4230acd84",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",