starred/minne
1
0
Fork 0
mirror of https://github.com/perstarkse/minne.git synced 2026-04-10 11:23:41 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: htmx aware error handling

Browse Source
This commit is contained in:
Per Stark
2025-04-08 16:12:08 +02:00
parent c000ac07b3
commit c3c0f69bba
3 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
html-router/src/middlewares/response_middleware.rs
View File

@@ -4,6 +4,7 @@ use axum::{
response::{Html, IntoResponse, Response},
Extension,
};
use axum_htmx::{HxRequest, HX_TRIGGER};
use common::{error::AppError, utils::template_engine::ProvidesTemplateEngine};
use minijinja::{context, Value};
use serde::Serialize;
@@ -97,7 +98,11 @@ impl IntoResponse for TemplateResponse {
}
}
pub async fn with_template_response<S>(State(state): State<S>, response: Response) -> Response
pub async fn with_template_response<S>(
State(state): State<S>,
HxRequest(is_htmx): HxRequest,
response: Response,
) -> Response
where
S: ProvidesTemplateEngine + Clone + Send + Sync + 'static,
{
@@ -123,44 +128,37 @@ where
}
}
}
TemplateKind::Error(_status) => {
// Extract title and description from context
let title = template_response
.context
.get_attr("title")
.ok()
.and_then(|v| v.as_str().map(|s| s.to_string()))
.unwrap_or_else(|| "Error".to_string()); // Fallback title
let description = template_response
.context
.get_attr("description")
.ok()
.and_then(|v| v.as_str().map(|s| s.to_string()))
.unwrap_or_else(|| "An error occurred.".to_string()); // Fallback desc
TemplateKind::Error(status) => {
if is_htmx {
// HTMX request: Send 204 + HX-Trigger for toast
let title = template_response
.context
.get_attr("title")
.ok()
.and_then(|v| v.as_str().map(String::from))
.unwrap_or_else(|| "Error".to_string());
let description = template_response
.context
.get_attr("description")
.ok()
.and_then(|v| v.as_str().map(String::from))
.unwrap_or_else(|| "An error occurred.".to_string());
let trigger_payload = json!({
"toast": {
"title": title,
"description": description,
"type": "error"
let trigger_payload = json!({"toast": {"title": title, "description": description, "type": "error"}});
let trigger_value = serde_json::to_string(&trigger_payload).unwrap_or_else(|e| {error!("Failed to serialize HX-Trigger payload: {}", e);
r#"{"toast":{"title":"Error","description":"An unexpected error occurred.", "type":"error"}}"#.to_string()});
(StatusCode::NO_CONTENT, [(HX_TRIGGER, trigger_value)], "").into_response()
} else {
// Non-HTMX request: Render the full errors/error.html page
match template_engine.render("errors/error.html", &template_response.context) {
Ok(html) => (*status, Html(html)).into_response(),
Err(e) => {
error!("Critical: Failed to render 'errors/error.html': {:?}", e);
// Fallback HTML, but use the intended status code
(*status, Html(fallback_error())).into_response()
}
}
});
// Convert payload to string
let trigger_value = serde_json::to_string(&trigger_payload)
.unwrap_or_else(|e| {
error!("Failed to serialize HX-Trigger payload: {}", e);
// Fallback trigger if serialization fails
r#"{"toast":{"title":"Error","description":"An unexpected error occurred.", "type":"error"}}"#.to_string()
});
// Return 204 No Content with HX-Trigger header
(
StatusCode::NO_CONTENT,
[(axum_htmx::HX_TRIGGER, trigger_value)],
"", // Empty body for 204
)
.into_response()
}
}
TemplateKind::Redirect(path) => {
(StatusCode::OK, [(axum_htmx::HX_REDIRECT, path.clone())], "").into_response()

1
html-router/src/routes/index/handlers.rs
View File

@@ -151,6 +151,7 @@ pub async fn show_active_jobs(
State(state): State<HtmlState>,
RequireUser(user): RequireUser,
) -> Result<impl IntoResponse, HtmlError> {
return Ok(TemplateResponse::server_error());
let active_jobs = User::get_unfinished_ingestion_tasks(&user.id, &state.db).await?;
Ok(TemplateResponse::new_partial(