do prober replace, update modified doing updatedoc

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -276,7 +276,7 @@ export class DatabaseConnection {
      * @returns Promise<T>
      */
     async UpdateOne<T extends Base>(query: any, item: T, collectionname: string, w: number, j: boolean, jwt: string): Promise<T> {
-        var itemUpdate: boolean = true;
+        var itemReplace: boolean = true;
         if (item === null || item === undefined) { throw Error("Cannot update null item"); }
         await this.connect();
         var user: TokenUser = Crypt.verityToken(jwt);
@@ -322,7 +322,7 @@ export class DatabaseConnection {
                 item.addRight(user._id, user.name, [Rights.full_control]);
             }
         } else {
-            itemUpdate = false;
+            itemReplace = false;
         }
 
         if (collectionname === "users" && item._type === "user" && item.hasOwnProperty("newpassword")) {
@@ -357,9 +357,13 @@ export class DatabaseConnection {
         // var options: CollectionInsertOneOptions = {};
         var res: UpdateWriteOpResult = null;
         try {
-            if (itemUpdate) {
-                res = await this.db.collection(collectionname).updateOne(_query, { $set: item }, options);
+            if (itemReplace) {
+                res = await this.db.collection(collectionname).replaceOne(_query, item, options);
             } else {
+                if ((item["$set"]) === undefined) { (item["$set"]) = {} };
+                (item["$set"])._modifiedby = user.name;
+                (item["$set"])._modifiedbyid = user._id;
+                (item["$set"])._modified = new Date(new Date().toISOString());
                 res = await this.db.collection(collectionname).updateOne(_query, item, options);
             }
             // var res: ReplaceOneWriteOpResult = await this.db.collection(collectionname).replaceOne(_query, item, options);

OpenFlow/src/public/Controllers.ts

@@ -184,7 +184,6 @@ module openflow {
                 workflowids.push(workflow._id);
             });
             var q = { WorkflowId: { $in: workflowids } }
-            console.log(q);
             var instances = await this.api.Query("openrpa_instances", q, null, null);
 
 
@@ -196,13 +195,16 @@ module openflow {
             chart.data = [[], [], []];
             for (var x = 0; x < stats.length; x++) {
                 var model = stats[x].value;
-                chart.data[0].push(model.minrun);
-                chart.data[1].push(model.run);
-                chart.data[2].push(model.maxrun);
-                var id = stats[x]._id;
-                var workflow = workflows.filter(x => x._id == id)[0];
-                if (workflow == undefined) { chart.labels.push("unknown"); } else { chart.labels.push(workflow.name); }
-
+                var _id = stats[x]._id;
+                var workflow = workflows.filter(y => y._id == _id)[0];
+                if (workflow !== undefined) {
+                    chart.data[0].push(model.minrun);
+                    chart.data[1].push(model.run);
+                    chart.data[2].push(model.maxrun);
+                    var id = stats[x]._id;
+                    var workflow = workflows.filter(x => x._id == id)[0];
+                    if (workflow == undefined) { chart.labels.push("unknown"); } else { chart.labels.push(workflow.name); }
+                }
             }
             this.charts.push(chart);
 
@@ -886,6 +888,7 @@ module openflow {
             if (!this.$scope.$$phase) { this.$scope.$apply(); }
         }
         async submit(): Promise<void> {
+            console.log(this.model);
             if (this.showjson) {
                 this.model = JSON.parse(this.jsonmodel);
             }

VERSION

@@ -1 +1 @@
-0.0.119
+0.0.120