From 44789819467695067d898c4c9a95959fcc142cc1 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Thu, 17 Aug 2023 19:23:04 +0200
Subject: [PATCH] Stop batch-add form being overwritten

---
 src/server/web/pages/queue.rs    | 19 ++++++++-----------
 templates/pages/queue.html       | 12 ++++++++++++
 templates/pages/queue_inner.html | 12 ------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/server/web/pages/queue.rs b/src/server/web/pages/queue.rs
index 6fe6252..89a95e4 100644
--- a/src/server/web/pages/queue.rs
+++ b/src/server/web/pages/queue.rs
@@ -155,7 +155,6 @@ async fn get_queue_data(
 #[derive(Template)]
 #[template(path = "pages/queue_inner.html")]
 struct PageInner {
-    link_admin_queue_add_batch: Link,
     workers: Vec<Worker>,
     tasks: Vec<Task>,
 }
@@ -168,17 +167,16 @@ pub async fn get_queue_inner(
 ) -> somehow::Result<impl IntoResponse> {
     let base = Base::new(config, Tab::Queue);
     let sorted_workers = sorted_workers(&workers);
-    Ok(PageInner {
-        link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
-        workers: get_workers(&db, &sorted_workers, &base).await?,
-        tasks: get_queue_data(&db, &sorted_workers, &base).await?,
-    })
+    let workers = get_workers(&db, &sorted_workers, &base).await?;
+    let tasks = get_queue_data(&db, &sorted_workers, &base).await?;
+    Ok(PageInner { workers, tasks })
 }
 
 #[derive(Template)]
 #[template(path = "pages/queue.html")]
 struct Page {
     link_queue_js: Link,
+    link_admin_queue_add_batch: Link,
     base: Base,
     inner: PageInner,
 }
@@ -191,14 +189,13 @@ pub async fn get_queue(
 ) -> somehow::Result<impl IntoResponse> {
     let base = Base::new(config, Tab::Queue);
     let sorted_workers = sorted_workers(&workers);
+    let workers = get_workers(&db, &sorted_workers, &base).await?;
+    let tasks = get_queue_data(&db, &sorted_workers, &base).await?;
     Ok(Page {
         link_queue_js: base.link(QUEUE_JS),
-        inner: PageInner {
-            link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
-            workers: get_workers(&db, &sorted_workers, &base).await?,
-            tasks: get_queue_data(&db, &sorted_workers, &base).await?,
-        },
+        link_admin_queue_add_batch: base.link(PathAdminQueueAddBatch {}),
         base,
+        inner: PageInner { workers, tasks },
     })
 }
 
diff --git a/templates/pages/queue.html b/templates/pages/queue.html
index 232359d..d911428 100644
--- a/templates/pages/queue.html
+++ b/templates/pages/queue.html
@@ -8,4 +8,16 @@
 
 {% block body %}
 <div id="inner">{{ inner|safe }}</div>
+
+<form method="post" action="{{ link_admin_queue_add_batch }}">
+    <label>
+        Batch size:
+        <input type="number" name="amount" value="10" min="1">
+    </label>
+    <label>
+        Priority:
+        <input type="number" id="priority" name="priority" value="-1" min="-2147483648" max="2147483647">
+    </label>
+    <button>Add batch to queue</button>
+</form>
 {% endblock %}
diff --git a/templates/pages/queue_inner.html b/templates/pages/queue_inner.html
index 63a7b7d..e38ba5b 100644
--- a/templates/pages/queue_inner.html
+++ b/templates/pages/queue_inner.html
@@ -67,15 +67,3 @@
         {% endfor %}
     </tbody>
 </table>
-
-<form method="post" action="{{ link_admin_queue_add_batch }}">
-    <label>
-        Batch size:
-        <input type="number" name="amount" value="10" min="1">
-    </label>
-    <label>
-        Priority:
-        <input type="number" id="priority" name="priority" value="-1" min="-2147483648" max="2147483647">
-    </label>
-    <button>Add batch to queue</button>
-</form>