@lblod/ember-rdfa-editor-lblod-plugins 35.6.0 → 36.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 36.0.0
+
+### Major Changes
+
+- [#637](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/637) [`d2d939b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d2d939bd5fe39e51146ad1df777aa48d6f54236b) Thanks [@kobemertens](https://github.com/kobemertens)! - Bump editor
+
+- [#637](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/637) [`23a40c0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/23a40c0389687eb34933fd2e740789ac29450e1e) Thanks [@kobemertens](https://github.com/kobemertens)! - Add contextual actions for inserting place descriptions
+
+### Minor Changes
+
+- [#651](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/651) [`c03484c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/c03484cd40fca81c9cdeafa3f0d5f2dcbb6b340f) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Add function to search the document for oslo locations
+
+### Patch Changes
+
+- [#643](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/643) [`42cd09c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/42cd09c7b199b7c4f487d90b1823f272fe5ff0ab) Thanks [@kobemertens](https://github.com/kobemertens)! - Add slash commands plugin
+
+- [#648](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/648) [`329813f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/329813f43ee6cdbc25a8c0acb18ba2188f753d1b) Thanks [@kobemertens](https://github.com/kobemertens)! - Adds ability to choose insert position for a mobility measure article
+
+- [`8ac430e`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/8ac430e1b89167275c7cceeb50e331bfe271e46a) Thanks [@kobemertens](https://github.com/kobemertens)! - fix translation mobility measure insert position
+
 ## 35.6.0
 
 ### Minor Changes

package/addon/components/roadsign-regulation-plugin/expanded-measure.gts

@@ -5,7 +5,6 @@ import { tracked } from '@glimmer/tracking';
 import t from 'ember-intl/helpers/t';
 import MeasurePreview from './measure-preview';
 import AuRadioGroup from '@appuniversum/ember-appuniversum/components/au-radio-group';
-import AuButtonGroup from '@appuniversum/ember-appuniversum/components/au-button-group';
 import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { action } from '@ember/object';
@@ -16,10 +15,15 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
 import { isSome } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import set from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/set';
+import { service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
+import { PNode } from '@lblod/ember-rdfa-editor';
+import PowerSelect from 'ember-power-select/components/power-select';
 
 export type InsertMobilityMeasureTask = Task<
   void,
-  [MobilityMeasureConcept, ZonalOrNot, boolean]
+  [MobilityMeasureConcept, ZonalOrNot, boolean, number?]
 >;
 type Signature = {
   Args: {
@@ -27,12 +31,43 @@ type Signature = {
     selectRow: (uri: string) => void;
     insert: InsertMobilityMeasureTask;
     endpoint: string;
+    articleNodes: PNode[];
   };
 };
 
+type InsertPositionOption = {
+  label: string;
+  position: 'first' | 'last' | 'custom';
+  insertIndex?: number;
+};
+
 export default class ExpandedMeasure extends Component<Signature> {
+  @service declare intl: IntlService;
+
   @tracked zonalityValue?: ZonalOrNot;
   @tracked temporalValue?: boolean;
+  @tracked selectedInsertPosition: InsertPositionOption;
+
+  insertPositionOptionFirst: InsertPositionOption;
+  insertPositionOptionLast: InsertPositionOption;
+
+  constructor(owner: unknown, args: Signature['Args']) {
+    super(owner, args);
+    this.insertPositionOptionFirst = {
+      label: this.intl.t(
+        'editor-plugins.roadsign-regulation.expanded-measure.as-first-article',
+      ),
+      position: 'first',
+      insertIndex: 0,
+    };
+    this.insertPositionOptionLast = {
+      label: this.intl.t(
+        'editor-plugins.roadsign-regulation.expanded-measure.as-last-article',
+      ),
+      position: 'last',
+    };
+    this.selectedInsertPosition = this.insertPositionOptionLast;
+  }
 
   get isPotentiallyZonal() {
     return this.args.concept.zonality === ZONALITY_OPTIONS.POTENTIALLY_ZONAL;
@@ -41,6 +76,7 @@ export default class ExpandedMeasure extends Component<Signature> {
   get insertButtonDisabled() {
     return (
       (this.isPotentiallyZonal && !this.zonalityValue) ||
+      this.args.insert.isRunning ||
       (this.args.concept.variableSignage && !isSome(this.temporalValue))
     );
   }
@@ -57,11 +93,13 @@ export default class ExpandedMeasure extends Component<Signature> {
 
   @action
   insert() {
+    const { insertIndex } = this.selectedInsertPosition;
     this.args.insert.perform(
       this.args.concept,
       // POTENTIALLY_ZONAL option is filtered out by requiring a zonalityValue to submit
       (this.zonalityValue ?? this.args.concept.zonality) as ZonalOrNot,
       this.temporalValue ?? false,
+      insertIndex,
     );
   }
 
@@ -70,6 +108,29 @@ export default class ExpandedMeasure extends Component<Signature> {
     this.args.selectRow(this.args.concept.uri);
   }
 
+  get articlesInDocument() {
+    return this.args.articleNodes;
+  }
+
+  get insertPositionOptions() {
+    return [
+      this.insertPositionOptionLast,
+      this.insertPositionOptionFirst,
+      ...this.articlesInDocument.slice(1).map((_, index) => ({
+        label: this.intl.t(
+          'editor-plugins.roadsign-regulation.expanded-measure.after-article-x',
+          { articleNumber: index + 1 },
+        ),
+        position: 'custom',
+        insertIndex: index + 1,
+      })),
+    ];
+  }
+
+  get insertPositionDropdownTitle() {
+    return this.selectedInsertPosition?.label.toLowerCase();
+  }
+
   <template>
     <tr class='au-c-data-table__detail'>
       <td colspan='5' class='au-o-flow au-o-flow--small'>
@@ -135,19 +196,28 @@ export default class ExpandedMeasure extends Component<Signature> {
             </AuRadioGroup>
           </div>
         {{/if}}
-        <AuButtonGroup>
-          <AuButton
-            {{on 'click' this.insert}}
-            @loading={{@insert.isRunning}}
-            @loadingMessage={{t 'common.loading'}}
-            @disabled={{this.insertButtonDisabled}}
-          >
-            {{t 'editor-plugins.utils.insert'}}
-          </AuButton>
-          <AuButton @skin='secondary' {{on 'click' this.unselectRow}}>
-            {{t 'editor-plugins.utils.cancel'}}
-          </AuButton>
-        </AuButtonGroup>
+        <AuHeading @level='6' @skin='6'>
+          {{t
+            'editor-plugins.roadsign-regulation.expanded-measure.insert-position'
+          }}
+        </AuHeading>
+        <PowerSelect
+          class='au-u-1-5'
+          @allowClear={{false}}
+          @onChange={{set this 'selectedInsertPosition'}}
+          @selected={{this.selectedInsertPosition}}
+          @options={{this.insertPositionOptions}}
+          as |option|
+        >{{option.label}}</PowerSelect>
+        <AuButton
+          {{on 'click' this.insert}}
+          @skin='primary'
+          @loading={{@insert.isRunning}}
+          @loadingMessage={{t 'common.loading'}}
+          @disabled={{this.insertButtonDisabled}}
+        >
+          {{t 'common.insert'}}
+        </AuButton>
       </td>
     </tr>
   </template>

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -41,6 +41,7 @@ import { Variable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsig
 import { generateVariableInstanceUri } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/variable-helpers';
 import { mapObject } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/map-object';
 import { v4 as uuid } from 'uuid';
+import { getArticleNodes } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/document-structure-utils';
 
 type Option = {
   uri: string;
@@ -319,6 +320,7 @@ export default class RoadsignsModal extends Component<Signature> {
       concept: MobilityMeasureConcept,
       zonality: ZonalOrNot,
       temporal: boolean,
+      position?: number,
     ) => {
       if (!this.decisionLocation) {
         return;
@@ -355,6 +357,7 @@ export default class RoadsignsModal extends Component<Signature> {
               decisionUri,
               zonality,
               temporal,
+              position,
             })(this.controller.mainEditorState).transaction;
           },
           { view: this.controller.mainEditorView },
@@ -386,6 +389,12 @@ export default class RoadsignsModal extends Component<Signature> {
     this.pageNumber = pageNumber;
   }
 
+  get articleNodes() {
+    return getArticleNodes(this.controller.mainEditorState).map(
+      (node) => node.node,
+    );
+  }
+
   <template>
     <AuModal
       class='au-c-modal--flush'
@@ -516,6 +525,7 @@ export default class RoadsignsModal extends Component<Signature> {
             @isLoading={{this.measureConceptsQuery.isRunning}}
             @insert={{this.insertMeasure}}
             @options={{@options}}
+            @articleNodes={{this.articleNodes}}
           />
           {{#if this.measureConceptCount}}
             {{#let

package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts

@@ -21,6 +21,7 @@ import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import removeZFromLabel from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/helpers/removeZFromLabel';
+import { PNode } from '@lblod/ember-rdfa-editor';
 
 type Signature = {
   Args: {
@@ -28,6 +29,7 @@ type Signature = {
     content?: MobilityMeasureConcept[];
     isLoading?: boolean;
     insert: InsertMobilityMeasureTask;
+    articleNodes: PNode[];
   };
 };
 
@@ -163,6 +165,7 @@ export default class RoadSignsTable extends Component<Signature> {
                     @insert={{@insert}}
                     @selectRow={{this.selectRow}}
                     @endpoint={{@options.endpoint}}
+                    @articleNodes={{@articleNodes}}
                   />
                 {{/if}}
               {{else}}

package/addon/plugins/decision-plugin/actions/insert-article.ts

@@ -20,6 +20,7 @@ interface InsertArticleToDecisionArgs {
   node: PNode;
   decisionUri: string;
   insertFreely?: false;
+  position?: number;
 }
 interface InsertArticleFreelyArgs {
   node: PNode;
@@ -46,7 +47,7 @@ export function insertArticle(
       };
     }
 
-    const { decisionUri } = args;
+    const { decisionUri, position } = args;
     const decision = getNodesBySubject(state, decisionUri)[0];
     if (!decision) {
       return {
@@ -55,56 +56,98 @@ export function insertArticle(
         result: false,
       };
     }
+
     const decisionResource = decision.value.attrs.subject;
     const container = getOutgoingTriple(decision.value.attrs, PROV('value'));
-    if (container) {
-      const location = findNodeByRdfaId(state.doc, container.object.value);
-      if (location) {
-        const insertLocation = location.pos + location.value.nodeSize - 1;
-        const factory = new SayDataFactory();
-        const tr = state.tr;
-        const combiResult = transactionCombinator(
-          state,
-          tr.replaceWith(insertLocation, insertLocation, node),
-        )([
-          addPropertyToNode({
-            resource: decisionResource,
-            property: {
-              predicate: ELI('has_part').full,
-              object: factory.resourceNode(node.attrs.subject),
-            },
-          }),
-          recalculateNumbers,
-        ]);
-
-        const { result, transaction } = combiResult;
-
-        transaction.setSelection(
-          TextSelection.create(
-            transaction.doc,
-            insertLocation + 1,
-            insertLocation + node.nodeSize - 1,
-          ),
-        );
-
-        transaction.scrollIntoView();
-        return {
-          initialState: state,
-          transaction,
-          result: result.every((ok) => ok),
-        };
-      } else {
-        return {
-          initialState: state,
-          transaction: state.tr,
-          result: false,
-        };
-      }
+    if (!container) {
+      return {
+        initialState: state,
+        transaction: state.tr,
+        result: false,
+      };
+    }
+
+    const location = findNodeByRdfaId(state.doc, container.object.value);
+    if (!location) {
+      return {
+        initialState: state,
+        transaction: state.tr,
+        result: false,
+      };
     }
+
+    const insertLocation = resolveInsertLocation(location, position);
+
+    const factory = new SayDataFactory();
+    const tr = state.tr;
+    const combiResult = transactionCombinator(
+      state,
+      tr.replaceWith(insertLocation, insertLocation, node),
+    )([
+      addPropertyToNode({
+        resource: decisionResource,
+        property: {
+          predicate: ELI('has_part').full,
+          object: factory.resourceNode(node.attrs.subject),
+        },
+      }),
+      recalculateNumbers,
+    ]);
+
+    const { result, transaction } = combiResult;
+
+    transaction.setSelection(
+      TextSelection.create(
+        transaction.doc,
+        insertLocation + 1,
+        insertLocation + node.nodeSize - 1,
+      ),
+    );
+
+    transaction.scrollIntoView();
     return {
       initialState: state,
-      transaction: state.tr,
-      result: false,
+      transaction,
+      result: result.every((ok) => ok),
     };
   };
 }
+
+/**
+ * Resolves the document position at which to insert a new article node
+ *
+ * - If `position` is undefined, insert at the end of the container.
+ * - If `position` is 0, insert before the first child.
+ * - If `position` >= childCount, insert after the last child (append).
+ * - Otherwise, insert before the child at that index.
+ */
+function resolveInsertLocation(
+  location: { pos: number; value: PNode },
+  position: number | undefined,
+): number {
+  const containerNode = location.value;
+
+  if (position === undefined) {
+    return location.pos + containerNode.nodeSize - 1;
+  }
+
+  const childCount = containerNode.childCount;
+
+  if (position >= childCount) {
+    return location.pos + containerNode.nodeSize - 1;
+  }
+
+  let offset = location.pos + 1; // +1 to step inside the container node
+  let articleIndex = 0;
+  for (const child of containerNode.children) {
+    if (articleIndex === position) {
+      return offset;
+    }
+    offset += child.nodeSize;
+    if (child.attrs.structureType === 'article') {
+      articleIndex += 1;
+    }
+  }
+
+  return location.pos + containerNode.nodeSize - 1;
+}

package/addon/plugins/location-plugin/utils/get-document-locations.ts

@@ -0,0 +1,63 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { Area, Place } from './geo-helpers';
+import { Address } from './address-helpers';
+
+type LocationsWithDistanceType = {
+  location: Place | Address | Area;
+  distance: number;
+};
+
+type LocationMetadataType = {
+  [locationUri: string]: { ocurrences: number; distance: number };
+};
+
+export default function getDocumentLocations(state: EditorState) {
+  const doc = state.doc;
+  const locationsWithDistance: LocationsWithDistanceType[] = [];
+  const selection = state.selection;
+  doc.descendants((node, pos) => {
+    if (node.type.name === 'oslo_location') {
+      const distance = Math.abs(pos - selection.from);
+      locationsWithDistance.push({
+        location: node.attrs.value,
+        distance: distance,
+      });
+      return false;
+    }
+    return true;
+  });
+  const locationMetadata: LocationMetadataType = {};
+  const locationsDedup: (Place | Address | Area)[] = [];
+  for (const locationWithDistance of locationsWithDistance) {
+    const uri =
+      (locationWithDistance.location as Address).belgianAddressUri ||
+      locationWithDistance.location.uri;
+    if (!locationMetadata[uri]) {
+      locationMetadata[uri] = {
+        ocurrences: 1,
+        distance: locationWithDistance.distance,
+      };
+      locationsDedup.push(locationWithDistance.location);
+    } else {
+      locationMetadata[uri].ocurrences++;
+      if (locationWithDistance.distance < locationMetadata[uri].distance) {
+        locationMetadata[uri].distance = locationWithDistance.distance;
+      }
+    }
+  }
+
+  const locations = locationsDedup.sort((a, b) => {
+    const uriA = (a as Address).belgianAddressUri || a.uri;
+    const uriB = (b as Address).belgianAddressUri || b.uri;
+    if (
+      locationMetadata[uriA].ocurrences === locationMetadata[uriB].ocurrences
+    ) {
+      return locationMetadata[uriA].distance - locationMetadata[uriB].distance;
+    } else {
+      return (
+        locationMetadata[uriB].ocurrences - locationMetadata[uriA].ocurrences
+      );
+    }
+  });
+  return locations;
+}

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -7,10 +7,7 @@ import {
 } from '@lblod/ember-rdfa-editor';
 import { v4 as uuid } from 'uuid';
 import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
-import {
-  type IncomingTriple,
-  type FullTriple,
-} from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+import { type FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
   DCT,
   EXT,
@@ -36,16 +33,12 @@ import {
   ZONALITY_OPTIONS,
   ZonalOrNot,
 } from '../constants';
-import { createTextVariable } from '../../variable-plugin/actions/create-text-variable';
-import { createNumberVariable } from '../../variable-plugin/actions/create-number-variable';
-import { createDateVariable } from '../../variable-plugin/actions/create-date-variable';
-import { createClassicLocationVariable } from '../../variable-plugin/actions/create-classic-location-variable';
 import { isTrafficSignal, TrafficSignal } from '../schemas/traffic-signal';
 import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
 import { VariableInstance } from '../schemas/variable-instance';
-import { createCodelistVariable } from '../../variable-plugin/actions/create-codelist-variable';
 import removeZFromLabel from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/helpers/removeZFromLabel';
 import { namespace } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import { constructMeasureFragment } from '../helpers/construct-measure-fragment';
 
 // This is defined locally as it's an implementation quirk that we don't want to use generally
 const RELATIE_OBJECT = namespace(
@@ -60,6 +53,7 @@ type InsertMeasureArgs = {
   variables: Record<string, VariableInstance & { __rdfaId: string }>;
   templateString: string;
   decisionUri: string;
+  position?: number;
   articleUriGenerator?: () => string;
 } & (
   | {
@@ -78,6 +72,7 @@ export default function insertMeasure({
   templateString,
   articleUriGenerator,
   decisionUri,
+  position,
   ...args
 }: InsertMeasureArgs): TransactionMonad<boolean> {
   return function (state: EditorState) {
@@ -153,7 +148,7 @@ export default function insertMeasure({
       ];
     }
     const measureUri = `http://data.lblod.info/mobiliteitsmaatregels/${uuid()}`;
-    const measureBody = constructMeasureBody(
+    const measureBody = constructMeasureFragment(
       templateString,
       variables,
       schema,
@@ -221,7 +216,7 @@ export default function insertMeasure({
         ],
         externalTriples,
       },
-      [measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
+      [...measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
     );
     const articleNode = buildArticleStructure(
       state.schema,
@@ -230,6 +225,7 @@ export default function insertMeasure({
     const initialTransaction = insertArticle({
       node: articleNode,
       decisionUri,
+      position,
     })(state).transaction;
     const resultingSelection = initialTransaction.selection;
     const { transaction, result } = transactionCombinator(
@@ -268,34 +264,6 @@ export default function insertMeasure({
   };
 }
 
-function constructMeasureBody(
-  templateString: string,
-  variables: Record<string, VariableInstance>,
-  schema: Schema,
-  backlinks?: IncomingTriple[],
-) {
-  const parts = templateString.split(/(\$\{[^{}$]+\})/);
-  const nodes = [];
-  for (const part of parts) {
-    if (!part) {
-      continue;
-    }
-    const match = /^\$\{([^{}$]+)\}$/.exec(part);
-    if (match) {
-      const variableName = match[1];
-      const matchedVariable = variables[variableName];
-      if (matchedVariable) {
-        nodes.push(constructVariableNode(matchedVariable, schema, backlinks));
-      } else {
-        nodes.push(schema.text(part));
-      }
-    } else {
-      nodes.push(schema.text(part));
-    }
-  }
-  return schema.nodes.paragraph.create({}, nodes);
-}
-
 function determineSignLabel(signConcept: TrafficSignalConcept) {
   switch (signConcept.type) {
     case TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT:
@@ -363,47 +331,3 @@ function constructSignalNode(
   );
   return node;
 }
-
-function constructVariableNode(
-  variableInstance: VariableInstance,
-  schema: Schema,
-  backlinks?: IncomingTriple[],
-) {
-  const variable = variableInstance.variable;
-  const valueStr =
-    variableInstance.value instanceof Date
-      ? variableInstance.value.toISOString()
-      : variableInstance.value?.toString();
-  const args = {
-    schema,
-    backlinks,
-    variable: variable.uri,
-    variableInstance: variableInstance.uri,
-    __rdfaId: variableInstance.__rdfaId,
-    value: valueStr,
-    valueLabel:
-      'valueLabel' in variableInstance
-        ? variableInstance.valueLabel
-        : undefined,
-    label: variable.label,
-  };
-  switch (variable.type) {
-    case 'text':
-      return createTextVariable(args);
-    case 'number':
-      return createNumberVariable(args);
-    case 'date':
-      return createDateVariable(args);
-    case 'codelist':
-      return createCodelistVariable({
-        ...args,
-        source: variable.source,
-        codelist: variable.codelistUri,
-      });
-    case 'location':
-      return createClassicLocationVariable({
-        ...args,
-        source: variable.source,
-      });
-  }
-}

package/addon/plugins/roadsign-regulation-plugin/helpers/construct-measure-fragment.ts

@@ -0,0 +1,96 @@
+import { Schema } from '@lblod/ember-rdfa-editor';
+import { type IncomingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+import { VariableInstance } from '../schemas/variable-instance';
+import { createTextVariable } from '../../variable-plugin/actions/create-text-variable';
+import { createNumberVariable } from '../../variable-plugin/actions/create-number-variable';
+import { createDateVariable } from '../../variable-plugin/actions/create-date-variable';
+import { createClassicLocationVariable } from '../../variable-plugin/actions/create-classic-location-variable';
+import { createCodelistVariable } from '../../variable-plugin/actions/create-codelist-variable';
+
+export function constructMeasureFragment(
+  templateString: string,
+  variables: Record<string, VariableInstance>,
+  schema: Schema,
+  backlinks?: IncomingTriple[],
+) {
+  // TODO: extract this functionality of parsing a text with "variable" placeholders into a fragment to a more general place
+  const parts = templateString.split(/(\$\{[^{}$]+\})/);
+  const fragment = [];
+  let currentParagraphContent = [];
+  for (const part of parts) {
+    if (!part) {
+      continue;
+    }
+    const match = /^\$\{([^{}$]+)\}$/.exec(part);
+    if (match) {
+      const variableName = match[1];
+      const matchedVariable = variables[variableName];
+      if (matchedVariable) {
+        const node = constructVariableNode(matchedVariable, schema, backlinks);
+        if (node.type.isBlock) {
+          if (currentParagraphContent.length > 0) {
+            fragment.push(
+              schema.nodes.paragraph.create({}, currentParagraphContent),
+            );
+            currentParagraphContent = [];
+          }
+          fragment.push(node);
+        }
+      } else {
+        currentParagraphContent.push(schema.text(part));
+      }
+    } else {
+      currentParagraphContent.push(schema.text(part));
+    }
+  }
+
+  if (currentParagraphContent.length > 0) {
+    fragment.push(schema.nodes.paragraph.create({}, currentParagraphContent));
+  }
+
+  return fragment;
+}
+
+function constructVariableNode(
+  variableInstance: VariableInstance,
+  schema: Schema,
+  backlinks?: IncomingTriple[],
+) {
+  const variable = variableInstance.variable;
+  const valueStr =
+    variableInstance.value instanceof Date
+      ? variableInstance.value.toISOString()
+      : variableInstance.value?.toString();
+  const args = {
+    schema,
+    backlinks,
+    variable: variable.uri,
+    variableInstance: variableInstance.uri,
+    __rdfaId: variableInstance.__rdfaId,
+    value: valueStr,
+    valueLabel:
+      'valueLabel' in variableInstance
+        ? variableInstance.valueLabel
+        : undefined,
+    label: variable.label,
+  };
+  switch (variable.type) {
+    case 'text':
+      return createTextVariable(args);
+    case 'number':
+      return createNumberVariable(args);
+    case 'date':
+      return createDateVariable(args);
+    case 'codelist':
+      return createCodelistVariable({
+        ...args,
+        source: variable.source,
+        codelist: variable.codelistUri,
+      });
+    case 'location':
+      return createClassicLocationVariable({
+        ...args,
+        source: variable.source,
+      });
+  }
+}

package/addon/plugins/variable-plugin/actions/create-classic-location-variable.ts

@@ -20,16 +20,9 @@ type CreateClassicLocationVariableArgs = {
 export function createClassicLocationVariable(
   args: CreateClassicLocationVariableArgs,
 ) {
-  const { schema, value, label } = args;
+  const { schema } = args;
   const attrs = createClassicLocationVariableAttrs(args);
-  return schema.nodes.location.create(
-    attrs,
-    value
-      ? schema.text(value)
-      : schema.node('placeholder', {
-          placeholderText: label,
-        }),
-  );
+  return schema.nodes.block_rdfa.create(attrs, schema.nodes.paragraph.create());
 }
 
 type CreateClassicLocationVariableAttrsArgs = {
@@ -88,7 +81,7 @@ export function createClassicLocationVariableAttrs({
     __rdfaId,
     externalTriples,
     backlinks: [...backlinks, ...addedBacklinks],
-    label,
+    label: label ?? 'Plaatsbeschrijving',
     source,
   };
 }

package/addon/plugins/variable-plugin/contextual-actions/index.ts

@@ -0,0 +1,188 @@
+import {
+  EditorState,
+  NodeSelection,
+  Transaction,
+} from '@lblod/ember-rdfa-editor';
+import { fetchCodeListOptions } from '../utils/fetch-data';
+import { findParentNode } from '@curvenote/prosemirror-utils';
+import {
+  getOutgoingTriple,
+  hasOutgoingNamedNodeTriple,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import {
+  EXT,
+  MOBILITEIT,
+  RDF,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import {
+  ZONALITY_OPTIONS,
+  ZONALITY_OPTIONS_LEGACY,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { ProseParser } from '@lblod/ember-rdfa-editor';
+import { wrapVariableInHighlight } from '../utils/codelist-utils';
+import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/editable-node';
+import { isRdfaAttrs } from '@lblod/ember-rdfa-editor/core/rdfa-types';
+import { v4 as uuidv4 } from 'uuid';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
+
+const plaatsbepalingGroupId =
+  'plaatsbepaling-1d8563d6-bfd8-487f-a2a0-6d7a6ab01cb5';
+
+function getSelectedLocation(state: EditorState) {
+  const { selection } = state;
+  if (
+    selection instanceof NodeSelection &&
+    selection.node.type === state.schema.nodes.location
+  ) {
+    return {
+      node: selection.node,
+      pos: selection.from,
+    };
+  } else {
+    return;
+  }
+}
+
+function getSource(state: EditorState, fallback?: string) {
+  const selectedLocation = getSelectedLocation(state);
+  if (selectedLocation) {
+    const { node } = selectedLocation;
+    const source = node.attrs.source;
+    if (source) {
+      return source;
+    }
+  }
+
+  return fallback;
+}
+
+function getIsZonal(state: EditorState) {
+  const { selection } = state;
+  const mobilityMeasureNode = findParentNode((node) =>
+    hasOutgoingNamedNodeTriple(
+      node.attrs,
+      RDF('type'),
+      MOBILITEIT('Mobiliteitsmaatregel'),
+    ),
+  )(selection)?.node;
+  if (!mobilityMeasureNode) {
+    return false;
+  }
+  const zonalityTriple = getOutgoingTriple(
+    mobilityMeasureNode.attrs,
+    EXT('zonality'),
+  );
+  if (!zonalityTriple) {
+    return false;
+  }
+  return (
+    zonalityTriple.object.value === ZONALITY_OPTIONS.ZONAL ||
+    zonalityTriple.object.value === ZONALITY_OPTIONS_LEGACY.ZONAL
+  );
+}
+
+type GetContextualActionsAttrs = {
+  zonalLocationCodelistUri: string;
+  nonZonalLocationCodelistUri: string;
+  endpoint?: string;
+};
+
+function humanReadableLabel(label: string) {
+  return label.replace(/\$\{[^}]+\}/g, '…');
+}
+
+function createInsertPlaceDescriptionCommand(label: string) {
+  return (state: EditorState, dispatch: (tr: Transaction) => void) => {
+    if (dispatch) {
+      let htmlToInsert = label;
+      htmlToInsert = wrapVariableInHighlight(htmlToInsert);
+      const domParser = new DOMParser();
+      const htmlNode = domParser.parseFromString(htmlToInsert, 'text/html');
+      const contentFragment = ProseParser.fromSchema(state.schema).parseSlice(
+        htmlNode,
+        {
+          preserveWhitespace: false,
+        },
+      );
+
+      const tr = state.tr;
+      const startPos = tr.selection.from;
+      tr.replaceSelection(contentFragment);
+
+      let highlightPos: number | null = null;
+
+      contentFragment.content.descendants((child, pos) => {
+        if (highlightPos !== null) {
+          return false;
+        }
+        if (child.type.name === state.schema.nodes.placeholder.name) {
+          highlightPos = startPos + pos;
+          return false;
+        }
+        return true;
+      });
+
+      if (highlightPos !== null) {
+        tr.setSelection(NodeSelection.create(tr.doc, highlightPos));
+      }
+      dispatch(tr);
+    }
+    return true;
+  };
+}
+
+export function getContextualActions({
+  zonalLocationCodelistUri,
+  nonZonalLocationCodelistUri,
+  endpoint,
+}: GetContextualActionsAttrs) {
+  return async function (state: EditorState) {
+    const source = getSource(state, endpoint);
+    const isZonal = getIsZonal(state);
+    const result = await fetchCodeListOptions(
+      source,
+      isZonal ? zonalLocationCodelistUri : nonZonalLocationCodelistUri,
+    );
+
+    return result.options.map((option) => {
+      return {
+        id: uuidv4(),
+        label: humanReadableLabel(option.label),
+        group: plaatsbepalingGroupId,
+        command: createInsertPlaceDescriptionCommand(option.label),
+      };
+    });
+  };
+}
+
+function contextualGroupIsVisible(state: EditorState) {
+  const activeNode = getActiveEditableNode(state);
+  const isPlaatsbepaling =
+    activeNode &&
+    isRdfaAttrs(activeNode.value.attrs) &&
+    activeNode.value.attrs.backlinks.some((value) =>
+      MOBILITEIT('plaatsbepaling').matches(value.predicate),
+    );
+
+  const isEmptySelection = state.selection.empty;
+  return (
+    (activeNode?.value.type.name === 'location' || isPlaatsbepaling) &&
+    isEmptySelection
+  );
+}
+
+export function getContextualActionGroups() {
+  return function (state: EditorState) {
+    return contextualGroupIsVisible(state)
+      ? [
+          {
+            id: plaatsbepalingGroupId,
+            label: getTranslationFunction(state)(
+              'variable.location.label',
+              'Plaatsbeschrijving',
+            ),
+          },
+        ]
+      : [];
+  };
+}

package/addon/plugins/variable-plugin/utils/codelist-utils.ts

@@ -14,7 +14,7 @@ import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
  * E.g. `This is a variable with ${placeholder}` gets converted to:
  * `This is a variable with <span class="mark-highlight-manual">${placeholder}</span>`
  */
-function wrapVariableInHighlight(text: string) {
+export function wrapVariableInHighlight(text: string) {
   return text.replace(
     /\$\{(.+?)\}/g,
     '<span class="mark-highlight-manual">${$1}</span>',

package/addon/utils/document-structure-utils.ts

@@ -0,0 +1,17 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { PNode } from '@lblod/ember-rdfa-editor';
+
+export function getArticleNodes(state: EditorState) {
+  const articles: { node: PNode; pos: number }[] = [];
+
+  state.doc.descendants((node, pos) => {
+    if (node.attrs.structureType === 'article') {
+      articles.push({ node, pos });
+      return false;
+    }
+
+    return true;
+  });
+
+  return articles;
+}

package/declarations/addon/components/roadsign-regulation-plugin/expanded-measure.d.ts

@@ -2,10 +2,13 @@ import Component from '@glimmer/component';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
+import IntlService from 'ember-intl/services/intl';
+import { PNode } from '@lblod/ember-rdfa-editor';
 export type InsertMobilityMeasureTask = Task<void, [
     MobilityMeasureConcept,
     ZonalOrNot,
-    boolean
+    boolean,
+    number?
 ]>;
 type Signature = {
     Args: {
@@ -13,16 +16,34 @@ type Signature = {
         selectRow: (uri: string) => void;
         insert: InsertMobilityMeasureTask;
         endpoint: string;
+        articleNodes: PNode[];
     };
 };
+type InsertPositionOption = {
+    label: string;
+    position: 'first' | 'last' | 'custom';
+    insertIndex?: number;
+};
 export default class ExpandedMeasure extends Component<Signature> {
+    intl: IntlService;
     zonalityValue?: ZonalOrNot;
     temporalValue?: boolean;
+    selectedInsertPosition: InsertPositionOption;
+    insertPositionOptionFirst: InsertPositionOption;
+    insertPositionOptionLast: InsertPositionOption;
+    constructor(owner: unknown, args: Signature['Args']);
     get isPotentiallyZonal(): boolean;
     get insertButtonDisabled(): boolean;
     changeZonality(zonality: ZonalOrNot): void;
     changeTemporality(temporality: 'true' | 'false'): void;
     insert(): void;
     unselectRow(): void;
+    get articlesInDocument(): PNode[];
+    get insertPositionOptions(): (InsertPositionOption | {
+        label: string;
+        position: string;
+        insertIndex: number;
+    })[];
+    get insertPositionDropdownTitle(): string;
 }
 export {};

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -134,10 +134,11 @@ export default class RoadsignsModal extends Component<Signature> {
         }))[];
     }[] | undefined;
     get measureConceptCount(): number | undefined;
-    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: ZonalOrNot, temporal: boolean) => Promise<void>>;
+    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: ZonalOrNot, temporal: boolean, position?: number) => Promise<void>>;
     resetPagination(): void;
     goToPreviousPage(): void;
     goToNextPage(): void;
     goToPage(pageNumber: number): void;
+    get articleNodes(): import("prosemirror-model").Node[];
 }
 export {};

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-table.d.ts

@@ -2,12 +2,14 @@ import Component from '@glimmer/component';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { InsertMobilityMeasureTask } from './expanded-measure';
+import { PNode } from '@lblod/ember-rdfa-editor';
 type Signature = {
     Args: {
         options: RoadsignRegulationPluginOptions;
         content?: MobilityMeasureConcept[];
         isLoading?: boolean;
         insert: InsertMobilityMeasureTask;
+        articleNodes: PNode[];
     };
 };
 export default class RoadSignsTable extends Component<Signature> {

package/declarations/addon/plugins/decision-plugin/actions/insert-article.d.ts

@@ -4,6 +4,7 @@ interface InsertArticleToDecisionArgs {
     node: PNode;
     decisionUri: string;
     insertFreely?: false;
+    position?: number;
 }
 interface InsertArticleFreelyArgs {
     node: PNode;

package/declarations/addon/plugins/location-plugin/utils/get-document-locations.d.ts

@@ -0,0 +1,4 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { Area, Place } from './geo-helpers';
+import { Address } from './address-helpers';
+export default function getDocumentLocations(state: EditorState): (Address | Place | Area)[];

package/declarations/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.d.ts

@@ -12,11 +12,12 @@ type InsertMeasureArgs = {
     }>;
     templateString: string;
     decisionUri: string;
+    position?: number;
     articleUriGenerator?: () => string;
 } & ({
     measureConcept: MobilityMeasureConcept;
 } | {
     measureDesign: MobilityMeasureDesign;
 });
-export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
+export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, position, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
 export {};

package/declarations/addon/plugins/roadsign-regulation-plugin/helpers/construct-measure-fragment.d.ts

@@ -0,0 +1,4 @@
+import { Schema } from '@lblod/ember-rdfa-editor';
+import { type IncomingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+import { VariableInstance } from '../schemas/variable-instance';
+export declare function constructMeasureFragment(templateString: string, variables: Record<string, VariableInstance>, schema: Schema, backlinks?: IncomingTriple[]): import("prosemirror-model").Node[];

package/declarations/addon/plugins/variable-plugin/actions/create-classic-location-variable.d.ts

@@ -21,7 +21,7 @@ export declare function createClassicLocationVariableAttrs({ variable, variableI
     __rdfaId: string | undefined;
     externalTriples: FullTriple[];
     backlinks: IncomingTriple[];
-    label: string | undefined;
+    label: string;
     source: string | undefined;
 };
 export {};

package/declarations/addon/plugins/variable-plugin/contextual-actions/index.d.ts

@@ -0,0 +1,17 @@
+import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
+type GetContextualActionsAttrs = {
+    zonalLocationCodelistUri: string;
+    nonZonalLocationCodelistUri: string;
+    endpoint?: string;
+};
+export declare function getContextualActions({ zonalLocationCodelistUri, nonZonalLocationCodelistUri, endpoint, }: GetContextualActionsAttrs): (state: EditorState) => Promise<{
+    id: string;
+    label: string;
+    group: string;
+    command: (state: EditorState, dispatch: (tr: Transaction) => void) => boolean;
+}[]>;
+export declare function getContextualActionGroups(): (state: EditorState) => {
+    id: string;
+    label: string;
+}[];
+export {};

package/declarations/addon/plugins/variable-plugin/utils/codelist-utils.d.ts

@@ -1,5 +1,15 @@
 import { CodeListOption } from './fetch-data';
 import { PNode, SayController } from '@lblod/ember-rdfa-editor';
+/**
+ *
+ * @param text content of variable option which needs to be inserted
+ * @returns content of variable option where the placeholders (indicated by ${...})
+ * are wrapped in a span with class `mark-highlight-manual`.
+ *
+ * E.g. `This is a variable with ${placeholder}` gets converted to:
+ * `This is a variable with <span class="mark-highlight-manual">${placeholder}</span>`
+ */
+export declare function wrapVariableInHighlight(text: string): string;
 export declare function updateCodelistVariable(selectedCodelist: {
     node: PNode;
     pos: number;

package/declarations/addon/utils/document-structure-utils.d.ts

@@ -0,0 +1,6 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { PNode } from '@lblod/ember-rdfa-editor';
+export declare function getArticleNodes(state: EditorState): {
+    node: PNode;
+    pos: number;
+}[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "35.6.0",
+  "version": "36.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -111,8 +111,8 @@
     "@glint/ember-tsc": "^1.5.0",
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
+    "@lblod/ember-rdfa-editor": "13.7.1",
     "@glint/template": "^1.7.7",
-    "@lblod/ember-rdfa-editor": "13.6.0",
     "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
@@ -184,7 +184,7 @@
     "@appuniversum/ember-appuniversum": "^3.12.0",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^12.15.0 || ^13.0.0",
+    "@lblod/ember-rdfa-editor": "^13.7.1",
     "ember-concurrency": "^4.0.2",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",

package/translations/en-US.yaml

@@ -208,7 +208,7 @@ variable:
     multi-select: Multiple selection
     label: codelist
   location:
-    label: location
+    label: place description
   text:
     label: text
   date:
@@ -316,6 +316,10 @@ editor-plugins:
   roadsign-regulation:
     expanded-measure:
       insert-measure: 'Insert measure:'
+      as-last-article: As last article
+      as-first-article: As first article
+      after-article-x: After article {articleNumber}
+      insert-position: 'Insertion position:'
       select-zonality:
         label: 'Select zonal validity:'
         zonal: Zonal

package/translations/nl-BE.yaml

@@ -212,7 +212,7 @@ variable:
     multi-select: Meervoudige selectie
     label: codelijst
   location:
-    label: locatie
+    label: plaatsbeschrijving
   text:
     label: tekst
   date:
@@ -232,7 +232,7 @@ variable-plugin:
   enter-variable-value: Selecteer waarde
   unknown-codelist: Er werden geen mogelijke waarden voor deze codelijst gevonden
   label: Label
-  labelPlaceholder: Type iets...
+  labelPlaceholder: Label invullen…
   number:
     minimum: Minimum
     minimum-placeholder: minimumwaarde
@@ -272,7 +272,7 @@ snippet-plugin:
     search:
       title: Filter op
       label: Fragmentnaam
-      placeholder: Typ iets...
+      placeholder: Vul in…
   snippet-list:
     open-modal: Fragmentlijsten beheren
     modal:
@@ -281,7 +281,7 @@ snippet-plugin:
       search:
         title: Filter op
         label: Naam lijst
-        placeholder: Typ iets..
+        placeholder: Vul in…
       button:
         cancel: Annuleer
         update: Fragmentlijsten opslaan
@@ -315,6 +315,10 @@ editor-plugins:
   roadsign-regulation:
     expanded-measure:
       insert-measure: 'Voeg maatregel in:'
+      as-last-article: Als laatste artikel
+      as-first-article: Als eerste artikel
+      after-article-x: Na artikel {articleNumber}
+      insert-position: 'Invoegpositie:'
       select-zonality:
         label: 'Selecteer zonale geldigheid:'
         zonal: Zonaal
@@ -445,7 +449,7 @@ location-plugin:
     place: Plaats
     area: Gebied
   label: Label
-  labelPlaceholder: Type iets...
+  labelPlaceholder: Vul in…
   default-label: locatie
   map:
     hint: