@lblod/ember-rdfa-editor-lblod-plugins 33.2.0 → 33.3.0-dev.770636ca8ec292930c2ff01dfcb8b20c5737251d

package/.changeset/gentle-buckets-clap.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+When inserting an AR design, include the link to the design in the RDFa

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 33.3.0
+
+### Minor Changes
+
+- [#611](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/611) [`ad9364d`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/ad9364d3d274d241228887356c057f7e2af84918) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Allow the use of draft besluit types
+
 ## 33.2.0
 
 ### Minor Changes

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

@@ -20,14 +20,17 @@ import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/u
 import {
   BesluitTypeInstance,
   checkBesluitTypeInstance,
+  checkForDraftBesluitType,
   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';
+import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 
 type Args = {
   controller: SayController;
   options: BesluitTypePluginOptions;
+  allowForDraftTypes?: boolean;
 };
 
 export default class EditorPluginsToolbarDropdownComponent extends Component<Args> {
@@ -67,7 +70,9 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
 
   setType = (type: BesluitTypeInstance) => {
     this.selectedTypeInstance = type;
-    this.insertIfValid();
+    if (!this.args.allowForDraftTypes) {
+      this.insertIfValid();
+    }
   };
 
   updateBesluitTypes = () => {
@@ -84,13 +89,16 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
     );
     if (typeInstance) {
       this.selectedTypeInstance = typeInstance;
-      this.cardExpanded = false;
+      const isDraftType = checkForDraftBesluitType(
+        this.controller.mainEditorState,
+      );
+      this.cardExpanded = !this.args.allowForDraftTypes && isDraftType;
     } else {
       this.cardExpanded = true;
     }
   };
 
-  insertIfValid() {
+  insertIfValid = () => {
     this.controller.doCommand((state, dispatch) => {
       if (!this.selectedTypeInstance || !dispatch) {
         return false;
@@ -98,6 +106,7 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
       const { result, transaction } = setBesluitType(
         state,
         this.selectedTypeInstance,
+        this.args.allowForDraftTypes,
       );
       if (result.every((ok) => ok)) {
         dispatch(transaction);
@@ -105,7 +114,7 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
       }
       return false;
     });
-  }
+  };
 
   <template>
     <div
@@ -182,6 +191,11 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
                 @selectedType={{this.selectedTypeInstance}}
                 @setType={{this.setType}}
               />
+              {{#if @allowForDraftTypes}}
+                <AuButton {{on 'click' this.insertIfValid}}>
+                  {{t 'common.insert'}}
+                </AuButton>
+              {{/if}}
             {{/if}}
           </Modal.Body>
         </AuModal>

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

@@ -1,7 +1,10 @@
 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/utils/decision-utils';
-import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import {
+  EXT,
+  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';
 
@@ -27,6 +30,20 @@ export function extractBesluitTypeUris(editorState: EditorState): string[] {
     .map((type: NamedNodeTriple) => type?.object.value);
 }
 
+export function checkForDraftBesluitType(editorState: EditorState): boolean {
+  const besluitRange = getCurrentBesluitRange(editorState);
+  if (!besluitRange) {
+    return false;
+  }
+  return getOutgoingTripleList(
+    besluitRange.node.attrs,
+    EXT('isDraftDecisionType'),
+  ).some(
+    (draftTypeTriple: NamedNodeTriple) =>
+      draftTypeTriple?.object.value === 'true',
+  );
+}
+
 /**
  * Finds a decision type in the document and checks that it represents a valid decision type
  * according to the list of types passed in.

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

@@ -10,21 +10,26 @@ import {
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import { getCurrentBesluitURI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/decision-utils';
 import {
+  checkForDraftBesluitType,
   extractBesluitTypeUris,
   isValidTypeChoice,
   mostSpecificBesluitType,
   type BesluitTypeInstance,
 } from './besluit-type-instances';
-import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import {
+  EXT,
+  RDF,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
 export function setBesluitType(
   initialState: EditorState,
   typeInstance: BesluitTypeInstance,
+  isDraftDecisionType?: boolean,
 ): TransactionCombinatorResult<boolean> {
   const transaction = initialState.tr;
-
   const resource = getCurrentBesluitURI(initialState);
-  if (!resource || !isValidTypeChoice(typeInstance)) {
+  const isValidType = isValidTypeChoice(typeInstance);
+  if (!resource || (!isValidType && !isDraftDecisionType)) {
     return {
       result: [false],
       initialState,
@@ -42,6 +47,17 @@ export function setBesluitType(
       },
     });
   });
+  if (checkForDraftBesluitType(initialState)) {
+    monads.push(
+      removePropertyFromNode({
+        resource,
+        property: {
+          predicate: EXT('isDraftDecisionType').full,
+          object: sayDataFactory.literal('true'),
+        },
+      }),
+    );
+  }
   monads.push(
     addPropertyToNode({
       resource,
@@ -53,5 +69,16 @@ export function setBesluitType(
       },
     }),
   );
+  if (!isValidType && isDraftDecisionType) {
+    monads.push(
+      addPropertyToNode({
+        resource,
+        property: {
+          predicate: EXT('isDraftDecisionType').full,
+          object: sayDataFactory.literal('true'),
+        },
+      }),
+    );
+  }
   return transactionCombinator<boolean>(initialState)(monads);
 }

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

@@ -7,10 +7,12 @@ import {
 } from '@lblod/ember-rdfa-editor';
 import { v4 as uuid } from 'uuid';
 import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
+import { type FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
   DCT,
   EXT,
   MOBILITEIT,
+  ONDERDEEL,
   PROV,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -46,6 +48,7 @@ import {
 } from '../schemas/variable-instance';
 
 type InsertMeasureArgs = {
+  arDesignUri?: string;
   zonality: ZonalOrNot;
   temporal: boolean;
   variables: Record<
@@ -65,6 +68,7 @@ type InsertMeasureArgs = {
 );
 
 export default function insertMeasure({
+  arDesignUri,
   zonality,
   temporal,
   variables,
@@ -79,6 +83,16 @@ export default function insertMeasure({
         ? args.measureConcept
         : args.measureDesign.measureConcept;
     const measureDesign = 'measureDesign' in args && args.measureDesign;
+    const externalTriples: FullTriple[] | undefined =
+      !arDesignUri || !measureDesign
+        ? undefined
+        : [
+            {
+              subject: sayDataFactory.namedNode(arDesignUri),
+              predicate: ONDERDEEL('BevatMaatregelOntwerp').full,
+              object: sayDataFactory.namedNode(measureDesign.uri),
+            },
+          ];
     const { schema } = state;
     const signNodes = measureConcept.trafficSignalConcepts.map((signConcept) =>
       constructSignalNode(signConcept, schema, zonality),
@@ -150,6 +164,7 @@ export default function insertMeasure({
           // mobiliteit:periode, mobiliteit:plaatsbepaling, schema:eventSchedule, mobiliteit:type,
           // mobiliteit:verwijstNaar, mobiliteit:heeftGevolg
         ],
+        externalTriples,
       },
       [measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
     );

package/addon/utils/constants.ts

@@ -67,3 +67,7 @@ export const BESTUURSPERIODES = {
 export type BestuursperiodeLabel = keyof typeof BESTUURSPERIODES;
 export type BestuursperiodeURI =
   (typeof BESTUURSPERIODES)[BestuursperiodeLabel];
+export const ONDERDEEL = namespace(
+  'https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#',
+  'onderdeel',
+);

package/declarations/addon/components/besluit-type-plugin/toolbar-dropdown.d.ts

@@ -5,6 +5,7 @@ import { BesluitTypeInstance } from '@lblod/ember-rdfa-editor-lblod-plugins/plug
 type Args = {
     controller: SayController;
     options: BesluitTypePluginOptions;
+    allowForDraftTypes?: boolean;
 };
 export default class EditorPluginsToolbarDropdownComponent extends Component<Args> {
     selectedTypeInstance?: BesluitTypeInstance;
@@ -17,6 +18,6 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
     toggleCard: () => void;
     setType: (type: BesluitTypeInstance) => void;
     updateBesluitTypes: () => void;
-    insertIfValid(): void;
+    insertIfValid: () => void;
 }
 export {};

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

@@ -6,6 +6,7 @@ export interface BesluitTypeInstance {
     subSubType?: BesluitType;
 }
 export declare function extractBesluitTypeUris(editorState: EditorState): string[];
+export declare function checkForDraftBesluitType(editorState: EditorState): boolean;
 /**
  * Finds a decision type in the document and checks that it represents a valid decision type
  * according to the list of types passed in.

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

@@ -1,4 +1,4 @@
 import { type EditorState } from '@lblod/ember-rdfa-editor';
 import { type TransactionCombinatorResult } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 import { type BesluitTypeInstance } from './besluit-type-instances';
-export declare function setBesluitType(initialState: EditorState, typeInstance: BesluitTypeInstance): TransactionCombinatorResult<boolean>;
+export declare function setBesluitType(initialState: EditorState, typeInstance: BesluitTypeInstance, isDraftDecisionType?: boolean): TransactionCombinatorResult<boolean>;

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

@@ -5,6 +5,7 @@ import { ZonalOrNot } from '../constants';
 import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
 import { VariableInstance } from '../schemas/variable-instance';
 type InsertMeasureArgs = {
+    arDesignUri?: string;
     zonality: ZonalOrNot;
     temporal: boolean;
     variables: Record<string, Exclude<Variable, {
@@ -18,5 +19,5 @@ type InsertMeasureArgs = {
 } | {
     measureDesign: MobilityMeasureDesign;
 });
-export default function insertMeasure({ zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
+export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
 export {};

package/declarations/addon/utils/constants.d.ts

@@ -28,3 +28,4 @@ export declare const BESTUURSPERIODES: {
 };
 export type BestuursperiodeLabel = keyof typeof BESTUURSPERIODES;
 export type BestuursperiodeURI = (typeof BESTUURSPERIODES)[BestuursperiodeLabel];
+export declare const ONDERDEEL: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#${Suffix}`, `onderdeel:${Suffix}`>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "33.2.0",
+  "version": "33.3.0-dev.770636ca8ec292930c2ff01dfcb8b20c5737251d",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",