@lblod/ember-rdfa-editor-lblod-plugins 37.3.0 → 38.0.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 38.0.1
+
+### Patch Changes
+
+- [#669](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/669) [`79ffc3a`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/79ffc3afb4895d6bfd7f6c67ffb259936c0b6c44) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix non block variables were not being added to the measure
+
+- [`b9357c3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b9357c31cc7a92a4a855f372a0910e86348d85c4) Thanks [@abeforgit](https://github.com/abeforgit)! - Fix docker build
+
+## 38.0.0
+
+### Major Changes
+
+- [#668](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/668) [`b16702c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b16702c91011512897145fb4ff9875d138497a92) Thanks [@kobemertens](https://github.com/kobemertens)! - Bump editor peerdep to 13.12.0
+
+### Minor Changes
+
+- [#665](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/665) [`819a3d2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/819a3d2193d8b51fe262bcc4ed3cf052acb2ec9f) Thanks [@kobemertens](https://github.com/kobemertens)! - Adds caching, sticky groups, and offline search for the existing context actions
+
+- [#666](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/666) [`06da07b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/06da07bd0a260a424caa82fca8cba4c855e785cb) Thanks [@kobemertens](https://github.com/kobemertens)! - Add placeholder for empty place description
+
+### Patch Changes
+
+- [#668](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/668) [`31809a2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/31809a2d82778280569fb515b0fb0f356fa44f34) Thanks [@kobemertens](https://github.com/kobemertens)! - Update prosemirror-model to 1.25.9
+
 ## 37.3.0
 
 ### Minor Changes

package/Dockerfile

@@ -1,11 +1,10 @@
-FROM node:20-slim AS builder
+FROM node:22-slim AS builder
 
 LABEL maintainer="info@redpencil.io"
 
 RUN corepack enable
-RUN corepack prepare pnpm@9.4 --activate
 WORKDIR /app
-COPY package.json pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 RUN pnpm i --frozen-lockfile
 COPY . .
 RUN pnpm build

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

@@ -17,78 +17,85 @@ const recentLocationsGroupId =
 
 const SUGGESTION_AMOUNT = 15;
 
-export function getContextualActions() {
-  return function (state: EditorState, searchQuery?: string) {
-    const t = getTranslationFunction(state);
-    const { selection } = state;
-    if (!(selection instanceof NodeSelection)) return [];
-    const selectedNode = selection.node;
-    if (selectedNode.type.name !== 'oslo_location') return [];
+function getLocationSuggestionOptions(state: EditorState) {
+  const { selection } = state;
+  if (!(selection instanceof NodeSelection)) return [];
+  const selectedNode = selection.node;
+  if (selectedNode.type.name !== 'oslo_location') return [];
 
-    const selectedLocation = selectedNode.attrs.value as
-      | Address
-      | Place
-      | Area
-      | undefined;
+  const selectedLocation = selectedNode.attrs.value as
+    | Address
+    | Place
+    | Area
+    | undefined;
 
-    const locationSuggestionOptions = getDocumentLocations(state)
-      .filter(
-        (location) =>
-          !selectedLocation ||
-          getLocationUri(selectedLocation) !== getLocationUri(location),
-      )
-      .slice(0, SUGGESTION_AMOUNT)
-      .map((location) => ({
-        label: location.formatted,
-        id: uuidv4(),
-        group: recentLocationsGroupId,
-        command: replaceLocationCommand(
-          { value: selection.node, pos: selection.from },
-          location,
-        ),
-      }));
+  return getDocumentLocations(state)
+    .filter(
+      (location) =>
+        !selectedLocation ||
+        getLocationUri(selectedLocation) !== getLocationUri(location),
+    )
+    .slice(0, SUGGESTION_AMOUNT)
+    .map((location) => ({
+      label: location.formatted,
+      id: uuidv4(),
+      group: recentLocationsGroupId,
+      command: replaceLocationCommand(
+        { value: selection.node, pos: selection.from },
+        location,
+      ),
+    }));
+}
 
-    const otherElementsOptions = [
-      {
-        label: t(
-          'location-plugin.context-actions.insert-address',
-          'Adres invoegen',
-        ),
-        locationType: 'address' as LocationType,
-        icon: 'location',
-      },
-      {
-        label: t(
-          'location-plugin.context-actions.insert-point-on-map',
-          'Punt op de kaart invoegen',
-        ),
-        locationType: 'place' as LocationType,
-        icon: 'location-gps',
-      },
-      {
-        label: t(
-          'location-plugin.context-actions.insert-area',
-          'Gebied invoegen',
-        ),
-        locationType: 'area' as LocationType,
-        icon: 'area',
-      },
-    ].map((option) => {
-      return {
-        ...option,
-        id: uuidv4(),
-        group: otherElementsGroupId,
-        command: openLocationModalCommand(option.locationType),
-      };
-    });
+function getOtherElementsOptions(state: EditorState) {
+  const t = getTranslationFunction(state);
 
-    return locationSuggestionOptions
-      .concat(otherElementsOptions)
-      .filter(
-        (option) =>
-          !searchQuery ||
-          option.label.toLocaleLowerCase().includes(searchQuery.toLowerCase()),
-      );
+  return [
+    {
+      label: t(
+        'location-plugin.context-actions.insert-address',
+        'Adres invoegen',
+      ),
+      locationType: 'address' as LocationType,
+      icon: 'location',
+    },
+    {
+      label: t(
+        'location-plugin.context-actions.insert-point-on-map',
+        'Punt op de kaart invoegen',
+      ),
+      locationType: 'place' as LocationType,
+      icon: 'location-gps',
+    },
+    {
+      label: t(
+        'location-plugin.context-actions.insert-area',
+        'Gebied invoegen',
+      ),
+      locationType: 'area' as LocationType,
+      icon: 'area',
+    },
+  ].map((option) => {
+    return {
+      ...option,
+      id: uuidv4(),
+      group: otherElementsGroupId,
+      command: openLocationModalCommand(option.locationType),
+    };
+  });
+}
+
+export function getContextualActions(type: 'suggestions' | 'other_elements') {
+  return function (state: EditorState, searchQuery?: string) {
+    const options =
+      type === 'suggestions'
+        ? getLocationSuggestionOptions(state)
+        : getOtherElementsOptions(state);
+    return options.filter(
+      (option) =>
+        !searchQuery ||
+        option.label.toLocaleLowerCase().includes(searchQuery.toLowerCase()),
+    );
   };
 }
 
@@ -101,7 +108,7 @@ function contextualGroupIsVisible(state: EditorState) {
 }
 
 export function getContextualActionGroups() {
-  return function (state: EditorState) {
+  return function (state: EditorState): ContextualActionGroup[] {
     if (!contextualGroupIsVisible(state)) return [];
     return [
       {
@@ -110,14 +117,12 @@ export function getContextualActionGroups() {
           'location-plugin.context-actions.location-suggestions',
           'Locatiesuggesties',
         ),
+        getActions: getContextualActions('suggestions'),
       },
       {
         id: otherElementsGroupId,
-        label: getTranslationFunction(state)(
-          'location-plugin.context-actions.other-elements',
-          'Andere elementen',
-        ),
         sticky: 'bottom',
+        getActions: getContextualActions('other_elements'),
       },
     ] satisfies ContextualActionGroup[];
   };

package/addon/plugins/location-plugin/utils/replace-location.ts

@@ -8,6 +8,7 @@ import {
   TextSelection,
   PNode,
   Selection,
+  Command,
 } from '@lblod/ember-rdfa-editor';
 import type { FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import { PROV } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -39,7 +40,7 @@ function moveNodeSelectionForward(selection: Selection, doc: PNode) {
 export function replaceLocationCommand(
   node: ResolvedPNode,
   location: Address | Place | Area,
-) {
+): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const df = new SayDataFactory();
     const { pos, value: locNode } = node;

package/addon/plugins/roadsign-regulation-plugin/constants.ts

@@ -1,6 +1,5 @@
 import { MOBILITEIT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { ValueOf } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
-import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 
 export const ZONALITY_OPTIONS = {
   POTENTIALLY_ZONAL:
@@ -54,7 +53,7 @@ export function isLegacyZonalityUri(uri: string): uri is LegacyZonalityUri {
   return Object.values(ZONALITY_OPTIONS_LEGACY).includes(uri);
 }
 
-export type ZonalityOption = ValuesOf<typeof ZONALITY_OPTIONS>;
+export type ZonalityOption = ValueOf<typeof ZONALITY_OPTIONS>;
 export type ZonalOrNot = Exclude<
   ZonalityOption,
   typeof ZONALITY_OPTIONS.POTENTIALLY_ZONAL

package/addon/plugins/roadsign-regulation-plugin/helpers/construct-measure-fragment.ts

@@ -35,6 +35,8 @@ export function constructMeasureFragment(
             currentParagraphContent = [];
           }
           fragment.push(node);
+        } else {
+          currentParagraphContent.push(node);
         }
       } else {
         currentParagraphContent.push(schema.text(part));

package/addon/plugins/variable-plugin/actions/create-classic-location-variable.ts

@@ -83,5 +83,6 @@ export function createClassicLocationVariableAttrs({
     backlinks: [...backlinks, ...addedBacklinks],
     label: label ?? 'Plaatsbeschrijving',
     source,
+    placeholder: 'Plaatsbeschrijving toevoegen',
   };
 }

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

@@ -24,10 +24,18 @@ import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/editable
 import { isRdfaAttrs } from '@lblod/ember-rdfa-editor/core/rdfa-types';
 import { v4 as uuidv4 } from 'uuid';
 import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
+import { type CodeListOptions } from '../utils/fetch-data';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
 
 const plaatsbepalingGroupId =
   'plaatsbepaling-1d8563d6-bfd8-487f-a2a0-6d7a6ab01cb5';
 
+const placeDescriptionCodelistCache: {
+  placeDescriptions: CodeListOptions | null;
+} = {
+  placeDescriptions: null,
+};
+
 function getSelectedLocation(state: EditorState) {
   const { selection } = state;
   if (
@@ -131,27 +139,47 @@ function createInsertPlaceDescriptionCommand(label: string) {
   };
 }
 
-export function getContextualActions({
-  zonalLocationCodelistUri,
-  nonZonalLocationCodelistUri,
-  endpoint,
-}: GetContextualActionsAttrs) {
-  return async function (state: EditorState) {
-    const source = getSource(state, endpoint);
-    const isZonal = getIsZonal(state);
-    const result = await fetchCodeListOptions(
+async function getPlaceDescriptionsCached(
+  state: EditorState,
+  {
+    zonalLocationCodelistUri,
+    nonZonalLocationCodelistUri,
+    endpoint,
+  }: GetContextualActionsAttrs,
+) {
+  const source = getSource(state, endpoint);
+  const isZonal = getIsZonal(state);
+  let options;
+  if (!placeDescriptionCodelistCache.placeDescriptions) {
+    options = await fetchCodeListOptions(
       source,
       isZonal ? zonalLocationCodelistUri : nonZonalLocationCodelistUri,
     );
+    placeDescriptionCodelistCache.placeDescriptions = options;
+  } else {
+    options = placeDescriptionCodelistCache.placeDescriptions;
+  }
 
-    return result.options.map((option) => {
-      return {
-        id: uuidv4(),
-        label: humanReadableLabel(option.label),
-        group: plaatsbepalingGroupId,
-        command: createInsertPlaceDescriptionCommand(option.label),
-      };
-    });
+  return options;
+}
+
+export function getContextualActions(attrs: GetContextualActionsAttrs) {
+  return async function (state: EditorState, searchQuery?: string) {
+    const result = await getPlaceDescriptionsCached(state, attrs);
+    return result.options
+      .filter(
+        (option) =>
+          !searchQuery ||
+          option.label.toLowerCase().includes(searchQuery.toLowerCase()),
+      )
+      .map((option) => {
+        return {
+          id: uuidv4(),
+          label: humanReadableLabel(option.label),
+          group: plaatsbepalingGroupId,
+          command: createInsertPlaceDescriptionCommand(option.label),
+        };
+      });
   };
 }
 
@@ -171,8 +199,8 @@ function contextualGroupIsVisible(state: EditorState) {
   );
 }
 
-export function getContextualActionGroups() {
-  return function (state: EditorState) {
+export function getContextualActionGroups(attrs: GetContextualActionsAttrs) {
+  return function (state: EditorState): ContextualActionGroup[] {
     return contextualGroupIsVisible(state)
       ? [
           {
@@ -181,6 +209,7 @@ export function getContextualActionGroups() {
               'variable.location.label',
               'Plaatsbeschrijving',
             ),
+            getActions: getContextualActions(attrs),
           },
         ]
       : [];

package/addon/utils/dom-output-spec-helpers.ts

@@ -3,7 +3,7 @@ import { EXT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
 export const span = (
   attributes: Attrs = {},
-  ...children: (DOMOutputSpec | 0)[]
+  ...children: (DOMOutputSpec | string | 0)[]
 ): DOMOutputSpec => {
   return ['span', attributes, ...children];
 };
@@ -13,7 +13,7 @@ export const span = (
  */
 export const contentSpan = (
   attributes: Attrs,
-  ...children: (DOMOutputSpec | 0)[]
+  ...children: (DOMOutputSpec | string | 0)[]
 ) => {
   return span(
     {

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

@@ -1,16 +1,9 @@
 import { EditorState } from '@lblod/ember-rdfa-editor';
-export declare function getContextualActions(): (state: EditorState, searchQuery?: string) => {
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
+export declare function getContextualActions(type: 'suggestions' | 'other_elements'): (state: EditorState, searchQuery?: string) => {
     label: string;
     id: string;
     group: string;
-    command: (state: EditorState, dispatch?: (tr: import("@lblod/ember-rdfa-editor").Transaction) => void) => boolean;
+    command: import("@lblod/ember-rdfa-editor").Command;
 }[];
-export declare function getContextualActionGroups(): (state: EditorState) => ({
-    id: string;
-    label: string;
-    sticky?: undefined;
-} | {
-    id: string;
-    label: string;
-    sticky: "bottom";
-})[];
+export declare function getContextualActionGroups(): (state: EditorState) => ContextualActionGroup[];

package/declarations/addon/plugins/location-plugin/utils/replace-location.d.ts

@@ -1,5 +1,5 @@
 import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import { Address } from './address-helpers';
 import { Area, Place } from './geo-helpers';
-import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
-export declare function replaceLocationCommand(node: ResolvedPNode, location: Address | Place | Area): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+import { Command } from '@lblod/ember-rdfa-editor';
+export declare function replaceLocationCommand(node: ResolvedPNode, location: Address | Place | Area): Command;

package/declarations/addon/plugins/roadsign-regulation-plugin/constants.d.ts

@@ -1,5 +1,4 @@
 import { ValueOf } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
-import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 export declare const ZONALITY_OPTIONS: {
     readonly POTENTIALLY_ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
     readonly ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
@@ -16,7 +15,7 @@ export declare function getLegacyZonalityUri(uri: ZonalityUri | LegacyZonalityUr
 export declare function getNewZonalityUri(uri: ZonalityUri | LegacyZonalityUri): ZonalityUri;
 export declare function isNewZonalityUri(uri: string): uri is ZonalityUri;
 export declare function isLegacyZonalityUri(uri: string): uri is LegacyZonalityUri;
-export type ZonalityOption = ValuesOf<typeof ZONALITY_OPTIONS>;
+export type ZonalityOption = ValueOf<typeof ZONALITY_OPTIONS>;
 export type ZonalOrNot = Exclude<ZonalityOption, typeof ZONALITY_OPTIONS.POTENTIALLY_ZONAL>;
 export declare const TRAFFIC_SIGNAL_CONCEPT_TYPES: {
     readonly TRAFFIC_SIGNAL: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept";

package/declarations/addon/plugins/variable-plugin/actions/create-classic-location-variable.d.ts

@@ -23,5 +23,6 @@ export declare function createClassicLocationVariableAttrs({ variable, variableI
     backlinks: IncomingTriple[];
     label: string;
     source: string | undefined;
+    placeholder: string;
 };
 export {};

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

@@ -1,17 +1,15 @@
 import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
 type GetContextualActionsAttrs = {
     zonalLocationCodelistUri: string;
     nonZonalLocationCodelistUri: string;
     endpoint?: string;
 };
-export declare function getContextualActions({ zonalLocationCodelistUri, nonZonalLocationCodelistUri, endpoint, }: GetContextualActionsAttrs): (state: EditorState) => Promise<{
+export declare function getContextualActions(attrs: GetContextualActionsAttrs): (state: EditorState, searchQuery?: string) => Promise<{
     id: string;
     label: string;
     group: string;
     command: (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 }[]>;
-export declare function getContextualActionGroups(): (state: EditorState) => {
-    id: string;
-    label: string;
-}[];
+export declare function getContextualActionGroups(attrs: GetContextualActionsAttrs): (state: EditorState) => ContextualActionGroup[];
 export {};

package/declarations/addon/utils/dom-output-spec-helpers.d.ts

@@ -1,6 +1,6 @@
 import { Attrs, DOMOutputSpec } from '@lblod/ember-rdfa-editor';
-export declare const span: (attributes?: Attrs, ...children: (DOMOutputSpec | 0)[]) => DOMOutputSpec;
+export declare const span: (attributes?: Attrs, ...children: (DOMOutputSpec | string | 0)[]) => DOMOutputSpec;
 /**
  * Constructs a variable content span. Accepts optional additional attributes and a series of children.
  */
-export declare const contentSpan: (attributes: Attrs, ...children: (DOMOutputSpec | 0)[]) => DOMOutputSpec;
+export declare const contentSpan: (attributes: Attrs, ...children: (DOMOutputSpec | string | 0)[]) => DOMOutputSpec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "37.3.0",
+  "version": "38.0.1",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -110,7 +110,7 @@
     "@glint/ember-tsc": "^1.5.0",
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
-    "@lblod/ember-rdfa-editor": "13.10.0",
+    "@lblod/ember-rdfa-editor": "13.12.0",
     "@glint/template": "^1.7.7",
     "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^2.0.1",
@@ -183,7 +183,7 @@
     "@appuniversum/ember-appuniversum": "^3.12.0",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^13.10.0",
+    "@lblod/ember-rdfa-editor": "^13.12.0",
     "ember-concurrency": "^4.0.2",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",
@@ -204,18 +204,11 @@
     }
   },
   "overrides": {},
-  "pnpm": {
-    "overrides": {
-      "babel-plugin-ember-template-compilation": "^2.2.5",
-      "@codemirror/state": "6.5.2",
-      "prosemirror-view": "^1.41.5"
-    }
-  },
   "engines": {
     "node": ">= 18"
   },
   "volta": {
-    "node": "20.11.0"
+    "node": "22.22.0"
   },
   "ember": {
     "edition": "octane"

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+overrides:
+  'prosemirror-model': '^1.25.9'