@lblod/ember-rdfa-editor-lblod-plugins 27.0.1 → 27.0.2-dev.751f44226897d2ee405ea11d48bec0779acfa8ed

package/.changeset/fair-months-invent.md

@@ -0,0 +1,14 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Location plugin: add support for configuring the location types to show.
+The location types may be configured through the `@locationTypes` argument of the `location-plugin/insert` component.
+
+The `@locationTypes` argument expects an array of `LocationType` values.
+Supported `LocationType` values are:
+- 'address'
+- 'place'
+- 'area'
+
+By default the value of `@locationTypes` is `['address', 'place', 'area']`

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 27.0.2
+
+### Patch Changes
+
+- [`3ca9431`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/3ca9431392d2927d1e5ee868745cda1cf7f78a4d) Thanks [@piemonkey](https://github.com/piemonkey)! - Correct default header format for decision articles in existing documents
+
 ## 27.0.1
 
 ### Patch Changes

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

@@ -35,7 +35,7 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import { type Point } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { type NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
-import { type LocationType } from './map';
+import { SUPPORTED_LOCATION_TYPES, type LocationType } from './map';
 import { type SafeString } from '@ember/template';
 
 interface Message {
@@ -47,6 +47,7 @@ interface Message {
 
 type Signature = {
   Args: {
+    locationTypes?: readonly LocationType[];
     locationType: LocationType;
     setLocationType: (type: LocationType) => void;
     defaultMunicipality?: string;
@@ -107,6 +108,31 @@ export default class LocationPluginEditComponent extends Component<Signature> {
   })
   newTruncatedValue?: boolean;
 
+  get locationTypes() {
+    const unsupportedLocationType = this.args.locationTypes?.find(
+      (locationType) => !SUPPORTED_LOCATION_TYPES.includes(locationType),
+    );
+    if (unsupportedLocationType) {
+      throw new Error(
+        `${unsupportedLocationType} is not supported. Supported location types are ${SUPPORTED_LOCATION_TYPES.join(
+          ', ',
+        )}`,
+      );
+    }
+    return this.args.locationTypes ?? SUPPORTED_LOCATION_TYPES;
+  }
+
+  locationTypeLabel = (locationType: LocationType) => {
+    switch (locationType) {
+      case 'address':
+        return this.intl.t('location-plugin.types.address');
+      case 'place':
+        return this.intl.t('location-plugin.types.place');
+      case 'area':
+        return this.intl.t('location-plugin.types.area');
+    }
+  };
+
   get message(): Message | undefined {
     const value = this.newAddress.value as Address | undefined;
 
@@ -372,15 +398,11 @@ export default class LocationPluginEditComponent extends Component<Signature> {
             @onChange={{@setLocationType}}
             as |Group|
           >
-            <Group.Radio @value='address'>
-              {{t 'location-plugin.types.address'}}
-            </Group.Radio>
-            <Group.Radio @value='place'>
-              {{t 'location-plugin.types.place'}}
-            </Group.Radio>
-            <Group.Radio @value='area'>
-              {{t 'location-plugin.types.area'}}
-            </Group.Radio>
+            {{#each this.locationTypes as |locationType|}}
+              <Group.Radio @value={{locationType}}>
+                {{this.locationTypeLabel locationType}}
+              </Group.Radio>
+            {{/each}}
           </AuRadioGroup>
         </fs.content>
       </AuFieldset>

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

@@ -28,7 +28,10 @@ import { replaceSelectionWithLocation } from '@lblod/ember-rdfa-editor-lblod-plu
 import { type LocationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import { NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import Edit from './edit';
-import LocationMap, { type LocationType } from './map';
+import LocationMap, {
+  SUPPORTED_LOCATION_TYPES,
+  type LocationType,
+} from './map';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
@@ -55,6 +58,7 @@ interface Signature {
     config: LocationPluginConfig;
     defaultMunicipality?: string;
     templateMode?: boolean;
+    locationTypes?: LocationType[];
   };
   Element: HTMLLIElement;
 }
@@ -65,6 +69,10 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   @tracked chosenPoint: GeoPos | undefined;
   @tracked isLoading = false;
 
+  get locationTypes() {
+    return this.args.locationTypes ?? SUPPORTED_LOCATION_TYPES;
+  }
+
   @trackedReset({
     memo: 'modalOpen',
     update: updateFromNode(Address, (address) => address),
@@ -99,11 +107,13 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     update(component: LocationPluginInsertComponent) {
       return (
         updateFromNode(Place, () => 'place')(component) ??
-        updateFromNode(Area, () => 'area', 'address')(component)
+        updateFromNode(Area, () => 'area')(component) ??
+        updateFromNode(Address, () => 'address')(component) ??
+        component.locationTypes[0]
       );
     },
   })
-  locationType: LocationType = 'address';
+  declare locationType: LocationType;
 
   @trackedReset({
     memo: 'controller.activeEditorState',
@@ -284,6 +294,7 @@ export default class LocationPluginInsertComponent extends Component<Signature>
             <Edit
               @locationType={{this.locationType}}
               @setLocationType={{this.setLocationType}}
+              @locationTypes={{this.locationTypes}}
               @selectedLocationNode={{this.selectedLocationNode}}
               @setAddressToInsert={{this.setAddressToInsert}}
               @setIsLoading={{this.setIsLoading}}

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

@@ -20,7 +20,8 @@ import {
   type GlobalCoordinates,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 
-export type LocationType = 'address' | 'place' | 'area';
+export const SUPPORTED_LOCATION_TYPES = ['address', 'place', 'area'] as const;
+export type LocationType = (typeof SUPPORTED_LOCATION_TYPES)[number];
 
 const MAP_TILE_ATTRIBUTION =
   '&copy; <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';

package/addon/plugins/structure-plugin/node.ts

@@ -245,7 +245,9 @@ export const emberNodeConfig: (
             attrs.rdfaNodeType === 'resource' &&
             node.dataset.sayRenderAs === 'structure'
           ) {
-            const headerFormat = node.dataset.sayHeaderFormat;
+            // Since there are existing decision articles with no sayHeaderFormat, the default if
+            // unset is the default for these structures, 'name'
+            const headerFormat = node.dataset.sayHeaderFormat ?? 'name';
             // strict selector here to avoid false positives when structures are nested
             // :scope refers to the element on which we call querySelector
             // say-structure-header-content data attribute is now deprecated in favour of using an

package/declarations/addon/components/location-plugin/edit.d.ts

@@ -14,6 +14,7 @@ interface Message {
 }
 type Signature = {
     Args: {
+        locationTypes?: readonly LocationType[];
         locationType: LocationType;
         setLocationType: (type: LocationType) => void;
         defaultMunicipality?: string;
@@ -34,6 +35,8 @@ export default class LocationPluginEditComponent extends Component<Signature> {
     newHousenumber?: string;
     newBusnumber?: string;
     newTruncatedValue?: boolean;
+    get locationTypes(): readonly ("address" | "area" | "place")[];
+    locationTypeLabel: (locationType: LocationType) => string;
     get message(): Message | undefined;
     get currentAddress(): Address | null;
     get currentMunicipality(): string | undefined;

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

@@ -14,6 +14,7 @@ interface Signature {
         config: LocationPluginConfig;
         defaultMunicipality?: string;
         templateMode?: boolean;
+        locationTypes?: LocationType[];
     };
     Element: HTMLLIElement;
 }
@@ -22,6 +23,7 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     modalOpen: boolean;
     chosenPoint: GeoPos | undefined;
     isLoading: boolean;
+    get locationTypes(): readonly ["address", "place", "area"] | ("address" | "area" | "place")[];
     addressToInsert?: Address;
     savedLocation: GeoPos | undefined;
     placeName: string;

package/declarations/addon/components/location-plugin/map.d.ts

@@ -4,7 +4,8 @@ import { type LatLngBoundsExpression } from 'leaflet';
 import { type LeafletMouseEvent } from 'leaflet';
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import { GeoPos, type GlobalCoordinates } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
-export type LocationType = 'address' | 'place' | 'area';
+export declare const SUPPORTED_LOCATION_TYPES: readonly ["address", "place", "area"];
+export type LocationType = (typeof SUPPORTED_LOCATION_TYPES)[number];
 interface Signature {
     Args: {
         address: Address | undefined;

package/package.json

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