@camunda/task-testing 0.2.1 → 0.2.3

package/dist/index.js

@@ -362,30 +362,18 @@ __webpack_require__.r(__webpack_exports__);
  * except in compliance with the MIT License.
  */
 
-/**
- * @import {
- * TaskExecutionApi,
- * TaskExecutionResult,
- * TaskExecutionError,
- * TaskExecutionStatus } from './types';
- */
+
+const INTERVAL_MS = 1000;
 
 /**
- * @import {
- * CreateProcessInstanceResponse,
- * DeployResourceResponse
- * } from '@camunda8/sdk/dist/c8/lib/C8Dto';
+ * @import { TaskExecutionApi, TaskExecutionResult, TaskExecutionError, TaskExecutionStatus } from './types';
  */
 
-
-const INTERVAL_MS = 1000;
-
 /**
  * Emits:
  * - `taskExecution.status.changed` with one of {@link TaskExecutionStatus}
  * - `taskExecution.finished` with {@link TaskExecutionResult}
  * - `taskExecution.error` with {@link TaskExecutionError}
- * - `taskExecution.interrupted` when execution is interrupted by switching focus
  */
 class TaskExecution extends (events__WEBPACK_IMPORTED_MODULE_0___default()) {
   /**
@@ -403,8 +391,11 @@ class TaskExecution extends (events__WEBPACK_IMPORTED_MODULE_0___default()) {
     this._status = 'idle';
     const eventBus = injector.get('eventBus');
     eventBus.on(['selection.changed', 'commandStack.changed'], () => {
+      if (this._status !== 'idle') {
+        console.log('Interrupting task execution in TaskExecution');
+        this.emit('taskExecution.interrupted');
+      }
       this.cancelTaskExecution();
-      this.emit('taskExecution.interrupted');
     });
   }
 
@@ -551,11 +542,14 @@ class TaskExecution extends (events__WEBPACK_IMPORTED_MODULE_0___default()) {
 /**
  * Get the process ID from the deployment response.
  *
- * @param {DeployResourceResponse} response
+ * @param {import('./types').DeploymentResponse} [response]
  *
  * @returns {string|null} The process ID or null if not found.
  */
 function getProcessId(response) {
+  if (!response) {
+    return null;
+  }
   const {
     processes = []
   } = response;
@@ -570,11 +564,14 @@ function getProcessId(response) {
 /**
  * Get the process instance key from the response.
  *
- * @param {CreateProcessInstanceResponse} response
+ * @param {import('./types').StartInstanceResponse} [response]
  *
  * @returns {string|null} The process instance key or null if not found.
  */
 function getProcessInstanceKey(response) {
+  if (!response) {
+    return null;
+  }
   const {
     processInstanceKey
   } = response;
@@ -1064,7 +1061,7 @@ function OutputBanner({
     } : {};
     return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(ErrorBanner, {
       title: "Task execution failed",
-      description: `Incident: ${output.incident.type}`,
+      description: `Incident: ${output.incident.errorType}`,
       ...action
     });
   }
@@ -1352,7 +1349,8 @@ const NO_ELEMENT_TEXT = 'Select a task to start testing';
  * @param {import('../../types').Config|undefined} [props.config]
  * @param {Function} [props.onConfigChanged=() => {}]
  * @param {string} [props.operateBaseUrl]
- * @param {Function} [props.onTaskExecution=() => {}]
+ * @param {Function} [props.onTaskExecutionStarted=() => {}]
+ * @param {Function} [props.onTaskExecutionFinished=() => {}]
  * @param {Function} [props.onTaskExecutionInterrupted=() => {}]
  */
 function TaskTesting({
@@ -1366,7 +1364,8 @@ function TaskTesting({
   config,
   onConfigChanged = () => {},
   operateBaseUrl,
-  onTaskExecution = () => {},
+  onTaskExecutionStarted = () => {},
+  onTaskExecutionFinished = () => {},
   onTaskExecutionInterrupted = () => {}
 }) {
   /**
@@ -1503,17 +1502,22 @@ function TaskTesting({
         ...output,
         operateUrl
       });
+      onTaskExecutionFinished(element, output);
+    };
+    const handleInterrupted = () => {
+      console.log('interrrrrrupted');
+      onTaskExecutionInterrupted();
     };
     taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur = taskExecutionRef.current) === null || _taskExecutionRef$cur === void 0 || _taskExecutionRef$cur.on('taskExecution.finished', handleFinished);
     taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur2 = taskExecutionRef.current) === null || _taskExecutionRef$cur2 === void 0 || _taskExecutionRef$cur2.on('taskExecution.status.changed', handleStatusChange);
     taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur3 = taskExecutionRef.current) === null || _taskExecutionRef$cur3 === void 0 || _taskExecutionRef$cur3.on('taskExecution.error', handleError);
-    taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur4 = taskExecutionRef.current) === null || _taskExecutionRef$cur4 === void 0 || _taskExecutionRef$cur4.on('taskExecution.interrupted', () => onTaskExecutionInterrupted());
+    taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur4 = taskExecutionRef.current) === null || _taskExecutionRef$cur4 === void 0 || _taskExecutionRef$cur4.on('taskExecution.interrupted', handleInterrupted);
     return () => {
       if (taskExecutionRef.current) {
         taskExecutionRef.current.off('taskExecution.finished', handleFinished);
         taskExecutionRef.current.off('taskExecution.status.changed', handleStatusChange);
         taskExecutionRef.current.off('taskExecution.error', handleError);
-        taskExecutionRef.current.off('taskExecution.interrupted', () => onTaskExecutionInterrupted());
+        taskExecutionRef.current.off('taskExecution.interrupted', handleInterrupted);
       }
     };
   }, [element]);
@@ -1547,14 +1551,17 @@ function TaskTesting({
     if (!isConnectionConfigured || inputError || !element || !taskExecutionRef.current || !elementConfigRef.current) {
       return;
     }
+    onTaskExecutionStarted(element);
     const inputConfig = await elementConfigRef.current.getInputConfigForElement(element);
     elementConfigRef.current.setOutputConfigForElement(element, null);
     taskExecutionRef.current.executeTask(element.id, JSON.parse(inputConfig));
-    onTaskExecution();
   };
   const handleCancelTaskExecution = () => {
-    if (taskExecutionRef.current) {
-      taskExecutionRef.current.cancelTaskExecution();
+    var _taskExecutionRef$cur5;
+    taskExecutionRef === null || taskExecutionRef === void 0 || (_taskExecutionRef$cur5 = taskExecutionRef.current) === null || _taskExecutionRef$cur5 === void 0 || _taskExecutionRef$cur5.cancelTaskExecution();
+    if (output !== null && output !== void 0 && output.operateUrl && Object.keys(output).length === 1) {
+      var _elementConfigRef$cur7;
+      elementConfigRef === null || elementConfigRef === void 0 || (_elementConfigRef$cur7 = elementConfigRef.current) === null || _elementConfigRef$cur7 === void 0 || _elementConfigRef$cur7.setOutputConfigForElement(element, null);
     }
   };
   const handleResetOutput = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(() => {
@@ -2831,8 +2838,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var bpmn_js_lib_util_ModelUtil__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! bpmn-js/lib/util/ModelUtil */ "./node_modules/bpmn-js/lib/util/ModelUtil.js");
 /* harmony import */ var _util_CachedValue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./util/CachedValue */ "./node_modules/@bpmn-io/variable-resolver/lib/base/util/CachedValue.js");
 /* harmony import */ var _util_scopeUtil__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./util/scopeUtil */ "./node_modules/@bpmn-io/variable-resolver/lib/base/util/scopeUtil.js");
-/* harmony import */ var min_dash__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! min-dash */ "./node_modules/min-dash/dist/index.esm.js");
-
 
 
 
@@ -2851,6 +2856,7 @@ __webpack_require__.r(__webpack_exports__);
  * @typedef {AdditionalVariable} ProcessVariable
  * @property {Array<ModdleElement>} origin
  * @property {ModdleElement} scope
+ * @property {Array<Object>} provider
  */
 
 /**
@@ -2883,7 +2889,7 @@ class BaseVariableResolver {
   }
 
   /**
-   * To be implemented by super class. This should be an instance of `getProcessVariables` from `@bpmn-io/extract-process-variables`,
+   * To be implemented by a subclass. This should be an instance of `getProcessVariables` from `@bpmn-io/extract-process-variables`,
    * either C7 or C8.
    *
    * @returns {Promise<Array<ProcessVariable>>}
@@ -3092,24 +3098,40 @@ class BaseVariableResolver {
     const root = getRootElement(bo);
     const allVariables = await this.getProcessVariables(root);
 
-    // keep only unique variables based on name property
-    const uniqueVariables = (0,min_dash__WEBPACK_IMPORTED_MODULE_3__.uniqueBy)('name', allVariables.reverse());
-
     // (1) get variables for given scope
-    var scopeVariables = uniqueVariables.filter(function(variable) {
+    var scopeVariables = allVariables.filter(function(variable) {
       return variable.scope.id === bo.id;
     });
 
     // (2) get variables for parent scopes
     var parents = (0,_util_scopeUtil__WEBPACK_IMPORTED_MODULE_1__.getParents)(bo);
 
-    var parentsScopeVariables = uniqueVariables.filter(function(variable) {
+    var parentsScopeVariables = allVariables.filter(function(variable) {
       return parents.find(function(parent) {
         return parent.id === variable.scope.id;
       });
     });
 
-    return [ ...scopeVariables, ...parentsScopeVariables ];
+    const reversedVariables = [ ...scopeVariables, ...parentsScopeVariables ].reverse();
+
+    const seenNames = new Set();
+
+    return reversedVariables.filter(variable => {
+
+      // if external variable, keep
+      if (variable.provider.find(extractor => extractor !== this._baseExtractor)) {
+        return true;
+      }
+
+      // if not external, keep only the first occurrence of each name
+      if (!seenNames.has(variable.name)) {
+        seenNames.add(variable.name);
+
+        return true;
+      }
+
+      return false;
+    });
   }
 }