From 968dc25b9bcbde828e6e0316f55d38b9899dabff Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 12 Apr 2024 15:46:47 +0200 Subject: [PATCH] Update to latest plugins and add worship-services plugin --- .changeset/four-boats-breathe.md | 5 +++ app/controllers/agendapoints/edit.js | 35 +++++++++++-------- app/controllers/regulatory-statements/edit.js | 21 +++++++---- app/styles/app.scss | 1 + app/templates/agendapoints/edit.hbs | 6 +++- app/templates/regulatory-statements/edit.hbs | 6 +++- package-lock.json | 8 ++--- package.json | 2 +- 8 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 .changeset/four-boats-breathe.md diff --git a/.changeset/four-boats-breathe.md b/.changeset/four-boats-breathe.md new file mode 100644 index 000000000..abba4d81d --- /dev/null +++ b/.changeset/four-boats-breathe.md @@ -0,0 +1,5 @@ +--- +"frontend-gelinkt-notuleren": minor +--- + +Add initial version of worship service plugin diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index a066d829d..f0ce51162 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -3,8 +3,7 @@ import { task } from 'ember-concurrency'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; import { service } from '@ember/service'; -import { TRASH_STATUS_ID } from 'frontend-gelinkt-notuleren/utils/constants'; -import generateExportFromEditorDocument from 'frontend-gelinkt-notuleren/utils/generate-export-from-editor-document'; + import { Schema } from '@lblod/ember-rdfa-editor'; import { em, @@ -55,30 +54,21 @@ 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'; import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; - import { createInvisiblesPlugin, hardBreak, heading as headingInvisible, paragraph as paragraphInvisible, } from '@lblod/ember-rdfa-editor/plugins/invisibles'; - import { besluitNodes, structureSpecs, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/standard-template-plugin'; - import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin'; - import { templateComment, templateCommentView, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/template-comments-plugin'; - -import { - regulatoryStatementNode, - regulatoryStatementNodeView, -} from '../../editor-plugins/regulatory-statements-plugin'; import { roadsign_regulation } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/nodes'; import { link, @@ -87,14 +77,21 @@ import { } from '@lblod/ember-rdfa-editor/plugins/link'; import { highlight } from '@lblod/ember-rdfa-editor/plugins/highlight/marks/highlight'; import { color } from '@lblod/ember-rdfa-editor/plugins/color/marks/color'; -import ENV from 'frontend-gelinkt-notuleren/config/environment'; import { validation } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/validation'; import { atLeastOneArticleContainer } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/utils/validation-rules'; +import { undo } from '@lblod/ember-rdfa-editor/plugins/history'; + +import { TRASH_STATUS_ID } from 'frontend-gelinkt-notuleren/utils/constants'; +import generateExportFromEditorDocument from 'frontend-gelinkt-notuleren/utils/generate-export-from-editor-document'; +import ENV from 'frontend-gelinkt-notuleren/config/environment'; +import { + regulatoryStatementNode, + regulatoryStatementNodeView, +} from '../../editor-plugins/regulatory-statements-plugin'; import { GEMEENTE, OCMW, } from '../../utils/bestuurseenheid-classificatie-codes'; -import { undo } from '@lblod/ember-rdfa-editor/plugins/history'; export default class AgendapointsEditController extends Controller { @service store; @@ -160,6 +157,7 @@ export default class AgendapointsEditController extends Controller { get config() { const classificatie = this.currentSession.classificatie; + const municipality = this.defaultMunicipality; return { date: { formats: [ @@ -185,7 +183,7 @@ export default class AgendapointsEditController extends Controller { }, endpoint: '/codex/sparql', decisionsEndpoint: ENV.publicatieEndpoint, - defaultDecisionsGovernmentName: this.defaultMunicipality, + defaultDecisionsGovernmentName: municipality.naam, }, link: { interactive: true, @@ -199,13 +197,20 @@ export default class AgendapointsEditController extends Controller { classificatieUri: classificatie?.uri, }, structures: structureSpecs, + worship: { + endpoint: 'https://data.lblod.info/sparql', + defaultAdministrativeUnit: municipality && { + label: municipality.naam, + uri: municipality.uri, + }, + }, }; } get defaultMunicipality() { const classificatie = this.currentSession.classificatie; if (classificatie?.uri === GEMEENTE || classificatie?.uri === OCMW) { - return this.currentSession.group.naam; + return this.currentSession.group; } else { return null; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 7fa36e10e..f093b7fc6 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -1,11 +1,10 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; - import { task } from 'ember-concurrency'; -import generateExportFromEditorDocument from 'frontend-gelinkt-notuleren/utils/generate-export-from-editor-document'; import { service } from '@ember/service'; import { getOwner } from '@ember/application'; + import { em, strikethrough, @@ -53,7 +52,6 @@ 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'; import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; - import { Schema } from '@lblod/ember-rdfa-editor'; import { address, @@ -82,15 +80,16 @@ import { } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/table-of-contents-plugin/nodes'; import { emberApplication } from '@lblod/ember-rdfa-editor/plugins/ember-application'; import { document_title } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-title-plugin/nodes'; - import { highlight } from '@lblod/ember-rdfa-editor/plugins/highlight/marks/highlight'; import { color } from '@lblod/ember-rdfa-editor/plugins/color/marks/color'; +import { undo } from '@lblod/ember-rdfa-editor/plugins/history'; + +import generateExportFromEditorDocument from 'frontend-gelinkt-notuleren/utils/generate-export-from-editor-document'; import ENV from 'frontend-gelinkt-notuleren/config/environment'; import { GEMEENTE, OCMW, } from '../../utils/bestuurseenheid-classificatie-codes'; -import { undo } from '@lblod/ember-rdfa-editor/plugins/history'; export default class RegulatoryStatementsRoute extends Controller { @service documentService; @@ -186,6 +185,7 @@ export default class RegulatoryStatementsRoute extends Controller { } get config() { + const municipality = this.defaultMunicipality; return { tableOfContents: [ { @@ -221,12 +221,19 @@ export default class RegulatoryStatementsRoute extends Controller { }, endpoint: '/codex/sparql', decisionsEndpoint: ENV.publicatieEndpoint, - defaultDecisionsGovernmentName: this.defaultMunicipality, + defaultDecisionsGovernmentName: municipality.naam, }, link: { interactive: true, }, structures: STRUCTURE_SPECS, + worship: { + endpoint: 'https://data.lblod.info/sparql', + defaultAdministrativeUnit: municipality && { + label: municipality.naam, + uri: municipality.uri, + }, + }, }; } @@ -273,7 +280,7 @@ export default class RegulatoryStatementsRoute extends Controller { const classificatie = this.currentSession.classificatie; if (classificatie?.uri === GEMEENTE || classificatie?.uri === OCMW) { - return this.currentSession.group.naam; + return this.currentSession.group; } else { return null; } diff --git a/app/styles/app.scss b/app/styles/app.scss index a641653b8..cfb3b653d 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -38,6 +38,7 @@ @import "variable-plugin"; @import "besluit-plugin"; @import "template-comments-plugin"; +@import "worship-plugin"; @import "project/p-annotations"; // @TODO: refactor in ember-rdfa-editor // give treatment (behandeling) content the same style as other say-documents diff --git a/app/templates/agendapoints/edit.hbs b/app/templates/agendapoints/edit.hbs index 80068ff3c..05b9d94c6 100644 --- a/app/templates/agendapoints/edit.hbs +++ b/app/templates/agendapoints/edit.hbs @@ -149,6 +149,10 @@ {{/if}} + <:sidebar> diff --git a/app/templates/regulatory-statements/edit.hbs b/app/templates/regulatory-statements/edit.hbs index cce4140ef..97d832212 100644 --- a/app/templates/regulatory-statements/edit.hbs +++ b/app/templates/regulatory-statements/edit.hbs @@ -135,6 +135,10 @@ /> + <:sidebar> diff --git a/package-lock.json b/package-lock.json index 944483c60..227f25be9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "9.6.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^16.3.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^16.4.0", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", @@ -4864,9 +4864,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor-lblod-plugins": { - "version": "16.3.0", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-16.3.0.tgz", - "integrity": "sha512-0t+Ky8OtF6WvjS/4tMkHx37T1+xgIMfXElmWKD5hDUCHMv/bnUSukTgsSfs3CVWav+BkQA12Si6bSaIhNPTXmg==", + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-16.4.0.tgz", + "integrity": "sha512-G2QUb5e4FN0In3Ql0Nj3wzboSgBsQSW3KTPLQdH4tipIT6U666P41HnRcjQAbmhz6FLF/CHfY64Fs37rMZXGQA==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.4.3", diff --git a/package.json b/package.json index 1c0ad8290..4d0adcb65 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "9.6.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^16.3.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^16.4.0", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7",