@lblod/ember-rdfa-editor-lblod-plugins 8.4.2 → 8.4.3

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.4.3] - 2023-08-07
+
+### Fixed
+- GN-4451: fix roadsign plugin no longer showing rendered templates in modal
+
 ## [8.4.2] - 2023-08-02
 ### Fixed
 - GN-4446: fix email-address formatting in error components
@@ -557,7 +562,7 @@ add onclick handler to pencil icon in variable plugin
 
 # Changelog
 
-[unreleased]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.4.2...HEAD
+[unreleased]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.4.3...HEAD
 [8.0.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.0.0...v8.0.1
 [8.0.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v7.1.0...v8.0.0
 [7.1.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v7.0.0...v7.1.0
@@ -573,6 +578,7 @@ add onclick handler to pencil icon in variable plugin
 [3.0.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v2.1.2...v3.0.0
 [2.1.2]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v2.1.0...v2.1.1
+[8.4.3]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.4.2...v8.4.3
 [8.4.2]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.4.1...v8.4.2
 [8.4.1]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.4.0...v8.4.1
 [8.4.0]: https://github.com/lblod/ember-rdfa-editor-lblod-plugins/compare/v8.3.0...v8.4.0

package/addon/components/roadsign-regulation-plugin/expanded-measure.hbs

@@ -3,7 +3,11 @@
     <AuHeading @level="6" @skin="6">Voeg maatregel in:</AuHeading>
     <p>
       <AuPill>
-        <RoadsignRegulationPlugin::MeasureTemplate @measure={{@measure.uri}} @template={{@measure.template}} />
+        <RoadsignRegulationPlugin::MeasureTemplate
+          @measure={{@measure.uri}}
+          @template={{@measure.template}}
+          @endpoint={{@endpoint}}
+        />
       </AuPill>
     </p>
     {{#if this.isPotentiallyZonal}}

package/addon/components/roadsign-regulation-plugin/expanded-measure.ts

@@ -17,6 +17,7 @@ type Args = {
     zonalityValue?: string,
     temporalValue?: string
   ) => void;
+  endpoint: string;
 };
 
 export default class ExpandedMeasureComponent extends Component<Args> {

package/addon/components/roadsign-regulation-plugin/measure-template.ts

@@ -1,9 +1,8 @@
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { tracked } from '@glimmer/tracking';
 import includeInstructions from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/includeInstructions';
 import RoadsignRegistryService from '@lblod/ember-rdfa-editor-lblod-plugins/services/roadsign-registry';
+import { trackedFunction } from 'ember-resources/util/function';
 
 type Args = {
   template: string;
@@ -13,27 +12,22 @@ type Args = {
 };
 export default class MeasureTemplateComponent extends Component<Args> {
   @service declare roadsignRegistry: RoadsignRegistryService;
-  @tracked template = '';
-  endpoint: string;
 
-  constructor(parent: unknown, args: Args) {
-    super(parent, args);
-    this.template = this.args.template;
-    void this.fetchData.perform();
-    this.endpoint = this.args.endpoint;
+  get template() {
+    return this.instructionData.value ?? '';
   }
 
-  fetchData = task(async () => {
+  instructionData = trackedFunction(this, async () => {
     const instructions =
       await this.roadsignRegistry.getInstructionsForMeasure.perform(
         this.args.measure,
-        this.endpoint
+        this.args.endpoint
       );
     const template = includeInstructions(
       this.args.template,
       instructions,
       this.args.annotated
     );
-    this.template = template;
+    return template;
   });
 }

package/addon/components/roadsign-regulation-plugin/roadsigns-table.hbs

@@ -33,7 +33,13 @@
                 </div>
               </td>
               <td>
-                <AuHelpText skin="secondary" class="au-u-margin-none"><RoadsignRegulationPlugin::MeasureTemplate @measure={{row.uri}} @template={{row.template}} @limitText={{true}}/></AuHelpText>
+                <AuHelpText skin="secondary" class="au-u-margin-none">
+                  <RoadsignRegulationPlugin::MeasureTemplate
+                    @measure={{row.uri}}
+                    @template={{row.template}}
+                    @limitText={{true}}
+                    @endpoint={{@options.endpoint}} />
+                </AuHelpText>
               </td>
               <td>
                 {{#each row.classifications as |classification|}}
@@ -51,7 +57,12 @@
               </td>
             </tr>
           {{#if (eq this.selected row.uri)}}
-            <RoadsignRegulationPlugin::ExpandedMeasure @measure={{row}} @insert={{@insert}} @selectRow={{this.selectRow}} />
+            <RoadsignRegulationPlugin::ExpandedMeasure
+              @measure={{row}}
+              @insert={{@insert}}
+              @selectRow={{this.selectRow}}
+              @endpoint={{@options.endpoint}}
+            />
           {{/if}}
         {{else}}
           <tr>

package/components/roadsign-regulation-plugin/expanded-measure.d.ts

@@ -4,6 +4,7 @@ type Args = {
     measure: Measure;
     selectRow: (uri: string) => void;
     insert: (measure: Measure, zonalityValue?: string, temporalValue?: string) => void;
+    endpoint: string;
 };
 export default class ExpandedMeasureComponent extends Component<Args> {
     zonalityValue?: string;

package/components/roadsign-regulation-plugin/measure-template.d.ts

@@ -8,9 +8,7 @@ type Args = {
 };
 export default class MeasureTemplateComponent extends Component<Args> {
     roadsignRegistry: RoadsignRegistryService;
-    template: string;
-    endpoint: string;
-    constructor(parent: unknown, args: Args);
-    fetchData: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, () => Promise<void>>;
+    get template(): string;
+    instructionData: import("ember-resources/util/function").State<Promise<string>>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "8.4.2",
+  "version": "8.4.3",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",