fix: result variable with output mapping

bpmn-io · Dec 11, 2024 · 43276ba · 43276ba
1 parent 8594822
commit 43276ba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/zeebe/VariableResolver.js b/lib/zeebe/VariableResolver.js
@@ -1,6 +1,6 @@
 import { getProcessVariables } from '@bpmn-io/extract-process-variables/zeebe';
 import { BaseVariableResolver } from '../base/VariableResolver';
-import { parseVariables } from './util/feelUtility';
+import { parseVariables, getScriptExpression, getIoExpression } from './util/feelUtility';
 import {
   getBusinessObject,
   is
@@ -26,6 +26,22 @@ export default class ZeebeVariableResolver extends BaseVariableResolver {
 
     const bo = getBusinessObject(element);
 
+    // filter based on resultVariable if output exists.
+
+    const outputExists = variables.some(variable =>
+      getIoExpression(variable, variable.origin[0]) && variable.scope === bo
+    );
+
+    if (outputExists && !moddleElement) {
+
+      // remove script variable if exists from variables.
+      const filteredVariables = variables.filter(
+        variable => !getScriptExpression(variable, variable.origin[0])
+      );
+
+      return filteredVariables;
+    }
+
     if (!moddleElement) {
       return variables;
     }

diff --git a/lib/zeebe/util/feelUtility.js b/lib/zeebe/util/feelUtility.js
@@ -179,7 +179,7 @@ function getExpressionDetails(variable, origin) {
  * @param {djs.model.Base} origin
  * @returns { expression: String}
  */
-function getIoExpression(variable, origin) {
+export function getIoExpression(variable, origin) {
   const ioMapping = getExtensionElementsList(origin, 'zeebe:IoMapping')[0];
 
   if (!ioMapping) {
@@ -215,7 +215,7 @@ function getIoExpression(variable, origin) {
  * @param {djs.model.Base} origin
  * @returns { expression: String}
  */
-function getScriptExpression(variable, origin) {
+export function getScriptExpression(variable, origin) {
   const script = getExtensionElementsList(origin, 'zeebe:Script')[0];
 
   if (!script) {