From e2956455c8d7973223199de529bdf0c14f96a611 Mon Sep 17 00:00:00 2001 From: Priec Date: Wed, 19 Aug 2026 00:07:11 +0200 Subject: [PATCH] fixes --- client | 2 +- server | 2 +- web/src/pages/import_export/import/logic.rs | 5 +++-- web/src/ui/mod.rs | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/client b/client index 9d6b35a7..9b57d475 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 9d6b35a7871dd11e2ea90439b8298694e6071018 +Subproject commit 9b57d475cc83dd5c9f7540ff279ac98deb9e0d48 diff --git a/server b/server index f1b23815..59dee75a 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit f1b2381563b5d529a97d50671a97db92a2bb68e2 +Subproject commit 59dee75ae65c3cc29fe08f03a43059a6500d7224 diff --git a/web/src/pages/import_export/import/logic.rs b/web/src/pages/import_export/import/logic.rs index 9a323a29..76c3a0ac 100644 --- a/web/src/pages/import_export/import/logic.rs +++ b/web/src/pages/import_export/import/logic.rs @@ -489,7 +489,7 @@ fn reject(headers: &HeaderMap, message: String) -> Response { /// pattern a value does not satisfy — is the user's to fix and answers 422; /// only an actually unreachable backend answers 502. fn grpc_error(headers: &HeaderMap, error: &tonic::Status) -> Response { - crate::ui::FormError::from_status(error) + crate::ui::FormError::from_status_with_message(error, format!("{error:?}")) .into_response(Locale::from_headers(headers), ui::render_error) } @@ -509,13 +509,14 @@ fn import_error( return failure.into_response(locale, ui::render_error); } let status = failure.status_code(); + let backend_error = format!("{error:?}"); let message = ui::render_import_failure( locale, inserted_before_chunk + inserted_in_chunk, prepared_rows, // One header row precedes the data, and CSV rows are one-based. chunk_start + failed_row_index + 2, - failure.message(), + &backend_error, ); (status, Html(message)).into_response() } diff --git a/web/src/ui/mod.rs b/web/src/ui/mod.rs index cab9d5eb..d7a268f1 100644 --- a/web/src/ui/mod.rs +++ b/web/src/ui/mod.rs @@ -39,7 +39,13 @@ impl FormError { /// on some pages and a rejected submission as an unreachable backend on /// others. pub(crate) fn from_status(status: &tonic::Status) -> Self { - let message = status.message().to_string(); + Self::from_status_with_message(status, status.message().to_string()) + } + + pub(crate) fn from_status_with_message( + status: &tonic::Status, + message: String, + ) -> Self { match status.code() { tonic::Code::Unauthenticated => Self::Unauthenticated, tonic::Code::PermissionDenied => Self::Forbidden(message),