@lblod/ember-rdfa-editor-lblod-plugins 34.0.2 → 34.1.1-dev.29920bcd6d316470556433a018a2c90739cfecff

package/.changeset/green-bulldogs-ring.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Styling fixes on document validation plugin

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 34.1.1
+
+### Patch Changes
+
+- [`ea58ba1`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/ea58ba1cebf5d69c4f1d784c524a13c1dfe6034e) Thanks [@abeforgit](https://github.com/abeforgit)! - Allow insertMeasure to take in ar-designs with concepts instead of signs
+
+## 34.1.0
+
+### Minor Changes
+
+- [#617](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/617) [`b77f866`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b77f866cde0afa81671fcd8378d735eb747afa90) Thanks [@abeforgit](https://github.com/abeforgit)! - Automatically instantiate codelist options when possible
+
 ## 34.0.2
 
 ### Patch Changes

package/addon/components/document-validation-plugin/card.gts

@@ -176,12 +176,14 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
             as |error|
           }}
             <div class='say-document-validation__error-container'>
-              <AuIcon
-                @icon={{CloseFilledIcon}}
-                @size='large'
-                @ariaHidden={{true}}
-                class='say-document-validation__icon-error au-u-margin-right-small'
-              />
+              <div class='au-u-margin-right-small'>
+                <AuIcon
+                  @icon={{CloseFilledIcon}}
+                  @size='large'
+                  @ariaHidden={{true}}
+                  class='say-document-validation__icon-error'
+                />
+              </div>
               <div>
                 {{error.message}}
                 <AuButton

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

@@ -341,6 +341,10 @@ function constructVariableNode(
     variable: variable.uri,
     variableInstance: variableInstance.uri,
     value: valueStr,
+    valueLabel:
+      'valueLabel' in variableInstance
+        ? variableInstance.valueLabel
+        : undefined,
     label: variable.label,
   };
   switch (variable.type) {

package/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-design.ts

@@ -4,10 +4,14 @@ import {
   type MobilityMeasureConcept,
   MobilityMeasureConceptSchema,
 } from './mobility-measure-concept';
+import { TrafficSignalConceptSchema } from './traffic-signal-concept';
 
 export const MobilityMeasureDesignSchema = z.object({
   uri: z.string(),
-  trafficSignals: z.array(TrafficSignalSchema),
+  trafficSignals: z.union([
+    z.array(TrafficSignalSchema),
+    z.array(TrafficSignalConceptSchema),
+  ]),
   measureConcept: MobilityMeasureConceptSchema,
 });
 

package/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.ts

@@ -34,6 +34,7 @@ const LocationVariableInstanceSchema = BaseVariableInstanceSchema.extend({
 
 const CodelistVariableInstanceSchema = BaseVariableInstanceSchema.extend({
   value: z.string().optional(),
+  valueLabel: z.string().optional(),
   variable: CodelistVariableSchema,
 });
 

package/addon/plugins/variable-plugin/actions/create-codelist-variable.ts

@@ -15,11 +15,22 @@ import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 
 type CreateCodelistVariableArgs = {
   schema: Schema;
+  value?: string;
+  valueLabel?: string;
 } & CreateCodelistVariableAttrsArgs;
 
 export function createCodelistVariable(args: CreateCodelistVariableArgs) {
   const { schema } = args;
   const attrs = createCodelistVariableAttrs(args);
+  if (args.value && args.valueLabel) {
+    const codelistOption = createCodelistOptionNode({
+      schema,
+      subject: args.value,
+      variableInstance: args.variableInstance,
+      text: args.valueLabel,
+    });
+    return schema.nodes.codelist.create(attrs, [codelistOption]);
+  }
   return schema.nodes.codelist.create(attrs);
 }
 
@@ -85,6 +96,7 @@ export function createCodelistOptionNode(args: CreateCodelistOptionNodeArgs) {
 type CreateCodelistOptionNodeAttrsArgs = {
   subject: string;
   text: string;
+  value?: string;
   variableInstance?: string;
 };
 

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-design.d.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { type MobilityMeasureConcept } from './mobility-measure-concept';
 export declare const MobilityMeasureDesignSchema: z.ZodObject<{
     uri: z.ZodString;
-    trafficSignals: z.ZodArray<z.ZodObject<{
+    trafficSignals: z.ZodUnion<[z.ZodArray<z.ZodObject<{
         uri: z.ZodString;
         trafficSignalConcept: z.ZodIntersection<z.ZodObject<{
             uri: z.ZodString;
@@ -87,7 +87,55 @@ export declare const MobilityMeasureDesignSchema: z.ZodObject<{
         } | {
             type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
         });
-    }>, "many">;
+    }>, "many">, z.ZodArray<z.ZodIntersection<z.ZodObject<{
+        uri: z.ZodString;
+        code: z.ZodString;
+        regulatoryNotation: z.ZodOptional<z.ZodString>;
+        image: z.ZodString;
+        position: z.ZodDefault<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        code: string;
+        image: string;
+        uri: string;
+        position: number;
+        regulatoryNotation?: string | undefined;
+    }, {
+        code: string;
+        image: string;
+        uri: string;
+        position?: number | undefined;
+        regulatoryNotation?: string | undefined;
+    }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+        type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
+        categories: z.ZodDefault<z.ZodArray<z.ZodObject<{
+            uri: z.ZodString;
+            label: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            label: string;
+            uri: string;
+        }, {
+            label: string;
+            uri: string;
+        }>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories: {
+            label: string;
+            uri: string;
+        }[];
+    }, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories?: {
+            label: string;
+            uri: string;
+        }[] | undefined;
+    }>, z.ZodObject<{
+        type: z.ZodEnum<["https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept", "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept"]>;
+    }, "strip", z.ZodTypeAny, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }>]>>, "many">]>;
     measureConcept: z.ZodObject<{
         uri: z.ZodString;
         label: z.ZodString;
@@ -214,7 +262,21 @@ export declare const MobilityMeasureDesignSchema: z.ZodObject<{
             type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
         }))[];
     };
