@5minds/node-red-contrib-processcube 1.6.3 → 1.6.4-feature-d974c2-m5xp01xv

package/docker-compose.yml

@@ -8,6 +8,7 @@ services:
     environment:
       - TZ=Europe/Berlin
       - ENGINE_URL=http://engine:8000
+      - TOPIC=TopicFromENV
     volumes:
       - ./nodered/:/data/
     depends_on:

package/externaltask-input.html

@@ -6,6 +6,7 @@
             name: { value: '' },
             engine: { value: '', type: 'processcube-engine-config' },
             topic: { value: '' },
+            topicType: { value: '' },
             workerConfig: { value: '{}'},
             workerConfigType: { value: 'json'}
         },
@@ -23,6 +24,14 @@
 
             $('#node-input-workerConfig').typedInput('value', this.workerConfig);
             $('#node-input-workerConfig').typedInput('type', this.workerConfigType);
+
+            $('#node-input-topic').typedInput({
+                default: 'str',
+                types: ['str', 'env'],
+            });
+
+            $('#node-input-topic').typedInput('value', this.topic);
+            $('#node-input-topic').typedInput('type', this.topicType);
         },
         oneditsave: function () {
             this.workerConfig = $('#node-input-workerConfig').typedInput('value');
@@ -31,6 +40,8 @@
                 $('#node-input-workerConfig').typedInput('value', '{}');
             }
             this.workerConfigType = $('#node-input-workerConfig').typedInput('type');
+            this.topic = $('#node-input-topic').typedInput('value');
+            this.topicType = $('#node-input-topic').typedInput('type');
         },
     });
 </script>

package/externaltask-input.js

@@ -121,10 +121,11 @@ module.exports = function (RED) {
                 });
             };
 
-            let options = RED.util.evaluateNodeProperty(config.workerConfig, 'json', node);
+            let options = RED.util.evaluateNodeProperty(config.workerConfig, config.workerConfigType, node);
+            let topic =  RED.util.evaluateNodeProperty(config.topic, config.topicType, node)
 
             client.externalTasks
