From dcd1be3fece06485fcb546a744f13eb30f20a452 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 17 Jan 2025 15:51:00 -0800 Subject: [PATCH] Fix default values in dynamic forms --- src-tauri/src/http_request.rs | 26 ++++++++------- src-tauri/src/lib.rs | 33 ++++++++++--------- src-web/components/DynamicForm.tsx | 12 ++++++- .../components/HttpAuthenticationEditor.tsx | 2 ++ 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/src-tauri/src/http_request.rs b/src-tauri/src/http_request.rs index 23c1daca..5d1a4592 100644 --- a/src-tauri/src/http_request.rs +++ b/src-tauri/src/http_request.rs @@ -37,16 +37,17 @@ use yaak_plugins::manager::PluginManager; pub async fn send_http_request( window: &WebviewWindow, - request: &HttpRequest, + unrendered_request: &HttpRequest, og_response: &HttpResponse, environment: Option, cookie_jar: Option, cancelled_rx: &mut Receiver, ) -> Result { let plugin_manager = window.state::(); - let workspace = - get_workspace(window, &request.workspace_id).await.expect("Failed to get Workspace"); - let base_environment = get_base_environment(window, &request.workspace_id) + let workspace = get_workspace(window, &unrendered_request.workspace_id) + .await + .expect("Failed to get Workspace"); + let base_environment = get_base_environment(window, &unrendered_request.workspace_id) .await .expect("Failed to get base environment"); let settings = get_or_create_settings(window).await; @@ -59,10 +60,11 @@ pub async fn send_http_request( let response_id = og_response.id.clone(); let response = Arc::new(Mutex::new(og_response.clone())); - let rendered_request = - render_http_request(&request, &base_environment, environment.as_ref(), &cb).await; + let request = + render_http_request(&unrendered_request, &base_environment, environment.as_ref(), &cb) + .await; - let mut url_string = rendered_request.url; + let mut url_string = request.url; url_string = ensure_proto(&url_string); if !url_string.starts_with("http://") && !url_string.starts_with("https://") { @@ -155,7 +157,7 @@ pub async fn send_http_request( // Render query parameters let mut query_params = Vec::new(); - for p in rendered_request.url_parameters { + for p in request.url_parameters.clone() { if !p.enabled || p.name.is_empty() { continue; } @@ -186,7 +188,7 @@ pub async fn send_http_request( } }; - let m = Method::from_bytes(rendered_request.method.to_uppercase().as_bytes()) + let m = Method::from_bytes(request.method.to_uppercase().as_bytes()) .expect("Failed to create method"); let mut request_builder = client.request(m, url).query(&query_params); @@ -209,7 +211,7 @@ pub async fn send_http_request( // ); // } - for h in rendered_request.headers { + for h in request.headers.clone() { if h.name.is_empty() && h.value.is_empty() { continue; } @@ -236,8 +238,8 @@ pub async fn send_http_request( headers.insert(header_name, header_value); } - let request_body = rendered_request.body; - if let Some(body_type) = &rendered_request.body_type { + let request_body = request.body.clone(); + if let Some(body_type) = &request.body_type { if body_type == "graphql" { let query = get_str_h(&request_body, "query"); let variables = get_str_h(&request_body, "variables"); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index f60d2204..33faa491 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -203,14 +203,15 @@ async fn cmd_grpc_go( Some(id) => Some(get_environment(&window, id).await.map_err(|e| e.to_string())?), None => None, }; - let req = get_grpc_request(&window, request_id) + let unrendered_request = get_grpc_request(&window, request_id) .await .map_err(|e| e.to_string())? .ok_or("Failed to find GRPC request")?; - let base_environment = - get_base_environment(&window, &req.workspace_id).await.map_err(|e| e.to_string())?; - let req = render_grpc_request( - &req, + let base_environment = get_base_environment(&window, &unrendered_request.workspace_id) + .await + .map_err(|e| e.to_string())?; + let request = render_grpc_request( + &unrendered_request, &base_environment, environment.as_ref(), &PluginTemplateCallback::new( @@ -223,7 +224,7 @@ async fn cmd_grpc_go( let mut metadata = BTreeMap::new(); // Add the rest of metadata - for h in req.clone().metadata { + for h in request.clone().metadata { if h.name.is_empty() && h.value.is_empty() { continue; } @@ -235,12 +236,12 @@ async fn cmd_grpc_go( metadata.insert(h.name, h.value); } - if let Some(auth_name) = req.authentication_type.clone() { - let auth = req.authentication.clone(); + if let Some(auth_name) = request.authentication_type.clone() { + let auth = request.authentication.clone(); let plugin_req = CallHttpAuthenticationRequest { config: serde_json::to_value(&auth).unwrap().as_object().unwrap().to_owned(), method: "POST".to_string(), - url: req.url.clone(), + url: request.url.clone(), headers: metadata .iter() .map(|(name, value)| HttpHeader { @@ -259,7 +260,7 @@ async fn cmd_grpc_go( } let conn = { - let req = req.clone(); + let req = request.clone(); upsert_grpc_connection( &window, &GrpcConnection { @@ -280,8 +281,8 @@ async fn cmd_grpc_go( let conn_id = conn.id.clone(); let base_msg = GrpcEvent { - workspace_id: req.clone().workspace_id, - request_id: req.clone().id, + workspace_id: request.clone().workspace_id, + request_id: request.clone().id, connection_id: conn.clone().id, ..Default::default() }; @@ -290,12 +291,12 @@ async fn cmd_grpc_go( let maybe_in_msg_tx = std::sync::Mutex::new(Some(in_msg_tx.clone())); let (cancelled_tx, mut cancelled_rx) = tokio::sync::watch::channel(false); - let uri = safe_uri(&req.url); + let uri = safe_uri(&request.url); let in_msg_stream = tokio_stream::wrappers::ReceiverStream::new(in_msg_rx); let (service, method) = { - let req = req.clone(); + let req = request.clone(); match (req.service, req.method) { (Some(service), Some(method)) => (service, method), _ => return Err("Service and method are required".to_string()), @@ -307,7 +308,7 @@ async fn cmd_grpc_go( .lock() .await .connect( - &req.clone().id, + &request.clone().id, uri.as_str(), &proto_files.iter().map(|p| PathBuf::from_str(p).unwrap()).collect(), ) @@ -438,7 +439,7 @@ async fn cmd_grpc_go( let grpc_listen = { let window = window.clone(); let base_event = base_msg.clone(); - let req = req.clone(); + let req = request.clone(); let msg = if req.message.is_empty() { "{}".to_string() } else { req.message }; let msg = render_template( msg.as_str(), diff --git a/src-web/components/DynamicForm.tsx b/src-web/components/DynamicForm.tsx index 2987b27a..37aae1bc 100644 --- a/src-web/components/DynamicForm.tsx +++ b/src-web/components/DynamicForm.tsx @@ -31,17 +31,19 @@ export function DynamicForm>({ data, onChange, useTemplating, + autocompleteVariables, stateKey, }: { config: FormInput[]; onChange: (value: T) => void; data: T; useTemplating?: boolean; + autocompleteVariables?: boolean; stateKey: string; }) { const setDataAttr = useCallback( (name: string, value: string | boolean | null) => { - onChange({ ...data, [name]: value == null ? '__NULL__' : value }); + onChange({ ...data, [name]: value == DYNAMIC_FORM_NULL_ARG ? undefined : value }); }, [data, onChange], ); @@ -66,6 +68,7 @@ export function DynamicForm>({ stateKey={stateKey} arg={a} useTemplating={useTemplating || false} + autocompleteVariables={autocompleteVariables || false} onChange={(v) => setDataAttr(a.name, v)} value={data[a.name] ? String(data[a.name]) : DYNAMIC_FORM_NULL_ARG} /> @@ -77,6 +80,7 @@ export function DynamicForm>({ stateKey={stateKey} arg={a} useTemplating={useTemplating || false} + autocompleteVariables={autocompleteVariables || false} onChange={(v) => setDataAttr(a.name, v)} value={data[a.name] ? String(data[a.name]) : DYNAMIC_FORM_NULL_ARG} /> @@ -119,12 +123,14 @@ function TextArg({ onChange, value, useTemplating, + autocompleteVariables, stateKey, }: { arg: FormInputText; value: string; onChange: (v: string) => void; useTemplating: boolean; + autocompleteVariables: boolean; stateKey: string; }) { const handleChange = useCallback( @@ -145,6 +151,7 @@ function TextArg({ hideLabel={arg.label == null} placeholder={arg.placeholder ?? arg.defaultValue ?? ''} useTemplating={useTemplating} + autocompleteVariables={autocompleteVariables} stateKey={stateKey} forceUpdateKey={stateKey} /> @@ -156,12 +163,14 @@ function EditorArg({ onChange, value, useTemplating, + autocompleteVariables, stateKey, }: { arg: FormInputEditor; value: string; onChange: (v: string) => void; useTemplating: boolean; + autocompleteVariables: boolean; stateKey: string; }) { const handleChange = useCallback( @@ -196,6 +205,7 @@ function EditorArg({ defaultValue={value === DYNAMIC_FORM_NULL_ARG ? arg.defaultValue : value} placeholder={arg.placeholder ?? arg.defaultValue ?? ''} useTemplating={useTemplating} + autocompleteVariables={autocompleteVariables} stateKey={stateKey} forceUpdateKey={stateKey} hideGutter diff --git a/src-web/components/HttpAuthenticationEditor.tsx b/src-web/components/HttpAuthenticationEditor.tsx index 6a345c3d..ef5d0fc9 100644 --- a/src-web/components/HttpAuthenticationEditor.tsx +++ b/src-web/components/HttpAuthenticationEditor.tsx @@ -39,6 +39,8 @@ export function HttpAuthenticationEditor({ request }: Props) { return (