@lblod/ember-rdfa-editor-lblod-plugins 6.1.0 → 7.1.0

package/.woodpecker/.release.yml

@@ -8,8 +8,15 @@ pipeline:
     settings:
       token:
         from_secret: npm_access_token
+  push-tagged-build:
+    image: plugins/docker
+    settings:
+      repo: lblod/ember-rdfa-editor-lblod-plugins
+      tags: "${CI_COMMIT_TAG##v}"
+      purge: true
+    secrets: [ docker_username, docker_password ]
     # Pipeline level conditions aren't supported yet:
     # https://github.com/woodpecker-ci/woodpecker/issues/283
 when:
   event: tag
-  tag: v*
+  tag: v*

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.1.0] - 2023-05-18
+
+### Added
+- validate motivering and article section
+
+## [7.0.0] - 2023-05-17
+### Added
+- add docker build for easy demo environments
+### Change
+- BREAKING: Endpoint config for `CitationPlugin`
+### Fixed
+- Remove structure doesn't always work - disable the "Remove <structure>" button correctly
+- Fix initialization of default date properties
+
+### Fixed
+
 ## [6.1.0] - 2023-05-11
 
 ### Added
@@ -18,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - validation plugin
+- Enable Firefox cursor fix for variables
  
 ### Deprecated
 - the decision-plugin card component is now deprecated in favor of the host app's choice of insert button
@@ -427,7 +444,9 @@ add onclick handler to pencil icon in variable plugin
 
 # Changelog
 
