@5minds/node-red-contrib-processcube 1.4.0-develop-819a52-m2bvwfgk → 1.4.0-develop-d2cbe1-m2d1k6k4

package/externaltask-input.html

@@ -6,7 +6,8 @@
             name: { value: '' },
             engine: { value: '', type: 'processcube-engine-config' },
             topic: { value: '' },
-            workerConfig: { value: '', type: 'json' },
+            workerConfig: { value: '{}'},
+            workerConfigType: { value: 'json'}
         },
         inputs: 0,
         outputs: 1,
@@ -19,9 +20,17 @@
                 default: 'json',
                 types: ['json'],
             });
+
+            $('#node-input-workerConfig').typedInput('value', this.workerConfig);
+            $('#node-input-workerConfig').typedInput('type', this.workerConfigType);
         },
         oneditsave: function () {
             this.workerConfig = $('#node-input-workerConfig').typedInput('value');
+            if (this.workerConfig == '') {
+                this.workerConfig = '{}'
+                $('#node-input-workerConfig').typedInput('value', '{}');
+            }
+            this.workerConfigType = $('#node-input-workerConfig').typedInput('type');
         },
     });
 </script>
@@ -39,8 +48,8 @@
         <label for="node-input-topic"><i class="fa fa-tag"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="Topic of ExternalTask" />
     </div>
-    <div class="form-row"></div>
-        <label for="node-input-workerConfig"><i class="fa fa-tag"></i> Worker Config</label>
+    <div class="form-row">
+        <label for="node-input-workerConfig"><i class="fa fa-tag"></i> Config</label>
         <input type="text" id="node-input-workerConfig" />
     </div>
 </script>

package/externaltask-input.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.4.0-develop-819a52-m2bvwfgk",
+    "version": "1.4.0-develop-d2cbe1-m2d1k6k4",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processcube-engine-config.html

@@ -4,6 +4,7 @@
         defaults: {
             name: { value: '' },
             url: { value: 'http://engine:8000', required: true },
+            urlType: { type: 'str'},
             clientId: { value: '' },
             clientIdType: { type: 'str' },
             clientSecret: { value: '' },
@@ -13,6 +14,11 @@
             return this.name || this.url;
         },
         oneditprepare: function () {
+            $('#node-config-input-url').typedInput({
+                default: 'str',
+                types: ['str', 'global', 'flow', 'env', 'msg', 'cred'],
+            });
+
             $('#node-config-input-clientId').typedInput({
                 default: 'str',
                 types: ['str', 'global', 'flow', 'env', 'msg', 'cred'],
@@ -23,6 +29,9 @@
                 types: ['str', 'global', 'flow', 'env', 'msg', 'cred'],
             });
 
+            $('#node-config-input-url').typedInput('value', this.url);
+            $('#node-config-input-url').typedInput('type', this.urlType);
+
             $('#node-config-input-clientId').typedInput('value', this.clientId);
             $('#node-config-input-clientId').typedInput('type', this.clientIdType);
 
@@ -30,6 +39,9 @@
             $('#node-config-input-clientSecret').typedInput('type', this.clientSecretType);
         },
         oneditsave: function () {
+            this.url = $('#node-config-input-url').typedInput('value');
+            this.urlType = $('#node-config-input-url').typedInput('type');
+
             this.clientId = $('#node-config-input-clientId').typedInput('value');
             this.clientIdType = $('#node-config-input-clientId').typedInput('type');
 

package/processcube-engine-config.js

@@ -9,7 +9,7 @@ module.exports = function (RED) {
         RED.nodes.createNode(this, n);
         const node = this;
         const identityChangedCallbacks = [];
-        this.url = n.url;
+        this.url = RED.util.evaluateNodeProperty(n.url, n.urlType, node);
         this.identity = null;
 
         this.credentials.clientId = RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node);