Merge pull request #2780 from IDEMSInternational/fix/data-items-outer-local

hotfix: data-items local variables

Author: esmeetewinkel

src/app/shared/components/template/components/data-items/data-items.service.ts

@@ -165,6 +165,11 @@ export class DataItemsService {
     } as any);
     // HACK - still want to be able to use localContext from parent rows so copy to child processor
     processor.templateRowMap = JSON.parse(JSON.stringify(templateRowMap));
+    const templateRowMapValues = Object.fromEntries(
+      Object.entries(templateRowMap).map(([key, { value }]) => [key, value])
+    );
+    processor.templateRowMapValues = templateRowMapValues;
+
     await processor.processContainerTemplateRows();
     return processor.renderedRows();
   }

src/app/shared/components/template/services/instance/template-action.service.spec.ts

@@ -31,11 +31,16 @@ class MockTemplateRowService implements Partial<TemplateRowService> {
     mock_row_1: { value: "", _nested_name: "mock_row_1", name: "mock_row_1", type: "" },
     mock_row_2: { value: "", _nested_name: "mock_row_2", name: "mock_row_2", type: "" },
   };
+  templateRowMapValues = {
+    mock_row_1: "",
+    mock_row_2: "",
+  };
   processRowUpdates = async () => null;
 }
 
 class MockContainer implements Partial<TemplateContainerComponent> {
   templateRowService = new MockTemplateRowService() as any as TemplateRowService;
+
   get templateRowMap() {
     return this.templateRowService.templateRowMap;
   }
@@ -74,14 +79,16 @@ describe("TemplateActionService", () => {
     await service.handleActions([
       { trigger: "click", action_id: "set_local", args: ["mock_row_1", "updated"] },
     ]);
-    expect(service.container.templateRowMap.mock_row_1.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMap.mock_row_1.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMapValues.mock_row_1).toEqual("updated");
   });
 
   it("set_self action", async () => {
     await service.handleActions([
       { trigger: "click", action_id: "set_self", args: ["mock_row_1", "updated"] },
     ]);
-    expect(service.container.templateRowMap.mock_row_1.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMap.mock_row_1.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMapValues.mock_row_1).toEqual("updated");
   });
 
   it("Uses latest value for `this.value` arg", async () => {
@@ -97,7 +104,8 @@ describe("TemplateActionService", () => {
       ],
       _triggeredBy
     );
-    expect(service.container.templateRowMap.mock_row_2.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMap.mock_row_2.value).toEqual("updated");
+    expect(service.container.templateRowService.templateRowMapValues.mock_row_2).toEqual("updated");
     // also include test case of concatenated expression
     await service.handleActions(
       [
@@ -109,7 +117,9 @@ describe("TemplateActionService", () => {
       ],
       _triggeredBy
     );
-    expect(service.container.templateRowMap.mock_row_2.value).toEqual("prefix_updated");
+    expect(service.container.templateRowService.templateRowMap.mock_row_2.value).toEqual(
+      "prefix_updated"
+    );
   });
 
   it("Uses latest value for `this.value` param", async () => {

src/app/shared/components/template/services/instance/template-action.service.ts

@@ -382,6 +382,8 @@ export class TemplateActionService extends SyncServiceBase {
       }
       rowEntry.value = value;
       this.container.templateRowService.templateRowMap[rowEntry._nested_name] = rowEntry;
+      this.container.templateRowService.templateRowMapValues[rowEntry._nested_name] =
+        rowEntry.value;
     } else {
       // TODO
       console.warn("Setting local variable which does not exist", { key, value }, "TODO");

src/app/shared/components/template/services/instance/template-process.service.ts

@@ -64,6 +64,7 @@ export class TemplateProcessService extends SyncServiceBase {
     this.container.template = template;
     // reset any existing templateRowMap data
     this.container.templateRowService.templateRowMap = {};
+    this.container.templateRowService.templateRowMapValues = {};
     // process the template as if it were rendered
     // TODO - should filter out template rows to only include those used programatically (e.g. set_variable, set_field etc.)
     await this.container.templateRowService.processContainerTemplateRows();

src/app/shared/components/template/services/instance/template-row.service.ts

@@ -37,7 +37,7 @@ export class TemplateRowService extends SyncServiceBase {
   public templateRowMap: ITemplateRowMap = {};
 
   /** Modified templateRowMap to only include row values, for use in local evalContext */
-  private templateRowMapValues: { [row_nested_name: string]: FlowTypes.TemplateRow["value"] } = {};
+  public templateRowMapValues: { [row_nested_name: string]: FlowTypes.TemplateRow["value"] } = {};
 
   public renderedRows = signal<FlowTypes.TemplateRow[]>([], { equal: isEqual }); // rows processed and filtered by condition