@lblod/ember-rdfa-editor-lblod-plugins 20.0.0 → 21.0.0-dev.c5ce781692d110862a9e25838e6909d944bb4a42

package/.changeset/brave-cobras-grab.md

@@ -0,0 +1,5 @@
+---
+"@lblod/ember-rdfa-editor-lblod-plugins": major
+---
+
+Update ember-intl to v7, drops support for v5 and v6 due to API changes

package/.changeset/brown-berries-kneel.md

@@ -0,0 +1,5 @@
+---
+"@lblod/ember-rdfa-editor-lblod-plugins": major
+---
+
+Update ember-modifier to v4 and drop support for older versions

package/.changeset/dull-files-sip.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Update to ember-power-select v7.1, drops support for older versions

package/.changeset/fair-spoons-tell.md

@@ -0,0 +1,5 @@
+---
+"@lblod/ember-rdfa-editor-lblod-plugins": patch
+---
+
+lbm-plugin: add support for inserting independent mandatees (who are not part of a fraction)

package/.changeset/funny-queens-doubt.md

@@ -0,0 +1,5 @@
+---
+"@lblod/ember-rdfa-editor-lblod-plugins": minor
+---
+
+Update to ember-template-imports 4.1.1

package/.changeset/modern-plants-change.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Update all dependencies to latest supported versions

package/.changeset/thick-snails-scream.md

