add support for values i forms

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -1177,7 +1177,15 @@ module openflow {
                 if (res.length > 0) { this.model = res[0]; } else { console.error(this.id + " workflow instances not found!"); return; }
                 if (this.model.form !== "") {
                     var res = await this.api.Query("forms", { _id: this.model.form }, null, { _created: -1 }, 1);
-                    if (res.length > 0) { this.form = res[0]; } else { console.error(this.id + " form not found!"); return; }
+                    if (res.length > 0) { this.form = res[0]; } else {
+                        if (this.model.state == "completed") {
+                            this.$location.path("/main");
+                            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+                            return;
+                        } else {
+                            console.error(this.id + " form not found! " + this.model.state); return;
+                        }
+                    }
                 } else {
                     console.debug("Model contains no form");
                 }
@@ -1237,6 +1245,7 @@ module openflow {
                 this.form.formData = JSON.parse((this.form.formData as any));
             }
             for (var i = 0; i < this.form.formData.length; i++) {
+                console.log(this.form.formData[i]);
                 var value = this.model.payload[this.form.formData[i].name];
                 if (value == undefined || value == null) { value = ""; }
                 this.form.formData[i].userData = [value];
@@ -1248,6 +1257,15 @@ module openflow {
                     if (value == undefined || value == null) { value = ""; }
                     this.form.formData[i].label = value;
                 }
+                if (this.model.values[this.form.formData[i].name] !== null && this.model.values[this.form.formData[i].name] !== undefined) {
+                    console.log("set values for " + this.form.formData[i].name);
+                    value = this.model.values[this.form.formData[i].name];
+                    console.log(value);
+                    if (value == undefined || value == null) { value = []; }
+                    this.form.formData[i].values = value;
+                } else {
+                    console.log("No values for " + this.form.formData[i].name);
+                }
             }
             var formRenderOpts = {
                 formData: this.form.formData,

OpenFlow/src/public/Entities.ts

@@ -100,6 +100,7 @@ module openflow {
         }
         public queue: string;
         public payload: any;
+        public values: any;
         public jwt: string;
         public state: string;
         public form: string;

OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts

@@ -96,6 +96,7 @@ export class workflow_in_node {
             } catch (error) {
             }
             result.payload = data.payload;
+            result.values = data.values;
             if (data.payload._id !== null && data.payload._id !== undefined && data.payload._id !== "") {
                 var res = await NoderedUtil.Query("workflow_instances", { "_id": data.payload._id }, null, null, 1, 0, data.jwt);
                 if (res.length == 0) {
@@ -191,6 +192,7 @@ export class workflow_out_node {
                 if (typeof msg.payload === 'string' || msg.payload instanceof String) {
                     msg.payload = { data: msg.payload };
                 }
+
                 if (msg._id !== null && msg._id !== undefined && msg._id !== "") {
                     var res = await NoderedUtil._UpdateOne("workflow_instances", null, msg, 1, false, msg.jwt);
                 }
@@ -204,6 +206,7 @@ export class workflow_out_node {
                 }
                 //data.error = msg.error;
                 data.payload = msg.payload;
+                data.values = msg.values;
                 data.jwt = msg.jwt;
                 data.payload._id = msg._id;
                 msg.amqpacknowledgment(JSON.stringify(data));

VERSION

@@ -1 +1 @@
-0.0.290
+0.0.291