@lblod/ember-rdfa-editor-lblod-plugins 33.0.0 → 33.1.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 33.1.0
+
+### Minor Changes
+
+- [#589](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/589) [`380f999`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/380f9998e6c8f37f1c7be5bf2be528884f24a850) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Add actions to document validation plugin
+
+### Patch Changes
+
+- [#608](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/608) [`7d01346`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/7d01346456985efa3fc4438c828b4fbc31de297e) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix ordering of measures in IRGN plugin
+
 ## 33.0.0
 
 ### Major Changes

package/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts

@@ -15,7 +15,7 @@ import {
 import {
   getCurrentBesluitRange,
   getCurrentBesluitURI,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import {
   updateBesluitTopicResource,
   TOPIC_PREDICATE,

package/addon/components/besluit-type-plugin/toolbar-dropdown.gts

@@ -16,7 +16,7 @@ import { CircleXIcon } from '@appuniversum/ember-appuniversum/components/icons/c
 import { SayController } from '@lblod/ember-rdfa-editor';
 import fetchBesluitTypes from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 import { BesluitTypePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import {
   BesluitTypeInstance,
   checkBesluitTypeInstance,

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

@@ -23,7 +23,7 @@ import { on } from '@ember/modifier';
 import { not } from 'ember-truth-helpers';
 import t from 'ember-intl/helpers/t';
 import { TemplateOnlyComponent } from '@ember/component/template-only';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 
 interface DecisionCardOptions {
   articleUriGenerator?: () => string;
@@ -145,12 +145,13 @@ export default class DecisionPluginCard extends Component<Sig> {
   }
   @action
   insertArticleBlock() {
-    if (this.decisionUri) {
+    if (this.decisionUri && this.decisionNodeLocation) {
       this.controller.doCommand(
         insertArticleContainer({
           intl: this.intl,
           decisionUri: this.decisionUri,
           articleUriGenerator: this.args.options?.articleUriGenerator,
+          decisionLocation: this.decisionNodeLocation,
         }),
         {
           view: this.controller.mainEditorView,

package/addon/components/decision-plugin/insert-article.gts

@@ -4,7 +4,7 @@ import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 import { PNode, SayController } from '@lblod/ember-rdfa-editor';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import { buildArticleStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/utils/build-article-structure';
 import { not } from 'ember-truth-helpers';
 import { service } from '@ember/service';

package/addon/components/document-validation-plugin/card.gts

@@ -12,6 +12,8 @@ import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 import { ExternalLinkIcon } from '@appuniversum/ember-appuniversum/components/icons/external-link';
 import t from 'ember-intl/helpers/t';
 import { eq } from 'ember-truth-helpers';
+import ValidationReport from 'rdf-validate-shacl/src/validation-report';
+import { CircleInfoIcon } from '@appuniversum/ember-appuniversum/components/icons/circle-info';
 
 interface Sig {
   Args: {
@@ -19,6 +21,17 @@ interface Sig {
   };
 }
 
+type ExtractWithKey<T, K extends PropertyKey> = T extends Record<K, unknown>
+  ? T
+  : never;
+
+function hasProperty<
+  O extends object = object,
+  K extends PropertyKey = PropertyKey,
+>(obj: O, key: K): obj is ExtractWithKey<O, K> {
+  return key in obj;
+}
+
 export default class DocumentValidationPluginCard extends Component<Sig> {
   get controller() {
     return this.args.controller;
@@ -37,10 +50,26 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
   }
   get documentValidationErrors() {
     if (!this.validationState) return [];
-    const { propertiesWithErrors } = this.validationState;
+
+    const { propertiesWithErrors, rules } = this.validationState;
     if (!propertiesWithErrors) return undefined;
 
-    return propertiesWithErrors;
+    const documentValidationErrors = propertiesWithErrors.map((property) => {
+      const rule = rules.find((rule) => property?.shape === rule.shaclRule);
+      if (rule && 'violations' in rule) {
+        const rulePerConstraint = rule.violations[property?.constraint];
+        return {
+          ...property,
+          rule: rulePerConstraint,
+        };
+      } else {
+        return {
+          ...property,
+          rule: rule,
+        };
+      }
+    });
+    return documentValidationErrors;
   }
   get propertiesWithoutErrors() {
     if (!this.validationState) return [];
@@ -65,6 +94,53 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
     return ['valid', 'no-matches'].includes(this.status);
   }
 
+  doActionAndTriggerValidation = async (
+    action: (controller: SayController, report: ValidationReport) => void,
+  ) => {
+    action(this.controller, this.validationState?.report as ValidationReport);
+    const pluginState = documentValidationPluginKey.getState(
+      this.controller.mainEditorView.state,
+    );
+    if (!pluginState) return;
+    const { validationCallback } = pluginState;
+    await validationCallback(
+      this.controller.mainEditorView,
+      this.controller.htmlContent,
+    );
+  };
+
+  oldVal: typeof this.documentValidationErrors;
+
+  dedupeDocumentValidationErrors = (
+    val: typeof this.documentValidationErrors,
+  ) => {
+    if (this.compareDocumentValidationErrors(val, this.oldVal)) {
+      return this.oldVal;
+    } else {
+      this.oldVal = val;
+      return val;
+    }
+  };
+
+  compareDocumentValidationErrors = (
+    val1: typeof this.documentValidationErrors,
+    val2: typeof this.documentValidationErrors,
+  ) => {
+    if (!val1?.length) return false;
+    if (val1.length !== val2?.length) return false;
+    for (let i = 0; i < val1.length; i++) {
+      if (
+        !val1 ||
+        !val2 ||
+        !val1[i] ||
+        !val2[i] ||
+        val1[i].shape !== val2[i].shape
+      )
+        return false;
+    }
+    return true;
+  };
+
   <template>
     <AuCard
       @flex={{true}}
@@ -94,42 +170,63 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
         </p>
       </c.header>
       <c.content>
-        <p class='au-u-medium au-u-para-small'>{{t
-            'document-validation-plugin.description'
-          }}</p>
-        {{#each this.documentValidationErrors as |error|}}
-          <div class='say-document-validation__error-container'>
-            <AuIcon
-              @icon={{CloseFilledIcon}}
-              @size='large'
-              @ariaHidden={{true}}
-              class='say-document-validation__icon-error au-u-margin-right-small'
-            />
-            <div>
-              {{error.message}}
-              <AuButton
-                class='au-u-padding-left-none au-u-padding-right-none'
-                @icon={{ExternalLinkIcon}}
-                @skin='link'
-                title={{error.subject}}
-                {{on 'click' (fn this.goToSubject error.subject)}}
-              >{{t 'document-validation-plugin.see-related-node'}}</AuButton>
-            </div>
-          </div>
-        {{/each}}
-        {{#each this.propertiesWithoutErrors as |property|}}
-          <div class='say-document-validation__error-container'>
-            <div class='au-u-margin-right-small'>
+        <div>
+          {{#each
+            (this.dedupeDocumentValidationErrors this.documentValidationErrors)
+            as |error|
+          }}
+            <div class='say-document-validation__error-container'>
               <AuIcon
-                @icon={{CheckFilledIcon}}
+                @icon={{CloseFilledIcon}}
                 @size='large'
                 @ariaHidden={{true}}
-                class='say-document-validation__icon-success'
+                class='say-document-validation__icon-error au-u-margin-right-small'
               />
+              <div>
+                {{error.message}}
+                <AuButton
+                  class='au-u-padding-left-none au-u-padding-right-none'
+                  @icon={{ExternalLinkIcon}}
+                  @skin='link'
+                  title={{error.subject}}
+                  {{on 'click' (fn this.goToSubject error.subject)}}
+                >{{t 'document-validation-plugin.see-related-node'}}</AuButton>
+                {{#if error.rule}}
+                  {{#if (hasProperty error.rule 'action')}}
+                    <AuButton
+                      class='au-u-padding-left-none au-u-padding-right-none'
+                      @icon={{ExternalLinkIcon}}
+                      @skin='link'
+                      title={{error.subject}}
+                      {{on
+                        'click'
+                        (fn this.doActionAndTriggerValidation error.rule.action)
+                      }}
+                    >{{error.rule.buttonTitle}}</AuButton>
+                  {{/if}}
+                  {{#if (hasProperty error.rule 'helpText')}}
+                    <span title={{error.rule.helpText}}>
+                      <AuIcon @icon={{CircleInfoIcon}} />
+                    </span>
+                  {{/if}}
+                {{/if}}
+              </div>
+            </div>
+          {{/each}}
+          {{#each this.propertiesWithoutErrors as |property|}}
+            <div class='say-document-validation__error-container'>
+              <div class='au-u-margin-right-small'>
+                <AuIcon
+                  @icon={{CheckFilledIcon}}
+                  @size='large'
+                  @ariaHidden={{true}}
+                  class='say-document-validation__icon-success'
+                />
+              </div>
+              {{property.message}}
             </div>
-            {{property.message}}
-          </div>
-        {{/each}}
+          {{/each}}
+        </div>
       </c.content>
 
     </AuCard>

package/addon/components/lpdc-plugin/lpdc-insert.ts

@@ -11,7 +11,7 @@ import {
   type LpdcPluginConfig,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/lpdc-plugin';
 import { v4 as uuidv4 } from 'uuid';
-import { getCurrentBesluitURI } from '../../plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitURI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import { SRO } from '../../utils/constants';
 
 interface Args {

package/addon/components/roadsign-regulation-plugin/roadsign-regulation-card.gts

@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';

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

@@ -6,7 +6,7 @@ import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import {
   countMobilityMeasures,

package/addon/plugins/besluit-type-plugin/utils/besluit-type-instances.ts

@@ -1,6 +1,6 @@
 import { type EditorState } from '@lblod/ember-rdfa-editor';
 import { getOutgoingTripleList } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { type BesluitType } from './fetchBesluitTypes';
 import { type NamedNodeTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';

package/addon/plugins/besluit-type-plugin/utils/set-besluit-type.ts

@@ -8,7 +8,7 @@ import {
   removePropertyFromNode,
 } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
-import { getCurrentBesluitURI } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitURI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import {
   extractBesluitTypeUris,
   isValidTypeChoice,

package/addon/plugins/decision-plugin/commands/insert-article-container.ts

@@ -8,16 +8,19 @@ import { buildArticleStructure } from '../utils/build-article-structure';
 import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 import { insertArticle } from '../actions/insert-article';
 import { recalculateNumbers } from '../../structure-plugin/monads/recalculate-structure-numbers';
+import { NodeWithPos } from '@curvenote/prosemirror-utils';
 
 interface InsertArticleContainerArgs {
   intl: IntlService;
   decisionUri: string;
   articleUriGenerator?: () => string;
+  decisionLocation: NodeWithPos;
 }
 
 export default function insertArticleContainer({
   decisionUri,
   articleUriGenerator,
+  decisionLocation,
 }: InsertArticleContainerArgs): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const { schema } = state;
@@ -33,9 +36,19 @@ export default function insertArticleContainer({
     const articleNode = buildArticleStructure(schema, articleUriGenerator);
 
     const factory = new SayDataFactory();
+    let replaceTr;
+    if (state.selection.$from.pos === decisionLocation.pos) {
+      replaceTr = state.tr.replaceRangeWith(
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        containerNode,
+      );
+    } else {
+      replaceTr = state.tr.replaceSelectionWith(containerNode);
+    }
     const { transaction: newTr, result } = transactionCombinator<boolean>(
       state,
-      state.tr.replaceSelectionWith(containerNode),
+      replaceTr,
     )([
       addPropertyToNode({
         resource: decisionUri,

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

@@ -31,7 +31,15 @@ export default function insertDescription({
     );
     const tr = state.tr;
 
-    tr.replaceSelectionWith(nodeToInsert);
+    if (state.selection.$from.pos === decisionLocation.pos) {
+      tr.replaceRangeWith(
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        nodeToInsert,
+      );
+    } else {
+      tr.replaceSelectionWith(nodeToInsert);
+    }
 
     const factory = new SayDataFactory();
     const { transaction: newTr, result } = transactionCombinator<boolean>(

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

@@ -110,7 +110,15 @@ export default function insertMotivation({
       ],
     );
     const tr = state.tr;
-    tr.replaceSelectionWith(nodeToInsert);
+    if (state.selection.$from.pos === decisionLocation.pos) {
+      tr.replaceRangeWith(
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        nodeToInsert,
+      );
+    } else {
+      tr.replaceSelectionWith(nodeToInsert);
+    }
     const factory = new SayDataFactory();
 
     const { transaction: newTr, result } = transactionCombinator<boolean>(

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

@@ -31,7 +31,15 @@ export default function insertTitle({
     );
 
     const tr = state.tr;
-    tr.replaceSelectionWith(nodeToInsert);
+    if (state.selection.$from.pos === decisionLocation.pos) {
+      tr.replaceRangeWith(
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        decisionLocation.pos + decisionLocation.node.nodeSize - 1,
+        nodeToInsert,
+      );
+    } else {
+      tr.replaceSelectionWith(nodeToInsert);
+    }
 
     const factory = new SayDataFactory();
     const { transaction: newTr, result } = transactionCombinator<boolean>(

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

@@ -0,0 +1,125 @@
+import { SayController } from '@lblod/ember-rdfa-editor';
+import { getDecisionNodeLocation } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
+import IntlService from 'ember-intl/services/intl';
+import {
+  Notification,
+  notificationPluginKey,
+} from '@lblod/ember-rdfa-editor/plugins/notification';
+import {
+  insertMotivation,
+  insertArticleContainer,
+  insertDescription,
+  insertTitle,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands';
+import { CircleXIcon } from '@appuniversum/ember-appuniversum/components/icons/circle-x';
+
+export function insertTitleAtCursor(
+  controller: SayController,
+  intl: IntlService,
+) {
+  const decisionNodeLocation = getDecisionNodeLocation(controller);
+  if (!decisionNodeLocation) {
+    return sendNotificationError(
+      controller,
+      intl.t('document-validation-plugin.decision-node-not-found'),
+    );
+  }
+  controller.doCommand(
+    insertTitle({
+      placeholderText: intl.t('besluit-plugin.placeholder.decision-title'),
+      decisionLocation: decisionNodeLocation,
+    }),
+    { view: controller.mainEditorView },
+  );
+  controller.focus();
+}
+
+export function insertDescriptionAtCursor(
+  controller: SayController,
+  intl: IntlService,
+) {
+  const decisionNodeLocation = getDecisionNodeLocation(controller);
+  if (!decisionNodeLocation) {
+    return sendNotificationError(
+      controller,
+      intl.t('document-validation-plugin.decision-node-not-found'),
+    );
+  }
+  controller.doCommand(
+    insertDescription({
+      placeholderText: intl.t(
+        'besluit-plugin.placeholder.decision-description',
+      ),
+      decisionLocation: decisionNodeLocation,
+    }),
+    {
+      view: controller.mainEditorView,
+    },
+  );
+  controller.focus();
+}
+
+export function insertMotivationAtCursor(
+  controller: SayController,
+  intl: IntlService,
+) {
+  const decisionNodeLocation = getDecisionNodeLocation(controller);
+  if (!decisionNodeLocation) {
+    return sendNotificationError(
+      controller,
+      intl.t('document-validation-plugin.decision-node-not-found'),
+    );
+  }
+  controller.doCommand(
+    insertMotivation({
+      intl: intl,
+      decisionLocation: decisionNodeLocation,
+    }),
+    {
+      view: controller.mainEditorView,
+    },
+  );
+  controller.focus();
+}
+
+export function insertArticleContainerAtCursor(
+  controller: SayController,
+  intl: IntlService,
+  articleUriGenerator?: () => string,
+) {
+  const decisionNodeLocation = getDecisionNodeLocation(controller);
+  if (!decisionNodeLocation) {
+    return sendNotificationError(
+      controller,
+      intl.t('document-validation-plugin.decision-node-not-found'),
+    );
+  }
+  controller.doCommand(
+    insertArticleContainer({
+      intl: intl,
+      decisionUri: decisionNodeLocation?.node.attrs.subject,
+      articleUriGenerator: articleUriGenerator,
+      decisionLocation: decisionNodeLocation,
+    }),
+    {
+      view: controller.mainEditorView,
+    },
+  );
+}
+
+function sendNotificationError(controller: SayController, text: string) {
+  // Show a notification via the notification plugin
+  const { notificationCallback } = notificationPluginKey.getState(
+    controller.mainEditorState,
+  ) as {
+    notificationCallback: (notification: Notification) => void;
+    intl: IntlService;
+  };
+  notificationCallback({
+    title: text,
+    options: {
+      type: 'error',
+      icon: CircleXIcon,
+    },
+  });
+}

package/addon/plugins/document-validation-plugin/index.ts

@@ -2,14 +2,17 @@ import factory from '@rdfjs/dataset';
 import SHACLValidator from 'rdf-validate-shacl';
 import { Parser as ParserN3 } from 'n3';
 import { RdfaParser } from 'rdfa-streaming-parser';
-import { ProsePlugin, PluginKey, EditorView } from '@lblod/ember-rdfa-editor';
+import {
+  ProsePlugin,
+  PluginKey,
+  EditorView,
+  SayController,
+} from '@lblod/ember-rdfa-editor';
 import removeQuotes from '@lblod/ember-rdfa-editor-lblod-plugins/utils/remove-quotes';
 import {
-  BlankNode,
   DataFactory,
   DatasetCore,
   DatasetCoreFactory,
-  NamedNode,
   Quad,
 } from '@rdfjs/types';
 import ValidationReport from 'rdf-validate-shacl/src/validation-report';
@@ -18,8 +21,34 @@ import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 export const documentValidationPluginKey =
   new PluginKey<DocumentValidationPluginState>('DOCUMENT_VALIDATION');
 
-interface DocumentValidationPluginArgs {
+type Violation =
+  | {
+      action: (controller: SayController, report: ValidationReport) => void;
+      buttonTitle: string;
+    }
+  | {
+      helpText: string;
+    };
+type Rule =
+  | {
+      shaclRule: string;
+      violations: {
+        [key: string]: Violation;
+      };
+    }
+  | {
+      shaclRule: string;
+      action: (controller: SayController, report: ValidationReport) => void;
+      buttonTitle: string;
+    }
+  | {
+      shaclRule: string;
+      helpText: string;
+    };
+
+export interface DocumentValidationPluginArgs {
   documentShape: string;
+  rules: Rule[];
 }
 
 export type ShaclValidationReport = ValidationReport.ValidationReport<
@@ -27,17 +56,16 @@ export type ShaclValidationReport = ValidationReport.ValidationReport<
     DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>
 >;
 
+type PropertyWithError = {
+  message: string;
+  subject: string | undefined;
+  shape: string;
+  constraint: string;
+};
 interface DocumentValidationResult {
   report?: ValidationReport;
   propertiesWithoutErrors: { message: string }[];
-  propertiesWithErrors: (
-    | {
-        message: string;
-        subject: string | undefined;
-      }
-    // TODO get rid of this?
-    | undefined
-  )[];
+  propertiesWithErrors: PropertyWithError[];
 }
 export interface DocumentValidationTransactionMeta
   extends DocumentValidationResult {
@@ -47,6 +75,7 @@ export interface DocumentValidationPluginState
   extends DocumentValidationResult {
   documentShape: string;
   validationCallback: typeof validationCallback;
+  rules: Rule[];
 }
 
 export const documentValidationPlugin = (
@@ -61,6 +90,7 @@ export const documentValidationPlugin = (
           documentShape: options.documentShape,
           propertiesWithoutErrors: [],
           propertiesWithErrors: [],
+          rules: options.rules,
         };
       },
       apply(tr, state) {
@@ -107,31 +137,30 @@ async function validationCallback(view: EditorView, documentHtml: string) {
     ...shacl.match(undefined, propertyPred, undefined),
   ].map((quad: Quad) => quad.object);
 
-  const propertiesWithErrors: {
-    sourceShape: BlankNode | NamedNode<string>;
-    focusNode: BlankNode | NamedNode<string> | null;
-  }[] = [];
-  for (const r of report.results) {
-    const sourceShape = r.sourceShape;
-    if (sourceShape)
-      propertiesWithErrors.push({ sourceShape, focusNode: r.focusNode });
-  }
   const errorMessagePred = sayFactory.namedNode(
     'http://www.w3.org/ns/shacl#resultMessage',
   );
-  const propertiesWithErrorsMessages = propertiesWithErrors
-    .map(({ sourceShape, focusNode }) => {
+  const propertiesWithErrors: PropertyWithError[] = [];
+  for (const r of report.results) {
+    const sourceShape = r.sourceShape;
+    if (sourceShape) {
       const match = shacl.match(sourceShape, errorMessagePred, undefined);
       const message = [...match][0]?.object.value;
-      return message
-        ? { message: removeQuotes(message), subject: focusNode?.value }
-        : undefined;
-    })
-    .filter((message) => message);
+      if (message) {
+        propertiesWithErrors.push({
+          message: removeQuotes(message),
+          subject: r.focusNode?.value,
+          shape: sourceShape.value,
+          constraint: r.sourceConstraintComponent?.value as string,
+        });
+      }
+    }
+  }
+
   const propertiesWithoutErrorsArray = propertyNodes.filter((propertyNode) =>
-    propertiesWithErrors.some((propertyWithError) => {
-      return propertyWithError.sourceShape.value !== propertyNode.value;
-    }),
+    propertiesWithErrors.every(
+      (propertyWithError) => propertyWithError.shape !== propertyNode.value,
+    ),
   );
 
   const successMessagePred = sayFactory.namedNode(
@@ -149,7 +178,7 @@ async function validationCallback(view: EditorView, documentHtml: string) {
     type: 'setNewReport',
     report,
     propertiesWithoutErrors,
-    propertiesWithErrors: propertiesWithErrorsMessages,
+    propertiesWithErrors: propertiesWithErrors,
   });
   transaction.setMeta('addToHistory', false);
   view.dispatch(transaction);

package/addon/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept.ts

@@ -92,8 +92,15 @@ async function _queryMobilityMeasures<Count extends boolean>(
     : /* sparql */ `SELECT DISTINCT ?uri ?label ?preview ?zonality ?variableSignage`;
 
   const filterStatement = _buildFilters(options).join('\n');
+  const orderBindings = !count
+    ? `
+      BIND(REPLACE(?label, "^(\\\\D+).*", "$1", "i") AS ?firstLetters)
+      BIND(xsd:decimal(REPLACE(?label, "^\\\\D+(\\\\d*\\\\.?\\\\d*).*", "$1", "i")) AS ?number)
+      BIND(REPLACE(?label, "^\\\\D+\\\\d*\\\\.?\\\\d*(.*)", "$1", "i") AS ?secondLetters)
+    `
+    : '';
   const orderByStatement = !count
-    ? /* sparql */ `ORDER BY ASC(strlen(str(?label))) ASC(?label)`
+    ? /* sparql */ `ORDER BY ASC(UCASE(?firstLetters)) ASC(?number) ASC(LCASE(?secondLetters))`
     : '';
   const paginationStatement = !count
     ? /* sparql */ `LIMIT ${pageSize} OFFSET ${page * pageSize}`
@@ -126,6 +133,7 @@ async function _queryMobilityMeasures<Count extends boolean>(
         ?signUri dct:type ?signClassification.
       }
       ${filterStatement}
+      ${orderBindings}
     }
     ${orderByStatement}
     ${paginationStatement}

package/addon/{plugins/besluit-topic-plugin/utils/helpers.ts → utils/decision-utils.ts}

@@ -7,6 +7,16 @@ import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugi
 import { ElementPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
 import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
 
+export function getDecisionNodeLocation(controller: SayController) {
+  const besluitRange = getCurrentBesluitRange(controller);
+  if (!besluitRange) return;
+  const decisionNodeLocation = {
+    pos: besluitRange.from,
+    node: besluitRange.node,
+  };
+  return decisionNodeLocation;
+}
+
 export const getCurrentBesluitRange = (
   controllerOrState: SayController | EditorState,
 ): ElementPNode | undefined => {
@@ -15,15 +25,29 @@ export const getCurrentBesluitRange = (
       ? controllerOrState.mainEditorState
       : controllerOrState;
   const selection = state.selection;
-
-  const besluit =
-    findAncestors(selection.$from, (node: PNode) => {
-      return hasOutgoingNamedNodeTriple(
-        node.attrs,
-        RDF('type'),
-        BESLUIT('Besluit'),
-      );
-    })[0] ?? null;
+  let besluit;
+  if (
+    selection.$from.nodeAfter &&
+    hasOutgoingNamedNodeTriple(
+      selection.$from.nodeAfter.attrs,
+      RDF('type'),
+      BESLUIT('Besluit'),
+    )
+  ) {
+    besluit = {
+      node: selection.$from.nodeAfter,
+      pos: selection.$from.pos,
+    };
+  } else {
+    besluit =
+      findAncestors(selection.$from, (node: PNode) => {
+        return hasOutgoingNamedNodeTriple(
+          node.attrs,
+          RDF('type'),
+          BESLUIT('Besluit'),
+        );
+      })[0] ?? null;
+  }
   if (!besluit) {
     return undefined;
   }

package/declarations/addon/components/document-validation-plugin/card.d.ts

@@ -1,5 +1,6 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import ValidationReport from 'rdf-validate-shacl/src/validation-report';
 interface Sig {
     Args: {
         controller: SayController;
@@ -9,14 +10,63 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
     get controller(): SayController;
     get validationState(): import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-validation-plugin").DocumentValidationPluginState | undefined;
     get documentValidationErrors(): ({
+        rule: {
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            helpText: string;
+        };
         message: string;
         subject: string | undefined;
-    } | undefined)[] | undefined;
+        shape: string;
+        constraint: string;
+    } | {
+        rule: {
+            shaclRule: string;
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            shaclRule: string;
+            helpText: string;
+        } | undefined;
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    })[] | undefined;
     get propertiesWithoutErrors(): {
         message: string;
     }[];
     goToSubject: (subject: string) => void;
     get status(): "not-run" | "no-matches" | "valid" | "invalid";
     get isSuccesslike(): boolean;
+    doActionAndTriggerValidation: (action: (controller: SayController, report: ValidationReport) => void) => Promise<void>;
+    oldVal: typeof this.documentValidationErrors;
+    dedupeDocumentValidationErrors: (val: typeof this.documentValidationErrors) => ({
+        rule: {
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            helpText: string;
+        };
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    } | {
+        rule: {
+            shaclRule: string;
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            shaclRule: string;
+            helpText: string;
+        } | undefined;
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    })[] | undefined;
+    compareDocumentValidationErrors: (val1: typeof this.documentValidationErrors, val2: typeof this.documentValidationErrors) => boolean;
 }
 export {};

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

@@ -1,9 +1,11 @@
 import { Command } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
+import { NodeWithPos } from '@curvenote/prosemirror-utils';
 interface InsertArticleContainerArgs {
     intl: IntlService;
     decisionUri: string;
     articleUriGenerator?: () => string;
+    decisionLocation: NodeWithPos;
 }
-export default function insertArticleContainer({ decisionUri, articleUriGenerator, }: InsertArticleContainerArgs): Command;
+export default function insertArticleContainer({ decisionUri, articleUriGenerator, decisionLocation, }: InsertArticleContainerArgs): Command;
 export {};

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

@@ -0,0 +1,6 @@
+import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
+export declare function insertTitleAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertDescriptionAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertMotivationAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertArticleContainerAtCursor(controller: SayController, intl: IntlService, articleUriGenerator?: () => string): void;

package/declarations/addon/plugins/document-validation-plugin/index.d.ts

@@ -1,20 +1,43 @@
-import { ProsePlugin, PluginKey, EditorView } from '@lblod/ember-rdfa-editor';
+import { ProsePlugin, PluginKey, EditorView, SayController } from '@lblod/ember-rdfa-editor';
 import { DataFactory, DatasetCore, DatasetCoreFactory, Quad } from '@rdfjs/types';
 import ValidationReport from 'rdf-validate-shacl/src/validation-report';
 export declare const documentValidationPluginKey: PluginKey<DocumentValidationPluginState>;
-interface DocumentValidationPluginArgs {
+type Violation = {
+    action: (controller: SayController, report: ValidationReport) => void;
+    buttonTitle: string;
+} | {
+    helpText: string;
+};
+type Rule = {
+    shaclRule: string;
+    violations: {
+        [key: string]: Violation;
+    };
+} | {
+    shaclRule: string;
+    action: (controller: SayController, report: ValidationReport) => void;
+    buttonTitle: string;
+} | {
+    shaclRule: string;
+    helpText: string;
+};
+export interface DocumentValidationPluginArgs {
     documentShape: string;
+    rules: Rule[];
 }
 export type ShaclValidationReport = ValidationReport.ValidationReport<DataFactory<Quad, Quad> & DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>>;
+type PropertyWithError = {
+    message: string;
+    subject: string | undefined;
+    shape: string;
+    constraint: string;
+};
 interface DocumentValidationResult {
     report?: ValidationReport;
     propertiesWithoutErrors: {
         message: string;
     }[];
-    propertiesWithErrors: ({
-        message: string;
-        subject: string | undefined;
-    } | undefined)[];
+    propertiesWithErrors: PropertyWithError[];
 }
 export interface DocumentValidationTransactionMeta extends DocumentValidationResult {
     type: string;
@@ -22,6 +45,7 @@ export interface DocumentValidationTransactionMeta extends DocumentValidationRes
 export interface DocumentValidationPluginState extends DocumentValidationResult {
     documentShape: string;
     validationCallback: typeof validationCallback;
+    rules: Rule[];
 }
 export declare const documentValidationPlugin: (options: DocumentValidationPluginArgs) => ProsePlugin<DocumentValidationPluginState>;
 declare function validationCallback(view: EditorView, documentHtml: string): Promise<void>;

package/declarations/addon/{plugins/besluit-topic-plugin/utils/helpers.d.ts → utils/decision-utils.d.ts}

@@ -1,4 +1,8 @@
-import { EditorState, SayController } from '@lblod/ember-rdfa-editor';
+import { EditorState, PNode, SayController } from '@lblod/ember-rdfa-editor';
 import { ElementPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
+export declare function getDecisionNodeLocation(controller: SayController): {
+    pos: number;
+    node: PNode;
+} | undefined;
 export declare const getCurrentBesluitRange: (controllerOrState: SayController | EditorState) => ElementPNode | undefined;
 export declare const getCurrentBesluitURI: (controllerOrState: SayController | EditorState) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "33.0.0",
+  "version": "33.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -75,7 +75,7 @@
     "ember-resources": "^7.0.2",
     "ember-template-imports": "^4.3.0",
     "ember-velcro": "^2.2.0",
-    "@lblod/lib-decision-shapes": "^0.0.22",
+    "@lblod/lib-decision-shapes": "^0.0.25",
     "n2words": "^1.21.0",
     "n3": "^1.26.0",
     "process": "0.11.10",

package/pnpm-lock.yaml

@@ -30,8 +30,8 @@ importers:
         specifier: ^1.16.5
         version: 1.19.2(@glint/template@1.5.1)
       '@lblod/lib-decision-shapes':
-        specifier: ^0.0.22
-        version: 0.0.22(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.14.9)(node-notifier@10.0.1))(typescript@5.7.3)
+        specifier: ^0.0.25
+        version: 0.0.25(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.14.9)(node-notifier@10.0.1))(typescript@5.7.3)
       '@lblod/marawa':
         specifier: 0.8.0-beta.6
         version: 0.8.0-beta.6
@@ -1753,8 +1753,8 @@ packages:
       '@glint/template':
         optional: true
 
-  '@lblod/lib-decision-shapes@0.0.22':
-    resolution: {integrity: sha512-8jNbj26lp75j1fEdx1PvFDZsEpw2a17unrmzYY4rRTfDqGbVnQwYyJLxfhBEudnMzYmjMXN+lDL00p/lavIW/Q==}
+  '@lblod/lib-decision-shapes@0.0.25':
+    resolution: {integrity: sha512-4pTmFBro+RLPtaN4SiWt5EYqZ2bbtDqpo+EYsNEDe1wtiMLg6RhOD4RwQwLQrH3mjbuJCyQd3DF3TaZBDcOiSQ==}
 
   '@lblod/marawa@0.8.0-beta.6':
     resolution: {integrity: sha512-BW3yCpeQlk9EPnQAEQnM9uViA8RC5DkuoiaPJzbuhMcLvKHfI4cjc6dTg9i8qAijbL/xObmQ/Aexko2Xcj9ktw==}
@@ -12152,7 +12152,7 @@ snapshots:
       - socks
       - supports-color
 
-  '@lblod/lib-decision-shapes@0.0.22(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.14.9)(node-notifier@10.0.1))(typescript@5.7.3)':
+  '@lblod/lib-decision-shapes@0.0.25(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.14.9)(node-notifier@10.0.1))(typescript@5.7.3)':
     dependencies:
       ts-jest: 29.3.4(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.14.9)(node-notifier@10.0.1))(typescript@5.7.3)
     optionalDependencies:

package/translations/en-US.yaml

@@ -515,3 +515,4 @@ document-validation-plugin:
   no-matching-rules: There is nothing to validate in the document
   see-related-node: See related node
   description: Some parts are required to allow our system to parse this document.
+  decision-node-not-found: Please put the cursor inside a decision node

package/translations/nl-BE.yaml

@@ -512,3 +512,4 @@ document-validation-plugin:
   no-matching-rules: Er is niets te valideren in dit document
   see-related-node: Zie gerelateerde node
   description: Sommige onderdelen zijn nodig om ons systeem toe te laten dit document te ontleden.
+  decision-node-not-found: Plaats de cursor in een besluit