add reference for formsio

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -59,10 +59,6 @@ export class RPAWorkflowCtrl extends entityCtrl<RPAWorkflow> {
                 console.log(this.queuename);
                 await this.loadData();
                 await this.loadUsers();
-                $scope.$on('queuemessage', (event, data: QueueMessage) => {
-                    if (event && data) { }
-                });
-
             } else {
                 console.error("Missing id");
             }
@@ -889,10 +885,6 @@ export class MenuCtrl {
         $scope.$root.$on('$routeChangeStart', (...args) => { this.routeChangeStart.apply(this, args); });
         this.path = this.$location.path();
         var cleanup = this.$scope.$on('signin', (event, data) => {
-            console.log('MenuCtrl.signin');
-            console.log('event', event);
-            console.log('data', data);
-
             if (event && data) { }
             this.user = data;
             this.signedin = true;
@@ -1331,8 +1323,8 @@ export class SocketCtrl {
     ) {
         console.debug("SocketCtrl");
         WebSocketClientService.onSignedin(async (user: TokenUser) => {
-            await NoderedUtil.RegisterQueue(WebSocketClient.instance, "", (nack: boolean, result: any) => {
-                console.log(result);
+            await NoderedUtil.RegisterQueue(WebSocketClient.instance, "", (data: QueueMessage, ack: any) => {
+                ack();
             });
         });
     }
@@ -1746,8 +1738,21 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
 
         this.basequery = { _id: this.id };
         WebSocketClientService.onSignedin(async (user: TokenUser) => {
-            this.queuename = await NoderedUtil.RegisterQueue(WebSocketClient.instance, "", (nack: boolean, result: any) => {
-                console.log(result);
+            this.queuename = await NoderedUtil.RegisterQueue(WebSocketClient.instance, "", (data: QueueMessage, ack: any) => {
+                ack();
+                console.debug(data);
+                if (data.queuename == this.queuename) {
+                    if (this.instanceid == null && data.data._id != null) {
+                        this.instanceid = data.data._id;
+                        // this.$location.path("/Form/" + this.id + "/" + this.instanceid);
+                        // if (!this.$scope.$$phase) { this.$scope.$apply(); }
+                        this.loadData();
+                        return;
+                    } else {
+                        this.loadData();
+                    }
+                }
+                if (!this.$scope.$$phase) { this.$scope.$apply(); }
             });
             console.log(this.queuename);
             if (this.id !== null && this.id !== undefined && this.id !== "") {
@@ -1759,22 +1764,6 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
                 console.error(this.errormessage);
             }
         });
-        $scope.$on('queuemessage', (event, data: QueueMessage) => {
-            if (event && data) { }
-            console.debug(data);
-            if (data.queuename == this.queuename) {
-                if (this.instanceid == null && data.data._id != null) {
-                    this.instanceid = data.data._id;
-                    // this.$location.path("/Form/" + this.id + "/" + this.instanceid);
-                    // if (!this.$scope.$$phase) { this.$scope.$apply(); }
-                    this.loadData();
-                    return;
-                } else {
-                    this.loadData();
-                }
-            }
-            if (!this.$scope.$$phase) { this.$scope.$apply(); }
-        });
 
     }
     async loadData(): Promise<void> {

OpenFlow/src/public/index.html

@@ -131,6 +131,9 @@
   <link rel="stylesheet" href="openflow-font/styles.css">
   <link rel="stylesheet" href="site.css">
 
+  <link rel='stylesheet' href='formio.full.min.css'>
+  <script src='formio.full.min.js'></script>
+
   <script>
     $(function () {
       var navMain = $(".navbar-collapse"); // avoid dependency on #id

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -47,4 +47,4 @@
     "unhandled-rejection": "^1.0.0",
     "winston": "^3.3.3"
   }
-}
+}

VERSION

@@ -1 +1 @@
-1.0.44
+1.0.45

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -87,4 +87,4 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12"
   }
-}
+}