@lblod/ember-rdfa-editor-lblod-plugins 12.0.0 → 13.0.0

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

@@ -66,6 +66,28 @@
               />
 
               <AuHr @size='large' />
+              {{#if this.isBesluitType}}
+                <AuLabel
+                  class='au-u-margin-top au-margin-bottom-small'
+                  for='search-government'
+                  @inline={{false}}
+                  @required={{false}}
+                  @error={{false}}
+                  @warning={{false}}
+                >
+                  {{t 'citaten-plugin.search.government-search'}}
+                </AuLabel>
+                <AuNativeInput
+                  @icon='search'
+                  @type='text'
+                  @width='block'
+                  @iconAlignment='right'
+                  id='search-government'
+                  value={{this.governmentSearchText}}
+                  placeholder={{t 'citaten-plugin.search.placeholder'}}
+                  {{on 'input' this.setGovernmentSearchText}}
+                />
+              {{/if}}
               {{! Date of document }}
               <AuLabel
                 class='au-u-margin-top au-u-margin-bottom-small'

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

@@ -62,6 +62,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
   @tracked publicationDateFrom: Date | null = null;
   @tracked publicationDateTo: Date | null = null;
   @tracked inputSearchText: string | null = null;
+  @tracked inputGovernmentSearchText: string | null = null;
   minDate = new Date('1930-01-01T12:00:00');
   maxDate = new Date(`${new Date().getFullYear() + 10}-01-01T12:00:00`);
 
@@ -115,6 +116,13 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     return this.inputSearchText ?? this.text;
   }
 
+  get governmentSearchText() {
+    return (
+      this.inputGovernmentSearchText ??
+      this.config.defaultDecisionsGovernmentName
+    );
+  }
+
   resourceSearch = restartableTask(async () => {
     await timeout(500);
     this.error = null;
@@ -129,6 +137,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
         documentDateTo: getISODate(this.documentDateTo),
         publicationDateFrom: getISODate(this.publicationDateFrom),
         publicationDateTo: getISODate(this.publicationDateTo),
+        governmentName: this.governmentSearchText,
       };
       const results = await fetchLegalDocuments({
         words: words,
@@ -152,6 +161,7 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
 
   decisionResource = trackedTask(this, this.resourceSearch, () => [
     this.searchText,
+    this.governmentSearchText,
     this.legislationTypeUri,
     this.pageSize,
     this.pageNumber,
@@ -170,6 +180,11 @@ export default class EditorPluginsCitationsSearchModalComponent extends Componen
     this.inputSearchText = (event.target as HTMLInputElement).value;
   }
 
+  @action
+  setGovernmentSearchText(event: InputEvent) {
+    this.inputGovernmentSearchText = (event.target as HTMLInputElement).value;
+  }
+
   @action
   updateDocumentDateFrom(_isoDate: unknown, date: Date) {
     this.documentDateFrom = date;

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

@@ -1,5 +1,5 @@
 {{#if this.canInsertTitle}}
-  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-title-warning"}}>
+  <AuAlert class="say-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"}}
@@ -7,7 +7,7 @@
   </AuAlert>
 {{/if}}
 {{#if this.canInsertMotivation}}
-  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-motivation-warning"}}>
+  <AuAlert class="say-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"}}
@@ -15,7 +15,7 @@
   </AuAlert>
 {{/if}}
 {{#if this.missingArticleBlock}}
-  <AuAlert class="validation-alert" @skin="warning" @closable={{false}} @icon="alert-triangle" @title={{t "besluit-plugin.missing-article-block-warning"}}>
+  <AuAlert class="say-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"}}

package/addon/components/snippet-plugin/snippet-list/snippet-list-view.hbs

@@ -2,8 +2,8 @@
   {{t 'snippet-plugin.snippet-list.modal.subtitle'}}
 </AuHeading>
 {{#if @snippetLists.length}}
-  <div class="snippet-lists-table">
-    <AuTable class="snippet-lists-table">
+  <div class="say-snippet-lists-table">
+    <AuTable class="say-snippet-lists-table">
       <:header>
         <tr>
           <th class="selectColumn">{{t 'snippet-plugin.snippet-list.modal.table.select'}}</th>

package/addon/components/table-of-contents-plugin/ember-nodes/table-of-contents.ts

@@ -31,6 +31,7 @@ export default class TableOfContentsComponent extends Component<EmberNodeArgs> {
       node: this.controller.mainEditorState.doc,
       pos: -1,
       config: this.config,
+      state: this.controller.mainEditorState,
     });
 
     return {

package/addon/components/template-comments-plugin/template-comment.hbs

@@ -1,13 +1,13 @@
 <AuAlert
   @size='small'
-  @title={{t 'template-comments-plugin.long-title'}}
+  @title={{this.translation.title}}
   @skin='info'
   @icon='circle-info'
-  class='template-comment {{
+  class='say-template-comment {{
     if this.selectionInside 'ProseMirror-selectednode'
-  }} default-cursor'
+  }} say-default-cursor'
 >
-  <div class='text-cursor'>
+  <div class='say-text-cursor'>
     {{yield}}
   </div>
 </AuAlert>

package/addon/components/template-comments-plugin/template-comment.ts

@@ -1,11 +1,27 @@
 import Component from '@glimmer/component';
+import { service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
 import { EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/ember-node';
 
 export default class TemplateCommentsPluginTemplateCommentComponent extends Component<EmberNodeArgs> {
+  @service declare intl: IntlService;
+
   get controller() {
     return this.args.controller;
   }
 
+  get documentLanguage() {
+    return this.controller.documentLanguage;
+  }
+
+  get translation() {
+    return {
+      title: this.intl.t('template-comments-plugin.long-title', {
+        locale: this.documentLanguage,
+      }),
+    };
+  }
+
   get selectionInside() {
     const { pos: selectPos } = this.controller.mainEditorState.selection.$from;
     const nodePos = this.args.getPos();

package/addon/components/variable-plugin/address/edit.ts

@@ -101,7 +101,7 @@ export default class AddressEditComponent extends Component<Args> {
   }
 
   get selectedAddressVariable() {
-    const { selection, schema } = this.controller.mainEditorState;
+    const { selection, schema } = this.controller.activeEditorState;
     if (
       selection instanceof NodeSelection &&
       selection.node.type === schema.nodes.address

package/addon/components/variable-plugin/address/insert-variable.hbs

@@ -0,0 +1,9 @@
+<AuFormRow>
+  <VariablePlugin::Utils::LabelInput 
+    @label={{this.label}} 
+    @updateLabel={{this.updateLabel}}
+  />
+</AuFormRow>
+<AuButton {{on 'click' this.insertAddress}}>
+  {{t 'variable-plugin.button'}}
+</AuButton>

package/addon/components/variable-plugin/address/insert-variable.ts

@@ -0,0 +1,40 @@
+import Component from '@glimmer/component';
+import { replaceSelectionWithAddress } from './utils';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { service } from '@ember/service';
+import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
+
+type Args = {
+  controller: SayController;
+};
+
+export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
+  @service declare intl: IntlService;
+  @tracked label?: string;
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  get documentLanguage() {
+    return this.controller.documentLanguage;
+  }
+
+  @action
+  updateLabel(event: InputEvent) {
+    this.label = (event.target as HTMLInputElement).value;
+  }
+
+  @action
+  insertAddress() {
+    replaceSelectionWithAddress(
+      this.controller,
+      this.label ??
+        this.intl.t('variable.address.label', {
+          locale: this.documentLanguage,
+        }),
+    );
+  }
+}

package/addon/components/variable-plugin/address/insert.hbs

@@ -3,7 +3,8 @@
     @icon="add"
     @iconAlignment="left"
     @skin="link"
-    {{on 'click' (fn this.insertAddress true)}}>
+    {{on 'click' (fn this.insertAddress true)}}
+    @disabled={{not this.canInsertAddress}}>
     {{t "editor-plugins.address.insert"}}
   </AuButton>
 </AuList::Item>

package/addon/components/variable-plugin/address/insert.ts

@@ -1,37 +1,41 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
+import { service } from '@ember/service';
 import { SayController } from '@lblod/ember-rdfa-editor';
-import { NodeSelection } from '@lblod/ember-rdfa-editor';
-import { v4 as uuidv4 } from 'uuid';
+import IntlService from 'ember-intl/services/intl';
+
+import { replaceSelectionWithAddress } from './utils';
 
 type Args = {
   controller: SayController;
 };
 
 export default class InsertAddressComponent extends Component<Args> {
+  @service declare intl: IntlService;
+
   get controller() {
     return this.args.controller;
   }
 
-  get schema() {
-    return this.controller.schema;
+  get documentLanguage() {
+    return this.controller.documentLanguage;
   }
 
   @action
   insertAddress() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
-    this.controller.withTransaction((tr) => {
-      tr.replaceSelectionWith(
-        this.schema.node('address', { mappingResource, variableInstance }),
-      );
-      if (tr.selection.$anchor.nodeBefore) {
-        const resolvedPos = tr.doc.resolve(
-          tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
-        );
-        tr.setSelection(new NodeSelection(resolvedPos));
-      }
-      return tr;
-    });
+    replaceSelectionWithAddress(
+      this.controller,
+      this.intl.t('variable.address.label', {
+        locale: this.documentLanguage,
+      }),
+    );
+  }
+
+  get canInsertAddress() {
+    if (this.controller.activeEditorView.props.nodeViews?.address) {
+      return true;
+    } else {
+      return false;
+    }
   }
 }

package/addon/components/variable-plugin/address/nodeview.hbs

@@ -1,14 +1,14 @@
 <AuPill
   @icon='pencil'
   @iconAlignment='right'
-  class='variable'
+  class='variable atomic'
   {{on 'click' this.selectThisNode}}
 >
   {{#if this.address}}
     {{this.address.formatted}}
   {{else}}
     <span class='mark-highlight-manual'>
-      {{t "editor-plugins.address.nodeview.placeholder"}}
+      {{this.translations.placeholder}}
     </span>
   {{/if}}
   {{#if @node.attrs.label}}

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

@@ -1,6 +1,9 @@
 import Component from '@glimmer/component';
-import { NodeSelection, PNode, SayController } from '@lblod/ember-rdfa-editor';
 import { action } from '@ember/object';
+import { service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
+
+import { NodeSelection, PNode, SayController } from '@lblod/ember-rdfa-editor';
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables/address';
 
 type Args = {
@@ -8,7 +11,26 @@ type Args = {
   node: PNode;
   controller: SayController;
 };
+
 export default class AddressNodeviewComponent extends Component<Args> {
+  @service declare intl: IntlService;
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  get documentLanguage() {
+    return this.controller.documentLanguage;
+  }
+
+  get translations() {
+    return {
+      placeholder: this.intl.t('editor-plugins.address.nodeview.placeholder', {
+        locale: this.documentLanguage,
+      }),
+    };
+  }
+
   get node() {
     return this.args.node;
   }

package/addon/components/variable-plugin/address/utils.ts

@@ -0,0 +1,26 @@
+import { SayController, NodeSelection } from '@lblod/ember-rdfa-editor';
+import { v4 as uuidv4 } from 'uuid';
+
+export function replaceSelectionWithAddress(
+  controller: SayController,
+  label?: string,
+) {
+  const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
+  const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+  controller.withTransaction((tr) => {
+    tr.replaceSelectionWith(
+      controller.schema.node('address', {
+        label: label,
+        mappingResource,
+        variableInstance,
+      }),
+    );
+    if (tr.selection.$anchor.nodeBefore) {
+      const resolvedPos = tr.doc.resolve(
+        tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
+      );
+      tr.setSelection(new NodeSelection(resolvedPos));
+    }
+    return tr;
+  });
+}

package/addon/components/variable-plugin/codelist/insert.ts

@@ -36,6 +36,10 @@ export default class CodelistInsertComponent extends Component<Args> {
     return this.args.controller;
   }
 
+  get documentLanguage() {
+    return this.controller.documentLanguage;
+  }
+
   get schema() {
     return this.args.controller.schema;
   }
@@ -84,7 +88,12 @@ export default class CodelistInsertComponent extends Component<Args> {
         mappingResource,
         variableInstance,
         codelistResource: this.selectedCodelist?.uri,
-        label: this.label ?? this.selectedCodelist?.label,
+        label:
+          this.label ??
+          this.selectedCodelist?.label ??
+          this.intl.t('variable.codelist.label', {
+            locale: this.documentLanguage,
+          }),
         source: this.endpoint,
         selectionStyle: this.selectedStyleValue,
       },

package/addon/components/{rdfa-date-plugin → variable-plugin/date}/date-time-picker.ts

@@ -9,7 +9,7 @@ type Args = {
   onChange: (date: Date) => void;
 };
 
-export default class RdfaDatePluginDateTimePicker extends Component<Args> {
+export default class DateTimePickerComponent extends Component<Args> {
   @service declare intl: Intl;
   @localCopy('args.value') declare date?: Date;
 

package/addon/components/{rdfa-date-plugin/card.hbs → variable-plugin/date/edit.hbs}

@@ -6,7 +6,7 @@
       </c.header>
       <c.content class="au-o-box au-o-box--small">
         <div class="au-o-flow au-o-flow--small">
-          <RdfaDatePlugin::DateTimePicker
+          <VariablePlugin::Date::DateTimePicker
             @onChange={{this.changeDate}}
             @value={{this.pickerDate}}
             @onlyDate={{this.onlyDate}}
@@ -43,7 +43,7 @@
                 </Velcro>
               {{/if}}
             </AuFormRow>
-          </RdfaDatePlugin::DateTimePicker>
+          </VariablePlugin::Date::DateTimePicker>
           {{#each this.formats as |format|}}
             <AuFormRow>
               <AuControlRadio
@@ -86,4 +86,4 @@
     </AuCard>
   {{/if}}
 </div>
-<RdfaDatePlugin::HelpModal @modalOpen={{this.helpModalOpen}} @closeModal={{this.toggleHelpModal}} />
+<VariablePlugin::Date::HelpModal @modalOpen={{this.helpModalOpen}} @closeModal={{this.toggleHelpModal}} />

package/addon/components/{rdfa-date-plugin/card.ts → variable-plugin/date/edit.ts}

@@ -3,15 +3,6 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { NodeSelection, PNode } from '@lblod/ember-rdfa-editor';
-import {
-  DateFormat,
-  DateOptions,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin';
-import {
-  formatContainsTime,
-  validateDateFormat,
-  ValidationError,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/utils';
 import { inject as service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import {
@@ -22,13 +13,22 @@ import {
   optionMapOr,
   unwrapOr,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import {
+  DateFormat,
+  DateOptions,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables/date';
+import {
+  ValidationError,
+  formatContainsTime,
+  validateDateFormat,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/date-helpers';
 
 type Args = {
   controller: SayController;
   options: DateOptions;
 };
 const SECONDS_REGEX = new RegExp('[sStT]|p{2,}');
-export default class RdfaDatePluginCardComponent extends Component<Args> {
+export default class DateEditComponent extends Component<Args> {
   @service
   declare intl: IntlService;
 

package/addon/components/{rdfa-date-plugin → variable-plugin/date}/help-modal.ts

@@ -1,13 +1,13 @@
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
-import { formatDate } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/utils';
+import { formatDate } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/date-helpers';
 
 interface Args {
   modalOpen: boolean;
   closeModal: () => void;
 }
 
-export default class HelpModalComponent extends Component<Args> {
+export default class DateHelpComponent extends Component<Args> {
   exampleDate: Date = new Date();
 
   @action

package/addon/components/variable-plugin/date/insert-variable.hbs

@@ -0,0 +1,9 @@
+<AuFormRow>
+  <VariablePlugin::Utils::LabelInput
+    @label={{this.label}}
+    @updateLabel={{this.updateLabel}}
+  />
+</AuFormRow>
+<AuButton {{on 'click' this.insert}}>
+  {{t 'variable-plugin.button'}}
+</AuButton>

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

@@ -0,0 +1,57 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { service } from '@ember/service';
+import { SayController } from '@lblod/ember-rdfa-editor';
+import { v4 as uuidv4 } from 'uuid';
+import IntlService from 'ember-intl/services/intl';
+
+type Args = {
+  controller: SayController;
+};
+
+export default class DateInsertVariableComponent extends Component<Args> {
+  @service declare intl: IntlService;
+  @tracked label?: string;
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  get schema() {
+    return this.args.controller.schema;
+  }
+
+  get documentLanguage() {
+    return this.controller.documentLanguage;
+  }
+
+  @action
+  updateLabel(event: InputEvent) {
+    this.label = (event.target as HTMLInputElement).value;
+  }
+
+  @action
+  insert() {
+    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
+
+    const defaultLabel = this.intl.t('variable.date.label', {
+      locale: this.documentLanguage,
+    });
+
+    const node = this.schema.nodes.date.create({
+      label: this.label ?? defaultLabel,
+      value: null,
+      mappingResource,
+    });
+
+    this.label = undefined;
+
+    this.controller.withTransaction(
+      (tr) => {
+        return tr.replaceSelectionWith(node);
+      },
+      { view: this.controller.mainEditorView },
+    );
+  }
+}

package/addon/components/variable-plugin/date/insert.hbs

@@ -1,9 +1,9 @@
-<AuFormRow>
-  <VariablePlugin::Utils::LabelInput 
-    @label={{this.label}} 
-    @updateLabel={{this.updateLabel}}
-  />
-</AuFormRow>
-<AuButton {{on 'click' this.insert}}>
-  {{t 'variable-plugin.button'}}
-</AuButton>
+<AuList::Item>
+  <AuButton
+    @icon="add"
+    @iconAlignment="left"
+    @skin="link"
+    {{on 'click' this.insert}}>
+    {{t "date-plugin.insert.date"}}
+  </AuButton>
+</AuList::Item>

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

@@ -1,40 +1,43 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { service } from '@ember/service';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 import { v4 as uuidv4 } from 'uuid';
 
 type Args = {
   controller: SayController;
 };
 
-export default class DateVariableInsertComponent extends Component<Args> {
-  @tracked label?: string;
+export default class DateInsertComponent extends Component<Args> {
+  @service declare intl: IntlService;
 
   get controller() {
     return this.args.controller;
   }
 
   get schema() {
-    return this.args.controller.schema;
+    return this.controller.schema;
   }
 
-  @action
-  updateLabel(event: InputEvent) {
-    this.label = (event.target as HTMLInputElement).value;
+  get documentLanguage() {
+    return this.controller.documentLanguage;
   }
 
   @action
   insert() {
     const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
+
+    const defaultLabel = this.intl.t('variable.date.label', {
+      locale: this.documentLanguage,
+    });
+
     const node = this.schema.nodes.date.create({
-      label: this.label,
+      label: defaultLabel,
       value: null,
       mappingResource,
     });
 
-    this.label = undefined;
-
     this.controller.withTransaction(
       (tr) => {
         return tr.replaceSelectionWith(node);

package/addon/components/{rdfa-date-plugin/date.hbs → variable-plugin/date/nodeview.hbs}

@@ -1,4 +1,4 @@
-<AuPill @icon="pencil" @iconAlignment="right" class="variable" {{on 'click' this.onClick}}>
+<AuPill @icon="pencil" @iconAlignment="right" class="variable atomic" {{on 'click' this.onClick}}>
 
   {{this.humanReadableDate}}
   {{#if @node.attrs.label}}