@lblod/ember-rdfa-editor-lblod-plugins 38.0.2 → 38.0.3-dev.9ded4345c52e1bc6f22bb3fbae8dfd96c5d6e6be

package/.changeset/early-carrots-smoke.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Cache snippets for insertion when not doing a text search

package/.changeset/friendly-points-yell.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Query for snippet list names instead of storing names when inserting

package/.changeset/fuzzy-nails-knock.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+No longer store snippet list names on snippet nodes. Passing this when creating snippets or placeholders is now deprecated.

package/.changeset/kind-humans-allow.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Make endpoint arg for location variable config required in the typescript type, which matches the documentation, and the reality of handling locations without a source attribute

package/.changeset/lucky-chairs-complain.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Cache snippet list names to avoid excess queries

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 38.0.3
+
+### Patch Changes
+
+- [`448e7e3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/448e7e324996d4422d2ba236bd3fba8970a8bb5d) Thanks [@abeforgit](https://github.com/abeforgit)! - Republish 38.0.2
+
 ## 38.0.2
 
 ### Patch Changes

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

@@ -13,6 +13,7 @@ import getClassnamesFromNode from '@lblod/ember-rdfa-editor/utils/get-classnames
 interface Signature {
   Args: Pick<EmberNodeArgs, 'node' | 'selectNode'> & {
     insertSnippet: () => void;
+    snippetListNames: string[];
   };
 }
 
@@ -22,19 +23,16 @@ export default class SnippetPluginPlaceholder extends Component<Signature> {
   get node() {
     return this.args.node;
   }
-  get listNames() {
-    return this.args.node.attrs.snippetListNames;
-  }
   get config(): SnippetPluginConfig {
     return this.node.attrs.config;
   }
   get isSingleList() {
-    return this.listNames.length === 1;
+    return this.args.snippetListNames.length === 1;
   }
   get alertTitle() {
     if (this.isSingleList) {
       return this.intl.t('snippet-plugin.placeholder.title-single', {
-        listName: this.listNames[0],
+        listName: this.args.snippetListNames[0],
       });
     } else {
       return this.intl.t('snippet-plugin.placeholder.title-multiple');
@@ -58,7 +56,7 @@ export default class SnippetPluginPlaceholder extends Component<Signature> {
         <p class='say-snippet-placeholder__title'>{{this.alertTitle}}</p>
         {{#unless this.isSingleList}}
           <ul class='say-snippet-placeholder__list'>
-            {{#each this.listNames as |listName|}}
+            {{#each @snippetListNames as |listName|}}
               <li>{{listName}}</li>
             {{/each}}
           </ul>

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

@@ -4,7 +4,9 @@ import SearchModal from '../search-modal';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 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 AuIcon, {
   type AuIconSignature,
 } from '@appuniversum/ember-appuniversum/components/au-icon';
@@ -33,8 +35,12 @@ import { createSnippetPlaceholder } from '@lblod/ember-rdfa-editor-lblod-plugins
 import { hasDecendant } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/has-descendant';
 import SnippetPlaceholder from '@lblod/ember-rdfa-editor-lblod-plugins/components/snippet-plugin/nodes/placeholder';
 import { getSnippetListUrisFromNode } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/rdfa-predicate';
-import { Snippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import {
+  Snippet,
+  SnippetPluginConfig,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 import getClassnamesFromNode from '@lblod/ember-rdfa-editor/utils/get-classnames-from-node';
+import SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';
 
 interface ButtonSig {
   Args: {
@@ -64,8 +70,11 @@ interface Signature {
 }
 
 export default class SnippetNode extends Component<Signature> {
+  @service declare snippetFetchService: SnippetFetchService;
+
   @tracked showModal: boolean = false;
   @tracked mode: string = '';
+
   get controller() {
     return this.args.controller;
   }
@@ -87,6 +96,12 @@ export default class SnippetNode extends Component<Signature> {
   get allowMultipleSnippets() {
     return this.node.attrs.allowMultipleSnippets as boolean;
   }
+  get snippetListUris() {
+    return getSnippetListUrisFromNode(this.node);
+  }
+  get config(): SnippetPluginConfig {
+    return this.node.attrs.config;
+  }
 
   @action
   closeModal() {
@@ -131,8 +146,8 @@ export default class SnippetNode extends Component<Signature> {
         const node = createSnippetPlaceholder({
           listProperties: {
             placeholderId: this.node.attrs.placeholderId,
-            listUris: getSnippetListUrisFromNode(this.node),
-            names: this.node.attrs.snippetListNames,
+            listUris: this.snippetListUris,
+            names: this.snippetListNames,
             importedResources: this.node.attrs.importedResources,
           },
           schema: this.schema,
@@ -202,8 +217,8 @@ export default class SnippetNode extends Component<Signature> {
         title: snippet.title ?? '',
         listProperties: {
           placeholderId: this.node.attrs.placeholderId,
-          listUris: getSnippetListUrisFromNode(this.node),
-          names: this.node.attrs.snippetListNames,
+          listUris: this.snippetListUris,
+          names: this.snippetListNames,
           importedResources: this.node.attrs.importedResources,
         },
         range: { start, end },
@@ -216,12 +231,23 @@ export default class SnippetNode extends Component<Signature> {
     return getClassnamesFromNode(this.args.node);
   }
 
+  loadedListNames = trackedFunction(this, async () => {
+    return this.snippetFetchService.getListNames(
+      this.config,
+      this.snippetListUris,
+    );
+  });
+  get snippetListNames() {
+    return this.loadedListNames.value ?? [];
+  }
+
   <template>
     {{#if this.isPlaceholder}}
       <SnippetPlaceholder
         @node={{@node}}
         @selectNode={{@selectNode}}
         @insertSnippet={{this.editFragment}}
+        @snippetListNames={{this.snippetListNames}}
       />
     {{else}}
       <div class='{{this.class}} say-snippet-card'>
@@ -268,10 +294,10 @@ export default class SnippetNode extends Component<Signature> {
     <SearchModal
       @open={{this.showModal}}
       @closeModal={{this.closeModal}}
-      @config={{this.node.attrs.config}}
+      @config={{this.config}}
       @onInsert={{this.onInsert}}
-      @snippetListUris={{getSnippetListUrisFromNode this.node}}
-      @snippetListNames={{this.node.attrs.snippetListNames}}
+      @snippetListUris={{this.snippetListUris}}
+      @snippetListNames={{this.snippetListNames}}
     />
   </template>
 }

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

@@ -1,7 +1,7 @@
-import pagination from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/pagination';
 import Component from '@glimmer/component';
 import { assert } from '@ember/debug';
 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 { tracked } from '@glimmer/tracking';
@@ -13,10 +13,11 @@ import AuMainContainer from '@appuniversum/ember-appuniversum/components/au-main
 import AuHeading from '@appuniversum/ember-appuniversum/components/au-heading';
 import AuLabel from '@appuniversum/ember-appuniversum/components/au-label';
 
+import { Option } from '@lblod/ember-rdfa-editor/utils/option';
+import pagination from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/pagination';
 import AuNativeInput from '@lblod/ember-rdfa-editor-lblod-plugins/components/au-native-input';
 import Loading from '@lblod/ember-rdfa-editor-lblod-plugins/components/common/search/loading';
 import AlertLoadError from '@lblod/ember-rdfa-editor-lblod-plugins/components/common/search/alert-load-error';
-import { fetchSnippets } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/fetch-data';
 import {
   Snippet,
   SnippetPluginConfig,
@@ -24,17 +25,20 @@ import {
 import PreviewList from '@lblod/ember-rdfa-editor-lblod-plugins/components/common/documents/preview-list';
 import AlertNoItems from '@lblod/ember-rdfa-editor-lblod-plugins/components/common/search/alert-no-items';
 import PaginationView from '@lblod/ember-rdfa-editor-lblod-plugins/components/pagination/pagination-view';
+import SnippetFetchService from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';
 
 interface Args {
   config: SnippetPluginConfig;
-  snippetListUris: string[] | undefined;
-  snippetListNames: string[] | undefined;
+  snippetListUris: Option<string[]>;
+  snippetListNames: Option<string[]>;
   closeModal: () => void;
   open: boolean;
   onInsert: (snippet: Snippet) => void;
 }
 
 export default class SnippetPluginSearchModalComponent extends Component<Args> {
+  @service declare snippetFetchService: SnippetFetchService;
+
   // Filtering
   @tracked inputSearchText: string | null = null;
 
@@ -75,12 +79,14 @@ export default class SnippetPluginSearchModalComponent extends Component<Args> {
   }
 
   snippetsSearch = restartableTask(async () => {
-    await timeout(500);
+    if (this.searchText) {
+      await timeout(500);
+    }
 
     const abortController = new AbortController();
 
     try {
-      const queryResult = await fetchSnippets({
+      const queryResult = await this.snippetFetchService.getSnippets({
         endpoint: this.args.config.endpoint,
         abortSignal: abortController.signal,
         filter: {

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

@@ -28,7 +28,6 @@ export default class SnippetInsertRdfaComponent extends Component<Sig> {
       return {
         listUris,
         placeholderId: activeNode.attrs.placeholderId,
-        names: activeNode.attrs.snippetListNames,
         importedResources: activeNode.attrs.importedResources,
       };
     }
@@ -50,7 +49,6 @@ export default class SnippetInsertRdfaComponent extends Component<Sig> {
         return {
           listUris,
           placeholderId: parentNode.node.attrs.placeholderId,
-          names: parentNode.node.attrs.snippetListNames,
           importedResources: parentNode.node.attrs.importedResources,
         };
       }

package/addon/plugins/snippet-plugin/commands/update-snippet-placeholder.ts

@@ -1,7 +1,6 @@
 import { Command } from '@lblod/ember-rdfa-editor';
 import { addProperty, removeProperty } from '@lblod/ember-rdfa-editor/commands';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
-import { SNIPPET_LIST_RDFA_PREDICATE } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/rdfa-predicate';
+import { tripleForSnippetListUri } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/rdfa-predicate';
 import { type OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import { type ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import {
@@ -47,20 +46,12 @@ export const updateSnippetPlaceholder = ({
 
         addProperty({
           resource,
-          property: {
-            predicate: SNIPPET_LIST_RDFA_PREDICATE.prefixed,
-            object: sayDataFactory.namedNode(list.uri),
-          },
+          property: tripleForSnippetListUri(list.uri),
           transaction,
         })(newState, (newTransaction) => {
           transaction = newTransaction;
         });
       });
-      transaction = transaction.setNodeAttribute(
-        node.pos,
-        'snippetListNames',
-        newSnippetLists.map((list) => list.label),
-      );
       transaction = transaction.setNodeAttribute(
         node.pos,
         'importedResources',

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

@@ -33,7 +33,8 @@ export type ImportedResourceMap = Record<string, Option<string>>;
 export type SnippetListProperties = {
   placeholderId: string;
   listUris: string[];
-  names: string[];
+  /** @deprecated Passing snippet list names is no longer necessary */
+  names?: string[];
   importedResources: ImportedResourceMap;
 };
 

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

@@ -81,7 +81,6 @@ export function createSnippetPlaceholder({
   return schema.nodes.snippet_placeholder.create({
     rdfaNodeType: 'resource',
     placeholderId: listProps.placeholderId,
-    snippetListNames: listProps.names,
     subject: mappingResource,
     properties: [
       {
@@ -106,7 +105,6 @@ const emberNodeConfig = (config: SnippetPluginConfig): EmberNodeConfig => ({
     ...rdfaAttrSpec({ rdfaAware: true }),
     typeof: { default: EXT('SnippetPlaceholder') },
     placeholderId: { default: '' },
-    snippetListNames: { default: [] },
     importedResources: { default: {} },
     allowMultipleSnippets: { default: false },
     config: {
@@ -117,13 +115,11 @@ const emberNodeConfig = (config: SnippetPluginConfig): EmberNodeConfig => ({
   classNames: ['say-snippet'],
   serialize(node, editorState) {
     const t = getTranslationFunction(editorState);
-    const listNames = node.attrs.snippetListNames as string[];
     return renderRdfaAware({
       renderable: node,
       tag: 'div',
       attrs: {
         class: `${getClassnamesFromNode(node)} say-snippet-placeholder`,
-        'data-list-names': listNames && JSON.stringify(listNames),
         'data-imported-resources': JSON.stringify(node.attrs.importedResources),
         'data-allow-multiple-snippets': node.attrs.allowMultipleSnippets,
       },
@@ -149,20 +145,12 @@ const emberNodeConfig = (config: SnippetPluginConfig): EmberNodeConfig => ({
             EXT('SnippetPlaceholder'),
           )
         ) {
-          let snippetListNames = jsonParse(
-            node.getAttribute('data-list-names'),
-          );
-          if (!snippetListNames) {
-            // We might have an older version which is comma separated
-            snippetListNames = node.getAttribute('data-list-names')?.split(',');
-          }
           return {
             ...rdfaAttrs,
             // Generate a placeholderId any time we deserialise, this way we don't need to handle
             // generating new ids whenever we re-use parts of a document (e.g. copy-paste or
             // placeholders inside snippets)
             placeholderId: uuidv4(),
-            snippetListNames,
             importedResources: jsonParse(
               node.getAttribute('data-imported-resources'),
             ),

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

@@ -84,12 +84,7 @@ export function createSnippet({
   content,
   title,
   allowMultipleSnippets,
-  listProperties: {
-    listUris,
-    names: snippetListNames,
-    importedResources,
-    placeholderId,
-  },
+  listProperties: { listUris, importedResources, placeholderId },
 }: CreateSnippetArgs): [PNode, Map<string, OutgoingTriple[]>] {
   // Replace instances of linked to uris with the resources that exist in the outer document.
   let replacedContent = content;
@@ -116,7 +111,6 @@ export function createSnippet({
     {
       placeholderId,
       properties,
-      snippetListNames,
       title,
       subject: `http://data.lblod.info/snippets/${uuidv4()}`,
       importedResources,
@@ -169,7 +163,6 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
     },
     rdfaNodeType: { default: 'resource' },
     placeholderId: { default: '' },
