Skip to content

Commit 4c208cf

Browse files
committedJan 21, 2025
Update dependencies
1 parent d4568dc commit 4c208cf

File tree

8 files changed

+178
-221
lines changed

8 files changed

+178
-221
lines changed
 

‎Cargo.lock

+155-199
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
clap = { version = "4.5.23", features = ["derive", "env"] }
9+
clap = { version = "4.5.27", features = ["derive", "env"] }
1010
color-eyre = "0.6.3"
1111
comfy-table = "7.1.3"
12-
tokio = { version = "1.42.0", features = ["macros", "rt"] }
12+
tokio = { version = "1.43.0", features = ["macros", "rt"] }
1313

1414
[dependencies.sqlx]
15-
version = "0.8.2"
15+
version = "0.8.3"
1616
features = ["postgres", "migrate", "runtime-tokio-rustls", "macros", "uuid"]

‎api/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ base64 = "0.22.1"
1414
chrono = { version = "0.4.39", features = ["serde"] }
1515
serde = "1.0.217"
1616
kabalist_types = { path = "../types", features = ["openapi"] }
17-
uuid = { version = "1.11.0", features = ["serde"] }
17+
uuid = { version = "1.12.1", features = ["serde"] }
1818
serde_repr = "0.1.19"
19-
axum = { version = "0.8.0-rc.1", features = [] }
20-
axum-extra = { version = "0.10.0-rc.1", features = ["typed-header"] }
19+
axum = { version = "0.8.2", features = ["macros"] }
20+
axum-extra = { version = "0.11.0", features = ["typed-header"] }
2121
tracing = "0.1.41"
2222
tracing-subscriber = "0.3.19"
23-
tokio = { version = "1.42.0", features = ["rt-multi-thread", "macros"] }
23+
tokio = { version = "1.43.0", features = ["rt-multi-thread", "macros"] }
2424
figment = { version = "0.10.19", features = ["toml", "env"] }
2525
color-eyre = "0.6.3"
2626
tokio-stream = "0.1.17"
2727
tera = "1.20.0"
2828
tower-http = { version = "0.6.2", features = ["cors"] }
29-
utoipa = { version = "5.3.0", features = ["uuid"] }
29+
utoipa = { version = "5.3.1", features = ["uuid"] }
3030
jwt-simple = { version = "0.12", default-features = false, features = [
3131
"pure-rust",
3232
] }
3333
# to be update when it uses a stable axum 0.8.0 version (and when we also do)
3434
# utoipa-swagger-ui = { version = "8.1.0", features = ["axum"] }
3535

3636
[dependencies.sqlx]
37-
version = "0.8.2"
37+
version = "0.8.3"
3838
features = ["postgres", "migrate", "runtime-tokio-rustls", "macros", "uuid"]

‎api/src/main.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,10 @@ async fn search_account(
385385

386386
#[derive(Deserialize, ToSchema, Debug)]
387387
struct SearchQuery {
388-
search: String,
388+
search: Option<String>,
389389
}
390390

391+
#[axum::debug_handler]
391392
#[utoipa::path(
392393
get,
393394
path = "/api/history/{list}",
@@ -409,14 +410,14 @@ async fn history_search(
409410
Extension(db): Extension<PgPool>,
410411
user: User,
411412
extract::Path(list): extract::Path<Uuid>,
412-
search: Option<Query<SearchQuery>>,
413+
search: Query<SearchQuery>,
413414
) -> Rsp<GetHistoryResponse> {
414415
let results =
415416
sqlx::query!(
416417
"SELECT name::text FROM history WHERE list = $1 AND creator = $2 AND name ILIKE '%' || $3 || '%'",
417418
list,
418419
user.id,
419-
search.as_ref().map(|Query(q)| -> &str { &q.search }).unwrap_or(""),
420+
search.search.as_deref().unwrap_or_default(),
420421
)
421422
.fetch_all(&db)
422423
.await?;

‎cli/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ kabalist_client = { path = "../client" }
1010
color-eyre = "0.6"
1111
promptly = "0.3.1"
1212
rpassword = "7.3.1"
13-
tokio = { version = "1.42.0", features = ["full"] }
13+
tokio = { version = "1.43.0", features = ["full"] }
1414
yansi = "1.0.1"
15-
clap = { version = "4.5.23", features = ["derive", "env"] }
16-
clap_complete = "4.5.40"
17-
itertools = "0.13.0"
15+
clap = { version = "4.5.27", features = ["derive", "env"] }
16+
clap_complete = "4.5.42"
17+
itertools = "0.14.0"

‎client/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
reqwest = { version = "0.12.11", features = ["json", "rustls-tls"], default-features = false }
9+
reqwest = { version = "0.12.12", features = ["json", "rustls-tls"], default-features = false }
1010
serde = { version = "1.0.217", features = ["derive"] }
11-
thiserror = "2.0.9"
11+
thiserror = "2.0.11"
1212
kabalist_types = { path = "../types" }

‎types/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ openapi = ["utoipa"]
1010

1111
[dependencies]
1212
serde = { version = "1.0.217", features = ["derive"] }
13-
thiserror = "2.0.9"
14-
uuid = { version = "1.11.0", features = ["serde"] }
15-
utoipa = { version = "5.3.0", features = ["uuid"], optional = true }
13+
thiserror = "2.0.11"
14+
uuid = { version = "1.12.1", features = ["serde"] }
15+
utoipa = { version = "5.3.1", features = ["uuid"], optional = true }

‎web/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ gloo = "0.11.0"
1717
kabalist_client = { path = "../client" }
1818
wasm-bindgen-futures = "=0.4.45"
1919
serde = { version = "1.0.217", features = ["derive"] }
20-
itertools = "0.13.0"
20+
itertools = "0.14.0"
2121
futures = "0.3.31"

0 commit comments

Comments
 (0)
Please sign in to comment.