Fix assign workflow

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -247,17 +247,22 @@ export class DatabaseConnection extends events.EventEmitter {
                         workflowid: wiq.workflowid,
                         data: { payload: {} }
                     }
+                    if ("(Empty)")
                     if (!NoderedUtil.IsNullEmpty(wiq.robotqueue) && !NoderedUtil.IsNullEmpty(wiq.workflowid)) {
-                        Logger.instanse.verbose("[workitems] Send invoke message to robot queue " + wiq.workflowid);
-                        let expiration = (Config.amqp_requeue_time / 2, 10) | 0;
-                        if (expiration < 500) expiration = 500;
-                        await amqpwrapper.Instance().send(null, wiq.robotqueue, payload, expiration, null, null, 2);
+                        if (wiq.robotqueue.toLowerCase() != "(empty)" && wiq.workflowid.toLowerCase() != "(empty)") {
+                            Logger.instanse.verbose("[workitems] Send invoke message to robot queue " + wiq.workflowid);
+                            let expiration = (Config.amqp_requeue_time / 2, 10) | 0;
+                            if (expiration < 500) expiration = 500;
+                            await amqpwrapper.Instance().send(null, wiq.robotqueue, payload, expiration, null, null, 2);
+                        }
                     }
                     if (!NoderedUtil.IsNullEmpty(wiq.amqpqueue)) {
-                        Logger.instanse.verbose("[workitems] Send invoke message to amqp queue " + wiq.amqpqueue);
-                        let expiration = (Config.amqp_requeue_time / 2, 10) | 0;
-                        if (expiration < 500) expiration = 500;
-                        await amqpwrapper.Instance().send(null, wiq.amqpqueue, payload, expiration, null, null, 2);
+                        if (wiq.amqpqueue.toLowerCase() != "(empty)") {
+                            Logger.instanse.verbose("[workitems] Send invoke message to amqp queue " + wiq.amqpqueue);
+                            let expiration = (Config.amqp_requeue_time / 2, 10) | 0;
+                            if (expiration < 500) expiration = 500;
+                            await amqpwrapper.Instance().send(null, wiq.amqpqueue, payload, expiration, null, null, 2);
+                        }
                     }
                 }
             }

OpenFlow/src/Messages/Message.ts

@@ -580,7 +580,7 @@ export class Message {
                     break;
                 case "createworkflowinstance":
                     if (!this.EnsureJWT(cli)) break;
-                    // await this.CreateWorkflowInstance(cli, span);
+                    await this.CreateWorkflowInstance(cli, span);
                     break;
                 case "stripeaddplan":
                     if (!this.EnsureJWT(cli)) {
@@ -2392,12 +2392,19 @@ export class Message {
                 msg.correlationId = NoderedUtil.GetUniqueIdentifier();
             }
 
+            (msg as any).payload = msg.data;
+            delete msg.data;
+
             const _data = Base.assign<Base>(msg as any);
             Base.addRight(_data, msg.targetid, "targetid", [-1]);
             Base.addRight(_data, cli.user._id, cli.user.name, [-1]);
             Base.addRight(_data, tuser._id, tuser.name, [-1]);
             _data._type = "instance";
             _data.name = msg.name;
+            (_data as any).state = "new";
+            if (!msg.initialrun) {
+                (_data as any).form = "unknown";
+            }
 
             const res2 = await Config.db.InsertOne(_data, "workflow_instances", 1, true, msg.jwt, span);
             msg.newinstanceid = res2._id;
@@ -4271,7 +4278,7 @@ export class Message {
             const nextrun_seconds = Math.round((end - wi.nextrun.getTime()) / 1000);
             if (seconds > 5 && nextrun_seconds >= 0) {
                 Config.db.queuemonitoringlastrun = new Date();
-                Config.db.queuemonitoring()
+                // Config.db.queuemonitoring()
             }
         } catch (error) {
             await handleError(null, error);
@@ -4416,7 +4423,7 @@ export class Message {
             const seconds = Math.round((end - Config.db.queuemonitoringlastrun.getTime()) / 1000);
             if (seconds > 5 && isRelevant) {
                 Config.db.queuemonitoringlastrun = new Date();
-                Config.db.queuemonitoring()
+                // Config.db.queuemonitoring()
             }
         } catch (error) {
             await handleError(null, error);
@@ -4585,7 +4592,7 @@ export class Message {
                 const nextrun_seconds = Math.round((end - wi.nextrun.getTime()) / 1000);
                 if (seconds > 5 && nextrun_seconds >= 0) {
                     Config.db.queuemonitoringlastrun = new Date();
-                    Config.db.queuemonitoring()
+                    // Config.db.queuemonitoring()
                 }
             }
 

OpenFlow/src/public/User.html

@@ -34,6 +34,13 @@ <h1 class="pagetitle" translate lib="web">userdetails</h1>
             <input type="checkbox" ng-model="ctrl.model.disabled" class="input-md" ng-disabled="ctrl.loading==true" />
         </div>
     </div>
+    <div class="form-group" ng-show="ctrl.model.company != '' && ctrl.model.company != null && ctrl.model.company != undefined">
+        <label for="sid" class="col-sm-2 control-label" translate lib="web">company</label>
+        <div class="col-sm-4">
+            <input ng-model="ctrl.model.company" class="form-control input-md" ng-disabled="ctrl.loading==true || (!menuctrl.hasrole('admins') && !menuctrl.hasrole('customer admins') && !menuctrl.hasrole('resellers'))"
+             />
+        </div>
+    </div>
     <div class="form-group" ng-show="ctrl.model.sid != '' && ctrl.model.sid != null && ctrl.model.sid != undefined">
         <label for="sid" class="col-sm-2 control-label" translate lib="web">SID</label>
         <div class="col-sm-4">