@lblod/ember-rdfa-editor-lblod-plugins 1.0.0-alpha.1 → 1.0.0-alpha.3

package/CHANGELOG.md

@@ -8,6 +8,36 @@
 
 
 
+
+
+## 1.0.0-alpha.3 (2023-01-09)
+
+#### :house: Internal
+* [#42](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/42) Remove redundant context from article-structure plugin ([@elpoelma](https://github.com/elpoelma))
+
+#### Committers: 1
+- Elena Poelman ([@elpoelma](https://github.com/elpoelma))
+
+## 1.0.0-alpha.2 (2023-01-03)
+
+#### :boom: Breaking Change
+* [#38](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/38) Folder restructure ([@elpoelma](https://github.com/elpoelma))
+
+#### :rocket: Enhancement
+* [#40](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/40) Major rework of article-structure plugin ([@elpoelma](https://github.com/elpoelma))
+* [#39](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/39) Remove paragraphs from toc ([@lagartoverde](https://github.com/lagartoverde))
+
+#### :bug: Bug Fix
+* [#37](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/37) Fix besluit plugin numbering ([@elpoelma](https://github.com/elpoelma))
+
+#### :house: Internal
+* [#41](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/41) Update editor to 1.0.0-alpha.13 ([@elpoelma](https://github.com/elpoelma))
+* [#38](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/38) Folder restructure ([@elpoelma](https://github.com/elpoelma))
+
+#### Committers: 2
+- Elena Poelman ([@elpoelma](https://github.com/elpoelma))
+- Oscar Rodriguez Villalobos ([@lagartoverde](https://github.com/lagartoverde))
+
 ## 1.0.0-alpha.1 (2022-12-22)
 
 #### :rocket: Enhancement

package/addon/components/article-structure-plugin/article-structure-card.hbs

@@ -1,14 +1,10 @@
 <div>
-{{#each this.structures.value as |structure|}}
+  {{#each this.structureTypes as |structureType|}}
   <AuList::Item>
-    <AuButton
-      @icon="add"
-      @iconAlignment="left"
-      @skin="link"
-      @disabled={{not structure.canExecute}}
-      {{on 'click' (fn this.insertStructure structure.title)}}>
-      {{t structure.translation}}
+    <AuButton @icon="add" @iconAlignment="left" @skin="link" @disabled={{not (this.canInsertStructure structureType)}}
+      {{on 'click' (fn this.insertStructure structureType)}}>
+      {{t structureType.translations.insert}}
     </AuButton>
   </AuList::Item>
-{{/each}}
+  {{/each}}
 </div>

package/addon/components/article-structure-plugin/article-structure-card.ts

@@ -1,83 +1,33 @@
 import Component from '@glimmer/component';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { ProseController } from '@lblod/ember-rdfa-editor';
-import { insertArticleStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/commands/article-structure-plugin';
 import IntlService from 'ember-intl/services/intl';
-import { trackedFunction } from 'ember-resources/util/function';
-import validateDatastore from '@lblod/ember-rdfa-editor-lblod-plugins/utils/article-structure-plugin/validate-datastore';
-import { ResolvedArticleStructurePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin';
+import {
+  ArticleStructurePluginOptions,
+  StructureSpec,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin';
+import { action } from '@ember/object';
+import { insertStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/commands';
 
 type Args = {
   controller: ProseController;
   widgetArgs: {
-    options: ResolvedArticleStructurePluginOptions;
+    options: ArticleStructurePluginOptions;
   };
 };
 export default class EditorPluginsArticleStructureCardComponent extends Component<Args> {
   @service declare intl: IntlService;
 
-  structures = trackedFunction(this, async () => {
-    return Promise.all(
-      this.args.widgetArgs.options.structures.map(async (structure) => {
-        const shaclReport = await validateDatastore(
-          this.args.controller.datastore,
-          structure.shaclConstraint
-        );
-        const canExecute = this.args.controller.checkCommand(
-          insertArticleStructure(
-            this.args.controller,
-            structure.title,
-            this.args.widgetArgs.options,
-            shaclReport,
-            this.intl
-          )
-        );
-        return {
-          ...structure,
-          canExecute,
-        };
-      })
-    );
-  });
-
-  @action
-  async insertStructure(structureName: string) {
-    const structureToAdd = this.args.widgetArgs.options.structures.find(
-      (structure) => structure.title === structureName
-    );
-    if (structureToAdd) {
-      const shaclReport = await validateDatastore(
-        this.args.controller.datastore,
-        structureToAdd.shaclConstraint
-      );
-      this.args.controller.doCommand(
-        insertArticleStructure(
-          this.args.controller,
-          structureName,
-          this.args.widgetArgs.options,
-          shaclReport,
-          this.intl
-        )
-      );
-    }
+  get structureTypes() {
+    return this.args.widgetArgs.options;
   }
 
-  get structureUri() {
-    const currentSelection = this.args.controller.state.selection;
-    const limitedDatastore = this.args.controller.datastore.limitToRange(
-      this.args.controller.state,
-      currentSelection.from,
-      currentSelection.to
-    );
-
-    return limitedDatastore
-      .match(null, 'a', '>https://say.data.gift/ns/DocumentSubdivision')
-      .asQuadResultSet()
-      .first()?.subject.value;
+  @action
+  insertStructure(spec: StructureSpec) {
+    this.args.controller.doCommand(insertStructure(spec, this.intl));
+    this.args.controller.focus();
   }
 
-  get isOutsideStructure() {
-    return !this.structureUri;
-  }
+  canInsertStructure = (spec: StructureSpec) =>
+    this.args.controller.checkCommand(insertStructure(spec, this.intl));
 }

package/addon/components/article-structure-plugin/structure-card.hbs

@@ -10,9 +10,9 @@
             @icon="chevron-up"
             @iconAlignment="left"
             @skin="link"
-            @disabled={{not this.canMoveUp.value}}
-            {{on 'click' (fn this.moveStructure true)}}>
-            {{t this.structureTypeSelected.moveUp}}
+            @disabled={{not this.canMoveUp}}
+            {{on 'click' (fn this.moveStructure 'up')}}>
+            {{t this.currentStructureType.translations.move.up}}
           </AuButton>
         </Item>
         <Item>
@@ -20,20 +20,24 @@
             @icon="chevron-down"
             @iconAlignment="left"
             @skin="link"
-            @disabled={{not this.canMoveDown.value}}
-            {{on 'click' (fn this.moveStructure false)}}>
-            {{t this.structureTypeSelected.moveDown}}
+            @disabled={{not this.canMoveDown}}
+            {{on 'click' (fn this.moveStructure 'down')}}>
+            {{t this.currentStructureType.translations.move.down}}
           </AuButton>
         </Item>
         <Item>
+          <AuToggleSwitch 
+            @label={{t "article-structure-plugin.remove.content"}} 
+            @checked={{this.removeStructureContent}}
+            @onChange={{this.setRemoveStructureContent}}/>
           <AuButton
             @icon="bin"
             @iconAlignment="left"
             @skin="link"
             @alert={{true}}
-            @disabled={{this.isOutsideStructure}}
+            @disabled={{not this.canRemoveStructure}}
             {{on 'click' this.removeStructure}}>
-            {{t "article-structure-plugin.remove.structure"}}
+            {{t this.currentStructureType.translations.remove}}
           </AuButton>
         </Item>
       </AuList>

package/addon/components/article-structure-plugin/structure-card.ts

@@ -1,140 +1,124 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { ProseController } from '@lblod/ember-rdfa-editor';
-import { trackedFunction } from 'ember-resources/util/function';
 import {
-  deleteStructure,
-  moveStructure,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/commands/article-structure-plugin';
-import validateDatastore from '@lblod/ember-rdfa-editor-lblod-plugins/utils/article-structure-plugin/validate-datastore';
-import { ResolvedArticleStructurePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin';
+  moveSelectedStructure,
+  removeStructure,
+  unwrapStructure,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/commands';
+import { ArticleStructurePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin';
+import { findAncestorOfType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/utils/structure';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
+
 type Args = {
   controller: ProseController;
   widgetArgs: {
-    options: ResolvedArticleStructurePluginOptions;
+    options: ArticleStructurePluginOptions;
   };
 };
 
 export default class EditorPluginsStructureCardComponent extends Component<Args> {
+  @service declare intl: IntlService;
+  @tracked removeStructureContent = false;
+
   get controller() {
     return this.args.controller;
   }
 
   @action
-  async moveStructure(moveUp: boolean) {
-    const structureToMove = this.args.widgetArgs.options.structures.find(
-      (structure) => structure === this.structureTypeSelected
+  moveStructure(direction: 'up' | 'down') {
+    this.controller.doCommand(
+      moveSelectedStructure(this.structureTypes, direction, this.intl)
     );
-    if (structureToMove && this.structure) {
-      const shaclReport = await validateDatastore(
-        this.controller.datastore,
-        structureToMove.shaclConstraint
-      );
-      this.controller.doCommand(
-        moveStructure(
-          this.controller,
-          this.structure.uri,
-          moveUp,
-          this.args.widgetArgs.options,
-          shaclReport
-        )
-      );
-    }
+    this.controller.focus();
   }
 
   @action
   removeStructure() {
-    if (this.structure) {
-      this.controller.doCommand(
-        deleteStructure(
-          this.controller,
-          this.structure.uri,
-          this.args.widgetArgs.options
-        )
-      );
+    if (this.structure && this.currentStructureType) {
+      if (this.removeStructureContent) {
+        this.controller.doCommand(
+          removeStructure(this.structure, this.structureTypes)
+        );
+      } else {
+        this.controller.doCommand(
+          unwrapStructure(
+            {
+              ...this.structure,
+              type: this.currentStructureType,
+            },
+            this.structureTypes
+          )
+        );
+      }
     }
+    this.controller.focus();
   }
 
-  get structure(): { uri: string; type: string } | undefined {
-    const currentSelection = this.controller.state.selection;
-    const limitedDatastore = this.controller.datastore.limitToRange(
-      this.controller.state,
-      currentSelection.from,
-      currentSelection.to
+  @action
+  setRemoveStructureContent(value: boolean) {
+    this.removeStructureContent = value;
+  }
+
+  get structureTypes() {
+    return this.args.widgetArgs.options;
+  }
+
+  get structureNodeSpecs() {
+    return this.structureTypes.map(
+      (type) => this.controller.schema.nodes[type.name]
     );
+  }
 
-    const quad = limitedDatastore
-      .match(null, 'a')
-      .transformDataset((dataset) => {
-        return dataset.filter((quad) => {
-          return this.args.widgetArgs.options.structureTypes.includes(
-            quad.object.value
-          );
-        });
-      })
-      .asQuadResultSet()
-      .first();
-    if (quad) {
-      return { uri: quad.subject.value, type: quad.object.value };
-    }
-    return;
+  get structure() {
+    const currentSelection = this.controller.state.selection;
+    return findAncestorOfType(currentSelection, ...this.structureNodeSpecs);
   }
 
-  get structureTypeSelected() {
-    const structureTypeof = this.structure?.type;
-    if (structureTypeof) {
-      return this.args.widgetArgs.options.structures.find((structure) =>
-        structureTypeof.includes(structure.type)
+  get currentStructureType() {
+    if (this.structure) {
+      const { node: structureNode } = this.structure;
+      return this.structureTypes.find(
+        (spec) => spec.name === structureNode.type.name
       );
     }
     return;
   }
 
   get isOutsideStructure() {
-    return !this.structure?.uri;
+    return !this.structure;
   }
 
-  canMoveDown = trackedFunction(this, async () => {
-    const structureToMove = this.args.widgetArgs.options.structures.find(
-      (structure) => structure === this.structureTypeSelected
+  get canMoveDown() {
+    return this.controller.checkCommand(
+      moveSelectedStructure(this.structureTypes, 'down', this.intl)
     );
-    if (structureToMove && this.structure) {
-      const shaclReport = await validateDatastore(
-        this.controller.datastore,
-        structureToMove.shaclConstraint
-      );
-      return this.controller.checkCommand(
-        moveStructure(
-          this.controller,
-          this.structure.uri,
-          false,
-          this.args.widgetArgs.options,
-          shaclReport
-        )
-      );
-    }
-    return false;
-  });
+  }
 
-  canMoveUp = trackedFunction(this, async () => {
-    const structureToMove = this.args.widgetArgs.options.structures.find(
-      (structure) => structure === this.structureTypeSelected
+  get canMoveUp() {
+    return this.controller.checkCommand(
+      moveSelectedStructure(this.structureTypes, 'up', this.intl)
     );
-    if (structureToMove && this.structure) {
-      const shaclReport = await validateDatastore(
-        this.controller.datastore,
-        structureToMove.shaclConstraint
-      );
-      return this.controller.checkCommand(
-        moveStructure(
-          this.controller,
-          this.structure.uri,
-          true,
-          this.args.widgetArgs.options,
-          shaclReport
-        )
-      );
+  }
+
+  get canRemoveStructure() {
+    if (this.structure && this.currentStructureType) {
+      if (this.removeStructureContent) {
+        return true;
+      } else {
+        return this.controller.checkCommand(
+          unwrapStructure(
+            {
+              ...this.structure,
+              type: this.currentStructureType,
+            },
+            this.structureTypes
+          )
+        );
+      }
     }
     return false;
-  });
+  }
 }

package/addon/components/besluit-plugin/besluit-context-card.ts

@@ -4,18 +4,12 @@ import { action } from '@ember/object';
 import {
   moveArticle,
   recalculateArticleNumbers,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/commands/besluit-plugin';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-plugin/commands';
 import { ResolvedPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
-import { DecisionOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-plugin';
 import { ProseController } from '@lblod/ember-rdfa-editor';
 
-interface ContextCardWidgetArgs {
-  options?: DecisionOptions;
-}
-
 interface Args {
   controller: ProseController;
-  widgetArgs: ContextCardWidgetArgs;
 }
 
 export default class BesluitContextCardComponent extends Component<Args> {

package/addon/components/besluit-plugin/besluit-plugin-card.ts

@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import {
   insertTitle,
   insertArticle,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/commands/besluit-plugin';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-plugin/commands';
 import { ProseController } from '@lblod/ember-rdfa-editor';
 
 type Args = {
@@ -20,7 +20,7 @@ export default class BesluitPluginCardComponent extends Component<Args> {
   }
   @action
   insertArticle() {
-    this.controller.checkAndDoCommand(insertArticle(this.controller, '', ''));
+    this.controller.checkAndDoCommand(insertArticle(this.controller, ''));
     this.focus();
   }
 
@@ -35,8 +35,6 @@ export default class BesluitPluginCardComponent extends Component<Args> {
   }
 
   get disableArticleInsert() {
-    return !this.controller.checkCommand(
-      insertArticle(this.controller, '', '')
-    );
+    return !this.controller.checkCommand(insertArticle(this.controller, ''));
   }
 }

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

@@ -1,8 +1,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/fetchBesluitTypes';
-
+import { BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 type Args = {
   besluitTypes: BesluitType[];
 };

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

@@ -3,7 +3,6 @@ import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { getOwner } from '@ember/application';
-import fetchBesluitTypes, { BesluitType } from '../../utils/fetchBesluitTypes';
 import { inject as service } from '@ember/service';
 import {
   addType,
@@ -14,6 +13,9 @@ import CurrentSessionService from '@lblod/frontend-gelinkt-notuleren/services/cu
 import { ResolvedPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
 import { unwrap } from '@lblod/ember-rdfa-editor/utils/option';
 import { getRdfaAttribute } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
+import fetchBesluitTypes, {
+  BesluitType,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 declare module 'ember__owner' {
   export default interface Owner {
     resolveRegistration(name: string): unknown;

package/addon/components/citation-plugin/citation-card.ts

@@ -9,10 +9,6 @@ import {
   Decision,
   fetchDecisions,
 } from '../../plugins/citation-plugin/utils/vlaamse-codex';
-import {
-  LEGISLATION_TYPE_CONCEPTS,
-  LEGISLATION_TYPES,
-} from '../../utils/legislation-types';
 import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
 import {
   Option,
@@ -25,6 +21,10 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
 import { ProseController, Transaction } from '@lblod/ember-rdfa-editor';
 import { citedText } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/cited-text';
+import {
+  LEGISLATION_TYPES,
+  LEGISLATION_TYPE_CONCEPTS,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/legislation-types';
 
 interface Args {
   controller: ProseController;

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

@@ -1,7 +1,6 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { LEGISLATION_TYPES } from '../../utils/legislation-types';
 import {
   Fragment,
   ProseController,
@@ -14,6 +13,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/vlaamse-codex';
 import { citedText } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/cited-text';
 import { CitationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
+import { LEGISLATION_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/legislation-types';
 
 interface Args {
   controller: ProseController;

package/addon/components/citation-plugin/citations/search-modal.ts

@@ -8,7 +8,7 @@ import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
 import {
   LEGISLATION_TYPE_CONCEPTS,
   LEGISLATION_TYPES,
-} from '../../../utils/legislation-types';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/legislation-types';
 import {
   Article,
   Decision,

package/addon/components/insert-variable-plugin/insert-variable-card.ts

@@ -3,13 +3,13 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { v4 as uuidv4 } from 'uuid';
-import {
-  defaultVariableTypes,
-  VariableType,
-} from '../../utils/variable-plugins/default-variable-types';
 import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
-import { CodeList } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/variable-plugins/fetch-data';
 import { insertHtml } from '@lblod/ember-rdfa-editor/commands/insert-html-command';
+import {
+  DEFAULT_VARIABLE_TYPES,
+  VariableType,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/insert-variable-plugin/utils/constants';
+import { CodeList } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/insert-variable-plugin/utils/fetch-data';
 type Args = {
   controller: ProseController;
   widgetArgs: {
@@ -48,7 +48,7 @@ export default class EditorPluginsInsertCodelistCardComponent extends Component<
     const variablesArray: VariableType[] = [];
     for (const type of variableTypesSelectedByUser) {
       if (typeof type === 'string') {
-        const variableType = defaultVariableTypes[type];
+        const variableType = DEFAULT_VARIABLE_TYPES[type];
         if (variableType) {
           variablesArray.push(variableType);
         } else {

package/addon/components/rdfa-date-plugin/card.ts

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import modifyDate from '../../commands/modify-date-command';
+import { modifyDate } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/commands';
 import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
 import { getRdfaAttribute } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
 type Args = {

package/addon/components/rdfa-date-plugin/insert.ts

@@ -14,6 +14,7 @@ export default class RdfaDatePluginInsertComponent extends Component<Args> {
   get schema() {
     return this.controller.schema;
   }
+
   @action
   insertDate() {
     this.controller.withTransaction((tr) => {

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

@@ -5,7 +5,7 @@ import {
   NON_ZONAL_URI,
   POTENTIALLY_ZONAL_URI,
   ZONAL_URI,
-} from '../../constants';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/constants';
 import Measure from '@lblod/ember-rdfa-editor-lblod-plugins/models/measure';
 import { assert } from '@ember/debug';
 

package/addon/components/roadsign-regulation-plugin/measure-template.ts

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
-import includeInstructions from '../../utils/roadsign-regulation-plugin/includeInstructions';
+import includeInstructions from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/includeInstructions';
 import RoadsignRegistryService from '@lblod/ember-rdfa-editor-lblod-plugins/services/roadsign-registry';
 
 type Args = {

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

@@ -5,18 +5,18 @@ import { task } from 'ember-concurrency';
 import { getOwner } from '@ember/application';
 import { v4 as uuid } from 'uuid';
 import { inject as service } from '@ember/service';
-import includeInstructions from '../../utils/roadsign-regulation-plugin/includeInstructions';
+import includeInstructions from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/includeInstructions';
 import {
   NON_ZONAL_URI,
   POTENTIALLY_ZONAL_URI,
   ZONAL_URI,
-} from '../../constants';
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/constants';
 import RoadsignRegistryService from '@lblod/ember-rdfa-editor-lblod-plugins/services/roadsign-registry';
 import { assert } from '@ember/debug';
 import { unwrap } from '@lblod/ember-rdfa-editor/utils/option';
 import Measure from '@lblod/ember-rdfa-editor-lblod-plugins/models/measure';
 import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
-import { insertArticle } from '@lblod/ember-rdfa-editor-lblod-plugins/commands/besluit-plugin';
+import { insertArticle } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-plugin/commands';
 
 const PAGE_SIZE = 10;
 const SIGN_TYPE_URI =
@@ -287,7 +287,7 @@ export default class RoadsignRegulationCard extends Component<Args> {
   `;
 
     this.args.controller.doCommand(
-      insertArticle(this.args.controller, regulationHTML, '')
+      insertArticle(this.args.controller, regulationHTML)
     );
     this.args.closeModal();
   }