@lblod/ember-rdfa-editor-lblod-plugins 35.5.0 → 35.6.0-dev.e16af1eb01766a9bd664f91a9ffbbac0e85b94d7

package/.changeset/calm-books-protect.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Bump editor

package/.changeset/hungry-rings-prove.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Add slash commands plugin

package/.changeset/itchy-impalas-accept.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major 
+---
+
+Add contextual actions for inserting place descriptions

package/.changeset/many-brooms-fetch.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Adds ability to choose insert position for a mobility measure article

package/.changeset/quick-frogs-type.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add function to search the document for oslo locations

package/.changeset/serious-lies-bathe.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Translate functions that insert besluit blocks

package/.changeset/ten-cameras-repair.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+fix translation mobility measure insert position

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.6.0
+
+### Minor Changes
+
+- [#652](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/652) [`6a75255`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/6a752557f1e36010629ba8d2f366739a42e063ed) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Allow to modify render in place for besluit topic select
+
 ## 35.5.0
 
 ### Minor Changes

package/addon/components/besluit-topic-plugin/besluit-topic-select.hbs

@@ -1,7 +1,6 @@
 {{! @glint-nocheck: not typesafe yet }}
 <div ...attributes>
   <PowerSelectMultiple
-    @renderInPlace={{true}}
     @searchEnabled={{true}}
     @searchMessage={{t 'besluit-topic-plugin.search-message'}}
     @noMatchesMessage={{t 'besluit-topic-plugin.no-matches-message'}}
@@ -9,6 +8,7 @@
     @options={{this.besluitTopics}}
     @selected={{@selected}}
     @onChange={{@onchange}}
+    @renderInPlace={{this.renderInPlace}}
     as |besluitTopic|
   >
     {{besluitTopic.label}}

package/addon/components/besluit-topic-plugin/besluit-topic-select.ts

@@ -8,6 +8,7 @@ type Args = {
   besluitTopics: BesluitTopic[];
   selected?: BesluitTopic[];
   onchange: (topic: BesluitTopic[]) => void;
+  renderInPlace?: boolean;
 };
 
 export default class BesluitTopicSelectComponent extends Component<Args> {
@@ -31,4 +32,8 @@ export default class BesluitTopicSelectComponent extends Component<Args> {
       besluitTopic.label.toLowerCase().includes(lowerTerm),
     );
   }
+  get renderInPlace() {
+    if (this.args.renderInPlace === false) return false;
+    return true;
+  }
 }

package/addon/components/decision-plugin/decision-plugin-card.gts

@@ -78,6 +78,7 @@ export default class DecisionPluginCard extends Component<Sig> {
             'besluit-plugin.placeholder.decision-title',
           ),
           decisionLocation: this.decisionNodeLocation,
+          label: 'Titel',
         }),
         { view: this.controller.mainEditorView },
       );
@@ -102,6 +103,7 @@ export default class DecisionPluginCard extends Component<Sig> {
             'besluit-plugin.placeholder.decision-description',
           ),
           decisionLocation: this.decisionNodeLocation,
