app/main.py

@@ -155,13 +155,6 @@ async def _origins_delete(request: Request):
     return Response(status_code=201)
 
 
-@app.delete('/-/origins/{origin_ref}', summary='* Origins')
-async def _origins_delete_origin_ref(request: Request, origin_ref: str):
-    if Origin.delete(db, origin_ref) == 1:
-        return Response(status_code=201)
-    raise JSONResponse(status_code=404, content={'status': 404, 'detail': 'lease not found'})
-
-
 @app.get('/-/leases', summary='* Leases')
 async def _leases(request: Request, origin: bool = False):
     session = sessionmaker(bind=db)()

app/orm.py

@@ -56,12 +56,12 @@ class Origin(Base):
         session.close()
 
     @staticmethod
-    def delete(engine: Engine, origin_ref: str = None) -> int:
+    def delete(engine: Engine, origins: ["Origin"] = None) -> int:
         session = sessionmaker(bind=engine)()
-        if origin_ref is None:
+        if origins is None:
             deletions = session.query(Origin).delete()
         else:
-            deletions = session.query(Origin).filter(Origin.origin_ref == origin_ref).delete()
+            deletions = session.query(Origin).filter(Origin.origin_ref in origins).delete()
         session.commit()
         session.close()
         return deletions

app/static/assets/js/helper.js

@@ -102,16 +102,7 @@ async function deleteOrigins() {
     let xhr = new XMLHttpRequest();
     xhr.open("DELETE", '/-/origins', true);
     xhr.send();
-}
+    await fetchOriginsWithLeases()
-
-async function deleteOrigin(origin_ref) {
-    if (origin_ref === undefined)
-        origin_ref = window.prompt("Please enter 'origin_ref' which should be deleted");
-    if (origin_ref === null || origin_ref === "")
-        return
-    let xhr = new XMLHttpRequest();
-    xhr.open("DELETE", `/-/origins/${origin_ref}`, true);
-    xhr.send();
 }
 
 async function deleteLease(lease_ref) {

app/templates/views/dashboard_leases.html

@@ -5,20 +5,18 @@
 {% endblock %}
 
 {% block content %}
-    <div>
+<div>
-        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+    <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>
+        <h1 class="h2">Leases <small>with origin</small></h1>
-            <div class="btn-toolbar mb-2 mb-md-0">
+        <div class="btn-toolbar mb-2 mb-md-0">
-                <div class="btn-group me-2">
+            <div class="btn-group me-2">
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteLease().finally(() => load())">
+                <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteLease();load();">delete lease</button>
-                        delete lease
-                    </button>
-                </div>
             </div>
         </div>
-
-        <div id="leases" class="mt-3"></div>
     </div>
+
+    <div id="leases" class="mt-3"></div>
+</div>
 {% endblock %}
 
 {% block scripts %}

app/templates/views/dashboard_origins.html

@@ -5,33 +5,24 @@
 {% endblock %}
 
 {% block content %}
-    <div>
+<div>
-        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+    <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>
+        <h1 class="h2">Origins <small>with leases</small></h1>
-            <div class="btn-toolbar mb-2 mb-md-0">
+        <div class="btn-toolbar mb-2 mb-md-0">
-                <div class="btn-group me-2">
+            <div class="btn-group me-2">
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigin().finally(() => load())">
+                <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigins()">delete all</button>
-                        delete origin
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigins().finally(() => load())">
-                        delete all
-                    </button>
-                </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">
+<script type="application/javascript">
-        function load() {
+    const origins = document.getElementById('origins')
-            const origins = document.getElementById('origins')
+    fetchOriginsWithLeases(origins)
-            fetchOriginsWithLeases(origins)
+</script>
-        }
-
-        load()
-    </script>
 {% endblock %}