improve ui

Author: skadefro

OpenFlow/src/public/Nodered.html

@@ -6,17 +6,17 @@ <h1 translate lib="web">sockets</h1>
   <section>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
-        <button type="button" class="btn btn-secondary" ng-click="ctrl.GetNoderedInstance()">Get status</button>
+        <button type="button" class="btn btn-secondary" ng-click="ctrl.GetNoderedInstance()">Reload</button>
         <button type="button" class="btn btn-secondary" ng-click="ctrl.EnsureNoderedInstance()"
-          ng-show="ctrl.instance==null || ctrl.instancestatus == 'pending deletion (Running)' ">Create Nodered</button>
+          ng-show="ctrl.instance==null || ctrl.instancestatus == 'pending deletion (Running)' ">Create Nodered </button>
         <button type="button" class="btn btn-secondary" ng-click="ctrl.RestartNoderedInstance()"
           ng-show="ctrl.instance!=null && ctrl.instancestatus != 'pending deletion (Running)' && ctrl.instancestatus != 'Pending'">Restart
           Nodered</button>
         <button type="button" class="btn btn-secondary" ng-click="ctrl.DeleteNoderedInstance()"
           ng-show="ctrl.instance!=null && ctrl.instancestatus != 'pending deletion (Running)' ">Delete Nodered</button>
-        <button type="button" class="btn btn-secondary"
+        <!-- <button type="button" class="btn btn-secondary"
           ng-show="ctrl.instance!=null && ctrl.instancestatus != 'pending deletion (Running)' && ctrl.instancestatus != 'Pending'"
-          ng-click="ctrl.GetNoderedInstanceLog()">Get Console</button>
+          ng-click="ctrl.GetNoderedInstanceLog()">Get Console</button> -->
 
         <a ng-href="{{ctrl.noderedurl}}" class="btn btn-danger" target="nodered" ng-show="ctrl.instance!=null">Open
           Nodered</a>
@@ -34,14 +34,26 @@ <h1 translate lib="web">sockets</h1>
         <span ng-show="ctrl.instance!=null">{{ instance.metadata.name }}</span>
       </div>
       <label class="col-sm-1 control-label"><span translate lib="web">status</span>: </label>
+      <div class="col-sm-1">
+        <span
+          ng-show="ctrl.instance!=null">{{ (this.instance.metadata.deletionTimestamp != null ? " deleting" : instance.status.phase) }}</span>
+      </div>
+      <label class="col-sm-1 control-label"><span translate lib="web">created</span>: </label>
+      <div class="col-sm-1">
+        <span ng-show="ctrl.instance!=null">
+          <timesince ng-model="instance.metadata.creationTimestamp" /></span>
+      </div>
+    </div>
+    <div class="row">
+      <label class="col-sm-1 control-label"><span translate lib="web">image</span>: </label>
       <div class="col">
-        <span ng-show="ctrl.instance!=null">{{ instance.status.phase }}</span>
+        <span ng-show="ctrl.instance!=null">{{ instance.spec.containers[0].image }}</span>
       </div>
-      <div class="col" ng-show="instance.status.phase == 'Failed'">
-        <!-- <button type="button" class="btn btn-secondary"
-          ng-click="ctrl.GetNoderedInstanceLog(instance.metadata.name)">Logs</button> -->
-        <button type="button" class="btn btn-secondary"
-          ng-click="ctrl.DeleteNoderedPod(instance.metadata.name)">Delete</button>
+      <div class="col" ng-show="instance.status.phase == 'Failed' || instance.status.phase == 'Running'">
+        <button type="button" class="btn btn-sm btn-secondary" ng-show="instance.status.phase == 'Running'"
+          ng-click="ctrl.GetNoderedInstanceLog(instance.metadata.name)">Logs</button>
+        <button type="button" class="btn btn-sm btn-secondary" ng-click="ctrl.DeleteNoderedPod(instance.metadata.name)"
+          ng-show="instance.status.phase == 'Failed' || instance.status.phase == 'Running'">Delete</button>
       </div>
     </div>
     <div class="row" ng-show="instance.status.phase == 'Failed'">
@@ -50,6 +62,7 @@ <h1 translate lib="web">sockets</h1>
   </div>
 
 </section>
+
 <section>
   <div class="form-group">
     <label class="col-sm-3 control-label"><span translate lib="web">image</span>: </label>

VERSION

@@ -1 +1 @@
-0.0.559
+0.0.560

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:0.0.556"
+    image: "cloudhack/openflow:0.0.560"
     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:0.0.556"
+    image: "cloudhack/openflownodered:0.0.560"
     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:0.0.556"
+    image: "cloudhack/openflow:0.0.560"
     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:0.0.556"
+    image: "cloudhack/openflownodered:0.0.560"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

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