+          label: 'Beschrijving',
         }),
         {
           view: this.controller.mainEditorView,
@@ -128,6 +130,7 @@ export default class DecisionPluginCard extends Component<Sig> {
         insertMotivation({
           intl: this.intl,
           decisionLocation: this.decisionNodeLocation,
+          label: 'Motivering',
         }),
         {
           view: this.controller.mainEditorView,
@@ -152,6 +155,7 @@ export default class DecisionPluginCard extends Component<Sig> {
           decisionUri: this.decisionUri,
           articleUriGenerator: this.args.options?.articleUriGenerator,
           decisionLocation: this.decisionNodeLocation,
+          label: 'Artikels',
         }),
         {
           view: this.controller.mainEditorView,

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/decision-plugin/commands/insert-article-container.ts

@@ -15,12 +15,14 @@ interface InsertArticleContainerArgs {
   decisionUri: string;
   articleUriGenerator?: () => string;
   decisionLocation: NodeWithPos;
+  label?: string;
 }
 
 export default function insertArticleContainer({
   decisionUri,
   articleUriGenerator,
   decisionLocation,
+  label,
 }: InsertArticleContainerArgs): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const { schema } = state;
@@ -29,6 +31,7 @@ export default function insertArticleContainer({
       {
         rdfaNodeType: 'literal',
         __rdfaId: articleContainerId,
+        label,
       },
       schema.nodes.paragraph.create(),
     );

package/addon/plugins/decision-plugin/commands/insert-description.ts

@@ -9,18 +9,20 @@ import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transactio
 interface InsertDescriptionArgs {
   placeholderText: string;
   decisionLocation: NodeWithPos;
+  label?: string;
 }
 
 export default function insertDescription({
   placeholderText,
   decisionLocation,
+  label,
 }: InsertDescriptionArgs) {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const { schema } = state;
     const descriptionId = uuid();
     const nodeToInsert = schema.node(
       'block_rdfa',
-      { rdfaNodeType: 'literal', __rdfaId: descriptionId },
+      { rdfaNodeType: 'literal', __rdfaId: descriptionId, label },
       schema.node(
         'paragraph',
         null,
@@ -30,6 +32,7 @@ export default function insertDescription({
       ),
     );
     const tr = state.tr;
+    console.log(nodeToInsert);
 
     if (state.selection.$from.pos === decisionLocation.pos) {
       tr.replaceRangeWith(

package/addon/plugins/decision-plugin/commands/insert-motivation.ts

@@ -11,11 +11,13 @@ import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transactio
 interface InsertMotivationArgs {
   intl: IntlService;
   decisionLocation: NodeWithPos;
+  label?: string;
 }
 
 export default function insertMotivation({
   intl,
   decisionLocation,
+  label,
 }: InsertMotivationArgs): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const translationWithDocLang = getTranslationFunction(state);
@@ -24,7 +26,7 @@ export default function insertMotivation({
     const motivationId = uuid();
     const nodeToInsert = schema.node(
       'block_rdfa',
-      { rdfaNodeType: 'literal', __rdfaId: motivationId },
+      { rdfaNodeType: 'literal', __rdfaId: motivationId, label },
       [
         schema.node(
           'paragraph',

package/addon/plugins/decision-plugin/commands/insert-title.ts

@@ -9,18 +9,20 @@ import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transactio
 interface InsertTitleArgs {
   placeholderText: string;
   decisionLocation: NodeWithPos;
+  label?: string;
 }
 
 export default function insertTitle({
   placeholderText,
   decisionLocation,
+  label,
 }: InsertTitleArgs) {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const { schema } = state;
     const titleId = uuid();
     const nodeToInsert = schema.node(
       'block_rdfa',
-      { rdfaNodeType: 'literal', __rdfaId: titleId },
+      { rdfaNodeType: 'literal', __rdfaId: titleId, label },
       schema.node(
         'paragraph',
         null,

package/addon/plugins/document-validation-plugin/common-fixes.ts

@@ -28,6 +28,7 @@ export function insertTitleAtCursor(
     insertTitle({
       placeholderText: intl.t('besluit-plugin.placeholder.decision-title'),
       decisionLocation: decisionNodeLocation,
+      label: 'Titel',
     }),
     { view: controller.mainEditorView },
   );
@@ -51,6 +52,7 @@ export function insertDescriptionAtCursor(
         'besluit-plugin.placeholder.decision-description',
       ),
       decisionLocation: decisionNodeLocation,
+      label: 'Beschrijving',
     }),
     {
       view: controller.mainEditorView,
@@ -74,6 +76,7 @@ export function insertMotivationAtCursor(
     insertMotivation({
       intl: intl,
       decisionLocation: decisionNodeLocation,
+      label: 'Motivering',
     }),
     {
       view: controller.mainEditorView,
@@ -100,6 +103,7 @@ export function insertArticleContainerAtCursor(
       decisionUri: decisionNodeLocation?.node.attrs.subject,
       articleUriGenerator: articleUriGenerator,
       decisionLocation: decisionNodeLocation,
+      label: 'Artikels',
     }),
     {
       view: controller.mainEditorView,