@lblod/ember-rdfa-editor-lblod-plugins 27.0.2 → 27.1.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 27.1.0
+
+### Minor Changes
+
+- [#546](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/546) [`b3f5a6b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b3f5a6b83ce1e9ce93445756e12e45fb2eb89645) Thanks [@elpoelma](https://github.com/elpoelma)! - Location plugin: add support for configuring the location types to show.
+  The location types may be configured through the `@locationTypes` argument of the `location-plugin/insert` component.
+
+  The `@locationTypes` argument expects an array of `LocationType` values.
+  Supported `LocationType` values are:
+
+  - 'address'
+  - 'place'
+  - 'area'
+
+  By default the value of `@locationTypes` is `['address', 'place', 'area']`
+
+## 27.0.3
+
+### Patch Changes
+
+- [#545](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/545) [`49f902f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/49f902f2b5c89d7799ecd4f0b6732f2e412ee2f5) Thanks [@elpoelma](https://github.com/elpoelma)! - Remove number node when backspacing/deleting inside empty input field
+
+- [#544](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/544) [`4e5edc3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4e5edc35b206847be16b4417d26bac95c6ea7750) Thanks [@elpoelma](https://github.com/elpoelma)! - IRGN plugin: use `xsd:boolean` type instead of custom `mu` boolean type in SPARQL queries.
+  This fixes the functionality of the mobility measure code dropdown.
+
+- [#541](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/541) [`4b7daf7`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4b7daf7e212a2f1aea9765908ef5897f49cc9c93) Thanks [@elpoelma](https://github.com/elpoelma)! - Implement quick successive structure title changes using transaction composition
+
 ## 27.0.2
 
 ### Patch Changes

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

@@ -35,7 +35,7 @@ import {
 } 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';
+import { SUPPORTED_LOCATION_TYPES, type LocationType } from './map';
 import { type SafeString } from '@ember/template';
 
 interface Message {
@@ -47,6 +47,7 @@ interface Message {
 
 type Signature = {
   Args: {
+    locationTypes?: readonly LocationType[];
     locationType: LocationType;
     setLocationType: (type: LocationType) => void;
     defaultMunicipality?: string;
@@ -107,6 +108,21 @@ export default class LocationPluginEditComponent extends Component<Signature> {
   })
   newTruncatedValue?: boolean;
 
+  get locationTypes() {
+    return this.args.locationTypes ?? SUPPORTED_LOCATION_TYPES;
+  }
+
+  locationTypeLabel = (locationType: LocationType) => {
+    switch (locationType) {
+      case 'address':
+        return this.intl.t('location-plugin.types.address');
+      case 'place':
+        return this.intl.t('location-plugin.types.place');
+      case 'area':
+        return this.intl.t('location-plugin.types.area');
+    }
+  };
+
   get message(): Message | undefined {
     const value = this.newAddress.value as Address | undefined;
 
@@ -372,15 +388,11 @@ export default class LocationPluginEditComponent extends Component<Signature> {
             @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>
-            <Group.Radio @value='area'>
-              {{t 'location-plugin.types.area'}}
-            </Group.Radio>
+            {{#each this.locationTypes as |locationType|}}
+              <Group.Radio @value={{locationType}}>
+                {{this.locationTypeLabel locationType}}
+              </Group.Radio>
+            {{/each}}
           </AuRadioGroup>
         </fs.content>
       </AuFieldset>

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

@@ -28,7 +28,10 @@ import { replaceSelectionWithLocation } from '@lblod/ember-rdfa-editor-lblod-plu
 import { type LocationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import { NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import Edit from './edit';
-import LocationMap, { type LocationType } from './map';
+import LocationMap, {
+  SUPPORTED_LOCATION_TYPES,
+  type LocationType,
+} from './map';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
@@ -55,6 +58,7 @@ interface Signature {
     config: LocationPluginConfig;
     defaultMunicipality?: string;
     templateMode?: boolean;
+    locationTypes?: LocationType[];
   };
   Element: HTMLLIElement;
 }
@@ -65,6 +69,24 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   @tracked chosenPoint: GeoPos | undefined;
   @tracked isLoading = false;
 
+  constructor(owner: unknown, args: Signature['Args']) {
+    super(owner, args);
+    const unsupportedLocationType = this.args.locationTypes?.find(
+      (locationType) => !SUPPORTED_LOCATION_TYPES.includes(locationType),
+    );
+    if (unsupportedLocationType) {
+      throw new Error(
+        `${unsupportedLocationType} is not supported. Supported location types are ${SUPPORTED_LOCATION_TYPES.join(
+          ', ',
+        )}`,
+      );
+    }
+  }
+
+  get locationTypes() {
+    return this.args.locationTypes ?? SUPPORTED_LOCATION_TYPES;
+  }
+
   @trackedReset({
     memo: 'modalOpen',
     update: updateFromNode(Address, (address) => address),
@@ -99,11 +121,13 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     update(component: LocationPluginInsertComponent) {
       return (
         updateFromNode(Place, () => 'place')(component) ??
-        updateFromNode(Area, () => 'area', 'address')(component)
+        updateFromNode(Area, () => 'area')(component) ??
+        updateFromNode(Address, () => 'address')(component) ??
+        component.locationTypes[0]
       );
     },
   })
-  locationType: LocationType = 'address';
+  declare locationType: LocationType;
 
   @trackedReset({
     memo: 'controller.activeEditorState',
@@ -284,6 +308,7 @@ export default class LocationPluginInsertComponent extends Component<Signature>
             <Edit
               @locationType={{this.locationType}}
               @setLocationType={{this.setLocationType}}
+              @locationTypes={{this.locationTypes}}
               @selectedLocationNode={{this.selectedLocationNode}}
               @setAddressToInsert={{this.setAddressToInsert}}
               @setIsLoading={{this.setIsLoading}}

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

@@ -20,7 +20,8 @@ import {
   type GlobalCoordinates,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 
-export type LocationType = 'address' | 'place' | 'area';
+export const SUPPORTED_LOCATION_TYPES = ['address', 'place', 'area'] as const;
+export type LocationType = (typeof SUPPORTED_LOCATION_TYPES)[number];
 
 const MAP_TILE_ATTRIBUTION =
   '&copy; <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';

package/addon/components/structure-plugin/_private/structure.gts

@@ -27,6 +27,9 @@ import { getNameForStructureType } from '@lblod/ember-rdfa-editor-lblod-plugins/
 import { StructureType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/structure-types';
 import { romanize } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/utils/romanize';
 import { Transaction } from '@lblod/ember-rdfa-editor';
+import { v4 as uuid } from 'uuid';
+import { setCompositionID } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/_private/transaction-utils';
+import { isNone } from '@lblod/ember-rdfa-editor/utils/_private/option';
 
 interface Sig {
   Args: EmberNodeArgs;
@@ -64,7 +67,9 @@ export default class Structure extends Component<Sig> {
    * A time counter to store the last time an update to the title was added to
    * the history
    * */
-  @tracked historyTimeStamp: number = 0;
+  historyTimeStamp: number = 0;
+  currentCompositionID?: string;
+
   innerEditor: NestedProsemirror | null = null;
 
   get showPlaceholder() {
@@ -154,7 +159,10 @@ export default class Structure extends Component<Sig> {
   }
 
   onTitleUpdate = (content: string, tr: Transaction) => {
-    let addToHistory = false;
+    const pos = this.args.getPos();
+    if (isNone(pos)) {
+      return;
+    }
     // every character typed would normally trigger a history event
     // in normal editor operation, this is ok, as the history plugin is smart
     // enough to group adjacent edits made in a short timespan (default 500ms)
@@ -162,12 +170,19 @@ export default class Structure extends Component<Sig> {
     // but since we trigger an attribute update, the history plugin can no
     // longer recognize these edits as adjacent, so each character triggers
     // a history event. This makes undoing title edits tedious, so we mimic the
-    // grouping here using the transaction timestamp
-    if (tr.time - this.historyTimeStamp > 500) {
-      addToHistory = true;
+    // grouping here using the transaction timestamp and compositionID
+    if (tr.time - this.historyTimeStamp > 500 || !this.currentCompositionID) {
       this.historyTimeStamp = tr.time;
+      this.currentCompositionID = uuid();
     }
-    this.args.updateAttribute('title', content, !addToHistory);
+
+    this.controller.withTransaction(
+      (tr) => {
+        setCompositionID(tr, this.currentCompositionID);
+        return tr.setNodeAttribute(pos, 'title', content);
+      },
+      { view: this.args.view },
+    );
   };
   onInnerEditorFocus = (view: SayView) => {
     this.controller.setActiveView(view);

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

@@ -25,6 +25,7 @@
             placeholder={{t 'variable.number.type-number'}}
             {{did-insert this.focus}}
             {{on 'input' this.onInputNumberChange}}
+            {{on 'keydown' this.onInputKeydown}}
             {{leave-with-arrow-keys @controller @getPos}}
             {{leave-on-enter-key @controller @getPos}}
           />

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

@@ -107,6 +107,29 @@ export default class NumberNodeviewComponent extends Component<Args> {
     this.validateAndSave();
   }
 
+  @action
+  onInputKeydown(event: KeyboardEvent) {
+    if (
+      (event.key === 'Backspace' || event.key === 'Delete') &&
+      !this.inputNumber
+    ) {
+      event.preventDefault();
+      this.remove();
+    }
+  }
+
+  @action
+  remove() {
+    const pos = this.args.getPos();
+    if (pos !== undefined) {
+      this.controller.withTransaction((tr) => {
+        tr.deleteRange(pos, pos + this.node.nodeSize);
+        return tr;
+      });
+      this.controller.focus();
+    }
+  }
+
   @action
   changeWrittenNumber() {
     this.args.updateAttribute('writtenNumber', !this.writtenNumber);

package/addon/plugins/roadsign-regulation-plugin/queries/sign-codes.ts

@@ -1,6 +1,7 @@
 import {
   executeQuery,
   objectify,
+  sparqlEscapeBool,
   sparqlEscapeString,
   sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
@@ -89,7 +90,7 @@ export default async function querySignCodes(
       ?uri mobiliteit:heeftMaatregelconcept ?measure.
       ?uri a ?signType;
               skos:prefLabel ?label;
-              ext:valid "true"^^<http://mu.semte.ch/vocabularies/typed-literals/boolean>.
+              ext:valid ${sparqlEscapeBool(true)}.
       ${filterStatement}
     }
     ORDER BY ASC(?label)

package/addon/utils/_private/transaction-utils.ts

@@ -0,0 +1,11 @@
+// TODO: move these utility functions to the `@lblod/ember-rdfa-editor` package
+
+import { Transaction } from '@lblod/ember-rdfa-editor';
+
+export function setCompositionID(tr: Transaction, compositionID: unknown) {
+  return tr.setMeta('composition', compositionID);
+}
+
+export function getCompositionID(tr: Transaction): unknown {
+  return tr.getMeta('composition');
+}

package/addon/utils/sparql-helpers.ts

@@ -20,6 +20,10 @@ interface QueryConfig {
 export const sparqlEscapeString = (value: string) =>
   '"""' + value.replace(/[\\"]/g, (match) => '\\' + match) + '"""';
 
+export const sparqlEscapeBool = (value: boolean) => {
+  return value ? '"true"^^xsd:boolean' : '"false"^^xsd:boolean';
+};
+
 export const sparqlEscapeUri = (value: string) => {
   return (
     '<' +

package/declarations/addon/components/location-plugin/edit.d.ts

@@ -14,6 +14,7 @@ interface Message {
 }
 type Signature = {
     Args: {
+        locationTypes?: readonly LocationType[];
         locationType: LocationType;
         setLocationType: (type: LocationType) => void;
         defaultMunicipality?: string;
@@ -34,6 +35,8 @@ export default class LocationPluginEditComponent extends Component<Signature> {
     newHousenumber?: string;
     newBusnumber?: string;
     newTruncatedValue?: boolean;
+    get locationTypes(): readonly ("address" | "area" | "place")[];
+    locationTypeLabel: (locationType: LocationType) => string;
     get message(): Message | undefined;
     get currentAddress(): Address | null;
     get currentMunicipality(): string | undefined;

package/declarations/addon/components/location-plugin/insert.d.ts

@@ -14,6 +14,7 @@ interface Signature {
         config: LocationPluginConfig;
         defaultMunicipality?: string;
         templateMode?: boolean;
+        locationTypes?: LocationType[];
     };
     Element: HTMLLIElement;
 }
@@ -22,6 +23,8 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     modalOpen: boolean;
     chosenPoint: GeoPos | undefined;
     isLoading: boolean;
+    constructor(owner: unknown, args: Signature['Args']);
+    get locationTypes(): readonly ["address", "place", "area"] | ("address" | "area" | "place")[];
     addressToInsert?: Address;
     savedLocation: GeoPos | undefined;
     placeName: string;

package/declarations/addon/components/location-plugin/map.d.ts

@@ -4,7 +4,8 @@ import { type LatLngBoundsExpression } from 'leaflet';
 import { type LeafletMouseEvent } from 'leaflet';
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import { GeoPos, type GlobalCoordinates } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
-export type LocationType = 'address' | 'place' | 'area';
+export declare const SUPPORTED_LOCATION_TYPES: readonly ["address", "place", "area"];
+export type LocationType = (typeof SUPPORTED_LOCATION_TYPES)[number];
 interface Signature {
     Args: {
         address: Address | undefined;

package/declarations/addon/components/structure-plugin/_private/structure.d.ts

@@ -20,6 +20,7 @@ export default class Structure extends Component<Sig> {
      * the history
      * */
     historyTimeStamp: number;
+    currentCompositionID?: string;
     innerEditor: NestedProsemirror | null;
     get showPlaceholder(): boolean;
     get controller(): import("@lblod/ember-rdfa-editor").SayController;

package/declarations/addon/components/variable-plugin/number/nodeview.d.ts

@@ -31,6 +31,8 @@ export default class NumberNodeviewComponent extends Component<Args> {
     get maxValue(): number;
     get label(): string | undefined;
     onInputNumberChange(event: InputEvent): void;
+    onInputKeydown(event: KeyboardEvent): void;
+    remove(): void;
     changeWrittenNumber(): void;
     get errorMessage(): string;
     validateAndSave(): void;

package/declarations/addon/utils/_private/transaction-utils.d.ts

@@ -0,0 +1,3 @@
+import { Transaction } from '@lblod/ember-rdfa-editor';
+export declare function setCompositionID(tr: Transaction, compositionID: unknown): Transaction;
+export declare function getCompositionID(tr: Transaction): unknown;

package/declarations/addon/utils/sparql-helpers.d.ts

@@ -15,6 +15,7 @@ interface QueryConfig {
     abortSignal?: AbortSignal;
 }
 export declare const sparqlEscapeString: (value: string) => string;
+export declare const sparqlEscapeBool: (value: boolean) => "\"true\"^^xsd:boolean" | "\"false\"^^xsd:boolean";
 export declare const sparqlEscapeUri: (value: string) => string;
 export declare function executeQuery<Binding = Record<string, RDF.Term>>({ query, endpoint, abortSignal, }: QueryConfig): Promise<QueryResult<Binding>>;
 export declare function executeCountQuery(queryConfig: QueryConfig): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "27.0.2",
+  "version": "27.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",