@lblod/ember-rdfa-editor-lblod-plugins 38.1.0 → 38.2.0

package/.woodpecker/.changeset.yml

@@ -1,6 +1,6 @@
 steps:
   changelog:
-    image: danlynn/ember-cli:4.8.0
+    image: danlynn/ember-cli:6.7.2-node_22.19
     commands:
       - git fetch origin master
       - git diff -wb --name-only origin/master..HEAD | grep "\.changeset/.*\.md"

package/.woodpecker/.release-commit.yml

@@ -1,11 +1,13 @@
 steps:
   install:
-    image: node:20-slim
+    image: node:22-slim
     commands:
+      - npm config set ignore-scripts true
+      - npm i -g corepack@0.35
       - corepack enable
       - pnpm i --frozen-lockfile
   version:
-    image: node:20-slim
+    image: node:22-slim
     commands:
       - npm version --no-git-tag-version $(npm pkg get version | sed 's/"//g')-dev.${CI_COMMIT_SHA}
   release:

package/.woodpecker/.release.yml

@@ -1,7 +1,9 @@
 steps:
   install:
-    image: node:20-slim
+    image: node:22-slim
     commands:
+      - npm config set ignore-scripts true
+      - npm i -g corepack@0.35
       - corepack enable
       - pnpm i --frozen-lockfile
   release:

package/.woodpecker/.verify-pr.yml

@@ -1,34 +1,38 @@
 steps:
   install:
-    image: node:20-slim
+    image: node:22-slim
     commands:
+      - npm config set ignore-scripts true
+      - npm i -g corepack@0.35
       - corepack enable
       - pnpm i --frozen-lockfile
   lint-js:
-    image: node:20-slim
+    image: node:22-slim
     group: lint
     commands:
       - corepack enable
       - pnpm lint:js
   lint-hbs:
-    image: node:20-slim
+    image: node:22-slim
     group: lint
     commands:
       - corepack enable
       - pnpm lint:hbs
   lint-prettier:
-    image: node:20-slim
+    image: node:22-slim
     group: lint
     commands:
       - corepack enable
       - pnpm lint:prettier
   test:
-    image: danlynn/ember-cli:4.12.1
+    image: danlynn/ember-cli:6.7.2-node_22.19
     commands:
+      - npm config set ignore-scripts true
+      - npm i -g corepack@0.35
       - corepack enable
       - pnpm test:ember
   precompile:
