@lblod/ember-rdfa-editor-lblod-plugins 19.2.0 → 19.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 19.3.0
+
+### Minor Changes
+
+- [#433](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/433) [`b43ae7e6b08b2b78e21a2ab6b2dfee3d044b5297`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b43ae7e6b08b2b78e21a2ab6b2dfee3d044b5297) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Hide label if the variable is filled
+
+- [#439](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/439) [`3c848481a9725b86c3bc4bd82d7381a3dfc2e509`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/3c848481a9725b86c3bc4bd82d7381a3dfc2e509) Thanks [@piemonkey](https://github.com/piemonkey)! - Add ability to select geographical positions from a map to the location plugin
+
+- [#436](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/436) [`2b270eccf55469187dd2273d6953a286b4868154`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/2b270eccf55469187dd2273d6953a286b4868154) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Changed UI of snippet placeholder to show which lists you can insert from
+
+- [#435](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/435) [`596b85bfe9c85a3a24b6964d44381cea8909698f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/596b85bfe9c85a3a24b6964d44381cea8909698f) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4820: Paste variables
+
+  Pasting variable (which was copied from same editor) will now paste actual variable, not just the text that was contained inside it.
+
+### Patch Changes
+
+- [#437](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/437) [`f2c4ece21d5a2c56029f7111361719220eeaefef`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/f2c4ece21d5a2c56029f7111361719220eeaefef) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4692: Add missing `nl-BE` translation for besluit topic plugin
+
 ## 19.2.0
 
 ### Minor Changes

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

@@ -8,16 +8,20 @@ import { service } from '@ember/service';
 import { on } from '@ember/modifier';
 import type { SafeString } from '@ember/template/-private/handlebars';
 import not from 'ember-truth-helpers/helpers/not';
+import eq from 'ember-truth-helpers/helpers/eq';
 import IntlService from 'ember-intl/services/intl';
 import t from 'ember-intl/helpers/t';
-import AuLabel from '@appuniversum/ember-appuniversum/components/au-label';
 import PowerSelect from 'ember-power-select/components/power-select';
+import AuLabel from '@appuniversum/ember-appuniversum/components/au-label';
 import AuAlert, {
   type AuAlertSignature,
 } from '@appuniversum/ember-appuniversum/components/au-alert';
+import AuFormRow from '@appuniversum/ember-appuniversum/components/au-form-row';
+import AuRadioGroup from '@appuniversum/ember-appuniversum/components/au-radio-group';
+import AuFieldset from '@appuniversum/ember-appuniversum/components/au-fieldset';
+import AuHeading from '@appuniversum/ember-appuniversum/components/au-heading';
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
 import { CheckIcon } from '@appuniversum/ember-appuniversum/components/icons/check';
-import { SayController } from '@lblod/ember-rdfa-editor';
 import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import AuNativeInput from '@lblod/ember-rdfa-editor-lblod-plugins/components/au-native-input';
 import {
@@ -28,6 +32,9 @@ import {
   resolveAddress,
   resolveStreet,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
+import { type Point } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
+import { type NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
+import { type LocationType } from './map';
 
 interface Message {
   skin: AuAlertSignature['Args']['skin'];
@@ -36,20 +43,28 @@ interface Message {
   body: string | SafeString;
 }
 
-type Args = {
-  controller: SayController;
-  defaultMunicipality?: string;
-  selectedAddressVariable: ResolvedPNode | null;
-  setAddressToInsert: (address: Address | undefined) => void;
-  setIsLoading?: (isLoading: boolean) => void;
+type Signature = {
+  Args: {
+    locationType: LocationType;
+    setLocationType: (type: LocationType) => void;
+    defaultMunicipality?: string;
+    currentAddress?: Address;
+    selectedLocationNode: ResolvedPNode | null;
+    setAddressToInsert: (address: Address | undefined) => void;
+    setIsLoading?: (isLoading: boolean) => void;
+    placeName?: string;
+    setPlaceName: (name: string) => void;
+    nodeContentsUtils: NodeContentsUtils;
+  };
+  Element: HTMLFormElement;
 };
 
-export default class AddressEditComponent extends Component<Args> {
+export default class LocationPluginEditComponent extends Component<Signature> {
   @service declare intl: IntlService;
 
   @trackedReset({
     memo: 'currentAddress',
-    update(component: AddressEditComponent) {
+    update(component: LocationPluginEditComponent) {
       const { currentMunicipality } = component;
       return currentMunicipality
         ? currentMunicipality
@@ -60,7 +75,7 @@ export default class AddressEditComponent extends Component<Args> {
 
   @trackedReset({
     memo: 'currentAddress',
-    update(component: AddressEditComponent) {
+    update(component: LocationPluginEditComponent) {
       return component.currentStreetName;
     },
   })
@@ -68,7 +83,7 @@ export default class AddressEditComponent extends Component<Args> {
 
   @trackedReset({
     memo: 'currentAddress',
-    update(component: AddressEditComponent) {
+    update(component: LocationPluginEditComponent) {
       return component.currentHousenumber;
     },
   })
@@ -76,7 +91,7 @@ export default class AddressEditComponent extends Component<Args> {
 
   @trackedReset({
     memo: 'currentAddress',
-    update(component: AddressEditComponent) {
+    update(component: LocationPluginEditComponent) {
       return component.currentBusnumber;
     },
   })
@@ -93,7 +108,7 @@ export default class AddressEditComponent extends Component<Args> {
       return {
         skin: 'success',
         icon: CheckIcon,
-        title: this.intl.t('editor-plugins.address.edit.success.address-found'),
+        title: this.intl.t('location-plugin.search.success.address-found'),
         body: value.formatted,
       };
     }
@@ -109,10 +124,10 @@ export default class AddressEditComponent extends Component<Args> {
           skin: 'warning',
           icon: AlertTriangleIcon,
           title: this.intl.t(
-            'editor-plugins.address.edit.errors.address-not-found-short',
+            'location-plugin.search.errors.address-not-found-short',
           ),
           body: this.intl.t(
-            'editor-plugins.address.edit.errors.alternative-address',
+            'location-plugin.search.errors.alternative-address',
             { address: this.newAddress.error.alternativeAddress.formatted },
           ),
         };
@@ -121,8 +136,11 @@ export default class AddressEditComponent extends Component<Args> {
       return {
         skin: 'warning',
         icon: AlertTriangleIcon,
-        title: this.intl.t(error.translation, { status: error.status }),
-        body: this.intl.t('editor-plugins.address.edit.errors.contact', {
+        title: this.intl.t(error.translation, {
+          status: error.status,
+          coords: error.coords,
+        }),
+        body: this.intl.t('location-plugin.search.errors.contact', {
           htmlSafe: true,
           email: 'gelinktnotuleren@vlaanderen.be',
         }),
@@ -133,8 +151,11 @@ export default class AddressEditComponent extends Component<Args> {
   }
 
   get currentAddress() {
-    return this.args.selectedAddressVariable?.value.attrs
-      .value as Address | null;
+    const currentLocation = this.args.selectedLocationNode?.value.attrs
+      .value as Address | Point | null;
+    return currentLocation && currentLocation instanceof Address
+      ? currentLocation
+      : null;
   }
 
   get currentMunicipality() {
@@ -188,9 +209,18 @@ export default class AddressEditComponent extends Component<Args> {
   resolveAddressTask = restartableTask(async () => {
     const { newStreetName, newMunicipality, newHousenumber, newBusnumber } =
       this;
+    if (
+      this.currentAddress &&
+      newStreetName === this.currentAddress.street &&
+      newMunicipality === this.currentAddress.municipality &&
+      newHousenumber === this.currentAddress.housenumber &&
+      newBusnumber === this.currentAddress.busnumber
+    ) {
+      // No need to re-search, nothing has changed
+      return;
+    }
     if (newMunicipality && newStreetName) {
       this.args.setIsLoading?.(true);
-      this.args.setAddressToInsert(undefined);
       try {
         if (
           this.currentAddress?.sameAs({
@@ -200,28 +230,40 @@ export default class AddressEditComponent extends Component<Args> {
             housenumber: newHousenumber,
           })
         ) {
-          this.args.setAddressToInsert(this.currentAddress);
           return this.currentAddress;
         } else {
           await timeout(200);
           if (newHousenumber) {
-            const address = await resolveAddress({
-              street: newStreetName,
-              municipality: newMunicipality,
-              housenumber: newHousenumber,
-              busnumber: newBusnumber,
-            });
+            const address = await resolveAddress(
+              {
+                street: newStreetName,
+                municipality: newMunicipality,
+                housenumber: newHousenumber,
+                busnumber: newBusnumber,
+              },
+              this.args.nodeContentsUtils,
+            );
             this.args.setAddressToInsert(address);
             return address;
           } else {
-            const address = await resolveStreet({
-              street: newStreetName,
-              municipality: newMunicipality,
-            });
+            const address = await resolveStreet(
+              {
+                street: newStreetName,
+                municipality: newMunicipality,
+              },
+              this.args.nodeContentsUtils,
+            );
             this.args.setAddressToInsert(address);
             return address;
           }
         }
+      } catch (err) {
+        if (err instanceof AddressError && err.alternativeAddress) {
+          this.args.setAddressToInsert(err.alternativeAddress);
+        } else {
+          this.args.setAddressToInsert(undefined);
+        }
+        throw err;
       } finally {
         this.args.setIsLoading?.(false);
       }
@@ -267,8 +309,9 @@ export default class AddressEditComponent extends Component<Args> {
     this.newBusnumber = (event.target as HTMLInputElement).value;
   }
 
-  get controller() {
-    return this.args.controller;
+  @action
+  updatePlaceName(event: InputEvent) {
+    this.args.setPlaceName((event.target as HTMLInputElement).value);
   }
 
   searchMunicipality = restartableTask(async (term: string) => {
@@ -287,84 +330,133 @@ export default class AddressEditComponent extends Component<Args> {
   });
 
   <template>
-    <form class='au-c-form'>
-      <AuLabel for='municipality-select'>
-        {{t 'editor-plugins.address.edit.municipality.label'}}*
-      </AuLabel>
-      <PowerSelect
-        id='municipality-select'
-        @loadingMessage={{t 'editor-plugins.utils.loading'}}
-        @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}}
-        @selected={{this.newMunicipality}}
-        @onChange={{this.selectMunicipality}}
-        as |municipality|
-      >
-        {{municipality}}
-      </PowerSelect>
-      <AuLabel for='streetname-select'>
-        {{t 'editor-plugins.address.edit.street.label'}}*
-      </AuLabel>
-      <PowerSelect
-        id='streetname-select'
-        @loadingMessage={{t 'editor-plugins.utils.loading'}}
-        @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}}
-        @selected={{this.newStreetName}}
-        @disabled={{not this.canUpdateStreet}}
-        @onChange={{this.selectStreet}}
-        as |street|
-      >
-        {{street}}
-      </PowerSelect>
-      <div class='au-o-grid au-o-grid--tiny'>
-        <div class='au-o-grid__item au-u-1-2@medium'>
-          <AuLabel for='housenumber-select'>
-            {{t 'editor-plugins.address.edit.housenumber.label'}}
+    <form class='au-c-form' ...attributes>
+      <AuFieldset @alignment='inline' as |fs|>
+        <fs.legend>
+          {{t 'location-plugin.search.type'}}
+        </fs.legend>
+        <fs.content>
+          <AuRadioGroup
+            id='location-type'
+            @alignment='inline'
+            @selected={{@locationType}}
+            @onChange={{@setLocationType}}
+            as |Group|
+          >
+            <Group.Radio @value='address'>
+              {{t 'location-plugin.types.address'}}
+            </Group.Radio>
+            <Group.Radio @value='place'>
+              {{t 'location-plugin.types.place'}}
+            </Group.Radio>
+          </AuRadioGroup>
+        </fs.content>
+      </AuFieldset>
+      {{#if (eq @locationType 'place')}}
+        <AuFormRow>
+          <AuLabel for='place-name'>
+            {{t 'location-plugin.search.place-name.label'}}*
           </AuLabel>
           <AuNativeInput
-            id='housenumber-select'
-            placeholder={{t
-              'editor-plugins.address.edit.housenumber.placeholder'
-            }}
+            id='place-name'
+            placeholder={{t 'location-plugin.search.place-name.placeholder'}}
             @width='block'
-            value={{this.newHousenumber}}
-            @disabled={{not this.canUpdateHousenumber}}
-            {{on 'input' this.updateHousenumber}}
+            value={{@placeName}}
+            {{on 'input' this.updatePlaceName}}
           />
-        </div>
-        <div class='au-o-grid__item au-u-1-2@medium'>
-          <AuLabel for='busnumber-select'>
-            {{t 'editor-plugins.address.edit.busnumber.label'}}
-          </AuLabel>
-          <AuNativeInput
-            id='busnumber-select'
-            placeholder={{t
-              'editor-plugins.address.edit.busnumber.placeholder'
+        </AuFormRow>
+        <AuHeading @level='6' @skin='6'>
+          {{t 'location-plugin.search.title'}}
+        </AuHeading>
+        <p class='au-u-para-tiny au-u-margin-none'>
+          {{t 'location-plugin.search.hint'}}
+        </p>
+      {{/if}}
+      <AuFormRow>
+        <AuLabel for='municipality-select'>
+          {{t 'location-plugin.search.municipality.label'}}
+        </AuLabel>
+        <PowerSelect
+          id='municipality-select'
+          @loadingMessage={{t 'editor-plugins.utils.loading'}}
+          @searchMessage={{t
+            'location-plugin.search.municipality.search-message'
+          }}
+          @noMatchesMessage={{t
+            'location-plugin.search.municipality.no-results'
+          }}
+          @placeholder={{t 'location-plugin.search.municipality.placeholder'}}
+          @allowClear={{true}}
+          @renderInPlace={{true}}
+          @searchEnabled={{true}}
+          @search={{perform this.searchMunicipality}}
+          @selected={{this.newMunicipality}}
+          @onChange={{this.selectMunicipality}}
+          as |municipality|
+        >
+          {{municipality}}
+        </PowerSelect>
+      </AuFormRow>
+      <AuFormRow>
+        <AuLabel for='streetname-select'>
+          {{t 'location-plugin.search.street.label'}}
+        </AuLabel>
+        <PowerSelect
+          id='streetname-select'
+          @loadingMessage={{t 'editor-plugins.utils.loading'}}
+          @searchMessage={{t 'location-plugin.search.street.search-message'}}
+          @noMatchesMessage={{t 'location-plugin.search.street.no-results'}}
+          @placeholder={{t 'location-plugin.search.street.placeholder'}}
+          @allowClear={{true}}
+          @renderInPlace={{true}}
+          @searchEnabled={{true}}
+          @search={{perform this.searchStreet}}
+          @selected={{this.newStreetName}}
+          @disabled={{not this.canUpdateStreet}}
+          @onChange={{this.selectStreet}}
+          as |street|
+        >
+          {{street}}
+        </PowerSelect>
+      </AuFormRow>
+      <AuFormRow>
+        <div class='au-o-grid au-o-grid--tiny'>
+          <div
+            class={{if
+              (eq @locationType 'address')
+              'au-o-grid__item au-u-1-2@medium'
+              'au-o-grid__item'
             }}
-            @width='block'
-            value={{this.newBusnumber}}
-            @disabled={{not this.canUpdateBusnumber}}
-            {{on 'input' this.updateBusnumber}}
-          />
+          >
+            <AuLabel for='housenumber-select'>
+              {{t 'location-plugin.search.housenumber.label'}}
+            </AuLabel>
+            <AuNativeInput
+              id='housenumber-select'
+              placeholder={{t 'location-plugin.search.housenumber.placeholder'}}
+              @width='block'
+              value={{this.newHousenumber}}
+              @disabled={{not this.canUpdateHousenumber}}
+              {{on 'input' this.updateHousenumber}}
+            />
+          </div>
+          {{#if (eq @locationType 'address')}}
+            <div class='au-o-grid__item au-u-1-2@medium'>
+              <AuLabel for='busnumber-select'>
+                {{t 'location-plugin.search.busnumber.label'}}
+              </AuLabel>
+              <AuNativeInput
+                id='busnumber-select'
+                placeholder={{t 'location-plugin.search.busnumber.placeholder'}}
+                @width='block'
+                value={{this.newBusnumber}}
+                @disabled={{not this.canUpdateBusnumber}}
+                {{on 'input' this.updateBusnumber}}
+              />
+            </div>
+          {{/if}}
         </div>
-      </div>
+      </AuFormRow>
 
       {{#if this.message}}
         <AuAlert