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

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 14.1.0
+
+### Minor Changes
+
+- [#315](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/315) [`01163d8`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/01163d8d45b801a50728b9aeabaf0e52a1cf9a33) Thanks [@piemonkey](https://github.com/piemonkey)! - Export standard-template-plugin's uuid instantiation function
+
+### Patch Changes
+
+- [#317](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/317) [`1d28bc9`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/1d28bc9b9b0e07e8eb5698988dfe0e3dd946c2a3) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4538: Display correctly that there are no streets when searching in the address plugin
+
+- [#316](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/316) [`e109035`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e109035809df341ede0a03fb0b146909883903ef) Thanks [@x-m-el](https://github.com/x-m-el)! - - Bugfix: `allowCustomFormat` for rdfa-date variable will now disable custom formats if set to false.
+  - No changes for old documents: date variables in old documents will allow custom formats, which is the default.
+
+## 14.0.0
+
+### Major Changes
+
+- [#314](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/314) [`a4402a0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/a4402a0eb3acc4b7184ed362451875a6cf43be76) Thanks [@piemonkey](https://github.com/piemonkey)! - Remove Current Session Service from plugins, now classificatie uri needs to be passed in to the besluit-type plugin
+
+- [#313](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/313) [`d4127ce`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d4127cece3424051447b0b3407202f0f05f23512) Thanks [@piemonkey](https://github.com/piemonkey)! - Breaking change: Standard Template plugin now requires a list of templates to be passed in.
+  No depends on ember-data.
+
+### Patch Changes
+
+- [#309](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/309) [`679b030`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/679b030539d5b604e5eaa4276a4e3d966998fc3f) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4539: Rename `besluit` to `gemeentebesluit`
+
+- [#310](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/310) [`b07035f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b07035f8568ea397a5ed6514701ebedb284078b9) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4501: Fail gracefully when house number does not exist
+
+  When house number does not exist provide user with an alternative of inserting
+  address with just the street information.
+
+- [#309](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/309) [`679b030`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/679b030539d5b604e5eaa4276a4e3d966998fc3f) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4539: Rename references to `decision` in Citation plugin
+
+  Instead of using `decision` use `legalDocument` in Citation plugin, to not confuse with `besluit` usage (which also means "decision" in Flemish).
+
+- [#311](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/311) [`bb8eee6`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/bb8eee6f60acaae7c243b85a30979137757ba1dc) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4544: Decision title sometimes is not present from public decisions query
+
+- [#308](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/308) [`39f3105`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/39f31053b59a5077c9a118431154c6d766f494eb) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4534: Citation insert card filter enhancement
+
+- [#307](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/307) [`03ab824`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/03ab824d7dbe3eab6a86b6b0aa6c99a27d9fbeee) Thanks [@elpoelma](https://github.com/elpoelma)! - Allow municipality and street fields of address-variable to be cleared when editing
+
+- [#312](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/312) [`52420c6`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/52420c62846b18532b1d87b8d746c201ac1be408) Thanks [@elpoelma](https://github.com/elpoelma)! - reset address-edit input fields when `currentAddress` property changes
+
 ## 13.0.0
 
 ### Major Changes

package/README.md

@@ -695,7 +695,7 @@ get dateOptions(){
 	- `key`: A **unique** identifier used for identification in the internal code. 
 	- `dateFormat`: The date format used when this is selected.
 	- `dateTimeFormat`: The datetime format to use when this is selected. Used when the user selects "Include time".
-- `allowCustomFormat`: true/false, determines if the option to insert a fully custom format is available.
+- `allowCustomFormat`: true by default, determines if the option to insert a fully custom format is available for newly created date nodes.
 
 The syntax of formats can be found at [date-fns](https://date-fns.org/v2.29.3/docs/format).
 

package/addon/components/besluit-type-plugin/toolbar-dropdown.ts

@@ -1,13 +1,11 @@
 import { tracked } from '@glimmer/tracking';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
 import {
   addType,
   removeType,
 } from '@lblod/ember-rdfa-editor/commands/type-commands';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import CurrentSessionService from '@lblod/frontend-gelinkt-notuleren/services/current-session';
 import { ResolvedPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
 import { getRdfaAttribute } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
 import fetchBesluitTypes, {
@@ -30,8 +28,6 @@ type Args = {
 };
 
 export default class EditorPluginsToolbarDropdownComponent extends Component<Args> {
-  @service declare currentSession: CurrentSessionService;
-
   /**
    * Actual besluit type selected
    * @property besluitType
@@ -61,11 +57,8 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
   }
 
   types = trackedFunction(this, async () => {
-    // eslint-disable-next-line @typescript-eslint/await-thenable
-    const bestuurseenheid = await this.currentSession.get('group');
-    const classificatie = await bestuurseenheid.get('classificatie');
     const types = await fetchBesluitTypes(
-      classificatie.uri,
+      this.args.options.classificatieUri,
       this.args.options.endpoint,
     );
     return types;

package/addon/components/citation-plugin/citation-card.hbs

@@ -79,7 +79,7 @@
       </div>
     </c.content>
     <c.footer class='au-u-background-gray-100 au-u-padding-none'>
-      {{#if this.decisionResource.isRunning}}
+      {{#if this.legalDocumentsResource.isRunning}}
         <AuLoader />
         <span class='au-u-hidden-visually'>{{t
             'citaten-plugin.alert.loading'
@@ -99,10 +99,10 @@
           <div
             class='citaten--decision-list au-u-margin-none au-u-padding-top-tiny au-u-padding-bottom-tiny'
           >
-            <CitationPlugin::Citations::DecisionList
-              @decisions={{this.decisionResource.value}}
-              @onCitationInsert={{this.insertDecisionCitation}}
-              @onCitationDetails={{this.openDecisionDetailModal}}
+            <CitationPlugin::Citations::LegalDocumentList
+              @legalDocuments={{this.legalDocumentsResource.value}}
+              @onCitationInsert={{this.insertLegalDocumentCitation}}
+              @onCitationDetails={{this.openLegalDocumentDetailModal}}
             />
           </div>
         {{/if}}
@@ -113,9 +113,9 @@
 <CitationPlugin::Citations::SearchModal
   @open={{this.showModal}}
   @closeModal={{this.closeModal}}
-  @insertDecisionCitation={{this.insertDecisionCitation}}
+  @insertLegalDocumentCitation={{this.insertLegalDocumentCitation}}
   @insertArticleCitation={{this.insertArticleCitation}}
-  @selectedDecision={{this.decision}}
+  @selectedLegalDocument={{this.legalDocument}}
   @legislationTypeUri={{this.selectedLegislationTypeUri}}
   @selectLegislationType={{this.selectLegislationType}}
   @text={{this.searchText}}

package/addon/components/citation-plugin/citation-card.ts

@@ -19,6 +19,7 @@ import { citedText } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citati
 import {
   LEGISLATION_TYPE_CONCEPTS,
   legislationKeysCapitalized,
+  legislationKeysCapitalizedWithoutGemeentebesluit,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/types';
 import { Article } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/article';
 import {
@@ -39,10 +40,9 @@ export default class CitationCardComponent extends Component<Args> {
   @tracked pageSize = 5;
   @tracked totalSize = 0;
   @tracked totalCount = 0;
-  @tracked decisions = [];
   @tracked error: unknown;
   @tracked showModal = false;
-  @tracked decision: LegalDocument | null = null;
+  @tracked legalDocument: LegalDocument | null = null;
   @tracked cardText: string | null = null;
   @tracked cardLegislationType: string | null = null;
   @tracked documentLegislationType: Option<string>;
@@ -95,7 +95,7 @@ export default class CitationCardComponent extends Component<Args> {
       return legislationKeysCapitalized;
     }
 
-    return legislationKeysCapitalized.filter((key) => key !== 'Besluit');
+    return legislationKeysCapitalizedWithoutGemeentebesluit;
   }
 
   get selectedLegislationType() {
@@ -121,6 +121,10 @@ export default class CitationCardComponent extends Component<Args> {
     this.cardText = (event.target as HTMLInputElement).value;
   }
 
+  get governmentName() {
+    return this.config.defaultDecisionsGovernmentName;
+  }
+
   resourceSearch = restartableTask(async () => {
     await timeout(100);
     this.error = null;
@@ -131,6 +135,7 @@ export default class CitationCardComponent extends Component<Args> {
       const words = this.searchText.match(/\S+/g) || [];
       const filter = {
         type: unwrapOr('', this.selectedLegislationTypeUri),
+        governmentName: this.governmentName,
       };
       const results = await fetchLegalDocuments({
         words: words,
@@ -152,7 +157,7 @@ export default class CitationCardComponent extends Component<Args> {
     }
   });
 
-  decisionResource = trackedTask(this, this.resourceSearch, () => [
+  legalDocumentsResource = trackedTask(this, this.resourceSearch, () => [
     this.searchText,
     this.selectedLegislationType,
     this.pageNumber,
@@ -171,8 +176,8 @@ export default class CitationCardComponent extends Component<Args> {
   }
 
   @action
-  openDecisionDetailModal(decision: LegalDocument): void {
-    this.decision = decision;
+  openLegalDocumentDetailModal(legalDocument: LegalDocument): void {
+    this.legalDocument = legalDocument;
     /** why focus? see {@link EditorPluginsCitationInsertComponent.openModal } */
     this.focus();
     this.showModal = true;
@@ -180,8 +185,8 @@ export default class CitationCardComponent extends Component<Args> {
 
   @action
   async openSearchModal(): Promise<void> {
-    await this.decisionResource.cancel();
-    this.decision = null;
+    await this.legalDocumentsResource.cancel();
+    this.legalDocument = null;
     this.focus();
     this.showModal = true;
   }
@@ -189,7 +194,7 @@ export default class CitationCardComponent extends Component<Args> {
   @action
   closeModal(lastSearchType: string, lastSearchTerm: string): void {
     this.showModal = false;
-    this.decision = null;
+    this.legalDocument = null;
     if (lastSearchType) {
       this.cardLegislationType = lastSearchType;
     }
@@ -199,9 +204,9 @@ export default class CitationCardComponent extends Component<Args> {
   }
 
   @action
-  insertDecisionCitation(decision: LegalDocument): void {
-    const uri = decision.uri;
-    const title = decision.title ?? '';
+  insertLegalDocumentCitation(legalDocument: LegalDocument): void {
+    const uri = legalDocument.uri;
+    const title = legalDocument.title ?? '';
     const { from, to } = unwrap(this.activeDecoration);
     this.controller.withTransaction(
       (tr: Transaction) =>
@@ -218,11 +223,11 @@ export default class CitationCardComponent extends Component<Args> {
   }
 
   @action
-  insertArticleCitation(decision: LegalDocument, article: Article): void {
+  insertArticleCitation(legalDocument: LegalDocument, article: Article): void {
     const uri = article.uri;
     let title = '';
-    if (decision.title) {
-      title = `${decision.title}, ${article.number || ''}`;
+    if (legalDocument.title) {
+      title = `${legalDocument.title}, ${article.number || ''}`;
     }
     const { from, to } = unwrap(this.activeDecoration);
     this.controller.withTransaction(
@@ -245,7 +250,7 @@ export default class CitationCardComponent extends Component<Args> {
 
   willDestroy(): void {
     // Not necessary as ember-concurrency does this for us.
-    // this.decisionResource.cancel();
+    // this.legalDocumentsResource.cancel();
     cleanCaches();
     super.willDestroy();
   }

package/addon/components/citation-plugin/citation-insert.hbs

@@ -13,7 +13,7 @@
 <CitationPlugin::Citations::SearchModal
   @open={{this.showModal}}
   @closeModal={{this.closeModal}}
-  @insertDecisionCitation={{this.insertDecisionCitation}}
+  @insertLegalDocumentCitation={{this.insertLegalDocumentCitation}}
   @insertArticleCitation={{this.insertArticleCitation}}
   @legislationTypeUri={{this.selectedLegislationTypeUri}}
   @selectLegislationType={{this.selectLegislationType}}

package/addon/components/citation-plugin/citation-insert.ts

@@ -104,10 +104,10 @@ export default class EditorPluginsCitationInsertComponent extends Component<Args
   }
 
   @action
-  insertDecisionCitation(decision: LegalDocument) {
-    const type = decision.legislationType?.label || '';
-    const uri = decision.uri;
-    const title = decision.title ?? '';
+  insertLegalDocumentCitation(legalDocument: LegalDocument) {
+    const type = legalDocument.legislationType?.label || '';
+    const uri = legalDocument.uri;
+    const title = legalDocument.title ?? '';
     this.controller.withTransaction(
       (tr: Transaction) =>
         tr
@@ -127,12 +127,12 @@ export default class EditorPluginsCitationInsertComponent extends Component<Args
   }
 
   @action
-  insertArticleCitation(decision: LegalDocument, article: Article) {
-    const type = decision.legislationType?.label || '';
+  insertArticleCitation(legalDocument: LegalDocument, article: Article) {
+    const type = legalDocument.legislationType?.label || '';
     const uri = article.uri;
     let title = '';
-    if (decision.title) {
-      title = `${decision.title}, ${article.number ?? ''}`;
+    if (legalDocument.title) {
+      title = `${legalDocument.title}, ${article.number ?? ''}`;
     }
     const { from, to } = this.controller.mainEditorState.selection;
     this.controller.withTransaction(

package/addon/components/citation-plugin/citations/article-preview.hbs

@@ -3,7 +3,7 @@
   {{@article.number}} ({{@article.dateInForce}} - {{if @article.dateNoLongerInForce @article.dateNoLongerInForce "…"}})
   </AuHeading>
   <p>
-    {{html-safe @article.content}}
+    {{this.content}}
   </p>
   <AuButton
     @skin="primary"

package/addon/components/citation-plugin/citations/article-preview.ts

@@ -0,0 +1,13 @@
+import Component from '@glimmer/component';
+import { htmlSafe } from '@ember/template';
+import { Article } from '../../../plugins/citation-plugin/utils/article';
+
+interface Args {
+  article: Article;
+}
+
+export default class ArticlePreviewComponent extends Component<Args> {
+  get content() {
+    return htmlSafe(this.args.article.content ?? '');
+  }
+}

package/addon/components/citation-plugin/citations/{decision-detail.hbs → legal-document-detail.hbs}

@@ -3,15 +3,15 @@
     {{! Heading with title and actions }}
     <div class="citaten--container-header au-u-background-gray-100 au-o-box">
       <AuHeading @level="2" @skin="4">
-        {{capitalize @decision.fullTitle}}
+        {{capitalize @legalDocument.fullTitle}}
       </AuHeading>
-      {{#if @decision.publicationDate}}
+      {{#if @legalDocument.publicationDate}}
         <AuPill
           class="au-u-margin-top-small au-u-margin-bottom-small"
           @skin="border"
           @icon="calendar"
           @iconAlignment="left">
-          {{@decision.publicationDate}}
+          {{@legalDocument.publicationDate}}
         </AuPill>
       {{/if}}
       <br/>
@@ -20,14 +20,14 @@
         @icon="plus-text"
         @iconAlignment="left"
         class="au-u-margin-right"
-        {{on "click" (fn @insertDecisionCitation @decision)}}>
+        {{on "click" (fn @insertLegalDocumentCitation @legalDocument)}}>
         {{t "citaten-plugin.references.refer-whole"}}
       </AuButton>
       <AuLinkExternal
         @skin="primary"
         @icon="link-external"
         @iconAlignment="left"
-        href={{@decision.uri}}
+        href={{@legalDocument.uri}}
         rel="noreferrer noopener">
         {{t "citaten-plugin.references.lookup-codex"}}
       </AuLinkExternal>
@@ -50,7 +50,7 @@
           <CitationPlugin::Helpers::AlertLoadError @fullSize={{true}} @error={{this.error}} class="au-o-box"/>
         {{else}}
           <CitationPlugin::Citations::ArticleList
-            @insertArticleCitation={{fn @insertArticleCitation @decision}}
+            @insertArticleCitation={{fn @insertArticleCitation @legalDocument}}
             @articles={{this.articleResource.value}}
             @fullSize={{true}}/>
         {{/if}}

package/addon/components/citation-plugin/citations/{decision-detail.ts → legal-document-detail.ts}

@@ -8,12 +8,12 @@ import { LegalDocument } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/ci
 import { fetchArticles } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/article';
 
 interface Args {
-  decision: LegalDocument;
+  legalDocument: LegalDocument;
   close: () => void;
   config: { endpoint: string };
 }
 
-export default class EditorPluginsCitationsDecisionDetailComponent extends Component<Args> {
+export default class LegalDocumentDetailComponent extends Component<Args> {
   @tracked error: unknown;
   @tracked pageNumber = 0;
   @tracked pageSize = 5;
@@ -33,13 +33,16 @@ export default class EditorPluginsCitationsDecisionDetailComponent extends Compo
     const abortController = new AbortController();
     try {
       const results = await fetchArticles({
-        legalExpression: this.args.decision.uri,
+        legalExpression: this.args.legalDocument.uri,
         pageNumber: this.pageNumber,
         pageSize: this.pageSize,
         articleFilter: this.articleFilterAfterTimeout,
         config: this.args.config,
       });
       this.totalCount = results.totalCount;
+
+      console.log({ result: results.articles });
+
       return results.articles;
     } catch (e) {
       console.warn(e); // eslint-ignore-line no-console

package/addon/components/citation-plugin/citations/{decision-list.hbs → legal-document-list.hbs}

@@ -1,11 +1,11 @@
-{{#if @decisions.length}}
+{{#if @legalDocuments.length}}
   <AuList @direction="vertical" @divider={{true}}>
-    {{#each @decisions as |decision|}}
+    {{#each @legalDocuments as |legalDocument|}}
       <AuList::Item class="au-u-padding-left-small au-u-padding-right-small">
-        <CitationPlugin::Citations::DecisionPreview
-          @decision={{decision}}
-          @onCitationInsert={{fn @onCitationInsert decision}}
-          @onCitationDetails={{fn @onCitationDetails decision}}
+        <CitationPlugin::Citations::LegalDocumentPreview
+          @legalDocument={{legalDocument}}
+          @onCitationInsert={{fn @onCitationInsert legalDocument}}
+          @onCitationDetails={{fn @onCitationDetails legalDocument}}
           @fullSize={{@fullSize}} />
       </AuList::Item>
     {{/each}}

package/addon/components/citation-plugin/citations/{decision-preview.hbs → legal-document-preview.hbs}

@@ -1,14 +1,14 @@
 <div class="citaten--decision-list-item {{if @fullSize "au-u-padding-small"}}" ...attributes>
   <p class="citaten--decision-title {{if @fullSize "au-u-h6 au-u-medium" "au-u-h-functional"}}">
-    {{if @fullSize (capitalize @decision.fullTitle) @decision.title}}
+    {{if @fullSize (capitalize @legalDocument.fullTitle) @legalDocument.title}}
   </p>
-  {{#if (and @fullSize @decision.publicationDate)}}
+  {{#if (and @fullSize @legalDocument.publicationDate)}}
     <AuPill
       class="au-u-margin-top-small au-u-margin-bottom-small"
       @skin="border"
       @icon="calendar"
       @iconAlignment="left">
-      {{@decision.publicationDate}}
+      {{@legalDocument.publicationDate}}
     </AuPill>
   {{/if}}
   {{#if @fullSize}}
@@ -27,7 +27,7 @@
               @skin="button"
               @icon="link-external"
               @iconAlignment="left"
-              href={{@decision.meta.publicationLink}}
+              href={{@legalDocument.meta.publicationLink}}
               rel="noreferrer noopener">
               {{t "citaten-plugin.references.lookup-publicatie"}}
             </AuLinkExternal>
@@ -69,7 +69,7 @@
             @skin="link"
             @icon="link-external"
             @iconAlignment="left"
-            href={{@decision.meta.publicationLink}}
+            href={{@legalDocument.meta.publicationLink}}
             rel="noreferrer noopener"
             class="au-u-h-functional"
           >

package/addon/components/citation-plugin/citations/{decision-preview.ts → legal-document-preview.ts}

@@ -5,15 +5,15 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/legal-documents';
 
 interface Args {
-  decision: LegalDocument;
+  legalDocument: LegalDocument;
 }
 
-export default class DecisionPreviewComponent extends Component<Args> {
+export default class LegalDocumentPreviewComponent extends Component<Args> {
   get isBesluit() {
-    return isBesluitLegalDocument(this.args.decision);
+    return isBesluitLegalDocument(this.args.legalDocument);
   }
 
   get hasPublicationLink() {
-    return this.isBesluit && this.args.decision.meta?.publicationLink;
+    return this.isBesluit && this.args.legalDocument.meta?.publicationLink;
   }
 }

package/addon/components/citation-plugin/citations/search-modal.hbs

@@ -6,13 +6,13 @@
   @padding='none'
   as |modal|
 >
-  {{#if this.selectedDecision}}
+  {{#if this.selectedLegalDocument}}
     <modal.Body>
-      <CitationPlugin::Citations::DecisionDetail
-        @insertDecisionCitation={{this.insertDecisionCitation}}
+      <CitationPlugin::Citations::LegalDocumentDetail
+        @insertLegalDocumentCitation={{this.insertLegalDocumentCitation}}
         @insertArticleCitation={{this.insertArticleCitation}}
-        @close={{this.closeDecisionDetail}}
-        @decision={{this.selectedDecision}}
+        @close={{this.closeLegalDocumentDetail}}
+        @legalDocument={{this.selectedLegalDocument}}
         @config={{this.config}}
       />
     </modal.Body>
@@ -195,7 +195,7 @@
           </div>
         </mc.sidebar>
         <mc.content>
-          {{#if this.decisionResource.isRunning}}
+          {{#if this.legalDocumentResource.isRunning}}
             <div class='au-u-margin'>
               <AuLoader @padding='large' />
               <span class='au-u-hidden-visually'>{{t
@@ -210,14 +210,14 @@
                 class='au-u-margin'
               />
             {{else}}
-              {{#if this.decisionResource.value.length}}
+              {{#if this.legalDocumentResource.value.length}}
                 <div
                   class='citaten--container-content au-u-padding-top-small au-u-padding-bottom-small'
                 >
-                  <CitationPlugin::Citations::DecisionList
-                    @decisions={{this.decisionResource.value}}
-                    @onCitationInsert={{this.insertDecisionCitation}}
-                    @onCitationDetails={{this.openDecisionDetail}}
+                  <CitationPlugin::Citations::LegalDocumentList
+                    @legalDocuments={{this.legalDocumentResource.value}}
+                    @onCitationInsert={{this.insertLegalDocumentCitation}}
+                    @onCitationDetails={{this.openLegalDocumentDetail}}
                     @fullSize={{true}}
                   />
                 </div>
@@ -229,7 +229,7 @@
               {{/if}}
             {{/if}}
           {{/if}}
-          {{#if this.decisionResource.value.length}}
+          {{#if this.legalDocumentResource.value.length}}
             {{#let
               (pagination
                 page=this.pageNumber

package/addon/components/citation-plugin/citations/search-modal.ts

@@ -6,10 +6,11 @@ import { inject as service } from '@ember/service';
 import { capitalize } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
 import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
 import {
-  isBesluitType,
+  isGemeenteBesluitType,
   LEGISLATION_TYPE_CONCEPTS,
   LEGISLATION_TYPES,
   legislationKeysCapitalized,
+  legislationKeysCapitalizedWithoutGemeentebesluit,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/types';
 import { CitationPluginEmberComponentConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
 import IntlService from 'ember-intl/services/intl';
@@ -37,26 +38,28 @@ function getISODate(date: Option<Date>): string | null {
 }
 
 interface Args {
-  selectedDecision: LegalDocument;
+  selectedLegalDocument: LegalDocument;
   legislationTypeUri: string;
   text: string;
-  insertDecisionCitation: (decision: LegalDocument) => void;
-  insertArticleCitation: (decision: LegalDocument, article: Article) => void;
+  insertLegalDocumentCitation: (legalDocument: LegalDocument) => void;
+  insertArticleCitation: (
+    legalDocument: LegalDocument,
+    article: Article,
+  ) => void;
   closeModal: (legislationTypeUri?: string, text?: string) => void;
   config: CitationPluginEmberComponentConfig;
 }
 
 export default class EditorPluginsCitationsSearchModalComponent extends Component<Args> {
   @service declare intl: IntlService;
-  // Vlaamse Codex currently doesn't contain captions and content of decisions
+  // Vlaamse Codex currently doesn't contain captions and content of legal document
   // @tracked isEnabledSearchCaption = false
   // @tracked isEnabledSearchContent = false
   @tracked pageNumber = 0;
   @tracked pageSize = 5;
   @tracked totalCount = 0;
-  @tracked decisions = [];
   @tracked error: unknown;
-  @tracked selectedDecision: LegalDocument | null = null;
+  @tracked selectedLegalDocument: LegalDocument | null = null;
   @tracked documentDateFrom: Date | null = null;
   @tracked documentDateTo: Date | null = null;
   @tracked publicationDateFrom: Date | null = null;
@@ -92,7 +95,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
       return legislationKeysCapitalized;
     }
 
-    return legislationKeysCapitalized.filter((key) => key !== 'Besluit');
+    return legislationKeysCapitalizedWithoutGemeentebesluit;
   }
 
   get legislationSelected() {
@@ -159,7 +162,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     }
   });
 
-  decisionResource = trackedTask(this, this.resourceSearch, () => [
+  legalDocumentResource = trackedTask(this, this.resourceSearch, () => [
     this.searchText,
     this.governmentSearchText,
     this.legislationTypeUri,
@@ -172,7 +175,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
   ]);
 
   get isBesluitType() {
-    return isBesluitType(this.legislationTypeUri);
+    return isGemeenteBesluitType(this.legislationTypeUri);
   }
 
   @action
@@ -206,32 +209,32 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
   }
 
   @action
-  async insertDecisionCitation(decision: LegalDocument) {
-    this.args.insertDecisionCitation(decision);
+  async insertLegalDocumentCitation(legalDocument: LegalDocument) {
+    this.args.insertLegalDocumentCitation(legalDocument);
     await this.closeModal();
   }
 
   @action
-  async insertArticleCitation(decision: LegalDocument, article: Article) {
-    this.args.insertArticleCitation(decision, article);
+  async insertArticleCitation(legalDocument: LegalDocument, article: Article) {
+    this.args.insertArticleCitation(legalDocument, article);
     await this.closeModal();
   }
 
   @action
   async closeModal(legislationTypeUri?: string, text?: string) {
-    await this.decisionResource.cancel();
+    await this.legalDocumentResource.cancel();
     this.inputSearchText = null;
     this.args.closeModal(legislationTypeUri, text);
   }
 
   @action
-  openDecisionDetail(decision: LegalDocument) {
-    this.selectedDecision = decision;
+  openLegalDocumentDetail(legalDocument: LegalDocument) {
+    this.selectedLegalDocument = legalDocument;
   }
 
   @action
-  closeDecisionDetail() {
-    this.selectedDecision = null;
+  closeLegalDocumentDetail() {
+    this.selectedLegalDocument = null;
   }
 
   // Pagination