From 0042f62614dc2663d924eab495b70425ce456f8f Mon Sep 17 00:00:00 2001 From: Elena Poelman Date: Fri, 16 Aug 2024 10:44:37 +0200 Subject: [PATCH 1/3] agendapoint-editor: enable rdfa-aware doc, heading and link nodes --- .changeset/chilled-bears-trade.md | 5 +++++ app/controllers/agendapoints/edit.js | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .changeset/chilled-bears-trade.md diff --git a/.changeset/chilled-bears-trade.md b/.changeset/chilled-bears-trade.md new file mode 100644 index 000000000..d0843d4ba --- /dev/null +++ b/.changeset/chilled-bears-trade.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': minor +--- + +agendapoint editor: enable rdfa-aware `doc`, `heading` and `link` nodes diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index 1bce25b62..9f874cbde 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -53,7 +53,7 @@ import { orderedListWithConfig, } from '@lblod/ember-rdfa-editor/plugins/list'; import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder'; -import { heading } from '@lblod/ember-rdfa-editor/plugins/heading'; +import { headingWithConfig } from '@lblod/ember-rdfa-editor/plugins/heading'; import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote'; import { code_block } from '@lblod/ember-rdfa-editor/plugins/code'; import { image, imageView } from '@lblod/ember-rdfa-editor/plugins/image'; @@ -130,7 +130,7 @@ export default class AgendapointsEditController extends Controller { SnippetInsert = SnippetInsertRdfaComponent; schema = new Schema({ nodes: { - doc: docWithConfig(), + doc: docWithConfig({ rdfaAware: true }), paragraph, repaired_block: repairedBlockWithConfig({ rdfaAware: true }), structure, @@ -148,7 +148,7 @@ export default class AgendapointsEditController extends Controller { location, codelist, roadsign_regulation, - heading, + heading: headingWithConfig({ rdfaAware: true }), blockquote, snippet_placeholder: snippetPlaceholder, snippet: snippet(this.config.snippet), @@ -207,6 +207,7 @@ export default class AgendapointsEditController extends Controller { }, link: { interactive: true, + rdfaAware: true, }, roadsignRegulation: { endpoint: ENV.mowRegistryEndpoint, From fb19e47f19a9c6cedc06102c2a116617fb7e436a Mon Sep 17 00:00:00 2001 From: Elena Poelman Date: Fri, 16 Aug 2024 10:47:19 +0200 Subject: [PATCH 2/3] rs-editor: enable rdfa-aware link nodes --- .changeset/empty-rocks-check.md | 5 +++++ app/controllers/regulatory-statements/edit.js | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/empty-rocks-check.md diff --git a/.changeset/empty-rocks-check.md b/.changeset/empty-rocks-check.md new file mode 100644 index 000000000..d411b6f48 --- /dev/null +++ b/.changeset/empty-rocks-check.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': minor +--- + +regulatory-statement editor: enable rdfa-aware `link` nodes diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 3ee2ff2da..963d8f7bb 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -258,6 +258,7 @@ export default class RegulatoryStatementsRoute extends Controller { }, link: { interactive: true, + rdfaAware: true, }, structures: STRUCTURE_SPECS, worship: { From 2386e7e1782068b6d99eb47e57dcd04114a1a2b9 Mon Sep 17 00:00:00 2001 From: Elena Poelman Date: Fri, 16 Aug 2024 10:55:03 +0200 Subject: [PATCH 3/3] meeting intro/outro: enable rdfa-aware nodes --- .changeset/eleven-panthers-melt.md | 5 ++++ .../zitting-text-document-container.js | 27 +++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 .changeset/eleven-panthers-melt.md diff --git a/.changeset/eleven-panthers-melt.md b/.changeset/eleven-panthers-melt.md new file mode 100644 index 000000000..06eeaadc2 --- /dev/null +++ b/.changeset/eleven-panthers-melt.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': minor +--- + +meeting intro/outro editors: enable rdfa-aware nodes diff --git a/app/components/zitting-text-document-container.js b/app/components/zitting-text-document-container.js index ee91e9988..98b577ad0 100644 --- a/app/components/zitting-text-document-container.js +++ b/app/components/zitting-text-document-container.js @@ -14,13 +14,13 @@ import { import { highlight } from '@lblod/ember-rdfa-editor/plugins/highlight/marks/highlight'; import { color } from '@lblod/ember-rdfa-editor/plugins/color/marks/color'; import { - block_rdfa, + blockRdfaWithConfig, docWithConfig, hard_break, horizontal_rule, - invisible_rdfa, + invisibleRdfaWithConfig, paragraph, - repaired_block, + repairedBlockWithConfig, text, } from '@lblod/ember-rdfa-editor/nodes'; import { @@ -36,11 +36,10 @@ import { orderedListWithConfig, } from '@lblod/ember-rdfa-editor/plugins/list'; import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder'; -import { heading } from '@lblod/ember-rdfa-editor/plugins/heading'; +import { headingWithConfig } from '@lblod/ember-rdfa-editor/plugins/heading'; import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote'; import { code_block } from '@lblod/ember-rdfa-editor/plugins/code'; import { image } from '@lblod/ember-rdfa-editor/plugins/image'; -import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; import { date, dateView, @@ -49,6 +48,10 @@ import { import { service } from '@ember/service'; import { linkPasteHandler } from '@lblod/ember-rdfa-editor/plugins/link'; import { tracked } from '@glimmer/tracking'; +import { + inlineRdfaWithConfig, + inlineRdfaWithConfigView, +} from '@lblod/ember-rdfa-editor/nodes/inline-rdfa'; export default class ZittingTextDocumentContainerComponent extends Component { @service intl; @@ -68,28 +71,28 @@ export default class ZittingTextDocumentContainerComponent extends Component { schema = new Schema({ nodes: { - doc: docWithConfig(), + doc: docWithConfig({ rdfaAware: true }), paragraph, - repaired_block, + repaired_block: repairedBlockWithConfig({ rdfaAware: true }), list_item: listItemWithConfig({ enableHierarchicalList: true }), ordered_list: orderedListWithConfig({ enableHierarchicalList: true }), bullet_list: bulletListWithConfig({ enableHierarchicalList: true }), placeholder, ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }), date: date(this.config.date), - heading, + heading: headingWithConfig({ rdfaAware: true }), blockquote, horizontal_rule, code_block, text, image, hard_break, - invisible_rdfa, - block_rdfa, + invisible_rdfa: invisibleRdfaWithConfig({ rdfaAware: true }), + block_rdfa: blockRdfaWithConfig({ rdfaAware: true }), + inline_rdfa: inlineRdfaWithConfig({ rdfaAware: true }), link: link(this.config.link), }, marks: { - inline_rdfa, em, strong, underline, @@ -134,6 +137,7 @@ export default class ZittingTextDocumentContainerComponent extends Component { return { link: { interactive: true, + rdfaAware: true, }, date: { placeholder: { @@ -173,6 +177,7 @@ export default class ZittingTextDocumentContainerComponent extends Component { return { link: linkView(this.config.link)(controller), date: dateView(this.config.date)(controller), + inline_rdfa: inlineRdfaWithConfigView({ rdfaAware: true })(controller), }; }; }