From 5035dd49471a2e189da2800b1cb682b6424faf15 Mon Sep 17 00:00:00 2001
From: Oscar Krause <oscar.krause@collinwebdesigns.de>
Date: Wed, 4 Jan 2023 09:52:15 +0100
Subject: [PATCH] fixed refreshing data after deleting some origin or lease

---
 app/static/assets/js/helper.js             |  1 -
 app/templates/views/dashboard_leases.html  | 20 +++++++------
 app/templates/views/dashboard_origins.html | 35 ++++++++++++++--------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/app/static/assets/js/helper.js b/app/static/assets/js/helper.js
index 28604d5..d383282 100644
--- a/app/static/assets/js/helper.js
+++ b/app/static/assets/js/helper.js
@@ -102,7 +102,6 @@ async function deleteOrigins() {
     let xhr = new XMLHttpRequest();
     xhr.open("DELETE", '/-/origins', true);
     xhr.send();
-    await fetchOriginsWithLeases()
 }
 
 async function deleteOrigin(origin_ref) {
diff --git a/app/templates/views/dashboard_leases.html b/app/templates/views/dashboard_leases.html
index 6d9d422..7e24e09 100644
--- a/app/templates/views/dashboard_leases.html
+++ b/app/templates/views/dashboard_leases.html
@@ -5,18 +5,20 @@
 {% endblock %}
 
 {% block content %}
-<div>
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-        <h1 class="h2">Leases <small>with origin</small></h1>
-        <div class="btn-toolbar mb-2 mb-md-0">
-            <div class="btn-group me-2">
-                <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteLease();load();">delete lease</button>
+    <div>
+        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+            <h1 class="h2">Leases <small>with origin</small></h1>
+            <div class="btn-toolbar mb-2 mb-md-0">
+                <div class="btn-group me-2">
+                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteLease().finally(() => load())">
+                        delete lease
+                    </button>
+                </div>
             </div>
         </div>
-    </div>
 
-    <div id="leases" class="mt-3"></div>
-</div>
+        <div id="leases" class="mt-3"></div>
+    </div>
 {% endblock %}
 
 {% block scripts %}
diff --git a/app/templates/views/dashboard_origins.html b/app/templates/views/dashboard_origins.html
index c45a0d0..b7142b3 100644
--- a/app/templates/views/dashboard_origins.html
+++ b/app/templates/views/dashboard_origins.html
@@ -5,24 +5,33 @@
 {% endblock %}
 
 {% block content %}
-<div>
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-        <h1 class="h2">Origins <small>with leases</small></h1>
-        <div class="btn-toolbar mb-2 mb-md-0">
-            <div class="btn-group me-2">
-                <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigins()">delete all</button>
+    <div>
+        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+            <h1 class="h2">Origins <small>with leases</small></h1>
+            <div class="btn-toolbar mb-2 mb-md-0">
+                <div class="btn-group me-2">
+                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigin().finally(() => load())">
+                        delete origin
+                    </button>
+                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigins().finally(() => load())">
+                        delete all
+                    </button>
+                </div>
             </div>
         </div>
-    </div>
 
-    <div id="origins" class="mt-3"></div>
-</div>
+        <div id="origins" class="mt-3"></div>
+    </div>
 {% endblock %}
 
 {% block scripts %}
 {{ super() }}
-<script type="application/javascript">
-    const origins = document.getElementById('origins')
-    fetchOriginsWithLeases(origins)
-</script>
+    <script type="application/javascript">
+        function load() {
+            const origins = document.getElementById('origins')
+            fetchOriginsWithLeases(origins)
+        }
+
+        load()
+    </script>
 {% endblock %}