-    image: node:20-slim
+    image: node:22-slim
     commands:
       - corepack enable
       - pnpm prepack

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 38.2.0
+
+### Minor Changes
+
+- [#677](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/677) [`024bc21`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/024bc215bbe2eec144c6742a932680581799bb2a) Thanks [@piemonkey](https://github.com/piemonkey)! - Add loading feedback and error messages for snippet name loading
+
+### Patch Changes
+
+- [#675](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/675) [`e05f335`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e05f3357b9e61f80a94c78cef18d3bd5030c07bc) Thanks [@piemonkey](https://github.com/piemonkey)! - Expand peer-dep versions of ember-concurrency and ember-appuniversum based on versions already used in template-builder app
+
+- [#675](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/675) [`4a9e617`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4a9e617f2335f3f83016147ce8bff0a82ef62fe4) Thanks [@piemonkey](https://github.com/piemonkey)! - Fix bug with document title which caused crashes with some usage
+
+- [#671](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/671) [`770fa4e`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/770fa4e08e1b6cc41b4b4a0bc954005fe513dde7) Thanks [@piemonkey](https://github.com/piemonkey)! - Use node v22 for build process and pnpm v11.10
+
 ## 38.1.0
 
 ### Minor Changes

package/README.md

@@ -9,7 +9,7 @@ related to the LBLOD Project.
   4.12 is no longer tested and not officially supported, but should still work for now.
 
 - Embroider or ember-auto-import v2
-- Node 18 or above (20+ recommended)
+- Node 18 or above (22+ recommended)
 
 ## Installation
 

package/RELEASE.md

@@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
 * First, ensure that you have installed your projects dependencies:
 
 ```sh
-npm install
+pnpm install
 ```
 
 * Second, ensure that you have obtained a
@@ -50,7 +50,7 @@ npm install
 * And last (but not least 😁) do your release.
 
 ```sh
-npx release-it
+pnpm release
 ```
 
 [release-it](https://github.com/release-it/release-it/) manages the actual

package/addon/components/common/search/alert-load-error.gts

@@ -7,6 +7,20 @@ import AuLinkExternal from '@appuniversum/ember-appuniversum/components/au-link-
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
 import { MailIcon } from '@appuniversum/ember-appuniversum/components/icons/mail';
 
+function errorMessage(err: unknown): string {
+  if (!err) return 'Error';
+  if (typeof err !== 'object') return JSON.stringify(err);
+  return (
+    ('message' in err && (err?.message as string)) ||
+    // getPromiseState includes the original error, so try to use that to avoid their generic error
+    ('original' in err && (err?.original as Error | undefined)?.message) ||
+    // getPromiseState 'Error's use 'reason' in place of 'message' for some reason
+    ('reason' in err && (err?.reason as string)) ||
+    err?.toString?.() ||
+    'Error'
+  );
+}
+
 interface Sig {
   Args: {
     error: unknown;
@@ -26,8 +40,7 @@ const AlertLoadError: TemplateOnlyComponent<Sig> = <template>
     ...attributes
   >
     <p>{{t 'common.search.error-intro'}}</p>
-    {{! @glint-expect-error: This seems to work... I guess Error has a toString that is called? }}
-    <code class='au-u-error error-code'>{{@error}}</code>
+    <code class='au-u-error error-code'>{{errorMessage @error}}</code>
     <p>
       {{t 'common.search.error-outro'}}
       <AuLinkExternal

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

@@ -3,9 +3,11 @@ import { service } from '@ember/service';
 import { on } from '@ember/modifier';
 import IntlService from 'ember-intl/services/intl';
 import t from 'ember-intl/helpers/t';
+import { State } from 'reactiveweb/get-promise-state';
 import { PlusTextIcon } from '@appuniversum/ember-appuniversum/components/icons/plus-text';
 import AuIcon from '@appuniversum/ember-appuniversum/components/au-icon';
 import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
+import AuLoader from '@appuniversum/ember-appuniversum/components/au-loader';
 import { type EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/_private/ember-node';
 import { type SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 import getClassnamesFromNode from '@lblod/ember-rdfa-editor/utils/get-classnames-from-node';
@@ -13,7 +15,7 @@ import getClassnamesFromNode from '@lblod/ember-rdfa-editor/utils/get-classnames
 interface Signature {
   Args: Pick<EmberNodeArgs, 'node' | 'selectNode'> & {
     insertSnippet: () => void;
-    snippetListNames: string[];
+    snippetListNames: State<string[]>;
   };
 }
 
@@ -27,12 +29,12 @@ export default class SnippetPluginPlaceholder extends Component<Signature> {
     return this.node.attrs.config;
   }
   get isSingleList() {
-    return this.args.snippetListNames.length === 1;
+    return this.args.snippetListNames.resolved?.length === 1;
   }
   get alertTitle() {
     if (this.isSingleList) {
       return this.intl.t('snippet-plugin.placeholder.title-single', {
-        listName: this.args.snippetListNames[0],
+        listName: this.args.snippetListNames.resolved?.[0],
       });
     } else {
       return this.intl.t('snippet-plugin.placeholder.title-multiple');
@@ -53,18 +55,32 @@ export default class SnippetPluginPlaceholder extends Component<Signature> {
         <AuIcon @icon={{PlusTextIcon}} />
       </div>
       <div class='say-snippet-placeholder__content'>
-        <p class='say-snippet-placeholder__title'>{{this.alertTitle}}</p>
-        {{#unless this.isSingleList}}
-          <ul class='say-snippet-placeholder__list'>
-            {{#each @snippetListNames as |listName|}}
-              <li>{{listName}}</li>
-            {{/each}}
-          </ul>
-        {{/unless}}
+        {{#if @snippetListNames.isLoading}}
+          <AuLoader @hideMessage={{true}}>
+            {{t 'common.search.loading'}}
+          </AuLoader>
+        {{else}}
+          {{#if @snippetListNames.error}}
+            <p class='say-snippet-placeholder__title'>{{t
+                'snippet-plugin.snippet-list.name-error-message'
+                message=@snippetListNames.error.reason
+              }}</p>
+          {{else}}
+            <p class='say-snippet-placeholder__title'>{{this.alertTitle}}</p>
+            {{#unless this.isSingleList}}
+              <ul class='say-snippet-placeholder__list'>
+                {{#each @snippetListNames.resolved as |listName|}}
+                  <li>{{listName}}</li>
+                {{/each}}
+              </ul>
+            {{/unless}}
+          {{/if}}
+        {{/if}}
         {{#unless this.config.hidePlaceholderInsertButton}}
           <AuButton
             @skin='link'
             class='say-snippet-placeholder__button'
+            @disabled={{@snippetListNames.isLoading}}
             {{on 'click' @insertSnippet}}
           >
             {{t 'snippet-plugin.placeholder.button'}}

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

@@ -7,6 +7,7 @@ import { TemplateOnlyComponent } from '@ember/component/template-only';
 import { service } from '@ember/service';
 import t from 'ember-intl/helpers/t';
 import { trackedFunction } from 'reactiveweb/function';
+import { getPromiseState } from 'reactiveweb/get-promise-state';
 import AuIcon, {
   type AuIconSignature,
 } from '@appuniversum/ember-appuniversum/components/au-icon';
@@ -110,6 +111,9 @@ export default class SnippetNode extends Component<Signature> {
   openModal() {
     this.controller.focus();
     this.showModal = true;
+    if (this.snippetListNames.error) {
+      this.snippetListNames.retry();
+    }
   }
 
   @action
@@ -147,7 +151,6 @@ export default class SnippetNode extends Component<Signature> {
           listProperties: {
             placeholderId: this.node.attrs.placeholderId,
             listUris: this.snippetListUris,
-            names: this.snippetListNames,
             importedResources: this.node.attrs.importedResources,
           },
           schema: this.schema,
@@ -218,7 +221,6 @@ export default class SnippetNode extends Component<Signature> {
         listProperties: {
           placeholderId: this.node.attrs.placeholderId,
           listUris: this.snippetListUris,
-          names: this.snippetListNames,
           importedResources: this.node.attrs.importedResources,
         },
         range: { start, end },
@@ -231,15 +233,12 @@ export default class SnippetNode extends Component<Signature> {
     return getClassnamesFromNode(this.args.node);
   }
 
-  loadedListNames = trackedFunction(this, async () => {
+  snippetListNames = trackedFunction(this, async () => {
     return this.snippetFetchService.getListNames(
       this.config,
       this.snippetListUris,
     );
   });
-  get snippetListNames() {
-    return this.loadedListNames.value ?? [];
-  }
 
   <template>
     {{#if this.isPlaceholder}}
@@ -247,7 +246,7 @@ export default class SnippetNode extends Component<Signature> {
         @node={{@node}}
         @selectNode={{@selectNode}}
         @insertSnippet={{this.editFragment}}
-        @snippetListNames={{this.snippetListNames}}
+        @snippetListNames={{getPromiseState this.snippetListNames.promise}}
       />
     {{else}}
       <div class='{{this.class}} say-snippet-card'>
@@ -297,7 +296,7 @@ export default class SnippetNode extends Component<Signature> {
       @config={{this.config}}
       @onInsert={{this.onInsert}}
       @snippetListUris={{this.snippetListUris}}
-      @snippetListNames={{this.snippetListNames}}
+      @snippetListNames={{getPromiseState this.snippetListNames.promise}}
     />
   </template>
 }

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

@@ -4,8 +4,10 @@ import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { task as trackedTask } from 'reactiveweb/ember-concurrency';
+import { State } from 'reactiveweb/get-promise-state';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
+import IntlService from 'ember-intl/services/intl';
 import t from 'ember-intl/helpers/t';
 import { not } from 'ember-truth-helpers';
 import AuModal from '@appuniversum/ember-appuniversum/components/au-modal';
@@ -30,7 +32,7 @@ import SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services
 interface Args {
   config: SnippetPluginConfig;
   snippetListUris: Option<string[]>;
-  snippetListNames: Option<string[]>;
+  snippetListNames: State<string[]>;
   closeModal: () => void;
   open: boolean;
   onInsert: (snippet: Snippet) => void;
@@ -38,18 +40,11 @@ interface Args {
 
 export default class SnippetPluginSearchModalComponent extends Component<Args> {
   @service declare snippetFetchService: SnippetFetchService;
+  @service declare intl: IntlService;
 
   // Filtering
   @tracked inputSearchText: string | null = null;
 
-  // Display
-  @tracked error: unknown;
-
-  // Pagination
-  @tracked pageNumber = 0;
-  @tracked pageSize = 20;
-  @tracked totalCount = 0;
-
   get config() {
     return this.args.config;
   }
@@ -58,8 +53,17 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
     return this.inputSearchText;
   }
 
-  get snippetListNames() {
-    return this.args.snippetListNames?.map((name) => `"${name}"`).join(', ');
+  get modalTitle() {
+    const listNames = this.args.snippetListNames;
+    return listNames.isLoading
+      ? this.intl.t('common.search.loading')
+      : listNames.error
+        ? this.intl.t('snippet-plugin.snippet-list.name-error')
+        : this.intl.t('snippet-plugin.modal.title', {
+            snippetListNames: listNames.resolved
+              ?.map((name) => `"${name}"`)
+              .join(', '),
+          });
   }
 
   @action
@@ -72,70 +76,12 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
     this.inputSearchText = event.target.value;
   }
 
-  @action
-  async closeModal() {
-    await this.snippetsResource.cancel();
-    this.args.closeModal();
-  }
-
-  snippetsSearch = restartableTask(async () => {
-    if (this.searchText) {
-      await timeout(500);
-    }
-
-    const abortController = new AbortController();
-
-    try {
-      const queryResult = await this.snippetFetchService.getSnippets({
-        endpoint: this.args.config.endpoint,
-        abortSignal: abortController.signal,
-        filter: {
-          name: this.inputSearchText ?? undefined,
-          snippetListUris: this.args.snippetListUris ?? undefined,
-        },
-        pagination: {
-          pageNumber: this.pageNumber,
-          pageSize: this.pageSize,
-        },
-      });
-
-      this.totalCount = queryResult.totalCount;
-
-      return queryResult.results;
-    } catch (error) {
-      this.error = error;
-      return [];
-    } finally {
-      abortController.abort();
-    }
-  });
-
-  snippetsResource = trackedTask<Snippet[]>(this, this.snippetsSearch, () => [
-    this.inputSearchText,
-    this.pageNumber,
-    this.pageSize,
-    this.args.snippetListUris,
-  ]);
-
-  @action
-  previousPage() {
-    --this.pageNumber;
-  }
-
-  @action
-  nextPage() {
-    ++this.pageNumber;
-  }
-
   <template>
     <AuModal
       class='snippet-modal'
       @modalOpen={{@open}}
-      @closeModal={{this.closeModal}}
-      @title={{t
-        'snippet-plugin.modal.title'
-        snippetListNames=this.snippetListNames
-      }}
+      @closeModal={{@closeModal}}
+      @title={{this.modalTitle}}
       @size='large'
       @padding='none'
       as |modal|
@@ -174,49 +120,121 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
             </div>
           </mc.sidebar>
           <mc.content @scroll={{true}}>
-            <div class='au-u-padding-top snippet-modal--list-container'>
-              {{#if this.snippetsResource.isRunning}}
-                <div class='au-u-margin'>
-                  <Loading />
-                </div>
-              {{else}}
-                {{#if this.error}}
-                  <AlertLoadError @error={{this.error}} />
-                {{else}}
-                  {{#if this.snippetsResource.value.length}}
-                    <PreviewList
-                      @docs={{this.snippetsResource.value}}
-                      @onInsert={{@onInsert}}
-                    />
-                  {{else}}
-                    <AlertNoItems />
-                  {{/if}}
-                {{/if}}
-              {{/if}}
-            </div>
-            {{#if this.snippetsResource.value.length}}
-              {{#let
-                (pagination
-                  page=this.pageNumber
-                  pageSize=this.pageSize
-                  count=this.totalCount
-                )
-                as |pg|
-              }}
-                <PaginationView
-                  @totalCount={{pg.count}}
-                  @rangeStart={{pg.pageStart}}
-                  @rangeEnd={{pg.pageEnd}}
-                  @onNextPage={{this.nextPage}}
-                  @onPreviousPage={{this.previousPage}}
-                  @isFirstPage={{not pg.hasPreviousPage}}
-                  @isLastPage={{not pg.hasNextPage}}
-                />
-              {{/let}}
-            {{/if}}
+            <Inner
+              @snippetListUris={{@snippetListUris}}
+              @searchText={{this.inputSearchText}}
+              @onInsert={{@onInsert}}
+              @config={{@config}}
+            />
           </mc.content>
         </AuMainContainer>
       </modal.Body>
     </AuModal>
   </template>
 }
+
+type InnerSig = {
+  Args: {
+    snippetListUris: Option<string[]>;
+    searchText: string | null;
+    onInsert: (snippet: Snippet) => void;
+    config: SnippetPluginConfig;
+  };
+};
+
+// Split out inner component to allow for easy re-trying of fetch errors
+class Inner extends Component<InnerSig> {
+  @service declare snippetFetchService: SnippetFetchService;
+
+  // Pagination
+  @tracked pageNumber = 0;
+  @tracked pageSize = 20;
+  @tracked totalCount = 0;
+
+  snippetsSearch = restartableTask(async () => {
+    if (this.args.searchText) {
+      await timeout(500);
+    }
+
+    const abortController = new AbortController();
+
+    try {
+      const queryResult = await this.snippetFetchService.getSnippets({
+        endpoint: this.args.config.endpoint,
+        abortSignal: abortController.signal,
+        filter: {
+          name: this.args.searchText ?? undefined,
+          snippetListUris: this.args.snippetListUris ?? undefined,
+        },
+        pagination: {
+          pageNumber: this.pageNumber,
+          pageSize: this.pageSize,
+        },
+      });
+
+      this.totalCount = queryResult.totalCount;
+
+      return queryResult.results;
+    } finally {
+      abortController.abort();
+    }
+  });
+
+  snippetsResource = trackedTask<Snippet[]>(this, this.snippetsSearch, () => [
+    this.args.searchText,
+    this.pageNumber,
+    this.pageSize,
+    this.args.snippetListUris,
+  ]);
+
+  @action
+  previousPage() {
+    --this.pageNumber;
+  }
+
+  @action
+  nextPage() {
+    ++this.pageNumber;
+  }
+
+  <template>
+    <div class='au-u-padding-top snippet-modal--list-container'>
+      {{#if this.snippetsResource.isRunning}}
+        <div class='au-u-margin'>
+          <Loading />
+        </div>
+      {{else}}
+        {{#if this.snippetsResource.error}}
+          <AlertLoadError @error={{this.snippetsResource.error}} />
+        {{else}}
+          {{#if this.snippetsResource.value.length}}
+            <PreviewList
+              @docs={{this.snippetsResource.value}}
+              @onInsert={{@onInsert}}
+            />
+          {{else}}
+            <AlertNoItems />
+          {{/if}}
+        {{/if}}
+      {{/if}}
+    </div>
+    {{#if this.snippetsResource.value.length}}
+      {{#let
+        (pagination
+          page=this.pageNumber pageSize=this.pageSize count=this.totalCount
+        )
+        as |pg|
+      }}
+        <PaginationView
+          @totalCount={{pg.count}}
+          @rangeStart={{pg.pageStart}}
+          @rangeEnd={{pg.pageEnd}}
+          @onNextPage={{this.nextPage}}
+          @onPreviousPage={{this.previousPage}}
+          @isFirstPage={{not pg.hasPreviousPage}}
+          @isLastPage={{not pg.hasNextPage}}
+        />
+      {{/let}}
+    {{/if}}
+  </template>
+}

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

@@ -1,8 +1,11 @@
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
+import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import t from 'ember-intl/helpers/t';
+import { trackedFunction } from 'reactiveweb/function';
+import { getPromiseState } from 'reactiveweb/get-promise-state';
 import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 import {
@@ -16,6 +19,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 import { type SnippetListProperties } 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 SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';
 import SearchModal from './search-modal';
 
 interface Sig {
@@ -28,6 +32,8 @@ interface Sig {
 }
 
 export default class SnippetInsertComponent extends Component<Sig> {
+  @service declare snippetFetchService: SnippetFetchService;
+
   @tracked showModal = false;
 
   get controller() {
@@ -73,6 +79,16 @@ export default class SnippetInsertComponent extends Component<Sig> {
     }
   }
 
+  snippetListNames = trackedFunction(this, async () => {
+    return (
+      this.args.listProperties &&
+      this.snippetFetchService.getListNames(
+        this.args.config,
+        this.args.listProperties.listUris,
+      )
+    );
+  });
+
   <template>
     <li class='au-c-list__item'>
       <AuButton
@@ -92,7 +108,7 @@ export default class SnippetInsertComponent extends Component<Sig> {
       @config={{@config}}
       @onInsert={{this.onInsert}}
       @snippetListUris={{@listProperties.listUris}}
-      @snippetListNames={{@listProperties.names}}
+      @snippetListNames={{getPromiseState this.snippetListNames.promise}}
     />
   </template>
 }

package/addon/plugins/document-title-plugin/nodes/document-title.ts

@@ -4,7 +4,7 @@ import { ELI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
 import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 
-const rdfaAware = true;
+const rdfaAware = false;
 export const document_title: NodeSpec = {
   content: 'paragraph{1}',
   inline: false,

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

@@ -64,7 +64,6 @@ export function createSnippetPlaceholder({
     listProps = {
       // This is a completely new placeholder, so new id
       placeholderId: uuidv4(),
-      names: args.lists.map((list) => list.label),
       importedResources: importedResourcesFromSnippetLists(args.lists),
     };
     additionalProperties = args.lists.map((list) =>

package/addon/plugins/table-of-contents-plugin/utils/index.ts

@@ -1,6 +1,7 @@
 import { NodeWithPos } from '@curvenote/prosemirror-utils';
 import { LegacyTableOfContentsConfig, TableOfContentsConfig } from '..';
 import { DOMOutputSpec, PNode, EditorState } from '@lblod/ember-rdfa-editor';
+import { Mutable } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 
 export type OutlineEntry = {
   content: string;
@@ -8,10 +9,6 @@ export type OutlineEntry = {
   children?: OutlineEntry[];
 };
 
-type Mutable<T> = {
-  -readonly [P in keyof T]: T[P];
-};
-
 export function createTableOfContents(entries: OutlineEntry[]) {
   const tableOfContents: Mutable<DOMOutputSpec> = [
     'ul',

package/addon/utils/types.ts

@@ -7,3 +7,7 @@ export type AllOrNone<T> = T | { [K in keyof T]?: never };
 export type ContentSpec = Fragment | PNode | PNode[];
 
 export type ValueOf<T> = T[keyof T];
+
+export type Mutable<T> = {
+  -readonly [P in keyof T]: T[P];
+};

package/declarations/addon/components/snippet-plugin/nodes/placeholder.d.ts

@@ -1,11 +1,12 @@
 import Component from '@glimmer/component';
 import IntlService from 'ember-intl/services/intl';
+import { State } from 'reactiveweb/get-promise-state';
 import { type EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/_private/ember-node';
 import { type SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 interface Signature {
     Args: Pick<EmberNodeArgs, 'node' | 'selectNode'> & {
         insertSnippet: () => void;
-        snippetListNames: string[];
+        snippetListNames: State<string[]>;
     };
 }
 export default class SnippetPluginPlaceholder extends Component<Signature> {

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

@@ -31,7 +31,6 @@ export default class SnippetNode extends Component<Signature> {
     get isActive(): boolean;
     onInsert(snippet: Snippet): void;
     get class(): string;
-    loadedListNames: import("reactiveweb/function").State<Promise<string[]>>;
-    get snippetListNames(): string[];
+    snippetListNames: import("reactiveweb/function").State<Promise<string[]>>;
 }
 export {};

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

@@ -1,30 +1,24 @@
 import Component from '@glimmer/component';
+import { State } from 'reactiveweb/get-promise-state';
+import IntlService from 'ember-intl/services/intl';
 import { Option } from '@lblod/ember-rdfa-editor/utils/option';
 import { Snippet, SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 import SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';
 interface Args {
     config: SnippetPluginConfig;
     snippetListUris: Option<string[]>;
-    snippetListNames: Option<string[]>;
+    snippetListNames: State<string[]>;
     closeModal: () => void;
     open: boolean;
     onInsert: (snippet: Snippet) => void;
 }
 export default class SnippetPluginSearchModalComponent extends Component<Args> {
     snippetFetchService: SnippetFetchService;
+    intl: IntlService;
     inputSearchText: string | null;
-    error: unknown;
-    pageNumber: number;
-    pageSize: number;
-    totalCount: number;
     get config(): SnippetPluginConfig;
     get searchText(): string | null;
-    get snippetListNames(): string | undefined;
+    get modalTitle(): string;
     setInputSearchText(event: InputEvent): void;
-    closeModal(): Promise<void>;
-    snippetsSearch: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<Snippet[]>>;
-    snippetsResource: import("reactiveweb/ember-concurrency").TaskInstance<Snippet[]>;
-    previousPage(): void;
-    nextPage(): void;
 }
 export {};

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

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { type SayController, Slice } from '@lblod/ember-rdfa-editor';
 import { Snippet, SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 import { type SnippetListProperties } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';
 interface Sig {
     Args: {
         controller: SayController;
@@ -11,6 +12,7 @@ interface Sig {
     };
 }
 export default class SnippetInsertComponent extends Component<Sig> {
+    snippetFetchService: SnippetFetchService;
     showModal: boolean;
     get controller(): SayController;
     get disabled(): boolean;
@@ -18,5 +20,6 @@ export default class SnippetInsertComponent extends Component<Sig> {
     closeModal(): void;
     createSliceFromElement(element: Element): Slice;
     onInsert(snippet: Snippet): void;
+    snippetListNames: import("reactiveweb/function").State<Promise<string[] | undefined>>;
 }
 export {};

package/declarations/addon/utils/types.d.ts

@@ -6,3 +6,6 @@ export type AllOrNone<T> = T | {
 };
 export type ContentSpec = Fragment | PNode | PNode[];
 export type ValueOf<T> = T[keyof T];
+export type Mutable<T> = {
+    -readonly [P in keyof T]: T[P];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "38.1.0",
+  "version": "38.2.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -180,11 +180,11 @@
     "webpack": "^5.95.0"
   },
   "peerDependencies": {
-    "@appuniversum/ember-appuniversum": "^3.12.0",
+    "@appuniversum/ember-appuniversum": "^3.12.0 || ^4.0.0",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
     "@lblod/ember-rdfa-editor": "^13.12.0",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^4.0.2 || ^5.0.0",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",
     "ember-leaflet": "^5.1.3",
@@ -216,5 +216,5 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   },
-  "packageManager": "pnpm@10.28.2"
+  "packageManager": "pnpm@11.10.0"
 }

package/pnpm-workspace.yaml

@@ -1,3 +1,6 @@
+allowBuilds:
+  core-js: true
 overrides:
   'prosemirror-model': '^1.25.9'
   '@codemirror/state': '^6.7.0'
+  browserslist: '^4.28.8'

package/translations/en-US.yaml

@@ -275,6 +275,8 @@ snippet-plugin:
       label: Snippet name
       placeholder: Type something...
   snippet-list:
+    name-error: Error loading snippet list names
+    name-error-message: 'Error loading snippet list names: {message}'
     open-modal: Manage snippet lists
     modal:
       title: Select available snippet lists for this template

package/translations/nl-BE.yaml

@@ -274,6 +274,8 @@ snippet-plugin:
       label: Fragmentnaam
       placeholder: Vul in…
   snippet-list:
+    name-error: Probleem bij het laden van de namen van de fragmentlijsten
+    name-error-message: 'Probleem bij het laden van de namen van de fragmentlijsten: {message}'
     open-modal: Fragmentlijsten beheren
     modal:
       title: Selecteer beschikbare fragmentlijsten voor deze sjabloon