@lblod/ember-rdfa-editor-lblod-plugins 28.0.0 → 28.1.0-dev.ed578cc3a5b1de900ca53bd1e5ebe4e950e51439

package/addon/plugins/snippet-plugin/utils/collate-imported-resources.ts

@@ -1,14 +1,17 @@
 import { IMPORTED_RESOURCES_ATTR } from '@lblod/ember-rdfa-editor/plugins/imported-resources';
 import { jsonParse } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
 import { type Snippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import { optionMap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 export function collateImportedResources(snippets: Snippet[]): string[] {
   const domParser = new DOMParser();
   return [
     ...new Set(
       snippets.flatMap(({ content }) => {
-        const htmlNode =
-          content && domParser.parseFromString(content.toString(), 'text/html');
+        const htmlNode = optionMap(
+          (some) => domParser.parseFromString(some, 'text/html'),
+          content,
+        );
         const imports = jsonParse(
           htmlNode
             ?.querySelector('[data-say-document]')

package/app/components/besluit-type-plugin/besluit-type-form.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/besluit-type-plugin/besluit-type-form';

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

@@ -0,0 +1,17 @@
+import Component from '@glimmer/component';
+import { type BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
+import { type BesluitTypeInstance } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/besluit-type-instances';
+interface Sig {
+    Args: {
+        types: BesluitType[];
+        selectedType?: BesluitTypeInstance;
+        setType: (selected: BesluitTypeInstance) => void;
+    };
+    Element: HTMLDivElement;
+}
+export default class BesluitTypePluginBesluitTypeSelectComponent extends Component<Sig> {
+    updateParentType: (selected: BesluitType) => void;
+    updateSubType: (selected: BesluitType) => void;
+    updateSubSubType: (selected: BesluitType) => void;
+}
+export {};

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

@@ -1,12 +1,19 @@
 import Component from '@glimmer/component';
-import { BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
-type Args = {
-    besluitTypes: BesluitType[];
-};
-export default class BesluitTypePluginBesluitTypeSelectComponent extends Component<Args> {
-    AlertTriangleIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/alert-triangle").AlertTriangleIconSignature>;
+import { type BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
+interface Sig {
+    Args: {
+        fieldNameTranslation: string;
+        besluitTypes: BesluitType[];
+        selected?: BesluitType;
+        showWarningWhenEmpty: boolean;
+        onchange: (selected: BesluitType) => void;
+    };
+    Element: HTMLDivElement;
+}
+export default class BesluitTypePluginBesluitTypeSelectComponent extends Component<Sig> {
     besluitTypes: BesluitType[];
-    constructor(parent: unknown, args: Args);
-    search(term: string): BesluitType[];
+    constructor(parent: unknown, args: Sig['Args']);
+    get showWarning(): boolean;
+    search: (term: string) => BesluitType[];
 }
 export {};

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

@@ -1,42 +1,22 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 import { BesluitTypePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin';
+import { BesluitTypeInstance } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/besluit-type-instances';
 type Args = {
     controller: SayController;
     options: BesluitTypePluginOptions;
 };
 export default class EditorPluginsToolbarDropdownComponent extends Component<Args> {
-    CircleIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/circle-x").CircleXIconSignature>;
-    MailIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/mail").MailIconSignature>;
-    CrossIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/cross").CrossIconSignature>;
-    AlertTriangleIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/alert-triangle").AlertTriangleIconSignature>;
-    /**
-     * Actual besluit type selected
-     * @property besluitType
-     * @type BesluitType
-     * @private
-     */
-    besluitType?: BesluitType;
-    previousBesluitType?: string;
-    besluit?: BesluitType;
-    subBesluit?: BesluitType;
-    subSubBesluit?: BesluitType;
+    selectedTypeInstance?: BesluitTypeInstance;
     cardExpanded: boolean;
-    constructor(parent: unknown, args: Args);
     get controller(): SayController;
-    get doc(): import("prosemirror-model").Node;
-    types: import("reactiveweb/function").State<Promise<BesluitType[]>>;
+    types: import("reactiveweb/function").State<Promise<import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes").BesluitType[]>>;
     get currentBesluitRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
-    get currentBesluitURI(): string | undefined;
     get showCard(): boolean;
-    updateBesluitTypes(): void;
-    updateBesluitType(selected: BesluitType): void;
-    updateBesluitSubType(selected: BesluitType): void;
-    updateBesluitSubSubType(selected: BesluitType): void;
-    findBesluitTypeParent(besluitType?: BesluitType, array?: BesluitType[] | null, parent?: BesluitType): BesluitType | undefined;
-    findBesluitTypeByURI(uri: string, types?: BesluitType[] | null): BesluitType | undefined;
-    insert(): void;
-    toggleCard(): void;
+    get selectedType(): import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes").BesluitType | undefined;
+    toggleCard: () => void;
+    setType: (type: BesluitTypeInstance) => void;
+    updateBesluitTypes: () => void;
+    insertIfValid(): void;
 }
 export {};

package/declarations/addon/components/common/documents/preview.d.ts

@@ -17,5 +17,7 @@ export default class DocumentPreview<Doc extends PreviewableDocument> extends Co
     togglePreview(): void;
     get isFavourite(): boolean | undefined;
     toggleFavourite: (event: MouseEvent) => void;
+    contentTask: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<"" | import("@ember/template").SafeString | null>>;
+    get content(): "" | import("@ember/template").SafeString | null | undefined;
 }
 export {};

package/declarations/addon/components/common/documents/types.d.ts

@@ -1,11 +1,4 @@
-import { SafeString } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
-interface PreviewableDocumentArgs {
+export interface PreviewableDocument {
     title: string | null;
-    content: string | null;
+    content: string | Promise<string | null> | null;
 }
-export declare class PreviewableDocument {
-    content: SafeString | null;
-    title: string | null;
-    constructor({ title, content }: PreviewableDocumentArgs);
-}
-export {};

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

@@ -0,0 +1,18 @@
+import { type EditorState } from '@lblod/ember-rdfa-editor';
+import { type BesluitType } from './fetchBesluitTypes';
+export interface BesluitTypeInstance {
+    parent: BesluitType;
+    subType?: BesluitType;
+    subSubType?: BesluitType;
+}
+export declare function extractBesluitTypeUris(editorState: EditorState): string[];
+/**
+ * Finds a decision type in the document and checks that it represents a valid decision type
+ * according to the list of types passed in.
+ */
+export declare function checkBesluitTypeInstance(editorState: EditorState, types: BesluitType[]): BesluitTypeInstance | false;
+/**
+ * Checks that the passed type instance has all of the necessary sub-types selected (and no more)
+ */
+export declare function isValidTypeChoice({ parent, subType, subSubType, }: BesluitTypeInstance): boolean;
+export declare function mostSpecificBesluitType(typeInstance: BesluitTypeInstance): BesluitType;

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

@@ -0,0 +1,4 @@
+import { type EditorState } from '@lblod/ember-rdfa-editor';
+import { type TransactionCombinatorResult } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { type BesluitTypeInstance } from './besluit-type-instances';
+export declare function setBesluitType(initialState: EditorState, typeInstance: BesluitTypeInstance): TransactionCombinatorResult<boolean>;

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

@@ -1,5 +1,5 @@
+import { PreviewableDocument } from '@lblod/ember-rdfa-editor-lblod-plugins/components/common/documents/types';
 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;
@@ -11,8 +11,8 @@ interface SnippetArgs {
     createdOn: string | null;
     content: string | null;
 }
-export declare class Snippet {
-    content: SafeString | null;
+export declare class Snippet implements PreviewableDocument {
+    content: string | null;
     createdOn: string | null;
     title: string | null;
     constructor({ title, createdOn, content }: SnippetArgs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "28.0.0",
+  "version": "28.1.0-dev.ed578cc3a5b1de900ca53bd1e5ebe4e950e51439",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",

package/translations/en-US.yaml

@@ -12,6 +12,13 @@ common:
     asc: Sort ascending
     desc: Sort descending
   not-applicable: 'N/A'
+  preview-list:
+    preview-button:
+      title: Show preview
+    select-button:
+      label: Select
+      title: Insert
+    no-content: Does not contain any content
 
 structure-plugin:
   move-up: 'Move {structureName} up'
@@ -82,6 +89,7 @@ citaten-plugin:
 
 besluit-type-plugin:
   dt: 'Decision type'
+  sub-type: 'Sub type'
   insert-dt: 'Select a decision type'
   search-message: 'Type to search'
   no-matches-message: 'No results'
@@ -219,7 +227,7 @@ variable-plugin:
     minimum-placeholder: minimum value
     maximum: Maximum
     maximum-placeholder: maximum value
-    to: to
+    to: to and including
   person:
     card-title: Insert person
     nodeview-placeholder: Person
@@ -255,16 +263,10 @@ snippet-plugin:
     active-lists: 'Active lists:'
   modal:
     title: Choose a snippet from {snippetListNames}
-    preview-button:
-      title: Show snippet preview
-    select-button:
-      label: Select
-      title: Insert snippet
     search:
       title: Filter on
       label: Snippet name
       placeholder: Type something...
-    no-content: Snippet does not contain any content
   snippet-list:
     open-modal: Manage snippet lists
     modal:

package/translations/nl-BE.yaml

@@ -12,6 +12,13 @@ common:
     asc: Oplopend sorteren
     desc: Aflopend sorteren
   not-applicable: 'n.v.t.'
+  preview-list:
+    preview-button:
+      title: Preview tonen
+    select-button:
+      label: Selecteer
+      title: Invoegen
+    no-content: Bevat geen inhoud
 
 structure-plugin:
   move-up: '{structureName} naar boven verplaatsen'
@@ -43,10 +50,10 @@ structure-plugin:
 
 citaten-plugin:
   card:
-    title: Voeg citeeropschrift toe
+    title: Voeg citaat toe
     suggestions: Suggesties
   insert:
-    title: Citeeropschrift invoegen
+    title: Citaat invoegen
   search:
     term: Zoekterm
     government-search: Filter op bestuursorgaan
@@ -70,7 +77,7 @@ citaten-plugin:
     previous: Vorige pagina
     of: van
   references:
-    insert: Citeeropschrift invoegen
+    insert: Citaat invoegen
     details: Details
     refer-whole: Verwijs naar volledig document
     refer-article: Verwijs naar artikel
@@ -82,6 +89,7 @@ citaten-plugin:
 
 besluit-type-plugin:
   dt: 'Besluittype'
+  sub-type: 'Subtype'
   insert-dt: 'Selecteer een besluittype'
   search-message: 'Typ om te zoeken'
   no-matches-message: 'Geen resultaten'
@@ -223,7 +231,7 @@ variable-plugin:
     minimum-placeholder: minimumwaarde
     maximum: Maximum
     maximum-placeholder: maximumwaarde
-    to: tot
+    to: tot en met
   person:
     card-title: Persoon invoegen
     nodeview-placeholder: Persoon
@@ -254,16 +262,10 @@ snippet-plugin:
     active-lists: 'Actieve lijsten:'
   modal:
     title: Kies een fragment uit {snippetListNames}
-    preview-button:
-      title: Preview van fragment tonen
-    select-button:
-      label: Selecteer
-      title: Fragment invoegen
     search:
       title: Filter op
       label: Fragmentnaam
       placeholder: Typ iets...
-    no-content: Fragment bevat geen inhoud
   snippet-list:
     open-modal: Fragmentlijsten beheren
     modal:

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

@@ -1,32 +0,0 @@
-{{! @glint-nocheck: not typesafe yet }}
-<div ...attributes>
-  <PowerSelect
-    @renderInPlace={{true}}
-    @searchEnabled={{true}}
-    @searchMessage={{t 'besluit-type-plugin.search-message'}}
-    @noMatchesMessage={{t 'besluit-type-plugin.no-matches-message'}}
-    @search={{this.search}}
-    @options={{this.besluitTypes}}
-    @selected={{@selected}}
-    @onChange={{@onchange}}
-    as |besluitType|
-  >
-    {{besluitType.label}}
-  </PowerSelect>
-  <p class='au-u-muted au-u-margin-tiny au-u-margin-bottom-small'>
-    {{@selected.definition}}
-  </p>
-  {{#if @showWarningWhenEmpty}}
-    {{#unless @selected}}
-      <AuAlert
-        @icon={{this.AlertTriangleIcon}}
-        @title={{t 'besluit-type-plugin.alert-title'}}
-        @skin='warning'
-        @size='small'
-        class='au-u-margin-bottom-none au-u-margin-top-small'
-      >
-        <p>{{t 'besluit-type-plugin.alert-body'}}</p>
-      </AuAlert>
-    {{/unless}}
-  {{/if}}
-</div>

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

@@ -1,29 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
-import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
-
-type Args = {
-  besluitTypes: BesluitType[];
-};
-
-export default class BesluitTypePluginBesluitTypeSelectComponent extends Component<Args> {
-  AlertTriangleIcon = AlertTriangleIcon;
-
-  @tracked besluitTypes;
-  constructor(parent: unknown, args: Args) {
-    super(parent, args);
-    this.besluitTypes = this.args.besluitTypes.sort((a, b) =>
-      a.label > b.label ? 1 : -1,
-    );
-  }
-
-  @action
-  search(term: string) {
-    const lowerTerm = term.toLowerCase();
-    return this.args.besluitTypes.filter((besluitType) =>
-      besluitType.label.toLowerCase().includes(lowerTerm),
-    );
-  }
-}

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

@@ -1,102 +0,0 @@
-{{! @glint-nocheck: not typesafe yet }}
-<div
-  {{did-update this.updateBesluitTypes @controller.mainEditorState}}
-  {{did-update this.updateBesluitTypes this.types.value}}
->
-  {{#if this.showCard}}
-    {{#if this.types.isError}}
-      <AuPill
-        @skin='error'
-        @icon={{this.CircleXIcon}}
-        @iconAlignment='left'
-        class='au-c-pill--link besluit-toolbar-pill'
-        {{on 'click' this.toggleCard}}
-        title={{t 'besluit-type-plugin.insert-dt'}}
-      >
-        {{t 'besluit-type-plugin.error-short'}}
-      </AuPill>
-    {{else}}
-      {{#if this.besluit.label}}
-        <AuPill
-          @skin='link'
-          {{on 'click' this.toggleCard}}
-          title={{t 'besluit-type-plugin.insert-dt'}}
-        >
-          {{t 'besluit-type-plugin.dt'}}:
-          {{this.besluit.label}}
-        </AuPill>
-      {{else}}
-        <AuPill
-          @icon={{this.AlertTriangleIcon}}
-          @iconAlignment='left'
-          @skin='link'
-          {{on 'click' this.toggleCard}}
-          title={{t 'besluit-type-plugin.insert-dt'}}
-        >
-          {{t 'besluit-type-plugin.insert-dt'}}
-        </AuPill>
-      {{/if}}
-    {{/if}}
-  {{/if}}
-  {{#if this.cardExpanded}}
-    <AuModal
-      @title={{t 'besluit-type-plugin.insert-dt'}}
-      @closeModal={{this.toggleCard}}
-      @modalOpen={{true}}
-      @size='default'
-      class='au-c-modal--overflow'
-      as |Modal|
-    >
-      <Modal.Body>
-        {{#if this.types.isError}}
-          <AuAlert
-            @title={{t 'besluit-type-plugin.error-title'}}
-            @skin='error'
-            @icon={{this.CrossIcon}}
-          >
-            <p>
-              {{t 'besluit-type-plugin.error-first-body'}}
-              {{! template-lint-disable no-bare-strings  }}
-              <AuLinkExternal
-                href='mailto:gelinktnotuleren@vlaanderen.be'
-                @icon={{this.MailIcon}}
-                @iconAlignment='left'
-              >
-                GelinktNotuleren@vlaanderen.be
-              </AuLinkExternal>
-              {{! template-lint-enable no-bare-strings  }}
-              {{t 'besluit-type-plugin.error-rest-body'}}
-            </p>
-          </AuAlert>
-        {{else}}
-          <BesluitTypePlugin::BesluitTypeSelect
-            @besluitTypes={{this.types.value}}
-            @onchange={{this.updateBesluitType}}
-            @selected={{this.besluit}}
-            @showWarningWhenEmpty={{false}}
-          />
-          {{#if this.besluit.subTypes.length}}
-            <AuHr @size='large' />
-            <BesluitTypePlugin::BesluitTypeSelect
-              @besluitTypes={{this.besluit.subTypes}}
-              @onchange={{this.updateBesluitSubType}}
-              @selected={{this.subBesluit}}
-              @showWarningWhenEmpty={{true}}
-              class='au-u-padding-left au-u-padding-right'
-            />
-          {{/if}}
-          {{#if this.subBesluit.subTypes.length}}
-            <AuHr @size='large' />
-            <BesluitTypePlugin::BesluitTypeSelect
-              @besluitTypes={{this.subBesluit.subTypes}}
-              @onchange={{this.updateBesluitSubSubType}}
-              @selected={{this.subSubBesluit}}
-              @showWarningWhenEmpty={{true}}
-              class='au-u-padding-left au-u-padding-right'
-            />
-          {{/if}}
-        {{/if}}
-      </Modal.Body>
-    </AuModal>
-  {{/if}}
-</div>