@lblod/ember-rdfa-editor-lblod-plugins 13.0.0 → 14.1.0

package/addon/components/standard-template-plugin/card.hbs

@@ -1,4 +1,4 @@
-<StandardTemplatePlugin::TemplateProvider @controller={{@controller}} as |provider|>
+<StandardTemplatePlugin::TemplateProvider @controller={{@controller}} @templates={{@templates}} as |provider|>
   {{#if provider.hasApplicableTemplates}}
     {{#each provider.applicableTemplates as |template|}}
       <AuList::Item>

package/addon/components/standard-template-plugin/card.ts

@@ -1,11 +1,16 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import StandardTemplate from '@lblod/ember-rdfa-editor-lblod-plugins/models/template';
 
 type Args = {
   controller: SayController;
+  templates: StandardTemplate[];
 };
 export default class StandardTemplatePluginCardComponent extends Component<Args> {
   get controller() {
     return this.args.controller;
   }
+  get templates() {
+    return this.args.templates;
+  }
 }

package/addon/components/standard-template-plugin/template-provider.hbs

@@ -1,8 +1,7 @@
-<div {{did-insert (perform this.standardTemplatePlugin.fetchTemplates)}}>
+<div>
 {{yield (hash
           applicableTemplates=this.applicableTemplates
           hasApplicableTemplates=this.hasApplicableTemplates
-          busy=this.busy
           insert=this.insert
         )}}
 </div>

package/addon/components/standard-template-plugin/template-provider.ts

@@ -1,9 +1,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import StandardTemplatePluginService from '@lblod/ember-rdfa-editor-lblod-plugins/services/standard-template-plugin';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import TemplateModel from '@lblod/ember-rdfa-editor-lblod-plugins/models/template';
+import StandardTemplate from '@lblod/ember-rdfa-editor-lblod-plugins/models/template';
 import { insertHtml } from '@lblod/ember-rdfa-editor/commands/insert-html-command';
 import instantiateUuids from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/standard-template-plugin/utils/instantiate-uuids';
 import { PNode, ResolvedPos } from '@lblod/ember-rdfa-editor';
@@ -15,6 +13,7 @@ import {
 
 type Args = {
   controller: SayController;
+  templates: StandardTemplate[];
 };
 
 const HACKY_LOOKUP: Record<string, Resource> = {
@@ -42,12 +41,6 @@ export function findAncestors(
 }
 
 export default class TemplateProviderComponent extends Component<Args> {
-  @service declare standardTemplatePlugin: StandardTemplatePluginService;
-
-  get busy() {
-    return this.standardTemplatePlugin.fetchTemplates.isRunning;
-  }
-
   get controller() {
     return this.args.controller;
   }
@@ -58,13 +51,13 @@ export default class TemplateProviderComponent extends Component<Args> {
 
   get applicableTemplates() {
     return (
-      this.standardTemplatePlugin.fetchTemplates.last?.value?.filter(
-        (template) => this.templateIsApplicable(template),
+      this.args.templates.filter((template) =>
+        this.templateIsApplicable(template),
       ) || []
     );
   }
 
-  templateIsApplicable(template: TemplateModel) {
+  templateIsApplicable(template: StandardTemplate) {
     const { $from } = this.controller.mainEditorState.selection;
     const containsTypes =
       this.controller.externalContextStore
@@ -93,8 +86,7 @@ export default class TemplateProviderComponent extends Component<Args> {
   }
 
   @action
-  async insert(template: TemplateModel) {
-    await template.reload();
+  insert(template: StandardTemplate) {
     const selection = this.controller.mainEditorState.selection;
     let insertRange: { from: number; to: number } = selection;
     const { $from, $to } = selection;

package/addon/components/variable-plugin/address/edit.hbs

@@ -11,6 +11,7 @@
           @searchMessage={{t "editor-plugins.address.edit.municipality.search-message"}}
           @noMatchesMessage={{t "editor-plugins.address.edit.municipality.no-results"}}
           @placeholder={{t "editor-plugins.address.edit.municipality.placeholder"}}
+          @allowClear={{true}}
           @renderInPlace={{true}}
           @searchEnabled={{true}}
           @search={{perform this.searchMunicipality}}
@@ -27,6 +28,7 @@
           @searchMessage={{t "editor-plugins.address.edit.street.search-message"}}
           @noMatchesMessage={{t "editor-plugins.address.edit.street.no-results"}}
           @placeholder={{t "editor-plugins.address.edit.street.placeholder"}}
+          @allowClear={{true}}
           @renderInPlace={{true}}
           @searchEnabled={{true}}
           @search={{perform this.searchStreet}}
@@ -40,11 +42,11 @@
             <AuLabel for="housenumber-select">
               {{t "editor-plugins.address.edit.housenumber.label"}}
             </AuLabel>
-            <AuNativeInput 
+            <AuNativeInput
               id="housenumber-select"
               placeholder={{t "editor-plugins.address.edit.housenumber.placeholder"}}
-              @width="block"  
-              value={{this.newHousenumber}} 
+              @width="block"
+              value={{this.newHousenumber}}
               @disabled={{not this.canUpdateHousenumber}}
               {{on 'input' this.updateHousenumber}}
             />
@@ -53,17 +55,17 @@
             <AuLabel for="busnumber-select">
               {{t "editor-plugins.address.edit.busnumber.label"}}
             </AuLabel>
-            <AuNativeInput 
+            <AuNativeInput
               id="busnumber-select"
               placeholder={{t "editor-plugins.address.edit.busnumber.placeholder"}}
-              @width="block"  
-              value={{this.newBusnumber}} 
+              @width="block"
+              value={{this.newBusnumber}}
               @disabled={{not this.canUpdateBusnumber}}
               {{on 'input' this.updateBusnumber}}
             />
           </div>
         </div>
-        
+
         {{#if this.newAddress.isRunning}}
           <LoadingAlert @title={{t "editor-plugins.address.edit.loading"}} @size="small" @skin="info"/>
         {{/if}}
@@ -72,14 +74,14 @@
             {{this.message.body}}
           </AuAlert>
         {{/if}}
-        <AuButton 
-          {{on 'click' this.updateAddressVariable}} 
+        <AuButton
+          {{on 'click' this.updateAddressVariable}}
           @disabled={{not this.canUpdateAddressVariable}}>
           {{t "editor-plugins.utils.insert"}}
         </AuButton>
-        
+
       </form>
-      
+
     </c.content>
   </AuCard>
 {{/if}}

package/addon/components/variable-plugin/address/edit.ts

@@ -10,7 +10,7 @@ import {
   resolveStreet,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/address-helpers';
 import { restartableTask, timeout } from 'ember-concurrency';
-import { localCopy, trackedReset } from 'tracked-toolbox';
+import { trackedReset } from 'tracked-toolbox';
 import { trackedTask } from 'ember-resources/util/ember-concurrency';
 import { inject as service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
@@ -23,9 +23,9 @@ type Args = {
 export default class AddressEditComponent extends Component<Args> {
   @service declare intl: IntlService;
 
-  @trackedReset<AddressEditComponent, string | undefined>({
+  @trackedReset({
     memo: 'currentAddress',
-    update(component) {
+    update(component: AddressEditComponent) {
       const { currentMunicipality } = component;
       return currentMunicipality
         ? currentMunicipality
@@ -34,14 +34,33 @@ export default class AddressEditComponent extends Component<Args> {
   })
   newMunicipality?: string;
 
-  @localCopy('currentStreetName') newStreetName?: string;
+  @trackedReset({
+    memo: 'currentAddress',
+    update(component: AddressEditComponent) {
+      return component.currentStreetName;
+    },
+  })
+  newStreetName?: string;
 
-  @localCopy('currentHousenumber') newHousenumber?: string;
+  @trackedReset({
+    memo: 'currentAddress',
+    update(component: AddressEditComponent) {
+      return component.currentHousenumber;
+    },
+  })
+  newHousenumber?: string;
 
-  @localCopy('currentBusnumber') newBusnumber?: string;
+  @trackedReset({
+    memo: 'currentAddress',
+    update(component: AddressEditComponent) {
+      return component.currentBusnumber;
+    },
+  })
+  newBusnumber?: string;
 
   get message() {
     const value = this.newAddress.value as Address | undefined;
+
     if (
       this.newAddress.isSuccessful &&
       value &&
@@ -53,11 +72,28 @@ export default class AddressEditComponent extends Component<Args> {
         title: this.intl.t('editor-plugins.address.edit.success.address-found'),
         body: value.formatted,
       };
-    } else if (
+    }
+
+    if (
       this.newAddress.isError &&
       this.newAddress.error instanceof AddressError
     ) {
       const { error } = this.newAddress;
+
+      if (this.newAddress.error.alternativeAddress) {
+        return {
+          skin: 'warning',
+          icon: 'alert-triangle',
+          title: this.intl.t(
+            'editor-plugins.address.edit.errors.address-not-found-short',
+          ),
+          body: this.intl.t(
+            'editor-plugins.address.edit.errors.alternative-address',
+            { address: this.newAddress.error.alternativeAddress.formatted },
+          ),
+        };
+      }
+
       return {
         skin: 'warning',
         icon: 'alert-triangle',
@@ -67,9 +103,9 @@ export default class AddressEditComponent extends Component<Args> {
           email: 'gelinktnotuleren@vlaanderen.be',
         }),
       };
-    } else {
-      return;
     }
+
+    return;
   }
 
   get currentAddress() {
@@ -127,12 +163,38 @@ export default class AddressEditComponent extends Component<Args> {
     return !!this.selectedAddressVariable;
   }
 
+  get alternativeAddressFromError() {
+    if (
+      this.newAddress.isError &&
+      this.newAddress.error instanceof AddressError &&
+      this.newAddress.error.alternativeAddress
+    ) {
+      return this.newAddress.error.alternativeAddress;
+    }
+
+    return undefined;
+  }
+
+  get addressToInsert() {
+    if (this.newAddress.isSuccessful) {
+      return this.newAddress.value;
+    }
+
+    return this.alternativeAddressFromError;
+  }
+
   get canUpdateAddressVariable() {
-    return (
-      this.newAddress.isSuccessful &&
-      this.newAddress.value &&
-      !this.currentAddress?.sameAs(this.newAddress.value as Address)
-    );
+    const addressToInsert = this.addressToInsert;
+
+    if (!addressToInsert) {
+      return false;
+    }
+
+    if (this.currentAddress?.sameAs(this.addressToInsert)) {
+      return false;
+    }
+
+    return true;
   }
 
   resolveAddressTask = restartableTask(async () => {
@@ -169,19 +231,23 @@ export default class AddressEditComponent extends Component<Args> {
     }
   });
 
-  newAddress = trackedTask(this, this.resolveAddressTask, () => [
-    this.newMunicipality,
-    this.newStreetName,
-    this.newHousenumber,
-    this.newBusnumber,
-  ]);
+  newAddress = trackedTask<Address | undefined>(
+    this,
+    this.resolveAddressTask,
+    () => [
+      this.newMunicipality,
+      this.newStreetName,
+      this.newHousenumber,
+      this.newBusnumber,
+    ],
+  );
 
   @action
   updateAddressVariable() {
-    if (this.selectedAddressVariable && this.newAddress.isSuccessful) {
+    if (this.selectedAddressVariable && this.addressToInsert) {
       const { pos } = this.selectedAddressVariable;
       this.controller.withTransaction((tr) => {
-        return tr.setNodeAttribute(pos, 'value', this.newAddress.value);
+        return tr.setNodeAttribute(pos, 'value', this.addressToInsert);
       });
     }
   }

package/addon/components/variable-plugin/date/edit.hbs

@@ -56,16 +56,18 @@
               />
             </AuFormRow>
           {{/each}}
-          <AuFormRow>
-            <AuControlRadio
-              @label={{t "date-plugin.card.custom-date" }}
-              @identifier="custom"
-              @name="dateFormat"
-              @value="custom"
-              checked={{eq this.dateFormatType "custom"}}
-              @onChange={{this.setDateFormatFromKey}}
-            />
-          </AuFormRow>
+          {{#if this.isCustomAllowed}}
+            <AuFormRow>
+              <AuControlRadio
+                @label={{t "date-plugin.card.custom-date" }}
+                @identifier="custom"
+                @name="dateFormat"
+                @value="custom"
+                checked={{eq this.dateFormatType "custom"}}
+                @onChange={{this.setDateFormatFromKey}}
+              />
+            </AuFormRow>
+          {{/if}}  
           {{#if (eq this.dateFormatType "custom")}}
             <AuFormRow @alignment="post">
               <AuButton @skin="secondary" @icon="info-circle"

package/addon/components/variable-plugin/date/edit.ts

@@ -125,6 +125,13 @@ export default class DateEditComponent extends Component<Args> {
     return unwrapOr(false, this.selectedDateNode?.attrs.custom as boolean);
   }
 
+  get isCustomAllowed(): boolean {
+    return unwrapOr(
+      true,
+      this.selectedDateNode?.attrs.customAllowed as boolean,
+    );
+  }
+
   get dateFormatType(): string {
     if (this.isCustom) {
       return 'custom';

package/addon/models/template.ts

@@ -1,14 +1,7 @@
-import Model, { attr } from '@ember-data/model';
-declare module 'ember-data/types/registries/model' {
-  export default interface ModelRegistry {
-    template: TemplateModel;
-  }
-}
-export default class TemplateModel extends Model {
-  @attr declare title: string;
-  @attr('string-set', { defaultValue: () => [] }) declare matches: string[];
-  @attr declare body: string;
-  @attr('string-set', { defaultValue: () => [] }) declare contexts: string[];
-  @attr('string-set', { defaultValue: () => [] })
-  declare disabledInContexts: string[];
+export default interface StandardTemplate {
+  title: string;
+  matches: string[];
+  body: string;
+  contexts: string[];
+  disabledInContexts: string[];
 }

package/addon/plugins/besluit-type-plugin/index.ts

@@ -1,3 +1,4 @@
 export type BesluitTypePluginOptions = {
   endpoint: string;
+  classificatieUri: string;
 };

package/addon/plugins/citation-plugin/index.ts

@@ -84,7 +84,7 @@ const ENUM_ROYAL = `genummerd${NNWS}?${ROYAL}`;
 /**
  * match for "decision of the flemish government"
  */
-const DECISION = 'besluit';
+const DECISION = 'gemeentebesluit';
 
 /**
  * The type of citation that we need to search for

package/addon/plugins/citation-plugin/utils/legal-documents.ts

@@ -1,5 +1,5 @@
 import {
-  isBesluitType,
+  isGemeenteBesluitType,
   LEGISLATION_TYPE_CONCEPTS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/types';
 import { fetchVlaamseCodexLegalDocuments } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/vlaamse-codex';
@@ -47,7 +47,7 @@ export class LegalDocument {
 }
 
 export const isBesluitLegalDocument = (legalDocument: LegalDocument) =>
-  isBesluitType(legalDocument.legislationType?.value ?? '');
+  isGemeenteBesluitType(legalDocument.legislationType?.value ?? '');
 
 export const fetchLegalDocumentsCache = new Map<
   string,
@@ -109,7 +109,7 @@ export async function fetchLegalDocuments({
     return results;
   } else {
     const shouldQueryPublicDecisions =
-      isBesluitType(filter.type) && config.decisionsEndpoint;
+      isGemeenteBesluitType(filter.type) && config.decisionsEndpoint;
 
     const fetchConfig = {
       words,

package/addon/plugins/citation-plugin/utils/public-decisions.ts

@@ -95,15 +95,16 @@ const getCountQuery = ({
         ?session besluit:behandelt ?agendaPoint.
         ?agendaPointTreatment dct:subject ?agendaPoint;
           prov:generated ?decision.
-        ?decision eli:title ?decisionTitle.
+        ?decision eli:title ?decisionTitleViaAgenda.
       }
       OPTIONAL {
         ?session ext:uittreksel ?treatment.
         ?treatment mu:uuid ?treatmentUuid.
         ?treatment ext:uittrekselBvap ?agendaPointTreatment.
         ?agendaPointTreatment prov:generated ?decision.
-        ?decision eli:title ?decisionTitle.
+        ?decision eli:title ?decisionTitleViaTreatment.
       }
+      BIND(COALESCE(?decisionTitleViaAgenda, ?decisionTitleViaTreatment) as ?decisionTitle)
       ${filterString}
     }
   `;
@@ -145,15 +146,16 @@ const getQuery = ({
         ?session besluit:behandelt ?agendaPoint.
         ?agendaPointTreatment dct:subject ?agendaPoint;
           prov:generated ?decision.
-        ?decision eli:title ?decisionTitle.
+        ?decision eli:title ?decisionTitleViaAgenda.
       }
       OPTIONAL {
         ?session ext:uittreksel ?treatment.
         ?treatment mu:uuid ?treatmentUuid.
         ?treatment ext:uittrekselBvap ?agendaPointTreatment.
         ?agendaPointTreatment prov:generated ?decision.
-        ?decision eli:title ?decisionTitle.
+        ?decision eli:title ?decisionTitleViaTreatment.
       }
+      BIND(COALESCE(?decisionTitleViaAgenda, ?decisionTitleViaTreatment) as ?decisionTitle)
       ${filterString}
     }
     ORDER BY DESC (?documentDate) (?decisionTitle) LIMIT ${pageSize} OFFSET ${

package/addon/plugins/citation-plugin/utils/types.ts

@@ -26,20 +26,24 @@ export const LEGISLATION_TYPES = {
   'genummerd koninklijk besluit':
     'https://data.vlaanderen.be/id/concept/AardWetgeving/GenummerdKoninklijkBesluit',
   protocol: 'https://data.vlaanderen.be/id/concept/AardWetgeving/Protocol',
-  besluit: 'https://data.vlaanderen.be/doc/concept/AardWetgeving/Besluit',
+  gemeentebesluit:
+    'https://data.vlaanderen.be/doc/concept/AardWetgeving/Besluit',
 };
 
 export const legislationKeysCapitalized = Object.keys(LEGISLATION_TYPES).map(
   capitalize,
 ) as [Capitalize<keyof typeof LEGISLATION_TYPES>];
 
+export const legislationKeysCapitalizedWithoutGemeentebesluit =
+  legislationKeysCapitalized.filter((key) => key !== 'Gemeentebesluit');
+
 export const isLegislationType = (
   type: string,
 ): type is keyof typeof LEGISLATION_TYPES =>
   Object.keys(LEGISLATION_TYPES).includes(type);
 
-export const isBesluitType = (type: string) =>
-  type === LEGISLATION_TYPES['besluit'];
+export const isGemeenteBesluitType = (type: string) =>
+  type === LEGISLATION_TYPES['gemeentebesluit'];
 
 export const LEGISLATION_TYPE_CONCEPTS = Object.entries(LEGISLATION_TYPES).map(
   ([label, value]) => ({

package/addon/plugins/standard-template-plugin/index.ts

@@ -11,6 +11,8 @@ import {
   besluitArticleStructure,
 } from './utils/nodes';
 
+export { default as instantiateUuids } from './utils/instantiate-uuids';
+
 export const besluitNodes = {
   besluit,
   besluit_title,

package/addon/plugins/standard-template-plugin/utils/instantiate-uuids.ts

@@ -17,7 +17,8 @@ import { v4 as uuidv4 } from 'uuid';
  */
 
 export default function instantiateUuids(templateString: string) {
-  const generateBoundUuid = memoize(uuidv4) as (...args: unknown[]) => string;
+  // We're not interested in the args in this case, we just use them to memoize
+  const generateBoundUuid = memoize((..._args: unknown[]) => uuidv4());
 
   const determineFunction = (string: string) => {
     switch (string) {
@@ -31,18 +32,9 @@ export default function instantiateUuids(templateString: string) {
   };
   return templateString.replace(
     /\$\{(generateUuid|generateBoundUuid)\(([^()]*)\)\}/g,
-    (string) => {
-      const match = /\$\{(generateUuid|generateBoundUuid)\(([^()]*)\)\}/.exec(
-        string,
-      );
-      if (match) {
-        const functionName = match[1];
-        const functionArgs = match[2];
-        const func = determineFunction(functionName);
-        return functionArgs ? func(functionArgs) : func();
-      } else {
-        return string;
-      }
+    (_match, functionName, functionArgs) => {
+      const func = determineFunction(functionName);
+      return functionArgs ? func(functionArgs) : func();
     },
   );
 }

package/addon/plugins/variable-plugin/utils/address-helpers.ts

@@ -22,7 +22,7 @@ type StreetSearchResult = {
       gemeente: {
         gemeentenaam: { geografischeNaam: { spelling: string } };
       };
-      straatnaam: {
+      straatnaam?: {
         straatnaam: {
           geografischeNaam: { spelling: string };
         };
@@ -75,14 +75,20 @@ type AddressDetailResult = {
 export class AddressError extends Error {
   translation: string;
   status?: number;
+  alternativeAddress?: Address;
   constructor({
     message,
     translation,
     status,
-  }: Pick<AddressError, 'message' | 'translation' | 'status'>) {
+    alternativeAddress,
+  }: Pick<
+    AddressError,
+    'message' | 'translation' | 'status' | 'alternativeAddress'
+  >) {
     super(message);
     this.translation = translation;
     this.status = status;
+    this.alternativeAddress = alternativeAddress;
   }
 }
 
@@ -129,9 +135,11 @@ export async function fetchStreets(term: string, municipality: string) {
   });
   if (result.ok) {
     const jsonResult = (await result.json()) as StreetSearchResult;
-    const streetnames = jsonResult.adresMatches.map((entry) => {
-      return entry.straatnaam.straatnaam.geografischeNaam.spelling;
-    });
+
+    const streetnames = jsonResult.adresMatches
+      .map((entry) => entry.straatnaam?.straatnaam.geografischeNaam.spelling)
+      .filter(Boolean);
+
     return streetnames;
   } else {
     throw new AddressError({
@@ -217,9 +225,15 @@ export async function resolveAddress(info: AddressInfo) {
       });
     }
   } else {
+    const alternativeAddress = await resolveStreet({
+      street: info.street,
+      municipality: info.municipality,
+    });
+
     throw new AddressError({
       translation: 'editor-plugins.address.edit.errors.address-not-found',
       message: `Could not find address in address register`,
+      alternativeAddress,
     });
   }
 }

package/addon/plugins/variable-plugin/variables/date.ts

@@ -65,6 +65,7 @@ const parseDOM = [
           onlyDate,
           format: node.dataset.format,
           custom: node.dataset.custom === 'true',
+          customAllowed: node.dataset.customAllowed !== 'false',
         };
       }
       return false;
@@ -96,6 +97,7 @@ const parseDOM = [
           value: value,
           format: format,
           custom: dateNode?.dataset.custom === 'true',
+          customAllowed: dateNode?.dataset.customAllowed !== 'false',
           label,
         };
       }
@@ -108,8 +110,15 @@ const parseDOM = [
 const serialize = (node: PNode, state: EditorState) => {
   const t = getTranslationFunction(state);
 
-  const { value, onlyDate, format, mappingResource, custom, label } =
-    node.attrs;
+  const {
+    value,
+    onlyDate,
+    format,
+    mappingResource,
+    custom,
+    customAllowed,
+    label,
+  } = node.attrs;
   const datatype = onlyDate ? XSD('date') : XSD('dateTime');
   let humanReadableDate: string;
   if (value) {
@@ -130,6 +139,7 @@ const serialize = (node: PNode, state: EditorState) => {
     datatype: datatype.prefixed,
     'data-format': format as string,
     'data-custom': custom ? 'true' : 'false',
+    'data-custom-allowed': customAllowed ? 'true' : 'false',
     ...(!!value && { content: value as string }),
   };
   return mappingSpan(
@@ -164,6 +174,9 @@ const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
     custom: {
       default: false,
     },
+    customAllowed: {
+      default: options.allowCustomFormat,
+    },
     label: { default: null },
   },
   // TODO: is this property still required?