working dialog now better

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
-    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],
-        );
-    }
-
-    if app_state.ui.dialog.show_dialog {
+    // --- DIALOG ---
+    // Check the correct field name for showing the dialog
+    if app_state.ui.dialog.dialog_show {
+        // Pass all 7 arguments correctly
         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,
-    message: &str,
-    is_active: bool,
+    dialog_title: &str,
+    dialog_message: &str,
+    dialog_buttons: &[String],
+    dialog_active_button_index: usize,
 ) {
-    // Create a centered rect for the dialog
-    let dialog_area = centered_rect(60, 25, area);
+    let message_lines: Vec<_> = dialog_message.lines().collect();
+    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
-    let inner_area = block.inner(dialog_area).inner(Margin {
-        horizontal: 2,
-        vertical: 1,
+    // Calculate inner area *after* defining the block
+    let inner_area = dialog_area.inner(Margin {
+        horizontal: 2, // Left/Right padding inside border
+        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([
-            Constraint::Min(3),  // Message content
-            Constraint::Length(3),  // Button
-        ])
+        .constraints(constraints)
         .split(inner_area);
 
-    // Message text
-    let message_text = Text::from(message.lines().map(|l| Line::from(Span::styled(
-        l,
-        Style::default().fg(theme.fg)
-    ))).collect::<Vec<_>>());
-    
-    let message_paragraph = Paragraph::new(message_text)
-        .alignment(Alignment::Center);
+    // Render Message
+    let message_text = Text::from(
+        message_lines
+            .into_iter()
+            .map(|l| Line::from(Span::styled(l, Style::default().fg(theme.fg))))
+            .collect::<Vec<_>>(),
+    );
+
+    let message_paragraph =
+        Paragraph::new(message_text).alignment(Alignment::Center);
+    // Render message in the first chunk
     f.render_widget(message_paragraph, chunks[0]);
 
-    // OK Button
-    let button_style = if is_active {
-        Style::default()
-            .fg(theme.highlight)
-            .add_modifier(Modifier::BOLD)
-    } else {
-        Style::default().fg(theme.fg)
-    };
+    // Render Buttons if they exist and there's a chunk for them
+    if !dialog_buttons.is_empty() && chunks.len() > 1 {
+        let button_area = chunks[1];
+        let button_count = dialog_buttons.len();
 
-    let button_block = Block::default()
-        .borders(Borders::ALL)
-        .border_type(BorderType::Plain)
-        .border_style(Style::default().fg(theme.accent))
-        .style(Style::default().bg(theme.bg));
+        // Use Ratio for potentially more even distribution with few buttons
+        let button_constraints = std::iter::repeat(Constraint::Ratio(
+            1,
+            button_count as u32,
+        ))
+        .take(button_count)
+        .collect::<Vec<_>>();
 
-    f.render_widget(
-        Paragraph::new("OK")
-            .block(button_block)
-            .style(button_style)
-            .alignment(Alignment::Center),
-        chunks[1],
-    );
+        let button_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints(button_constraints)
+            .horizontal_margin(1) // Add space between buttons
+            .split(button_area);
+
+        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/functions/common.rs

@@ -0,0 +1,2 @@
+// src/functions/common.rs
+

client/src/functions/mod.rs

@@ -0,0 +1,7 @@
+// src/functions/mod.rs
+
+pub mod common;
+pub mod modes;
+
+pub use common::*;
+pub use modes::*;

client/src/functions/modes.rs

@@ -0,0 +1,8 @@
+// src/functions/modes.rs
+
+pub mod read_only;
+pub mod edit;
+
+
+pub use read_only::*;
+pub use edit::*;

client/src/functions/modes/edit.rs

@@ -0,0 +1,4 @@
+// src/functions/modes/edit.rs
+
+pub mod form_e;
+pub mod auth_e;

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

@@ -0,0 +1,431 @@
+// src/functions/modes/edit/auth_e.rs
+
+use crate::config::binds::config::Config;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::common::form::{revert, save};
+use crossterm::event::{KeyCode, KeyEvent};
+use std::any::Any;
+
+pub async fn execute_common_action<S: CanvasState + Any>(
+    action: &str,
+    state: &mut S,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" | "revert" => {
+            if !state.has_unsaved_changes() {
+                return Ok("No changes to save or revert.".to_string());
+            }
+            if let Some(form_state) =
+                (state as &mut dyn Any).downcast_mut::<FormState>()
+            {
+                match action {
+                    "save" => {
+                        save(
+                            form_state,
+                            grpc_client,
+                            is_saved,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    "revert" => {
+                        revert(
+                            form_state,
+                            grpc_client,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    _ => unreachable!(),
+                }
+            } else {
+                Ok(format!(
+                    "Action '{}' not implemented for this state type.",
+                    action
+                ))
+            }
+        }
+        _ => Ok(format!("Common action '{}' not handled here.", action)),
+    }
+}
+
+pub async fn execute_edit_action<S: CanvasState>(
+    action: &str,
+    key: KeyEvent,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    _grpc_client: &mut GrpcClient,
+    _is_saved: &mut bool,
+    _current_position: &mut u64,
+    _total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "insert_char" => {
+            if let KeyCode::Char(c) = key.code {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.insert(cursor_pos, c);
+                    *field_value = chars.into_iter().collect();
+                    state.set_current_cursor_pos(cursor_pos + 1);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = state.current_cursor_pos();
+                }
+            } else {
+                return Ok("Error: insert_char called without a char key."
+                    .to_string());
+            }
+            Ok("working?".to_string())
+        }
+
+        "delete_char_backward" => {
+            if state.current_cursor_pos() > 0 {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.remove(cursor_pos - 1);
+                    *field_value = chars.into_iter().collect();
+                    let new_pos = cursor_pos - 1;
+                    state.set_current_cursor_pos(new_pos);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = new_pos;
+                }
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_forward" => {
+            let cursor_pos = state.current_cursor_pos();
+            let field_value = state.get_current_input_mut();
+            let mut chars: Vec<char> = field_value.chars().collect();
+            if cursor_pos < chars.len() {
+                chars.remove(cursor_pos);
+                *field_value = chars.into_iter().collect();
+                state.set_has_unsaved_changes(true);
+                *ideal_cursor_column = cursor_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "next_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = (current_field + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "prev_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    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();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_left" => {
+            let new_pos = state.current_cursor_pos().saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if current_pos < current_input.len() {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_up" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    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();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_down" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = (state.current_field() + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            let new_pos = current_input.len();
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_first_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to first field".to_string())
+        }
+
+        "move_last_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = num_fields - 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to last field".to_string())
+        }
+
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_next_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                let final_pos = new_pos.min(current_input.len());
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos == current_pos {
+                    find_word_end(current_input, new_pos + 1)
+                } else {
+                    new_pos
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos >= len {
+        return len;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < len && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < len && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+
+    if get_char_type(chars[pos]) == CharType::Whitespace {
+        pos = find_next_word_start(text, pos);
+    }
+
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    pos
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+    if pos == 0 && get_char_type(chars[pos]) != CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

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

@@ -0,0 +1,431 @@
+// src/functions/modes/edit/form_e.rs
+
+use crate::config::binds::config::Config;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::common::form::{revert, save};
+use crossterm::event::{KeyCode, KeyEvent};
+use std::any::Any;
+
+pub async fn execute_common_action<S: CanvasState + Any>(
+    action: &str,
+    state: &mut S,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" | "revert" => {
+            if !state.has_unsaved_changes() {
+                return Ok("No changes to save or revert.".to_string());
+            }
+            if let Some(form_state) =
+                (state as &mut dyn Any).downcast_mut::<FormState>()
+            {
+                match action {
+                    "save" => {
+                        save(
+                            form_state,
+                            grpc_client,
+                            is_saved,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    "revert" => {
+                        revert(
+                            form_state,
+                            grpc_client,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    _ => unreachable!(),
+                }
+            } else {
+                Ok(format!(
+                    "Action '{}' not implemented for this state type.",
+                    action
+                ))
+            }
+        }
+        _ => Ok(format!("Common action '{}' not handled here.", action)),
+    }
+}
+
+pub async fn execute_edit_action<S: CanvasState>(
+    action: &str,
+    key: KeyEvent,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    _grpc_client: &mut GrpcClient,
+    _is_saved: &mut bool,
+    _current_position: &mut u64,
+    _total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "insert_char" => {
+            if let KeyCode::Char(c) = key.code {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.insert(cursor_pos, c);
+                    *field_value = chars.into_iter().collect();
+                    state.set_current_cursor_pos(cursor_pos + 1);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = state.current_cursor_pos();
+                }
+            } else {
+                return Ok("Error: insert_char called without a char key."
+                    .to_string());
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_backward" => {
+            if state.current_cursor_pos() > 0 {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.remove(cursor_pos - 1);
+                    *field_value = chars.into_iter().collect();
+                    let new_pos = cursor_pos - 1;
+                    state.set_current_cursor_pos(new_pos);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = new_pos;
+                }
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_forward" => {
+            let cursor_pos = state.current_cursor_pos();
+            let field_value = state.get_current_input_mut();
+            let mut chars: Vec<char> = field_value.chars().collect();
+            if cursor_pos < chars.len() {
+                chars.remove(cursor_pos);
+                *field_value = chars.into_iter().collect();
+                state.set_has_unsaved_changes(true);
+                *ideal_cursor_column = cursor_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "next_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = (current_field + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "prev_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    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();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_left" => {
+            let new_pos = state.current_cursor_pos().saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if current_pos < current_input.len() {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_up" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    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();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_down" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = (state.current_field() + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            let new_pos = current_input.len();
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_first_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to first field".to_string())
+        }
+
+        "move_last_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = num_fields - 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to last field".to_string())
+        }
+
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_next_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                let final_pos = new_pos.min(current_input.len());
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos == current_pos {
+                    find_word_end(current_input, new_pos + 1)
+                } else {
+                    new_pos
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos >= len {
+        return len;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < len && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < len && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+
+    if get_char_type(chars[pos]) == CharType::Whitespace {
+        pos = find_next_word_start(text, pos);
+    }
+
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    pos
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+    if pos == 0 && get_char_type(chars[pos]) != CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/functions/modes/read_only.rs

@@ -0,0 +1,4 @@
+// src/functions/modes/read_only.rs
+
+pub mod auth_ro;
+pub mod form_ro;

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

@@ -0,0 +1,358 @@
+// src/functions/modes/read_only/auth_ro.rs
+
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::state::canvas_state::CanvasState;
+use std::error::Error;
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+pub async fn execute_action<S: CanvasState>(
+    action: &str,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    key_sequence_tracker: &mut KeySequenceTracker,
+    command_message: &mut String,
+) -> Result<String, Box<dyn Error>> {
+    match action {
+        "previous_entry" | "next_entry" => {
+            key_sequence_tracker.reset();
+            Ok(format!(
+                "Action '{}' should be handled by context-specific logic",
+                action
+            ))
+        }
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = if current_field == 0 {
+                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() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+
+            Ok("move up from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = (current_field + 1) % num_fields;
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("move down from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            state.set_current_field(0);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            let last_field_index = num_fields - 1;
+            state.set_current_field(last_field_index);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "exit_edit_mode" => {
+            key_sequence_tracker.reset();
+            command_message.clear();
+            Ok("".to_string())
+        }
+        "move_left" => {
+            let current_pos = state.current_cursor_pos();
+            let new_pos = current_pos.saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if !current_input.is_empty()
+                && current_pos < current_input.len().saturating_sub(1)
+            {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos =
+                    find_next_word_start(current_input, state.current_cursor_pos());
+                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos != current_pos {
+                    new_pos
+                } else {
+                    find_word_end(current_input, new_pos + 1)
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = current_input.len().saturating_sub(1);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            } else {
+                state.set_current_cursor_pos(0);
+                *ideal_cursor_column = 0;
+            }
+            Ok("".to_string())
+        }
+        _ => {
+             key_sequence_tracker.reset();
+             Ok(format!("Unknown read-only action: {}", action))
+        },
+    }
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+    let current_pos = current_pos.min(chars.len());
+
+    if current_pos == chars.len() {
+        return current_pos;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_next_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+
+    let next_start = find_next_word_start(text, current_pos);
+
+    if next_start >= chars.len() {
+        return chars.len().saturating_sub(1);
+    }
+
+    let mut pos = next_start;
+    let word_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+    let original_pos = pos;
+
+    let current_type = get_char_type(chars[pos]);
+    if current_type != CharType::Whitespace {
+        while pos < len && get_char_type(chars[pos]) == current_type {
+            pos += 1;
+        }
+        return pos.saturating_sub(1);
+    }
+
+    pos = find_next_word_start(text, pos);
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if get_char_type(chars[pos]) != CharType::Whitespace {
+        let word_type = get_char_type(chars[pos]);
+        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+            pos -= 1;
+        }
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+         0
+    } else {
+        pos
+    }
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+     let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+        return 0;
+    }
+     if pos == 0 && get_char_type(chars[0]) != CharType::Whitespace {
+         return 0;
+     }
+
+    let word_type = get_char_type(chars[pos]);
+     while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

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

@@ -0,0 +1,357 @@
+// src/functions/modes/read_only/form_ro.rs
+
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::state::canvas_state::CanvasState;
+use std::error::Error;
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+pub async fn execute_action<S: CanvasState>(
+    action: &str,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    key_sequence_tracker: &mut KeySequenceTracker,
+    command_message: &mut String,
+) -> Result<String, Box<dyn Error>> {
+    match action {
+        "previous_entry" | "next_entry" => {
+            key_sequence_tracker.reset();
+            Ok(format!(
+                "Action '{}' should be handled by context-specific logic",
+                action
+            ))
+        }
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = if current_field == 0 {
+                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() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = (current_field + 1) % num_fields;
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            state.set_current_field(0);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            let last_field_index = num_fields - 1;
+            state.set_current_field(last_field_index);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "exit_edit_mode" => {
+            key_sequence_tracker.reset();
+            command_message.clear();
+            Ok("".to_string())
+        }
+        "move_left" => {
+            let current_pos = state.current_cursor_pos();
+            let new_pos = current_pos.saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if !current_input.is_empty()
+                && current_pos < current_input.len().saturating_sub(1)
+            {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos =
+                    find_next_word_start(current_input, state.current_cursor_pos());
+                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos != current_pos {
+                    new_pos
+                } else {
+                    find_word_end(current_input, new_pos + 1)
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = current_input.len().saturating_sub(1);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            } else {
+                state.set_current_cursor_pos(0);
+                *ideal_cursor_column = 0;
+            }
+            Ok("".to_string())
+        }
+        _ => {
+             key_sequence_tracker.reset();
+             Ok(format!("Unknown read-only action: {}", action))
+        },
+    }
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+    let current_pos = current_pos.min(chars.len());
+
+    if current_pos == chars.len() {
+        return current_pos;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_next_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+
+    let next_start = find_next_word_start(text, current_pos);
+
+    if next_start >= chars.len() {
+        return chars.len().saturating_sub(1);
+    }
+
+    let mut pos = next_start;
+    let word_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+    let original_pos = pos;
+
+    let current_type = get_char_type(chars[pos]);
+    if current_type != CharType::Whitespace {
+        while pos < len && get_char_type(chars[pos]) == current_type {
+            pos += 1;
+        }
+        return pos.saturating_sub(1);
+    }
+
+    pos = find_next_word_start(text, pos);
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if get_char_type(chars[pos]) != CharType::Whitespace {
+        let word_type = get_char_type(chars[pos]);
+        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+            pos -= 1;
+        }
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+         0
+    } else {
+        pos
+    }
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+     let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+        return 0;
+    }
+     if pos == 0 && get_char_type(chars[0]) != CharType::Whitespace {
+         return 0;
+     }
+
+    let word_type = get_char_type(chars[pos]);
+     while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/lib.rs

@@ -5,6 +5,7 @@ pub mod config;
 pub mod state;
 pub mod components;
 pub mod modes;
+pub mod functions;
 pub mod services;
 
 pub use ui::run_ui;

client/src/modes/canvas.rs

@@ -1,4 +1,4 @@
 // src/client/modes/canvas.rs
 pub mod edit;
-pub mod common;
+pub mod common_mode;
 pub mod read_only;

client/src/modes/canvas/edit.rs

@@ -1,19 +1,18 @@
 // src/modes/canvas/edit.rs
 
-// TODO THIS is freaking bloated with functions it never uses REFACTOR 200 LOC can be gone
-
-use std::any::Any;
-use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
-use crate::state::canvas_state::CanvasState;
-use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
-use crate::tui::functions::common::form::{save, revert};
+use crate::state::pages::{auth::AuthState, form::FormState};
+use crate::state::state::AppState;
+use crate::functions::modes::edit::{auth_e, form_e};
+use crossterm::event::{KeyCode, KeyEvent};
 
-pub async fn handle_edit_event_internal<S: CanvasState + Any>(
+pub async fn handle_edit_event(
+    is_auth_context: bool,
     key: KeyEvent,
     config: &Config,
-    state: &mut S,
+    form_state: &mut FormState,
+    auth_state: &mut AuthState,
     ideal_cursor_column: &mut usize,
     command_message: &mut String,
     is_saved: &mut bool,
@@ -21,491 +20,99 @@ pub async fn handle_edit_event_internal<S: CanvasState + Any>(
     total_count: u64,
     grpc_client: &mut GrpcClient,
 ) -> Result<String, Box<dyn std::error::Error>> {
-    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(&config.keybindings.global, key.code, key.modifiers) {
-        handle_edit_specific_input(key, state, ideal_cursor_column);
+
+    // Global command mode check
+    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(
+        &config.keybindings.global,
+        key.code,
+        key.modifiers
+    ) {
+        *command_message = "Switching to Command Mode...".to_string();
         return Ok(command_message.clone());
     }
 
-    if let Some(action) = config.get_action_for_key_in_mode(&config.keybindings.common, key.code, key.modifiers) {
-        return execute_common_action(
-            action,
-            state,
-            grpc_client,
-            is_saved,
-            current_position,
-            total_count,
-        ).await;
-    }
-
-    if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
-        return execute_edit_action(
-            action,
-            state,
-            ideal_cursor_column,
-            grpc_client,
-            is_saved,
-            current_position,
-            total_count,
-        ).await;
-    }
-
-    handle_edit_specific_input(key, state, ideal_cursor_column);
-    Ok(command_message.clone())
-}
-
-async fn execute_common_action<S: CanvasState + Any>(
-    action: &str,
-    state: &mut S,
-    grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        "save" | "revert" if state.has_unsaved_changes() => {
-            if let Some(form_state) = (state as &mut dyn Any).downcast_mut::<FormState>() {
-                return match action {
-                    "save" => save(form_state, grpc_client, is_saved, current_position, total_count).await,
-                    "revert" => revert(form_state, grpc_client, current_position, total_count).await,
-                    _ => unreachable!(),
-                };
-            }
-            Ok("Action not available in this context".to_string())
+    // Common actions (save/revert)
+    if let Some(action) = config.get_action_for_key_in_mode(
+        &config.keybindings.common,
+        key.code,
+        key.modifiers
+    ) {
+        if matches!(action, "save" | "revert") {
+            return if is_auth_context {
+                auth_e::execute_common_action(
+                    action,
+                    auth_state,  // Concrete AuthState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            } else {
+                form_e::execute_common_action(
+                    action,
+                    form_state,  // Concrete FormState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            };
         }
-        "move_up" | "move_down" => {
-            execute_edit_action(
+    }
+
+    // Edit-specific actions
+    if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
+        return if is_auth_context {
+            auth_e::execute_edit_action(
                 action,
-                state,
-                &mut 0,
+                key,
+                auth_state,  // Full access to AuthState fields
+                ideal_cursor_column,
                 grpc_client,
                 is_saved,
                 current_position,
-                total_count,
+                total_count
             ).await
-        }
-        _ => Ok(format!("Common action not handled: {}", action)),
+        } else {
+            form_e::execute_edit_action(
+                action,
+                key,
+                form_state,  // Full access to FormState fields
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
     }
-}
-
-fn handle_edit_specific_input<S: CanvasState>( // No Any needed here
-    key: KeyEvent,
-    state: &mut S,
-    ideal_cursor_column: &mut usize,
-) {
-    match key.code {
-        KeyCode::Char(c) => {
-            let cursor_pos = state.current_cursor_pos();
-            let field_value = state.get_current_input_mut();
-            let mut chars: Vec<char> = field_value.chars().collect();
-            if cursor_pos <= chars.len() {
-                chars.insert(cursor_pos, c);
-                *field_value = chars.into_iter().collect();
-                // Use trait setters
-                state.set_current_cursor_pos(cursor_pos + 1);
-                state.set_has_unsaved_changes(true);
-                *ideal_cursor_column = state.current_cursor_pos(); // Update ideal column
-            }
-        }
-        KeyCode::Backspace => {
-            if state.current_cursor_pos() > 0 {
-                let cursor_pos = state.current_cursor_pos();
-                let field_value = state.get_current_input_mut();
-                let mut chars: Vec<char> = field_value.chars().collect();
-                if cursor_pos <= chars.len() && cursor_pos > 0 {
-                    chars.remove(cursor_pos - 1);
-                    *field_value = chars.into_iter().collect();
-                    // Use trait setters
-                    state.set_current_cursor_pos(cursor_pos - 1);
-                    state.set_has_unsaved_changes(true);
-                    *ideal_cursor_column = state.current_cursor_pos(); // Update ideal column
-                }
-            }
-        }
-        KeyCode::Delete => {
-            let cursor_pos = state.current_cursor_pos();
-            let field_value = state.get_current_input_mut();
-            let chars: Vec<char> = field_value.chars().collect();
-            if cursor_pos < chars.len() {
-                let mut new_chars = chars.clone();
-                new_chars.remove(cursor_pos);
-                *field_value = new_chars.into_iter().collect();
-                // Use trait setter
-                state.set_has_unsaved_changes(true);
-                // Cursor position doesn't change, but ideal might if text changed
-                *ideal_cursor_column = state.current_cursor_pos();
-            }
-        }
-        KeyCode::Tab => {
-            let num_fields = state.fields().len();
-            if num_fields > 0 { // Avoid panic on empty fields
-                let current_field = state.current_field();
-                let new_field = if key.modifiers.contains(KeyModifiers::SHIFT) {
-                    if current_field == 0 { num_fields - 1 } else { current_field - 1 }
-                } else {
-                    (current_field + 1) % num_fields
-                };
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_cursor_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_cursor_pos));
-            }
-        }
-        KeyCode::Enter => {
-             let num_fields = state.fields().len();
-            if num_fields > 0 { // Avoid panic on empty fields
-                let new_field = (state.current_field() + 1) % num_fields;
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_cursor_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_cursor_pos));
-            }
-        }
-        _ => {}
-    }
-}
-
-async fn execute_edit_action<S: CanvasState>( // No Any needed here
-    action: &str,
-    state: &mut S,
-    ideal_cursor_column: &mut usize,
-    // These parameters are unused if save/revert aren't handled here,
-    // but keep them for now if execute_common_action calls this
-    _grpc_client: &mut GrpcClient,
-    _is_saved: &mut bool,
-    _current_position: &mut u64,
-    _total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        "move_left" => {
-            let new_pos = state.current_cursor_pos().saturating_sub(1);
-            // Use trait setter
-            state.set_current_cursor_pos(new_pos);
-            *ideal_cursor_column = new_pos;
-            Ok("".to_string())
-        }
-        "move_right" => {
-            let current_input = state.get_current_input();
-            let current_pos = state.current_cursor_pos();
-            // Allow moving cursor to position *after* last character
-            if current_pos < current_input.len() {
-                let new_pos = current_pos + 1;
-                 // Use trait setter
-                state.set_current_cursor_pos(new_pos);
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_up" => {
-            let num_fields = state.fields().len();
-            if num_fields > 0 {
-                let current_field = state.current_field();
-                let new_field = if current_field == 0 { num_fields - 1 } else { current_field - 1 };
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("".to_string())
-        }
-        "move_down" => {
-            let num_fields = state.fields().len();
-             if num_fields > 0 {
-                let new_field = (state.current_field() + 1) % num_fields;
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("".to_string())
-        }
-        "move_line_start" => {
-            // Use trait setter
-            state.set_current_cursor_pos(0);
-            *ideal_cursor_column = 0;
-            Ok("".to_string())
-        }
-        "move_line_end" => {
-            let current_input = state.get_current_input();
-            let new_pos = current_input.len();
-            // Use trait setter
-            state.set_current_cursor_pos(new_pos);
-            *ideal_cursor_column = new_pos;
-            Ok("".to_string())
-        }
-        "move_first_line" => {
-             let num_fields = state.fields().len();
-             if num_fields > 0 {
-                // Use trait setter
-                state.set_current_field(0);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("Moved to first line".to_string())
-        }
-        "move_last_line" => {
-            let num_fields = state.fields().len();
-             if num_fields > 0 {
-                let new_field = num_fields - 1;
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("Moved to last line".to_string())
-        }
-        "move_word_next" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_next_word_start(current_input, state.current_cursor_pos());
-                let final_pos = new_pos.min(current_input.len());
-                // Use trait setter
-                state.set_current_cursor_pos(final_pos);
-                *ideal_cursor_column = final_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_word_end(current_input, state.current_cursor_pos());
-                let final_pos = new_pos.min(current_input.len());
-                 // Use trait setter
-                state.set_current_cursor_pos(final_pos);
-                *ideal_cursor_column = final_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_prev" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_start(current_input, state.current_cursor_pos());
-                // Use trait setter
-                state.set_current_cursor_pos(new_pos);
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end_prev" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_end(current_input, state.current_cursor_pos());
-                // Use trait setter
-                state.set_current_cursor_pos(new_pos);
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("Moved to previous word end".to_string())
-        }
-        "delete_char_forward" => {
-            let cursor_pos = state.current_cursor_pos();
-            let field_value = state.get_current_input_mut();
-            let mut chars: Vec<char> = field_value.chars().collect(); // Use mut for modification
-            if cursor_pos < chars.len() {
-                chars.remove(cursor_pos);
-                *field_value = chars.into_iter().collect();
-                // Use trait setter
-                state.set_has_unsaved_changes(true);
-                // Cursor position doesn't change
-                *ideal_cursor_column = cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "delete_char_backward" => {
-            if state.current_cursor_pos() > 0 {
-                let cursor_pos = state.current_cursor_pos();
-                let field_value = state.get_current_input_mut();
-                let mut chars: Vec<char> = field_value.chars().collect(); // Use mut
-                if cursor_pos <= chars.len() && cursor_pos > 0 {
-                    chars.remove(cursor_pos - 1);
-                    *field_value = chars.into_iter().collect();
-                    let new_pos = cursor_pos - 1;
-                    // Use trait setters
-                    state.set_current_cursor_pos(new_pos);
-                    state.set_has_unsaved_changes(true);
-                    *ideal_cursor_column = new_pos;
-                }
-            }
-            Ok("".to_string())
-        }
-        "insert_char" => {
-            // This action doesn't make sense here as char insertion is handled
-            // directly in handle_edit_specific_input
-            Ok("Character insertion handled directly".to_string())
-        }
-        "next_field" => {
-            let num_fields = state.fields().len();
-             if num_fields > 0 {
-                let new_field = (state.current_field() + 1) % num_fields;
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("".to_string())
-        }
-        "prev_field" => {
-            let num_fields = state.fields().len();
-             if num_fields > 0 {
-                let current_field = state.current_field();
-                let new_field = if current_field == 0 { num_fields - 1 } else { current_field - 1 };
-                // Use trait setter
-                state.set_current_field(new_field);
-                let current_input = state.get_current_input();
-                let max_pos = current_input.len();
-                // Use trait setter
-                state.set_current_cursor_pos((*ideal_cursor_column).min(max_pos));
-            }
-            Ok("".to_string())
-        }
-        _ => Ok(format!("Unknown edit action: {}", action)),
-    }
-}
-
-#[derive(PartialEq)]
-enum CharType {
-    Whitespace,
-    Alphanumeric,
-    Punctuation,
-}
-
-fn get_char_type(c: char) -> CharType {
-    if c.is_whitespace() {
-        CharType::Whitespace
-    } else if c.is_alphanumeric() {
-        CharType::Alphanumeric
-    } else {
-        CharType::Punctuation
-    }
-}
-
-fn find_next_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos >= chars.len() {
-        return current_pos;
-    }
-
-    let mut pos = current_pos;
-    let initial_type = get_char_type(chars[pos]);
-    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
-        pos += 1;
-    }
-
-    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-
-    if current_pos >= chars.len() - 1 {
-        return chars.len() - 1;
-    }
-
-    let mut pos = current_pos;
-
-    if get_char_type(chars[pos]) == CharType::Whitespace {
-        while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-            pos += 1;
-        }
-    } else {
-        let current_type = get_char_type(chars[pos]);
-        if pos + 1 < chars.len() && get_char_type(chars[pos + 1]) != current_type {
-            pos += 1;
-            while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-                pos += 1;
-            }
-        }
-    }
-
-    if pos >= chars.len() {
-        return chars.len() - 1;
-    }
-
-    let word_type = get_char_type(chars[pos]);
-    while pos + 1 < chars.len() && get_char_type(chars[pos + 1]) == word_type {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos == 0 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-    }
-
-    pos
-}
-
-fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos <= 1 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if pos > 0 && get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
-            pos -= 1;
-        }
-
-        if pos > 0 {
-            pos -= 1;
-            let prev_word_type = get_char_type(chars[pos]);
-            while pos > 0 && get_char_type(chars[pos - 1]) == prev_word_type {
-                pos -= 1;
-            }
-
-            while pos < chars.len() - 1 &&
-                  get_char_type(chars[pos + 1]) == prev_word_type {
-                pos += 1;
-            }
-        }
-    }
-
-    pos
+
+    // Character insertion
+    if let KeyCode::Char(_) = key.code {
+        return if is_auth_context {
+            auth_e::execute_edit_action(
+                "insert_char",
+                key,
+                auth_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        } else {
+            form_e::execute_edit_action(
+                "insert_char",
+                key,
+                form_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
+    }
+
+    Ok(command_message.clone())
 }

client/src/modes/canvas/read_only.rs

@@ -3,42 +3,33 @@
 use crate::config::binds::config::Config;
 use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::canvas_state::CanvasState; // Import the trait
+use crate::state::canvas_state::CanvasState;
 use crate::state::pages::auth::AuthState;
 use crate::state::pages::form::FormState;
+use crate::functions::modes::read_only::{auth_ro, form_ro};
 use crossterm::event::KeyEvent;
 
-#[derive(PartialEq)]
-enum CharType {
-    Whitespace,
-    Alphanumeric,
-    Punctuation,
-}
-
 pub async fn handle_read_only_event(
     app_state: &crate::state::state::AppState,
     key: KeyEvent,
     config: &Config,
-    form_state: &mut FormState, // Keep specific types here for routing
-    auth_state: &mut AuthState, // Keep specific types here for routing
+    form_state: &mut FormState,
+    auth_state: &mut AuthState,
     key_sequence_tracker: &mut KeySequenceTracker,
-    current_position: &mut u64, // Needed for form actions
-    total_count: u64,           // Needed for form actions
-    grpc_client: &mut GrpcClient, // Needed for form actions
+    current_position: &mut u64,
+    total_count: u64,
+    grpc_client: &mut GrpcClient,
     command_message: &mut String,
     edit_mode_cooldown: &mut bool,
     ideal_cursor_column: &mut usize,
 ) -> Result<(bool, String), Box<dyn std::error::Error>> {
-    // Check for entering Edit mode from Read-Only mode
     if config.is_enter_edit_mode_before(key.code, key.modifiers) {
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode".to_string();
-        // The actual mode switch happens in event.rs based on this return
         return Ok((false, command_message.clone()));
     }
 
     if config.is_enter_edit_mode_after(key.code, key.modifiers) {
-        // Use the correct state based on context
         let (current_input, current_pos) = if app_state.ui.show_login {
             (
                 auth_state.get_current_input(),
@@ -52,7 +43,6 @@ pub async fn handle_read_only_event(
         };
 
         if !current_input.is_empty() && current_pos < current_input.len() {
-            // Update the correct state
             if app_state.ui.show_login {
                 auth_state.set_current_cursor_pos(current_pos + 1);
                 *ideal_cursor_column = auth_state.current_cursor_pos();
@@ -63,23 +53,24 @@ pub async fn handle_read_only_event(
         }
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode (after cursor)".to_string();
-        // The actual mode switch happens in event.rs based on this return
         return Ok((false, command_message.clone()));
     }
 
-    // Handle Read-Only mode keybindings
+    const CONTEXT_ACTIONS_FORM: &[&str] = &[
+        "previous_entry",
+        "next_entry",
+    ];
+    const CONTEXT_ACTIONS_LOGIN: &[&str] = &[
+        "previous_entry",
+        "next_entry",
+    ];
+
     if key.modifiers.is_empty() {
         key_sequence_tracker.add_key(key.code);
         let sequence = key_sequence_tracker.get_sequence();
 
-        // Try to match the current sequence against Read-Only mode bindings
-        if let Some(action) = config.matches_key_sequence_generalized(&sequence)
-        {
-            // Handle context-specific actions first
-            let result = if app_state.ui.show_form
-                && (action == "previous_entry" || action == "next_entry")
-            {
-                // Form-specific navigation
+        if let Some(action) = config.matches_key_sequence_generalized(&sequence) {
+            let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                 crate::tui::functions::form::handle_action(
                     action,
                     form_state,
@@ -89,70 +80,43 @@ pub async fn handle_read_only_event(
                     ideal_cursor_column,
                 )
                 .await?
-            } else if app_state.ui.show_login
-                && (action == "move_up" || action == "move_down")
-            {
-                // Login-specific field navigation
+            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
                 crate::tui::functions::login::handle_action(
                     action,
                     auth_state,
                     ideal_cursor_column,
                 )
                 .await?
-            } else if app_state.ui.show_form
-                && (action == "move_up" || action == "move_down")
-            {
-                // Form-specific field navigation (can reuse login handler logic if identical)
-                 crate::tui::functions::form::handle_action(
+            } else if app_state.ui.show_login {
+                auth_ro::execute_action(
                     action,
-                    form_state,
-                    grpc_client, // Might not be needed for simple up/down
-                    current_position,
-                    total_count,
+                    auth_state,
                     ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
                 )
                 .await?
             } else {
-                // Handle common navigation actions generically
-                if app_state.ui.show_login {
-                    execute_action(
-                        action,
-                        auth_state, // Pass AuthState
-                        ideal_cursor_column,
-                        key_sequence_tracker,
-                        command_message,
-                    )
-                    .await?
-                } else {
-                    execute_action(
-                        action,
-                        form_state, // Pass FormState
-                        ideal_cursor_column,
-                        key_sequence_tracker,
-                        command_message,
-                    )
-                    .await?
-                }
+                form_ro::execute_action(
+                    action,
+                    form_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
             };
             key_sequence_tracker.reset();
             return Ok((false, result));
         }
 
-        // Check if this might be a prefix of a longer sequence
         if config.is_key_sequence_prefix(&sequence) {
             return Ok((false, command_message.clone()));
         }
 
-        // Since it's not part of a multi-key sequence, check for a direct action
         if sequence.len() == 1 && !config.is_key_sequence_prefix(&sequence) {
-            if let Some(action) =
-                config.get_read_only_action_for_key(key.code, key.modifiers)
-            {
-                // Handle context-specific actions first
-                let result = if app_state.ui.show_form
-                    && action == "previous_entry"
-                {
-                    // Form-specific navigation
+            if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
+                let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                     crate::tui::functions::form::handle_action(
                         action,
                         form_state,
@@ -162,44 +126,42 @@ pub async fn handle_read_only_event(
                         ideal_cursor_column,
                     )
                     .await?
+                } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
+                    crate::tui::functions::login::handle_action(
+                        action,
+                        auth_state,
+                        ideal_cursor_column,
+                    )
+                    .await?
+                } else if app_state.ui.show_login {
+                    auth_ro::execute_action(
+                        action,
+                        auth_state,
+                        ideal_cursor_column,
+                        key_sequence_tracker,
+                        command_message,
+                    )
+                    .await?
                 } else {
-                    // Handle common navigation actions generically
-                    if app_state.ui.show_login {
-                        execute_action(
-                            action,
-                            auth_state, // Pass AuthState
-                            ideal_cursor_column,
-                            key_sequence_tracker,
-                            command_message,
-                        )
-                        .await?
-                    } else {
-                        execute_action(
-                            action,
-                            form_state, // Pass FormState
-                            ideal_cursor_column,
-                            key_sequence_tracker,
-                            command_message,
-                        )
-                        .await?
-                    }
+                    form_ro::execute_action(
+                        action,
+                        form_state,
+                        ideal_cursor_column,
+                        key_sequence_tracker,
+                        command_message,
+                    )
+                    .await?
                 };
                 key_sequence_tracker.reset();
                 return Ok((false, result));
             }
         }
+        key_sequence_tracker.reset();
     } else {
-        // If modifiers are pressed, check for direct key bindings
         key_sequence_tracker.reset();
 
-        if let Some(action) =
-            config.get_read_only_action_for_key(key.code, key.modifiers)
-        {
-            // Handle context-specific actions first
-            let result = if app_state.ui.show_form
-                && action == "previous_entry"
-            {
-                // Form-specific navigation
+        if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
+            let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                 crate::tui::functions::form::handle_action(
                     action,
                     form_state,
@@ -209,33 +171,36 @@ pub async fn handle_read_only_event(
                     ideal_cursor_column,
                 )
                 .await?
+            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
+                crate::tui::functions::login::handle_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_login {
+                auth_ro::execute_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
             } else {
-                // Handle common navigation actions generically
-                if app_state.ui.show_login {
-                    execute_action(
-                        action,
-                        auth_state, // Pass AuthState
-                        ideal_cursor_column,
-                        key_sequence_tracker,
-                        command_message,
-                    )
-                    .await?
-                } else {
-                    execute_action(
-                        action,
-                        form_state, // Pass FormState
-                        ideal_cursor_column,
-                        key_sequence_tracker,
-                        command_message,
-                    )
-                    .await?
-                }
+                form_ro::execute_action(
+                    action,
+                    form_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
             };
             return Ok((false, result));
         }
     }
 
-    // Show a helpful message when no binding was found
     if !*edit_mode_cooldown {
         let default_key = "i".to_string();
         let edit_key = config
@@ -243,296 +208,12 @@ pub async fn handle_read_only_event(
             .read_only
             .get("enter_edit_mode_before")
             .and_then(|keys| keys.first())
-            .unwrap_or(&default_key);
+            .map(|k| k.to_string())
+            .unwrap_or(default_key);
         *command_message = format!("Read-only mode - press {} to edit", edit_key);
     }
 
+    *edit_mode_cooldown = false;
+
     Ok((false, command_message.clone()))
 }
-
-// Make this function generic over CanvasState
-async fn execute_action<S: CanvasState>(
-    action: &str,
-    state: &mut S, // Use generic state
-    ideal_cursor_column: &mut usize,
-    key_sequence_tracker: &mut KeySequenceTracker, // Keep for resetting
-    command_message: &mut String, // Keep for clearing
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        // These actions are handled outside now based on context
-        "previous_entry" | "next_entry" => {
-            key_sequence_tracker.reset();
-            Ok(format!(
-                "Action '{}' should be handled by context-specific logic",
-                action
-            ))
-        }
-        // These actions are handled outside now based on context
-        "move_up" | "move_down" => {
-            key_sequence_tracker.reset();
-             Ok(format!(
-                "Action '{}' should be handled by context-specific logic",
-                action
-            ))
-        }
-        "exit_edit_mode" => {
-            // This action is primarily for Edit mode, but might be bound here too
-            key_sequence_tracker.reset();
-            command_message.clear();
-            Ok("".to_string())
-        }
-        "move_left" => {
-            let current_pos = state.current_cursor_pos();
-            let new_pos = current_pos.saturating_sub(1);
-            state.set_current_cursor_pos(new_pos); // Use trait setter
-            *ideal_cursor_column = new_pos;
-            Ok("".to_string())
-        }
-        "move_right" => {
-            let current_input = state.get_current_input();
-            let current_pos = state.current_cursor_pos();
-            // In read-only, cursor stops AT the last character, not after
-            if !current_input.is_empty()
-                && current_pos < current_input.len().saturating_sub(1)
-            {
-                let new_pos = current_pos + 1;
-                state.set_current_cursor_pos(new_pos); // Use trait setter
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_next" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos =
-                    find_next_word_start(current_input, state.current_cursor_pos());
-                // Clamp to last valid character index in read-only
-                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
-                state.set_current_cursor_pos(final_pos); // Use trait setter
-                *ideal_cursor_column = final_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos =
-                    find_word_end(current_input, state.current_cursor_pos());
-                // Clamp to last valid character index in read-only
-                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
-                state.set_current_cursor_pos(final_pos); // Use trait setter
-                *ideal_cursor_column = final_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_prev" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_start(
-                    current_input,
-                    state.current_cursor_pos(),
-                );
-                state.set_current_cursor_pos(new_pos); // Use trait setter
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end_prev" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_end(
-                    current_input,
-                    state.current_cursor_pos(),
-                );
-                state.set_current_cursor_pos(new_pos); // Use trait setter
-                *ideal_cursor_column = new_pos;
-            }
-            Ok("Moved to previous word end".to_string())
-        }
-        "move_line_start" => {
-            state.set_current_cursor_pos(0); // Use trait setter
-            *ideal_cursor_column = 0;
-            Ok("".to_string())
-        }
-        "move_line_end" => {
-            let current_input = state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = current_input.len().saturating_sub(1);
-                state.set_current_cursor_pos(new_pos); // Use trait setter
-                *ideal_cursor_column = new_pos;
-            } else {
-                state.set_current_cursor_pos(0); // Handle empty input case
-                *ideal_cursor_column = 0;
-            }
-            Ok("".to_string())
-        }
-        "move_first_line" => {
-            // Field change is handled outside based on context
-            // Just set cursor position based on ideal column
-            let current_input = state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len().saturating_sub(1)
-            } else {
-                0
-            };
-            state.set_current_cursor_pos(
-                (*ideal_cursor_column).min(max_cursor_pos),
-            );
-            Ok("Moved to first line".to_string()) // Message might be inaccurate now
-        }
-        "move_last_line" => {
-            // Field change is handled outside based on context
-            // Just set cursor position based on ideal column
-            let current_input = state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len().saturating_sub(1)
-            } else {
-                0
-            };
-            state.set_current_cursor_pos(
-                (*ideal_cursor_column).min(max_cursor_pos),
-            );
-            Ok("Moved to last line".to_string()) // Message might be inaccurate now
-        }
-        _ => Ok(format!("Unknown read-only action: {}", action)),
-    }
-}
-
-// Helper functions remain unchanged as they operate on &str
-fn get_char_type(c: char) -> CharType {
-    if c.is_whitespace() {
-        CharType::Whitespace
-    } else if c.is_alphanumeric() {
-        CharType::Alphanumeric
-    } else {
-        CharType::Punctuation
-    }
-}
-
-fn find_next_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos >= chars.len() {
-        return current_pos;
-    }
-
-    let mut pos = current_pos;
-    // Handle edge case where current_pos might be out of bounds after edits
-    if pos >= chars.len() {
-        return chars.len();
-    }
-    let initial_type = get_char_type(chars[pos]);
-
-    // Move past characters of the same type
-    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
-        pos += 1;
-    }
-
-    // Move past whitespace
-    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos += 1;
-    }
-
-    pos
-}
-
-
-fn find_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-     // Handle edge case where current_pos might be out of bounds
-    let mut pos = current_pos.min(chars.len().saturating_sub(1));
-
-    // If starting on whitespace, move to the next non-whitespace
-    if get_char_type(chars[pos]) == CharType::Whitespace {
-         while pos + 1 < chars.len() && get_char_type(chars[pos + 1]) == CharType::Whitespace {
-            pos += 1;
-        }
-        // If we are still on whitespace (meaning end of string or only whitespace left), return current pos
-        if pos + 1 >= chars.len() || get_char_type(chars[pos + 1]) == CharType::Whitespace {
-             return pos;
-        }
-        // Move to the start of the next word
-        pos += 1;
-    }
-
-    // Now we are on a non-whitespace character
-    let word_type = get_char_type(chars[pos]);
-    while pos + 1 < chars.len() && get_char_type(chars[pos + 1]) == word_type {
-        pos += 1;
-    }
-
-    pos
-}
-
-
-fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos == 0 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    // Move past whitespace
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    // Now on a non-whitespace or at the beginning
-    if get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-        // Move to the beginning of the word
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-    }
-
-    // If pos is 0 and it's whitespace, keep it at 0. Otherwise, it's the start of the word.
-    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        0
-    } else {
-        pos
-    }
-}
-
-
-fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
-     let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos <= 1 { // Need at least 2 chars to find a *previous* word end
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1); // Start looking one char back
-
-    // Skip trailing whitespace from the current position
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-     // Now we are at the end of the word the cursor was in/after, or at the start
-    if pos == 0 {
-        return 0; // Reached the beginning
-    }
-
-    // Skip the word itself
-    let word_type = get_char_type(chars[pos]);
-     while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-        pos -= 1;
-    }
-
-    // Skip whitespace before that word
-    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    // Now pos is at the beginning of the word *or* the end of the *previous* word.
-    // If we moved back, pos-1 is the index we want.
-    if pos > 0 {
-        pos - 1
-    } else {
-        0 // We were at the first word
-    }
-}
-

client/src/modes/common.rs

@@ -1,3 +1,6 @@
 // src/client/modes/common.rs
 pub mod command_mode;
 pub mod highlight;
+pub mod commands;
+
+pub use commands::*;

client/src/modes/common/command_mode.rs

@@ -4,7 +4,7 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::tui::functions::common::commands::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
 use crate::tui::functions::common::form::{save, revert};
 

client/src/modes/handlers/event.rs

@@ -6,14 +6,15 @@ use crate::tui::terminal::{
 };
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::tui::functions::common::commands::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 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},
-    canvas::{edit, read_only, common},
+    canvas::{edit, read_only, common_mode},
     general::navigation,
 };
 use crate::config::binds::key_sequences::KeySequenceTracker;
@@ -27,7 +28,7 @@ pub struct EventHandler {
     pub edit_mode_cooldown: bool,
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
-    pub auth_state: AuthState,
+    // pub auth_state: AuthState, // Removed
     pub auth_client: AuthClient,
 }
 
@@ -41,7 +42,7 @@ impl EventHandler {
             edit_mode_cooldown: false,
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
-            auth_state: AuthState::new(),
+            // auth_state: AuthState::new(), // Removed
             auth_client: AuthClient::new().await?,
         })
     }
@@ -54,6 +55,7 @@ impl EventHandler {
         grpc_client: &mut GrpcClient,
         command_handler: &mut CommandHandler,
         form_state: &mut FormState,
+        auth_state: &mut AuthState, // Added
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
@@ -100,10 +102,25 @@ impl EventHandler {
 
                     if config.is_enter_edit_mode_after(key_code, modifiers) &&
                        ModeManager::can_enter_edit_mode(current_mode) {
-                        let current_input = form_state.get_current_input();
-                        if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
-                            form_state.current_cursor_pos += 1;
-                            self.ideal_cursor_column = form_state.current_cursor_pos;
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos < current_input.len() {
+                             if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
                         }
                         self.is_edit_mode = true;
                         self.edit_mode_cooldown = true;
@@ -123,7 +140,6 @@ impl EventHandler {
                     }
 
                     // Check for core application actions (save, quit, etc.)
-                    // ONLY handle a limited subset of core actions here
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -131,10 +147,10 @@ impl EventHandler {
                     ) {
                         match action {
                             "save" | "force_quit" | "save_and_quit" | "revert" => {
-                                return common::handle_core_action(
+                                return common_mode::handle_core_action(
                                     action,
                                     form_state,
-                                    &mut self.auth_state,
+                                    auth_state, // Changed
                                     grpc_client,
                                     &mut self.auth_client,
                                     terminal,
@@ -143,17 +159,17 @@ impl EventHandler {
                                     total_count,
                                 ).await;
                             },
-                            _ => {} // For other actions, let the mode-specific handler take care of it
+                            _ => {}
                         }
                     }
 
-                    // Let read_only mode handle its own actions (including navigation from common bindings)
+                    // Let read_only mode handle its own actions
                     return read_only::handle_read_only_event(
                         &app_state,
                         key,
                         config,
                         form_state,
-                        &mut self.auth_state,
+                        auth_state, // Changed
                         &mut self.key_sequence_tracker,
                         current_position,
                         total_count,
@@ -167,7 +183,13 @@ impl EventHandler {
                 AppMode::Edit => {
                     // Check for exiting edit mode
                     if config.is_exit_edit_mode(key_code, modifiers) {
-                        if form_state.has_unsaved_changes {
+                        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 = "Unsaved changes! Use :w to save or :q! to discard".to_string();
                             return Ok((false, self.command_message.clone()));
                         }
@@ -176,16 +198,31 @@ impl EventHandler {
                         self.command_message = "Read-only mode".to_string();
                         terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
 
-                        let current_input = form_state.get_current_input();
-                        if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
-                            form_state.current_cursor_pos = current_input.len() - 1;
-                            self.ideal_cursor_column = form_state.current_cursor_pos;
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos >= current_input.len() {
+                            let new_pos = current_input.len() - 1;
+                            if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
                         }
                         return Ok((false, self.command_message.clone()));
                     }
 
                     // Check for core application actions (save, quit, etc.)
-                    // ONLY handle a limited subset of core actions here
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -193,10 +230,10 @@ impl EventHandler {
                     ) {
                         match action {
                             "save" | "force_quit" | "save_and_quit" | "revert" => {
-                                return common::handle_core_action(
+                                return common_mode::handle_core_action(
                                     action,
                                     form_state,
-                                    &mut self.auth_state,
+                                    auth_state, // Changed
                                     grpc_client,
                                     &mut self.auth_client,
                                     terminal,
@@ -205,36 +242,24 @@ impl EventHandler {
                                     total_count,
                                 ).await;
                             },
-                            _ => {} // For other actions, let the mode-specific handler take care of it
+                            _ => {}
                         }
                     }
 
-                    // Let edit mode handle its own actions (including navigation from common bindings)
-                    let result = if app_state.ui.show_login {
-                        edit::handle_edit_event_internal(
-                            key,
-                            config,
-                            &mut self.auth_state, // Use auth_state instead of form_state
-                            &mut self.ideal_cursor_column,
-                            &mut self.command_message,
-                            &mut app_state.ui.is_saved,
-                            current_position,
-                            total_count,
-                            grpc_client,
-                        ).await?
-                    } else {
-                        edit::handle_edit_event_internal(
-                            key,
-                            config,
-                            form_state,
-                            &mut self.ideal_cursor_column,
-                            &mut self.command_message,
-                            &mut app_state.ui.is_saved,
-                            current_position,
-                            total_count,
-                            grpc_client,
-                        ).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
+                        &mut self.ideal_cursor_column,
+                        &mut self.command_message,
+                        &mut app_state.ui.is_saved,
+                        current_position,
+                        total_count,
+                        grpc_client,
+                    ).await?;
 
                     self.key_sequence_tracker.reset();
                     return Ok((false, result));
@@ -267,6 +292,5 @@ impl EventHandler {
         self.edit_mode_cooldown = false;
         Ok((false, self.command_message.clone()))
     }
-
-
 }
+

client/src/modes/handlers/mode_manager.rs

@@ -19,7 +19,7 @@ impl ModeManager {
             return AppMode::Command;
         }
 
-        if app_state.ui.show_login {  // NEW: Check auth visibility
+        if app_state.ui.show_login {
             if event_handler.is_edit_mode {
                 AppMode::Edit
             } else {

client/src/state/pages/auth.rs

@@ -12,6 +12,7 @@ pub struct AuthState {
     pub auth_token: Option<String>,
     pub user_id: Option<String>,
     pub role: Option<String>,
+    pub has_unsaved_changes: bool,
 }
 
 impl AuthState {
@@ -26,6 +27,7 @@ impl AuthState {
             auth_token: None,
             user_id: None,
             role: None,
+            has_unsaved_changes: false,
         }
     }
 }
@@ -36,12 +38,16 @@ impl CanvasState for AuthState {
     }
 
     fn current_cursor_pos(&self) -> usize {
-        self.current_cursor_pos
+        let len = match self.current_field {
+            0 => self.username.len(),
+            1 => self.password.len(),
+            _ => 0,
+        };
+        self.current_cursor_pos.min(len)
     }
 
     fn has_unsaved_changes(&self) -> bool {
-        // Auth form doesn't need unsaved changes tracking
-        false
+        self.has_unsaved_changes
     }
 
     fn inputs(&self) -> Vec<&String> {
@@ -52,7 +58,7 @@ impl CanvasState for AuthState {
         match self.current_field {
             0 => &self.username,
             1 => &self.password,
-            _ => "", // Return empty string for invalid index instead of panicking
+            _ => "",
         }
     }
 
@@ -68,20 +74,31 @@ impl CanvasState for AuthState {
         vec!["Username/Email", "Password"]
     }
 
-    // --- Implement the setter methods ---
     fn set_current_field(&mut self, index: usize) {
-        // AuthState only has 2 fields (0 and 1)
-        if index < 2 {
+        if index < 2 { // AuthState only has 2 fields
             self.current_field = index;
+            // IMPORTANT: Clamp cursor position to the length of the NEW field
+            let len = match self.current_field {
+               0 => self.username.len(),
+               1 => self.password.len(),
+               _ => 0,
+            };
+            self.current_cursor_pos = self.current_cursor_pos.min(len);
         }
     }
 
     fn set_current_cursor_pos(&mut self, pos: usize) {
-        // Optional: Add validation based on current input length if needed
-        self.current_cursor_pos = pos;
+        let len = match self.current_field {
+           0 => self.username.len(),
+           1 => self.password.len(),
+           _ => 0,
+        };
+        // Ensure stored position is always valid
+        self.current_cursor_pos = pos.min(len);
     }
 
-    fn set_has_unsaved_changes(&mut self, _changed: bool) {
-        // Auth form doesn't track unsaved changes, so do nothing
+    fn set_has_unsaved_changes(&mut self, changed: bool) {
+        // Allow the generic handler to signal changes
+        self.has_unsaved_changes = changed;
     }
 }

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) {
-        self.ui.dialog.show_dialog = true;
+    /// Shows a dialog with the given title, message, and buttons.
+    /// 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) {
-        self.ui.dialog.dialog_button_active = active;
+    /// Sets the active button index, wrapping around if necessary.
+    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.rs

@@ -1,8 +1,7 @@
 // src/tui/functions/common.rs
-pub mod commands;
+
 pub mod form;
 pub mod login;
 
-pub use commands::*;
-pub use form::{revert as form_revert, save as form_save};
-pub use login::{revert as login_revert, save as login_save};
+pub use form::*;
+pub use login::*;

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,87 @@ 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.user_id = Some(response.user_id);
-            auth_state.role = Some(response.role);
-            auth_state.error_message = None;
-            auth_state.set_has_unsaved_changes(false); // Mark as "saved"
+            auth_state.auth_token = Some(response.access_token.clone());
+            auth_state.user_id = Some(response.user_id.clone());
+            auth_state.role = Some(response.role.clone());
+            auth_state.set_has_unsaved_changes(false);
 
-            // Update app state to transition from login to the main form view
-            app_state.ui.show_login = false;
-            app_state.ui.show_form = true; // Assuming form is the next view
+            let success_message = format!(
+                "Login Successful!\n\n\
+                 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
+            app_state.show_dialog(
+                "Login Success",
+                &success_message,
+                vec!["OK".to_string()], // Pass buttons here
+            );
+            // REMOVE these lines:
+            // app_state.ui.dialog.dialog_title = "Login Success".to_string();
+            // app_state.ui.dialog.dialog_message = success_message;
+            // app_state.ui.dialog.dialog_show = true;
+            // app_state.ui.dialog.dialog_button_active = true;
+
+            Ok("Login successful, details shown in dialog.".to_string())
         }
         Err(e) => {
-            // Store error message on failure
-            let error_message = format!("Login failed: {}", e);
-            auth_state.error_message = Some(error_message.clone());
-            // Keep unsaved changes true if login fails, allowing retry/revert
+            let error_message = format!("{}", e);
+
+            // Use the helper method to configure and show the dialog
+            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.set_has_unsaved_changes(false); // Fields are cleared, no unsaved changes
+    auth_state.error_message = None;
+    auth_state.set_has_unsaved_changes(false);
 
-    // Update app state to hide login and show the previous screen (Intro)
-    app_state.ui.show_login = false;
-    app_state.ui.show_intro = true; // Assuming Intro is the screen before login
+    // Ensure dialog is hidden if revert is called
+    // _app_state.hide_dialog(); // Uncomment if needed
+
+    // 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

@@ -1,6 +1,7 @@
 // src/tui/functions/form.rs
 use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
 
 pub async fn handle_action(
     action: &str,
@@ -74,38 +75,6 @@ pub async fn handle_action(
                 Ok("Already at last entry".into())
             }
         }
-        "move_up" => {
-            // Change field first
-            if form_state.current_field == 0 {
-                form_state.current_field = form_state.fields.len() - 1;
-            } else {
-                form_state.current_field = form_state.current_field.saturating_sub(1);
-            }
-
-            // Get current input AFTER changing field
-            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 = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "move_down" => {
-            // Change field first
-            form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-
-            // Get current input AFTER changing field
-            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 = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
         _ => Err("Unknown form action".into())
     }
 }

client/src/tui/functions/login.rs

@@ -8,56 +8,11 @@ pub async fn handle_action(
     ideal_cursor_column: &mut usize,
 ) -> Result<String, Box<dyn std::error::Error>> {
     match action {
-        "move_up" => {
-            if auth_state.return_selected {
-                // From Return button to last field (password)
-                auth_state.return_selected = false;
-                auth_state.current_field = 1;
-            } else if auth_state.current_field == 1 {
-                // Password -> Username
-                auth_state.current_field = 0;
-            } else if auth_state.current_field == 0 {
-                // Username -> Password (wrap around fields only)
-                auth_state.current_field = 1;
-            } else if auth_state.current_field == 2 {
-                // From Login button to Password field
-                auth_state.current_field = 1;
-            }
-
-            // Update cursor position only when in a field
-            if auth_state.current_field < 2 {
-                let current_input = auth_state.get_current_input();
-                let max_cursor_pos = current_input.len();
-                auth_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            }
-
-            Ok(format!("Navigation 'up' from functions/login"))
+        "previous_entry" => {
+            Ok("Previous entry at tui/functions/login.rs not implemented".into())
         }
-        "move_down" => {
-            if auth_state.return_selected {
-                // From Return button to first field (username)
-                auth_state.return_selected = false;
-                auth_state.current_field = 0;
-            } else if auth_state.current_field == 0 {
-                // Username -> Password
-                auth_state.current_field = 1;
-            } else if auth_state.current_field == 1 {
-                // Password -> Login button
-                auth_state.current_field = 2;
-                auth_state.return_selected = false;
-            } else if auth_state.current_field == 2 {
-                // Login button -> Return button
-                auth_state.return_selected = true;
-            }
-
-            // Update cursor position only when in a field
-            if auth_state.current_field < 2 {
-                let current_input = auth_state.get_current_input();
-                let max_cursor_pos = current_input.len();
-                auth_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            }
-
-            Ok(format!("Navigation 'down' from functions/login"))
+        "next_entry" => {
+            Ok("Next entry at tui/functions/login.rs not implemented".into())
         }
         _ => Err("Unknown login action".into())
     }

client/src/ui/handlers/ui.rs

@@ -3,14 +3,15 @@
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::services::ui_service::UiService;  // Add this import
+use crate::services::ui_service::UiService;
 use crate::tui::terminal::EventReader;
-use crate::tui::functions::common::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
 
@@ -18,10 +19,10 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
     let mut terminal = TerminalCore::new()?;
     let mut grpc_client = GrpcClient::new().await?;
-    let auth_client = AuthClient::new().await?;
+    // let auth_client = AuthClient::new().await?; // AuthClient is now inside EventHandler
     let mut command_handler = CommandHandler::new();
     let theme = Theme::from_str(&config.colors.theme);
-    let mut auth_state = AuthState::default();
+    let mut auth_state = AuthState::default(); // The single source of truth for AuthState
 
     // Initialize app_state first
     let mut app_state = AppState::new()?;
@@ -32,7 +33,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
-    // The rest of your UI initialization remains the same
+    // Initialize EventHandler (which now contains AuthClient)
     let mut event_handler = EventHandler::new().await?;
     let event_reader = EventReader::new();
 
@@ -43,13 +44,16 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     loop {
         UiService::update_adresar_count(&mut grpc_client, &mut app_state).await?;
 
+        // Determine edit mode based on EventHandler state
+        let is_edit_mode = event_handler.is_edit_mode;
+
         terminal.draw(|f| {
             render_ui(
                 f,
                 &mut form_state,
-                &mut auth_state,
+                &mut auth_state, // Pass the single AuthState instance
                 &theme,
-                event_handler.is_edit_mode,
+                is_edit_mode, // Use determined edit mode
                 app_state.total_count,
                 app_state.current_position,
                 &app_state.current_dir,
@@ -71,6 +75,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             &mut grpc_client,
             &mut command_handler,
             &mut form_state,
+            &mut auth_state, // Pass the single AuthState instance here too
             &mut app_state,
             total_count,
             &mut current_position,
@@ -78,49 +83,74 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
 
         app_state.current_position = current_position;
 
-        // Handle position changes and update form state
-        if !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
-            } else {
-                0
-            };
-            form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-
-            // Ensure position never exceeds total_count + 1
-            if app_state.current_position > total_count + 1 {
-                app_state.current_position = total_count + 1;
-            }
-            if app_state.current_position > total_count {
-                // New entry - reset form
-                form_state.reset_to_empty();
-                form_state.current_field = 0;
-            } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
-                // Existing entry - load data
-                let current_position = app_state.current_position;
-                let message = UiService::load_adresar_by_position(
-                    &mut grpc_client,
-                    &mut app_state,
-                    &mut form_state,
-                    current_position
-                ).await?;                
-
+        // Handle position changes and update form state (Only when form is shown)
+        if app_state.ui.show_form { // Added check
+            if !event_handler.is_edit_mode {
                 let current_input = form_state.get_current_input();
-                let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
-                    current_input.len() - 1  // In readonly mode, limit to last character
+                let max_cursor_pos = if !current_input.is_empty() {
+                    current_input.len() - 1  // Limit to last character in readonly mode
                 } else {
-                    current_input.len()
+                    0
                 };
                 form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                event_handler.command_message = message;
-            } else {
-                // Invalid position - reset to first entry
-                app_state.current_position = 1;
+
+                // Ensure position never exceeds total_count + 1
+                if app_state.current_position > total_count + 1 {
+                    app_state.current_position = total_count + 1;
+                }
+                if app_state.current_position > total_count {
+                    // New entry - reset form
+                    form_state.reset_to_empty();
+                    form_state.current_field = 0;
+                } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
+                    // Existing entry - load data
+                    let current_position_to_load = app_state.current_position; // Use a copy
+                    let load_message = UiService::load_adresar_by_position(
+                        &mut grpc_client,
+                        &mut app_state, // Pass app_state mutably if needed by the service
+                        &mut form_state,
+                        current_position_to_load
+                    ).await?;
+
+                    let current_input = form_state.get_current_input();
+                    let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
+                        current_input.len() - 1  // In readonly mode, limit to last character
+                    } else {
+                        current_input.len()
+                    };
+                    form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+                    // Don't overwrite message from handle_event if load_message is simple success
+                    if !load_message.starts_with("Loaded entry") || message.is_empty() {
+                         event_handler.command_message = load_message;
+                    }
+                } else {
+                    // Invalid position (e.g., 0) - reset to first entry or new entry mode
+                    app_state.current_position = 1.min(total_count + 1); // Go to 1 or new entry if empty
+                     if app_state.current_position > total_count {
+                         form_state.reset_to_empty();
+                         form_state.current_field = 0;
+                     }
+                }
             }
+        } else if app_state.ui.show_login {
+             // Handle cursor updates for AuthState if needed, similar to FormState
+             if !event_handler.is_edit_mode {
+                 let current_input = auth_state.get_current_input();
+                 let max_cursor_pos = if !current_input.is_empty() {
+                     current_input.len() - 1
+                 } else {
+                     0
+                 };
+                 auth_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+             }
+        }
+
+
+        // Only update command message if handle_event provided one
+        if !message.is_empty() {
+            event_handler.command_message = message;
         }
 
-        event_handler.command_message = message;
         if should_exit {
             return Ok(());
         }