-    trafficSignals: {
+    trafficSignals: ({
+        code: string;
+        image: string;
+        uri: string;
+        position: number;
+        regulatoryNotation?: string | undefined;
+    } & ({
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories: {
+            label: string;
+            uri: string;
+        }[];
+    } | {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }))[] | {
         uri: string;
         trafficSignalConcept: {
             code: string;
@@ -256,7 +318,21 @@ export declare const MobilityMeasureDesignSchema: z.ZodObject<{
             type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
         }))[] | undefined;
     };
-    trafficSignals: {
+    trafficSignals: ({
+        code: string;
+        image: string;
+        uri: string;
+        position?: number | undefined;
+        regulatoryNotation?: string | undefined;
+    } & ({
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories?: {
+            label: string;
+            uri: string;
+        }[] | undefined;
+    } | {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }))[] | {
         uri: string;
         trafficSignalConcept: {
             code: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.d.ts

@@ -180,6 +180,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
     uri: z.ZodString;
 }, {
     value: z.ZodOptional<z.ZodString>;
+    valueLabel: z.ZodOptional<z.ZodString>;
     variable: z.ZodObject<z.objectUtil.extendShape<{
         uri: z.ZodString;
         label: z.ZodString;
@@ -214,6 +215,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
         defaultValue?: string | undefined;
     };
     value?: string | undefined;
+    valueLabel?: string | undefined;
 }, {
     uri: string;
     variable: {
@@ -225,6 +227,7 @@ export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUti
         defaultValue?: string | undefined;
     };
     value?: string | undefined;
+    valueLabel?: string | undefined;
 }>]>;
 export type VariableInstance = z.infer<typeof VariableInstanceSchema>;
 export declare function isVariableInstance(variableOrVariableInstance: Variable | VariableInstance): variableOrVariableInstance is VariableInstance;

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

@@ -3,6 +3,8 @@ import { AllOrNone } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 import { FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 type CreateCodelistVariableArgs = {
     schema: Schema;
+    value?: string;
+    valueLabel?: string;
 } & CreateCodelistVariableAttrsArgs;
 export declare function createCodelistVariable(args: CreateCodelistVariableArgs): import("prosemirror-model").Node;
 type CreateCodelistVariableAttrsArgs = {
@@ -32,6 +34,7 @@ export declare function createCodelistOptionNode(args: CreateCodelistOptionNodeA
 type CreateCodelistOptionNodeAttrsArgs = {
     subject: string;
     text: string;
+    value?: string;
     variableInstance?: string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "34.0.2",
+  "version": "34.1.1-dev.29920bcd6d316470556433a018a2c90739cfecff",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",