-                .subscribeToExternalTaskTopic(config.topic, etwCallback, options)
+                .subscribeToExternalTaskTopic(topic, etwCallback, options)
                 .then(async (externalTaskWorker) => {
                     node.status({ fill: 'blue', shape: 'ring', text: 'subcribed' });
 

package/message-event-trigger.js

@@ -15,7 +15,7 @@ module.exports = function (RED) {
             node.engine.engineClient.events
                 .triggerMessageEvent(config.messagename, {
                     processInstanceId: msg.processinstanceid,
-                    payload: msg.payload,
+                    payload: { payload: msg.payload },
                 })
                 .then((result) => {
                     msg.payload = result;

package/nodered/flows.json

@@ -507,6 +507,32 @@
         "w": 552,
         "h": 142
     },
+    {
+        "id": "73ca179de59cdabf",
+        "type": "group",
+        "z": "a23d2e782beb66f4",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "3283986789f6f865",
+            "f2b869714547df91",
+            "7a24dd57f7964be1",
+            "9be410342a64e57a",
+            "7bc885294b6f6b08",
+            "412d03bddecd4fd4"
+        ],
+        "x": 34,
+        "y": 739,
+        "w": 682,
+        "h": 202
+    },
     {
         "id": "42e6796dddd9d4db",
         "type": "processcube-engine-config",
@@ -824,6 +850,101 @@
         "y": 540,
         "wires": []
     },
+    {
+        "id": "3283986789f6f865",
+        "type": "externaltask-input",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "TopicFromENV",
+        "engine": "42e6796dddd9d4db",
+        "topic": "TOPIC",
+        "topicType": "env",
+        "workerConfig": "{}",
+        "workerConfigType": "json",
+        "x": 140,
+        "y": 840,
+        "wires": [
+            [
+                "f2b869714547df91"
+            ]
+        ]
+    },
+    {
+        "id": "f2b869714547df91",
+        "type": "delay",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "",
+        "pauseType": "delay",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 400,
+        "y": 840,
+        "wires": [
+            [
+                "7a24dd57f7964be1"
+            ]
+        ]
+    },
+    {
+        "id": "7a24dd57f7964be1",
+        "type": "externaltask-output",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "",
+        "x": 600,
+        "y": 840,
+        "wires": []
+    },
+    {
+        "id": "9be410342a64e57a",
+        "type": "externaltask-error",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "",
+        "error": "",
+        "x": 510,
+        "y": 900,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7bc885294b6f6b08",
+        "type": "catch",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 320,
+        "y": 900,
+        "wires": [
+            [
+                "9be410342a64e57a"
+            ]
+        ]
+    },
+    {
+        "id": "412d03bddecd4fd4",
+        "type": "comment",
+        "z": "a23d2e782beb66f4",
+        "g": "73ca179de59cdabf",
+        "name": "External Task with Topic from ENV",
+        "info": "",
+        "x": 200,
+        "y": 780,
+        "wires": []
+    },
     {
         "id": "82533b02fb9a9f04",
         "type": "comment",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.6.3",
+    "version": "1.6.4-feature-d974c2-m5xp01xv",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processes/External-Task-Env-Topic.bpmn

@@ -0,0 +1,57 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="External-Task-Env-Topic_Definition" targetNamespace="http://bpmn.io/schema/bpmn" exporter="5Minds Studio" exporterVersion="1">
+  <bpmn:collaboration id="Collaboration_1cidyxu" name="">
+    <bpmn:participant id="Participant_0px403d" name="External-Task-Env-Topic" processRef="External-Task-Env-Topic_Process" />
+  </bpmn:collaboration>
+  <bpmn:process id="External-Task-Env-Topic_Process" name="External-Task-Env-Topic" isExecutable="true">
+    <bpmn:laneSet>
+      <bpmn:lane id="Lane_1xzf0d3">
+        <bpmn:flowNodeRef>StartEvent_1</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_0altset</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0oql7b5</bpmn:flowNodeRef>
+      </bpmn:lane>
+    </bpmn:laneSet>
+    <bpmn:startEvent id="StartEvent_1" name="Start">
+      <bpmn:outgoing>Flow_1y2qxv2</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_1y2qxv2" sourceRef="StartEvent_1" targetRef="Activity_0oql7b5" />
+    <bpmn:endEvent id="Event_0altset">
+      <bpmn:incoming>Flow_01qqshn</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_01qqshn" sourceRef="Activity_0oql7b5" targetRef="Event_0altset" />
+    <bpmn:serviceTask id="Activity_0oql7b5" name="External Task with topic from ENV" camunda:type="external" camunda:topic="TopicFromENV">
+      <bpmn:incoming>Flow_1y2qxv2</bpmn:incoming>
+      <bpmn:outgoing>Flow_01qqshn</bpmn:outgoing>
+    </bpmn:serviceTask>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1cidyxu">
+      <bpmndi:BPMNShape id="Participant_0px403d_di" bpmnElement="Participant_0px403d" isHorizontal="true">
+        <dc:Bounds x="5" y="4" width="885" height="346" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Lane_1xzf0d3_di" bpmnElement="Lane_1xzf0d3" isHorizontal="true">
+        <dc:Bounds x="35" y="4" width="855" height="346" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1_di" bpmnElement="StartEvent_1">
+        <dc:Bounds x="92" y="152" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="98" y="195" width="24" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0altset_di" bpmnElement="Event_0altset">
+        <dc:Bounds x="332" y="152" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1hcksxj_di" bpmnElement="Activity_0oql7b5">
+        <dc:Bounds x="180" y="130" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1y2qxv2_di" bpmnElement="Flow_1y2qxv2">
+        <di:waypoint x="128" y="170" />
+        <di:waypoint x="180" y="170" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_01qqshn_di" bpmnElement="Flow_01qqshn">
+        <di:waypoint x="280" y="170" />
+        <di:waypoint x="332" y="170" />
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>

package/usertask-output.js

@@ -7,7 +7,12 @@ module.exports = function (RED) {
             if (msg.payload.userTask) {
                 const flowNodeInstanceId = msg.payload.userTask.flowNodeInstanceId;
 
-                const userTaskResult = RED.util.evaluateNodeProperty(config.result, config.result_type, node, msg);
+                let userTaskResult = RED.util.evaluateNodeProperty(config.result, config.result_type, node, msg);
+
+                // remote msg and format from result
+                delete userTaskResult.format;
+                delete userTaskResult.msg;
+
 
                 node.engine = RED.nodes.getNode(config.engine);