@lblod/ember-rdfa-editor-lblod-plugins 12.0.0 → 12.1.0

package/.woodpecker/.changeset.yml

@@ -5,5 +5,4 @@ steps:
       - git fetch origin master
       - git diff -wb --name-only origin/master..HEAD | grep "\.changeset/.*\.md"
 when:
-  event: pull_request
-  evaluate: 'not (CI_COMMIT_PULL_REQUEST_LABELS contains "dependabot")'
+  - evaluate: 'CI_PIPELINE_EVENT == "pull_request" && not (CI_COMMIT_PULL_REQUEST_LABELS contains "dependabot")'

package/CHANGELOG.md

@@ -1,4 +1,21 @@
-## 11.3.0 - 2023-09-06
+# @lblod/ember-rdfa-editor-lblod-plugins
+
+## 12.1.0
+
+### Minor Changes
+
+- [#286](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/286) [`955535b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/955535b4d99d729b40f0e01bf1c634042894bf60) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4266: Referring to published decisions - filter by government name
+
+- [#299](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/299) [`3732e50`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/3732e5041df3d3e994df34de9dd436f59f7bade0) Thanks [@x-m-el](https://github.com/x-m-el)! - Update readme documentation for RDFa date and Table of Contents plugin to include explanation about their configurations
+
+- [#290](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/290) [`8c1ad72`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/8c1ad729b0eb1a159637d3ed9f3b49a02a659a96) Thanks [@elpoelma](https://github.com/elpoelma)! - Add support for address variables inside location variables
+
+- [#296](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/296) [`bcf7a2d`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/bcf7a2d7314dfd1156ca1e310d5c15d1d2c2fbfe) Thanks [@abeforgit](https://github.com/abeforgit)! - bump ember and ember data to 4.12 for development, and add correct peerdep specification for consumers
+
+- [#298](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/298) [`2908aa3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/2908aa355b6dadc694ee90fd93ad2e79faa22257) Thanks [@x-m-el](https://github.com/x-m-el)! - Added a second address insert `variable-plugin/address/insert-variable`. This replaces the `insert` from before when used inside the `insert-variable-card` dropdown.
+
+  - same UI as other variables
+  - allows using a custom label
 
 ## 12.0.0
 
@@ -17,6 +34,8 @@
 
 - [#289](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/289) [`d1e2af1`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d1e2af14bab0eb4ed6e1d7d62a5c55e396c707ce) Thanks [@elpoelma](https://github.com/elpoelma)! - Bumps `@lblod/ember-rdfa-editor` from 5.2.0 to 5.3.0
 
+## [11.3.0] - 2023-09-06
+
 ### Changed
 
 - CI: move changelog check to separate CI pipeline

package/README.md

@@ -5,7 +5,9 @@ related to the LBLOD Project.
 
 ## Compatibility
 
-* Ember.js v3.28 or above
+* Ember.js and ember data v3.28 or 4.x
+note: we smoke-test for 3.28 but develop on the latest 4.x minor. The 5.x range is currently untested and not officially supported, but we accept issues and PRs to do so.
+
 * Embroider or ember-auto-import v2
 * Node 18 or above
 
@@ -254,13 +256,15 @@ Same goes for the `CitationInsert` component, with which you can directly insert
 
 You need to specify the endpoints for the plugin in the config object
 ```js
-{
-  endpoint: 'https://codex.opendata.api.vlaanderen.be:8888/sparql'
-  decisionsEndpoint: 'https://https://publicatie.gelinkt-notuleren.vlaanderen.be/sparql'
+const citationPluginConfig = {
+  endpoint: 'https://codex.opendata.api.vlaanderen.be:8888/sparql',
+  decisionsEndpoint: 'https://publicatie.gelinkt-notuleren.vlaanderen.be/sparql',
+  defaultDecisionsGovernmentName: 'Edegem'
 }
 ```
 
-The `decisionsEndpoint` is optional, and is required if you want to display decisions from the Publicatie.
+The `decisionsEndpoint` is optional, and is required if you want to display decisions from the Publicatie.  
+The `defaultDecisionsGovernmentName` is also optional, and is used to filter the decisions from the Publicatie by government name, the government name for the filter can be changed by the user during the search.
 
 
 Make `this.citationPlugin` a tracked reference to the plugin created with the function exported from the package and the wished configuration
@@ -380,15 +384,38 @@ And an insert button to insert new dates that needs to be added to the insert pa
   />
 ```
 
-You will also need to add the date node with the following configuration (being the insertDate and insertDateTime the placeholder strings):
+You will also need to add a configuration like the following:
 ```js
   date: date({
     placeholder: {
       insertDate: this.intl.t('date-plugin.insert.date'),
       insertDateTime: this.intl.t('date-plugin.insert.datetime'),
     },
+     formats: [
+      {
+        label: 'Short Date',
+        key: 'short',
+        dateFormat: 'dd/MM/yy',
+        dateTimeFormat: 'dd/MM/yy HH:mm',
+      },
+      {
+        label: 'Long Date',
+        key: 'long',
+        dateFormat: 'EEEE dd MMMM yyyy',
+        dateTimeFormat: 'PPPPp',
+      },
+    ],
+    allowCustomFormat: true,
   }),
 ```
+- `formats`: specify default formats to show for selection in the date card.
+	- `label` (optional): The label shown to the user on the card. If not provided, the format is used instead e.g.: `dd/MM/yyyy`
+	- `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.
+
+The syntax of formats can be found at [date-fns](https://date-fns.org/v2.29.3/docs/format).
 
 ## roadsign-regulation-plugin
 
@@ -411,7 +438,7 @@ You will need to set the following configuration in the config object
   imageBaseUrl: 'https://register.mobiliteit.vlaanderen.be/',
 }
 ```
-The `endpoint` from where the plugin will fetch the roadsigns, and the `imageBaseUrl` is a fallback for the images that don't have a baseUrl specified, probably you won't need it if your data is correctly constructed.
+The `endpoint` from where the plugin will fetch the roadsigns, and the `imageBaseUrl` is a fallback for the images that don't have a baseUrl specified. This won't be used if your data is correctly constructed.
 
 ## standard-template-plugin
 
@@ -454,6 +481,15 @@ In order to enable the plugin you need to add the table of contents button to th
 ```js
   tableOfContentsView(this.config.tableOfContents)(controller),
 ```
+
+You also need to allow this node as content by adding it to the doc node of the schema. It is *not* part of the block group.
+``` js
+// example to allow the table of contents at the top and any blocks underneath
+doc: docWithConfig({
+        content: 'table-of-contents? block+'
+     }),
+```
+
 ### Configuring the plugin with a custom config
 
 You can configure the nodeview with the hierarchy of the nodes.  
@@ -470,6 +506,11 @@ For very custom setups, the plugin might be unable to find your scrollContainer
 },
 ```
 
+`nodeHierarchy` is a list of *regex* strings to specify the node structure of the document. Note that this means the order of the words does not matter. The example shows this for article structures.
+The *first string* selects the main nodes in the document that define the structure.
+The strings afterwards are the sub-nodes inside main nodes that should be used to find the actual content to display in the table of contents, if the main node does not contain the content directly. In the example a title will have a `structure_header` that contains the actual text of the title.  
+In the case that `structure_header` contains a node `actual_title_text` that should be used as content, you'd have to add a third regex string that matches `actual_title_text`.
+
 ### Internationalization of the table of contents
 The dynamic version of the table of contents is internationalized based on the current document language and using the `ember-intl` service.
 The static (serialized) version of the table of contents can also be internationalized based on the current document language. For this to work correctly, the `emberApplication` prosemirror-plugin should be present. 
@@ -530,7 +571,7 @@ This addon includes an insert-component for each of these variable types:
 - `variable-plugin/date/insert`
 - `variable-plugin/location/insert`
 - `variable-plugin/codelist/insert`
-- `variable-plugin/address/insert`
+- `variable-plugin/address/insert-variable`
 
 Each of these components presents a custom UI which allows a user to insert a variable of the corresponding type in a document.
 
@@ -604,6 +645,12 @@ get variableTypes() {
         },
       },
     },
+    {
+      label: 'address',
+      component: {
+        path: 'variable-plugin/address/insert-variable',
+      },
+    },
   ];
 }
 ```
@@ -674,6 +721,12 @@ The edit card can be configured with two arguments:
 - An instance of a `SayController` (required)
 - A `defaultMuncipality` which should be used as the default value of the `muncipality` field in the edit-card (optional)
 
+
+You can also add an insert component meant for use outside of `insert-variable-card` by using the `variable-plugin/address/insert` component. This has no label-input and will show a default label.
+```hbs
+  <VariablePlugin::Address::Insert @controller={{this.controller}}/>
+```
+
 ## validation-plugin
 
 see [the plugin docs](addon/plugins/validation/README.md)

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

@@ -66,6 +66,28 @@
               />
 
               <AuHr @size='large' />
+              {{#if this.isBesluitType}}
+                <AuLabel
+                  class='au-u-margin-top au-margin-bottom-small'
+                  for='search-government'
+                  @inline={{false}}
+                  @required={{false}}
+                  @error={{false}}
+                  @warning={{false}}
+                >
+                  {{t 'citaten-plugin.search.government-search'}}
+                </AuLabel>
+                <AuNativeInput
+                  @icon='search'
+                  @type='text'
+                  @width='block'
+                  @iconAlignment='right'
+                  id='search-government'
+                  value={{this.governmentSearchText}}
+                  placeholder={{t 'citaten-plugin.search.placeholder'}}
+                  {{on 'input' this.setGovernmentSearchText}}
+                />
+              {{/if}}
               {{! Date of document }}
               <AuLabel
                 class='au-u-margin-top au-u-margin-bottom-small'

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

@@ -62,6 +62,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
   @tracked publicationDateFrom: Date | null = null;
   @tracked publicationDateTo: Date | null = null;
   @tracked inputSearchText: string | null = null;
+  @tracked inputGovernmentSearchText: string | null = null;
   minDate = new Date('1930-01-01T12:00:00');
   maxDate = new Date(`${new Date().getFullYear() + 10}-01-01T12:00:00`);
 
@@ -115,6 +116,13 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     return this.inputSearchText ?? this.text;
   }
 
+  get governmentSearchText() {
+    return (
+      this.inputGovernmentSearchText ??
+      this.config.defaultDecisionsGovernmentName
+    );
+  }
+
   resourceSearch = restartableTask(async () => {
     await timeout(500);
     this.error = null;
@@ -129,6 +137,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
         documentDateTo: getISODate(this.documentDateTo),
         publicationDateFrom: getISODate(this.publicationDateFrom),
         publicationDateTo: getISODate(this.publicationDateTo),
+        governmentName: this.governmentSearchText,
       };
       const results = await fetchLegalDocuments({
         words: words,
@@ -152,6 +161,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
 
   decisionResource = trackedTask(this, this.resourceSearch, () => [
     this.searchText,
+    this.governmentSearchText,
     this.legislationTypeUri,
     this.pageSize,
     this.pageNumber,
@@ -170,6 +180,11 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     this.inputSearchText = (event.target as HTMLInputElement).value;
   }
 
+  @action
+  setGovernmentSearchText(event: InputEvent) {
+    this.inputGovernmentSearchText = (event.target as HTMLInputElement).value;
+  }
+
   @action
   updateDocumentDateFrom(_isoDate: unknown, date: Date) {
     this.documentDateFrom = date;

package/addon/components/rdfa-date-plugin/date.hbs

@@ -1,4 +1,4 @@
-<AuPill @icon="pencil" @iconAlignment="right" class="variable" {{on 'click' this.onClick}}>
+<AuPill @icon="pencil" @iconAlignment="right" class="variable atomic" {{on 'click' this.onClick}}>
 
   {{this.humanReadableDate}}
   {{#if @node.attrs.label}}

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

@@ -101,7 +101,7 @@ export default class AddressEditComponent extends Component<Args> {
   }
 
   get selectedAddressVariable() {
-    const { selection, schema } = this.controller.mainEditorState;
+    const { selection, schema } = this.controller.activeEditorState;
     if (
       selection instanceof NodeSelection &&
       selection.node.type === schema.nodes.address

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

@@ -0,0 +1,9 @@
+<AuFormRow>
+  <VariablePlugin::Utils::LabelInput 
+    @label={{this.label}} 
+    @updateLabel={{this.updateLabel}}
+  />
+</AuFormRow>
+<AuButton {{on 'click' this.insertAddress}}>
+  {{t 'variable-plugin.button'}}
+</AuButton>

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

@@ -0,0 +1,27 @@
+import Component from '@glimmer/component';
+import { replaceSelectionWithAddress } from './utils';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { SayController } from '@lblod/ember-rdfa-editor';
+
+type Args = {
+  controller: SayController;
+};
+
+export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
+  @tracked label?: string;
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  @action
+  updateLabel(event: InputEvent) {
+    this.label = (event.target as HTMLInputElement).value;
+  }
+
+  @action
+  insertAddress() {
+    replaceSelectionWithAddress(this.controller, this.label);
+  }
+}

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

@@ -3,7 +3,8 @@
     @icon="add"
     @iconAlignment="left"
     @skin="link"
-    {{on 'click' (fn this.insertAddress true)}}>
+    {{on 'click' (fn this.insertAddress true)}}
+    @disabled={{not this.canInsertAddress}}>
     {{t "editor-plugins.address.insert"}}
   </AuButton>
 </AuList::Item>

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

@@ -1,8 +1,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { NodeSelection } from '@lblod/ember-rdfa-editor';
-import { v4 as uuidv4 } from 'uuid';
+import { replaceSelectionWithAddress } from './utils';
 
 type Args = {
   controller: SayController;
@@ -13,25 +12,16 @@ export default class InsertAddressComponent extends Component<Args> {
     return this.args.controller;
   }
 
-  get schema() {
-    return this.controller.schema;
-  }
-
   @action
   insertAddress() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
-    this.controller.withTransaction((tr) => {
-      tr.replaceSelectionWith(
-        this.schema.node('address', { mappingResource, variableInstance }),
-      );
-      if (tr.selection.$anchor.nodeBefore) {
-        const resolvedPos = tr.doc.resolve(
-          tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
-        );
-        tr.setSelection(new NodeSelection(resolvedPos));
-      }
-      return tr;
-    });
+    replaceSelectionWithAddress(this.controller);
+  }
+
+  get canInsertAddress() {
+    if (this.controller.activeEditorView.props.nodeViews?.address) {
+      return true;
+    } else {
+      return false;
+    }
   }
 }

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

@@ -1,7 +1,7 @@
 <AuPill
   @icon='pencil'
   @iconAlignment='right'
-  class='variable'
+  class='variable atomic'
   {{on 'click' this.selectThisNode}}
 >
   {{#if this.address}}

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

@@ -0,0 +1,26 @@
+import { SayController, NodeSelection } from '@lblod/ember-rdfa-editor';
+import { v4 as uuidv4 } from 'uuid';
+
+export function replaceSelectionWithAddress(
+  controller: SayController,
+  label?: string,
+) {
+  const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
+  const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+  controller.withTransaction((tr) => {
+    tr.replaceSelectionWith(
+      controller.schema.node('address', {
+        label: label,
+        mappingResource,
+        variableInstance,
+      }),
+    );
+    if (tr.selection.$anchor.nodeBefore) {
+      const resolvedPos = tr.doc.resolve(
+        tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
+      );
+      tr.setSelection(new NodeSelection(resolvedPos));
+    }
+    return tr;
+  });
+}

package/addon/components/variable-plugin/location/nodeview.hbs

@@ -0,0 +1,8 @@
+<VariablePlugin::Variable::Nodeview 
+  @controller={{@controller}} 
+  @node={{@node}} 
+  @view={{@view}} 
+  @getPos={{@getPos}} 
+  @selected={{@selected}}
+  @nodeViews={{this.nodeViews}}
+/>

package/addon/components/variable-plugin/location/nodeview.ts

@@ -0,0 +1,15 @@
+import Component from '@glimmer/component';
+import { SayController, SayView } from '@lblod/ember-rdfa-editor';
+import { tracked } from '@glimmer/tracking';
+import { addressView } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
+
+type Args = {
+  controller: SayController;
+};
+
+export default class LocationNodeViewComponent extends Component<Args> {
+  @tracked nodeViews = {
+    address: addressView(this.args.controller),
+  };
+  @tracked innerView?: SayView;
+}

package/addon/components/variable-plugin/number/nodeview.hbs

@@ -5,7 +5,7 @@
   <AuPill
     @icon='pencil'
     @iconAlignment='right'
-    class='variable'
+    class='variable atomic'
     {{velcro.hook}}
     {{select-node-on-click @controller @getPos}}
   >

package/addon/components/variable-plugin/variable/nodeview.hbs

@@ -6,6 +6,7 @@
     @getPos={{@getPos}} 
     @selected={{@selected}}
     @initEditor={{this.initEditor}}
+    @nodeViews={{@nodeViews}}
   />
   {{#if @node.attrs.label}}
     <span class="label">

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

@@ -140,6 +140,7 @@ export type CitationPluginConfig =
 export type CitationPluginEmberComponentConfig = CitationPluginConfig & {
   endpoint: string;
   decisionsEndpoint?: string;
+  defaultDecisionsGovernmentName?: string;
 };
 
 export function citationPlugin(config: CitationPluginConfig): CitationPlugin {

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

@@ -65,6 +65,7 @@ export interface LegalDocumentsQueryFilter {
   documentDateTo?: Option<string>;
   publicationDateFrom?: Option<string>;
   publicationDateTo?: Option<string>;
+  governmentName?: Option<string>;
 }
 
 export type LegalDocumentsQueryConfig = {
@@ -94,6 +95,7 @@ export async function fetchLegalDocuments({
     documentDateTo: filter.documentDateTo || null,
     publicationDateFrom: filter.publicationDateFrom || null,
     publicationDateTo: filter.publicationDateTo || null,
+    governmentName: filter.governmentName || null,
   };
   const stringArguments = JSON.stringify({
     words,

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

@@ -42,6 +42,12 @@ const getFilters = ({
     );
   }
 
+  const governmentNameFilter = filter.governmentName?.trim()
+    ? `FILTER (CONTAINS(LCASE(?administrativeUnitName), "${replaceDiacriticsInWord(
+        filter.governmentName?.trim(),
+      ).toLowerCase()}"))`
+    : '';
+
   return `
     ${words
       .map(
@@ -51,7 +57,10 @@ const getFilters = ({
           ).toLowerCase()}"))`,
       )
       .join('\n')}
