Add routingkey for workflow exchange

Author: skadefro

OpenFlow/src/amqpwrapper.ts

@@ -391,13 +391,14 @@ export class amqpwrapper extends events.EventEmitter {
             const correlationId: string = msg.properties.correlationId;
             const replyTo: string = msg.properties.replyTo;
             const consumerTag: string = msg.fields.consumerTag;
-            const routingkey: string = msg.fields.routingkey;
+            const routingKey: string = msg.fields.routingKey;
+
             const exchange: string = msg.fields.exchange;
             const options: QueueMessageOptions = {
                 correlationId: correlationId,
                 replyTo: replyTo,
                 consumerTag: consumerTag,
-                routingkey: routingkey,
+                routingkey: routingKey,
                 exchange: exchange
             }
             const data: string = msg.content.toString();

OpenFlow/src/public/Controllers.ts

@@ -1858,23 +1858,24 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
         if (!NoderedUtil.IsNullEmpty(this.localexchangequeue)) return;
         const result = await NoderedUtil.RegisterExchange(WebSocketClient.instance, exchange, "direct",
             "", async (msg: QueueMessage, ack: any) => {
-                // this.OnMessage(msg, ack);
                 console.log(msg);
                 ack();
-                // this.loadData();
-                this.model.payload = Object.assign(this.model.payload, msg.data.payload);
-                if (!NoderedUtil.IsNullEmpty(msg.data.payload.form)) {
-                    if (msg.data.payload.form != this.model.form) {
-                        const res = await NoderedUtil.Query("forms", { _id: msg.data.payload.form }, null, { _created: -1 }, 1, 0, null);
-                        if (res.length > 0) {
-                            this.model.form = msg.data.payload.form;
-                            this.form = res[0];
-                        } else {
-                            console.error("Failed locating form " + msg.data.payload.form)
+                if (NoderedUtil.IsNullEmpty(msg.routingkey) || msg.routingkey == this.instanceid) {
+                    // this.loadData();
+                    this.model.payload = Object.assign(this.model.payload, msg.data.payload);
+                    if (!NoderedUtil.IsNullEmpty(msg.data.payload.form)) {
+                        if (msg.data.payload.form != this.model.form) {
+                            const res = await NoderedUtil.Query("forms", { _id: msg.data.payload.form }, null, { _created: -1 }, 1, 0, null);
+                            if (res.length > 0) {
+                                this.model.form = msg.data.payload.form;
+                                this.form = res[0];
+                            } else {
+                                console.error("Failed locating form " + msg.data.payload.form)
+                            }
                         }
                     }
+                    this.renderform();
                 }
-                this.renderform();
             }, (msg) => {
                 // if (this != null && this.node != null) this.node.status({ fill: "red", shape: "dot", text: "Disconnected" });
                 // setTimeout(this.connect.bind(this), (Math.floor(Math.random() * 6) + 1) * 500);