@5minds/node-red-contrib-processcube 0.3.5-feature-1092e6-lxhvslzu → 0.3.5-feature-58d0b1-lxi3af5i

package/nodered/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@5minds/node-red-contrib-processcube": "file:..",
-    "@5minds/node-red-dashboard-2-processcube-dynamic-form": "file:../../../../moellenbeck/reps/node-red-dashboard-2-ui-example",
+    "@5minds/node-red-dashboard-2-processcube-dynamic-form": "file:../../node-red-dashboard-2-processcube-dynamic-form",
     "@flowfuse/node-red-dashboard": "^1.11.1",
     "node-red": "^3.1.10",
     "node-red-debugger": "^1.1.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.3.5-feature-1092e6-lxhvslzu",
+    "version": "0.3.5-feature-58d0b1-lxi3af5i",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [
@@ -32,6 +32,7 @@
             "externaltaskOutput": "externaltask-output.js",
             "externaltaskError": "externaltask-error.js",
             "processStart": "process-start.js",
+            "UserTaskNewListener": "usertask-new-listener.js",
             "UserTaskInput": "usertask-input.js",
             "UserTaskOutput": "usertask-output.js",
             "processcubeEngineConfig": "processcube-engine-config.js"

package/processes/SampleUserTask.bpmn

@@ -7,8 +7,9 @@
     <bpmn:laneSet>
       <bpmn:lane id="Lane_1xzf0d3" name="Lane">
         <bpmn:flowNodeRef>StartEvent_1</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_1eeiwx4</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0ljiko7</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_1eeiwx4</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0glvmjk</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:startEvent id="StartEvent_1" name="Start">
@@ -20,10 +21,6 @@
       <bpmn:outgoing>Flow_1h0giih</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:sequenceFlow id="Flow_1h0giih" sourceRef="StartEvent_1" targetRef="Activity_0ljiko7" />
-    <bpmn:endEvent id="Event_1eeiwx4">
-      <bpmn:incoming>Flow_1laqnja</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_1laqnja" sourceRef="Activity_0ljiko7" targetRef="Event_1eeiwx4" />
     <bpmn:userTask id="Activity_0ljiko7" name="Hello world">
       <bpmn:extensionElements>
         <camunda:formData>
@@ -35,20 +32,35 @@
             <camunda:value id="value_02" name="Value 02" />
           </camunda:formField>
           <camunda:formField id="boolean_id" label="Boolean Label" type="boolean" />
-          <camunda:formField id="customer_01" label="Custom_01" type="v-text-field" />
+          <camunda:formField id="customer_01" label="Custom_01" type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1h0giih</bpmn:incoming>
-      <bpmn:outgoing>Flow_1laqnja</bpmn:outgoing>
+      <bpmn:outgoing>Flow_06e5qq4</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_06e5qq4" sourceRef="Activity_0ljiko7" targetRef="Activity_0glvmjk" />
+    <bpmn:endEvent id="Event_1eeiwx4">
+      <bpmn:incoming>Flow_02dyxfy</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_02dyxfy" sourceRef="Activity_0glvmjk" targetRef="Event_1eeiwx4" />
+    <bpmn:userTask id="Activity_0glvmjk" name="foo">
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="FormField_BeDNcjma" label="Label 1" type="string" />
+          <camunda:formField id="FormField_Qv2INvg4" label="Label 2" type="string" />
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_06e5qq4</bpmn:incoming>
+      <bpmn:outgoing>Flow_02dyxfy</bpmn:outgoing>
     </bpmn:userTask>
   </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="435" height="346" />
+        <dc:Bounds x="5" y="4" width="665" height="346" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1xzf0d3_di" bpmnElement="Lane_1xzf0d3" isHorizontal="true">
-        <dc:Bounds x="35" y="4" width="405" height="346" />
+        <dc:Bounds x="35" y="4" width="635" height="346" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1_di" bpmnElement="StartEvent_1">
         <dc:Bounds x="92" y="152" width="36" height="36" />
@@ -56,20 +68,28 @@
           <dc:Bounds x="98" y="195" width="24" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1eeiwx4_di" bpmnElement="Event_1eeiwx4">
-        <dc:Bounds x="332" y="152" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1uodwbi_di" bpmnElement="Activity_0ljiko7">
         <dc:Bounds x="180" y="130" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1eeiwx4_di" bpmnElement="Event_1eeiwx4">
+        <dc:Bounds x="482" y="152" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0vcm0z0_di" bpmnElement="Activity_0glvmjk">
+        <dc:Bounds x="330" y="130" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1h0giih_di" bpmnElement="Flow_1h0giih">
         <di:waypoint x="128" y="170" />
         <di:waypoint x="180" y="170" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1laqnja_di" bpmnElement="Flow_1laqnja">
+      <bpmndi:BPMNEdge id="Flow_06e5qq4_di" bpmnElement="Flow_06e5qq4">
         <di:waypoint x="280" y="170" />
-        <di:waypoint x="332" y="170" />
+        <di:waypoint x="330" y="170" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_02dyxfy_di" bpmnElement="Flow_02dyxfy">
+        <di:waypoint x="430" y="170" />
+        <di:waypoint x="482" y="170" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

package/usertask-input.html

@@ -4,9 +4,10 @@
         color: '#00aed7',
         defaults: {
             name: {value: ""},
-            engine: {value: "", type: "processcube-engine-config"}
+            engine: {value: "", type: "processcube-engine-config"},
+            multisend: {value: false}
         },
-        inputs: 0,
+        inputs: 1,
         outputs: 1,
         icon: "font-awesome/fa-envelope-open",
         label: function() {
@@ -24,6 +25,13 @@
         <label for="node-input-engine"><i class="fa fa-tag"></i> Engine-URL</label>
         <input type="text" id="node-input-engine" placeholder="http://engine:8000">
     </div>
+    <div class="form-row" style="display:flex; margin-bottom: 3px;">
+        <label for="node-input-multisend" style="vertical-align:top"><i class="fa fa-list-alt"></i> Send multi</label>
+        <div>
+            <input type="checkbox" checked id="node-input-multisend" style="display: inline-block; width: auto; margin: 0px 0px 0px 4px;">
+            <label style="width:auto" for="node-input-multisend">Send one output of each usertask input?</label>
+        </div>
+    </div>
 </script>
 
 <script type="text/html" data-help-name="usertask-input">

package/usertask-input.js

@@ -37,26 +37,27 @@ module.exports = function(RED) {
             eventEmitter = flowContext.get('emitter');
         }
 
-        client.userTasks.onUserTaskWaiting((userTaskWaitingNotification) => {
-            console.log(`UserTask with id ${userTaskWaitingNotification.flowNodeInstanceId} is waiting.`);
+        node.on("close", async () => {
+            client.dispose();
+            client = null;
+        });
 
-            // Abschließend mit - client.userTasks.finishUserTask(waitingUserTask?.flowNodeInstanceId, sampleResult)
+        node.on('input', async function(msg) {
 
-            // flowNodeInstanceId
-            // processModelName
-            // flowNodeId
-            client.userTasks.query({
-                flowNodeInstanceId: userTaskWaitingNotification.flowNodeInstanceId,
-                processModelId: userTaskWaitingNotification.processModelId,
-                flowNodeId: userTaskWaitingNotification.flowNodeId,
-            }).then((matchingFlowNodes) => {
+            client.userTasks.query(msg.payload).then((matchingFlowNodes) => {
                 if (matchingFlowNodes && matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
                     userTask = matchingFlowNodes.userTasks[0];
 
-                    node.send({ payload: {userTask: userTask }, "_flowNodeInstanceId": userTaskWaitingNotification.flowNodeInstanceId});
+                    node.send({ payload: {userTask: userTask } });
                 } else {
-                    node.send({ payload: matchingFlowNodes.userTasks });
-                }
+                    if (config.multisend) {
+                        matchingFlowNodes.userTasks.forEach((userTask) => {
+                            node.send({ payload: { userTask: userTask } });
+                        });
+                    } else {
+                        node.send({ payload: { userTasks: matchingFlowNodes.userTasks } });
+                    }
+                 }
             });
         });
     }

package/usertask-new-listener.html

@@ -0,0 +1,39 @@
+<script type="text/javascript">
+    RED.nodes.registerType('usertask-new-listener',{
+        category: 'ProcessCube',
+        color: '#00aed7',
+        defaults: {
+            name: {value: ""},
+            engine: {value: "", type: "processcube-engine-config"},
+            multisend: {value: false}
+        },
+        inputs: 0,
+        outputs: 1,
+        icon: "font-awesome/fa-envelope-open",
+        label: function() {
+            return this.name || "usertask-new-listener";
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="usertask-new-listener">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-engine"><i class="fa fa-tag"></i> Engine-URL</label>
+        <input type="text" id="node-input-engine" placeholder="http://engine:8000">
+    </div>
+    <div class="form-row" style="display:flex; margin-bottom: 3px;">
+        <label for="node-input-multisend" style="vertical-align:top"><i class="fa fa-list-alt"></i> Send multi</label>
+        <div>
+            <input type="checkbox" checked id="node-input-multisend" style="display: inline-block; width: auto; margin: 0px 0px 0px 4px;">
+            <label style="width:auto" for="node-input-multisend">Send one output of each usertask input?</label>
+        </div>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="usertask-input">
+    <p>A node which subscribes to an User Task of https://processcube.io</p>
+</script>

package/usertask-new-listener.js

@@ -0,0 +1,44 @@
+const process = require('process');
+const EventEmitter = require('node:events');
+
+const engine_client = require('@5minds/processcube_engine_client');
+
+module.exports = function(RED) {
+    function UserTaskNewListener(config) {
+        RED.nodes.createNode(this,config);
+        var node = this;
+        var msgCounter = 0;
+        var flowContext = node.context().flow;
+        var nodeContext = node.context();
+
+        this.engine = this.server = RED.nodes.getNode(config.engine);
+
+        const engineUrl = this.engine?.url || process.env.ENGINE_URL || 'http://engine:8000';
+
+        var client = nodeContext.get('client');
+
+        if (!client) {
+            nodeContext.set('client', new engine_client.EngineClient(engineUrl));
+            client = nodeContext.get('client');
+        }   
+
+        var eventEmitter = flowContext.get('emitter');
+
+        if (!eventEmitter) {
+            flowContext.set('emitter', new EventEmitter());
+            eventEmitter = flowContext.get('emitter');
+        }
+
+        node.on("close", async () => {
+            client.dispose();
+            client = null;
+        });
+
+        client.userTasks.onUserTaskWaiting((userTaskWaitingNotification) => {
+            console.log(`UserTask with id ${userTaskWaitingNotification.flowNodeInstanceId} is waiting.`);
+
+            node.send({ payload: { flowNodeInstanceId: userTaskWaitingNotification.flowNodeInstanceId } });
+        });
+    }
+    RED.nodes.registerType("usertask-new-listener", UserTaskNewListener);
+}

package/usertask-output.js

@@ -31,13 +31,18 @@ module.exports = function(RED) {
         }
 
         node.on('input', function(msg) {
-            console.log(`Try to finsih UserTask with id ${msg._flowNodeInstanceId}.`);
-
-            const flowNodeInstanceId = msg._flowNodeInstanceId;
-
-            client.userTasks.finishUserTask(flowNodeInstanceId, msg.payload).then(() => {
-                console.log(`UserTask with id ${flowNodeInstanceId} finished.`);
-            });
+            if (msg.payload.userTask) {
+                console.log(`Try to finsih UserTask with id ${msg.payload.userTask.flowNodeInstanceId}.`);
+
+                const flowNodeInstanceId = msg.payload.userTask.flowNodeInstanceId;
+                const userTaskResult = msg.payload.formData || {};
+
+                client.userTasks.finishUserTask(flowNodeInstanceId, userTaskResult).then(() => {
+                    console.log(`UserTask with id ${flowNodeInstanceId} finished.`);
+                });
+            } else {
+                console.log(`No UserTask found in message: ${JSON.stringify(msg.payload)}`);
+            }
         });     
     }