diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index b4c4ee999..e5f90d809 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -34,6 +34,10 @@ import { variable, variableView, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/nodes'; +import { + number, + numberView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number'; import { bullet_list, list_item, @@ -109,6 +113,7 @@ export default class AgendapointsEditController extends Controller { date: date(this.config.date), STRUCTURE_NODES, regulatoryStatementNode, + number, variable, ...besluitNodes, roadsign_regulation, @@ -195,6 +200,7 @@ export default class AgendapointsEditController extends Controller { link: linkView(this.config.link)(controller), image: imageView(controller), date: dateView(this.config.date)(controller), + number: numberView(controller), }; }; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index e5cef06d5..0a9fe5d70 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -58,7 +58,10 @@ import { } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; import { Schema } from '@lblod/ember-rdfa-editor'; - +import { + number, + numberView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number'; import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin'; import { createInvisiblesPlugin, @@ -101,6 +104,7 @@ export default class RegulatoryStatementsRoute extends Controller { placeholder, ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }), date: date(this.config.date), + number, variable, ...STRUCTURE_NODES, heading, @@ -137,6 +141,7 @@ export default class RegulatoryStatementsRoute extends Controller { link: linkView(this.config.link)(controller), image: imageView(controller), date: dateView(this.config.date)(controller), + number: numberView(controller), }; }; } diff --git a/config/environment.js b/config/environment.js index 8301ebf7f..eabd8c900 100644 --- a/config/environment.js +++ b/config/environment.js @@ -88,7 +88,7 @@ module.exports = function (environment) { ENV.featureFlags['regulatory-statements'] = true; ENV.featureFlags['prosemirror-dev-tools'] = true; ENV.roadsignRegulationPlugin.endpoint = - 'https://dev.roadsigns.lblod.info/sparql'; + 'https://dev.roadsigns.lblod.info/raw-sparql'; ENV.roadsignRegulationPlugin.imageBaseUrl = 'https://register.mobiliteit.vlaanderen.be/'; ENV.templateVariablePlugin.endpoint = diff --git a/package-lock.json b/package-lock.json index f192d291d..e70e4b725 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": "^3.10.0", - "@lblod/ember-rdfa-editor-lblod-plugins": "^8.1.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^8.2.2", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", @@ -4000,9 +4000,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor-lblod-plugins": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-8.1.0.tgz", - "integrity": "sha512-AP2jWD0Wug3skVCGaPmI79IlzlLwOSTsJ6QrRauJn6pENdnouqCgEmS9aeadXscndAV54fxBILcURO6LRiGxdw==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-8.2.2.tgz", + "integrity": "sha512-j+my0VZzK2jsL0XSQZ6mooIMLf33uOu3g1Lsm0DpqI45HgLm2zRblF6Wy3UYjs9YGr/S25KBfOVqRKc5vnr6aQ==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.4.3", @@ -4014,10 +4014,10 @@ "@rdfjs/dataset": "^2.0.1", "@rdfjs/parser-n3": "^2.0.1", "@types/rdf-validate-shacl": "^0.4.0", - "@types/rdfjs__parser-n3": "^1.1.5", + "@types/rdfjs__parser-n3": "^2.0.1", "buffer": "^6.0.3", "codemirror": "^6.0.1", - "date-fns": "^2.29.3", + "date-fns": "^2.30.0", "ember-auto-import": "^2.4.3", "ember-cli-babel": "^7.26.11", "ember-cli-htmlbars": "^6.1.1", @@ -4028,6 +4028,7 @@ "ember-resources": "^5.6.2", "ember-velcro": "^1.1.0", "fetch-sparql-endpoint": "^3.0.0", + "n2words": "^1.16.4", "process": "0.11.10", "rdf-ext": "^2.1.0", "rdf-validate-shacl": "^0.4.5", @@ -5366,9 +5367,9 @@ } }, "node_modules/@types/rdfjs__parser-n3": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@types/rdfjs__parser-n3/-/rdfjs__parser-n3-1.1.5.tgz", - "integrity": "sha512-HLG3uULuaHJK6Wwbq+hIQkvjla86rrsXrFvhyz2EBYQZoIr858BI4vcs6YMO7kkaLc/wCPZS71Ueedpf+8beOQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/rdfjs__parser-n3/-/rdfjs__parser-n3-2.0.1.tgz", + "integrity": "sha512-IPA04Q5LutRlFy9Kz1x48uqj6UaPd5rWandyBww1wj7xzwrCl1Yp3xTVkx7DnWP6o/kYd527/KHKsVkNi4tA9g==", "dev": true, "dependencies": { "rdf-js": "^4.0.2" @@ -28916,6 +28917,15 @@ "thenify-all": "^1.0.0" } }, + "node_modules/n2words": { + "version": "1.16.4", + "resolved": "https://registry.npmjs.org/n2words/-/n2words-1.16.4.tgz", + "integrity": "sha512-t4wGZkLxQpByjWwuN5cJWTBUHer82g3bGUDaK00YJZicQPUYcI9i6eu3KMDg/awLIkTKeH5IQ866lGy+c02d2g==", + "dev": true, + "engines": { + "node": "16 || >=18" + } + }, "node_modules/n3": { "version": "1.16.4", "resolved": "https://registry.npmjs.org/n3/-/n3-1.16.4.tgz", diff --git a/package.json b/package.json index ff490d4f4..3d82c7386 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": "^3.10.0", - "@lblod/ember-rdfa-editor-lblod-plugins": "^8.1.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^8.2.2", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7",