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

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,
@@ -33,13 +30,10 @@ import {
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { jsonParse } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
 import {
+  DEFAULT_CONTENT_STRING,
   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,
@@ -64,11 +58,11 @@ function outgoingFromBacklink(
 }
 
 interface CreateSnippetArgs {
-  controller: SayController;
+  schema: Schema;
   content: string;
   title: string;
   snippetListIds: string[];
-  importedResources: ImportedResourceMap;
+  importedResources?: ImportedResourceMap;
 }
 
 /**
@@ -78,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,
@@ -93,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,
@@ -111,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) {
@@ -135,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,
@@ -195,7 +153,7 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
     config: { default: options },
   },
   component: SnippetComponent,
-  content: 'block+',
+  content: options.allowedContent || DEFAULT_CONTENT_STRING,
   serialize(node) {
     return renderRdfaAware({
       renderable: node,

package/app/styles/snippet-plugin.scss

@@ -140,6 +140,11 @@ div[typeof='besluitpublicatie:Documentonderdeel']
       border-radius: 4px;
       color: var(--au-blue-700);
       cursor: pointer;
+      &.say-snippet-hidden {
+        color: transparent;
+        border: none;
+        cursor: auto;
+      }
       &.say-snippet-remove-button {
         color: var(--au-red-600);
         border-color: var(--au-red-600);

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;
 }

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

@@ -19,7 +19,7 @@ export default class SnippetListModalComponent extends Component<Signature> {
     closeModal(): void;
     saveAndClose(): void;
     snippetListSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<SnippetList[]>>;
-    snippetListResource: import("ember-resources/util/ember-concurrency").TaskInstance<SnippetList[]>;
+    snippetListResource: import("reactiveweb/ember-concurrency").TaskInstance<SnippetList[]>;
     onChange(assignedSnippetListsIds: string[]): void;
 }
 export {};

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

@@ -35,7 +35,7 @@ export default class AddressEditComponent extends Component<Args> {
     get addressToInsert(): Address | null | undefined;
     get canUpdateAddressVariable(): boolean;
     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>;
     updateAddressVariable(): void;
     selectMunicipality(municipality: string): void;
     selectStreet(street: string): void;

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

@@ -19,7 +19,7 @@ export default class CodelistEditComponent extends Component<Args> {
     get codelistUri(): string | undefined;
     get showCard(): boolean;
     get label(): string | undefined;
-    codelistOptions: import("ember-resources/util/function").State<Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data").CodeListOptions | undefined>>;
+    codelistOptions: import("reactiveweb/function").State<Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data").CodeListOptions | undefined>>;
     get multiSelect(): boolean;
     insert(): void;
     updateCodelistOption(codelistOption: CodeListOption | CodeListOption[]): void;

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

@@ -32,7 +32,7 @@ export default class CodelistInsertComponent extends Component<Args> {
         label: string;
         value: string;
     } | undefined;
-    codelistData: import("ember-resources/util/function").State<Promise<CodeList[]>>;
+    codelistData: import("reactiveweb/function").State<Promise<CodeList[]>>;
     updateLabel(event: InputEvent): void;
     insert(): void;
     selectCodelist(codelist: CodeList): void;

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

@@ -23,7 +23,7 @@ export default class LocationEditComponent extends Component<Args> {
     get source(): string;
     get label(): string | undefined;
     get isZonal(): boolean;
-    locationOptions: import("ember-resources/util/function").State<Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data").CodeListOptions>>;
+    locationOptions: import("reactiveweb/function").State<Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data").CodeListOptions>>;
     get multiSelect(): boolean;
     updateLocationOption(locationOption: CodeListOption | CodeListOption[]): void;
 }

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

@@ -22,7 +22,7 @@ export default class WorshipPluginSearchModalComponent extends Component<Args> {
     setAdministrativeUnit(unit: AdministrativeUnit): void;
     closeModal(): Promise<void>;
     search: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/worship-plugin/utils/fetchWorshipServices").WorshipServiceResponse>>;
-    servicesResource: import("ember-resources/util/ember-concurrency").TaskInstance<unknown>;
+    servicesResource: import("reactiveweb/ember-concurrency").TaskInstance<unknown>;
     setSort(sort: SearchSort): void;
     previousPage(): void;
     nextPage(): void;

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

@@ -0,0 +1,14 @@
+import { Command } from '@lblod/ember-rdfa-editor';
+import { type ImportedResourceMap } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+export interface InsertSnippetCommandArgs {
+    content: string;
+    title: string;
+    assignedSnippetListsIds: string[];
+    importedResources?: ImportedResourceMap;
+    range?: {
+        start: number;
+        end: number;
+    };
+}
+declare const insertSnippet: ({ content, title, assignedSnippetListsIds, importedResources, range, }: InsertSnippetCommandArgs) => Command;
+export default insertSnippet;

package/declarations/addon/plugins/snippet-plugin/index.d.ts

@@ -1,7 +1,9 @@
 import { type Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { SafeString } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
+export declare const DEFAULT_CONTENT_STRING = "block+";
 export type SnippetPluginConfig = {
     endpoint: string;
+    allowedContent?: string;
 };
 interface SnippetArgs {
     title: string | null;

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

@@ -1,12 +1,12 @@
-import { type PNode, type SayController, type Transaction } from '@lblod/ember-rdfa-editor';
+import { type PNode, type Schema } from '@lblod/ember-rdfa-editor';
 import { type OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import { type ImportedResourceMap, type SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 interface CreateSnippetArgs {
-    controller: SayController;
+    schema: Schema;
     content: string;
     title: string;
     snippetListIds: string[];
-    importedResources: ImportedResourceMap;
+    importedResources?: ImportedResourceMap;
 }
 /**
  * Creates a Snippet node wrapping the given content while allowing for further snippets to be added
@@ -14,15 +14,7 @@ interface CreateSnippetArgs {
  * @returns a tuple containing the Node and the map of imported resources to the new outgoing
  * properties that these resources will have after the snippet is inserted into the document.
  **/
-export declare function createSnippet({ controller, content, title, snippetListIds, importedResources, }: CreateSnippetArgs): [PNode, Map<string, OutgoingTriple[]>];
-/**
- * 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 declare function createAndInsertSnippet(createSnippetArgs: CreateSnippetArgs, insertTransactionGenerator: (tr: Transaction, snippet: PNode) => Transaction): void;
+export declare function createSnippet({ schema, content, title, snippetListIds, importedResources, }: CreateSnippetArgs): [PNode, Map<string, OutgoingTriple[]>];
 export declare const snippet: (config: SnippetPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const snippetView: (config: SnippetPluginConfig) => (controller: SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const snippetView: (config: SnippetPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "22.5.1",
+  "version": "23.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -65,12 +65,12 @@
     "codemirror": "^6.0.1",
     "crypto-browserify": "^3.12.0",
     "date-fns": "^2.30.0",
-    "ember-auto-import": "~2.6.3",
+    "ember-auto-import": "~2.7.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-concurrency": "^3.1.1",
     "ember-mu-transform-helpers": "^2.1.2",
-    "ember-resources": "^6.5.1",
+    "ember-resources": "^7.0.2",
     "ember-template-imports": "^4.1.1",
     "ember-velcro": "^2.2.0",
     "fetch-sparql-endpoint": "^3.3.3",
@@ -79,6 +79,7 @@
     "proj4": "^2.11.0",
     "rdf-ext": "^2.5.2",
     "rdf-validate-shacl": "^0.4.5",
+    "reactiveweb": "^1.3.0",
     "stream-browserify": "^3.0.0",
     "tracked-built-ins": "^3.3.0",
     "tracked-toolbox": "^2.0.0",
@@ -102,7 +103,7 @@
     "@glint/template": "^1.4.0",
     "@graphy/content.ttl.write": "^4.3.7",
     "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "^10.4.0",
+    "@lblod/ember-rdfa-editor": "10.4.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -189,7 +190,7 @@
     "@appuniversum/ember-appuniversum": "^3.4.1",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^10.0.2",
+    "@lblod/ember-rdfa-editor": "^10.4.0",
     "ember-concurrency": "^3.1.0",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",