From 41f9c480c8edbb999ca1637e6ea51d74e1aed7ba Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Fri, 7 Jul 2023 18:39:18 -0700 Subject: [PATCH] remove old references to server context --- docs/guide/examples/server_context.rs | 6 +++--- docs/guide/examples/server_context_state.rs | 6 +++--- .../fullstack/examples/salvo-hello-world/src/main.rs | 8 ++++---- packages/fullstack/examples/warp-hello-world/src/main.rs | 8 ++++---- playwrite-tests/fullstack/src/main.rs | 9 ++------- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/docs/guide/examples/server_context.rs b/docs/guide/examples/server_context.rs index eb3c5e9c1..172b978e9 100644 --- a/docs/guide/examples/server_context.rs +++ b/docs/guide/examples/server_context.rs @@ -74,10 +74,9 @@ fn app(cx: Scope) -> Element { button { onclick: move |_| { to_owned![count]; - let sc = cx.sc(); async move { // Call the server function just like a local async function - if let Ok(new_count) = double_server(sc, *count.current()).await { + if let Ok(new_count) = double_server(*count.current()).await { count.set(new_count); } } @@ -89,7 +88,8 @@ fn app(cx: Scope) -> Element { // We use the "getcbor" encoding to make caching easier #[server(DoubleServer, "", "getcbor")] -async fn double_server(cx: DioxusServerContext, number: usize) -> Result { +async fn double_server(number: usize) -> Result { + let cx = server_context(); // Perform some expensive computation or access a database on the server tokio::time::sleep(std::time::Duration::from_secs(1)).await; let result = number * 2; diff --git a/docs/guide/examples/server_context_state.rs b/docs/guide/examples/server_context_state.rs index c75496561..0f0b541cc 100644 --- a/docs/guide/examples/server_context_state.rs +++ b/docs/guide/examples/server_context_state.rs @@ -92,10 +92,9 @@ fn app(cx: Scope) -> Element { button { onclick: move |_| { to_owned![count]; - let sc = cx.sc(); async move { // Call the server function just like a local async function - if let Ok(new_count) = double_server(sc, *count.current()).await { + if let Ok(new_count) = double_server(*count.current()).await { count.set(new_count); } } @@ -107,10 +106,11 @@ fn app(cx: Scope) -> Element { // We use the "getcbor" encoding to make caching easier #[server(DoubleServer, "", "getcbor")] -async fn double_server(cx: DioxusServerContext, number: usize) -> Result { +async fn double_server(number: usize) -> Result { // Perform some expensive computation or access a database on the server tokio::time::sleep(std::time::Duration::from_secs(1)).await; let result = number * 2; + let cx = server_context(); println!( "User Agent {:?}", diff --git a/packages/fullstack/examples/salvo-hello-world/src/main.rs b/packages/fullstack/examples/salvo-hello-world/src/main.rs index 79dfeb692..84e190aab 100644 --- a/packages/fullstack/examples/salvo-hello-world/src/main.rs +++ b/packages/fullstack/examples/salvo-hello-world/src/main.rs @@ -24,7 +24,6 @@ struct AppProps { fn app(cx: Scope) -> Element { let mut count = use_state(cx, || cx.props.count); let text = use_state(cx, || "...".to_string()); - let server_context = cx.sc(); cx.render(rsx! { h1 { "High-Five counter: {count}" } @@ -32,12 +31,12 @@ fn app(cx: Scope) -> Element { button { onclick: move |_| count -= 1, "Down low!" } button { onclick: move |_| { - to_owned![text, server_context]; + to_owned![text]; async move { if let Ok(data) = get_server_data().await { println!("Client received: {}", data); text.set(data.clone()); - post_server_data(server_context, data).await.unwrap(); + post_server_data(data).await.unwrap(); } } }, @@ -48,8 +47,9 @@ fn app(cx: Scope) -> Element { } #[server(PostServerData)] -async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> { +async fn post_server_data(data: String) -> Result<(), ServerFnError> { // The server context contains information about the current request and allows you to modify the response. + let cx = server_context(); cx.response_headers_mut() .insert("Set-Cookie", "foo=bar".parse().unwrap()); println!("Server received: {}", data); diff --git a/packages/fullstack/examples/warp-hello-world/src/main.rs b/packages/fullstack/examples/warp-hello-world/src/main.rs index 79dfeb692..84e190aab 100644 --- a/packages/fullstack/examples/warp-hello-world/src/main.rs +++ b/packages/fullstack/examples/warp-hello-world/src/main.rs @@ -24,7 +24,6 @@ struct AppProps { fn app(cx: Scope) -> Element { let mut count = use_state(cx, || cx.props.count); let text = use_state(cx, || "...".to_string()); - let server_context = cx.sc(); cx.render(rsx! { h1 { "High-Five counter: {count}" } @@ -32,12 +31,12 @@ fn app(cx: Scope) -> Element { button { onclick: move |_| count -= 1, "Down low!" } button { onclick: move |_| { - to_owned![text, server_context]; + to_owned![text]; async move { if let Ok(data) = get_server_data().await { println!("Client received: {}", data); text.set(data.clone()); - post_server_data(server_context, data).await.unwrap(); + post_server_data(data).await.unwrap(); } } }, @@ -48,8 +47,9 @@ fn app(cx: Scope) -> Element { } #[server(PostServerData)] -async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> { +async fn post_server_data(data: String) -> Result<(), ServerFnError> { // The server context contains information about the current request and allows you to modify the response. + let cx = server_context(); cx.response_headers_mut() .insert("Set-Cookie", "foo=bar".parse().unwrap()); println!("Server received: {}", data); diff --git a/playwrite-tests/fullstack/src/main.rs b/playwrite-tests/fullstack/src/main.rs index 98caadbb6..b453d3f47 100644 --- a/playwrite-tests/fullstack/src/main.rs +++ b/playwrite-tests/fullstack/src/main.rs @@ -69,12 +69,11 @@ fn app(cx: Scope) -> Element { class: "server-button", onclick: move |_| { to_owned![text]; - let sc = cx.sc(); async move { if let Ok(data) = get_server_data().await { println!("Client received: {}", data); text.set(data.clone()); - post_server_data(sc, data).await.unwrap(); + post_server_data(data).await.unwrap(); } } }, @@ -85,12 +84,8 @@ fn app(cx: Scope) -> Element { } #[server(PostServerData)] -async fn post_server_data(cx: DioxusServerContext, data: String) -> Result<(), ServerFnError> { - // The server context contains information about the current request and allows you to modify the response. - cx.response_headers_mut() - .insert("Set-Cookie", "foo=bar".parse().unwrap()); +async fn post_server_data(data: String) -> Result<(), ServerFnError> { println!("Server received: {}", data); - println!("Request parts are {:?}", cx.request_parts()); Ok(()) }