@lblod/ember-rdfa-editor-lblod-plugins 28.1.0 → 28.2.0-dev.85da5ade4142e66d8c5423cd25ed0d291f1c2bad

package/.changeset/hot-hats-wink.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Bundle location plugin marker icons to avoid issues when bundling the code for embeddable

package/.changeset/selfish-singers-tan.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Remove obsolete `webpack-config.js`. This config is solely needed for the tests, and is now inlined in the `ember-cli-build` file of the test-app

package/.changeset/shiny-panthers-live.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Update `ember-template-imports` to version 4.3.0 . This version unlocks `.gts`/`.gjs` sourcemaps.

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 28.2.0
+
+### Minor Changes
+
+- [#553](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/553) [`50831e0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/50831e01cfa5d8101c72e8cc3d98b304a8b86646) Thanks [@piemonkey](https://github.com/piemonkey)! - Add re-usable component for selecting a decision type
+
+### Patch Changes
+
+- [#553](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/553) [`03f4ce0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/03f4ce0864550cfc947f8ff7504aeac8b0300ae9) Thanks [@piemonkey](https://github.com/piemonkey)! - Fix undo behaviour when changing decision type
+
 ## 28.1.0
 
 ### Minor Changes

package/addon/components/besluit-type-plugin/besluit-type-form.gts

@@ -0,0 +1,68 @@
+import Component from '@glimmer/component';
+import { type BesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
+import BesluitTypeSelect from '@lblod/ember-rdfa-editor-lblod-plugins/components/besluit-type-plugin/besluit-type-select';
+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) => {
+    this.args.setType({ parent: selected });
+  };
+
+  updateSubType = (selected: BesluitType) => {
+    if (this.args.selectedType) {
+      this.args.setType({
+        parent: this.args.selectedType.parent,
+        subType: selected,
+      });
+    }
+  };
+
+  updateSubSubType = (selected: BesluitType) => {
+    if (this.args.selectedType) {
+      this.args.setType({
+        parent: this.args.selectedType.parent,
+        subType: this.args.selectedType.subType,
+        subSubType: selected,
+      });
+    }
+  };
+
+  <template>
+    <div ...attributes>
+      <BesluitTypeSelect
+        @fieldNameTranslation='besluit-type-plugin.dt'
+        @besluitTypes={{@types}}
+        @onchange={{this.updateParentType}}
+        @selected={{@selectedType.parent}}
+        @showWarningWhenEmpty={{false}}
+      />
+      {{#if @selectedType.parent.subTypes.length}}
+        <BesluitTypeSelect
+          @fieldNameTranslation='besluit-type-plugin.sub-type'
+          @besluitTypes={{@selectedType.parent.subTypes}}
+          @onchange={{this.updateSubType}}
+          @selected={{@selectedType.subType}}
+          @showWarningWhenEmpty={{true}}
+        />
+      {{/if}}
+      {{#if @selectedType.subType.subTypes.length}}
+        <BesluitTypeSelect
+          @fieldNameTranslation='besluit-type-plugin.sub-type'
+          @besluitTypes={{@selectedType.subType.subTypes}}
+          @onchange={{this.updateSubSubType}}
+          @selected={{@selectedType.subSubType}}
+          @showWarningWhenEmpty={{true}}
+        />
+      {{/if}}
+    </div>
+  </template>
+}

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

@@ -0,0 +1,80 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import t from 'ember-intl/helpers/t';
+import PowerSelect from 'ember-power-select/components/power-select';
+import { v4 as uuidv4 } from 'uuid';
+import AuAlert from '@appuniversum/ember-appuniversum/components/au-alert';
+import AuLabel from '@appuniversum/ember-appuniversum/components/au-label';
+import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
+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> {
+  @tracked besluitTypes;
+
+  constructor(parent: unknown, args: Sig['Args']) {
+    super(parent, args);
+    this.besluitTypes = this.args.besluitTypes.sort((a, b) =>
+      a.label > b.label ? 1 : -1,
+    );
+  }
+
+  get showWarning() {
+    return this.args.showWarningWhenEmpty && !this.args.selected;
+  }
+
+  search = (term: string) => {
+    const lowerTerm = term.toLowerCase();
+    return this.args.besluitTypes.filter((besluitType) =>
+      besluitType.label.toLowerCase().includes(lowerTerm),
+    );
+  };
+
+  <template>
+    <div ...attributes>
+      {{#let (uuidv4) as |id|}}
+        <AuLabel for={{id}}>
+          {{t @fieldNameTranslation}}
+        </AuLabel>
+        <PowerSelect
+          id={{id}}
+          @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>
+      {{/let}}
+      <p class='au-u-muted au-u-margin-tiny au-u-margin-bottom-small'>
+        {{@selected.definition}}
+      </p>
+      {{#if this.showWarning}}
+        <AuAlert
+          @icon={{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>
+      {{/if}}
+    </div>
+  </template>
+}

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

@@ -0,0 +1,191 @@
+import { tracked } from '@glimmer/tracking';
+import Component from '@glimmer/component';
+import { on } from '@ember/modifier';
+// eslint-disable-next-line ember/no-at-ember-render-modifiers
+import didUpdate from '@ember/render-modifiers/modifiers/did-update';
+import { trackedFunction } from 'reactiveweb/function';
+import t from 'ember-intl/helpers/t';
+import AuPill from '@appuniversum/ember-appuniversum/components/au-pill';
+import AuModal from '@appuniversum/ember-appuniversum/components/au-modal';
+import AuLinkExternal from '@appuniversum/ember-appuniversum/components/au-link-external';
+import AuAlert from '@appuniversum/ember-appuniversum/components/au-alert';
+import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
+import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross';
+import { MailIcon } from '@appuniversum/ember-appuniversum/components/icons/mail';
+import { CircleXIcon } from '@appuniversum/ember-appuniversum/components/icons/circle-x';
+import { SayController } from '@lblod/ember-rdfa-editor';
+import fetchBesluitTypes 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 { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import {
+  BesluitTypeInstance,
+  checkBesluitTypeInstance,
+  mostSpecificBesluitType,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/besluit-type-instances';
+import BesluitTypeForm from '@lblod/ember-rdfa-editor-lblod-plugins/components/besluit-type-plugin/besluit-type-form';
+import { setBesluitType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/set-besluit-type';
+
+type Args = {
+  controller: SayController;
+  options: BesluitTypePluginOptions;
+};
+
+export default class EditorPluginsToolbarDropdownComponent extends Component<Args> {
+  @tracked selectedTypeInstance?: BesluitTypeInstance;
+  @tracked cardExpanded = false;
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  types = trackedFunction(this, async () => {
+    const types = await fetchBesluitTypes(
+      this.args.options.classificatieUri,
+      this.args.options.endpoint,
+    );
+    return types;
+  });
+
+  get currentBesluitRange() {
+    return getCurrentBesluitRange(this.controller);
+  }
+
+  get showCard() {
+    return !!this.currentBesluitRange;
+  }
+
+  get selectedType() {
+    return (
+      this.selectedTypeInstance &&
+      mostSpecificBesluitType(this.selectedTypeInstance)
+    );
+  }
+
+  toggleCard = () => {
+    this.cardExpanded = !this.cardExpanded;
+  };
+
+  setType = (type: BesluitTypeInstance) => {
+    this.selectedTypeInstance = type;
+    this.insertIfValid();
+  };
+
+  updateBesluitTypes = () => {
+    if (!this.types.isFinished || !this.currentBesluitRange) {
+      return;
+    }
+    if (!this.types.value) {
+      console.warn('Request for besluit types failed');
+      return;
+    }
+    const typeInstance = checkBesluitTypeInstance(
+      this.controller.mainEditorState,
+      this.types.value,
+    );
+    if (typeInstance) {
+      this.selectedTypeInstance = typeInstance;
+      this.cardExpanded = false;
+    } else {
+      this.cardExpanded = true;
+    }
+  };
+
+  insertIfValid() {
+    this.controller.doCommand((state, dispatch) => {
+      if (!this.selectedTypeInstance || !dispatch) {
+        return false;
+      }
+      const { result, transaction } = setBesluitType(
+        state,
+        this.selectedTypeInstance,
+      );
+      if (result.every((ok) => ok)) {
+        dispatch(transaction);
+        return true;
+      }
+      return false;
+    });
+  }
+
+  <template>
+    <div
+      {{didUpdate this.updateBesluitTypes @controller.mainEditorState}}
+      {{didUpdate this.updateBesluitTypes this.types.value}}
+    >
+      {{#if this.showCard}}
+        {{#if this.types.isError}}
+          <AuPill
+            @skin='error'
+            @icon={{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.selectedType.label}}
+            <AuPill
+              @skin='link'
+              {{on 'click' this.toggleCard}}
+              title={{t 'besluit-type-plugin.insert-dt'}}
+            >
+              {{t 'besluit-type-plugin.dt'}}:
+              {{this.selectedType.label}}
+            </AuPill>
+          {{else}}
+            <AuPill
+              @icon={{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}}
+          class='au-c-modal--overflow'
+          as |Modal|
+        >
+          <Modal.Body>
+            {{#if this.types.isError}}
+              <AuAlert
+                @title={{t 'besluit-type-plugin.error-title'}}
+                @skin='error'
+                @icon={{CrossIcon}}
+              >
+                <p>
+                  {{t 'besluit-type-plugin.error-first-body'}}
+                  {{! template-lint-disable no-bare-strings  }}
+                  <AuLinkExternal
+                    href='mailto:gelinktnotuleren@vlaanderen.be'
+                    @icon={{MailIcon}}
+                    @iconAlignment='left'
+                  >
+                    GelinktNotuleren@vlaanderen.be
+                  </AuLinkExternal>
+                  {{! template-lint-enable no-bare-strings  }}
+                  {{t 'besluit-type-plugin.error-rest-body'}}
+                </p>
+              </AuAlert>
+            {{else if this.types.value}}
+              <BesluitTypeForm
+                @types={{this.types.value}}
+                @selectedType={{this.selectedTypeInstance}}
+                @setType={{this.setType}}
+              />
+            {{/if}}
+          </Modal.Body>
+        </AuModal>
+      {{/if}}
+    </div>
+  </template>
+}

package/addon/components/location-plugin/map.gts

@@ -6,6 +6,7 @@ import and from 'ember-truth-helpers/helpers/and';
 import eq from 'ember-truth-helpers/helpers/eq';
 import t from 'ember-intl/helpers/t';
 import {
+  Leaflet,
   LeafletMap,
   type LeafletMapSig,
   type LeafletMapStart,
@@ -20,6 +21,38 @@ import {
   type GlobalCoordinates,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 
+// Taken from Leaflet's default icon, with the viewbox tweaked (from 0 0 500 820), so that the icon
+// is a whole number of pixels in size, to make positioning the point easy.
+const ICON_HTML = `<svg viewBox="0 0 500 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve"
+     style="fill-rule: evenodd; clip-rule: evenodd; stroke-linecap: round;">
+    <defs>
+        <linearGradient x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.30025e-15,-37.566,37.566,2.30025e-15,416.455,540.999)" id="map-marker-38-f">
+            <stop offset="0" stop-color="rgb(18,111,198)"/>
+            <stop offset="1" stop-color="rgb(76,156,209)"/>
+        </linearGradient>
+        <linearGradient x1="0" y1="0" x2="1" y2="0"
+                        gradientUnits="userSpaceOnUse"
+                        gradientTransform="matrix(1.16666e-15,-19.053,19.053,1.16666e-15,414.482,522.486)"
+                        id="map-marker-38-s">
+            <stop offset="0" stop-color="rgb(46,108,151)"/>
+            <stop offset="1" stop-color="rgb(56,131,183)"/>
+        </linearGradient>
+    </defs>
+    <g transform="matrix(19.5417,0,0,19.5417,-7889.1,-9807.44)">
+        <path fill="#FFFFFF" d="M421.2,515.5c0,2.6-2.1,4.7-4.7,4.7c-2.6,0-4.7-2.1-4.7-4.7c0-2.6,2.1-4.7,4.7-4.7 C419.1,510.8,421.2,512.9,421.2,515.5z"/>
+        <path d="M416.544,503.612C409.971,503.612 404.5,509.303 404.5,515.478C404.5,518.256 406.064,521.786 407.194,524.224L416.5,542.096L425.762,524.224C426.892,521.786 428.5,518.433 428.5,515.478C428.5,509.303 423.117,503.612 416.544,503.612ZM416.544,510.767C419.128,510.784 421.223,512.889 421.223,515.477C421.223,518.065 419.128,520.14 416.544,520.156C413.96,520.139 411.865,518.066 411.865,515.477C411.865,512.889 413.96,510.784 416.544,510.767Z" stroke-width="1.1px" fill="url(#map-marker-38-f)" stroke="url(#map-marker-38-s)"/>
+    </g>
+</svg>`;
+// We use Leaflet.divIcon directly, as passing arguments to the ember-leaflet helper seems to be
+// broken
+const MARKER_ICON = Leaflet.divIcon({
+  html: ICON_HTML,
+  // This prevents the default class from being applied, along with the default styling
+  className: '',
+  iconAnchor: [15, 48],
+  iconSize: [30, 48],
+});
+
 export const SUPPORTED_LOCATION_TYPES = ['address', 'place', 'area'] as const;
 export type LocationType = (typeof SUPPORTED_LOCATION_TYPES)[number];
 
@@ -248,7 +281,11 @@ export default class LocationPluginMapComponent extends Component<Signature> {
   }
 
   <template>
-    <div class='map-wrapper' ...attributes>
+    <div
+      class='map-wrapper
+        {{unless (eq @locationType "address") "map-cursor-pointer"}}'
+      ...attributes
+    >
       <MapWrapper
         @mapStart={{this.mapLocation}}
         @onClick={{this.onMapClick}}
@@ -259,7 +296,11 @@ export default class LocationPluginMapComponent extends Component<Signature> {
           @attribution={{MAP_TILE_ATTRIBUTION}}
         />
         {{#if (and @address (eq @locationType 'address') this.foundAddress)}}
-          <layers.marker @location={{this.foundAddress}} as |marker|>
+          <layers.marker
+            @location={{this.foundAddress}}
+            @icon={{MARKER_ICON}}
+            as |marker|
+          >
             <marker.tooltip>
               {{@address.formatted}}
             </marker.tooltip>
@@ -269,6 +310,7 @@ export default class LocationPluginMapComponent extends Component<Signature> {
           <layers.marker
             @opacity={{if @location 0.3 1}}
             @location={{this.existingLocationCoords}}
+            @icon={{MARKER_ICON}}
             as |marker|
           >
             <marker.tooltip>
@@ -277,7 +319,7 @@ export default class LocationPluginMapComponent extends Component<Signature> {
           </layers.marker>
         {{/if}}
         {{#if (and @location (eq @locationType 'place'))}}
-          <layers.marker @location={{@location.global}} />
+          <layers.marker @location={{@location.global}} @icon={{MARKER_ICON}} />
         {{/if}}
         {{#if (eq @locationType 'area')}}
           <layers.polyline @locations={{this.vertices}} />
@@ -285,6 +327,7 @@ export default class LocationPluginMapComponent extends Component<Signature> {
             <layers.marker
               @location={{vertex}}
               @onClick={{fn this.onVertexClick index}}
+              @icon={{MARKER_ICON}}
               as |marker|
             >
               {{#if (eq index 0)}}

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

@@ -0,0 +1,100 @@
+import { type EditorState } from '@lblod/ember-rdfa-editor';
+import { getOutgoingTripleList } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import { type BesluitType } from './fetchBesluitTypes';
+import { type NamedNodeTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+
+export interface BesluitTypeInstance {
+  parent: BesluitType;
+  subType?: BesluitType;
+  subSubType?: BesluitType;
+}
+
+export function extractBesluitTypeUris(editorState: EditorState): string[] {
+  const besluitRange = getCurrentBesluitRange(editorState);
+  if (!besluitRange) {
+    return [];
+  }
+  return getOutgoingTripleList(besluitRange.node.attrs, RDF('type'))
+    .filter(
+      (type) =>
+        type.object.termType === 'NamedNode' &&
+        type.object.value.includes(
+          'https://data.vlaanderen.be/id/concept/BesluitType/',
+        ),
+    )
+    .map((type: NamedNodeTriple) => type?.object.value);
+}
+
+/**
+ * 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 function checkBesluitTypeInstance(
+  editorState: EditorState,
+  types: BesluitType[],
+): BesluitTypeInstance | false {
+  const besluitTypes = extractBesluitTypeUris(editorState);
+
+  if (besluitTypes.length === 0) {
+    return false;
+  } else if (besluitTypes.length !== 1) {
+    console.warn(
+      "More than one decision type found for document, we don't support this and will just take the first one",
+      besluitTypes,
+    );
+  }
+  const typeHierarchy = findBesluitTypeHierarchy(types, besluitTypes[0]);
+
+  return (
+    !!typeHierarchy && {
+      parent: typeHierarchy[0],
+      subType: typeHierarchy[1],
+      subSubType: typeHierarchy[2],
+    }
+  );
+}
+
+function findBesluitTypeHierarchy(
+  types: BesluitType[],
+  uri: string,
+): BesluitType[] | undefined {
+  for (const type of types) {
+    if (type.uri === uri) {
+      return [type];
+    } else if (type.subTypes?.length) {
+      const subTypes = findBesluitTypeHierarchy(type.subTypes, uri);
+      if (subTypes) {
+        return [type, ...subTypes];
+      }
+    }
+  }
+  return;
+}
+
+/**
+ * Checks that the passed type instance has all of the necessary sub-types selected (and no more)
+ */
+export function isValidTypeChoice({
+  parent,
+  subType,
+  subSubType,
+}: BesluitTypeInstance) {
+  if (!parent.subTypes || parent.subTypes.length === 0) {
+    return !subType && !subSubType;
+  }
+  if (!subType) {
+    return false;
+  }
+  if (!subType.subTypes || subType.subTypes.length === 0) {
+    return !subSubType;
+  }
+  return !!subSubType;
+}
+
+export function mostSpecificBesluitType(
+  typeInstance: BesluitTypeInstance,
+): BesluitType {
+  return typeInstance.subSubType ?? typeInstance.subType ?? typeInstance.parent;
+}

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

@@ -0,0 +1,57 @@
+import { type EditorState } from '@lblod/ember-rdfa-editor';
+import {
+  transactionCombinator,
+  type TransactionCombinatorResult,
+} from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import {
+  addPropertyToNode,
+  removePropertyFromNode,
+} from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
+import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import { getCurrentBesluitURI } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
+import {
+  extractBesluitTypeUris,
+  isValidTypeChoice,
+  mostSpecificBesluitType,
+  type BesluitTypeInstance,
+} from './besluit-type-instances';
+import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+
+export function setBesluitType(
+  initialState: EditorState,
+  typeInstance: BesluitTypeInstance,
+): TransactionCombinatorResult<boolean> {
+  const transaction = initialState.tr;
+
+  const resource = getCurrentBesluitURI(initialState);
+  if (!resource || !isValidTypeChoice(typeInstance)) {
+    return {
+      result: [false],
+      initialState,
+      transaction,
+      transactions: [transaction],
+    };
+  }
+  const existingTypeUris = extractBesluitTypeUris(initialState);
+  const monads = existingTypeUris.map((existingUri) => {
+    return removePropertyFromNode({
+      resource,
+      property: {
+        predicate: RDF('type').full,
+        object: sayDataFactory.namedNode(existingUri),
+      },
+    });
+  });
+  monads.push(
+    addPropertyToNode({
+      resource,
+      property: {
+        predicate: RDF('type').full,
+        object: sayDataFactory.namedNode(
+          mostSpecificBesluitType(typeInstance).uri,
+        ),
+      },
+    }),
+  );
+  return transactionCombinator<boolean>(initialState)(monads);
+}

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

@@ -1,2 +1,2 @@
-export { type LpdcPluginConfig, LPDC } from './types';
+export type { LpdcPluginConfig, LPDC } from './types';
 export { fetchLpdcs } from './api';

package/app/components/{location-plugin/insert-variable.js → besluit-type-plugin/besluit-type-form.js}

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

package/app/styles/location-plugin.scss

@@ -21,6 +21,11 @@
     height: 100%;
   }
 
+  // Override the 'grab' cursor to 'pointer' so we can accurately pick points
+  .map-cursor-pointer > .leaflet-grab {
+    cursor: pointer;
+  }
+
   .leaflet-container {
     height: 100%;
   }

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