From dfb6d608cf9d453ae7d4ccbc92f290370ec80374 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 4 Nov 2026 20:42:30 -0800 Subject: [PATCH] fix(actions): authorize confirmed edits with captured dialog fields --- crates/ui-egui/src/canvas/filter_preview.rs | 2 +- crates/ui-egui/src/dialogs/adjust_preview.rs | 2 +- crates/ui-egui/src/panels/actions.rs | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/crates/ui-egui/src/canvas/filter_preview.rs b/crates/ui-egui/src/canvas/filter_preview.rs index 4ad00a84f4..e94b79a8af 100644 --- a/crates/ui-egui/src/canvas/filter_preview.rs +++ b/crates/ui-egui/src/canvas/filter_preview.rs @@ -58,7 +58,7 @@ pub(crate) fn ensure_filter_preview(app: &mut PhotocraftApp, idx: usize, ctx: &e } params = crate::select_mask_view::request_params(&d.fields, params); } - crate::actions::authorize_preview(app, d.id, &cmd, ¶ms).ok()?; + crate::actions::authorize_dialog_edit(app, d.id, &d.fields, &cmd, ¶ms).ok()?; let st = app.session.documents().get(idx)?; let k = filter_preview_factor(app, &st.doc, &cmd, ¶ms); let request = crate::filter_dialog::FilterPreviewKey { diff --git a/crates/ui-egui/src/dialogs/adjust_preview.rs b/crates/ui-egui/src/dialogs/adjust_preview.rs index 0c9f62ea0b..5f6c752259 100644 --- a/crates/ui-egui/src/dialogs/adjust_preview.rs +++ b/crates/ui-egui/src/dialogs/adjust_preview.rs @@ -192,7 +192,7 @@ fn dialog(app: &PhotocraftApp) -> Option<(String, Value, bool)> { let kind = d.fields.get("__adjust")?.as_str()?.to_string(); let preview = d.fields.get("__preview").and_then(Value::as_bool).unwrap_or(true); let params = crate::filter_dialog::params_of(&d.fields); - crate::actions::authorize_preview(app, d.id, &format!("image.adjustments.{kind}"), ¶ms).ok()?; + crate::actions::authorize_dialog_edit(app, d.id, &d.fields, &format!("image.adjustments.{kind}"), ¶ms).ok()?; Some((kind, params, preview)) } diff --git a/crates/ui-egui/src/panels/actions.rs b/crates/ui-egui/src/panels/actions.rs index 53ed6e1d6c..ed959edf76 100644 --- a/crates/ui-egui/src/panels/actions.rs +++ b/crates/ui-egui/src/panels/actions.rs @@ -1395,11 +1395,16 @@ pub(crate) fn validate_editor(app: &PhotocraftApp, dialog: u64, fields: &serde_j Ok(()) } -/// Record Again and the canonical frame both retain their preview authority and document. -pub(crate) fn authorize_preview(app: &PhotocraftApp, dialog: u64, command: &str, params: &Value) -> Result<(), String> { +/// Authorize a live preview or a confirmed edit using the owning dialog's fields. +pub(crate) fn authorize_dialog_edit( + app: &PhotocraftApp, + dialog: u64, + fields: &serde_json::Map, + command: &str, + params: &Value, +) -> Result<(), String> { record_again::authorize_preview(app, dialog, command, params)?; if let Some(paused) = app.paused_playbacks.paused.values().find(|paused| paused.dialog == dialog) { - let fields = &app.ui.dialogs.iter().find(|value| value.id == dialog).ok_or("the action step dialog closed")?.fields; validate_editor(app, dialog, fields)?; if fields.get("__command").and_then(Value::as_str) != Some(command) { return Err("the paused action preview command changed".into()); @@ -1421,7 +1426,7 @@ pub(crate) fn run_dialog_command( ) -> Result { with_step_gate(app, fields, Some(dialog), |app| { validate_editor(app, dialog, fields)?; - authorize_preview(app, dialog, command, ¶ms)?; + authorize_dialog_edit(app, dialog, fields, command, ¶ms)?; run_step_dialog(app, fields, command, params) }) }