@lblod/ember-rdfa-editor-lblod-plugins 28.0.0 → 28.1.0-dev.bd6a773a8a0f8eb8948de754f67fa8e3a75c9895

package/.changeset/brown-bats-watch-1.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `text` variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:string` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-2.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `number` variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:decimal` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-3.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `date` variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:date` or `xsd:dateTime` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-4.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `autofilled` variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:string` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-5.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `location` (classic) variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:string` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-6.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `codelist` variable to smart variable system
+
+- Fully rdfa-aware
+- Literal node
+- `xsd:string` datatype
+- May optionally contain MOW-variable information in external-triples, but is decoupled from this info and does not depend on it

package/.changeset/brown-bats-watch-7.md

@@ -0,0 +1,10 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `person` variable to smart variable system
+
+- Resource node
+- Is not configured to be able to contain MOW-variable information (but this would not be hard to add, due to it's decoupled nature)
+- If empty, contains a placeholder subject. Subject changes every time the person contained changes. Backlinks and external triples are kept when person contained changes, properties are not.
+- Fully rdfa-aware

package/.changeset/brown-bats-watch-8.md

@@ -0,0 +1,12 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Convert `oslo_location` variable to smart variable system
+
+
+- Resource node
+- Is not configured to be able to contain MOW-variable information (but this would not be hard to add, due to it's decoupled nature)
+- May not be empty
+- Subject changes every time the person contained changes. Backlinks and external triples are kept when location contained changes, properties are not.
+- Partially rdfa-aware: backlinks and external-triples, but properties are ignored (this variable uses it's own value attribute which overrides the properties)

package/.changeset/plenty-spies-scream.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Update `@lblod/ember-rdfa-editor` peerdependency to version 12.0.0

package/.changeset/stupid-eels-eat.md

@@ -0,0 +1,9 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Introduce 'smart variable' system:
+- Decoupled from the MOW variable namespace
+- Mostly literal nodes
+- Supports multiple backlinks and external triples
+

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 28.1.0
+
+### Minor Changes
+
+- [#549](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/549) [`ab33ef7`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/ab33ef7e9ef6d237457db61d217f5286362ed74d) Thanks [@piemonkey](https://github.com/piemonkey)! - Change preview list to asynchronously load previews
+
+### Patch Changes
+
+- [#551](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/551) [`f88d903`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/f88d903697e4f689a09cf2d364bf8c5b81bbbb19) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Change number variable modal to clarify the upper number is also included in the range
+
+- [#552](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/552) [`4cf94fd`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4cf94fd78616a141265f09e8b403923e8018cd05) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Rename "citeeropschrift" to "citaat"
+
 ## 28.0.0
 
 ### Major Changes

package/addon/components/common/documents/preview.gts

@@ -1,4 +1,5 @@
 import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
+import AuLoader from '@appuniversum/ember-appuniversum/components/au-loader';
 import AuIcon from '@appuniversum/ember-appuniversum/components/au-icon';
 import { NavDownIcon } from '@appuniversum/ember-appuniversum/components/icons/nav-down';
 import { NavUpIcon } from '@appuniversum/ember-appuniversum/components/icons/nav-up';
@@ -7,6 +8,8 @@ import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { htmlSafe } from '@ember/template';
+import { task } from 'ember-concurrency';
 import t from 'ember-intl/helpers/t';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { PreviewableDocument } from './types';
@@ -35,6 +38,9 @@ export default class DocumentPreview<
 
   @action
   togglePreview() {
+    if (!this.isExpanded && this.contentTask.isIdle && !this.contentTask.last) {
+      this.contentTask.perform();
+    }
     this.isExpanded = !this.isExpanded;
   }
 
@@ -46,6 +52,14 @@ export default class DocumentPreview<
     this.args.toggleFavourite?.(this.args.doc);
   };
 
+  contentTask = task(async () => {
+    const content = await this.args.doc.content;
+    return content && htmlSafe(content);
+  });
+  get content() {
+    return this.contentTask.last?.value;
+  }
+
   <template>
     <div
       class='snippet-preview {{if this.isExpanded "snippet-preview--expanded"}}'
@@ -54,7 +68,7 @@ export default class DocumentPreview<
       <div class='snippet-preview__header'>
         <div
           role='button'
-          title={{t 'snippet-plugin.modal.preview-button.title'}}
+          title={{t 'common.preview-list.preview-button.title'}}
           {{on 'click' this.togglePreview}}
           {{! template-lint-disable require-presentational-children}}
         >
@@ -86,12 +100,12 @@ export default class DocumentPreview<
         </div>
         <div
           role='button'
-          title={{t 'snippet-plugin.modal.select-button.title'}}
+          title={{t 'common.preview-list.select-button.title'}}
           {{on 'click' this.onInsert}}
           {{! template-lint-disable require-presentational-children}}
         >
           <AuButton class='snippet-preview__insert-button' @skin='naked'>
-            {{t 'snippet-plugin.modal.select-button.label'}}
+            {{t 'common.preview-list.select-button.label'}}
           </AuButton>
         </div>
 
@@ -100,10 +114,14 @@ export default class DocumentPreview<
         <div
           class='say-editor say-content rdfa-annotations rdfa-annotations-highlight rdfa-annotations-hover snippet-preview__content'
         >
-          {{#if @doc.content}}
-            {{@doc.content}}
+          {{#if this.content}}
+            {{this.content}}
+          {{else if this.contentTask.isRunning}}
+            <AuLoader @hideMessage={{true}}>
+              {{t 'common.search.loading'}}
+            </AuLoader>
           {{else}}
-            <p class='au-u-italic'>{{t 'snippet-plugin.modal.no-content'}}</p>
+            <p class='au-u-italic'>{{t 'common.preview-list.no-content'}}</p>
           {{/if}}
         </div>
       {{/if}}

package/addon/components/common/documents/types.ts

@@ -1,19 +1,4 @@
-import { htmlSafe } from '@ember/template';
-
-import { optionMapOr } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-import { SafeString } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
-
-interface PreviewableDocumentArgs {
+export interface PreviewableDocument {
   title: string | null;
-  content: string | null;
-}
-
-export class PreviewableDocument {
-  content: SafeString | null;
-  title: string | null;
-
-  constructor({ title, content }: PreviewableDocumentArgs) {
-    this.content = optionMapOr(null, htmlSafe, content);
-    this.title = title;
-  }
+  content: string | Promise<string | null> | null;
 }

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

@@ -6,17 +6,11 @@ import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { LmbPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/lmb-plugin';
 import Electee from '@lblod/ember-rdfa-editor-lblod-plugins/models/electee';
-import { v4 as uuidv4 } from 'uuid';
-import {
-  DCT,
-  EXT,
-  RDF,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblod-plugins/commands';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import { Person } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
+import { createPersonVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/actions/create-person-variable';
 
 interface Args {
   controller: SayController;
@@ -47,14 +41,6 @@ export default class LmbPluginInsertComponent extends Component<Args> {
 
   @action
   onInsert(electee: Electee) {
-    const mappingSubject = `http://data.lblod.info/mappings/${
-      this.args.templateMode ? '--ref-uuid4-' : ''
-    }${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${
-      this.args.templateMode ? '--ref-uuid4-' : ''
-    }${uuidv4()}`;
-    const variableId = uuidv4();
-
     const person: Person = {
       uri: electee.uri,
       firstName: electee.firstName,
@@ -64,29 +50,10 @@ export default class LmbPluginInsertComponent extends Component<Args> {
     const label = this.intl.t('variable.person.label', {
       locale: this.controller.documentLanguage,
     });
-    const node = this.controller.schema.nodes.person_variable.create({
-      subject: mappingSubject,
-      rdfaNodeType: 'resource',
-      __rdfaId: variableId,
+    const node = createPersonVariable({
+      schema: this.controller.schema,
+      label,
       value: person,
-      properties: [
-        {
-          predicate: RDF('type').full,
-          object: sayDataFactory.namedNode(EXT('Mapping').full),
-        },
-        {
-          predicate: EXT('instance').full,
-          object: sayDataFactory.namedNode(variableInstance),
-        },
-        {
-          predicate: EXT('label').full,
-          object: sayDataFactory.literal(label),
-        },
-        {
-          predicate: DCT('type').full,
-          object: sayDataFactory.literal('person'),
-        },
-      ],
     });
 
     this.controller.doCommand(replaceSelectionWithAndSelectNode(node), {

package/addon/components/location-plugin/insert.gts

@@ -32,6 +32,8 @@ import LocationMap, {
   SUPPORTED_LOCATION_TYPES,
   type LocationType,
 } from './map';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { updateSubject } from '@lblod/ember-rdfa-editor/plugins/rdfa-info/utils';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
@@ -270,11 +272,31 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     }
     if (toInsert) {
       this.modalOpen = false;
-      replaceSelectionWithLocation(
-        this.controller,
-        toInsert,
-        this.args.config.subjectTypesToLinkTo,
-      );
+      if (this.selectedLocationNode) {
+        // Update, while keeping backlinks intact
+        const { pos } = this.selectedLocationNode;
+        this.controller.withTransaction((tr) => {
+          return transactionCombinator(
+            this.controller.activeEditorState,
+            tr.setNodeAttribute(pos, 'value', toInsert),
+          )([
+            updateSubject({
+              pos,
+              targetSubject: toInsert.uri,
+              keepBacklinks: true,
+              keepProperties: false,
+              keepExternalTriples: true,
+            }),
+          ]).transaction;
+        });
+      } else {
+        // Insert
+        replaceSelectionWithLocation(
+          this.controller,
+          toInsert,
+          this.args.config.subjectTypesToLinkTo,
+        );
+      }
     }
   }
 

package/addon/components/snippet-plugin/nodes/snippet.gts

@@ -197,7 +197,7 @@ export default class SnippetNode extends Component<Signature> {
     }
     this.controller.doCommand(
       insertSnippet({
-        content: snippet.content?.toHTML() ?? '',
+        content: snippet.content ?? '',
         title: snippet.title ?? '',
         listProperties: {
           placeholderId: this.node.attrs.placeholderId,

package/addon/components/snippet-plugin/snippet-insert.gts

@@ -64,7 +64,7 @@ export default class SnippetInsertComponent extends Component<Sig> {
     if (this.args.listProperties) {
       this.controller.doCommand(
         insertSnippet({
-          content: snippet.content?.toHTML() ?? '',
+          content: snippet.content ?? '',
           title: snippet.title ?? '',
           listProperties: this.args.listProperties,
           allowMultipleSnippets: this.args.allowMultipleSnippets,

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

@@ -22,6 +22,9 @@ type Args = {
   defaultMunicipality?: string;
 };
 
+/**
+ * @deprecated
+ */
 export default class AddressEditComponent extends Component<Args> {
   @service declare intl: IntlService;
 

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

@@ -12,6 +12,9 @@ type Args = {
   templateMode?: boolean;
 };
 
+/**
+ * @deprecated
+ */
 export default class InsertAddressComponent extends Component<Args> {
   AddIcon = AddIcon;
 

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

@@ -11,6 +11,9 @@ type Args = {
   controller: SayController;
 };
 
+/**
+ * @deprecated
+ */
 export default class AddressNodeviewComponent extends Component<Args> {
   get node() {
     return this.args.node;

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

@@ -7,6 +7,9 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { v4 as uuidv4 } from 'uuid';
 
+/**
+ * @deprecated
+ */
 export function replaceSelectionWithAddress(
   controller: SayController,
   label?: string,

package/addon/components/variable-plugin/autofilled/edit.gts

@@ -13,33 +13,11 @@ import AuHeading from '@appuniversum/ember-appuniversum/components/au-heading';
 import t from 'ember-intl/helpers/t';
 import { on } from '@ember/modifier';
 import { trackedReset } from 'tracked-toolbox';
-import { DCT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory/data-factory';
-import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import LabelInput from '../utils/label-input';
-import {
-  ContentLiteralTerm,
-  SayLiteral,
-  SayNamedNode,
-} from '@lblod/ember-rdfa-editor/core/say-data-factory';
 type Args = {
   controller: SayController;
 };
 
-type nodeProperty =
-  | {
-      predicate: string;
-      object: SayNamedNode<string>;
-    }
-  | {
-      predicate: string;
-      object: SayLiteral;
-    }
-  | {
-      predicate: string;
-      object: ContentLiteralTerm;
-    };
-
 export default class AutoFilledVariableInsertComponent extends Component<Args> {
   @service declare intl: IntlService;
 
@@ -97,8 +75,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
   }
   get labelAttr() {
     if (!this.selectedVariable) return '';
-    return getOutgoingTriple(this.selectedVariable.node.attrs, DCT('title'))
-      ?.object.value;
+    return this.selectedVariable.node.attrs['label'];
   }
 
   get showCard() {
@@ -144,16 +121,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
             'convertToString',
             this.convertToString,
           );
-          const oldProperties = this.selectedVariable?.node.attrs.properties;
-          const newProperties = oldProperties.filter(
-            (property: nodeProperty) =>
-              property.predicate !== DCT('title').full,
-          );
-          newProperties.push({
-            predicate: DCT('title').full,
-            object: sayDataFactory.literal(this.label || ''),
-          });
-          tr.setNodeAttribute(position, 'properties', newProperties);
+          tr.setNodeAttribute(position, 'label', this.label || '');
           return tr;
         },
         // because the variable pill contains a nested editor, when it's

package/addon/components/variable-plugin/autofilled/insert.gts

@@ -14,10 +14,6 @@ import t from 'ember-intl/helpers/t';
 import { on } from '@ember/modifier';
 import LabelInput from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/utils/label-input';
 import { createAutofilledVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/actions/create-autofilled-variable';
-import {
-  generateVariableInstanceUri,
-  generateVariableUri,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/variable-helpers';
 
 type Args = {
   controller: SayController;
@@ -67,10 +63,6 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
       this.label != '' ? this.label : this.autofillKey || placeholder;
     const node = createAutofilledVariable({
       schema: this.schema,
-      variable: generateVariableUri(),
-      variableInstance: generateVariableInstanceUri({
-        templateMode: this.args.templateMode,
-      }),
       label,
       autofillKey: this.autofillKey,
       convertToString: this.convertToString,

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

@@ -10,11 +10,6 @@ import { MULTI_SELECT_CODELIST_TYPE } from '@lblod/ember-rdfa-editor-lblod-plugi
 import { NodeSelection } from '@lblod/ember-rdfa-editor';
 import { trackedFunction } from 'reactiveweb/function';
 import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils';
-import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import {
-  DCT,
-  MOBILITEIT,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { tracked } from '@glimmer/tracking';
 export type CodelistEditOptions = {
@@ -50,8 +45,7 @@ export default class CodelistEditComponent extends Component<Args> {
   get source() {
     if (this.selectedCodelist) {
       const { node } = this.selectedCodelist;
-      const source = getOutgoingTriple(node.attrs, DCT('source'))?.object
-        .value as Option<string>;
+      const source = node.attrs['source'] as Option<string>;
       if (source) {
         return source;
       }
@@ -62,8 +56,7 @@ export default class CodelistEditComponent extends Component<Args> {
   get codelistUri() {
     if (this.selectedCodelist) {
       const { node } = this.selectedCodelist;
-      const codelistUri = getOutgoingTriple(node.attrs, MOBILITEIT('codelijst'))
-        ?.object.value as Option<string>;
+      const codelistUri = node.attrs['codelist'] as Option<string>;
       if (codelistUri) {
         return codelistUri;
       }

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

@@ -11,10 +11,6 @@ import IntlService from 'ember-intl/services/intl';
 import { trackedFunction } from 'reactiveweb/function';
 import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblod-plugins/commands';
 import { createCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/actions/create-codelist-variable';
-import {
-  generateVariableInstanceUri,
-  generateVariableUri,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/variable-helpers';
 
 export type CodelistInsertOptions = {
   publisher?: string;
@@ -97,10 +93,6 @@ export default class CodelistInsertComponent extends Component<Args> {
     const source = this.endpoint;
     const node = createCodelistVariable({
       schema: this.schema,
-      variable: generateVariableUri(),
-      variableInstance: generateVariableInstanceUri({
-        templateMode: this.args.templateMode,
-      }),
       selectionStyle: this.selectedStyleValue,
       codelist: codelistResource,
       source,

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

@@ -7,7 +7,6 @@ import {
   Transaction,
 } from '@lblod/ember-rdfa-editor';
 import { NodeSelection, PNode } from '@lblod/ember-rdfa-editor';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import {
@@ -28,14 +27,10 @@ import {
   validateDateFormat,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/date-helpers';
 import { Velcro } from 'ember-velcro';
-import {
-  RDF,
-  XSD,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
-import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+
 import { InfoCircleIcon } from '@appuniversum/ember-appuniversum/components/icons/info-circle';
 import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross';
+import { XSD } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
 type Args = {
   controller: SayController;
@@ -79,10 +74,7 @@ export default class DateEditComponent extends Component<Args> {
 
   get documentDate(): Option<Date> {
     if (this.selectedDateNode) {
-      const dateVal = getOutgoingTriple(
-        this.selectedDateNode.attrs,
-        RDF('value'),
-      )?.object.value as Option<string>;
+      const dateVal = this.selectedDateNode.attrs['content'] as Option<string>;
       if (dateVal) {
         return new Date(dateVal);
       }
@@ -214,26 +206,7 @@ export default class DateEditComponent extends Component<Args> {
     const pos = this.documentDatePos;
     if (pos) {
       this.controller.withTransaction((tr: Transaction) => {
-        const node = tr.doc.nodeAt(pos);
-        if (!node) {
-          return tr;
-        }
-        const properties = node.attrs.properties as OutgoingTriple[];
-        const newProperties = properties.filter((prop) => {
-          return !(
-            prop.object.termType === 'Literal' &&
-            RDF('value').matches(prop.predicate)
-          );
-        });
-        const datatype = this.onlyDate ? XSD('date') : XSD('dateTime');
-        newProperties.push({
-          predicate: RDF('value').full,
-          object: sayDataFactory.literal(
-            date.toISOString(),
-            datatype.namedNode,
-          ),
-        });
-        return tr.setNodeAttribute(pos, 'properties', newProperties);
+        return tr.setNodeAttribute(pos, 'content', date.toISOString());
       });
     }
   }
@@ -258,11 +231,14 @@ export default class DateEditComponent extends Component<Args> {
     if (isNone(pos)) {
       return;
     }
+    const datatype = !formatContainsTime(dateFormat)
+      ? XSD('date').namedNode
+      : XSD('dateTime').namedNode;
     this.controller.withTransaction((tr) => {
       return tr
         .setNodeAttribute(pos, 'format', dateFormat)
         .setNodeAttribute(pos, 'custom', custom)
-        .setNodeAttribute(pos, 'onlyDate', !formatContainsTime(dateFormat));
+        .setNodeAttribute(pos, 'datatype', datatype);
     });
   }
 
@@ -293,10 +269,13 @@ export default class DateEditComponent extends Component<Args> {
 
     const pos = this.documentDatePos;
     if (isSome(pos) && isSome(format)) {
+      const datatype = !formatContainsTime(format)
+        ? XSD('date').namedNode
+        : XSD('dateTime').namedNode;
       this.controller.withTransaction((tr) => {
         return tr
           .setNodeAttribute(pos, 'format', format)
-          .setNodeAttribute(pos, 'onlyDate', !formatContainsTime(format));
+          .setNodeAttribute(pos, 'datatype', datatype);
       });
     }
   }