-[unreleased]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v6.1.0...HEAD
+[unreleased]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v7.1.0...HEAD
+[7.1.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v7.0.0...v7.1.0
+[7.0.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v6.1.0...v7.0.0
 [6.1.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v6.0.0...v6.1.0
 [6.0.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v5.0.1...v6.0.0
 [5.0.1]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v5.0.0...v5.0.1

package/Dockerfile

@@ -0,0 +1,10 @@
+FROM madnificent/ember:4.9.2 as builder
+
+LABEL maintainer="info@redpencil.io"
+
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci
+COPY . .
+EXPOSE 80
+CMD ["ember", "s", "--port", "80"]

package/README.md

@@ -21,6 +21,7 @@ This addon contains the following editor plugins:
 
 * besluit-type-plugin
 * citaten-plugin
+* decision-plugin
 * import-snippet-plugin
 * insert-variable-plugin
 * rdfa-date-plugin
@@ -76,6 +77,28 @@ You can need to specify the endpoint from which the plugin will fetch the types
 }
 ```
 
+## decision-plugin
+
+This plugin provides some warnings to the user if the validation for a besluit fails, it need to be used with the validation plugin as it exports some validation rules for it.
+In order to use it you will need to add its card to the sidebar like
+```hbs
+ <DecisionPlugin::DecisionPluginCard
+    @controller={{this.controller}}
+  />
+```
+
+and then import the rule and add it to the config of your validation plugin like
+```js
+import { atLeastOneArticleContainer } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/utils/validation-rules';
+...
+ @tracked validationPlugin = validation((schema: Schema) => ({
+    shapes: [
+      atLeastOneArticleContainer(schema),
+    ]
+ })
+```
+With these changes you will see a warning if the decision is missing a title, a motivation block or an article block.
+
 ## citaten-plugin
 
 Plugin which allows a user to insert references to a legal resource or legal expression into the document.
@@ -85,8 +108,26 @@ This plugin provides a card that needs to be added to the sidebar of the editor
   <CitationPlugin::CitationCard 
     @controller={{this.controller}} 
     @plugin={{this.citationPlugin}}
+    @config={{this.config.citation}}
   />
 ```
+
+You need to specify the endpoint for the plugin in the config object
+```js
+{
+  endpoint: 'https://codex.opendata.api.vlaanderen.be:8888/sparql'
+}
+```
+
+Same goes for the `CitationInsert` component
+```hbs
+  <CitationPlugin::CitationInsert
+    @controller={{this.controller}}
+    @config={{this.config.citation}}
+  />
+```
+
+
 Being this.citationPlugin a tracked reference to the plugin created with the function exported from the package and the wished configuration
 ```js
   import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';

package/addon/components/article-structure-plugin/structure-card.hbs

@@ -34,7 +34,7 @@
                   @iconAlignment="left"
                   @skin="link"
                   @alert={{true}}
-                  @disabled={{this.currentStructureType.noUnwrap}}
+                  @disabled={{not this.canRemoveStructure}}
                   aria-describedby="remove-tooltip"
                   {{hover.velcroHook}}
                   {{hover.handleHover}}

package/addon/components/citation-plugin/citation-card.hbs

@@ -119,4 +119,5 @@
   @legislationTypeUri={{this.selectedLegislationTypeUri}}
   @selectLegislationType={{this.selectLegislationType}}
   @text={{this.searchText}}
+  @config={{this.config}}
 />

package/addon/components/citation-plugin/citation-card.ts

@@ -29,6 +29,9 @@ import {
 interface Args {
   controller: SayController;
   plugin: CitationPlugin;
+  config: {
+    endpoint: string;
+  };
 }
 
 export default class CitationCardComponent extends Component<Args> {
@@ -70,6 +73,10 @@ export default class CitationCardComponent extends Component<Args> {
     return this.args.plugin;
   }
 
+  get config() {
+    return this.args.config;
+  }
+
   get decorations() {
     return this.plugin.getState(this.controller.mainEditorState)?.highlights;
   }
@@ -121,12 +128,13 @@ export default class CitationCardComponent extends Component<Args> {
       const filter = {
         type: unwrapOr('', this.selectedLegislationTypeUri),
       };
-      const results = await fetchDecisions(
-        words,
-        filter,
-        this.pageNumber,
-        this.pageSize
-      );
+      const results = await fetchDecisions({
+        words: words,
+        filter: filter,
+        pageNumber: this.pageNumber,
+        pageSize: this.pageSize,
+        config: this.args.config,
+      });
       this.totalCount = results.totalCount;
       return results.decisions;
     } catch (e) {

package/addon/components/citation-plugin/citation-insert.hbs

@@ -19,4 +19,5 @@
 
   @selectLegislationType={{this.selectLegislationType}}
   @text={{this.text}}
+  @config={{this.config}}
 />

package/addon/components/citation-plugin/citation-insert.ts

@@ -12,7 +12,7 @@ import {
   Decision,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/vlaamse-codex';
 import { citedText } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/cited-text';
-import { CitationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
+import { CitationPluginEmberComponentConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
 import {
   LEGISLATION_TYPE_CONCEPTS,
   LEGISLATION_TYPES,
@@ -22,7 +22,7 @@ import { findParentNodeOfType } from '@curvenote/prosemirror-utils';
 
 interface Args {
   controller: SayController;
-  config: CitationPluginConfig;
+  config: CitationPluginEmberComponentConfig;
 }
 
 export default class EditorPluginsCitationInsertComponent extends Component<Args> {

package/addon/components/citation-plugin/citations/decision-detail.ts

@@ -11,6 +11,7 @@ import { task as trackedTask } from 'ember-resources/util/ember-concurrency';
 interface Args {
   decision: Decision;
   close: () => void;
+  config: { endpoint: string };
 }
 
 export default class EditorPluginsCitationsDecisionDetailComponent extends Component<Args> {
@@ -32,12 +33,13 @@ export default class EditorPluginsCitationsDecisionDetailComponent extends Compo
     this.error = null;
     const abortController = new AbortController();
     try {
-      const results = await fetchArticles(
-        this.args.decision.uri,
-        this.pageNumber,
-        this.pageSize,
-        this.articleFilterAfterTimeout
-      );
+      const results = await fetchArticles({
+        legalExpression: this.args.decision.uri,
+        pageNumber: this.pageNumber,
+        pageSize: this.pageSize,
+        articleFilter: this.articleFilterAfterTimeout,
+        config: this.args.config,
+      });
       this.totalCount = results.totalCount;
       return results.articles;
     } catch (e) {

package/addon/components/citation-plugin/citations/search-modal.hbs

@@ -13,6 +13,7 @@
         @insertArticleCitation={{this.insertArticleCitation}}
         @close={{this.closeDecisionDetail}}
         @decision={{this.selectedDecision}}
+        @config={{this.config}}
       />
     </modal.Body>
   {{else}}

package/addon/components/citation-plugin/citations/search-modal.ts

@@ -40,6 +40,7 @@ interface Args {
   insertDecisionCitation: (decision: Decision) => void;
   insertArticleCitation: (decision: Decision, article: Article) => void;
   closeModal: (legislationTypeUri?: string, text?: string) => void;
+  config: { endpoint: string };
 }
 
 export default class EditorPluginsCitationsSearchModalComponent extends Component<Args> {
@@ -99,6 +100,10 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     return this.args.text;
   }
 
+  get config() {
+    return this.args.config;
+  }
+
   get searchText() {
     return this.inputSearchText ?? this.text;
   }
@@ -135,12 +140,13 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
         publicationDateFrom: getISODate(this.publicationDateFrom),
         publicationDateTo: getISODate(this.publicationDateTo),
       };
-      const results = await fetchDecisions(
-        words,
-        filter,
-        this.pageNumber,
-        this.pageSize
-      );
+      const results = await fetchDecisions({
+        words: words,
+        filter: filter,
+        pageNumber: this.pageNumber,
+        pageSize: this.pageSize,
+        config: this.args.config,
+      });
       this.totalCount = results.totalCount;
       return results.decisions;
     } catch (e) {

package/addon/components/decision-plugin/decision-plugin-card.hbs

@@ -1,8 +1,24 @@
 {{#if this.canInsertTitle}}
-<AuAlert class="title-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-title-warning"}}>
-  <AuButton @iconAlignment="left" @skin="link-secondary" @disabled={{not this.canInsertTitle}} {{on 'click'
-    this.insertTitle}}>
-    {{t "besluit-plugin.insert.decision-title"}}
-  </AuButton>
-</AuAlert>
+  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-title-warning"}}>
+    <AuButton @iconAlignment="left" @skin="link-secondary" @disabled={{not this.canInsertTitle}} {{on 'click'
+      this.insertTitle}}>
+      {{t "besluit-plugin.insert.decision-title"}}
+    </AuButton>
+  </AuAlert>
+{{/if}}
+{{#if this.canInsertMotivation}}
+  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-motivation-warning"}}>
+    <AuButton @iconAlignment="left" @skin="link-secondary" @disabled={{not this.canInsertMotivation}} {{on 'click'
+      this.insertMotivation}}>
+      {{t "besluit-plugin.insert.motivation"}}
+    </AuButton>
+  </AuAlert>
+{{/if}}
+{{#if this.missingArticleBlock}}
+  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-article-block-warning"}}>
+    <AuButton @iconAlignment="left" @skin="link-secondary" @disabled={{not this.missingArticleBlock}} {{on 'click'
+      this.insertArticleBlock}}>
+      {{t "besluit-plugin.insert.article-block"}}
+    </AuButton>
+  </AuAlert>
 {{/if}}

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

@@ -1,9 +1,13 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { insertTitle } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands';
+import {
+  insertMotivation,
+  insertArticleContainer,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { inject as service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
+import { VALIDATION_KEY } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/validation';
 
 type Args = {
   controller: SayController;
@@ -24,26 +28,41 @@ export default class DecisionPluginCard extends Component<Args> {
   }
 
   @action
-  insertTitle() {
-    this.controller.doCommand(
-      insertTitle({
-        placeholderText: this.intl.t('besluit-plugin.insert.decision-title'),
-      }),
-      {
-        view: this.controller.mainEditorView,
-      }
-    );
+  insertMotivation() {
+    this.controller.doCommand(insertMotivation({ intl: this.intl }), {
+      view: this.controller.mainEditorView,
+    });
+    this.focus();
+  }
+
+  get canInsertMotivation() {
+    return this.controller.checkCommand(insertMotivation({ intl: this.intl }), {
+      view: this.controller.mainEditorView,
+    });
+  }
+
+  @action
+  insertArticleBlock() {
+    this.controller.doCommand(insertArticleContainer({ intl: this.intl }), {
+      view: this.controller.mainEditorView,
+    });
     this.focus();
   }
 
-  get canInsertTitle() {
-    return this.controller.checkCommand(
-      insertTitle({
-        placeholderText: this.intl.t('besluit-plugin.insert.decision-title'),
-      }),
-      {
-        view: this.controller.mainEditorView,
+  get missingArticleBlock() {
+    const state = VALIDATION_KEY.getState(this.controller.activeEditorState);
+    if (state) {
+      let missingArticleBlock = false;
+      const results = state.report.results;
+      if (!results) return false;
+      for (const result of results) {
+        if (result.sourceShape.name === 'at-least-one-article-container') {
+          missingArticleBlock = true;
+        }
       }
-    );
+      return missingArticleBlock;
+    } else {
+      return false;
+    }
   }
 }

package/addon/components/rdfa-date-plugin/date-time-picker.ts

@@ -7,25 +7,25 @@ import { localCopy } from 'tracked-toolbox';
 import Intl from 'ember-intl/services/intl';
 
 type Args = {
-  value: Date;
+  value?: Date;
   onChange: (date: Date) => void;
 };
 
 export default class RdfaDatePluginDateTimePicker extends Component<Args> {
   @service declare intl: Intl;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  @localCopy('args.value') declare date: Date;
+  @localCopy('args.value') declare date?: Date;
 
   get hours() {
-    return this.date.getHours();
+    return this.date?.getHours();
   }
 
   get minutes() {
-    return this.date.getMinutes();
+    return this.date?.getMinutes();
   }
 
   get seconds() {
-    return this.date.getSeconds();
+    return this.date?.getSeconds();
   }
 
   get datePickerLocalization() {

package/addon/components/rdfa-date-plugin/insert.ts

@@ -37,6 +37,7 @@ export default class RdfaDatePluginInsertComponent extends Component<Args> {
         this.schema.node('date', {
           onlyDate: true,
           format: this.defaultDateFormat,
+          value: new Date().toISOString(),
         })
       );
       if (tr.selection.$anchor.nodeBefore) {

package/addon/plugins/citation-plugin/index.ts

@@ -132,6 +132,10 @@ export type CitationPluginConfig =
   | CitationPluginNodeConfig
   | CitationPluginRangeConfig;
 
+export type CitationPluginEmberComponentConfig = CitationPluginConfig & {
+  endpoint: string;
+};
+
 export function citationPlugin(config: CitationPluginConfig): CitationPlugin {
   const citation: CitationPlugin = new ProsePlugin({
     state: {

package/addon/plugins/citation-plugin/utils/vlaamse-codex.ts

@@ -8,10 +8,6 @@ import {
 import Ember from 'ember';
 import SafeString = Ember.Handlebars.SafeString;
 
-const SPARQL_ENDPOINT = '/codex/sparql/';
-
-//const SPARQL_ENDPOINT = 'https://codex.opendata.api.vlaanderen.be:8888/sparql';
-
 interface DecisionArgs {
   uri: string;
   legislationTypeUri: Option<string>;
@@ -106,13 +102,20 @@ export interface QueryFilter {
   publicationDateTo?: Option<string>;
 }
 
-async function fetchDecisions(
-  words: string[],
-  filter: QueryFilter,
+async function fetchDecisions({
+  words,
+  filter,
   pageNumber = 0,
-  pageSize = 5
+  pageSize = 5,
+  config,
+}: {
+  words: string[];
+  filter: QueryFilter;
+  pageNumber: number;
+  pageSize: number;
+  config: CodexQueryConfig;
+}) {
   /*abortSignal*/
-) {
   //This is silly, but null != undefined, so we have to be careful and include the correct value here
   //Also, reconstruct the whole filter object to always have the same ordering, hopefully.
   filter = {
@@ -132,12 +135,13 @@ async function fetchDecisions(
   if (results) {
     return results;
   } else {
-    const newResults = await fetchDecisionsMemo(
+    const newResults = await fetchDecisionsMemo({
       words,
       filter,
       pageNumber,
-      pageSize
-    );
+      pageSize,
+      config,
+    });
     fetchDecisionsMemory.set(stringArguments, newResults);
     return newResults;
   }
@@ -148,13 +152,19 @@ interface DecisionCollection {
   decisions: Decision[];
 }
 
-async function fetchDecisionsMemo(
-  words: string[],
-  filter: QueryFilter,
+async function fetchDecisionsMemo({
+  words,
+  filter,
   pageNumber = 0,
   pageSize = 5,
-  abortSignal?: AbortSignal
-): Promise<DecisionCollection> {
+  config,
+}: {
+  words: string[];
+  filter: QueryFilter;
+  config: CodexQueryConfig;
+  pageNumber?: number;
+  pageSize?: number;
+}): Promise<DecisionCollection> {
   // TBD/NOTE: in the context of a <http://data.europa.eu/eli/ontology#LegalResource>
   // the eli:cites can have either a <http://xmlns.com/foaf/0.1/Document> or <http://data.europa.eu/eli/ontology#LegalResource>
   // as range (see AP https://data.vlaanderen.be/doc/applicatieprofiel/besluit-publicatie/#Rechtsgrond),
@@ -199,8 +209,8 @@ async function fetchDecisionsMemo(
       'FILTER(! STRSTARTS(LCASE(?title),"tot wijziging"))'
     );
   }
-  const totalCount = await executeCountQuery(
-    `PREFIX eli: <http://data.europa.eu/eli/ontology#>
+  const totalCount = await executeCountQuery({
+    query: `PREFIX eli: <http://data.europa.eu/eli/ontology#>
 
       SELECT COUNT(DISTINCT(?expressionUri)) as ?count
       WHERE {
@@ -220,12 +230,12 @@ async function fetchDecisionsMemo(
         ${documentDateFilter}
         ${publicationDateFilter}
       }`,
-    abortSignal
-  );
+    config,
+  });
 
   if (totalCount > 0) {
-    const response = await executeQuery<DecisionBinding>(
-      `PREFIX eli: <http://data.europa.eu/eli/ontology#>
+    const response = await executeQuery<DecisionBinding>({
+      query: `PREFIX eli: <http://data.europa.eu/eli/ontology#>
 
         SELECT DISTINCT ?expressionUri as ?uri ?title ?publicationDate ?documentDate
         WHERE {
@@ -246,8 +256,8 @@ async function fetchDecisionsMemo(
           ${documentDateFilter}
           ${publicationDateFilter}
         } ORDER BY ?title LIMIT ${pageSize} OFFSET ${pageNumber * pageSize}`,
-      abortSignal
-    );
+      config,
+    });
 
     const decisions = response.results.bindings.map((binding) => {
       const escapedTitle = escapeValue(binding.title.value);
@@ -291,13 +301,19 @@ interface DecisionBinding {
 
 const fetchArticlesMemory = new Map<string, ArticleCollection>();
 
-async function fetchArticles(
-  legalExpression: string,
-  pageNumber: number,
-  pageSize: number,
-  articleFilter: string
-  /*abortSignal*/
-): Promise<ArticleCollection> {
+async function fetchArticles({
+  legalExpression,
+  pageNumber,
+  pageSize,
+  articleFilter,
+  config,
+}: {
+  legalExpression: string;
+  pageNumber: number;
+  pageSize: number;
+  articleFilter: string;
+  config: CodexQueryConfig;
+}): Promise<ArticleCollection> {
   //Simpler here, only one way arguments are set up
   const stringArguments = JSON.stringify({
     legalExpression,
@@ -309,12 +325,13 @@ async function fetchArticles(
   if (results) {
     return results;
   } else {
-    const newResults = await fetchArticlesMemo(
+    const newResults = await fetchArticlesMemo({
       legalExpression,
       pageNumber,
       pageSize,
-      articleFilter
-    );
+      articleFilter,
+      config,
+    });
     fetchArticlesMemory.set(stringArguments, newResults);
     return newResults;
   }
@@ -352,18 +369,24 @@ interface ArticleCollection {
   articles: Article[];
 }
 
-async function fetchArticlesMemo(
-  legalExpression: string,
+async function fetchArticlesMemo({
+  legalExpression,
   pageNumber = 0,
   pageSize = 10,
-  articleFilter: string,
-  abortSignal?: AbortSignal
-): Promise<ArticleCollection> {
+  articleFilter,
+  config,
+}: {
+  legalExpression: string;
+  pageNumber: number;
+  pageSize: number;
+  articleFilter: string;
+  config: CodexQueryConfig;
+}): Promise<ArticleCollection> {
   const numberFilter = articleFilter
     ? `FILTER( !BOUND(?number) || CONTAINS(?number, "${articleFilter}"))`
     : '';
-  const totalCount = await executeCountQuery(
-    `PREFIX eli: <http://data.europa.eu/eli/ontology#>
+  const totalCount = await executeCountQuery({
+    query: `PREFIX eli: <http://data.europa.eu/eli/ontology#>
     PREFIX dct: <http://purl.org/dc/terms/>
 
     SELECT COUNT(DISTINCT(?article)) as ?count
@@ -381,14 +404,14 @@ async function fetchArticlesMemo(
         OPTIONAL { ?article eli:number ?number . }
         ${numberFilter}
     }`,
-    abortSignal
-  );
+    config,
+  });
 
   if (totalCount > 0) {
     // ?number has format like "Artikel 12." We parse the number from the string for ordering
     // Second degree ordering on ?numberStr to make sure "Artikel 3/1." comes after "Artikel 3."
-    const response = await executeQuery<ArticleBinding>(
-      `PREFIX eli: <http://data.europa.eu/eli/ontology#>
+    const response = await executeQuery<ArticleBinding>({
+      query: `PREFIX eli: <http://data.europa.eu/eli/ontology#>
       PREFIX prov: <http://www.w3.org/ns/prov#>
       PREFIX dct: <http://purl.org/dc/terms/>
 
@@ -411,8 +434,8 @@ async function fetchArticlesMemo(
       } ORDER BY ?numberInt ?numberStr LIMIT ${pageSize} OFFSET ${
         pageNumber * pageSize
       }`,
-      abortSignal
-    );
+      config,
+    });
 
     const articles = response.results.bindings.map((binding) => {
       const escapedContent = escapeValue(
@@ -483,28 +506,39 @@ function dateValue(value?: string): string | null {
   }
 }
 
-async function executeCountQuery(query: string, abortSignal?: AbortSignal) {
-  const response = await executeQuery<{ count: { value: string } }>(
+async function executeCountQuery({
+  query,
+  config,
+}: {
+  query: string;
+  config: CodexQueryConfig;
+}) {
+  const response = await executeQuery<{ count: { value: string } }>({
     query,
-    abortSignal
-  );
+    config,
+  });
   return optionMapOr(0, parseInt, response.results.bindings[0]?.count.value);
 }
 
-async function executeQuery<A>(
-  query: string,
-  abortSignal?: AbortSignal
-): Promise<QueryResponse<A>> {
+type CodexQueryConfig = { endpoint: string; abortSignal?: AbortSignal };
+
+async function executeQuery<A>({
+  query,
+  config,
+}: {
+  query: string;
+  config: CodexQueryConfig;
+}): Promise<QueryResponse<A>> {
   const encodedQuery = encodeURIComponent(query.trim());
-  const endpoint = `${SPARQL_ENDPOINT}`;
-  const response = await fetch(endpoint, {
+
+  const response = await fetch(config.endpoint, {
     method: 'POST',
     headers: {
       Accept: 'application/sparql-results+json',
       'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
     },
     body: `query=${encodedQuery}`,
-    signal: abortSignal,
+    signal: config.abortSignal,
   });
 
   if (response.ok) {

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

@@ -8,16 +8,17 @@ import { v4 as uuid } from 'uuid';
 import { isNone } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { transactionCompliesWithShapes } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/validation/utils/transaction-complies-with-shapes';
 import { findInsertionPosInAncestorOfType } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/find-insertion-pos-in-ancestor-of-type';
+import IntlService from 'ember-intl/services/intl';
 
 interface InsertMotivationArgs {
-  placeholderText?: string;
+  intl: IntlService;
   validateShapes?: Set<string>;
 }
 
 export default function insertMotivation({
+  intl,
   validateShapes,
-  placeholderText = 'Insert motivation',
-}: InsertMotivationArgs = {}): Command {
+}: InsertMotivationArgs): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const { selection, schema } = state;
     const nodeToInsert = schema.node('motivering', { __rdfaId: uuid() }, [
@@ -25,9 +26,63 @@ export default function insertMotivation({
         'paragraph',
         null,
         schema.node('placeholder', {
-          placeholderText,
+          placeholderText: intl.t('besluit-plugin.placeholder.government-body'),
         })
       ),
+      schema.node(
+        'heading',
+        {
+          level: 5,
+        },
+        [schema.text(intl.t('besluit-plugin.text.authority'))]
+      ),
+      schema.node('bullet_list', null, [
+        schema.node('list_item', null, [
+          schema.node('paragraph', null, [
+            schema.node('placeholder', {
+              placeholderText: intl.t(
+                'besluit-plugin.placeholder.legal-jurisdiction'
+              ),
+            }),
+          ]),
+        ]),
+      ]),
+      schema.node(
+        'heading',
+        {
+          level: 5,
+        },
+        [schema.text(intl.t('besluit-plugin.text.legal-context'))]
+      ),
+      schema.node('bullet_list', null, [
+        schema.node('list_item', null, [
+          schema.node('paragraph', null, [
+            schema.node('placeholder', {
+              placeholderText: intl.t(
+                'besluit-plugin.placeholder.insert-legal-context'
+              ),
+            }),
+          ]),
+        ]),
+      ]),
+      schema.node(
+        'heading',
+        {
+          level: 5,
+        },
+        [schema.text(intl.t('besluit-plugin.text.factual-context'))]
+      ),
+      schema.node('bullet_list', null, [
+        schema.node('list_item', null, [
+          schema.node('paragraph', null, [
+            schema.node('placeholder', {
+              placeholderText: intl.t(
+                'besluit-plugin.placeholder.insert-factual-context'
+              ),
+            }),
+          ]),
+        ]),
+      ]),
     ]);
     // how the offset between the insertion point and the point where the cursor should end up
     const cursorOffset = 2;
@@ -47,8 +102,6 @@ export default function insertMotivation({
       return false;
     }
     if (dispatch) {
-      console.log('inserts in ', insertionPos);
-      console.log('selection on ', insertionPos + cursorOffset);
       const selectionPos = tr.doc.resolve(insertionPos + cursorOffset);
       // const targetPos = tr.doc.resolve(insertionPos + cursorOffset + 1);
       // TODO figure out why I cant just set a nodeSelection here

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

@@ -0,0 +1,11 @@
+import { Schema } from '@lblod/ember-rdfa-editor';
+
+export const atLeastOneArticleContainer = (schema: Schema) => ({
+  name: 'at-least-one-article-container',
+  focusNodeType: schema.nodes.besluit,
+  path: ['article_container'],
+  message: 'Document must contain at least one article container.',
+  constraints: {
+    minCount: 1,
+  },
+});

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

@@ -16,11 +16,9 @@ const date: (options: DateOptions) => NodeSpec = (options) => {
       mappingResource: {
         default: null,
       },
-      value: {
-        default: new Date().toISOString(),
-      },
+      value: {},
       format: {
-        default: 'dd/MM/yyyy',
+        default: options.formats[0].dateFormat,
       },
       onlyDate: {
         default: true,
@@ -86,7 +84,7 @@ const date: (options: DateOptions) => NodeSpec = (options) => {
           ) {
             const onlyDate = hasRDFaAttribute(node, 'datatype', XSD('date'));
             return {
-              value: node.getAttribute('content'),
+              value: node.getAttribute('content') ?? new Date().toISOString(),
               onlyDate,
               format: node.dataset.format,
               custom: node.dataset.custom === 'true',
@@ -115,13 +113,14 @@ const date: (options: DateOptions) => NodeSpec = (options) => {
               );
               const dateNode = [...node.children].find((el) =>
                 hasRDFaAttribute(el, 'property', EXT('content'))
-              );
+              ) as HTMLElement | undefined;
               return {
                 mappingResource,
                 onlyDate,
-                value: dateNode?.getAttribute('content'),
-                format: dateNode?.getAttribute('data-format'),
-                custom: dateNode?.getAttribute('data-custom') === 'true',
+                value:
+                  dateNode?.getAttribute('content') ?? new Date().toISOString(),
+                format: dateNode?.dataset.format,
+                custom: dateNode?.dataset.custom === 'true',
               };
             }
           }

package/addon/plugins/validation/index.ts

@@ -141,13 +141,7 @@ export function validation(
         const schemaChanged = oldState.schema !== newState.schema;
         if (schemaChanged) {
           const spec = compileSpec(configurator, newState.schema);
-          const newValidation = doValidation(
-            tr,
-            oldPluginState,
-            oldState,
-            newState,
-            spec
-          );
+          const newValidation = doValidation(newState, spec);
           tr.setMeta('validated', newValidation);
           tr.setMeta('firstPass', false);
           return { spec, report: newValidation };
@@ -166,13 +160,7 @@ export function validation(
             tr.setMeta('firstPass', false);
             return cachedValidation;
           }
-          const newValidation = doValidation(
-            tr,
-            oldPluginState,
-            oldState,
-            newState,
-            spec
-          );
+          const newValidation = doValidation(newState, spec);
           tr.setMeta('validated', newValidation);
           tr.setMeta('firstPass', false);
           return { spec, report: newValidation };
@@ -230,9 +218,6 @@ interface ValidationContext {
  * @param spec
  */
 function doValidation(
-  tr: Transaction,
-  oldPluginState: ValidationState,
-  oldState: EditorState,
   newState: EditorState,
   spec: ValidationSpec
 ): ValidationReport {

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

@@ -23,6 +23,7 @@ const emberNodeConfig: EmberNodeConfig = {
   recreateUri: true,
   uriAttributes: ['variableInstance'],
   draggable: false,
+  needsFFKludge: true,
   attrs: {
     mappingResource: {},
     codelistResource: {

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/variable-plugin.scss

@@ -2,6 +2,10 @@
   margin-left: 0.3rem;
 }
 
+.mark-highlight-manual + .ProseMirror-firefox-fake-cursor {
+  margin-left: -0.5rem;
+}
+
 [typeof='ext:Mapping'] {
   border-bottom: 0 !important;
 
@@ -63,4 +67,4 @@
       background-color: var(--au-blue-300);
     }
   }
-}
+}

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

@@ -6,6 +6,9 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 interface Args {
     controller: SayController;
     plugin: CitationPlugin;
+    config: {
+        endpoint: string;
+    };
 }
 export default class CitationCardComponent extends Component<Args> {
     pageNumber: number;
@@ -24,6 +27,9 @@ export default class CitationCardComponent extends Component<Args> {
     get controller(): SayController;
     get showCard(): false | Option<CitationDecoration>;
     get plugin(): CitationPlugin;
+    get config(): {
+        endpoint: string;
+    };
     get decorations(): import("prosemirror-view").DecorationSet | undefined;
     get activeDecoration(): Option<CitationDecoration>;
     get searchText(): string;

package/components/citation-plugin/citation-insert.d.ts

@@ -1,17 +1,17 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { Article, Decision } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin/utils/vlaamse-codex';
-import { CitationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
+import { CitationPluginEmberComponentConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
 interface Args {
     controller: SayController;
-    config: CitationPluginConfig;
+    config: CitationPluginEmberComponentConfig;
 }
 export default class EditorPluginsCitationInsertComponent extends Component<Args> {
     showModal: boolean;
     legislationTypeUri: string;
     text: string;
     legislationType: string | null;
-    get config(): CitationPluginConfig;
+    get config(): CitationPluginEmberComponentConfig;
     get selectedLegislationTypeUri(): string;
     get selectedLegislationType(): {
         label: string;

package/components/citation-plugin/citations/decision-detail.d.ts

@@ -3,6 +3,9 @@ import { Decision } from '../../../plugins/citation-plugin/utils/vlaamse-codex';
 interface Args {
     decision: Decision;
     close: () => void;
+    config: {
+        endpoint: string;
+    };
 }
 export default class EditorPluginsCitationsDecisionDetailComponent extends Component<Args> {
     error: unknown;

package/components/citation-plugin/citations/search-modal.d.ts

@@ -8,6 +8,9 @@ interface Args {
     insertDecisionCitation: (decision: Decision) => void;
     insertArticleCitation: (decision: Decision, article: Article) => void;
     closeModal: (legislationTypeUri?: string, text?: string) => void;
+    config: {
+        endpoint: string;
+    };
 }
 export default class EditorPluginsCitationsSearchModalComponent extends Component<Args> {
     intl: IntlService;
@@ -42,6 +45,9 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     get legislationTypes(): string[];
     get legislationSelected(): string;
     get text(): string;
+    get config(): {
+        endpoint: string;
+    };
     get searchText(): string;
     get rangeStart(): number;
     get rangeEnd(): number;

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/rdfa-date-plugin/date-time-picker.d.ts

@@ -1,15 +1,15 @@
 import Component from '@glimmer/component';
 import Intl from 'ember-intl/services/intl';
 type Args = {
-    value: Date;
+    value?: Date;
     onChange: (date: Date) => void;
 };
 export default class RdfaDatePluginDateTimePicker extends Component<Args> {
     intl: Intl;
-    date: Date;
-    get hours(): number;
-    get minutes(): number;
-    get seconds(): number;
+    date?: Date;
+    get hours(): number | undefined;
+    get minutes(): number | undefined;
+    get seconds(): number | undefined;
     get datePickerLocalization(): {
         buttonLabel: string;
         selectedDateMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "6.1.0",
+  "version": "7.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -63,7 +63,7 @@
     "@embroider/test-setup": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^3.4.1",
+    "@lblod/ember-rdfa-editor": "^3.7.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@tsconfig/ember": "^1.0.1",
@@ -143,7 +143,7 @@
   },
   "peerDependencies": {
     "@appuniversum/ember-appuniversum": "^2.4.2",
-    "@lblod/ember-rdfa-editor": "^3.4.1",
+    "@lblod/ember-rdfa-editor": "^3.7.0",
     "ember-concurrency": "^2.3.7"
   },
   "engines": {

package/plugins/citation-plugin/index.d.ts

@@ -31,5 +31,8 @@ export interface CitationPluginRangeConfig {
     activeInRanges(state: EditorState): [number, number][];
 }
 export type CitationPluginConfig = CitationPluginNodeConfig | CitationPluginRangeConfig;
+export type CitationPluginEmberComponentConfig = CitationPluginConfig & {
+    endpoint: string;
+};
 export declare function citationPlugin(config: CitationPluginConfig): CitationPlugin;
 export {};

package/plugins/citation-plugin/utils/vlaamse-codex.d.ts

@@ -42,15 +42,31 @@ export interface QueryFilter {
     publicationDateFrom?: Option<string>;
     publicationDateTo?: Option<string>;
 }
-declare function fetchDecisions(words: string[], filter: QueryFilter, pageNumber?: number, pageSize?: number): Promise<DecisionCollection>;
+declare function fetchDecisions({ words, filter, pageNumber, pageSize, config, }: {
+    words: string[];
+    filter: QueryFilter;
+    pageNumber: number;
+    pageSize: number;
+    config: CodexQueryConfig;
+}): Promise<DecisionCollection>;
 interface DecisionCollection {
     totalCount: number;
     decisions: Decision[];
 }
-declare function fetchArticles(legalExpression: string, pageNumber: number, pageSize: number, articleFilter: string): Promise<ArticleCollection>;
+declare function fetchArticles({ legalExpression, pageNumber, pageSize, articleFilter, config, }: {
+    legalExpression: string;
+    pageNumber: number;
+    pageSize: number;
+    articleFilter: string;
+    config: CodexQueryConfig;
+}): Promise<ArticleCollection>;
 interface ArticleCollection {
     totalCount: number;
     articles: Article[];
 }
 declare function cleanCaches(): void;
+type CodexQueryConfig = {
+    endpoint: string;
+    abortSignal?: AbortSignal;
+};
 export { fetchDecisions, fetchArticles, cleanCaches };

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/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:

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: