From 145d1b6d9bde4c21892859b37647dd04782290e0 Mon Sep 17 00:00:00 2001
From: Martin Stamm <martin.stamm@camunda.com>
Date: Thu, 7 Mar 2024 14:02:08 +0100
Subject: [PATCH] fix(VariableResolver): correctly filter out already existing
 properties

related to https://github.com/camunda/camunda-modeler/issues/4139
---
 lib/base/VariableResolver.js               |  4 +-
 test/fixtures/zeebe/mappings/mappings.bpmn | 75 ----------------------
 test/fixtures/zeebe/mappings/merging.bpmn  | 38 ++++++++++-
 test/spec/zeebe/Mappings.spec.js           | 23 +++++++
 4 files changed, 62 insertions(+), 78 deletions(-)
 delete mode 100644 test/fixtures/zeebe/mappings/mappings.bpmn

diff --git a/lib/base/VariableResolver.js b/lib/base/VariableResolver.js
index 3c051ff..83a9dd1 100644
--- a/lib/base/VariableResolver.js
+++ b/lib/base/VariableResolver.js
@@ -309,9 +309,9 @@ function merge(property, target, source) {
     target[property] = [];
   }
 
-  const originToAdd = source[property].filter(o => !target.origin.includes(o));
+  const propertiesToAdd = source[property].filter(o => !target[property].includes(o));
 
-  target[property].push(...originToAdd);
+  target[property].push(...propertiesToAdd);
 }
 
 export function mergeEntries(target, source, visited = []) {
diff --git a/test/fixtures/zeebe/mappings/mappings.bpmn b/test/fixtures/zeebe/mappings/mappings.bpmn
deleted file mode 100644
index 9c475c5..0000000
--- a/test/fixtures/zeebe/mappings/mappings.bpmn
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1sdo7dc" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.6.0-rc.1" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0">
-  <bpmn:process id="Process_1pynl9y" isExecutable="true">
-    <bpmn:serviceTask id="ServiceTask_1" name="Task 1">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:output source="=globalVariable" target="variable1" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="genericTypes" name="Native Types">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:output source="={&#10;  number: 1,&#10;  boolean: true,&#10;  string: &#34;foo&#34;,&#10;  null: null&#10;}" target="genericTypes" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="mergeContext" name="Merging Contexts">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:output source="=if &#10;  foo &#10;then&#10;  {a: globalVariable}&#10;else&#10;  {b: globalVariable}" target="mergedContext" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0vmhb76" name="Task 2">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:output source="=variable1" target="variable2" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_00jy8b0" name="Task 3">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:output source="=variable2" target="variable3" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="scopedContext" name="Scoped Context">
-      <bpmn:extensionElements>
-        <zeebe:ioMapping>
-          <zeebe:input source="={&#10;  foo: &#34;bar&#34;&#10;}" target="scopedContext" />
-        </zeebe:ioMapping>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1pynl9y">
-      <bpmndi:BPMNShape id="Activity_0sb1ibj_di" bpmnElement="ServiceTask_1">
-        <dc:Bounds x="160" y="70" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_02flowt" bpmnElement="Activity_0vmhb76">
-        <dc:Bounds x="340" y="70" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1wz0ejs" bpmnElement="Activity_00jy8b0">
-        <dc:Bounds x="520" y="70" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_01ho8di_di" bpmnElement="mergeContext">
-        <dc:Bounds x="160" y="310" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0kwek3i" bpmnElement="genericTypes">
-        <dc:Bounds x="160" y="190" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1n52sm3_di" bpmnElement="scopedContext">
-        <dc:Bounds x="160" y="430" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
diff --git a/test/fixtures/zeebe/mappings/merging.bpmn b/test/fixtures/zeebe/mappings/merging.bpmn
index 4cee764..44d27ed 100644
--- a/test/fixtures/zeebe/mappings/merging.bpmn
+++ b/test/fixtures/zeebe/mappings/merging.bpmn
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1noegy9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.10.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1noegy9" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.21.0-rc.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0">
   <bpmn:collaboration id="Collaboration_0val525">
     <bpmn:participant id="Participant_1" processRef="Process_1" />
     <bpmn:participant id="Participant_2" processRef="Process_2" />
+    <bpmn:participant id="Participant_3" processRef="Process_3" />
   </bpmn:collaboration>
   <bpmn:process id="Process_1" isExecutable="true">
     <bpmn:serviceTask id="mergeContext" name="Merging Contexts">
@@ -36,6 +37,34 @@
       </bpmn:extensionElements>
     </bpmn:serviceTask>
   </bpmn:process>
+  <bpmn:process id="Process_3" isExecutable="false">
+    <bpmn:serviceTask id="Activity_1d3l9mi" name="20 Mappings">
+      <bpmn:extensionElements>
+        <zeebe:ioMapping>
+          <zeebe:output source="=a" target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+          <zeebe:output target="foo" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+    </bpmn:serviceTask>
+  </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0val525">
       <bpmndi:BPMNShape id="Participant_0o063cf_di" bpmnElement="Participant_1" isHorizontal="true">
@@ -59,6 +88,13 @@
         <dc:Bounds x="510" y="460" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Participant_10nlgk8_di" bpmnElement="Participant_3" isHorizontal="true">
+        <dc:Bounds x="160" y="680" width="600" height="250" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1lvesqk_di" bpmnElement="Activity_1d3l9mi">
+        <dc:Bounds x="210" y="760" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/test/spec/zeebe/Mappings.spec.js b/test/spec/zeebe/Mappings.spec.js
index 1ca1bad..18dff03 100644
--- a/test/spec/zeebe/Mappings.spec.js
+++ b/test/spec/zeebe/Mappings.spec.js
@@ -247,6 +247,29 @@ describe('ZeebeVariableResolver - Variable Mappings', function() {
       ]);
     }));
 
+
+    it('should handle many merge operations', inject(async function(variableResolver, elementRegistry) {
+
+      // given
+      const root = elementRegistry.get('Participant_3');
+
+      createProvider({
+        variables: [],
+        variableResolver
+      });
+
+      // when
+      // this failed previously in an infinite loop, cf. https://github.com/camunda/camunda-modeler/issues/4139
+      const variables = await variableResolver.getVariablesForElement(root.businessObject.processRef);
+
+      // then
+      expect(variables).to.variableEqual([
+        {
+          name: 'foo'
+        }
+      ]);
+    }));
+
   });