@lblod/ember-rdfa-editor-lblod-plugins 32.6.1 → 32.6.2-dev.2b79e744693974a7028fb653bcb3f5c426cb767f

package/.changeset/old-squids-flash.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add text to roadsigns indicating zonality to newly inserted zonal measures

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 32.6.2
+
+### Patch Changes
+
+- [#598](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/598) [`4534978`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4534978967ada361779096652ad8570d592320c1) Thanks [@piemonkey](https://github.com/piemonkey)! - Do not auto-focus variables unless they only contain a placeholder
+
+- [#602](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/602) [`9037dd0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/9037dd03b02c299e7fe56134fa592af3a3e19af0) Thanks [@elpoelma](https://github.com/elpoelma)! - Add default fallback values for `source` and `codelist` attributes of `location` and `codelist` variables. This ensures that older documents may be parsed without/with less issues/errors
+
 ## 32.6.1
 
 ### Patch Changes

package/addon/components/roadsign-regulation-plugin/expanded-measure.gts

@@ -10,17 +10,16 @@ import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
-import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import {
+  ZONALITY_OPTIONS,
+  ZonalOrNot,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
 import { isSome } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 export type InsertMobilityMeasureTask = Task<
   void,
-  [
-    MobilityMeasureConcept,
-    typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL,
-    boolean,
-  ]
+  [MobilityMeasureConcept, ZonalOrNot, boolean]
 >;
 type Signature = {
   Args: {
@@ -32,9 +31,7 @@ type Signature = {
 };
 
 export default class ExpandedMeasure extends Component<Signature> {
-  @tracked zonalityValue?:
-    | typeof ZONALITY_OPTIONS.ZONAL
-    | typeof ZONALITY_OPTIONS.NON_ZONAL;
+  @tracked zonalityValue?: ZonalOrNot;
   @tracked temporalValue?: boolean;
 
   get isPotentiallyZonal() {
@@ -49,9 +46,7 @@ export default class ExpandedMeasure extends Component<Signature> {
   }
 
   @action
-  changeZonality(
-    zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL,
-  ) {
+  changeZonality(zonality: ZonalOrNot) {
     this.zonalityValue = zonality;
   }
 
@@ -64,9 +59,8 @@ export default class ExpandedMeasure extends Component<Signature> {
   insert() {
     this.args.insert.perform(
       this.args.concept,
-      (this.zonalityValue ?? this.args.concept.zonality) as
-        | typeof ZONALITY_OPTIONS.ZONAL
-        | typeof ZONALITY_OPTIONS.NON_ZONAL,
+      // POTENTIALLY_ZONAL option is filtered out by requiring a zonalityValue to submit
+      (this.zonalityValue ?? this.args.concept.zonality) as ZonalOrNot,
       this.temporalValue ?? false,
     );
   }

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -32,6 +32,7 @@ import { on } from '@ember/modifier';
 import {
   TRAFFIC_SIGNAL_CONCEPT_TYPES,
   ZONALITY_OPTIONS,
+  type ZonalOrNot,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { resolveTemplate } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/actions/resolve-template';
 import { queryMobilityTemplates } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/queries/mobility-template';
@@ -309,9 +310,7 @@ export default class RoadsignsModal extends Component<Signature> {
   insertMeasure = task(
     async (
       concept: MobilityMeasureConcept,
-      zonality:
-        | typeof ZONALITY_OPTIONS.ZONAL
-        | typeof ZONALITY_OPTIONS.NON_ZONAL,
+      zonality: ZonalOrNot,
       temporal: boolean,
     ) => {
       if (!this.decisionLocation) {

package/addon/components/variable-plugin/variable/nodeview.ts

@@ -16,7 +16,7 @@ export default class VariableNodeViewComponent extends Component<EmberNodeArgs>
     return [editableNodePlugin(this.args.getPos)];
   }
   @action
-  onClick() {
+  onClick(event: Event) {
     if (this.innerView) {
       if (this.innerView.state.doc.firstChild?.type.name === 'placeholder') {
         this.innerView.focus();
@@ -28,7 +28,13 @@ export default class VariableNodeViewComponent extends Component<EmberNodeArgs>
             this.innerView?.dispatch(tr);
           }
         });
-      } else {
+      } else if (
+        event.target instanceof Element &&
+        event.target.classList.contains('say-pill')
+      ) {
+        // When clicking between the nested prosemirror and the border of the pill, we need to
+        // focus the inner view to avoid weird issues with the selection jumping after starting to
+        // type
         this.innerView.focus();
       }
     }

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -30,6 +30,7 @@ import {
   TRAFFIC_SIGNAL_TYPE_MAPPING,
   TRAFFIC_SIGNAL_TYPES,
   ZONALITY_OPTIONS,
+  ZonalOrNot,
 } from '../constants';
 import { createTextVariable } from '../../variable-plugin/actions/create-text-variable';
 import { generateVariableInstanceUri } from '../../variable-plugin/utils/variable-helpers';
@@ -40,7 +41,7 @@ import { createClassicLocationVariable } from '../../variable-plugin/actions/cre
 
 interface InsertMeasureArgs {
   measureConcept: MobilityMeasureConcept;
-  zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL;
+  zonality: ZonalOrNot;
   temporal: boolean;
   variables: Record<string, Exclude<Variable, { type: 'instruction' }>>;
   templateString: string;
@@ -60,7 +61,7 @@ export default function insertMeasure({
   return function (state: EditorState) {
     const { schema } = state;
     const signNodes = measureConcept.trafficSignalConcepts.map((signConcept) =>
-      constructSignNode(signConcept, schema),
+      constructSignNode(signConcept, schema, zonality),
     );
     let signSection: PNode[] = [];
     if (signNodes.length) {
@@ -210,9 +211,19 @@ function determineSignLabel(signConcept: TrafficSignalConcept) {
   }
 }
 
-function constructSignNode(signConcept: TrafficSignalConcept, schema: Schema) {
+function constructSignNode(
+  signConcept: TrafficSignalConcept,
+  schema: Schema,
+  zonality?: ZonalOrNot,
+) {
   const signUri = `http://data.lblod.info/verkeerstekens/${uuid()}`;
   const prefix = determineSignLabel(signConcept);
+  const zonalityText =
+    !zonality || zonality !== ZONALITY_OPTIONS.ZONAL
+      ? ''
+      : prefix === 'Onderbord'
+        ? ' op het verkeersbord met zonale geldigheid'
+        : ' met zonale geldigheid';
   const node = schema.nodes.inline_rdfa.create(
     {
       rdfaNodeType: 'resource',
@@ -235,7 +246,7 @@ function constructSignNode(signConcept: TrafficSignalConcept, schema: Schema) {
         },
       ],
     },
-    schema.text(`${prefix} ${signConcept.code}`),
+    schema.text(`${prefix} ${signConcept.code}${zonalityText}`),
   );
   return node;
 }

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

@@ -1,4 +1,5 @@
 import { MOBILITEIT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 
 export const ZONALITY_OPTIONS = {
   POTENTIALLY_ZONAL:
@@ -7,6 +8,11 @@ export const ZONALITY_OPTIONS = {
   NON_ZONAL:
     'http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc',
 } as const;
+export type ZonalityOption = ValuesOf<typeof ZONALITY_OPTIONS>;
+export type ZonalOrNot = Exclude<
+  ZonalityOption,
+  typeof ZONALITY_OPTIONS.POTENTIALLY_ZONAL
+>;
 
 export const TRAFFIC_SIGNAL_CONCEPT_TYPES = {
   TRAFFIC_SIGNAL: MOBILITEIT('Verkeerstekenconcept').full,

package/addon/plugins/variable-plugin/variables/codelist.ts

@@ -106,8 +106,8 @@ const parseDOMLegacy = [
           label,
           // These attrs are required but it's possible for older documents to get into a broken
           // state. We mark these as unknown so we can push the user to fix this as we can't do it.
-          source: sourceUri ?? 'UNKNOWN',
-          codelist: codelistUri ?? 'UNKNOWN',
+          source: sourceUri,
+          codelist: codelistUri,
           selectionStyle,
         });
       }
@@ -138,7 +138,6 @@ const parseDOMLegacy = [
         const sourceUri = getOutgoingTriple(attrs, DCT('source'))?.object.value;
         const selectionStyle = node.dataset.selectionStyle;
         const label = getOutgoingTriple(attrs, EXT('label'))?.object.value;
-
         return createCodelistVariableAttrs({
           variable: variableUri,
           variableInstance: variableInstanceUri,
@@ -237,8 +236,12 @@ const emberNodeConfig: EmberNodeConfig = {
     label: {
       default: null,
     },
-    codelist: {},
-    source: {},
+    codelist: {
+      default: 'UNKNOWN',
+    },
+    source: {
+      default: 'UNKNOWN',
+    },
     selectionStyle: {
       default: null,
     },

package/addon/plugins/variable-plugin/variables/location.ts

@@ -99,7 +99,7 @@ const parseDOMLegacy = [
           variableInstance: variableInstanceUri,
           label,
           // Default to a blank string so the edit component uses the default
-          source: sourceUri ?? '',
+          source: sourceUri,
         });
       }
       return false;
@@ -176,7 +176,9 @@ const emberNodeConfig: EmberNodeConfig = {
     label: {
       default: null,
     },
-    source: {},
+    source: {
+      default: '',
+    },
     datatype: {
       default: XSD('string').namedNode,
     },

package/declarations/addon/components/roadsign-regulation-plugin/expanded-measure.d.ts

@@ -1,10 +1,10 @@
 import Component from '@glimmer/component';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
-import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
 export type InsertMobilityMeasureTask = Task<void, [
     MobilityMeasureConcept,
-    typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL,
+    ZonalOrNot,
     boolean
 ]>;
 type Signature = {
@@ -16,11 +16,11 @@ type Signature = {
     };
 };
 export default class ExpandedMeasure extends Component<Signature> {
-    zonalityValue?: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL;
+    zonalityValue?: ZonalOrNot;
     temporalValue?: boolean;
     get isPotentiallyZonal(): boolean;
     get insertButtonDisabled(): boolean;
-    changeZonality(zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL): void;
+    changeZonality(zonality: ZonalOrNot): void;
     changeTemporality(temporality: 'true' | 'false'): void;
     insert(): void;
     unselectRow(): void;

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -4,7 +4,7 @@ import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { Select } from 'ember-power-select/components/power-select';
 import { TaskInstance } from 'reactiveweb/ember-concurrency';
-import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { type ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 type Option = {
     uri: string;
     label: string;
@@ -131,7 +131,7 @@ export default class RoadsignsModal extends Component<Signature> {
         }))[];
     }[] | undefined;
     get measureConceptCount(): number | undefined;
-    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL, temporal: boolean) => Promise<void>>;
+    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: ZonalOrNot, temporal: boolean) => Promise<void>>;
     resetPagination(): void;
     goToPreviousPage(): void;
     goToNextPage(): void;

package/declarations/addon/components/variable-plugin/variable/nodeview.d.ts

@@ -4,7 +4,7 @@ import { EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/ember-node';
 export default class VariableNodeViewComponent extends Component<EmberNodeArgs> {
     innerView?: SayView;
     get plugins(): ProsePlugin[];
-    onClick(): void;
+    onClick(event: Event): void;
     initEditor(view: SayView): void;
     resetVariable(): void;
     get label(): any;

package/declarations/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.d.ts

@@ -1,10 +1,10 @@
 import { TransactionMonad } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 import { MobilityMeasureConcept } from '../schemas/mobility-measure-concept';
 import { Variable } from '../schemas/variable';
-import { ZONALITY_OPTIONS } from '../constants';
+import { ZonalOrNot } from '../constants';
 interface InsertMeasureArgs {
     measureConcept: MobilityMeasureConcept;
-    zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL;
+    zonality: ZonalOrNot;
     temporal: boolean;
     variables: Record<string, Exclude<Variable, {
         type: 'instruction';

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

@@ -1,8 +1,11 @@
+import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 export declare const ZONALITY_OPTIONS: {
     readonly POTENTIALLY_ZONAL: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
     readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
     readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
 };
+export type ZonalityOption = ValuesOf<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";
     readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "32.6.1",
+  "version": "32.6.2-dev.2b79e744693974a7028fb653bcb3f5c426cb767f",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",