-    snippetListNames: { default: [] },
     importedResources: { default: {} },
     title: { default: '' },
     config: { default: options },
@@ -180,13 +173,11 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
   content: options.allowedContent || DEFAULT_CONTENT_STRING,
   classNames: ['say-snippet'],
   serialize(node) {
-    const listNames = node.attrs.snippetListNames as string[];
     return renderRdfaAware({
       renderable: node,
       tag: 'div',
       attrs: {
         'data-snippet-placeholder-id': node.attrs.placeholderId,
-        'data-list-names': listNames && JSON.stringify(listNames),
         'data-imported-resources': JSON.stringify(node.attrs.importedResources),
         'data-snippet-title': node.attrs.title,
         'data-allow-multiple-snippets': node.attrs.allowMultipleSnippets,
@@ -225,7 +216,6 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
             ...rdfaAttrs,
             properties,
             placeholderId,
-            snippetListNames: jsonParse(node.getAttribute('data-list-names')),
             importedResources: jsonParse(
               node.getAttribute('data-imported-resources'),
             ),

package/addon/plugins/snippet-plugin/utils/fetch-data.ts

@@ -7,7 +7,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 import { Snippet, SnippetList, SnippetListArgs } from '../index';
 
-type Filter = { name?: string; snippetListUris?: string[] };
+export type SnippetFilter = { name?: string; snippetListUris?: string[] };
 export type OrderBy =
   | 'label'
   | 'created-on'
@@ -15,9 +15,9 @@ export type OrderBy =
   | '-created-on'
   | ''
   | null;
-type Pagination = { pageNumber: number; pageSize: number };
+export type Pagination = { pageNumber: number; pageSize: number };
 
-const buildSnippetCountQuery = ({ name, snippetListUris }: Filter) => {
+const buildSnippetCountQuery = ({ name, snippetListUris }: SnippetFilter) => {
   return /* sparql */ `
       PREFIX schema: <http://schema.org/>
       PREFIX dct: <http://purl.org/dc/terms/>
@@ -52,7 +52,7 @@ const buildSnippetCountQuery = ({ name, snippetListUris }: Filter) => {
       `;
 };
 
-// const buildSnippetListCountQuery = ({ name }: Filter) => {
+// const buildSnippetListCountQuery = ({ name }: SnippetFilter) => {
 //   return `
 //       PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
 //       SELECT (COUNT(?snippetLists) AS ?count)
@@ -72,7 +72,7 @@ const buildSnippetFetchQuery = ({
   filter: { name, snippetListUris },
   pagination: { pageSize, pageNumber },
 }: {
-  filter: Filter;
+  filter: SnippetFilter;
   pagination: Pagination;
 }) => {
   return /* sparql */ `
@@ -138,7 +138,7 @@ const buildSnippetListFetchQuery = ({
   filter: { name },
   orderBy,
 }: {
-  filter: Filter;
+  filter: SnippetFilter;
   orderBy: OrderBy;
 }) => {
   return /* sparql */ `
@@ -161,6 +161,21 @@ const buildSnippetListFetchQuery = ({
         `;
 };
 
+const buildSnippetListNameFetchQuery = (snippetListUris: string[]) => {
+  return /* sparql */ `
+        PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+        PREFIX say: <https://say.data.gift/ns/>
+
+        SELECT DISTINCT ?snippetList ?snippetListName WHERE {
+          ?snippetList a say:SnippetList;
+            skos:prefLabel ?snippetListName.
+          FILTER (?snippetList IN (${snippetListUris
+            .map(sparqlEscapeUri)
+            .join(', ')}))
+        }
+        `;
+};
+
 export const fetchSnippets = async ({
   endpoint,
   abortSignal,
@@ -169,7 +184,7 @@ export const fetchSnippets = async ({
 }: {
   endpoint: string;
   abortSignal: AbortSignal;
-  filter: Filter;
+  filter: SnippetFilter;
   pagination: Pagination;
 }) => {
   if (!filter.snippetListUris?.length) {
@@ -196,14 +211,13 @@ export const fetchSnippets = async ({
     abortSignal,
   });
 
-  const results = queryResult.results.bindings.map(
-    (binding) =>
-      new Snippet({
-        title: binding.title?.value,
-        createdOn: binding.createdOn?.value,
-        content: binding.content?.value,
-      }),
-  );
+  const results = queryResult.results.bindings.map((binding) => {
+    return new Snippet({
+      title: binding.title?.value,
+      createdOn: binding.createdOn?.value,
+      content: binding.content?.value,
+    });
+  });
 
   return { totalCount, results };
 };
@@ -216,7 +230,7 @@ export const fetchSnippetLists = async ({
 }: {
   endpoint: string;
   abortSignal: AbortSignal;
-  filter: Filter;
+  filter: SnippetFilter;
   orderBy: OrderBy;
 }) => {
   // We don't currently use this count, so skip the query, but we'll need it if we make pagination
@@ -263,3 +277,28 @@ export const fetchSnippetLists = async ({
 
   return { results };
 };
+
+export const fetchSnippetListNames = async ({
+  endpoint,
+  abortSignal,
+  snippetListUris,
+}: {
+  endpoint: string;
+  abortSignal: AbortSignal;
+  snippetListUris: string[];
+}) => {
+  const queryResult = await executeQuery<
+    BindingObject<{ snippetList: string; snippetListName: string }>
+  >({
+    endpoint,
+    query: buildSnippetListNameFetchQuery(snippetListUris),
+    abortSignal,
+  });
+
+  return new Map(
+    queryResult.results.bindings.map((binding) => [
+      binding.snippetList.value,
+      binding.snippetListName.value,
+    ]),
+  );
+};

package/addon/plugins/variable-plugin/contextual-actions/index.ts

@@ -51,11 +51,11 @@ function getSelectedLocation(state: EditorState) {
   }
 }
 
-function getSource(state: EditorState, fallback?: string) {
+function getSource(state: EditorState, fallback: string) {
   const selectedLocation = getSelectedLocation(state);
   if (selectedLocation) {
     const { node } = selectedLocation;
-    const source = node.attrs.source;
+    const source = node.attrs.source as string | undefined;
     if (source) {
       return source;
     }
@@ -92,7 +92,7 @@ function getIsZonal(state: EditorState) {
 type GetContextualActionsAttrs = {
   zonalLocationCodelistUri: string;
   nonZonalLocationCodelistUri: string;
-  endpoint?: string;
+  endpoint: string;
 };
 
 function humanReadableLabel(label: string) {

package/addon/services/snippet-fetch-service.ts

@@ -0,0 +1,76 @@
+import Service from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import {
+  fetchSnippetListNames,
+  fetchSnippets,
+  Pagination,
+  SnippetFilter,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/fetch-data';
+import {
+  Snippet,
+  SnippetPluginConfig,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+
+export default class SnippetFetchService extends Service {
+  @tracked listNameCache = new Map<string, string>();
+  @tracked snippetPageCache = new Map<
+    string,
+    { totalCount: number; pages: Map<number, Snippet[]> }
+  >();
+
+  async getListNames(
+    config: SnippetPluginConfig,
+    listUris: string[],
+  ): Promise<string[]> {
+    if (listUris.every((uri) => this.listNameCache.has(uri))) {
+      return listUris.map((uri) => this.listNameCache.get(uri) as string);
+    }
+    const abortController = new AbortController();
+    const listNames = await fetchSnippetListNames({
+      endpoint: config.endpoint,
+      abortSignal: abortController.signal,
+      snippetListUris: listUris,
+    });
+    listNames.forEach((name, uri) => this.listNameCache.set(uri, name));
+
+    return [...listNames.values()];
+  }
+
+  async getSnippets({
+    endpoint,
+    abortSignal,
+    filter,
+    pagination,
+  }: {
+    endpoint: string;
+    abortSignal: AbortSignal;
+    filter: SnippetFilter;
+    pagination: Pagination;
+  }) {
+    if (filter.name || !filter.snippetListUris?.length) {
+      // Filtering, so just search, to avoid mess of re-implementing local filtering to match that
+      // of the server. Undefined or empty uri lists are ignored by the fetch function, so pass
+      // those through too.
+      return fetchSnippets({ endpoint, abortSignal, filter, pagination });
+    }
+    const cacheKey = filter.snippetListUris.join('---');
+    let cachedPages = this.snippetPageCache.get(cacheKey);
+    if (!cachedPages) {
+      cachedPages = { totalCount: -1, pages: new Map() };
+      this.snippetPageCache.set(cacheKey, cachedPages);
+    }
+    const cachedPage = cachedPages.pages.get(pagination.pageNumber);
+    if (!cachedPage) {
+      const fetched = await fetchSnippets({
+        endpoint,
+        abortSignal,
+        filter,
+        pagination,
+      });
+      cachedPages.totalCount = fetched.totalCount;
+      cachedPages.pages.set(pagination.pageNumber, fetched.results);
+      return fetched;
+    }
+    return { totalCount: cachedPages.totalCount, results: cachedPage };
+  }
+}

package/app/services/snippet-fetch-service.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/services/snippet-fetch-service';

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

@@ -5,12 +5,12 @@ import { type SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins
 interface Signature {
     Args: Pick<EmberNodeArgs, 'node' | 'selectNode'> & {
         insertSnippet: () => void;
+        snippetListNames: string[];
     };
 }
 export default class SnippetPluginPlaceholder extends Component<Signature> {
     intl: IntlService;
     get node(): import("prosemirror-model").Node;
-    get listNames(): any;
     get config(): SnippetPluginConfig;
     get isSingleList(): boolean;
     get alertTitle(): string;

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

@@ -1,7 +1,8 @@
 import Component from '@glimmer/component';
 import { type EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/_private/ember-node';
 import { type PNode, type Selection, Slice } from '@lblod/ember-rdfa-editor';
-import { Snippet } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+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 Signature {
     Args: EmberNodeArgs;
     Blocks: {
@@ -9,6 +10,7 @@ interface Signature {
     };
 }
 export default class SnippetNode extends Component<Signature> {
+    snippetFetchService: SnippetFetchService;
     showModal: boolean;
     mode: string;
     get controller(): import("@lblod/ember-rdfa-editor").SayController;
@@ -17,6 +19,8 @@ export default class SnippetNode extends Component<Signature> {
     get node(): PNode;
     get isPlaceholder(): boolean;
     get allowMultipleSnippets(): boolean;
+    get snippetListUris(): string[];
+    get config(): SnippetPluginConfig;
     closeModal(): void;
     openModal(): void;
     addFragment(): void;
@@ -27,5 +31,7 @@ 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[];
 }
 export {};

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

@@ -1,14 +1,17 @@
 import Component from '@glimmer/component';
+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: string[] | undefined;
-    snippetListNames: string[] | undefined;
+    snippetListUris: Option<string[]>;
+    snippetListNames: Option<string[]>;
     closeModal: () => void;
     open: boolean;
     onInsert: (snippet: Snippet) => void;
 }
 export default class SnippetPluginSearchModalComponent extends Component<Args> {
+    snippetFetchService: SnippetFetchService;
     inputSearchText: string | null;
     error: unknown;
     pageNumber: number;

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

@@ -21,7 +21,8 @@ export type ImportedResourceMap = Record<string, Option<string>>;
 export type SnippetListProperties = {
     placeholderId: string;
     listUris: string[];
-    names: string[];
+    /** @deprecated Passing snippet list names is no longer necessary */
+    names?: string[];
     importedResources: ImportedResourceMap;
 };
 export type SnippetListArgs = {

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

@@ -14,7 +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({ schema, content, title, allowMultipleSnippets, listProperties: { listUris, names: snippetListNames, importedResources, placeholderId, }, }: CreateSnippetArgs): [PNode, Map<string, OutgoingTriple[]>];
+export declare function createSnippet({ schema, content, title, allowMultipleSnippets, listProperties: { listUris, importedResources, placeholderId }, }: 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: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
 export {};

package/declarations/addon/plugins/snippet-plugin/utils/fetch-data.d.ts

@@ -1,17 +1,17 @@
 import { Snippet, SnippetList } from '../index';
-type Filter = {
+export type SnippetFilter = {
     name?: string;
     snippetListUris?: string[];
 };
 export type OrderBy = 'label' | 'created-on' | '-label' | '-created-on' | '' | null;
-type Pagination = {
+export type Pagination = {
     pageNumber: number;
     pageSize: number;
 };
 export declare const fetchSnippets: ({ endpoint, abortSignal, filter, pagination, }: {
     endpoint: string;
     abortSignal: AbortSignal;
-    filter: Filter;
+    filter: SnippetFilter;
     pagination: Pagination;
 }) => Promise<{
     totalCount: number;
@@ -20,9 +20,13 @@ export declare const fetchSnippets: ({ endpoint, abortSignal, filter, pagination
 export declare const fetchSnippetLists: ({ endpoint, abortSignal, filter, orderBy, }: {
     endpoint: string;
     abortSignal: AbortSignal;
-    filter: Filter;
+    filter: SnippetFilter;
     orderBy: OrderBy;
 }) => Promise<{
     results: SnippetList[];
 }>;
-export {};
+export declare const fetchSnippetListNames: ({ endpoint, abortSignal, snippetListUris, }: {
+    endpoint: string;
+    abortSignal: AbortSignal;
+    snippetListUris: string[];
+}) => Promise<Map<string, string>>;

package/declarations/addon/plugins/variable-plugin/contextual-actions/index.d.ts

@@ -3,7 +3,7 @@ import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextu
 type GetContextualActionsAttrs = {
     zonalLocationCodelistUri: string;
     nonZonalLocationCodelistUri: string;
-    endpoint?: string;
+    endpoint: string;
 };
 export declare function getContextualActions(attrs: GetContextualActionsAttrs): (state: EditorState, searchQuery?: string) => Promise<{
     id: string;

package/declarations/addon/services/snippet-fetch-service.d.ts

@@ -0,0 +1,20 @@
+import Service from '@ember/service';
+import { Pagination, SnippetFilter } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/utils/fetch-data';
+import { Snippet, SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+export default class SnippetFetchService extends Service {
+    listNameCache: Map<string, string>;
+    snippetPageCache: Map<string, {
+        totalCount: number;
+        pages: Map<number, Snippet[]>;
+    }>;
+    getListNames(config: SnippetPluginConfig, listUris: string[]): Promise<string[]>;
+    getSnippets({ endpoint, abortSignal, filter, pagination, }: {
+        endpoint: string;
+        abortSignal: AbortSignal;
+        filter: SnippetFilter;
+        pagination: Pagination;
+    }): Promise<{
+        totalCount: number;
+        results: Snippet[];
+    }>;
+}

package/package.json

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