@@ -0,0 +1,5 @@
+---
+"@lblod/ember-rdfa-editor-lblod-plugins": major
+---
+
+Run pnpm up to update dependencies to latest supported versions

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 21.0.0
+
+### Major Changes
+
+- [#449](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/449) [`335cb673df926d26a0d421a958c414d334653575`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/335cb673df926d26a0d421a958c414d334653575) Thanks [@elpoelma](https://github.com/elpoelma)! - Drop obsolete decision nodes from `standard-template` plugin
+
+### Minor Changes
+
+- [#443](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/443) [`9f53a0c5a0e0db0414b0c84aed978d01752ccbf8`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9f53a0c5a0e0db0414b0c84aed978d01752ccbf8) Thanks [@piemonkey](https://github.com/piemonkey)! - Add ability to specify area locations in the location-plugin
+
+- [#445](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/445) [`06fe546cea3d3e7076f3a0ab4549c8de389a43d7`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/06fe546cea3d3e7076f3a0ab4549c8de389a43d7) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Support for repeatable fragments
+
+  Addition of a custom, interactive `fragment` node and nodeview.
+  Using the fragment node interactive buttons, you can replace, add and remove fragments.
+
+- [#444](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/444) [`3eea339d0d4bd5bf746d6c8cd9c99cf95e127825`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/3eea339d0d4bd5bf746d6c8cd9c99cf95e127825) Thanks [@elpoelma](https://github.com/elpoelma)! - Addition of a backwards-compatible parsing-rule for decision articles to `structure` node-spec
+
+- [#446](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/446) [`f9b4a65a743b214d4f5fa2ba3936fc9fca9fa4c2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/f9b4a65a743b214d4f5fa2ba3936fc9fca9fa4c2) Thanks [@elpoelma](https://github.com/elpoelma)! - Introduce some modifications to new `structure` node-spec:
+  - Drop `structureName` node-attribute. This attribute has been replaced by both the `structureType` and `displayStructureName` attributes.
+  - Introduction of a required `structureType` attribute. Examples of `structureType` values are:
+    - `article`
+    - `title`
+    - `chapter`
+    - `section`
+    - `subsection`
+    - `paragraph`
+  - Introduction of a `displayStructureName` attribute. This attribute controls whether the internationalizated (based on the document language) version of the structure name is displayed inside the header of the structure. The internationalized structure name is based on the `structureType` value and the entries included in the translation files. `displayStructureName` has a default value of `false`.
+
+### Patch Changes
+
+- [#447](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/447) [`f06edfdf1681fc2c52e46462cad8faa5d97215c4`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/f06edfdf1681fc2c52e46462cad8faa5d97215c4) Thanks [@elpoelma](https://github.com/elpoelma)! - Ensure `zonality` is set up as optional when fetching traffic signs
+
 ## 20.0.0
 
 ### Major Changes

package/Dockerfile

@@ -3,7 +3,7 @@ FROM node:20-slim AS builder
 LABEL maintainer="info@redpencil.io"
 
 RUN corepack enable
-RUN corepack prepare pnpm@latest-8 --activate
+RUN corepack prepare pnpm@9.4 --activate
 WORKDIR /app
 COPY package.json pnpm-lock.yaml ./
 RUN pnpm i --frozen-lockfile

package/addon/components/hover-tooltip.gts

@@ -24,21 +24,18 @@ interface Sig {
 }
 
 export default class HoverTooltip extends Component<Sig> {
-  hover = modifier<HoverModifierSig>(
-    (element) => {
-      element.addEventListener('mouseenter', this.showTooltip);
-      element.addEventListener('mouseleave', this.hideTooltip);
-      element.addEventListener('focus', this.showTooltip);
-      element.addEventListener('blur', this.hideTooltip);
-      return () => {
-        element.removeEventListener('mouseenter', this.showTooltip);
-        element.removeEventListener('mouseleave', this.hideTooltip);
-        element.removeEventListener('focus', this.showTooltip);
-        element.removeEventListener('blur', this.hideTooltip);
-      };
-    },
-    { eager: false },
-  );
+  hover = modifier<HoverModifierSig>((element) => {
+    element.addEventListener('mouseenter', this.showTooltip);
+    element.addEventListener('mouseleave', this.hideTooltip);
+    element.addEventListener('focus', this.showTooltip);
+    element.addEventListener('blur', this.hideTooltip);
+    return () => {
+      element.removeEventListener('mouseenter', this.showTooltip);
+      element.removeEventListener('mouseleave', this.hideTooltip);
+      element.removeEventListener('focus', this.showTooltip);
+      element.removeEventListener('blur', this.hideTooltip);
+    };
+  });
   @tracked tooltipOpen = false;
 
   get placement(): Placement | undefined {
@@ -56,7 +53,7 @@ export default class HoverTooltip extends Component<Sig> {
     <Velcro @placement={{this.placement}} as |velcro|>
       {{#let velcro.loop as |loop|}}
         {{yield
-          (hash velcroHook=velcro.hook handleHover=(modifier this.hover))
+          (hash velcroHook=velcro.hook handleHover=this.hover)
           to='hover'
         }}
         {{#if this.tooltipOpen}}

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

@@ -53,31 +53,33 @@ export default class LmbPluginSearchModalComponent extends Component<Args> {
       },
       body: JSON.stringify({
         query: `
-        PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#> 
-        PREFIX skos: <http://www.w3.org/2004/02/skos/core#> 
+        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#>
         PREFIX foaf: <http://xmlns.com/foaf/0.1/>
         PREFIX persoon: <http://data.vlaanderen.be/ns/persoon#>
         PREFIX org: <http://www.w3.org/ns/org#>
         PREFIX regorg: <https://www.w3.org/ns/regorg#>
-        SELECT DISTINCT ?mandatee ?person ?firstName ?lastName ?statusLabel ?fractieLabel ?roleLabel WHERE { 
+        SELECT DISTINCT ?mandatee ?person ?firstName ?lastName ?statusLabel ?fractieLabel ?roleLabel WHERE {
             ?mandatee a mandaat:Mandataris;
               org:holds ?mandaat;
               mandaat:status ?status;
-              mandaat:isBestuurlijkeAliasVan ?person;
-              org:hasMembership ?membership.
+              mandaat:isBestuurlijkeAliasVan ?person.
             ?person foaf:familyName ?lastName;
               persoon:gebruikteVoornaam ?firstName.
             ?status skos:prefLabel ?statusLabel.
-            ?membership org:organisation ?fractie.
-            ?fractie regorg:legalName ?fractieLabel.
             ?mandaat org:role ?role.
             ?role skos:prefLabel ?roleLabel.
             OPTIONAL  {
               ?mandatee mandaat:einde ?endDate
             }
+            OPTIONAL {
+              ?mandatee org:hasMembership ?membership.
+              ?membership org:organisation ?fractie.
+              ?fractie regorg:legalName ?fractieLabel.
+            }
             filter (!bound(?endDate) || ?endDate > now()).
-        }        
+        }
         `,
       }),
     });

package/addon/components/location-plugin/edit.gts

@@ -349,10 +349,13 @@ export default class LocationPluginEditComponent extends Component<Signature> {
             <Group.Radio @value='place'>
               {{t 'location-plugin.types.place'}}
             </Group.Radio>
+            <Group.Radio @value='area'>
+              {{t 'location-plugin.types.area'}}
+            </Group.Radio>
           </AuRadioGroup>
         </fs.content>
       </AuFieldset>
-      {{#if (eq @locationType 'place')}}
+      {{#unless (eq @locationType 'address')}}
         <AuFormRow>
           <AuLabel for='place-name'>
             {{t 'location-plugin.search.place-name.label'}}*
@@ -371,7 +374,7 @@ export default class LocationPluginEditComponent extends Component<Signature> {
         <p class='au-u-para-tiny au-u-margin-none'>
           {{t 'location-plugin.search.hint'}}
         </p>
-      {{/if}}
+      {{/unless}}
       <AuFormRow>
         <AuLabel for='municipality-select'>
           {{t 'location-plugin.search.municipality.label'}}

package/addon/components/location-plugin/insert.gts

@@ -16,11 +16,13 @@ import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import {
+  Area,
   convertWGS84CoordsToLambert,
   GeoPos,
   type GlobalCoordinates,
   Place,
   Point,
+  Polygon,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { replaceSelectionWithAddress } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/node-utils';
 import { type LocationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
@@ -30,6 +32,23 @@ import LocationMap, { type LocationType } from './map';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
+function updateFromNode<T extends Address | Place | Area, R>(
+  Class: new (...args: unknown[]) => T,
+  extractFunc: (current: T) => R,
+  defaultValue?: R,
+) {
+  return (component: LocationPluginInsertComponent): R | undefined => {
+    const curLocation = component.selectedLocationNode?.value.attrs.value as
+      | Address
+      | Area
+      | Place
+      | null;
+    return curLocation instanceof Class
+      ? extractFunc(curLocation)
+      : defaultValue;
+  };
+}
+
 interface Signature {
   Args: {
     controller: SayController;
@@ -46,43 +65,41 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   @tracked isLoading = false;
 
   @trackedReset({
-    memo: 'selectedLocationNode',
-    update(component: LocationPluginInsertComponent) {
-      const currentLocation = component.selectedLocationNode?.value.attrs
-        .value as Address | Place | null;
-      return currentLocation instanceof Address ? currentLocation : undefined;
-    },
+    memo: 'modalOpen',
+    update: updateFromNode(Address, (address) => address),
   })
   addressToInsert?: Address;
 
   @trackedReset({
-    memo: 'selectedLocationNode',
-    update(component: LocationPluginInsertComponent) {
-      const currentLocation = component.selectedLocationNode?.value.attrs
-        .value as Address | Place | null;
-      return currentLocation instanceof Place
-        ? currentLocation.location.location
-        : undefined;
-    },
+    memo: 'modalOpen',
+    update: updateFromNode(Place, (place) => place.location.location),
   })
   savedLocation: GeoPos | undefined;
 
   @trackedReset({
-    memo: 'selectedLocationNode',
+    memo: 'modalOpen',
     update(component: LocationPluginInsertComponent) {
-      const currentLocation = component.selectedLocationNode?.value.attrs
-        .value as Address | Place | null;
-      return currentLocation instanceof Place ? currentLocation.name : '';
+      return (
+        updateFromNode(Place, (place) => place.name)(component) ??
+        updateFromNode(Area, (area) => area.name, '')(component)
+      );
     },
   })
   placeName: string = '';
 
   @trackedReset({
-    memo: 'selectedLocationNode',
+    memo: 'modalOpen',
+    update: updateFromNode(Area, (area) => area.shape.locations),
+  })
+  savedArea: GeoPos[] | undefined;
+
+  @trackedReset({
+    memo: 'modalOpen',
     update(component: LocationPluginInsertComponent) {
-      const currentLocation = component.selectedLocationNode?.value.attrs
-        .value as Address | Place | null;
-      return currentLocation instanceof Place ? 'place' : 'address';
+      return (
+        updateFromNode(Place, () => 'place')(component) ??
+        updateFromNode(Area, () => 'area', 'address')(component)
+      );
     },
   })
   locationType: LocationType = 'address';
@@ -121,14 +138,27 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   }
 
   get canInsert() {
+    // trackedReset only actually resets any values if the values are used somewhere. Since we're
+    // not actually rendering anything inside the modal if this.modalOpen is false, we need to use
+    // these values somewhere outside of the modal contents block.
+    this.addressToInsert;
+    this.placeName;
+    this.savedLocation;
+    this.savedArea;
+    this.locationType;
     return !!this.controller.activeEditorView.props.nodeViews?.oslo_location;
   }
 
   get disableConfirm() {
-    if (this.locationType === 'place') {
-      return !this.selectedLocationNode || !this.placeName || !this.chosenPoint;
-    } else {
-      return !this.selectedLocationNode || !this.addressToInsert;
+    switch (this.locationType) {
+      case 'place':
+        return (
+          !this.selectedLocationNode || !this.placeName || !this.chosenPoint
+        );
+      case 'address':
+        return !this.selectedLocationNode || !this.addressToInsert;
+      default:
+        return !this.selectedLocationNode || !this.placeName || !this.savedArea;
     }
   }
 
@@ -139,9 +169,8 @@ export default class LocationPluginInsertComponent extends Component<Signature>
 
   @action
   setChosenPoint(point: GlobalCoordinates) {
-    // Since we only use the global coordinates, we don't have to do a conversion to lambert here
     this.chosenPoint = {
-      lambert: { x: 0, y: 0 },
+      lambert: convertWGS84CoordsToLambert(point),
       global: point,
     };
   }
@@ -153,6 +182,7 @@ export default class LocationPluginInsertComponent extends Component<Signature>
 
   @action
   closeModal() {
+    this.chosenPoint = undefined;
     this.modalOpen = false;
   }
 
@@ -179,41 +209,58 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     this.addressToInsert = address;
   }
 
+  @action
+  setArea(vertices: GlobalCoordinates[]) {
+    this.savedArea = vertices.map((vertex) => ({
+      global: vertex,
+      lambert: convertWGS84CoordsToLambert(vertex),
+    }));
+  }
+
   @action
   confirmLocation() {
     if (this.selectedLocationNode) {
-      let toInsert: Address | Place | undefined;
+      let toInsert: Address | Place | Area | undefined;
       const { pos } = this.selectedLocationNode;
       if (this.locationType === 'address' && this.addressToInsert) {
         toInsert = this.addressToInsert;
-        this.controller.withTransaction((tr) => {
-          return tr.setNodeAttribute(pos, 'value', toInsert);
-        });
-        this.modalOpen = false;
       } else if (
         this.locationType === 'place' &&
         this.chosenPoint?.global &&
         this.placeName
       ) {
-        convertWGS84CoordsToLambert(this.chosenPoint.global).then((lambert) => {
-          toInsert = new Place({
-            uri: this.nodeContentsUtils.fallbackPlaceUri(),
-            name: this.placeName,
-            location: new Point({
-              uri: this.nodeContentsUtils.fallbackPointUri(),
-              location: {
-                lambert,
-                global: this.chosenPoint?.global,
-              },
-            }),
-          });
-          this.controller.withTransaction((tr) => {
-            return tr.setNodeAttribute(pos, 'value', toInsert);
-          });
-          this.modalOpen = false;
-          this.chosenPoint = undefined;
+        toInsert = new Place({
+          uri: this.nodeContentsUtils.fallbackPlaceUri(),
+          name: this.placeName,
+          location: new Point({
+            uri: this.nodeContentsUtils.fallbackGeometryUri(),
+            location: {
+              lambert: convertWGS84CoordsToLambert(this.chosenPoint.global),
+              global: this.chosenPoint?.global,
+            },
+          }),
+        });
+        this.chosenPoint = undefined;
+      } else if (
+        this.locationType === 'area' &&
+        this.savedArea &&
+        this.placeName
+      ) {
+        toInsert = new Area({
+          uri: this.nodeContentsUtils.fallbackPlaceUri(),
+          name: this.placeName,
+          shape: new Polygon({
+            uri: this.nodeContentsUtils.fallbackGeometryUri(),
+            locations: this.savedArea,
+          }),
         });
       }
+      if (toInsert) {
+        this.controller.withTransaction((tr) => {
+          return tr.setNodeAttribute(pos, 'value', toInsert);
+        });
+        this.modalOpen = false;
+      }
     }
   }
 
@@ -263,6 +310,8 @@ export default class LocationPluginInsertComponent extends Component<Signature>
             @location={{this.chosenPoint}}
             @existingLocation={{this.savedLocation}}
             @setLocation={{this.setChosenPoint}}
+            @existingArea={{this.savedArea}}
+            @setArea={{this.setArea}}
           />
         </div>
       </modal.Body>