From 90ca8cf97c5ac7ea83d13618788c0dc9ef2c317f Mon Sep 17 00:00:00 2001 From: filipriec Date: Wed, 23 Apr 2025 12:13:56 +0200 Subject: [PATCH] working dialog is now at the correct place --- client/src/state/app/state.rs | 12 ------------ client/src/ui/handlers/ui.rs | 8 +++++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/client/src/state/app/state.rs b/client/src/state/app/state.rs index 4407b23..d1d40c4 100644 --- a/client/src/state/app/state.rs +++ b/client/src/state/app/state.rs @@ -123,18 +123,6 @@ impl AppState { } } - /// Shows a standard success dialog after saving a table. - pub fn show_save_success_dialog(&mut self, message: &str) { - self.ui.dialog.dialog_show = true; - self.ui.dialog.dialog_title = "Save Successful".to_string(); - self.ui.dialog.dialog_message = message.to_string(); - self.ui.dialog.dialog_buttons = vec!["OK".to_string()]; - self.ui.dialog.dialog_active_button_index = 0; - self.ui.dialog.purpose = Some(DialogPurpose::SaveTableSuccess); - self.ui.dialog.is_loading = false; - self.ui.focus_outside_canvas = true; - self.focused_button_index = 0; // Focus the first (only) button - } /// Hides the dialog and clears its content. pub fn hide_dialog(&mut self) { diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index a9d0930..4f2e038 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -23,6 +23,7 @@ use crate::tui::functions::common::login::LoginResult; use crate::tui::functions::common::register::RegisterResult; use crate::tui::functions::common::add_table::handle_save_table_action; use crate::functions::modes::navigation::add_table_nav::SaveTableResultSender; +use crate::ui::handlers::context::{DialogPurpose, UiContext}; use crate::tui::functions::common::login; use crate::tui::functions::common::register; use std::time::Instant; @@ -230,7 +231,12 @@ pub async fn run_ui() -> Result<()> { app_state.hide_dialog(); // Hide loading indicator match result { Ok(ref success_message) => { - app_state.show_save_success_dialog(success_message); + app_state.show_dialog( + "Save Successful", + success_message, + vec!["OK".to_string()], + DialogPurpose::SaveTableSuccess, + ); admin_state.add_table_state.has_unsaved_changes = false; } Err(e) => {