diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index 015a2f7cc..8fa51e331 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, @@ -69,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, @@ -113,8 +120,11 @@ export default class AgendapointsEditController extends Controller { date: date(this.config.date), STRUCTURE_NODES, regulatoryStatementNode, + templateComment, + text_variable, number, - variable, + location, + codelist, ...besluitNodes, roadsign_regulation, heading, @@ -175,32 +185,42 @@ 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), + templateComment: templateCommentView(controller), }; }; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index ab00417a0..f86b6a495 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -34,14 +34,14 @@ 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, } 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 +60,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, @@ -106,10 +112,13 @@ export default class RegulatoryStatementsRoute extends Controller { ordered_list, bullet_list, placeholder, + templateComment, ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }), date: date(this.config.date), + codelist, + location, number, - variable, + text_variable, ...STRUCTURE_NODES, heading, blockquote, @@ -138,7 +147,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 +154,10 @@ 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), + templateComment: templateCommentView(controller), }; }; } @@ -205,13 +217,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 +245,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/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'; diff --git a/app/templates/agendapoints/edit.hbs b/app/templates/agendapoints/edit.hbs index f6a431310..2c31b34ee 100644 --- a/app/templates/agendapoints/edit.hbs +++ b/app/templates/agendapoints/edit.hbs @@ -91,11 +91,14 @@ @controller={{this.controller}} @options={{this.config.date}} /> - + {{#if (feature-flag 'regulatoryStatements')}} {{/if}} + <:sidebar> - + + + diff --git a/app/templates/regulatory-statements/edit.hbs b/app/templates/regulatory-statements/edit.hbs index 989b9990e..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> - + + + diff --git a/config/environment.js b/config/environment.js index eabd8c900..100b11d5c 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,12 @@ 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 = - 'https://register.mobiliteit.vlaanderen.be/'; - ENV.templateVariablePlugin.endpoint = - 'https://dev.roadsigns.lblod.info/sparql'; - ENV.templateVariablePlugin.zonalLocationCodelistUri = + 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.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 073584590..78ee69aea 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 7ba1164c2..a31eb9a79 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",