Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(admin): show save errors under the field they belong to

Hampusc80c0d809b5f
diff --git a/fluxer_admin/src/middleware/flash.rs b/fluxer_admin/src/middleware/flash.rs
index 0c2f5f263..be9164cda 100644
--- a/fluxer_admin/src/middleware/flash.rs
+++ b/fluxer_admin/src/middleware/flash.rs
@@ -17,6 +17,14 @@ pub struct FlashData {
pub flash_type: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub detail: Option<String>,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub field_error: Option<FieldError>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct FieldError {
+ pub field: String,
+ pub message: String,
}
impl FlashData {
@@ -25,6 +33,7 @@ impl FlashData {
message: message.into(),
flash_type: "success".to_owned(),
detail: None,
+ field_error: None,
}
}
@@ -33,6 +42,7 @@ impl FlashData {
message: message.into(),
flash_type: "error".to_owned(),
detail: None,
+ field_error: None,
}
}
@@ -41,9 +51,18 @@ impl FlashData {
message: message.into(),
flash_type: "info".to_owned(),
detail: None,
+ field_error: None,
}
}
+ pub fn with_field_error(mut self, field: &str, message: impl Into<String>) -> Self {
+ self.field_error = Some(FieldError {
+ field: field.to_owned(),
+ message: message.into(),
+ });
+ self
+ }
+
pub fn to_flash_message(&self) -> FlashMessage {
FlashMessage {
level: match self.flash_type.as_str() {
diff --git a/fluxer_admin/src/middleware/htmx.rs b/fluxer_admin/src/middleware/htmx.rs
index 1b4f0d5f2..98d9f64f6 100644
--- a/fluxer_admin/src/middleware/htmx.rs
+++ b/fluxer_admin/src/middleware/htmx.rs
@@ -50,15 +50,37 @@ pub fn navigate_with_flash(url: &str, flash: &FlashData, secure: bool) -> Respon
}
pub fn add_toast_header(response: &mut Response, flash: &FlashData) {
- let payload = serde_json::json!({
- "level": flash.flash_type,
- "message": flash.message,
- });
- if let Ok(value) = HeaderValue::from_str(&payload.to_string()) {
+ let mut payload = serde_json::json!({"level": flash.flash_type});
+ if flash
+ .field_error
+ .as_ref()
+ .is_none_or(|field_error| field_error.message != flash.message)
+ {
+ payload["message"] = flash.message.clone().into();
+ }
+ if let Some(field_error) = &flash.field_error {
+ payload["field"] = field_error.field.clone().into();
+ payload["field_message"] = field_error.message.clone().into();
+ }
+ if let Ok(value) = HeaderValue::from_str(&ascii_json(&payload)) {
response.headers_mut().insert(ADMIN_TOAST, value);
}
}
+fn ascii_json(value: &serde_json::Value) -> String {
+ let mut out = String::new();
+ for c in value.to_string().chars() {
+ if c.is_ascii() {
+ out.push(c);
+ } else {
+ for unit in c.encode_utf16(&mut [0; 2]) {
+ out.push_str(&format!("\\u{unit:04x}"));
+ }
+ }
+ }
+ out
+}
+
pub async fn flash_redirect_to_toast(request: Request, next: Next) -> Response {
let should_convert = is_htmx_request(request.headers())
&& targets(request.headers(), "flash-container")
diff --git a/fluxer_admin/src/templates/layout_scripts.rs b/fluxer_admin/src/templates/layout_scripts.rs
index ca1a4d67f..560cfa050 100644
--- a/fluxer_admin/src/templates/layout_scripts.rs
+++ b/fluxer_admin/src/templates/layout_scripts.rs
@@ -389,6 +389,15 @@ pub const HTMX_FLASH_SCRIPT: &str = r#"
}
}
+ function hideToast() {
+ if (hideTimer) {
+ window.clearTimeout(hideTimer);
+ hideTimer = 0;
+ }
+ if (activeToast) activeToast.remove();
+ activeToast = null;
+ }
+
function requestVerb(detail) {
var cfg = detail && detail.requestConfig;
return String((cfg && cfg.verb) || '').toLowerCase();
@@ -508,7 +517,9 @@ pub const HTMX_FLASH_SCRIPT: &str = r#"
var parsed = JSON.parse(raw);
return {
level: parsed && parsed.level ? String(parsed.level) : 'info',
- message: parsed && parsed.message ? String(parsed.message) : ''
+ message: parsed && parsed.message ? String(parsed.message) : '',
+ field: parsed && parsed.field ? String(parsed.field) : '',
+ fieldMessage: parsed && parsed.field_message ? String(parsed.field_message) : ''
};
} catch (error) {
return null;
@@ -529,13 +540,57 @@ pub const HTMX_FLASH_SCRIPT: &str = r#"
});
}
+ function fieldErrorSlots(root) {
+ return root && root.querySelectorAll ? root.querySelectorAll('[data-field-error]') : [];
+ }
+
+ function clearFieldErrors(detail) {
+ var elt = mutationElement(detail);
+ var form = elt && elt.closest ? elt.closest('form') : null;
+ Array.prototype.forEach.call(fieldErrorSlots(form), function (slot) {
+ slot.textContent = '';
+ slot.hidden = true;
+ var field = document.getElementById(slot.getAttribute('data-field-error'));
+ if (field) field.removeAttribute('aria-invalid');
+ });
+ }
+
+ function showFieldError(toast) {
+ if (!toast || !toast.field || !toast.fieldMessage) return false;
+ var field = document.getElementById(toast.field);
+ var slot = Array.prototype.find.call(fieldErrorSlots(document), function (candidate) {
+ return candidate.getAttribute('data-field-error') === toast.field;
+ });
+ if (!field || !slot) return false;
+ slot.textContent = toast.fieldMessage;
+ slot.hidden = false;
+ field.setAttribute('aria-invalid', 'true');
+ window.setTimeout(function () { field.focus(); }, 0);
+ return true;
+ }
+
+ function showResult(toast) {
+ if (showFieldError(toast) && !toast.message) {
+ hideToast();
+ return;
+ }
+ showToast(toast.level, toast.message || toast.fieldMessage);
+ }
+
document.body.addEventListener('showFlash', function (evt) {
var d = evt.detail || {};
showToast(d.level || 'info', d.message || '');
});
+ function clearFlashBanner() {
+ var container = document.getElementById('flash-container');
+ if (container) container.innerHTML = '';
+ }
+
document.addEventListener('htmx:beforeRequest', function (event) {
if (!isMutation(event.detail)) return;
+ clearFlashBanner();
+ clearFieldErrors(event.detail);
showToast('info', 'Working...', {persist: true});
}, true);
@@ -552,7 +607,7 @@ pub const HTMX_FLASH_SCRIPT: &str = r#"
event.detail.shouldSwap = false;
event.detail.isError = false;
markToastHandled(event.detail);
- showToast(parsed.level, parsed.message);
+ showResult(parsed);
refreshAfterSuccess(event.detail, parsed.level);
}, true);
@@ -562,7 +617,7 @@ pub const HTMX_FLASH_SCRIPT: &str = r#"
var xhr = event.detail.xhr;
var serverToast = parseAdminToastHeader(xhr);
if (serverToast) {
- showToast(serverToast.level, serverToast.message);
+ showResult(serverToast);
markToastHandled(event.detail);
refreshAfterSuccess(event.detail, serverToast.level);
return;