add support for mobility measures (IRGN) (#225)

* remove unused/unsupported plugins * basic plugin setup * change the name of the plugins * plugin names should not include the plugin postfix * bump roadsign regulation plugin * bump template plugin * template variable plugin was not being configured correctly * bump editor and re-enable package-lock * use package-lock * fix Dockerfile * build a dev version * bumped roadsign plugin * bump roadsign plugin * add besluit plugin * Get rid of ember-cli-moment-shim and update ember-moment * update besluit plugin * fix package-lock * Add rdfa-date plugin * update roadsign regulation plugin * bump decision plugin this version has the correct label * upgrade packages * bump besluit plugin * bump editor * remove modal when editing treatment via meeting (#224) * replace modal component with classes * add quick fix for fake modal * bump date plugin * fix scroll on editor in treatment view Co-authored-by: Dieter Peirs <[email protected]> * bump editor * reenable prod build * reinstate newer variable plugin * fix editor profiles Co-authored-by: Oscar <[email protected]> Co-authored-by: abeforgit <[email protected]> Co-authored-by: Dieter Peirs <[email protected]>
lblod · Jan 19, 2022 · 1500c5c · 1500c5c
1 parent feb3e78
commit 1500c5c
Show file tree

Hide file tree

Showing 12 changed files with 36,501 additions and 53 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -6,7 +6,7 @@ steps:
 - name: install
   image: danlynn/ember-cli:3.20.0
   commands:
-  - npm install
+  - npm ci
 - name: lint
   image: danlynn/ember-cli:3.20.0
   commands:

diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@
 
 *~
 .DS_Store
-package-lock.json
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try

diff --git a/.npmrc b/.npmrc
@@ -1 +0,0 @@
-package-lock=false

diff --git a/Dockerfile b/Dockerfile
@@ -3,8 +3,8 @@ FROM madnificent/ember:3.20.0 as builder
 LABEL maintainer="[email protected]"
 
 WORKDIR /app
-COPY package.json .
-RUN npm install
+COPY package.json package-lock.json ./
+RUN npm ci
 COPY . .
 RUN ember build -prod
 

diff --git a/app/components/rdfa-editor-container.hbs b/app/components/rdfa-editor-container.hbs
@@ -27,10 +27,12 @@
   <div class="container-flex--contain" vocab="{{this.vocab}}" {{did-insert this.setPrefix}}
        typeof="{{@typeOfWrappingDiv}}" property="{{@property}}" resource="#">
     <Rdfa::RdfaEditor
-            class="au-c-rdfa-editor"
-            @profile={{@profile}}
-            @rdfaEditorInit={{this.rdfaEditorInit}}
-            @editorOptions={{this.editorOptions}}
-            @toolbarOptions={{this.toolbarOptions}} />
+      class="au-c-rdfa-editor"
+      @profile={{@profile}}
+      @rdfaEditorInit={{this.rdfaEditorInit}}
+      @editorOptions={{this.editorOptions}}
+      @toolbarOptions={{this.toolbarOptions}}
+      @plugins={{this.plugins}}
+    />
   </div>
 {{/if}}
diff --git a/app/components/rdfa-editor-container.js b/app/components/rdfa-editor-container.js
@@ -4,7 +4,12 @@ import { tracked } from '@glimmer/tracking';
 
 export default class RdfaEditorContainerComponent extends Component {
   @tracked editor;
-
+  plugins = [
+    'roadsign-regulation',
+    'template-variable',
+    'besluit',
+    'rdfa-date',
+  ];
   get editorOptions() {
     return (
       this.args.editorOptions ?? {

diff --git a/app/config/editor-profiles.js b/app/config/editor-profiles.js
@@ -1,33 +1,24 @@
 export default {
   default: [
-    "rdfa-editor-document-title-plugin",
-    "rdfa-editor-generic-model-plugin",
     "rdfa-editor-standard-template-plugin",
     "rdfa-editor-citaten-plugin",
     "rdfa-editor-import-snippet-plugin",
-    "rdfa-editor-roadsign-hint-plugin",
     "rdfa-editor-besluit-type-plugin",
   ],
 
   //GEMEENTE
   "http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001": [
-    "rdfa-editor-document-title-plugin",
-    "rdfa-editor-generic-model-plugin",
     "rdfa-editor-standard-template-plugin",
     "rdfa-editor-citaten-plugin",
     "rdfa-editor-import-snippet-plugin",
-    "rdfa-editor-roadsign-hint-plugin",
     "rdfa-editor-besluit-type-plugin",
   ],
 
   //OCMW
   "http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000002": [
-    "rdfa-editor-document-title-plugin",
-    "rdfa-editor-generic-model-plugin",
     "rdfa-editor-standard-template-plugin",
     "rdfa-editor-citaten-plugin",
     "rdfa-editor-import-snippet-plugin",
-    "rdfa-editor-roadsign-hint-plugin",
     "rdfa-editor-besluit-type-plugin",
 
   ],
@@ -36,7 +27,6 @@ export default {
     "rdfa-editor-citaten-plugin",
     "rdfa-editor-import-snippet-plugin",
     "rdfa-editor-besluit-type-plugin",
-    "rdfa-editor-roadsign-hint-plugin"
 
   ],
   none: []

diff --git a/app/styles/_shame.scss b/app/styles/_shame.scss
@@ -588,3 +588,14 @@
 .au-c-main-container--mock-login {
   height: 100%;
 }
+
+// Fake modal
+.au-c-modal--flat {
+  z-index: 9997;
+  max-width: 100%;
+  max-height: 100%;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  border-radius: 0;
+}
diff --git a/app/templates/meetings/edit/treatment.hbs b/app/templates/meetings/edit/treatment.hbs
@@ -1,18 +1,17 @@
-<AuModal @modalOpen={{true}}
-         @size="fullscreen"
-         @closeModal={{this.closeModal}}
-         @modalTitle={{this.document.title}}
-         class="au-c-modal--editor"
-         as |Modal|
->
-  <Modal.Body>
+<div class="au-c-modal au-c-modal--flat is-visible au-c-modal--editor" role="dialog" aria-describedby="au-c-modal-title-" tabindex="-1">
+  <div class="au-c-modal__header">
+    <h1 id="au-c-modal-title-" class="au-c-modal__title" tabindex="-1">
+      {{this.document.title}}
+    </h1>
+  </div>
+  <div class="au-c-modal__body">
     {{#if this.documentContainer}}
       <div id="panel-2" role="tabpanel" tabindex="0" aria-labelledby="tab-2"  class={{if this.uploading "" "au-u-hidden"}}>
         <DocumentAttachments @documentContainer={{this.documentContainer}} @decisions={{this.decisions}}/>
       </div>
     {{/if}}
     {{#if this.document}}
-      <div id="panel-1" role="tabpanel" tabindex="0" aria-labelledby="tab-1"  class={{if this.uploading "au-u-hidden" ""}}>
+      <div id="panel-1" role="tabpanel" tabindex="0" aria-labelledby="tab-1"  class={{if this.uploading "au-u-hidden" "au-c-body-container"}}>
         <BesluitDocumentContainer class={{if this.uploading ".au-u-hidden" ""}}
                                   @document={{this.document}}
                                   @handleRdfaEditorInit={{this.handleRdfaEditorInit}}
@@ -21,8 +20,8 @@
         />
       </div>
     {{/if}}
-  </Modal.Body>
-  <Modal.Footer>
+  </div>
+  <div class="au-c-modal__footer">
     {{#if (feature-flag 'attachments')}}
       {{#if this.uploading}}
         <AuButtonGroup @inline={{true}} role="tablist" aria-label="editor-tabs">
@@ -61,6 +60,6 @@
         {{t "behandelingVanAgendapunten.cancel"}}
       </AuButton>
     </AuButtonGroup>
-  </Modal.Footer>
-</AuModal>
+  </div>
+</div>
 <ConfirmRouteLeave @enabled={{this.dirty}} @message={{t "behandelingVanAgendapunten.confirmLeaveWithoutSaving"}}/>
diff --git a/config/environment.js b/config/environment.js
@@ -26,6 +26,12 @@ module.exports = function (environment) {
         plausibleScript: "{{ANALYTICS_PLAUSIBLE_SCRIPT}}"
       }
     },
+    roadsignRegulationPlugin: {
+      endpoint: "{{MOW_REGISTRY_ENDPOINT}}"
+    },
+    templateVariablePlugin: {
+      endpoint: "{{MOW_REGISTRY_ENDPOINT}}"
+    },
     manual: {
       baseUrl: "{{MANUAL_BASE_URL}}",
       notuleren: "{{MANUAL_NOTULEREN}}",
@@ -78,6 +84,8 @@ module.exports = function (environment) {
     ENV.manual.publisher="#gebruikersbeheer";
     ENV.manual.print="";
     ENV.featureFlags.attachments = true;
+    ENV.roadsignRegulationPlugin.endpoint = "https://dev.roadsigns.lblod.info/sparql";
+    ENV.templateVariablePlugin.endpoint = "https://dev.roadsigns.lblod.info/sparql";
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;
     // ENV.APP.LOG_TRANSITIONS = true;