@lblod/ember-rdfa-editor-lblod-plugins 24.1.2 → 24.2.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 24.2.0
+
+### Minor Changes
+
+- [#489](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/489) [`9a89b99`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9a89b992a2e6520e06720c099bff1dd7f115d9ab) Thanks [@piemonkey](https://github.com/piemonkey)! - Add config to specify an external decision URI when creating decision article structures
+
+- [#489](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/489) [`9a89b99`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9a89b992a2e6520e06720c099bff1dd7f115d9ab) Thanks [@piemonkey](https://github.com/piemonkey)! - Add config to specify an external decision URI in lpdc plugin
+
+- [#489](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/489) [`9a89b99`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9a89b992a2e6520e06720c099bff1dd7f115d9ab) Thanks [@piemonkey](https://github.com/piemonkey)! - Add config to specify an external decision URI and type in roadsign-regulation-plugin
+
 ## 24.1.2
 
 ### Patch Changes

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

@@ -74,22 +74,16 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
 
   @action
   updateBesluitTopic() {
-    const currentBesluitURI = getCurrentBesluitURI(this.controller);
-
-    if (!currentBesluitURI || !this.topics.value) {
+    if (!this.topics.isFinished || !this.decisionRange) {
       return;
     }
-
-    const besluit = this.decisionRange;
-    if (!besluit) {
-      console.warn(
-        `We have a besluit URI (${currentBesluitURI}), but can't find a besluit ancestor`,
-      );
+    if (!this.topics.value) {
+      console.warn('Request for besluit topics failed');
       return;
     }
 
     const outgoingBesluitTopics = getOutgoingTripleList(
-      besluit.node.attrs,
+      this.decisionRange.node.attrs,
       ELI(ELI_SUBJECT),
     );
 
@@ -120,13 +114,7 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
   upsertBesluitTopic(selected: BesluitTopic[]) {
     this.besluitTopicsSelected = selected;
 
-    const currentBesluitRange = getCurrentBesluitRange(this.controller);
-
-    const resource =
-      (currentBesluitRange &&
-        'node' in currentBesluitRange &&
-        (currentBesluitRange.node.attrs.subject as string)) ||
-      undefined;
+    const resource = getCurrentBesluitURI(this.controller);
 
     if (this.besluitTopicsSelected && resource) {
       this.controller.doCommand(

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

@@ -8,7 +8,6 @@ import fetchBesluitTypes, {
   BesluitType,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 import { trackedFunction } from 'reactiveweb/function';
-import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { BesluitTypePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin';
 import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { getOutgoingTripleList } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
@@ -16,7 +15,10 @@ import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/i
 import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross';
 import { MailIcon } from '@appuniversum/ember-appuniversum/components/icons/mail';
 import { CircleXIcon } from '@appuniversum/ember-appuniversum/components/icons/circle-x';
-import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import {
+  getCurrentBesluitRange,
+  getCurrentBesluitURI,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
 
 type Args = {
   controller: SayController;
@@ -69,11 +71,7 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
   }
 
   get currentBesluitURI() {
-    if (this.currentBesluitRange) {
-      const node = unwrap(this.doc.nodeAt(this.currentBesluitRange.from));
-      return node.attrs['subject'] as string | undefined;
-    }
-    return;
+    return getCurrentBesluitURI(this.controller);
   }
 
   get showCard() {
@@ -82,16 +80,14 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
 
   @action
   updateBesluitTypes() {
-    if (!this.currentBesluitURI || !this.types.value) {
+    if (!this.types.isFinished || !this.currentBesluitRange) {
       return;
     }
-    const besluit = this.currentBesluitRange;
-    if (!besluit) {
-      console.warn(
-        `We have a besluit URI (${this.currentBesluitURI}), but can't find a besluit ancestor`,
-      );
+    if (!this.types.value) {
+      console.warn('Request for besluit types failed');
       return;
     }
+    const besluit = this.currentBesluitRange;
     const besluitTypes = getOutgoingTripleList(besluit.node.attrs, RDF('type'));
     const besluitTypeRelevant = besluitTypes.find(
       (type) =>
@@ -192,11 +188,7 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
   }
 
   insert() {
-    const resource =
-      (this.currentBesluitRange &&
-        'node' in this.currentBesluitRange &&
-        (this.currentBesluitRange.node.attrs.subject as string)) ||
-      undefined;
+    const resource = this.currentBesluitURI;
     if (this.besluitType && resource) {
       this.cardExpanded = false;
       if (this.previousBesluitType) {

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

@@ -6,20 +6,15 @@ import {
   insertDescription,
   insertTitle,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands';
-import type { PNode, SayController, Selection } from '@lblod/ember-rdfa-editor';
+import type { SayController, Selection } from '@lblod/ember-rdfa-editor';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
-import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
-import {
-  getOutgoingTriple,
-  hasOutgoingNamedNodeTriple,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import {
   BESLUIT,
   ELI,
   PROV,
-  RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { NodeWithPos } from '@curvenote/prosemirror-utils';
 import AuAlert from '@appuniversum/ember-appuniversum/components/au-alert';
@@ -28,6 +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';
 
 interface DecisionCardOptions {
   articleUriGenerator?: () => string;
@@ -50,15 +46,13 @@ export default class DecisionPluginCard extends Component<Sig> {
   }
 
   get decisionNodeLocation(): NodeWithPos | null {
-    return (
-      findAncestors(this.selection.$from, (node: PNode) => {
-        return hasOutgoingNamedNodeTriple(
-          node.attrs,
-          RDF('type'),
-          BESLUIT('Besluit'),
-        );
-      })[0] ?? null
-    );
+    const besluitRange = getCurrentBesluitRange(this.controller);
+    return besluitRange
+      ? {
+          pos: besluitRange.from,
+          node: besluitRange.node,
+        }
+      : null;
   }
 
   @action

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

@@ -10,12 +10,12 @@ import { buildArticleStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/pl
 import { not } from 'ember-truth-helpers';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
-import { recalculateNumbers } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/recalculate-structure-numbers';
-import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 
 export interface InsertArticleOptions {
   uriGenerator?: () => string;
   insertFreely?: boolean;
+  /** Pass a decision URI instead of finding one in the document. Implies `insertFreely`. */
+  decisionUri?: string;
 }
 interface Sig {
   Args: {
@@ -53,18 +53,18 @@ export default class InsertArticleComponent extends Component<Sig> {
       : null;
   }
 
+  get canInsertFreely() {
+    return this.options?.insertFreely || this.options?.decisionUri;
+  }
+
   get canInsert() {
-    if (this.options?.insertFreely) {
-      return this.canInsertFreely;
+    if (this.canInsertFreely) {
+      return true;
     } else {
       return this.canInsertInDecision;
     }
   }
 
-  get canInsertFreely() {
-    return true;
-  }
-
   get canInsertInDecision() {
     if (!this.decisionLocation) {
       return false;
@@ -83,8 +83,9 @@ export default class InsertArticleComponent extends Component<Sig> {
     const structureNode = buildArticleStructure(
       this.schema,
       this.args.options?.uriGenerator,
+      this.args.options?.decisionUri,
     );
-    if (this.args.options?.insertFreely) {
+    if (this.canInsertFreely) {
       this.insertFreely(structureNode);
     } else {
       this.insertInDecision(structureNode);
@@ -93,12 +94,12 @@ export default class InsertArticleComponent extends Component<Sig> {
 
   @action
   insertFreely(node: PNode) {
-    this.controller.withTransaction((tr) => {
-      return transactionCombinator(
-        this.controller.activeEditorState,
-        tr.replaceSelectionWith(node),
-      )([recalculateNumbers]).transaction;
-    });
+    this.controller.doCommand(
+      insertArticle({
+        node,
+        insertFreely: true,
+      }),
+    );
     this.controller.focus();
   }
 

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 { getCurrentBesluitRange } from '../../plugins/besluit-topic-plugin/utils/helpers';
+import { getCurrentBesluitURI } from '../../plugins/besluit-topic-plugin/utils/helpers';
 import { SRO } from '../../utils/constants';
 
 interface Args {
@@ -39,21 +39,19 @@ export default class LpdcPluginsInsertComponent extends Component<Args> {
     this.showModal = false;
   }
 
+  get decisionUri() {
+    return (
+      this.args.config?.decisionUri ?? getCurrentBesluitURI(this.controller)
+    );
+  }
+
   get isButtonDisabled() {
-    return !getCurrentBesluitRange(this.controller);
+    return !this.decisionUri;
   }
 
   @action
   onLpdcInsert(lpdc: LPDC) {
-    const currentBesluitRange = getCurrentBesluitRange(this.controller);
-
-    const resource =
-      (currentBesluitRange &&
-        'node' in currentBesluitRange &&
-        (currentBesluitRange.node.attrs.subject as string)) ||
-      undefined;
-
-    if (!resource) {
+    if (!this.decisionUri) {
       throw new Error('No besluit found in selection');
     }
 
@@ -80,7 +78,7 @@ export default class LpdcPluginsInsertComponent extends Component<Args> {
 
     this.controller.doCommand(
       addProperty({
-        resource,
+        resource: this.decisionUri,
         property: {
           predicate: SRO('bekrachtigt').full,
           object: sayDataFactory.resourceNode(uri),

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

@@ -6,6 +6,7 @@ import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 
 /**
  * Card displaying a hint of the Date plugin
@@ -26,6 +27,7 @@ const acceptedTypes = [
 
 type Args = {
   controller: SayController;
+  options: RoadsignRegulationPluginOptions;
 };
 
 export default class RoadsignRegulationCard extends Component<Args> {
@@ -53,21 +55,28 @@ export default class RoadsignRegulationCard extends Component<Args> {
   }
 
   get showCard() {
-    const decisionRange = getCurrentBesluitRange(this.controller);
-    if (!decisionRange) {
-      return false;
+    const decisionContext = this.args.options.decisionContext;
+    let decisionTypes = [];
+    if (decisionContext && decisionContext.decisionType) {
+      decisionTypes = [decisionContext.decisionType];
+    } else {
+      const decisionRange = getCurrentBesluitRange(this.controller);
+      if (!decisionRange) {
+        return false;
+      }
+      const decisionNode = decisionRange.node;
+      const properties: OutgoingTriple[] = decisionNode.attrs.properties;
+      decisionTypes = properties
+        .filter(
+          ({ predicate, object }) =>
+            RDF('type').matches(predicate) && object.termType === 'NamedNode',
+        )
+        .map((property) => property.object.value);
     }
-    const decisionNode = decisionRange.node;
-    const properties: OutgoingTriple[] = decisionNode.attrs.properties;
 
-    const decisionHasAcceptedType = properties.some((property) => {
-      const { predicate, object } = property;
-      return (
-        RDF('type').matches(predicate) &&
-        object.termType === 'NamedNode' &&
-        acceptedTypes.includes(object.value)
-      );
-    });
+    const decisionHasAcceptedType = decisionTypes.some((type) =>
+      acceptedTypes.includes(type),
+    );
     return decisionHasAcceptedType;
   }
 }

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

@@ -47,7 +47,7 @@ type Args = {
   options: RoadsignRegulationPluginOptions;
 };
 
-export default class RoadsignRegulationCard extends Component<Args> {
+export default class RoadsignsModal extends Component<Args> {
   endpoint: string;
   imageBaseUrl: string;
 
@@ -99,12 +99,10 @@ export default class RoadsignRegulationCard extends Component<Args> {
   get controller() {
     return this.args.controller;
   }
-  get decisionRange() {
-    return getCurrentBesluitRange(this.controller);
-  }
   get decisionLocation() {
-    return this.decisionRange
-      ? { node: this.decisionRange.node, pos: this.decisionRange.from }
+    const decisionRange = getCurrentBesluitRange(this.controller);
+    return decisionRange
+      ? { node: decisionRange.node, pos: decisionRange.from }
       : null;
   }
 
@@ -320,9 +318,11 @@ export default class RoadsignRegulationCard extends Component<Args> {
                           `;
     const domParser = new DOMParser();
     const htmlNode = domParser.parseFromString(regulationHTML, 'text/html');
+    const passedDecisionUri = this.args.options.decisionContext?.decisionUri;
     const article = buildArticleStructure(
       this.controller.activeEditorState.schema,
       this.args.options.articleUriGenrator,
+      this.args.options.decisionContext?.decisionUri,
     );
     const contentFragment = ProseParser.fromSchema(
       this.args.controller.schema,
@@ -331,13 +331,12 @@ export default class RoadsignRegulationCard extends Component<Args> {
     }).content;
     const nodeToInsert = article.copy(contentFragment);
 
-    this.args.controller.doCommand(
-      insertArticle({
-        node: nodeToInsert,
-        decisionLocation: unwrap(this.decisionLocation),
-      }),
-      { view: this.args.controller.mainEditorView },
-    );
+    const insertArgs: Parameters<typeof insertArticle>[0] = passedDecisionUri
+      ? { node: nodeToInsert, insertFreely: true }
+      : { node: nodeToInsert, decisionLocation: unwrap(this.decisionLocation) };
+    this.args.controller.doCommand(insertArticle(insertArgs), {
+      view: this.args.controller.mainEditorView,
+    });
     this.args.closeModal();
   }
 

package/addon/plugins/besluit-topic-plugin/utils/helpers.ts

@@ -4,7 +4,6 @@ import {
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { ElementPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
 import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
 
@@ -36,13 +35,13 @@ export const getCurrentBesluitRange = (
   };
 };
 
-export const getCurrentBesluitURI = (controller: SayController) => {
-  const currentBesluitRange = getCurrentBesluitRange(controller);
-  const doc = controller.mainEditorState.doc;
+export const getCurrentBesluitURI = (
+  controllerOrState: SayController | EditorState,
+) => {
+  const currentBesluitRange = getCurrentBesluitRange(controllerOrState);
 
   if (currentBesluitRange) {
-    const node = unwrap(doc.nodeAt(currentBesluitRange.from));
-    return node.attrs['subject'] as string | undefined;
+    return currentBesluitRange.node.attrs['subject'] as string | undefined;
   }
 
   return;

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

@@ -19,19 +19,46 @@ import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import { recalculateNumbers } from '../../structure-plugin/recalculate-structure-numbers';
 import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 
-interface InsertArticleArgs {
+interface InsertArticleToDecisionArgs {
   node: PNode;
-  decisionLocation: NodeWithPos;
+  decisionLocation: NodeWithPos | null;
+  insertFreely?: false;
 }
+interface InsertArticleFreelyArgs {
+  node: PNode;
+  insertFreely: true;
+}
+
 export default function insertArticle({
   node,
-  decisionLocation,
-}: InsertArticleArgs): Command {
+  ...args
+}: InsertArticleToDecisionArgs | InsertArticleFreelyArgs): Command {
   return function (
     state: EditorState,
     dispatch?: (tr: Transaction) => void,
   ): boolean {
-    const decision = decisionLocation;
+    if ('insertFreely' in args) {
+      const tr = state.tr;
+      const { result, transaction } = transactionCombinator(
+        state,
+        tr.replaceSelectionWith(node),
+      )([recalculateNumbers]);
+
+      transaction.scrollIntoView();
+      if (result.every((ok) => ok)) {
+        if (dispatch) {
+          dispatch(transaction);
+        }
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    const decision = args.decisionLocation;
+    if (!decision) {
+      return false;
+    }
     const decisionResource = decision.node.attrs.subject;
     const container = getOutgoingTriple(decision.node.attrs, PROV('value'));
     if (container) {

package/addon/plugins/decision-plugin/utils/build-article-structure.ts

@@ -1,6 +1,7 @@
 import { Schema } from '@lblod/ember-rdfa-editor';
 import {
   BESLUIT,
+  ELI,
   PROV,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -11,6 +12,13 @@ import { v4 as uuid } from 'uuid';
 export function buildArticleStructure(
   schema: Schema,
   uriGenerator?: () => string,
+  /**
+   * Adds a backlink to this resource instead of relying on being linked to the decision after
+   * creation.
+   * Adding backlinks like this does not play nice with the RDFa tools, but if combined with a
+   * document with this URI imported it works as expected. It creates valid RDFa in either case.
+   */
+  decisionUri?: string,
 ) {
   let articleResource: string;
   if (uriGenerator) {
@@ -34,6 +42,14 @@ export function buildArticleStructure(
           object: factory.contentLiteral(),
         },
       ] satisfies OutgoingTriple[],
+      backlinks: !decisionUri
+        ? undefined
+        : [
+            {
+              subject: factory.resourceNode(decisionUri),
+              predicate: ELI('has_part'),
+            },
+          ],
       hasTitle: false,
       structureType: 'article',
       displayStructureName: true,

package/addon/plugins/lpdc-plugin/api.ts

@@ -81,6 +81,12 @@ export const fetchLpdcs = async ({
     },
   });
 
+  if (!results.ok) {
+    throw new Error(
+      `Received '${results.status}: ${results.statusText}' when fetching from LPDC`,
+    );
+  }
+
   const resultJson = (await results.json()) as FetchResults;
 
   return {

package/addon/plugins/lpdc-plugin/types.ts

@@ -1,5 +1,7 @@
 export type LpdcPluginConfig = {
   endpoint: string;
+  /** Decision URI to use for RDFa links to avoid needing to look for one in the document */
+  decisionUri?: string;
 };
 
 export type LPDC = { uri: string; name: string };

package/addon/plugins/roadsign-regulation-plugin/index.ts

@@ -2,4 +2,9 @@ export type RoadsignRegulationPluginOptions = {
   endpoint: string;
   imageBaseUrl: string;
   articleUriGenrator?: () => string;
+  /** Instead of finding a decision node in the document, pass the relevant URI and type */
+  decisionContext?: {
+    decisionUri: string;
+    decisionType?: string;
+  };
 };

package/addon/utils/translation.ts

@@ -33,7 +33,6 @@ export const getIntlService = (state: EditorState) => {
   const intl = emberApplicationPluginKey
     .getState(state)
     ?.application.lookup('service:intl');
-  console.log(emberApplicationPluginKey.getState(state));
   return intl;
 };
 /**

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

@@ -4,6 +4,8 @@ import IntlService from 'ember-intl/services/intl';
 export interface InsertArticleOptions {
     uriGenerator?: () => string;
     insertFreely?: boolean;
+    /** Pass a decision URI instead of finding one in the document. Implies `insertFreely`. */
+    decisionUri?: string;
 }
 interface Sig {
     Args: {
@@ -23,8 +25,8 @@ export default class InsertArticleComponent extends Component<Sig> {
         pos: number;
         node: PNode;
     } | null;
+    get canInsertFreely(): string | true | undefined;
     get canInsert(): boolean;
-    get canInsertFreely(): boolean;
     get canInsertInDecision(): boolean;
     doInsert(): void;
     insertFreely(node: PNode): void;

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

@@ -11,6 +11,7 @@ export default class LpdcPluginsInsertComponent extends Component<Args> {
     get controller(): SayController;
     openModal(): void;
     closeModal(): void;
+    get decisionUri(): string | undefined;
     get isButtonDisabled(): boolean;
     onLpdcInsert(lpdc: LPDC): void;
 }

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

@@ -1,7 +1,9 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 type Args = {
     controller: SayController;
+    options: RoadsignRegulationPluginOptions;
 };
 export default class RoadsignRegulationCard extends Component<Args> {
     AddIcon: TOC<import("@appuniversum/ember-appuniversum/components/icons/add").AddIconSignature>;

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

@@ -17,7 +17,7 @@ type Args = {
     controller: SayController;
     options: RoadsignRegulationPluginOptions;
 };
-export default class RoadsignRegulationCard extends Component<Args> {
+export default class RoadsignsModal extends Component<Args> {
     endpoint: string;
     imageBaseUrl: string;
     pageSize: number;
@@ -38,7 +38,6 @@ export default class RoadsignRegulationCard extends Component<Args> {
     constructor(parent: unknown, args: Args);
     get schema(): import("prosemirror-model").Schema<any, any>;
     get controller(): SayController;
-    get decisionRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
     get decisionLocation(): {
         node: import("prosemirror-model").Node;
         pos: number;

package/declarations/addon/plugins/besluit-topic-plugin/utils/helpers.d.ts

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

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

@@ -1,8 +1,13 @@
 import { NodeWithPos } from '@curvenote/prosemirror-utils';
 import { Command, PNode } from '@lblod/ember-rdfa-editor';
-interface InsertArticleArgs {
+interface InsertArticleToDecisionArgs {
     node: PNode;
-    decisionLocation: NodeWithPos;
+    decisionLocation: NodeWithPos | null;
+    insertFreely?: false;
 }
-export default function insertArticle({ node, decisionLocation, }: InsertArticleArgs): Command;
+interface InsertArticleFreelyArgs {
+    node: PNode;
+    insertFreely: true;
+}
+export default function insertArticle({ node, ...args }: InsertArticleToDecisionArgs | InsertArticleFreelyArgs): Command;
 export {};

package/declarations/addon/plugins/decision-plugin/utils/build-article-structure.d.ts

@@ -1,2 +1,9 @@
 import { Schema } from '@lblod/ember-rdfa-editor';
-export declare function buildArticleStructure(schema: Schema, uriGenerator?: () => string): import("prosemirror-model").Node;
+export declare function buildArticleStructure(schema: Schema, uriGenerator?: () => string, 
+/**
+ * Adds a backlink to this resource instead of relying on being linked to the decision after
+ * creation.
+ * Adding backlinks like this does not play nice with the RDFa tools, but if combined with a
+ * document with this URI imported it works as expected. It creates valid RDFa in either case.
+ */
+decisionUri?: string): import("prosemirror-model").Node;

package/declarations/addon/plugins/lpdc-plugin/types.d.ts

@@ -1,5 +1,7 @@
 export type LpdcPluginConfig = {
     endpoint: string;
+    /** Decision URI to use for RDFa links to avoid needing to look for one in the document */
+    decisionUri?: string;
 };
 export type LPDC = {
     uri: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/index.d.ts

@@ -2,4 +2,9 @@ export type RoadsignRegulationPluginOptions = {
     endpoint: string;
     imageBaseUrl: string;
     articleUriGenrator?: () => string;
+    /** Instead of finding a decision node in the document, pass the relevant URI and type */
+    decisionContext?: {
+        decisionUri: string;
+        decisionType?: string;
+    };
 };

package/package.json

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