changes for revert save in the readonly mode and not only the edit mode finished.

Cargo.lock

@@ -421,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "client"
-version = "0.2.5"
+version = "0.3.0"
 dependencies = [
  "async-trait",
  "common",
@@ -458,7 +458,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.2.5"
+version = "0.3.0"
 dependencies = [
  "prost",
  "serde",
@@ -2589,7 +2589,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.2.5"
+version = "0.3.0"
 dependencies = [
  "bcrypt",
  "chrono",

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # TODO: idk how to do the name, fix later
 # name = "Multieko2"
-version = "0.2.5"
+version = "0.3.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
 authors = ["Filip Priečinský <filippriec@gmail.com>"]

client/src/components/auth/login.rs

@@ -4,13 +4,13 @@ use crate::{
     config::colors::themes::Theme,
     state::pages::auth::AuthState,
     components::common::dialog,
-    state::state::AppState,  // Add this import
+    state::state::AppState,
 };
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
-    style::{Style, Modifier, Color},  // Removed unused Color import
+    style::{Style, Modifier, Color},
     widgets::{Block, BorderType, Borders, Paragraph},
-    Frame,  // Removed unused Span import
+    Frame,
 };
 
 pub fn render_login(
@@ -18,7 +18,7 @@ pub fn render_login(
     area: Rect,
     theme: &Theme,
     state: &AuthState,
-    app_state: &AppState,  // Add AppState parameter
+    app_state: &AppState,
     is_edit_mode: bool,
 ) {
     // Main container
@@ -47,24 +47,9 @@ pub fn render_login(
         .split(inner_area);
 
     // --- FORM RENDERING ---
-    let input_block = Block::default()
-        .borders(Borders::ALL)
-        .border_style(if is_edit_mode {
-            Style::default().fg(theme.accent)
-        } else {
-            Style::default().fg(theme.border)
-        })
-        .style(Style::default().bg(theme.bg));
-
-    // Calculate inner area BEFORE rendering
-    let input_area = input_block.inner(chunks[0]);
-    
-    f.render_widget(input_block, chunks[0]);
-
-    // Use the canvas renderer for fields
     crate::components::handlers::canvas::render_canvas(
         f,
-        input_area,  // Use the pre-calculated area
+        chunks[0],
         state,
         &["Username/Email", "Password"],
         &state.current_field,
@@ -73,7 +58,17 @@ pub fn render_login(
         is_edit_mode,
     );
 
-    // --- BUTTONS --- (Keep this unchanged)
+    // --- ERROR MESSAGE ---
+    if let Some(err) = &state.error_message {
+        f.render_widget(
+            Paragraph::new(err.as_str())
+                .style(Style::default().fg(Color::Red))
+                .alignment(Alignment::Center),
+            chunks[1],
+        );
+    }
+
+    // --- BUTTONS ---
     let button_chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
@@ -123,24 +118,18 @@ pub fn render_login(
         button_chunks[1],
     );
 
-    // Error message
+    // --- DIALOG ---
-    if let Some(err) = &state.error_message {
+    // Check the correct field name for showing the dialog
-        f.render_widget(
+    if app_state.ui.dialog.dialog_show {
-            Paragraph::new(err.as_str())
+        // Pass all 7 arguments correctly
-                .style(Style::default().fg(Color::Red))
-                .alignment(Alignment::Center),
-            chunks[1],
-        );
-    }
-
-    if app_state.ui.dialog.show_dialog {
         dialog::render_dialog(
             f,
-            f.area(), // Use area() instead of deprecated size()
+            f.area(),
             theme,
             &app_state.ui.dialog.dialog_title,
             &app_state.ui.dialog.dialog_message,
-            app_state.ui.dialog.dialog_button_active,
+            &app_state.ui.dialog.dialog_buttons, // Pass buttons slice
+            app_state.ui.dialog.dialog_active_button_index, // Pass active index
         );
     }
 }

client/src/components/common/dialog.rs

@@ -1,101 +1,146 @@
 // src/components/common/dialog.rs
-use ratatui::{
-    layout::{Constraint, Direction, Layout, Rect, Margin},
-    style::{Modifier, Style},
-    widgets::{Block, BorderType, Borders, Paragraph},
-    Frame,
-    text::{Text, Line, Span}
-};
-use ratatui::prelude::Alignment;
 use crate::config::colors::themes::Theme;
+use ratatui::{
+    layout::{Constraint, Direction, Layout, Margin, Rect},
+    prelude::Alignment,
+    style::{Modifier, Style},
+    text::{Line, Span, Text},
+    widgets::{Block, BorderType, Borders, Paragraph, Clear}, // Added Clear
+    Frame,
+};
 
 pub fn render_dialog(
     f: &mut Frame,
     area: Rect,
     theme: &Theme,
-    title: &str,
+    dialog_title: &str,
-    message: &str,
+    dialog_message: &str,
-    is_active: bool,
+    dialog_buttons: &[String],
+    dialog_active_button_index: usize,
 ) {
-    // Create a centered rect for the dialog
+    let message_lines: Vec<_> = dialog_message.lines().collect();
-    let dialog_area = centered_rect(60, 25, area);
+    let message_height = message_lines.len() as u16;
+    let button_row_height = if dialog_buttons.is_empty() { 0 } else { 3 };
+    let vertical_padding = 2; // Block borders (top/bottom)
+    let inner_vertical_margin = 2; // Margin inside block (top/bottom)
+
+    let required_inner_height =
+        message_height + button_row_height + inner_vertical_margin;
+    // Add block border height
+    let required_total_height = required_inner_height + vertical_padding;
+
+    // Use a fixed percentage width, clamped to min/max
+    let width_percentage: u16 = 60;
+    let dialog_width = (area.width * width_percentage / 100)
+        .max(20) // Minimum width
+        .min(area.width); // Maximum width
+
+    // Ensure height doesn't exceed available area
+    let dialog_height = required_total_height.min(area.height);
+
+    // Calculate centered area manually
+    let dialog_x = area.x + (area.width.saturating_sub(dialog_width)) / 2;
+    let dialog_y = area.y + (area.height.saturating_sub(dialog_height)) / 2;
+    let dialog_area = Rect::new(dialog_x, dialog_y, dialog_width, dialog_height);
+
+    // Clear the area first before drawing the dialog
+    f.render_widget(Clear, dialog_area);
 
-    // Main dialog container
     let block = Block::default()
         .borders(Borders::ALL)
         .border_type(BorderType::Rounded)
         .border_style(Style::default().fg(theme.accent))
-        .title(title)
+        .title(format!(" {} ", dialog_title)) // Add padding to title
         .style(Style::default().bg(theme.bg));
 
-    f.render_widget(&block, dialog_area);
+    f.render_widget(block, dialog_area);
 
-    // Inner content area
+    // Calculate inner area *after* defining the block
-    let inner_area = block.inner(dialog_area).inner(Margin {
+    let inner_area = dialog_area.inner(Margin {
-        horizontal: 2,
+        horizontal: 2, // Left/Right padding inside border
-        vertical: 1,
+        vertical: 1,   // Top/Bottom padding inside border
     });
 
-    // Split into message and button areas
+    // Layout for Message and Buttons
+    let mut constraints = vec![
+        // Allocate space for message, ensuring at least 1 line height
+        Constraint::Min(message_height.max(1)),
+    ];
+    if button_row_height > 0 {
+        constraints.push(Constraint::Length(button_row_height));
+    }
+
     let chunks = Layout::default()
         .direction(Direction::Vertical)
-        .constraints([
+        .constraints(constraints)
-            Constraint::Min(3),  // Message content
-            Constraint::Length(3),  // Button
-        ])
         .split(inner_area);
 
-    // Message text
+    // Render Message
-    let message_text = Text::from(message.lines().map(|l| Line::from(Span::styled(
+    let message_text = Text::from(
-        l,
+        message_lines
-        Style::default().fg(theme.fg)
+            .into_iter()
-    ))).collect::<Vec<_>>());
+            .map(|l| Line::from(Span::styled(l, Style::default().fg(theme.fg))))
+            .collect::<Vec<_>>(),
+    );
 
-    let message_paragraph = Paragraph::new(message_text)
+    let message_paragraph =
-        .alignment(Alignment::Center);
+        Paragraph::new(message_text).alignment(Alignment::Center);
+    // Render message in the first chunk
     f.render_widget(message_paragraph, chunks[0]);
 
-    // OK Button
+    // Render Buttons if they exist and there's a chunk for them
-    let button_style = if is_active {
+    if !dialog_buttons.is_empty() && chunks.len() > 1 {
-        Style::default()
+        let button_area = chunks[1];
-            .fg(theme.highlight)
+        let button_count = dialog_buttons.len();
-            .add_modifier(Modifier::BOLD)
-    } else {
-        Style::default().fg(theme.fg)
-    };
 
-    let button_block = Block::default()
+        // Use Ratio for potentially more even distribution with few buttons
-        .borders(Borders::ALL)
+        let button_constraints = std::iter::repeat(Constraint::Ratio(
-        .border_type(BorderType::Plain)
+            1,
-        .border_style(Style::default().fg(theme.accent))
+            button_count as u32,
-        .style(Style::default().bg(theme.bg));
+        ))
+        .take(button_count)
+        .collect::<Vec<_>>();
 
-    f.render_widget(
+        let button_chunks = Layout::default()
-        Paragraph::new("OK")
+            .direction(Direction::Horizontal)
-            .block(button_block)
+            .constraints(button_constraints)
-            .style(button_style)
+            .horizontal_margin(1) // Add space between buttons
-            .alignment(Alignment::Center),
+            .split(button_area);
-        chunks[1],
+
-    );
+        for (i, button_label) in dialog_buttons.iter().enumerate() {
+            // Ensure we don't try to render into a non-existent chunk
+            if i >= button_chunks.len() {
+                break;
+            }
+
+            let is_active = i == dialog_active_button_index;
+            let (button_style, border_style) = if is_active {
+                (
+                    Style::default()
+                        .fg(theme.highlight)
+                        .add_modifier(Modifier::BOLD),
+                    Style::default().fg(theme.accent), // Highlight border
+                )
+            } else {
+                (
+                    Style::default().fg(theme.fg),
+                    Style::default().fg(theme.border), // Normal border
+                )
+            };
+
+            let button_block = Block::default()
+                .borders(Borders::ALL)
+                .border_type(BorderType::Plain)
+                .border_style(border_style);
+
+            f.render_widget(
+                Paragraph::new(button_label.as_str())
+                    .block(button_block)
+                    .style(button_style)
+                    .alignment(Alignment::Center),
+                button_chunks[i],
+            );
+        }
+    }
 }
 
-/// Helper function to center a rect with given percentage values
-fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
-    let popup_layout = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Percentage((100 - percent_y) / 2),
-            Constraint::Percentage(percent_y),
-            Constraint::Percentage((100 - percent_y) / 2),
-        ])
-        .split(r);
-
-    Layout::default()
-        .direction(Direction::Horizontal)
-        .constraints([
-            Constraint::Percentage((100 - percent_x) / 2),
-            Constraint::Percentage(percent_x),
-            Constraint::Percentage((100 - percent_x) / 2),
-        ])
-        .split(popup_layout[1])[1]
-}

client/src/components/handlers/canvas.rs

@@ -27,13 +27,16 @@ pub fn render_canvas(
         .split(area);
 
     // Input container styling
+    let border_style = if form_state.has_unsaved_changes() {
+        Style::default().fg(theme.warning)
+    } else if is_edit_mode {
+        Style::default().fg(theme.accent)
+    } else {
+        Style::default().fg(theme.secondary)
+    };
     let input_container = Block::default()
         .borders(Borders::ALL)
-        .border_style(if is_edit_mode {
+        .border_style(border_style)
-            form_state.has_unsaved_changes().then(|| theme.warning).unwrap_or(theme.accent)
-        } else {
-            theme.secondary
-        })
         .style(Style::default().bg(theme.bg));
 
     // Input block dimensions

client/src/functions/modes/edit/auth_e.rs

@@ -173,11 +173,7 @@ pub async fn execute_edit_action<S: CanvasState>(
             let num_fields = state.fields().len();
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = if current_field == 0 {
+                let new_field = current_field.saturating_sub(1);
-                    num_fields - 1
-                } else {
-                    current_field - 1
-                };
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();
@@ -191,7 +187,7 @@ pub async fn execute_edit_action<S: CanvasState>(
         "move_down" => {
             let num_fields = state.fields().len();
             if num_fields > 0 {
-                let new_field = (state.current_field() + 1) % num_fields;
+                let new_field = (state.current_field() + 1).min(num_fields - 1);
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();

client/src/functions/modes/edit/form_e.rs

@@ -173,11 +173,7 @@ pub async fn execute_edit_action<S: CanvasState>(
             let num_fields = state.fields().len();
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = if current_field == 0 {
+                let new_field = current_field.saturating_sub(1);
-                    num_fields - 1
-                } else {
-                    current_field - 1
-                };
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();
@@ -191,7 +187,7 @@ pub async fn execute_edit_action<S: CanvasState>(
         "move_down" => {
             let num_fields = state.fields().len();
             if num_fields > 0 {
-                let new_field = (state.current_field() + 1) % num_fields;
+                let new_field = (state.current_field() + 1).min(num_fields - 1);
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();

client/src/functions/modes/read_only/auth_ro.rs

@@ -33,11 +33,7 @@ pub async fn execute_action<S: CanvasState>(
                 return Ok("No fields to navigate.".to_string());
             }
             let current_field = state.current_field();
-            let new_field = if current_field == 0 {
+            let new_field = current_field.saturating_sub(1);
-                num_fields - 1
-            } else {
-                current_field - 1
-            };
             state.set_current_field(new_field);
             let current_input = state.get_current_input();
             let max_cursor_pos = if current_input.is_empty() {
@@ -57,7 +53,7 @@ pub async fn execute_action<S: CanvasState>(
                 return Ok("No fields to navigate.".to_string());
             }
             let current_field = state.current_field();
-            let new_field = (current_field + 1) % num_fields;
+            let new_field = (state.current_field() + 1).min(num_fields - 1);
             state.set_current_field(new_field);
             let current_input = state.get_current_input();
             let max_cursor_pos = if current_input.is_empty() {

client/src/functions/modes/read_only/form_ro.rs

@@ -33,11 +33,7 @@ pub async fn execute_action<S: CanvasState>(
                 return Ok("No fields to navigate.".to_string());
             }
             let current_field = state.current_field();
-            let new_field = if current_field == 0 {
+            let new_field = current_field.saturating_sub(1);
-                num_fields - 1
-            } else {
-                current_field - 1
-            };
             state.set_current_field(new_field);
             let current_input = state.get_current_input();
             let max_cursor_pos = if current_input.is_empty() {
@@ -56,7 +52,7 @@ pub async fn execute_action<S: CanvasState>(
                 return Ok("No fields to navigate.".to_string());
             }
             let current_field = state.current_field();
-            let new_field = (current_field + 1) % num_fields;
+            let new_field = (current_field + 1).min(num_fields - 1);
             state.set_current_field(new_field);
             let current_input = state.get_current_input();
             let max_cursor_pos = if current_input.is_empty() {

client/src/modes/handlers/event.rs

@@ -1,9 +1,7 @@
 // src/modes/handlers/event.rs
 use crossterm::event::Event;
 use crossterm::cursor::SetCursorStyle;
-use crate::tui::terminal::{
+use crate::tui::terminal::core::TerminalCore;
-    core::TerminalCore,
-};
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
 use crate::modes::common::commands::CommandHandler;
@@ -13,7 +11,7 @@ use crate::state::pages::auth::AuthState;
 use crate::state::canvas_state::CanvasState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::modes::{
-    common::{command_mode},
+    common::command_mode,
     canvas::{edit, read_only, common_mode},
     general::navigation,
 };
@@ -28,7 +26,6 @@ pub struct EventHandler {
     pub edit_mode_cooldown: bool,
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
-    // pub auth_state: AuthState, // Removed
     pub auth_client: AuthClient,
 }
 
@@ -42,7 +39,6 @@ impl EventHandler {
             edit_mode_cooldown: false,
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
-            // auth_state: AuthState::new(), // Removed
             auth_client: AuthClient::new().await?,
         })
     }
@@ -55,12 +51,11 @@ impl EventHandler {
         grpc_client: &mut GrpcClient,
         command_handler: &mut CommandHandler,
         form_state: &mut FormState,
-        auth_state: &mut AuthState, // Added
+        auth_state: &mut AuthState,
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
-        // Determine current mode based on app state and event handler state
         let current_mode = ModeManager::derive_mode(app_state, self);
         app_state.update_mode(current_mode);
 
@@ -68,14 +63,12 @@ impl EventHandler {
             let key_code = key.code;
             let modifiers = key.modifiers;
 
-            // Handle common actions across all modes
             if UiStateHandler::toggle_sidebar(&mut app_state.ui, config, key_code, modifiers) {
                 return Ok((false, format!("Sidebar {}",
                     if app_state.ui.show_sidebar { "shown" } else { "hidden" }
                 )));
             }
 
-            // Mode-specific handling
             match current_mode {
                 AppMode::General => {
                     return navigation::handle_navigation_event(
@@ -90,7 +83,6 @@ impl EventHandler {
                 },
 
                 AppMode::ReadOnly => {
-                    // Check for mode transitions first
                     if config.is_enter_edit_mode_before(key_code, modifiers) &&
                        ModeManager::can_enter_edit_mode(current_mode) {
                         self.is_edit_mode = true;
@@ -129,7 +121,6 @@ impl EventHandler {
                         return Ok((false, self.command_message.clone()));
                     }
 
-                    // Check for entering command mode
                     if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
                         if action == "enter_command_mode" && ModeManager::can_enter_command_mode(current_mode) {
                             self.command_mode = true;
@@ -139,7 +130,6 @@ impl EventHandler {
                         }
                     }
 
-                    // Check for core application actions (save, quit, etc.)
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -150,7 +140,7 @@ impl EventHandler {
                                 return common_mode::handle_core_action(
                                     action,
                                     form_state,
-                                    auth_state, // Changed
+                                    auth_state,
                                     grpc_client,
                                     &mut self.auth_client,
                                     terminal,
@@ -163,13 +153,12 @@ impl EventHandler {
                         }
                     }
 
-                    // Let read_only mode handle its own actions
                     return read_only::handle_read_only_event(
                         &app_state,
                         key,
                         config,
                         form_state,
-                        auth_state, // Changed
+                        auth_state,
                         &mut self.key_sequence_tracker,
                         current_position,
                         total_count,
@@ -181,21 +170,22 @@ impl EventHandler {
                 },
 
                 AppMode::Edit => {
-                    // Check for exiting edit mode
                     if config.is_exit_edit_mode(key_code, modifiers) {
+                        self.is_edit_mode = false;
+                        self.edit_mode_cooldown = true;
+                        
                         let has_changes = if app_state.ui.show_login {
                             auth_state.has_unsaved_changes()
                         } else {
                             form_state.has_unsaved_changes()
                         };
                         
-                        if has_changes {
+                        self.command_message = if has_changes {
-                            self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
+                            "Exited edit mode (unsaved changes remain)".to_string()
-                            return Ok((false, self.command_message.clone()));
+                        } else {
-                        }
+                            "Read-only mode".to_string()
-                        self.is_edit_mode = false;
+                        };
-                        self.edit_mode_cooldown = true;
+                        
-                        self.command_message = "Read-only mode".to_string();
                         terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
 
                         let current_input = if app_state.ui.show_login {
@@ -222,7 +212,6 @@ impl EventHandler {
                         return Ok((false, self.command_message.clone()));
                     }
 
-                    // Check for core application actions (save, quit, etc.)
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -230,29 +219,28 @@ impl EventHandler {
                     ) {
                         match action {
                             "save" | "force_quit" | "save_and_quit" | "revert" => {
-                                return common_mode::handle_core_action(
+                                    return common_mode::handle_core_action(
-                                    action,
+                                        action,
-                                    form_state,
+                                        form_state,
-                                    auth_state, // Changed
+                                        auth_state,
-                                    grpc_client,
+                                        grpc_client,
-                                    &mut self.auth_client,
+                                        &mut self.auth_client,
-                                    terminal,
+                                        terminal,
-                                    app_state,
+                                        app_state,
-                                    current_position,
+                                        current_position,
-                                    total_count,
+                                        total_count,
-                                ).await;
+                                    ).await;
-                            },
+                                },
                             _ => {}
                         }
                     }
 
-                    // Let edit mode handle its own actions
                     let result = edit::handle_edit_event(
                         app_state.ui.show_login,
                         key,
                         config,
                         form_state,
-                        auth_state, // Changed
+                        auth_state,
                         &mut self.ideal_cursor_column,
                         &mut self.command_message,
                         &mut app_state.ui.is_saved,
@@ -288,9 +276,7 @@ impl EventHandler {
             }
         }
 
-        // Non-key events or if no specific handler was matched
         self.edit_mode_cooldown = false;
         Ok((false, self.command_message.clone()))
     }
 }
-

client/src/state/state.rs

@@ -5,12 +5,12 @@ use common::proto::multieko2::table_definition::ProfileTreeResponse;
 use crate::components::IntroState;
 use crate::modes::handlers::mode_manager::AppMode;
 
-#[derive(Default)]
 pub struct DialogState {
-    pub show_dialog: bool,
+    pub dialog_show: bool,
     pub dialog_title: String,
     pub dialog_message: String,
-    pub dialog_button_active: bool,
+    pub dialog_buttons: Vec<String>,
+    pub dialog_active_button_index: usize,
 }
 
 pub struct UiState {
@@ -77,21 +77,55 @@ impl AppState {
     }
 
     // Add dialog helper methods
-    pub fn show_dialog(&mut self, title: &str, message: &str) {
+    /// Shows a dialog with the given title, message, and buttons.
-        self.ui.dialog.show_dialog = true;
+    /// The first button (index 0) is active by default.
+    pub fn show_dialog(
+        &mut self,
+        title: &str,
+        message: &str,
+        buttons: Vec<String>,
+    ) {
         self.ui.dialog.dialog_title = title.to_string();
         self.ui.dialog.dialog_message = message.to_string();
-        self.ui.dialog.dialog_button_active = true;
+        self.ui.dialog.dialog_buttons = buttons;
+        self.ui.dialog.dialog_active_button_index = 0; // Default to first button
+        self.ui.dialog.dialog_show = true; // Use new name
     }
 
+    /// Hides the dialog and clears its content.
     pub fn hide_dialog(&mut self) {
-        self.ui.dialog.show_dialog = false;
+        self.ui.dialog.dialog_show = false; // Use new name
         self.ui.dialog.dialog_title.clear();
         self.ui.dialog.dialog_message.clear();
+        self.ui.dialog.dialog_buttons.clear();
+        self.ui.dialog.dialog_active_button_index = 0;
     }
 
-    pub fn set_dialog_button_active(&mut self, active: bool) {
+    /// Sets the active button index, wrapping around if necessary.
-        self.ui.dialog.dialog_button_active = active;
+    pub fn next_dialog_button(&mut self) {
+        if !self.ui.dialog.dialog_buttons.is_empty() {
+            let next_index = (self.ui.dialog.dialog_active_button_index + 1)
+                % self.ui.dialog.dialog_buttons.len();
+            self.ui.dialog.dialog_active_button_index = next_index; // Use new name
+        }
+    }
+
+    /// Sets the active button index, wrapping around if necessary.
+    pub fn previous_dialog_button(&mut self) {
+        if !self.ui.dialog.dialog_buttons.is_empty() {
+            let len = self.ui.dialog.dialog_buttons.len();
+            let prev_index =
+                (self.ui.dialog.dialog_active_button_index + len - 1) % len;
+            self.ui.dialog.dialog_active_button_index = prev_index; // Use new name
+        }
+    }
+
+    /// Gets the label of the currently active button, if any.
+    pub fn get_active_dialog_button_label(&self) -> Option<&str> {
+        self.ui.dialog
+            .dialog_buttons // Use new name
+            .get(self.ui.dialog.dialog_active_button_index) // Use new name
+            .map(|s| s.as_str())
     }
 }
 
@@ -109,3 +143,16 @@ impl Default for UiState {
         }
     }
 }
+
+// Update the Default implementation for DialogState itself
+impl Default for DialogState {
+    fn default() -> Self {
+        Self {
+            dialog_show: false, // Use new name
+            dialog_title: String::new(), // Use new name
+            dialog_message: String::new(), // Use new name
+            dialog_buttons: Vec::new(), // Use new name
+            dialog_active_button_index: 0, // Use new name
+        }
+    }
+}

client/src/tui/functions/common/login.rs

@@ -3,6 +3,8 @@ use crate::services::auth::AuthClient;
 use crate::state::pages::auth::AuthState;
 use crate::state::state::AppState;
 use crate::state::canvas_state::CanvasState;
+// Remove unused import if CanvasState is not directly used here
+// use crate::state::canvas_state::CanvasState;
 
 /// Attempts to log the user in using the provided credentials via gRPC.
 /// Updates AuthState and AppState on success or failure.
@@ -14,48 +16,84 @@ pub async fn save(
     let identifier = auth_state.username.clone();
     let password = auth_state.password.clone();
 
+    // Clear previous error/dialog state before attempting
+    auth_state.error_message = None;
+    // Use the helper to ensure dialog is hidden and cleared properly
+    app_state.hide_dialog();
+
     // Call the gRPC login method
     match auth_client.login(identifier, password).await {
         Ok(response) => {
             // Store authentication details on success
-            auth_state.auth_token = Some(response.access_token);
+            auth_state.auth_token = Some(response.access_token.clone());
-            auth_state.user_id = Some(response.user_id);
+            auth_state.user_id = Some(response.user_id.clone());
-            auth_state.role = Some(response.role);
+            auth_state.role = Some(response.role.clone());
-            auth_state.error_message = None;
+            auth_state.set_has_unsaved_changes(false);
-            auth_state.set_has_unsaved_changes(false); // Mark as "saved"
 
-            // Update app state to transition from login to the main form view
+            let success_message = format!(
-            app_state.ui.show_login = false;
+                "Login Successful!\n\n\
-            app_state.ui.show_form = true; // Assuming form is the next view
+                 Access Token: {}\n\
+                 Token Type: {}\n\
+                 Expires In: {}\n\
+                 User ID: {}\n\
+                 Role: {}",
+                response.access_token,
+                response.token_type,
+                response.expires_in,
+                response.user_id,
+                response.role
+            );
 
-            Ok("Login successful!".to_string())
+            // Use the helper method to configure and show the dialog
+            // TODO Implement logic for pressing menu or exit buttons, not imeplementing it now,
+            // need to do other more important stuff now"
+            app_state.show_dialog(
+                "Login Success",
+                &success_message,
+                vec!["Menu".to_string(), "Exit".to_string()],
+            );
+
+            Ok("Login successful, details shown in dialog.".to_string())
         }
         Err(e) => {
-            // Store error message on failure
+            let error_message = format!("{}", e);
-            let error_message = format!("Login failed: {}", e);
+
-            auth_state.error_message = Some(error_message.clone());
+            // Use the helper method to configure and show the dialog
-            // Keep unsaved changes true if login fails, allowing retry/revert
+            app_state.show_dialog(
+                "Login Failed",
+                &error_message,
+                vec!["OK".to_string()], // Pass buttons here
+            );
+            // REMOVE these lines:
+            // app_state.ui.dialog.dialog_title = "Login Failed".to_string();
+            // app_state.ui.dialog.dialog_message = error_message.clone();
+            // app_state.ui.dialog.dialog_show = true;
+            // app_state.ui.dialog.dialog_button_active = true;
+
             auth_state.set_has_unsaved_changes(true);
-            Ok(error_message) // Return error message to display
+
+            Ok(format!("Login failed: {}", error_message))
         }
     }
 }
 
 /// Reverts the login form fields to empty and returns to the previous screen (Intro).
-/// This function is now named 'revert' to match the 'form' counterpart.
 pub async fn revert(
     auth_state: &mut AuthState,
-    app_state: &mut AppState,
+    _app_state: &mut AppState, // Prefix unused variable
 ) -> String {
     // Clear the input fields
     auth_state.username.clear();
     auth_state.password.clear();
-    auth_state.error_message = None; // Clear any previous error
+    auth_state.error_message = None;
-    auth_state.set_has_unsaved_changes(false); // Fields are cleared, no unsaved changes
+    auth_state.set_has_unsaved_changes(false);
 
-    // Update app state to hide login and show the previous screen (Intro)
+    // Ensure dialog is hidden if revert is called
-    app_state.ui.show_login = false;
+    // _app_state.hide_dialog(); // Uncomment if needed
-    app_state.ui.show_intro = true; // Assuming Intro is the screen before login
+
+    // Navigation logic (currently disabled in original code)
+    // _app_state.ui.show_login = false;
+    // _app_state.ui.show_intro = true;
 
     "Login reverted".to_string()
 }

client/src/tui/functions/form.rs

@@ -11,6 +11,15 @@ pub async fn handle_action(
     total_count: u64,
     ideal_cursor_column: &mut usize,
 ) -> Result<String, Box<dyn std::error::Error>> {
+            // TODO store unsaved changes without deleting form state values
+    // First check for unsaved changes in both cases
+    if form_state.has_unsaved_changes() {
+        return Ok(
+            "Unsaved changes. Save (Ctrl+S) or Revert (Ctrl+R) before navigating."
+                .to_string(),
+        );
+    }
+
     match action {
         "previous_entry" => {
             let new_position = current_position.saturating_sub(1);

client/src/ui/handlers/ui.rs

@@ -66,6 +66,8 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
 
         let total_count = app_state.total_count;
         let mut current_position = app_state.current_position;
+        // Store position before event handling to detect navigation
+        let position_before_event = current_position;
 
         let event = event_reader.read_event()?;
         let (should_exit, message) = event_handler.handle_event(
@@ -83,9 +85,11 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
 
         app_state.current_position = current_position;
 
+        let position_changed = app_state.current_position != position_before_event;
+
         // Handle position changes and update form state (Only when form is shown)
-        if app_state.ui.show_form { // Added check
+        if app_state.ui.show_form {
-            if !event_handler.is_edit_mode {
+            if position_changed && !event_handler.is_edit_mode {
                 let current_input = form_state.get_current_input();
                 let max_cursor_pos = if !current_input.is_empty() {
                     current_input.len() - 1  // Limit to last character in readonly mode
@@ -131,6 +135,16 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                          form_state.current_field = 0;
                      }
                 }
+            } else if !position_changed && !event_handler.is_edit_mode {
+                // If position didn't change but we are in read-only, just adjust cursor
+                let current_input = form_state.get_current_input();
+                let max_cursor_pos = if !current_input.is_empty() {
+                    current_input.len() - 1
+                } else {
+                    0
+                };
+                form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+
             }
         } else if app_state.ui.show_login {
              // Handle cursor updates for AuthState if needed, similar to FormState