@lblod/ember-rdfa-editor-lblod-plugins 22.5.2 → 23.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 23.0.0
+
+### Major Changes
+
+- [#478](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/478) [`b3cf324`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b3cf324e6b959a50ba354e1563b04a0e12f41f67) Thanks [@abeforgit](https://github.com/abeforgit)! - Run recalculate numbers after inserting a snippet
+
+### Minor Changes
+
+- [#480](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/480) [`789180f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/789180fde786000756c2880dca9591866bf7132f) Thanks [@piemonkey](https://github.com/piemonkey)! - Internal: update to latest ember-resources 7.0.2. Requires an upgrade only if consumer app uses
+  ember dependency-lint to maintain matching versions.
+
 ## 22.5.2
 
 ### Patch Changes

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

@@ -2,7 +2,7 @@ import { tracked } from '@glimmer/tracking';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { trackedFunction } from 'ember-resources/util/function';
+import { trackedFunction } from 'reactiveweb/function';
 import { ELI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
 import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross';

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

@@ -7,7 +7,7 @@ import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import fetchBesluitTypes, {
   BesluitType,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
-import { trackedFunction } from 'ember-resources/util/function';
+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';

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

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { action } from '@ember/object';
 import { capitalize } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 import {
   Option,
   unwrap,

package/addon/components/citation-plugin/citations/legal-document-detail.ts

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 import { CalendarIcon } from '@appuniversum/ember-appuniversum/components/icons/calendar';
 import { PlusTextIcon } from '@appuniversum/ember-appuniversum/components/icons/plus-text';
 import { LinkExternalIcon } from '@appuniversum/ember-appuniversum/components/icons/link-external';

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

@@ -4,7 +4,7 @@ import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { service } from '@ember/service';
 import { capitalize } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 import {
   isGemeenteBesluitType,
   LEGISLATION_TYPE_CONCEPTS,

package/addon/components/lmb-plugin/search-modal.ts

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { assert } from '@ember/debug';
 import { action } from '@ember/object';
 import { restartableTask } from 'ember-concurrency';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 import { LmbPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/lmb-plugin';
 
 import Mandatee from '@lblod/ember-rdfa-editor-lblod-plugins/models/mandatee';

package/addon/components/location-plugin/edit.gts

@@ -3,7 +3,7 @@ import Component from '@glimmer/component';
 import { restartableTask, timeout } from 'ember-concurrency';
 import perform from 'ember-concurrency/helpers/perform';
 import { trackedReset } from 'tracked-toolbox';
-import { trackedTask } from 'ember-resources/util/ember-concurrency';
+import { trackedTask } from 'reactiveweb/ember-concurrency';
 import { service } from '@ember/service';
 import { on } from '@ember/modifier';
 import type { SafeString } from '@ember/template/-private/handlebars';

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

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 
 import { tracked } from '@glimmer/tracking';
 

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

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { service } from '@ember/service';
 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';
-import { trackedFunction } from 'ember-resources/util/function';
+import { trackedFunction } from 'reactiveweb/function';
 
 type Args = {
   template: string;

package/addon/components/snippet-plugin/nodes/snippet.gts

@@ -25,7 +25,10 @@ import {
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import { createAndInsertSnippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/nodes/snippet';
+import insertSnippet from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/commands/insert-snippet';
+import { isNone } from '@lblod/ember-rdfa-editor/utils/_private/option';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { recalculateNumbers } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/recalculate-structure-numbers';
 
 interface ButtonSig {
   Args: {
@@ -93,7 +96,10 @@ export default class SnippetNode extends Component<Signature> {
     const position = this.args.getPos();
     if (position !== undefined) {
       this.controller.withTransaction((tr) => {
-        return tr.deleteRange(position, position + this.node.nodeSize);
+        return transactionCombinator(
+          this.controller.mainEditorState,
+          tr.deleteRange(position, position + this.node.nodeSize),
+        )([recalculateNumbers]).transaction;
       });
     }
   }
@@ -121,46 +127,32 @@ export default class SnippetNode extends Component<Signature> {
   }
   @action
   onInsert(content: string, title: string) {
-    let rangeStart = 0;
-    let rangeEnd = 0;
-    if (this.args.getPos() === undefined) return;
+    this.closeModal();
+    const assignedSnippetListsIds = this.node.attrs.assignedSnippetListsIds;
+    let start = 0;
+    let end = 0;
+    const pos = this.args.getPos();
+    if (isNone(pos)) {
+      return;
+    }
     if (this.mode === 'add') {
       // Add new snippet
-      rangeStart = (this.args.getPos() as number) + this.node.nodeSize;
-      rangeEnd = (this.args.getPos() as number) + this.node.nodeSize;
+      start = pos + this.node.nodeSize;
+      end = pos + this.node.nodeSize;
     } else {
       //Replace current snippet
-      rangeStart = this.args.getPos() as number;
-      rangeEnd = (this.args.getPos() as number) + this.node.nodeSize;
-    }
-
-    const domParser = new DOMParser();
-    const parsed = domParser.parseFromString(content, 'text/html').body;
-    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
-
-    this.closeModal();
-
-    if (documentDiv) {
-      return createAndInsertSnippet(
-        {
-          controller: this.controller,
-          content,
-          title,
-          snippetListIds: this.node.attrs.assignedSnippetListsIds,
-          importedResources: this.node.attrs.importedResources,
-        },
-        (tr, snippet) => tr.replaceRangeWith(rangeStart, rangeEnd, snippet),
-      );
+      start = pos;
+      end = pos + this.node.nodeSize;
     }
-
-    this.controller.withTransaction((tr) =>
-      tr.replaceRange(
-        rangeStart,
-        rangeEnd,
-        this.createSliceFromElement(parsed),
-      ),
+    this.controller.doCommand(
+      insertSnippet({
+        content,
+        title,
+        assignedSnippetListsIds,
+        importedResources: this.node.attrs.importedResources,
+        range: { start, end },
+      }),
     );
-    this.closeModal();
   }
 
   <template>

package/addon/components/snippet-plugin/search-modal.ts

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { assert } from '@ember/debug';
 import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 
 import { tracked } from '@glimmer/tracking';
 

package/addon/components/snippet-plugin/snippet-insert.gts

@@ -11,8 +11,8 @@ import {
   Slice,
 } from '@lblod/ember-rdfa-editor';
 import { SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
-import { createAndInsertSnippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/nodes/snippet';
 import { type ImportedResourceMap } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import insertSnippet from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/commands/insert-snippet';
 import SearchModal from './search-modal';
 
 interface Sig {
@@ -56,29 +56,15 @@ export default class SnippetInsertComponent extends Component<Sig> {
 
   @action
   onInsert(content: string, title: string) {
-    const domParser = new DOMParser();
-    const parsed = domParser.parseFromString(content, 'text/html').body;
-    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
-
     this.closeModal();
-    const assignedSnippetListProperties = this.args.snippetListProperties;
-
-    if (documentDiv && assignedSnippetListProperties) {
-      return createAndInsertSnippet(
-        {
-          controller: this.controller,
-          content,
-          title,
-          snippetListIds: assignedSnippetListProperties.listIds,
-          importedResources: assignedSnippetListProperties.importedResources,
-        },
-        (tr, snippet) => tr.replaceSelectionWith(snippet),
-      );
-    } else {
-      return this.controller.withTransaction((tr) =>
-        tr.replaceSelection(this.createSliceFromElement(parsed)),
-      );
-    }
+    this.controller.doCommand(
+      insertSnippet({
+        content,
+        title,
+        assignedSnippetListsIds: this.args.snippetListProperties?.listIds || [],
+        importedResources: this.args.snippetListProperties?.importedResources,
+      }),
+    );
   }
 
   get disabled() {

package/addon/components/snippet-plugin/snippet-list/snippet-list-modal.ts

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 
 import { tracked } from '@glimmer/tracking';
 

package/addon/components/variable-plugin/address/edit.ts

@@ -11,7 +11,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/address-helpers';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { trackedReset } from 'tracked-toolbox';
-import { trackedTask } from 'ember-resources/util/ember-concurrency';
+import { trackedTask } from 'reactiveweb/ember-concurrency';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';

package/addon/components/variable-plugin/codelist/edit.ts

@@ -7,7 +7,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data';
 import { MULTI_SELECT_CODELIST_TYPE } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/constants';
 import { NodeSelection } from '@lblod/ember-rdfa-editor';
-import { trackedFunction } from 'ember-resources/util/function';
+import { trackedFunction } from 'reactiveweb/function';
 import { trackedReset } from 'tracked-toolbox';
 import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils';
 import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';

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

@@ -9,7 +9,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
-import { trackedFunction } from 'ember-resources/util/function';
+import { trackedFunction } from 'reactiveweb/function';
 import { v4 as uuidv4 } from 'uuid';
 import {
   DCT,

package/addon/components/variable-plugin/location/edit.ts

@@ -10,7 +10,7 @@ import { findParentNodeOfType } from '@curvenote/prosemirror-utils';
 import { NodeSelection } from '@lblod/ember-rdfa-editor';
 import { ZONAL_URI } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-import { trackedFunction } from 'ember-resources/util/function';
+import { trackedFunction } from 'reactiveweb/function';
 import { trackedReset } from 'tracked-toolbox';
 import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils';
 

package/addon/components/worship-plugin/search-modal.ts

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { assert } from '@ember/debug';
 import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
-import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
+import { task as trackedTask } from 'reactiveweb/ember-concurrency';
 import { WorshipPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/worship-plugin';
 import {
   fetchWorshipServices,

package/addon/plugins/snippet-plugin/commands/insert-snippet.ts

@@ -0,0 +1,91 @@
+import { Command, ProseParser, Schema, Slice } from '@lblod/ember-rdfa-editor';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
+import { recalculateNumbers } from '../../structure-plugin/recalculate-structure-numbers';
+import { createSnippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/nodes/snippet';
+import { type ImportedResourceMap } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import {
+  isSome,
+  unwrap,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+
+export interface InsertSnippetCommandArgs {
+  content: string;
+  title: string;
+  assignedSnippetListsIds: string[];
+  importedResources?: ImportedResourceMap;
+  range?: { start: number; end: number };
+}
+
+const insertSnippet = ({
+  content,
+  title,
+  assignedSnippetListsIds,
+  importedResources,
+  range,
+}: InsertSnippetCommandArgs): Command => {
+  return (state, dispatch) => {
+    const domParser = new DOMParser();
+    const parsed = domParser.parseFromString(content, 'text/html').body;
+    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
+
+    const schema = state.schema;
+
+    let tr = state.tr;
+    const insertRange = range ?? {
+      start: state.selection.from,
+      end: state.selection.to,
+    };
+
+    if (documentDiv) {
+      const [snippet, importedTriples] = createSnippet({
+        schema: state.schema,
+        content,
+        title,
+        snippetListIds: assignedSnippetListsIds,
+        importedResources,
+      });
+
+      const addImportedResourceProperties = Object.values(
+        importedResources ?? {},
+      )
+        .map((linked) => {
+          const newProperties =
+            (isSome(linked) && importedTriples.get(linked)) || [];
+          return newProperties.map((newProp) =>
+            addPropertyToNode({
+              resource: unwrap(linked),
+              property: newProp,
+            }),
+          );
+        })
+        .flat();
+
+      tr = transactionCombinator(
+        state,
+        tr.replaceRangeWith(insertRange.start, insertRange.end, snippet),
+      )([recalculateNumbers, ...addImportedResourceProperties]).transaction;
+    } else {
+      const slice = createSliceFromElement(parsed, schema);
+      tr = transactionCombinator(
+        state,
+        tr.replaceRange(insertRange.start, insertRange.end, slice),
+      )([recalculateNumbers]).transaction;
+    }
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
+};
+
+function createSliceFromElement(element: Element, schema: Schema) {
+  return new Slice(
+    ProseParser.fromSchema(schema).parse(element, {
+      preserveWhitespace: true,
+    }).content,
+    0,
+    0,
+  );
+}
+export default insertSnippet;

package/addon/plugins/snippet-plugin/nodes/snippet.ts

@@ -5,8 +5,7 @@ import {
   type PNode,
   ProseParser,
   rdfaAttrSpec,
-  type SayController,
-  type Transaction,
+  type Schema,
 } from '@lblod/ember-rdfa-editor';
 import {
   renderRdfaAware,
@@ -23,8 +22,6 @@ import {
   type EmberNodeConfig,
 } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import { htmlToDoc } from '@lblod/ember-rdfa-editor/utils/_private/html-utils';
-import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
-import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
 import SnippetComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/snippet-plugin/nodes/snippet';
 import {
   EXT,
@@ -37,10 +34,6 @@ import {
   type ImportedResourceMap,
   type SnippetPluginConfig,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
-import {
-  isSome,
-  unwrap,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 function outgoingFromBacklink(
   backlink: IncomingTriple,
@@ -65,11 +58,11 @@ function outgoingFromBacklink(
 }
 
 interface CreateSnippetArgs {
-  controller: SayController;
+  schema: Schema;
   content: string;
   title: string;
   snippetListIds: string[];
-  importedResources: ImportedResourceMap;
+  importedResources?: ImportedResourceMap;
 }
 
 /**
@@ -79,7 +72,7 @@ interface CreateSnippetArgs {
  * properties that these resources will have after the snippet is inserted into the document.
  **/
 export function createSnippet({
-  controller,
+  schema,
   content,
   title,
   snippetListIds,
@@ -94,13 +87,12 @@ export function createSnippet({
     }
   }
   // Create the new node
-  const parser = ProseParser.fromSchema(controller.schema);
+  const parser = ProseParser.fromSchema(schema);
   const contentAsNode = htmlToDoc(replacedContent, {
-    schema: controller.schema,
+    schema,
     parser,
-    editorView: controller.mainEditorView,
   });
-  const node = controller.schema.node(
+  const node = schema.node(
     'snippet',
     {
       assignedSnippetListsIds: snippetListIds,
@@ -112,7 +104,7 @@ export function createSnippet({
   );
   // Find all the new backlinks that refer to imported resources and generate OutgoingLinks for them
   const importedTriples: Map<string, OutgoingTriple[]> = new Map();
-  if (Object.keys(importedResources).length > 0) {
+  if (Object.keys(importedResources ?? {}).length > 0) {
     contentAsNode.descendants((node) => {
       const backlinks = node.attrs.backlinks as IncomingTriple[] | undefined;
       if (backlinks && backlinks.length > 0) {
@@ -136,41 +128,6 @@ export function createSnippet({
   return [node, importedTriples];
 }
 
-/**
- * Creates a Snippet node wrapping the given content while allowing for further snippets to be added
- * or removed.
- * Takes the same arguments object as creating a snippet but also a generator that produces a
- * transaction that inserts the snippet into the document, so that this can be done in a way
- * specific to the situation.
- **/
-export function createAndInsertSnippet(
-  createSnippetArgs: CreateSnippetArgs,
-  insertTransactionGenerator: (tr: Transaction, snippet: PNode) => Transaction,
-) {
-  return createSnippetArgs.controller.withTransaction((tr, state) => {
-    const [snippet, importedTriples] = createSnippet(createSnippetArgs);
-    const result = transactionCombinator<boolean>(
-      state,
-      insertTransactionGenerator(tr, snippet),
-    )(
-      Object.values(createSnippetArgs.importedResources)
-        .map((linked) => {
-          const newProperties =
-            (isSome(linked) && importedTriples.get(linked)) || [];
-          return newProperties.map((newProp) =>
-            addPropertyToNode({
-              resource: unwrap(linked),
-              property: newProp,
-            }),
-          );
-        })
-        .flat(),
-    );
-
-    return result.transaction;
-  });
-}
-
 const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
   name: 'snippet',
   inline: false,

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

@@ -20,7 +20,7 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
     get doc(): import("prosemirror-model").Node;
     get decisionRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
     get showCard(): boolean;
-    topics: import("ember-resources/util/function").State<Promise<BesluitTopic[]>>;
+    topics: import("reactiveweb/function").State<Promise<BesluitTopic[]>>;
     findBesluitTopicsByUris(uris: string[], topics?: BesluitTopic[] | null): BesluitTopic[] | undefined;
     updateBesluitTopic(): void;
     upsertBesluitTopic(selected: BesluitTopic[]): void;

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

@@ -26,7 +26,7 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
     constructor(parent: unknown, args: Args);
     get controller(): SayController;
     get doc(): import("prosemirror-model").Node;
-    types: import("ember-resources/util/function").State<Promise<BesluitType[]>>;
+    types: import("reactiveweb/function").State<Promise<BesluitType[]>>;
     get currentBesluitRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
     get currentBesluitURI(): string | undefined;
     get showCard(): boolean;

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

@@ -41,7 +41,7 @@ export default class CitationCardComponent extends Component<Args> {
     onCardTextChange(event: InputEvent): void;
     get governmentName(): string | undefined;
     resourceSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<LegalDocument[]>>;
-    legalDocumentsResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    legalDocumentsResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     selectLegislationType(type: string): void;
     openLegalDocumentDetailModal(legalDocument: LegalDocument): void;
     openSearchModal(): Promise<void>;

package/declarations/addon/components/citation-plugin/citations/legal-document-detail.d.ts

@@ -24,7 +24,7 @@ export default class LegalDocumentDetailComponent extends Component<Args> {
     articleFilterAfterTimeout: string;
     updateArticleFilter: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (event: InputEvent) => Promise<void>>;
     resourceSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/article").Article[]>>;
-    articleResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    articleResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     close(): Promise<void>;
     previousPage(): void;
     nextPage(): void;

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

@@ -51,7 +51,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     get searchText(): string;
     get governmentSearchText(): string | undefined;
     resourceSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<LegalDocument[]>>;
-    legalDocumentResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    legalDocumentResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     get isBesluitType(): boolean;
     setInputSearchText(event: InputEvent): void;
     setGovernmentSearchText(event: InputEvent): void;

package/declarations/addon/components/lmb-plugin/search-modal.d.ts

@@ -22,7 +22,7 @@ export default class LmbPluginSearchModalComponent extends Component<Args> {
         results: Mandatee[];
         totalCount: number;
     } | undefined>>;
-    servicesResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    servicesResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     setSort(sort: SearchSort): void;
     setInputSearchText(event: InputEvent): void;
     previousPage(): void;

package/declarations/addon/components/location-plugin/edit.d.ts

@@ -44,7 +44,7 @@ export default class LocationPluginEditComponent extends Component<Signature> {
     get canUpdateBusnumber(): string | undefined;
     get alternativeAddressFromError(): Address | undefined;
     resolveAddressTask: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<Address | undefined>>;
-    newAddress: import("ember-resources/util/ember-concurrency").TaskInstance<Address | undefined>;
+    newAddress: import("reactiveweb/ember-concurrency").TaskInstance<Address | undefined>;
     selectMunicipality(municipality: string): void;
     selectStreet(street: string): void;
     updateHousenumber(event: InputEvent): void;

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

@@ -36,7 +36,7 @@ export default class LpdcPluginModalComponent extends Component<Signature> {
             };
         };
     })>>;
-    lpdcResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    lpdcResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     onSearchTextChange(event: InputEvent): void;
 }
 export {};

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

@@ -9,6 +9,6 @@ type Args = {
 export default class MeasureTemplateComponent extends Component<Args> {
     roadsignRegistry: RoadsignRegistryService;
     get template(): string;
-    instructionData: import("ember-resources/util/function").State<Promise<string>>;
+    instructionData: import("reactiveweb/function").State<Promise<string>>;
 }
 export {};

package/declarations/addon/components/snippet-plugin/search-modal.d.ts

@@ -18,7 +18,7 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
     setInputSearchText(event: InputEvent): void;
     closeModal(): Promise<void>;
     snippetsSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin").Snippet[]>>;
-    snippetsResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    snippetsResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     previousPage(): void;
     nextPage(): void;
 }