From bdb03085dec2ee408455b58d8d9790a1d368d845 Mon Sep 17 00:00:00 2001 From: abeforgit Date: Tue, 8 Aug 2023 16:14:06 +0200 Subject: [PATCH 1/4] chore(deps): bump plugin to latest and update configuration --- app/controllers/agendapoints/edit.js | 45 ++++++++++++------- app/controllers/regulatory-statements/edit.js | 40 +++++++++++------ app/templates/agendapoints/edit.hbs | 11 ++++- app/templates/regulatory-statements/edit.hbs | 7 ++- config/environment.js | 26 +++++------ package-lock.json | 8 ++-- package.json | 2 +- 7 files changed, 86 insertions(+), 53 deletions(-) diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index 015a2f7cc..d52596d63 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -31,13 +31,15 @@ import { } from '@lblod/ember-rdfa-editor/plugins/table'; import { STRUCTURE_NODES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/structures'; import { - variable, - variableView, -} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/nodes'; -import { + codelist, + codelistView, number, numberView, -} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number'; + location, + locationView, + text_variable, + textVariableView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables'; import { bullet_list, list_item, @@ -113,8 +115,10 @@ export default class AgendapointsEditController extends Controller { date: date(this.config.date), STRUCTURE_NODES, regulatoryStatementNode, + text_variable, number, - variable, + location, + codelist, ...besluitNodes, roadsign_regulation, heading, @@ -175,32 +179,41 @@ export default class AgendapointsEditController extends Controller { interactive: true, }, roadsignRegulation: { - endpoint: ENV.roadsignRegulationPlugin.endpoint, - imageBaseUrl: ENV.roadsignRegulationPlugin.imageBaseUrl, + endpoint: ENV.mowRegistryEndpoint, + imageBaseUrl: ENV.roadsignImageBaseUrl, }, besluitType: { endpoint: 'https://centrale-vindplaats.lblod.info/sparql', }, - templateVariable: { - endpoint: ENV.templateVariablePlugin.endpoint, - zonalLocationCodelistUri: - ENV.templateVariablePlugin.zonalLocationCodelistUri, - nonZonalLocationCodelistUri: - ENV.templateVariablePlugin.nonZonalLocationCodelistUri, - }, structures: structureSpecs, }; } + get codelistEditOptions() { + return { + endpoint: ENV.fallbackCodelistEndpoint, + }; + } + + get locationEditOptions() { + return { + endpoint: ENV.fallbackCodelistEndpoint, + zonalLocationCodelistUri: ENV.zonalLocationCodelistUri, + nonZonalLocationCodelistUri: ENV.nonZonalLocationCodelistUri, + }; + } + get nodeViews() { return (controller) => { return { - variable: variableView(controller), regulatoryStatementNode: regulatoryStatementNodeView(controller), link: linkView(this.config.link)(controller), image: imageView(controller), date: dateView(this.config.date)(controller), number: numberView(controller), + text_variable: textVariableView(controller), + location: locationView(controller), + codelist: codelistView(controller), }; }; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index ab00417a0..923d267b7 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -38,10 +38,6 @@ import { STRUCTURE_NODES, STRUCTURE_SPECS, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/structures'; -import { - variable, - variableView, -} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/nodes'; import { bullet_list, list_item, @@ -60,9 +56,15 @@ import { import { Schema } from '@lblod/ember-rdfa-editor'; import { + codelist, + codelistView, number, numberView, -} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number'; + location, + locationView, + text_variable, + textVariableView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables'; import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin'; import { createInvisiblesPlugin, @@ -108,8 +110,10 @@ export default class RegulatoryStatementsRoute extends Controller { placeholder, ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }), date: date(this.config.date), + codelist, + location, number, - variable, + text_variable, ...STRUCTURE_NODES, heading, blockquote, @@ -138,7 +142,6 @@ export default class RegulatoryStatementsRoute extends Controller { get nodeViews() { return (controller) => { return { - variable: variableView(controller), table_of_contents: tableOfContentsView(this.config.tableOfContents)( controller ), @@ -146,6 +149,9 @@ export default class RegulatoryStatementsRoute extends Controller { image: imageView(controller), date: dateView(this.config.date)(controller), number: numberView(controller), + location: locationView(controller), + codelist: codelistView(controller), + text_variable: textVariableView(controller), }; }; } @@ -205,13 +211,6 @@ export default class RegulatoryStatementsRoute extends Controller { }, endpoint: '/codex/sparql', }, - templateVariable: { - endpoint: ENV.templateVariablePlugin.endpoint, - zonalLocationCodelistUri: - ENV.templateVariablePlugin.zonalLocationCodelistUri, - nonZonalLocationCodelistUri: - ENV.templateVariablePlugin.nonZonalLocationCodelistUri, - }, link: { interactive: true, }, @@ -240,6 +239,19 @@ export default class RegulatoryStatementsRoute extends Controller { return this.model.documentContainer; } + get codelistEditOptions() { + return { + endpoint: ENV.fallbackCodelistEndpoint, + }; + } + + get locationEditOptions() { + return { + endpoint: ENV.fallbackCodelistEndpoint, + zonalLocationCodelistUri: ENV.zonalLocationCodelistUri, + nonZonalLocationCodelistUri: ENV.nonZonalLocationCodelistUri, + }; + } @action download() { this.editorDocument.content = this.controller.htmlContent; diff --git a/app/templates/agendapoints/edit.hbs b/app/templates/agendapoints/edit.hbs index f6a431310..ae59e750b 100644 --- a/app/templates/agendapoints/edit.hbs +++ b/app/templates/agendapoints/edit.hbs @@ -91,7 +91,9 @@ @controller={{this.controller}} @options={{this.config.date}} /> - + {{#if (feature-flag 'regulatoryStatements')}} @@ -112,7 +114,12 @@ - + + diff --git a/app/templates/regulatory-statements/edit.hbs b/app/templates/regulatory-statements/edit.hbs index 989b9990e..1b81fbc93 100644 --- a/app/templates/regulatory-statements/edit.hbs +++ b/app/templates/regulatory-statements/edit.hbs @@ -101,7 +101,12 @@ - + + diff --git a/config/environment.js b/config/environment.js index eabd8c900..3503c1737 100644 --- a/config/environment.js +++ b/config/environment.js @@ -8,6 +8,11 @@ module.exports = function (environment) { locationType: 'auto', regulatoryStatementEndpoint: '{{REGULATORY_STATEMENT_ENDPOINT}}', regulatoryStatementFileEndpoint: '{{REGULATORY_STATEMENT_FILE_ENDPOINT}}', + mowRegistryEndpoint: '{{MOW_REGISTRY_ENDPOINT}}', + roadsignImageBaseUrl: '{{ROADSIGN_IMAGE_BASE_URL}}', + fallbackCodelistEndpoint: '{{MOW_REGISTRY_ENDPOINT}}', + zonalLocationCodelistUri: '{{ZONAL_LOCATION_CODELIST_URI}}', + nonZonalLocationCodelistUri: '{{NON_ZONAL_LOCATION_CODELIST_URI}}', EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build @@ -20,15 +25,6 @@ module.exports = function (environment) { outputDateFormat: 'D MMMM YYYY', }, }, - roadsignRegulationPlugin: { - endpoint: '{{MOW_REGISTRY_ENDPOINT}}', - imageBaseUrl: '{{ROADSIGN_IMAGE_BASE_URL}}', - }, - templateVariablePlugin: { - endpoint: '{{MOW_REGISTRY_ENDPOINT}}', - zonalLocationCodelistUri: '{{ZONAL_LOCATION_CODELIST_URI}}', - nonZonalLocationCodelistUri: '{{NON_ZONAL_LOCATION_CODELIST_URI}}', - }, 'ember-plausible': { enabled: false, domain: '{{PLAUSIBLE_APP_DOMAIN}}', @@ -87,15 +83,15 @@ module.exports = function (environment) { ENV.manual.print = ''; ENV.featureFlags['regulatory-statements'] = true; ENV.featureFlags['prosemirror-dev-tools'] = true; - ENV.roadsignRegulationPlugin.endpoint = - 'https://dev.roadsigns.lblod.info/raw-sparql'; - ENV.roadsignRegulationPlugin.imageBaseUrl = + ENV.mowRegistryEndpoint = + 'https://dev.roadsigns.lblod.info/sparql'; + ENV.roadsignImageBaseUrl = 'https://register.mobiliteit.vlaanderen.be/'; - ENV.templateVariablePlugin.endpoint = + ENV.fallbackCodelistEndpoint = 'https://dev.roadsigns.lblod.info/sparql'; - ENV.templateVariablePlugin.zonalLocationCodelistUri = + ENV.zonalLocationCodelistUri = 'http://lblod.data.gift/concept-schemes/62331E6900730AE7B99DF7EF'; - ENV.templateVariablePlugin.nonZonalLocationCodelistUri = + ENV.nonZonalLocationCodelistUri = 'http://lblod.data.gift/concept-schemes/62331FDD00730AE7B99DF7F2'; ENV.regulatoryStatementEndpoint = 'https://dev.reglementairebijlagen.lblod.info/raw-sparql'; diff --git a/package-lock.json b/package-lock.json index 84738b0c2..76dee9eb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "^4.2.0", - "@lblod/ember-rdfa-editor-lblod-plugins": "^9.1.1", + "@lblod/ember-rdfa-editor-lblod-plugins": "^10.0.0", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", @@ -3957,9 +3957,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor-lblod-plugins": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-9.1.1.tgz", - "integrity": "sha512-P2ILRU2mgNpzUTUb178bLHEwdo3fGz6BcQdUV0oCcBl6WQSYC8S35EWOOQKqadYhwizP93U3Z9b9O9B0gnwNCA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-10.0.0.tgz", + "integrity": "sha512-tK3oGc+hYKHdD5ZLECsRgtLurmbNk2RcaOqTiNbfcQC5VGg5odW6m6SgmcY/sWPikg6tItz8n/71F4hQQmJ6WQ==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.4.3", diff --git a/package.json b/package.json index c479fc8c1..4a33eac44 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "^4.2.0", - "@lblod/ember-rdfa-editor-lblod-plugins": "^9.1.1", + "@lblod/ember-rdfa-editor-lblod-plugins": "^10.0.0", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", From c597e8ec5508faf6aac21518dd5e3880b2974f25 Mon Sep 17 00:00:00 2001 From: abeforgit Date: Tue, 8 Aug 2023 16:57:18 +0200 Subject: [PATCH 2/4] feat(comments): enable template comment plugin --- app/controllers/agendapoints/edit.js | 7 +++++++ app/controllers/regulatory-statements/edit.js | 6 ++++++ app/templates/agendapoints/edit.hbs | 2 ++ app/templates/regulatory-statements/edit.hbs | 2 ++ 4 files changed, 17 insertions(+) diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index d52596d63..950cb1f5f 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -71,6 +71,11 @@ import { 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, @@ -115,6 +120,7 @@ export default class AgendapointsEditController extends Controller { date: date(this.config.date), STRUCTURE_NODES, regulatoryStatementNode, + templateComment, text_variable, number, location, @@ -214,6 +220,7 @@ export default class AgendapointsEditController extends Controller { text_variable: textVariableView(controller), location: locationView(controller), codelist: codelistView(controller), + templateComment: templateCommentView(controller), }; }; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 923d267b7..91c06ff55 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -34,6 +34,10 @@ import { linkView, linkPasteHandler, } from '@lblod/ember-rdfa-editor/plugins/link'; +import { + templateComment, + templateCommentView +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/template-comments-plugin'; import { STRUCTURE_NODES, STRUCTURE_SPECS, @@ -108,6 +112,7 @@ export default class RegulatoryStatementsRoute extends Controller { ordered_list, bullet_list, placeholder, + templateComment, ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }), date: date(this.config.date), codelist, @@ -152,6 +157,7 @@ export default class RegulatoryStatementsRoute extends Controller { location: locationView(controller), codelist: codelistView(controller), text_variable: textVariableView(controller), + templateComment: templateCommentView(controller), }; }; } diff --git a/app/templates/agendapoints/edit.hbs b/app/templates/agendapoints/edit.hbs index ae59e750b..2c31b34ee 100644 --- a/app/templates/agendapoints/edit.hbs +++ b/app/templates/agendapoints/edit.hbs @@ -98,6 +98,7 @@ {{#if (feature-flag 'regulatoryStatements')}} {{/if}} + <:sidebar> + diff --git a/app/templates/regulatory-statements/edit.hbs b/app/templates/regulatory-statements/edit.hbs index 1b81fbc93..bf69afeb3 100644 --- a/app/templates/regulatory-statements/edit.hbs +++ b/app/templates/regulatory-statements/edit.hbs @@ -87,6 +87,7 @@ @options={{this.config.date}} /> + <:sidebar> + From c14cdb60664bdfa6cebc337c810ce7ec41ac1aa1 Mon Sep 17 00:00:00 2001 From: abeforgit Date: Tue, 8 Aug 2023 17:04:01 +0200 Subject: [PATCH 3/4] fix(formatting): run prettier --- app/controllers/agendapoints/edit.js | 2 +- app/controllers/regulatory-statements/edit.js | 2 +- config/environment.js | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index 950cb1f5f..8fa51e331 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -73,7 +73,7 @@ import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/c import { templateComment, - templateCommentView + templateCommentView, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/template-comments-plugin'; import { diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 91c06ff55..f86b6a495 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -36,7 +36,7 @@ import { } from '@lblod/ember-rdfa-editor/plugins/link'; import { templateComment, - templateCommentView + templateCommentView, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/template-comments-plugin'; import { STRUCTURE_NODES, diff --git a/config/environment.js b/config/environment.js index 3503c1737..100b11d5c 100644 --- a/config/environment.js +++ b/config/environment.js @@ -83,12 +83,9 @@ module.exports = function (environment) { ENV.manual.print = ''; ENV.featureFlags['regulatory-statements'] = true; ENV.featureFlags['prosemirror-dev-tools'] = true; - ENV.mowRegistryEndpoint = - 'https://dev.roadsigns.lblod.info/sparql'; - ENV.roadsignImageBaseUrl = - 'https://register.mobiliteit.vlaanderen.be/'; - ENV.fallbackCodelistEndpoint = - 'https://dev.roadsigns.lblod.info/sparql'; + ENV.mowRegistryEndpoint = 'https://dev.roadsigns.lblod.info/sparql'; + ENV.roadsignImageBaseUrl = 'https://register.mobiliteit.vlaanderen.be/'; + ENV.fallbackCodelistEndpoint = 'https://dev.roadsigns.lblod.info/sparql'; ENV.zonalLocationCodelistUri = 'http://lblod.data.gift/concept-schemes/62331E6900730AE7B99DF7EF'; ENV.nonZonalLocationCodelistUri = From 762fd9621ab9e628d5ff567b098c17ffa654c770 Mon Sep 17 00:00:00 2001 From: abeforgit Date: Wed, 9 Aug 2023 22:13:12 +0200 Subject: [PATCH 4/4] fix(template-comments): add missing css import --- app/styles/app.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index f5503ae4d..3bf1b5895 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -37,6 +37,7 @@ @import "date-plugin"; @import "variable-plugin"; @import "besluit-plugin"; +@import "template-comments-plugin"; @import "project/p-annotations"; // @TODO: refactor in ember-rdfa-editor @@ -46,4 +47,4 @@ // TEMPORARY HACKS AND QUICKFIXES @import 'deprecated'; -@import 'shame'; \ No newline at end of file +@import 'shame';