@5minds/node-red-contrib-processcube 0.5.7 → 0.6.0-develop-a016f3-lxu6osmc

package/externaltask-error.html

@@ -7,7 +7,7 @@
             error: {value:""}
         },
         inputs: 1,
-        outputs: 0,
+        outputs: 1,
         icon: "font-awesome/fa-exclamation-triangle",
         label: function() {
             return this.name || "externaltask-error";

package/externaltask-error.js

@@ -26,6 +26,8 @@ module.exports = function(RED) {
             };
 
             eventEmitter.emit(`error-${externalTaskId}`, msg.payload);
+            
+            node.send(msg);
         });     
     }
     RED.nodes.registerType("externaltask-error", ExternalTaskError);

package/externaltask-input.js

@@ -11,6 +11,16 @@ function showStatus(node, msgCounter) {
     }
 }
 
+function decrCounter(msgCounter) {
+    msgCounter--;
+
+    if (msgCounter < 0) {
+        msgCounter = 0;
+    }
+
+    return msgCounter;
+}
+
 module.exports = function(RED) {
     function ExternalTaskInput(config) {
         RED.nodes.createNode(this,config);
@@ -46,13 +56,14 @@ module.exports = function(RED) {
                     
                     // TODO: once ist 2x gebunden
                     eventEmitter.once(`finish-${externalTask.flowNodeInstanceId}`, (result) => {
-                        msgCounter--;
+                        msgCounter = decrCounter(msgCounter);
+
                         showStatus(node, msgCounter);
                         resolve(result);
                     });
 
                     eventEmitter.once(`error-${externalTask.flowNodeInstanceId}`, (msg) => {
-                        msgCounter--;
+                        msgCounter = decrCounter(msgCounter);
                         showStatus(node, msgCounter);
 
                         var result = msg.payload ? msg.payload : msg;

package/nodered/node-red-contrib-processcube-flows.json

@@ -106,7 +106,6 @@
             "1497b762d2ac1723",
             "493500b42d8d0f5b",
             "34984ae3f4e83b0b",
-            "8e2a2f993ee7156a",
             "eee38d2764bac337",
             "a4d741804929ba73",
             "915816cdb895af14",
@@ -161,12 +160,15 @@
             "5cc47f646e818d1e",
             "66b90cf83a531a75",
             "e002a108a6c7df75",
-            "2851b83de5fb070d"
+            "2851b83de5fb070d",
+            "a547ad5dcdd4613f",
+            "e98eecc53e433cfe",
+            "ed3c805cc0dc276c"
         ],
         "x": 34,
         "y": 559,
-        "w": 712,
-        "h": 142
+        "w": 952,
+        "h": 182
     },
     {
         "id": "02fef81e2129ea71",
@@ -379,6 +381,33 @@
         "visible": "true",
         "disabled": "false"
     },
+    {
+        "id": "973fe345c23a83a4",
+        "type": "ui-page",
+        "name": "DynamicTable",
+        "ui": "26a45d43c064bdb6",
+        "path": "/page4",
+        "icon": "home",
+        "layout": "grid",
+        "theme": "7175f012d8e51857",
+        "order": -1,
+        "className": "",
+        "visible": "true",
+        "disabled": "false"
+    },
+    {
+        "id": "99fb2417816969fd",
+        "type": "ui-group",
+        "name": "Table",
+        "page": "973fe345c23a83a4",
+        "width": "12",
+        "height": "1",
+        "order": -1,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false"
+    },
     {
         "id": "84f18cf9bf25b858",
         "type": "openApi-red",
@@ -1450,6 +1479,8 @@
         "g": "405f8c703368777c",
         "name": "",
         "engine": "42e6796dddd9d4db",
+        "query": "payload",
+        "force_send_array": true,
         "multisend": false,
         "x": 540,
         "y": 140,
@@ -1506,6 +1537,8 @@
         "g": "405f8c703368777c",
         "name": "",
         "engine": "d042a4c68f51d6ab",
+        "result": "payload",
+        "result_type": "msg",
         "x": 1020,
         "y": 140,
         "wires": [
@@ -1710,10 +1743,10 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\t    \"state\": \"suspended\"\t}",
-        "payloadType": "jsonata",
+        "payload": "{\"flowNodeInstanceId\":\"a84dfgh2b416-58f7-443f-bd38-c10ddcd776cb\"}",
+        "payloadType": "json",
         "x": 160,
-        "y": 660,
+        "y": 700,
         "wires": [
             [
                 "66b90cf83a531a75"
@@ -1727,12 +1760,16 @@
         "g": "b60e94a5f1ee2790",
         "name": "",
         "engine": "d042a4c68f51d6ab",
+        "query": "payload",
+        "query_type": "msg",
+        "force_send_array": false,
         "multisend": false,
         "x": 400,
-        "y": 660,
+        "y": 700,
         "wires": [
             [
-                "e002a108a6c7df75"
+                "e002a108a6c7df75",
+                "a547ad5dcdd4613f"
             ]
         ]
     },
@@ -1750,7 +1787,7 @@
         "statusVal": "",
         "statusType": "auto",
         "x": 640,
-        "y": 660,
+        "y": 700,
         "wires": []
     },
     {
@@ -1761,9 +1798,201 @@
         "name": "Abfragen von UserTasks",
         "info": "",
         "x": 170,
+        "y": 640,
+        "wires": []
+    },
+    {
+        "id": "a547ad5dcdd4613f",
+        "type": "dynamic-form",
+        "z": "fd3c725340de4f74",
+        "g": "b60e94a5f1ee2790",
+        "name": "",
+        "group": "5403f00c961584ab",
+        "order": 0,
+        "options": [
+            {
+                "label": "jljlkj"
+            },
+            {
+                "label": "another"
+            },
+            {
+                "label": "dsfjklsdj"
+            }
+        ],
+        "waiting_title": "Warten auf den Usertask...",
+        "waiting_info": "Der Usertask wird automatisch angezeigt, wenn ein entsprechender Task vorhanden ist.",
+        "width": 0,
+        "height": 0,
+        "outputs": 3,
+        "x": 640,
+        "y": 640,
+        "wires": [
+            [
+                "e98eecc53e433cfe"
+            ],
+            [
+                "ed3c805cc0dc276c"
+            ],
+            [
+                "ed3c805cc0dc276c"
+            ]
+        ]
+    },
+    {
+        "id": "e98eecc53e433cfe",
+        "type": "debug",
+        "z": "fd3c725340de4f74",
+        "g": "b60e94a5f1ee2790",
+        "name": "debug 25",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 860,
         "y": 600,
         "wires": []
     },
+    {
+        "id": "ed3c805cc0dc276c",
+        "type": "debug",
+        "z": "fd3c725340de4f74",
+        "g": "b60e94a5f1ee2790",
+        "name": "debug 26",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 880,
+        "y": 640,
+        "wires": []
+    },
+    {
+        "id": "a80d2f28ea46f22f",
+        "type": "inject",
+        "z": "fd3c725340de4f74",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 140,
+        "y": 840,
+        "wires": [
+            [
+                "e283d772578fb6d2"
+            ]
+        ]
+    },
+    {
+        "id": "09a463e42d3ce5b8",
+        "type": "dynamic-table",
+        "z": "fd3c725340de4f74",
+        "name": "",
+        "tableName": "",
+        "group": "99fb2417816969fd",
+        "order": 0,
+        "data": "payload.userTasks",
+        "data_type": "msg",
+        "options": [
+            {
+                "label": "action",
+                "condition": ""
+            },
+            {
+                "label": "another",
+                "condition": ""
+            }
+        ],
+        "columns": [
+            {
+                "label": "State",
+                "value": "state",
+                "type": "str"
+            }
+        ],
+        "width": 0,
+        "height": 0,
+        "outputs": 2,
+        "x": 560,
+        "y": 840,
+        "wires": [
+            [
+                "8c5309ae86d0cb66"
+            ],
+            [
+                "45208778372636d3"
+            ]
+        ]
+    },
+    {
+        "id": "e283d772578fb6d2",
+        "type": "usertask-input",
+        "z": "fd3c725340de4f74",
+        "name": "",
+        "engine": "d042a4c68f51d6ab",
+        "query": "{\"state\":\"suspended\"}",
+        "query_type": "json",
+        "force_send_array": true,
+        "multisend": false,
+        "x": 340,
+        "y": 840,
+        "wires": [
+            [
+                "09a463e42d3ce5b8"
+            ]
+        ]
+    },
+    {
+        "id": "8c5309ae86d0cb66",
+        "type": "debug",
+        "z": "fd3c725340de4f74",
+        "name": "debug 27",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 740,
+        "y": 780,
+        "wires": []
+    },
+    {
+        "id": "45208778372636d3",
+        "type": "debug",
+        "z": "fd3c725340de4f74",
+        "name": "debug 28",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 880,
+        "wires": []
+    },
     {
         "id": "0f5978f327b01bfb",
         "type": "ui-table",
@@ -2118,29 +2347,6 @@
             ]
         ]
     },
-    {
-        "id": "8e2a2f993ee7156a",
-        "type": "dynamic-form",
-        "z": "b195bc3ca2e1a665",
-        "g": "ec36901abb138306",
-        "name": "",
-        "group": "5403f00c961584ab",
-        "order": 0,
-        "waiting_title": "Waiting for Warten auf den Usertask...",
-        "waiting_info": "Der Usertask wird automatisch angezeigt, wenn ein entsprechender Task vorhanden ist.",
-        "submit_title": "Submit your task",
-        "cancel_title": "Cancel your task",
-        "width": 0,
-        "height": 0,
-        "x": 820,
-        "y": 520,
-        "wires": [
-            [
-                "915816cdb895af14",
-                "5399c05e8fea3679"
-            ]
-        ]
-    },
     {
         "id": "eee38d2764bac337",
         "type": "usertask-input",
@@ -2152,9 +2358,7 @@
         "x": 560,
         "y": 580,
         "wires": [
-            [
-                "8e2a2f993ee7156a"
-            ]
+            []
         ]
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.5.7",
+    "version": "0.6.0-develop-a016f3-lxu6osmc",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [

package/usertask-input.html

@@ -5,6 +5,8 @@
         defaults: {
             name: {value: ""},
             engine: {value: "", type: "processcube-engine-config"},
+            query: {value: "payload"},
+            query_type: {value: "msg"},
             force_send_array: {value: false},
             multisend: {value: false}
         },
@@ -13,6 +15,20 @@
         icon: "font-awesome/fa-envelope-open",
         label: function() {
             return this.name || "usertask-input";
+        },
+        oneditprepare: function() {
+            $("#node-input-query").typedInput({
+                default: 'msg',
+                types: ['msg', 'json']
+            });
+
+            $("#node-input-query").typedInput('value', this.query);
+            $("#node-input-query").typedInput('type', this.query_type);
+        },
+        oneditsave: function() {
+            this.query = $("#node-input-query").typedInput('value'),
+            this.query_type = $("#node-input-query").typedInput('type')
+
         }
     });
 </script>
@@ -26,6 +42,10 @@
         <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">
+        <label for="node-input-query"><i class="fa fa-tag"></i> Query</label>
+        <input type="text" id="node-input-query">
+    </div>
     <div class="form-row" style="display:flex; margin-bottom: 3px;">
         <label for="node-input-force_send_array" style="vertical-align:top"><i class="fa fa-list-alt"></i> Force send payload as array</label>
         <div>
@@ -44,4 +64,4 @@
 
 <script type="text/html" data-help-name="usertask-input">
     <p>A node which subscribes to an User Task of https://processcube.io</p>
-</script>
+</script>

package/usertask-input.js

@@ -28,7 +28,7 @@ module.exports = function(RED) {
         if (!client) {
             nodeContext.set('client', new engine_client.EngineClient(engineUrl));
             client = nodeContext.get('client');
-        }   
+        }
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -42,15 +42,14 @@ module.exports = function(RED) {
             client = null;
         });
 
-        node.on('input', async function(msg) {
-            console.log(`UserTaskInput received message: ${JSON.stringify(msg.payload)}`);
-
-            let query = msg.payload;
+        node.on('input', function(msg) {
+            const query = RED.util.evaluateNodeProperty(config.query, config.query_type, node, msg)
+            console.log(query)
 
             client.userTasks.query(query).then((matchingFlowNodes) => {
 
                 console.log(`UserTaskInput query result: ${JSON.stringify(matchingFlowNodes)}`);
-                
+
                 if (!config.force_send_array && matchingFlowNodes && matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
                     userTask = matchingFlowNodes.userTasks[0];
 
@@ -72,4 +71,4 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("usertask-input", UserTaskInput);
-}
+}

package/usertask-output.html

@@ -4,14 +4,30 @@
         color: '#00aed7',
         defaults: {
             name: {value: ""},
-            engine: {value: "", type: "processcube-engine-config"}
+            engine: {value: "", type: "processcube-engine-config"},
+            result: {value: "payload"},
+            result_type: {value: "msg"}
         },
         inputs: 1,
         outputs: 1,
         icon: "font-awesome/fa-envelope",
         label: function() {
             return this.name || "usertask-output";
-        }
+        },
+        oneditprepare: function() {
+          $("#node-input-result").typedInput({
+              default: 'msg',
+              types: ['msg', 'json']
+          });
+
+          $("#node-input-result").typedInput('value', this.result);
+          $("#node-input-result").typedInput('type', this.result_type);
+      },
+      oneditsave: function() {
+          this.result = $("#node-input-result").typedInput('value'),
+          this.result_type = $("#node-input-result").typedInput('type')
+
+      }
     });
 </script>
 
@@ -24,8 +40,12 @@
         <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">
+        <label for="node-input-result"><i class="fa fa-tag"></i> Result</label>
+        <input type="text" id="node-input-result">
+    </div>
 </script>
 
 <script type="text/html" data-help-name="usertask-output">
     <p>A node which send the result to an User Task of https://processcube.io</p>
-</script>
+</script>

package/usertask-output.js

@@ -21,7 +21,7 @@ module.exports = function(RED) {
         if (!client) {
             nodeContext.set('client', new engine_client.EngineClient(engineUrl));
             client = nodeContext.get('client');
-        }   
+        }
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -35,7 +35,8 @@ module.exports = function(RED) {
                 console.log(`Try to finsih UserTask with id ${msg.payload.userTask.flowNodeInstanceId}.`);
 
                 const flowNodeInstanceId = msg.payload.userTask.flowNodeInstanceId;
-                const userTaskResult = msg.payload.formData || {};
+
+                const userTaskResult = RED.util.evaluateNodeProperty(config.result, config.result_type, node, msg);
 
                 client.userTasks.finishUserTask(flowNodeInstanceId, userTaskResult).then(() => {
                     console.log(`UserTask with id ${flowNodeInstanceId} finished.`);
@@ -47,8 +48,8 @@ module.exports = function(RED) {
             } else {
                 console.log(`No UserTask found in message: ${JSON.stringify(msg.payload)}`);
             }
-        });     
+        });
     }
 
     RED.nodes.registerType("usertask-output", UserTaskOutput);
-}
+}