Typesafe routing and CM line height issue

src-tauri/src/main.rs

@@ -313,14 +313,13 @@ async fn delete_request(
     app_handle: AppHandle<Wry>,
     db_instance: State<'_, Mutex<Pool<Sqlite>>>,
     request_id: &str,
-) -> Result<models::HttpRequest, String> {
+) -> Result<(), String> {
     let pool = &*db_instance.lock().await;
     let req = models::delete_request(request_id, pool)
         .await
         .expect("Failed to delete request");
-    app_handle.emit_all("deleted_request", request_id).unwrap();
-
-    Ok(req)
+    app_handle.emit_all("deleted_model", req).unwrap();
+    Ok(())
 }
 
 #[tauri::command]
@@ -357,12 +356,15 @@ async fn responses(
 #[tauri::command]
 async fn delete_response(
     id: &str,
+    app_handle: AppHandle<Wry>,
     db_instance: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<(), String> {
     let pool = &*db_instance.lock().await;
-    models::delete_response(id, pool)
+    let response = models::delete_response(id, pool)
         .await
-        .map_err(|e| e.to_string())
+        .expect("Failed to delete response");
+    app_handle.emit_all("deleted_model", response).unwrap();
+    Ok(())
 }
 
 #[tauri::command]
@@ -394,6 +396,20 @@ async fn workspaces(
     }
 }
 
+#[tauri::command]
+async fn delete_workspace(
+    app_handle: AppHandle<Wry>,
+    db_instance: State<'_, Mutex<Pool<Sqlite>>>,
+    id: &str,
+) -> Result<(), String> {
+    let pool = &*db_instance.lock().await;
+    let workspace = models::delete_workspace(id, pool)
+        .await
+        .expect("Failed to delete workspace");
+    app_handle.emit_all("deleted_model", workspace).unwrap();
+    Ok(())
+}
+
 #[tauri::command]
 fn greet(name: &str) -> String {
     format!("Hello, {}! You've been greeted from Rust!", name)
@@ -511,6 +527,7 @@ fn main() {
             send_request,
             create_request,
             create_workspace,
+            delete_workspace,
             update_request,
             delete_request,
             responses,

src-tauri/src/models.rs

@@ -142,6 +142,22 @@ pub async fn get_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, s
     .await
 }
 
+pub async fn delete_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, sqlx::Error> {
+    let workspace = get_workspace(id, pool)
+        .await
+        .expect("Failed to get request to delete");
+    let _ = sqlx::query!(
+        r#"
+            DELETE FROM http_requests
+            WHERE id = ?
+        "#,
+        id,
+    )
+        .execute(pool)
+        .await;
+    Ok(workspace)
+}
+
 pub async fn create_workspace(
     name: &str,
     description: &str,
@@ -395,7 +411,11 @@ pub async fn find_responses(
     .await
 }
 
-pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<(), sqlx::Error> {
+pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpResponse, sqlx::Error> {
+    let resp = get_response(id, pool)
+        .await
+        .expect("Failed to get response to delete");
+
     let _ = sqlx::query!(
         r#"
             DELETE FROM http_responses
@@ -406,7 +426,7 @@ pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<(), sqlx::
     .execute(pool)
     .await;
 
-    Ok(())
+    Ok(resp)
 }
 
 pub async fn delete_all_responses(