Allow restore, without having to compare first

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -2658,11 +2658,13 @@ export class HistoryCtrl extends entitiesCtrl<Base> {
     }
     async CompareThen(model) {
         if (model.item == null || model.delta == null) {
-            const items = await NoderedUtil.Query(this.collection + "_hist", { _id: model._id }, null, this.orderby, 100, 0, null);
-            if (items.length > 0) {
-                model.item = items[0].item;
-                model.delta = items[0].delta;
-            }
+            // const items = await NoderedUtil.Query(this.collection + "_hist", { _id: model._id }, null, this.orderby, 100, 0, null);
+            // if (items.length > 0) {
+            //     model.item = items[0].item;
+            //     model.delta = items[0].delta;
+            // }
+            const item = await NoderedUtil.GetDocumentVersion(this.collection, this.id, model._version, null);
+            if (item != null) model.item = item;
         }
         const modal: any = $("#exampleModal");
         modal.modal();
@@ -2671,11 +2673,13 @@ export class HistoryCtrl extends entitiesCtrl<Base> {
     }
     async RevertTo(model) {
         if (model.item == null) {
-            const items = await NoderedUtil.Query(this.collection + "_hist", { _id: model._id }, null, this.orderby, 100, 0, null);
-            if (items.length > 0) {
-                model.item = items[0].item;
-                model.delta = items[0].delta;
-            }
+            // const items = await NoderedUtil.Query(this.collection + "_hist", { _id: model._id }, null, this.orderby, 100, 0, null);
+            // if (items.length > 0) {
+            //     model.item = items[0].item;
+            //     model.delta = items[0].delta;
+            // }
+            const item = await NoderedUtil.GetDocumentVersion(this.collection, this.id, model._version, null);
+            if (item != null) model.item = item;
         }
         let result = window.confirm("Overwrite current version with version " + model._version + "?");
         if (result) {

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.87",
+  "version": "1.1.88",
   "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": {

VERSION

@@ -1 +1 @@
-1.1.87
+1.1.88

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.87"
+    image: "cloudhack/openflow:1.1.88"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.87"
+    image: "cloudhack/openflownodered:1.1.88"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "cloudhack/openflow:1.1.87"
+    image: "cloudhack/openflow:1.1.88"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.87"
+    image: "cloudhack/openflownodered:1.1.88"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.87"
+    image: "cloudhack/openflow:1.1.88"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.87"
+    image: "cloudhack/openflownodered:1.1.88"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.87"
+    image: "cloudhack/openflow:1.1.88"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.87"
+    image: "cloudhack/openflownodered:1.1.88"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.87",
+  "version": "1.1.88",
   "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": {