@lblod/ember-rdfa-editor-lblod-plugins 7.0.0 → 8.0.0

package/addon/plugins/variable-plugin/utils/constants.ts

@@ -1,4 +1,4 @@
-import { PNode, Schema } from '@lblod/ember-rdfa-editor';
+import { Attrs, PNode, Schema } from '@lblod/ember-rdfa-editor';
 import { CodeList, fetchCodeListsByPublisher } from './fetch-data';
 import { v4 as uuidv4 } from 'uuid';
 import { XSD } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -10,17 +10,18 @@ export const MULTI_SELECT_CODELIST_TYPE =
 export type VariableType = {
   label: string;
   fetchSubtypes?: (endpoint: string, publisher: string) => Promise<CodeList[]>;
-  constructor: (
-    schema: Schema,
-    endpoint?: string,
-    selectedCodelist?: CodeList
-  ) => PNode;
+  constructor: (props: {
+    schema: Schema;
+    label?: string;
+    attributes?: Attrs;
+    codelist?: CodeList;
+  }) => PNode;
 };
 
 export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
   text: {
     label: 'text',
-    constructor: (schema) => {
+    constructor: ({ schema, label = 'text' }) => {
       const mappingURI = `http://data.lblod.info/mappings/${uuidv4()}`;
       const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
       return schema.node(
@@ -29,6 +30,7 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
           mappingResource: mappingURI,
           variableInstance,
           type: 'text',
+          label,
         },
         schema.node('placeholder', { placeholderText: 'text' })
       );
@@ -36,9 +38,10 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
   },
   number: {
     label: 'number',
-    constructor: (schema) => {
+    constructor: ({ schema, attributes, label = 'number' }) => {
       const mappingURI = `http://data.lblod.info/mappings/${uuidv4()}`;
       const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+
       return schema.node(
         'variable',
         {
@@ -46,6 +49,8 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
           variableInstance,
           type: 'number',
           datatype: XSD('integer').prefixed,
+          label,
+          ...attributes,
         },
         schema.node('placeholder', { placeholderText: 'number' })
       );
@@ -53,18 +58,19 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
   },
   date: {
     label: 'date',
-    constructor: (schema) => {
+    constructor: ({ schema, label = 'date' }) => {
       return unwrap(
         schema.nodes.date.createAndFill({
           mappingResource: `http://data.lblod.info/mappings/${uuidv4()}`,
           value: null,
+          label,
         })
       );
     },
   },
   location: {
     label: 'location',
-    constructor: (schema, endpoint) => {
+    constructor: ({ schema, attributes, label = 'location' }) => {
       const mappingURI = `http://data.lblod.info/mappings/${uuidv4()}`;
       const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
       return schema.node(
@@ -73,7 +79,8 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
           type: 'location',
           mappingResource: mappingURI,
           variableInstance,
-          source: endpoint,
+          label,
+          ...attributes,
         },
         schema.node('placeholder', {
           placeholderText: 'location',
@@ -87,7 +94,7 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
       const codelists = fetchCodeListsByPublisher(endpoint, publisher);
       return codelists;
     },
-    constructor: (schema, endpoint, selectedCodelist?: CodeList) => {
+    constructor: ({ schema, attributes, codelist, label }) => {
       const mappingURI = `http://data.lblod.info/mappings/${uuidv4()}`;
       const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
       return schema.node(
@@ -95,14 +102,21 @@ export const DEFAULT_VARIABLE_TYPES: Record<string, VariableType> = {
         {
           type: 'codelist',
           mappingResource: mappingURI,
-          codelistResource: selectedCodelist?.uri,
+          codelistResource: codelist?.uri,
           variableInstance,
-          source: endpoint,
+          label: label ?? codelist?.label,
+          ...attributes,
         },
         schema.node('placeholder', {
-          placeholderText: selectedCodelist?.label ?? '',
+          placeholderText: codelist?.label,
         })
       );
     },
   },
 };
+
+export const MINIMUM_VALUE_PNODE_KEY = 'minimumValue';
+export const MAXIMUM_VALUE_PNODE_KEY = 'maximumValue';
+
+export const MINIMUM_VALUE_HTML_ATTRIBUTE_KEY = 'data-minimum-value';
+export const MAXIMUM_VALUE_HTML_ATTRIBUTE_KEY = 'data-maximum-value';

package/addon/plugins/variable-plugin/utils/fetch-data.ts

@@ -15,20 +15,24 @@ export type CodeListOption = {
 
 function generateCodeListOptionsQuery(codelistUri: string): string {
   const codeListOptionsQuery = `
-    PREFIX lblodMobilitiet: <http://data.lblod.info/vocabularies/mobiliteit/>
+    PREFIX lblodMobiliteit: <http://data.lblod.info/vocabularies/mobiliteit/>
     PREFIX dct: <http://purl.org/dc/terms/>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
     PREFIX schema: <http://schema.org/>
+    PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
     SELECT DISTINCT * WHERE { 
-      <${codelistUri}> a lblodMobilitiet:Codelist.
+      <${codelistUri}> a lblodMobiliteit:Codelist.
       ?codelistOptions skos:inScheme <${codelistUri}>.
-      ?codelistOptions skos:prefLabel ?label.
+      ?codelistOptions skos:prefLabel ?value.
       OPTIONAL {
         ?codelistOptions schema:position ?position .
       }
       OPTIONAL {
         <${codelistUri}> dct:type ?type.
       }
+      OPTIONAL {
+        ?codelistOptions ext:summary ?label.
+      }
     }
     ORDER BY (!BOUND(?position)) ASC(?position)
   `;
@@ -56,8 +60,8 @@ export async function fetchCodeListOptions(
 function parseCodelistOptions(queryResult: QueryResult): CodeListOption[] {
   const bindings = queryResult.results.bindings;
   return bindings.map((binding) => ({
-    value: binding['label']?.value,
-    label: binding['label']?.value,
+    value: binding['value']?.value,
+    label: binding['label'] ? binding['label'].value : binding['value']?.value,
   }));
 }
 

package/app/components/generic-rdfa-variable/insert-menu.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/generic-rdfa-variable/insert-menu';

package/app/components/rdfa-date-plugin/date.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/rdfa-date-plugin/date';

package/app/components/variable-plugin/number-settings.js

@@ -0,0 +1 @@
+export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/number-settings';

package/app/styles/besluit-plugin.scss

@@ -1,4 +1,4 @@
-.title-alert .au-c-button {
+.validation-alert .au-c-button {
     padding: 0;
 }
 

package/app/styles/generic-rdfa-variable.scss

@@ -0,0 +1,20 @@
+.generic-rdfa-variable-textarea-wrapper {
+  width: 100%;
+  height: 100%;
+  min-height: 150px;
+  display: flex;
+
+  overflow: visible;
+
+  .cm-editor {
+    width: 100%;
+  }
+}
+
+.generic-rdfa-plugin-modal {
+  overflow: visible;
+
+  .au-c-modal__body {
+    overflow: visible;
+  }
+}

package/app/styles/variable-plugin.scss

@@ -55,6 +55,15 @@
       word-wrap: break-word;
       outline: 0px;
     }
+    .label {
+      font-size: var(--au-base);
+      color: var(--au-blue-700);
+      user-select: none;
+      margin: 0.5rem;
+    }
+    .au-c-icon {
+      margin: 0;
+    }
   }
 }
 
@@ -68,3 +77,25 @@
     }
   }
 }
+
+.number-settings {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: 1fr;
+
+  .to {
+    display: flex;
+    justify-content: center;
+    color: var(--au-gray-900);
+
+    span {
+      position: relative;
+      top: 33px;
+    }
+  }
+
+  // AuInput @type='number' overrides width to be 100px, we have to override it again
+  input[type='number'] {
+    width: 100%;
+  }
+}

package/components/decision-plugin/decision-plugin-card.d.ts

@@ -11,7 +11,9 @@ export default class DecisionPluginCard extends Component<Args> {
     intl: IntlService;
     get controller(): SayController;
     focus(): void;
-    insertTitle(): void;
-    get canInsertTitle(): boolean;
+    insertMotivation(): void;
+    get canInsertMotivation(): boolean;
+    insertArticleBlock(): void;
+    get missingArticleBlock(): boolean;
 }
 export {};

package/components/generic-rdfa-variable/insert-menu.d.ts

@@ -0,0 +1,17 @@
+import Component from '@glimmer/component';
+import { SayController } from '@lblod/ember-rdfa-editor';
+type Args = {
+    controller: SayController;
+};
+export default class GenericRdfaVariableInsertMenu extends Component<Args> {
+    modalOpen: boolean;
+    private htmlEditor?;
+    get controller(): SayController;
+    get schema(): import("prosemirror-model").Schema<any, any>;
+    showModal(): void;
+    closeModal(): void;
+    onCancel(): void;
+    setupHtmlEditor(element: HTMLElement): void;
+    onInsert(): void;
+}
+export {};

package/components/rdfa-date-plugin/date.d.ts

@@ -0,0 +1,16 @@
+import Component from '@glimmer/component';
+import { DecorationSource, PNode, SayController, SayView } from '@lblod/ember-rdfa-editor';
+type Args = {
+    getPos: () => number | undefined;
+    node: PNode;
+    updateAttribute: (attr: string, value: unknown) => void;
+    controller: SayController;
+    view: SayView;
+    selected: boolean;
+    contentDecorations?: DecorationSource;
+};
+export default class VariableComponent extends Component<Args> {
+    onClick(): void;
+    get humanReadableDate(): string;
+}
+export {};

package/components/variable-plugin/insert-variable-card.d.ts

@@ -16,14 +16,18 @@ export default class EditorPluginsInsertCodelistCardComponent extends Component<
     hasSubtype: boolean;
     selectedSubtype?: CodeList;
     subtypes?: CodeList[];
+    variableLabel?: string;
+    extraAttributes: Record<string, unknown>;
     publisher: string;
     endpoint: string;
     constructor(parent: unknown, args: Args);
     get controller(): SayController;
+    updateVariableLabel(event: InputEvent): void;
     insert(): void;
     updateSelectedVariable(variable: VariableType): void;
     fetchSubtypes: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (fetchFunction: (endpoint: string, publisher: string) => Promise<CodeList[]>) => Promise<void>>;
     updateSubtype(subtype: CodeList): void;
+    get type(): string | undefined;
     get showCard(): boolean;
 }
 export {};

package/components/variable-plugin/template-variable-card.d.ts

@@ -16,6 +16,7 @@ export default class EditorPluginsTemplateVariableCardComponent extends Componen
     } | undefined;
     showCard: boolean;
     multiSelect: boolean;
+    label?: string;
     mappingUri?: string;
     get controller(): SayController;
     insert(): void;

package/components/variable-plugin/variable.d.ts

@@ -0,0 +1,11 @@
+import Component from '@glimmer/component';
+import { SayController, SayView } from '@lblod/ember-rdfa-editor';
+type Args = {
+    controller: SayController;
+};
+export default class VariableComponent extends Component<Args> {
+    innerView?: SayView;
+    onClick(): void;
+    initEditor(view: SayView): void;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -30,6 +30,9 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
+    "@codemirror/lang-html": "^6.4.3",
+    "@codemirror/state": "^6.2.1",
+    "@codemirror/view": "^6.12.0",
     "@curvenote/prosemirror-utils": "^1.0.5",
     "@lblod/marawa": "^0.8.0-beta.2",
     "@rdfjs/data-model": "^2.0.1",
@@ -38,6 +41,7 @@
     "@types/rdf-validate-shacl": "^0.4.0",
     "@types/rdfjs__parser-n3": "^1.1.5",
     "buffer": "^6.0.3",
+    "codemirror": "^6.0.1",
     "date-fns": "^2.29.3",
     "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.11",
@@ -54,6 +58,7 @@
     "rdf-validate-shacl": "^0.4.5",
     "stream-browserify": "^3.0.0",
     "tracked-built-ins": "^3.1.0",
+    "tracked-toolbox": "^1.2.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
@@ -63,7 +68,7 @@
     "@embroider/test-setup": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^3.7.0",
+    "@lblod/ember-rdfa-editor": "^3.8.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@tsconfig/ember": "^1.0.1",
@@ -137,13 +142,12 @@
     "qunit-dom": "^2.0.0",
     "release-it": "^15.5.0",
     "sass": "^1.49.7",
-    "tracked-toolbox": "^1.2.3",
     "typescript": "^4.9.3",
     "webpack": "^5.74.0"
   },
   "peerDependencies": {
     "@appuniversum/ember-appuniversum": "^2.4.2",
-    "@lblod/ember-rdfa-editor": "^3.7.0",
+    "@lblod/ember-rdfa-editor": "^3.8.0",
     "ember-concurrency": "^2.3.7"
   },
   "engines": {

package/plugins/decision-plugin/commands/insert-motivation.d.ts

@@ -1,7 +1,8 @@
 import { Command } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 interface InsertMotivationArgs {
-    placeholderText?: string;
+    intl: IntlService;
     validateShapes?: Set<string>;
 }
-export default function insertMotivation({ validateShapes, placeholderText, }?: InsertMotivationArgs): Command;
+export default function insertMotivation({ intl, validateShapes, }: InsertMotivationArgs): Command;
 export {};

package/plugins/decision-plugin/utils/validation-rules.d.ts

@@ -0,0 +1,10 @@
+import { Schema } from '@lblod/ember-rdfa-editor';
+export declare const atLeastOneArticleContainer: (schema: Schema) => {
+    name: string;
+    focusNodeType: import("prosemirror-model").NodeType;
+    path: string[];
+    message: string;
+    constraints: {
+        minCount: number;
+    };
+};

package/plugins/rdfa-date-plugin/nodes/date.d.ts

@@ -1,4 +1,3 @@
-import { NodeSpec } from '@lblod/ember-rdfa-editor';
 import { DateOptions } from '..';
-declare const date: (options: DateOptions) => NodeSpec;
-export default date;
+export declare const date: (options: DateOptions) => import("prosemirror-model").NodeSpec;
+export declare const dateView: (options: DateOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("prosemirror-view").NodeViewConstructor;

package/plugins/variable-plugin/nodes.d.ts

@@ -1,2 +1,23 @@
+import { PNode } from '@lblod/ember-rdfa-editor';
+export declare const getHTMLNodeExtraAttributes: ({ node, type, }: {
+    node: HTMLElement;
+    type: string;
+}) => {
+    minimumValue: string | null;
+    maximumValue: string | null;
+} | {
+    minimumValue?: undefined;
+    maximumValue?: undefined;
+};
+export declare const getPNodeExtraAttributes: ({ node, type, }: {
+    node: PNode;
+    type: string;
+}) => {
+    "data-minimum-value": string;
+    "data-maximum-value": string;
+} | {
+    "data-minimum-value"?: undefined;
+    "data-maximum-value"?: undefined;
+};
 export declare const variable: import("prosemirror-model").NodeSpec;
-export declare const variableView: (controller: import("@lblod/ember-rdfa-editor/addon").SayController) => import("prosemirror-view").NodeViewConstructor;
+export declare const variableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("prosemirror-view").NodeViewConstructor;

package/plugins/variable-plugin/utils/constants.d.ts

@@ -1,9 +1,18 @@
-import { PNode, Schema } from '@lblod/ember-rdfa-editor';
+import { Attrs, PNode, Schema } from '@lblod/ember-rdfa-editor';
 import { CodeList } from './fetch-data';
 export declare const MULTI_SELECT_CODELIST_TYPE = "http://lblod.data.gift/concepts/57C93E12-A02C-4D4B-8B95-666B6701286C";
 export type VariableType = {
     label: string;
     fetchSubtypes?: (endpoint: string, publisher: string) => Promise<CodeList[]>;
-    constructor: (schema: Schema, endpoint?: string, selectedCodelist?: CodeList) => PNode;
+    constructor: (props: {
+        schema: Schema;
+        label?: string;
+        attributes?: Attrs;
+        codelist?: CodeList;
+    }) => PNode;
 };
 export declare const DEFAULT_VARIABLE_TYPES: Record<string, VariableType>;
+export declare const MINIMUM_VALUE_PNODE_KEY = "minimumValue";
+export declare const MAXIMUM_VALUE_PNODE_KEY = "maximumValue";
+export declare const MINIMUM_VALUE_HTML_ATTRIBUTE_KEY = "data-minimum-value";
+export declare const MAXIMUM_VALUE_HTML_ATTRIBUTE_KEY = "data-maximum-value";

package/translations/en-US.yaml

@@ -114,11 +114,24 @@ besluit-type-plugin:
   error-rest-body: '. For more specific details about this problem, inspect the browser console.'
 
 besluit-plugin:
-  missing-title-warning: This decision is missing a title
+  missing-title-warning: This decision is missing a title.
+  missing-motivation-warning: This decision is missing a motivation block, a decision without this block will be harder to parse by our system.
+  missing-article-block-warning: This decision is missing an article block, a decision without this block will be harder to parse by our system.
   insert:
     decision-title: Insert decision title
+    motivation: Insert motivation
+    article-block: Insert article block
   placeholder:
     decision-title: Insert decision title
+    government-body: specify governing body
+    legal-jurisdiction: Legal basis providing that body has jurisdiction.
+    insert-legal-context: Insert juridische context
+    insert-factual-context: Factual context and reasoning
+    insert-article: Insert article
+  text:
+    authority: Authority
+    legal-context: Legal context
+    factual-context: Factual context and reasoning
 
 date-plugin:
   help:
@@ -170,6 +183,14 @@ variable-plugin:
   insert-variable: Insert variable
   button: Insert
   enter-variable-value: Select value
+  label: Label
+  labelPlaceholder: Type something...
+  number:
+    minimum: Minimum
+    minimum-placeholder: minimum value
+    maximum: Maximum
+    maximum-placeholder: maximum value
+    to: to
 validation-plugin:
   default-fix-message: Resolve
 
@@ -190,3 +211,10 @@ address-plugin:
 dummy:
   validation-card:
     title: Document Validation
+
+generic-rdfa-variable:
+  menu:
+    insert: Insert RDFA
+  modal:
+    insert: Insert
+    cancel: Cancel

package/translations/nl-BE.yaml

@@ -117,11 +117,24 @@ besluit-type-plugin:
 
 
 besluit-plugin:
-  missing-title-warning: Dit besluit heeft geen titel
+  missing-title-warning: Dit besluit heeft geen titel.
+  missing-motivation-warning: Dit besluit mist een motivatieblok, een besluit zonder dit blok zal moeilijker te ontleden zijn door ons systeem.
+  missing-article-block-warning: Deze besluit mist een artikelblok, een besluit zonder dit blok zal moeilijker te ontleden zijn door ons systeem.
   insert:
     decision-title: Voeg besluittitel in
+    motivation: Voeg motivatie in
+    article-block: Voeg artikelblok in
   placeholder:
     decision-title: Geef titel besluit op
+    government-body: geef bestuursorgaan op
+    legal-jurisdiction: Rechtsgrond die bepaalt dat dit orgaan bevoegd is.
+    insert-legal-context: Voeg juridische context in
+    insert-factual-context: Feitelijke context en argumentatie
+    insert-article: Artikel invoegen
+  text:
+    authority: Bevoegdheid
+    legal-context: Juridische context
+    factual-context: Feitelijke context en argumentatie
 
 
 date-plugin:
@@ -183,6 +196,14 @@ variable-plugin:
   insert-variable: Voeg variabele in
   button: Voeg in
   enter-variable-value: Selecteer waarde
+  label: Label
+  labelPlaceholder: Type iets...
+  number:
+    minimum: Minimum
+    minimum-placeholder: minimumwaarde
+    maximum: Maximum
+    maximum-placeholder: maximumwaarde
+    to: tot
 
 address-plugin:
   insert:
@@ -196,3 +217,10 @@ address-plugin:
 dummy:
   validation-card:
     title: Documentvalidatie
+
+generic-rdfa-variable:
+  menu:
+    insert: RDFA invoegen
+  modal:
+    insert: Invoegen
+    cancel: Terug