diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 4bea4f00..26b3c0c5 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -42,7 +42,7 @@ use window_ext::TrafficLightWindowExt; use crate::analytics::{AnalyticsAction, AnalyticsResource}; use crate::http::send_http_request; use crate::models::{ - cancel_pending_grpc_connections, cancel_pending_responses, create_response, + cancel_pending_grpc_connections, cancel_pending_responses, create_http_response, delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar, delete_environment, delete_folder, delete_grpc_connection, delete_grpc_request, delete_http_request, delete_http_response, delete_workspace, duplicate_grpc_request, duplicate_http_request, @@ -1001,7 +1001,7 @@ async fn cmd_export_data( } #[tauri::command] -async fn cmd_send_request( +async fn cmd_send_http_request( w: Window, request_id: &str, environment_id: Option<&str>, @@ -1030,7 +1030,7 @@ async fn cmd_send_request( None => None, }; - let response = create_response( + let response = create_http_response( &w, &request.id, 0, @@ -1654,7 +1654,7 @@ fn main() { cmd_list_workspaces, cmd_new_window, cmd_send_ephemeral_request, - cmd_send_request, + cmd_send_http_request, cmd_set_key_value, cmd_set_update_mode, cmd_track_event, diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs index 9a2eb05f..fcd9efcd 100644 --- a/src-tauri/src/models.rs +++ b/src-tauri/src/models.rs @@ -1147,7 +1147,7 @@ pub async fn delete_http_request( } #[allow(clippy::too_many_arguments)] -pub async fn create_response( +pub async fn create_http_response( mgr: &impl Manager, request_id: &str, elapsed: i64, @@ -1190,7 +1190,10 @@ pub async fn create_response( .execute(&db) .await?; - get_http_response(mgr, &id).await + match get_http_response(mgr, &id).await { + Ok(m) => Ok(emit_upserted_model(mgr, m)), + Err(e) => Err(e), + } } pub async fn cancel_pending_grpc_connections(mgr: &impl Manager) -> Result<(), sqlx::Error> { diff --git a/src-web/components/GlobalHooks.tsx b/src-web/components/GlobalHooks.tsx index 88ee8f23..5c5d7a0e 100644 --- a/src-web/components/GlobalHooks.tsx +++ b/src-web/components/GlobalHooks.tsx @@ -92,7 +92,7 @@ export function GlobalHooks() { }); }); - useListenToTauriEvent('deleted_model', ({ payload, windowLabel }) => { + useListenToTauriEvent('deleted_model', ({ payload }) => { if (shouldIgnoreModel(payload)) return; if (payload.model === 'workspace') { diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx index dc0246b1..da2231f0 100644 --- a/src-web/components/Sidebar.tsx +++ b/src-web/components/Sidebar.tsx @@ -743,7 +743,7 @@ const SidebarItem = forwardRef(function SidebarItem( data-active={isActive} data-selected={selected} className={classNames( - 'w-full flex gap-2 items-center text-sm h-xs pl-2 rounded-md transition-colors', + 'w-full flex gap-2 items-center text-sm h-xs px-1.5 rounded-md transition-colors', editing && 'ring-1 focus-within:ring-focus', isActive && 'bg-highlightSecondary text-gray-800', !isActive && @@ -774,22 +774,22 @@ const SidebarItem = forwardRef(function SidebarItem( ) : ( {itemName || itemFallbackName} )} - {latestGrpcConnection ? ( -
- {latestGrpcConnection.elapsed === 0 && ( - - )} -
- ) : latestHttpResponse ? ( -
- {isResponseLoading(latestHttpResponse) ? ( - - ) : ( - - )} -
- ) : null} + {latestGrpcConnection ? ( +
+ {latestGrpcConnection.elapsed === 0 && ( + + )} +
+ ) : latestHttpResponse ? ( +
+ {isResponseLoading(latestHttpResponse) ? ( + + ) : ( + + )} +
+ ) : null} {children} diff --git a/src-web/hooks/useSendAnyRequest.ts b/src-web/hooks/useSendAnyRequest.ts index 67dd75f7..e273ebf9 100644 --- a/src-web/hooks/useSendAnyRequest.ts +++ b/src-web/hooks/useSendAnyRequest.ts @@ -31,7 +31,7 @@ export function useSendAnyRequest(options: { download?: boolean } = {}) { } } - return invoke('cmd_send_request', { + return invoke('cmd_send_http_request', { requestId: id, environmentId, downloadDir: downloadDir,