From 4edb8881357e043fd7ea15efeb2d592c9fb55efc Mon Sep 17 00:00:00 2001
From: Justin Choquette <jchoquette@iol.unh.edu>
Date: Tue, 7 Jun 2022 16:07:54 -0400
Subject: Laas Dashboard Front End Improvements

Change-Id: Ib9aa21747bd57faef94db7795cd89119ad4b0a9d
Signed-off-by: Justin Choquette <jchoquette@iol.unh.edu>
---
 .../base/resource/steps/pod_definition.html        | 41 ++++++++++++----------
 src/templates/base/workflow/confirm.html           |  8 +----
 src/templates/base/workflow/viewport-base.html     |  4 +--
 3 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'src/templates')

diff --git a/src/templates/base/resource/steps/pod_definition.html b/src/templates/base/resource/steps/pod_definition.html
index 83c4fcb..233d995 100644
--- a/src/templates/base/resource/steps/pod_definition.html
+++ b/src/templates/base/resource/steps/pod_definition.html
@@ -39,27 +39,32 @@
 </form>
 <script>
     //gather context data
-    let debug = false;
-    {% if debug %}
-    debug = true;
-    {% endif %}
+    try {
+        let debug = false;
+        {% if debug %}
+        debug = true;
+        {% endif %}
 
-    const False = false;
-    const True = true;
+        const False = false;
+        const True = true;
 
-    let resources = {{resources|safe}};
-    let networks = {{networks|safe}};
+        let resources = {{resources|safe}};
+        let networks = {{networks|safe}};
+
+        network_step = new NetworkStep(
+            debug,
+            resources,
+            networks,
+            document.getElementById('graphContainer'),
+            document.getElementById('outlineContainer'),
+            document.getElementById('toolbarContainer'),
+            document.getElementById('sidebarContainer')
+        );
+        form_submission_callbacks.push(() => network_step.prepareForm());
+    } catch (e) {
+        console.log(e)
+    }
 
-    network_step = new NetworkStep(
-        debug,
-        resources,
-        networks,
-        document.getElementById('graphContainer'),
-        document.getElementById('outlineContainer'),
-        document.getElementById('toolbarContainer'),
-        document.getElementById('sidebarContainer')
-    );
-    form_submission_callbacks.push(() => network_step.prepareForm());
 </script>
 {% endblock content %}
 {% block onleave %}
diff --git a/src/templates/base/workflow/confirm.html b/src/templates/base/workflow/confirm.html
index 2f99a41..bc8e4e3 100644
--- a/src/templates/base/workflow/confirm.html
+++ b/src/templates/base/workflow/confirm.html
@@ -43,15 +43,9 @@
     {
         select.value = "True";
         submitStepForm();
+        pop_workflow();
     }
     function formcancel()
-    {
-        select.value = "False";
-        submitStepForm();
-    }
-
-    var confirmed = {{confirm_succeeded|default:"false"}};
-    if( confirmed )
     {
         pop_workflow();
     }
diff --git a/src/templates/base/workflow/viewport-base.html b/src/templates/base/workflow/viewport-base.html
index d9648c2..88229ca 100644
--- a/src/templates/base/workflow/viewport-base.html
+++ b/src/templates/base/workflow/viewport-base.html
@@ -10,7 +10,7 @@
     <div class="col">
         <nav>
             <ul class="pagination d-flex flex-row" id="topPagination">
-                <li class="page-item flex-shrink-1 page-control">
+                <li class="page-item flex-shrink-1 page-control" id="workflow-nav-back">
                     <a class="page-link" href="#" id="gob" onclick="submit_and_go('prev')">
                         <i class="fas fa-backward"></i> Back
                     </a>
@@ -20,7 +20,7 @@
                         <i class="far"></i>
                     </a>
                 </li>
-                <li class="page-item flex-shrink-1 page-control">
+                <li class="page-item flex-shrink-1 page-control" id="workflow-nav-next">
                     <a class="page-link text-right" href="#" id="gof" onclick="submit_and_go('next')">
                         Next <i class="fas fa-forward"></i>
                     </a>
-- 
cgit 1.2.3-korg