From 0f6e4b641ad259cf16bb27436ff5be5e6838253b Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 6 Nov 2023 13:06:15 -0800
Subject: [PATCH] Cancel responses on startup

---
 src-tauri/sqlx-data.json                      | 10 +++++++
 src-tauri/src/main.rs                         | 16 +++++------
 src-tauri/src/models.rs                       | 13 +++++++++
 src-web/components/RequestActionsDropdown.tsx |  1 -
 src-web/components/Sidebar.tsx                | 27 +++++++++++--------
 src-web/components/core/StatusTag.tsx         |  4 +--
 src-web/lib/models.ts                         |  2 +-
 7 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/src-tauri/sqlx-data.json b/src-tauri/sqlx-data.json
index 9afa85b4..a914a814 100644
--- a/src-tauri/sqlx-data.json
+++ b/src-tauri/sqlx-data.json
@@ -764,6 +764,16 @@
     },
     "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                method,\n                body,\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        "
   },
+  "ac1b4ffbd98b67f0a1a74e3525387d679dd6f44c561d55c7bbea747053e53671": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Right": 0
+      }
+    },
+    "query": "\n            UPDATE http_responses\n            SET (elapsed, status_reason) = (-1, 'Cancelled')\n            WHERE elapsed = 0;\n        "
+  },
   "aeb0712785a9964d516dc8939bc54aa8206ad852e608b362d014b67a0f21b0ed": {
     "describe": {
       "columns": [],
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 9844c5b8..8cb35f8e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -77,17 +77,10 @@ async fn send_ephemeral_request(
     let response = models::HttpResponse::default();
     let environment_id2 = environment_id.unwrap_or("n/a").to_string();
     request.id = "".to_string();
-    return actually_send_ephemeral_request(
-        request,
-        &response,
-        &environment_id2,
-        &app_handle,
-        pool,
-    )
-    .await;
+    return actually_send_request(request, &response, &environment_id2, &app_handle, pool).await;
 }
 
-async fn actually_send_ephemeral_request(
+async fn actually_send_request(
     request: models::HttpRequest,
     response: &models::HttpResponse,
     environment_id: &str,
@@ -302,7 +295,7 @@ async fn send_request(
     let pool2 = pool.clone();
 
     tokio::spawn(async move {
-        actually_send_ephemeral_request(req, &response2, &environment_id2, &app_handle2, &pool2)
+        actually_send_request(req, &response2, &environment_id2, &app_handle2, &pool2)
             .await
             .expect("Failed to send request");
     });
@@ -317,6 +310,7 @@ async fn response_err(
     pool: &Pool<Sqlite>,
 ) -> Result<models::HttpResponse, String> {
     let mut response = response.clone();
+    response.elapsed = -1;
     response.error = Some(error.clone());
     response = models::update_response_if_id(&response, pool)
         .await
@@ -744,6 +738,8 @@ fn main() {
                     .expect("Failed to migrate database");
                 app.manage(m);
 
+                let _ = models::cancel_pending_responses(&pool).await;
+
                 // TODO: Move this somewhere better
                 match app.get_cli_matches() {
                     Ok(matches) => {
diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index 7cece3df..5eef7072 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -600,6 +600,19 @@ pub async fn create_response(
     get_response(&id, pool).await
 }
 
+pub async fn cancel_pending_responses(pool: &Pool<Sqlite>) -> Result<(), sqlx::Error> {
+    sqlx::query!(
+        r#"
+            UPDATE http_responses
+            SET (elapsed, status_reason) = (-1, 'Cancelled')
+            WHERE elapsed = 0;
+        "#,
+    )
+    .execute(pool)
+    .await?;
+    Ok(())
+}
+
 pub async fn update_response_if_id(
     response: &HttpResponse,
     pool: &Pool<Sqlite>,
diff --git a/src-web/components/RequestActionsDropdown.tsx b/src-web/components/RequestActionsDropdown.tsx
index 8d8d71f8..2d839792 100644
--- a/src-web/components/RequestActionsDropdown.tsx
+++ b/src-web/components/RequestActionsDropdown.tsx
@@ -48,7 +48,6 @@ export function RequestActionsDropdown({ requestId, children }: Props) {
           variant: 'danger',
           leftSlot: <Icon icon="trash" />,
         },
-        { type: 'separator', label: 'Yaak Settings' },
       ]}
     >
       {children}
diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index 8654a0fa..e69a58bb 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -549,19 +549,10 @@ const SidebarItem = forwardRef(function SidebarItem(
         {itemModel === 'folder' && (
           <Dropdown
             items={[
-              {
-                key: 'createRequest',
-                label: 'New Request',
-                onSelect: () => createRequest.mutate({ folderId: itemId, sortPriority: -1 }),
-              },
-              {
-                key: 'createFolder',
-                label: 'New Folder',
-                onSelect: () => createFolder.mutate({ folderId: itemId, sortPriority: -1 }),
-              },
               {
                 key: 'sendAll',
                 label: 'Send All',
+                leftSlot: <Icon icon="paperPlane" />,
                 onSelect: () => {
                   for (const { item } of child.children) {
                     if (item.model === 'http_request') {
@@ -570,13 +561,27 @@ const SidebarItem = forwardRef(function SidebarItem(
                   }
                 },
               },
-              { type: 'separator' },
+              { type: 'separator', label: itemName },
               {
                 key: 'deleteFolder',
                 label: 'Delete',
                 variant: 'danger',
+                leftSlot: <Icon icon="trash" />,
                 onSelect: () => deleteRequest.mutate(),
               },
+              { type: 'separator' },
+              {
+                key: 'createRequest',
+                label: 'New Request',
+                leftSlot: <Icon icon="plus" />,
+                onSelect: () => createRequest.mutate({ folderId: itemId, sortPriority: -1 }),
+              },
+              {
+                key: 'createFolder',
+                label: 'New Folder',
+                leftSlot: <Icon icon="plus" />,
+                onSelect: () => createFolder.mutate({ folderId: itemId, sortPriority: -1 }),
+              },
             ]}
           >
             <IconButton
diff --git a/src-web/components/core/StatusTag.tsx b/src-web/components/core/StatusTag.tsx
index b8ca6bee..64cdb241 100644
--- a/src-web/components/core/StatusTag.tsx
+++ b/src-web/components/core/StatusTag.tsx
@@ -8,8 +8,8 @@ interface Props {
 }
 
 export function StatusTag({ response, className, showReason }: Props) {
-  const { status, error } = response;
-  const label = error ? 'ERR' : status;
+  const { status } = response;
+  const label = status < 100 ? 'ERR' : status;
   return (
     <span
       className={classNames(
diff --git a/src-web/lib/models.ts b/src-web/lib/models.ts
index 501ea489..51836e8e 100644
--- a/src-web/lib/models.ts
+++ b/src-web/lib/models.ts
@@ -87,7 +87,7 @@ export interface HttpResponse extends BaseModel {
 }
 
 export function isResponseLoading(response: HttpResponse): boolean {
-  return !(response.body || response.status || response.error);
+  return response.elapsed === 0;
 }
 
 export function modelsEq(a: Model, b: Model) {