-    ${documentDateFilter.join('\n')}`;
+    ${documentDateFilter.join('\n')}
+    ${governmentNameFilter}
+    FILTER(BOUND(?decisionTitle))
+    `;
 };
 
 const getCountQuery = ({
@@ -69,25 +78,31 @@ const getCountQuery = ({
     PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
     PREFIX eli: <http://data.europa.eu/eli/ontology#>
     PREFIX prov: <http://www.w3.org/ns/prov#>
-    PREFIX schema: <http://schema.org/>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
     PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
-    PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+    PREFIX dct: <http://purl.org/dc/terms/>
 
     SELECT (COUNT(DISTINCT(?decision)) as ?count) WHERE {
       ?session rdf:type besluit:Zitting;
         mu:uuid ?zittingUuid;
-        (besluit:isGehoudenDoor/mandaat:isTijdspecialisatieVan/skos:prefLabel) ?governmentName;
-        ext:besluitenlijst ?decisionList.
-      ?decisionList ext:besluitenlijstBesluit ?decision.
-      ?decision eli:title ?decisionTitle.
+        (besluit:isGehoudenDoor/mandaat:isTijdspecialisatieVan) ?administrativeUnit.
+      ?administrativeUnit skos:prefLabel ?administrativeUnitFullName;
+        besluit:bestuurt ?bestuurseenheid.
+      ?bestuurseenheid skos:prefLabel ?administrativeUnitName;
+        (besluit:classificatie/skos:prefLabel) ?administrativeUnitTypeName.
       OPTIONAL {
-        ?agenda rdf:type besluit:BehandelingVanAgendapunt;
+        ?session besluit:behandelt ?agendaPoint.
+        ?agendaPointTreatment dct:subject ?agendaPoint;
           prov:generated ?decision.
-        ?treatment rdf:type ext:Uittreksel;
-          ext:uittrekselBvap ?agenda;
-          mu:uuid ?treatmentUuida.
+        ?decision eli:title ?decisionTitle.
+      }
+      OPTIONAL {
+        ?session ext:uittreksel ?treatment.
+        ?treatment mu:uuid ?treatmentUuid.
+        ?treatment ext:uittrekselBvap ?agendaPointTreatment.
+        ?agendaPointTreatment prov:generated ?decision.
+        ?decision eli:title ?decisionTitle.
       }
       ${filterString}
     }
@@ -113,25 +128,31 @@ const getQuery = ({
     PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
     PREFIX eli: <http://data.europa.eu/eli/ontology#>
     PREFIX prov: <http://www.w3.org/ns/prov#>
-    PREFIX schema: <http://schema.org/>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
     PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
-    PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+    PREFIX dct: <http://purl.org/dc/terms/>
 
-    SELECT DISTINCT ?governmentName ?decision ?decisionTitle ?documentDate ?zittingUuid ?treatmentUuid WHERE {
+    SELECT DISTINCT ?administrativeUnitFullName ?administrativeUnitTypeName ?administrativeUnitName ?documentDate ?decision ?decisionTitle ?zittingUuid ?treatmentUuid WHERE {
       ?session rdf:type besluit:Zitting;
         mu:uuid ?zittingUuid;
-        (besluit:isGehoudenDoor/mandaat:isTijdspecialisatieVan/skos:prefLabel) ?governmentName;
-        ext:besluitenlijst ?decisionList.
-      ?decisionList ext:besluitenlijstBesluit ?decision.
-      ?decision eli:title ?decisionTitle.
+        (besluit:isGehoudenDoor/mandaat:isTijdspecialisatieVan) ?administrativeUnit.
+      ?administrativeUnit skos:prefLabel ?administrativeUnitFullName;
+        besluit:bestuurt ?bestuurseenheid.
+      ?bestuurseenheid skos:prefLabel ?administrativeUnitName;
+        (besluit:classificatie/skos:prefLabel) ?administrativeUnitTypeName.
       OPTIONAL {
-        ?agenda rdf:type besluit:BehandelingVanAgendapunt;
+        ?session besluit:behandelt ?agendaPoint.
+        ?agendaPointTreatment dct:subject ?agendaPoint;
           prov:generated ?decision.
-        ?treatment rdf:type ext:Uittreksel;
-          ext:uittrekselBvap ?agenda;
-          mu:uuid ?treatmentUuid.
+        ?decision eli:title ?decisionTitle.
+      }
+      OPTIONAL {
+        ?session ext:uittreksel ?treatment.
+        ?treatment mu:uuid ?treatmentUuid.
+        ?treatment ext:uittrekselBvap ?agendaPointTreatment.
+        ?agendaPointTreatment prov:generated ?decision.
+        ?decision eli:title ?decisionTitle.
       }
       ${filterString}
     }
@@ -142,7 +163,9 @@ const getQuery = ({
 };
 
 interface PublicDecisionLegalDocumentBinding {
-  governmentName: Binding<string>;
+  administrativeUnitName: Binding<string>;
+  administrativeUnitTypeName: Binding<string>;
+  administrativeUnitFullName: Binding<string>;
   decision: Binding<string>;
   decisionTitle: Binding<string>;
   documentDate?: Binding<string>;
@@ -176,7 +199,7 @@ export async function fetchPublicDecisions({
 
     const legalDocuments = response.results.bindings.map((binding) => {
       const escapedGovernmentName =
-        escapeValue(binding.governmentName.value) ?? '';
+        escapeValue(binding.administrativeUnitFullName.value) ?? '';
 
       const escapedTitle = escapeValue(binding.decisionTitle.value) ?? '';
 
@@ -198,8 +221,12 @@ export async function fetchPublicDecisions({
           publicationLink:
             binding.zittingUuid.value && binding.treatmentUuid?.value
               ? getPublicationLink({
+                  administrativeUnitName: binding.administrativeUnitName.value,
+                  administrativeUnitTypeName:
+                    binding.administrativeUnitTypeName.value,
                   zittingUuid: binding.zittingUuid.value,
                   treatmentUuid: binding.treatmentUuid.value,
+                  decisionsEndpoint: config.endpoint,
                 })
               : null,
         },
@@ -219,10 +246,19 @@ export async function fetchPublicDecisions({
 }
 
 const getPublicationLink = ({
+  administrativeUnitName,
+  administrativeUnitTypeName,
   zittingUuid,
   treatmentUuid,
+  decisionsEndpoint,
 }: {
+  administrativeUnitName: string;
+  administrativeUnitTypeName: string;
   zittingUuid: string;
   treatmentUuid: string;
-}) =>
-  `https://publicatie.gelinkt-notuleren.lblod.info/Edegem/Gemeente/zittingen/${zittingUuid}/uittreksels/${treatmentUuid}`;
+  decisionsEndpoint: string;
+}) => {
+  return `https://${
+    new URL(decisionsEndpoint).host
+  }/${administrativeUnitName}/${administrativeUnitTypeName}/zittingen/${zittingUuid}/uittreksels/${treatmentUuid}`;
+};

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

@@ -71,7 +71,7 @@ const toDOM = (node: PNode): DOMOutputSpec => {
 
 const emberNodeConfig: EmberNodeConfig = {
   name: 'location',
-  componentPath: 'variable-plugin/variable/nodeview',
+  componentPath: 'variable-plugin/location/nodeview',
   inline: true,
   group: 'inline variable',
   content: 'inline*',

package/app/components/variable-plugin/address/insert-variable.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/address/insert-variable';

package/app/components/variable-plugin/location/nodeview.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/location/nodeview';

package/app/styles/variable-plugin.scss

@@ -48,12 +48,14 @@
 }
 
 .ember-node {
+  white-space: normal !important;
   .variable {
     [contenteditable] {
       white-space: break-spaces;
       word-break: break-all;
       word-wrap: break-word;
       outline: 0px;
+      padding: 2px;
     }
     .label {
       font-size: var(--au-base);
@@ -68,8 +70,10 @@
 }
 
 .ember-node.ProseMirror-selectednode {
-  .variable {
-    background-color: var(--au-blue-200);
+  > .variable {
+    &.atomic {
+      background-color: var(--au-blue-200);
+    }
     outline: 2px solid var(--au-blue-500);
 
     ::selection {

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

@@ -25,6 +25,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     publicationDateFrom: Date | null;
     publicationDateTo: Date | null;
     inputSearchText: string | null;
+    inputGovernmentSearchText: string | null;
     minDate: Date;
     maxDate: Date;
     get legislationTypeUri(): string;
@@ -47,10 +48,12 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     get text(): string;
     get config(): CitationPluginEmberComponentConfig;
     get searchText(): string;
+    get governmentSearchText(): string | undefined;
     resourceSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<LegalDocument[]>>;
     decisionResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
     get isBesluitType(): boolean;
     setInputSearchText(event: InputEvent): void;
+    setGovernmentSearchText(event: InputEvent): void;
     updateDocumentDateFrom(_isoDate: unknown, date: Date): void;
     updateDocumentDateTo(_isoDate: unknown, date: Date): void;
     updatePublicationDateFrom(_isoDate: unknown, date: Date): void;

package/components/variable-plugin/address/insert-variable.d.ts

@@ -0,0 +1,12 @@
+import Component from '@glimmer/component';
+import { SayController } from '@lblod/ember-rdfa-editor';
+type Args = {
+    controller: SayController;
+};
+export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
+    label?: string;
+    get controller(): SayController;
+    updateLabel(event: InputEvent): void;
+    insertAddress(): void;
+}
+export {};

package/components/variable-plugin/address/insert.d.ts

@@ -5,7 +5,7 @@ type Args = {
 };
 export default class InsertAddressComponent extends Component<Args> {
     get controller(): SayController;
-    get schema(): import("prosemirror-model").Schema<any, any>;
     insertAddress(): void;
+    get canInsertAddress(): boolean;
 }
 export {};

package/components/variable-plugin/address/utils.d.ts

@@ -0,0 +1,2 @@
+import { SayController } from '@lblod/ember-rdfa-editor';
+export declare function replaceSelectionWithAddress(controller: SayController, label?: string): void;

package/components/variable-plugin/location/nodeview.d.ts

@@ -0,0 +1,12 @@
+import Component from '@glimmer/component';
+import { SayController, SayView } from '@lblod/ember-rdfa-editor';
+type Args = {
+    controller: SayController;
+};
+export default class LocationNodeViewComponent extends Component<Args> {
+    nodeViews: {
+        address: import("prosemirror-view").NodeViewConstructor;
+    };
+    innerView?: SayView;
+}
+export {};

package/index.js

@@ -6,6 +6,9 @@ module.exports = {
     return process.env.EMBER_ENV === 'development';
   },
   options: {
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+    },
     babel: {
       sourceMaps: 'inline',
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -46,7 +46,6 @@
     "ember-auto-import": "~2.6.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",
-    "ember-cli-typescript": "^5.2.1",
     "ember-concurrency": "^2.3.7",
     "ember-mu-transform-helpers": "^2.0.0",
     "ember-power-select": "^6.0.1",
@@ -106,18 +105,19 @@
     "@types/rdfjs__dataset": "^2.0.0",
     "@types/rsvp": "^4.0.4",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "@typescript-eslint/parser": "^5.21.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "changesets-release-it-plugin": "^0.1.1",
-    "ember-cli": "~4.8.0",
+    "ember-cli": "~4.12.0",
+    "ember-cli-typescript": "^5.2.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "^3.28.12",
+    "ember-data": "^4.12.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-functions-as-helper-polyfill": "^2.1.1",
     "ember-intl": "^5.7.2",
@@ -126,7 +126,7 @@
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
     "ember-simple-auth": "4.2.2",
-    "ember-source": "~4.8.0",
+    "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.16.1",
     "ember-try": "^2.0.0",
@@ -151,7 +151,9 @@
     "@appuniversum/ember-appuniversum": "^2.4.2",
     "@lblod/ember-rdfa-editor": "^5.3.0",
     "ember-concurrency": "^2.3.7",
-    "ember-modifier": "^3.2.7"
+    "ember-modifier": "^3.2.7",
+    "ember-source": "^3.28.0 || ^4.0.0",
+    "ember-data": "^3.28.0 || ^4.0.0"
   },
   "overrides": {
     "ember-intl": {

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

@@ -34,6 +34,7 @@ export type CitationPluginConfig = CitationPluginNodeConfig | CitationPluginRang
 export type CitationPluginEmberComponentConfig = CitationPluginConfig & {
     endpoint: string;
     decisionsEndpoint?: string;
+    defaultDecisionsGovernmentName?: string;
 };
 export declare function citationPlugin(config: CitationPluginConfig): CitationPlugin;
 export {};

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

@@ -32,6 +32,7 @@ export interface LegalDocumentsQueryFilter {
     documentDateTo?: Option<string>;
     publicationDateFrom?: Option<string>;
     publicationDateTo?: Option<string>;
+    governmentName?: Option<string>;
 }
 export type LegalDocumentsQueryConfig = {
     endpoint: string;

package/translations/en-US.yaml

@@ -69,6 +69,7 @@ citaten-plugin:
     title: Insert reference
   search:
     term: Search term
+    government-search: Filter by government
     advanced: Advanced search
     type: Type of document
     placeholder: Type to search

package/translations/nl-BE.yaml

@@ -70,6 +70,7 @@ citaten-plugin:
     title: Citeeropschrift invoegen
   search:
     term: Zoekterm
+    government-search: Filter op bestuursorgaan
     advanced: Uitgebreid zoeken
     type: Type van document
     placeholder: Typ om te zoeken