GN-4264: enable template comments in GN

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),
       };
     };
   }

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,14 +147,17 @@ export default class RegulatoryStatementsRoute extends Controller {
   get nodeViews() {
     return (controller) => {
       return {
-        variable: variableView(controller),
         table_of_contents: tableOfContentsView(this.config.tableOfContents)(
           controller
         ),
         link: linkView(this.config.link)(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;

app/templates/agendapoints/edit.hbs

@@ -91,11 +91,14 @@
           @controller={{this.controller}}
           @options={{this.config.date}}
         />
-        <RoadsignRegulationPlugin::RoadsignRegulationCard @controller={{this.controller}} @options={{this.config.roadsignRegulation}}/>
+        <RoadsignRegulationPlugin::RoadsignRegulationCard
+          @controller={{this.controller}}
+          @options={{this.config.roadsignRegulation}}/>
         <StandardTemplatePlugin::Card @controller={{this.controller}}/>
         {{#if (feature-flag 'regulatoryStatements')}}
           <EditorPlugins::RegulatoryStatements::SidebarInsert @controller={{this.controller}}/>
         {{/if}}
+        <TemplateCommentsPlugin::Insert @controller={{this.controller}}/>
     </:sidebarCollapsible>
     <:sidebar>
       <ArticleStructurePlugin::StructureCard
@@ -112,7 +115,13 @@
       <RdfaDatePlugin::Card
         @controller={{this.controller}}
         @options={{this.config.date}}/>
-      <VariablePlugin::TemplateVariableCard @controller={{this.controller}} @options={{this.config.templateVariable}}/>
+      <VariablePlugin::Codelist::Edit
+        @controller={{this.controller}}
+        @options={{this.codelistEditOptions}}/>
+      <VariablePlugin::Location::Edit
+        @controller={{this.controller}}
+        @options={{this.locationEditOptions}}/>
+      <TemplateCommentsPlugin::EditCard @controller={{this.controller}}/>
     </:sidebar>
   </RdfaEditorContainer>
 </div>

app/templates/regulatory-statements/edit.hbs

@@ -87,6 +87,7 @@
         @options={{this.config.date}}
       />
       <StandardTemplatePlugin::Card @controller={{this.controller}}/>
+      <TemplateCommentsPlugin::Insert @controller={{this.controller}}/>
     </:sidebarCollapsible>
     <:sidebar>
       <ArticleStructurePlugin::StructureCard
@@ -101,7 +102,13 @@
       <RdfaDatePlugin::Card
         @controller={{this.controller}}
         @options={{this.config.date}}/>
-      <VariablePlugin::TemplateVariableCard @controller={{this.controller}} @options={{this.config.templateVariable}}/>
+      <VariablePlugin::Codelist::Edit
+        @controller={{this.controller}}
+        @options={{this.codelistEditOptions}}/>
+      <VariablePlugin::Location::Edit
+        @controller={{this.controller}}
+        @options={{this.locationEditOptions}}/>
+      <TemplateCommentsPlugin::EditCard @controller={{this.controller}}/>
     </:sidebar>
   </RdfaEditorContainer>
 </AuBodyContainer>

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';

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",