fixed, removed log library

Cargo.lock

@@ -1656,9 +1656,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lru"

client/config.toml

@@ -15,6 +15,7 @@ toggle_sidebar = ["ctrl+t"]
 toggle_buffer_list = ["ctrl+b"]
 next_field = ["Tab"]
 prev_field = ["Shift+Tab"]
+exit_table_scroll = ["esc"]
 
 [keybindings.common]
 save = ["ctrl+s"]
@@ -60,16 +61,17 @@ enter_highlight_mode_linewise = ["ctrl+v"]
 # BIG CHANGES NOW EXIT HANDLES EITHER IF THOSE
 # exit_edit_mode = ["esc","ctrl+e"]
 # exit_suggestion_mode = ["esc"]
+# select_suggestion = ["enter"]
+# next_field = ["enter"]
+enter_decider = ["enter"]
+prev_field = ["shift+enter"]
 exit = ["esc", "ctrl+e"]
 delete_char_forward = ["delete"]
 delete_char_backward = ["backspace"]
-next_field = ["enter"]
-prev_field = ["shift+enter"]
 move_left = ["left"]
 move_right = ["right"]
 suggestion_down = ["ctrl+n", "tab"]
 suggestion_up = ["ctrl+p", "shift+tab"]
-select_suggestion = ["enter"]
 
 [keybindings.command]
 exit_command_mode = ["ctrl+g", "esc"]

client/src/components/admin/add_table.rs

@@ -1,31 +1,47 @@
 // src/components/admin/add_table.rs
 use crate::config::colors::themes::Theme;
+use crate::state::app::highlight::HighlightState;
+use crate::state::app::state::AppState;
+use crate::state::pages::add_table::{AddTableFocus, AddTableState};
+use crate::state::pages::canvas_state::CanvasState;
+// use crate::state::pages::add_table::{ColumnDefinition, LinkDefinition}; // Not directly used here
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
-    style::{Style, Stylize},
+    style::{Modifier, Style},
     text::{Line, Span},
-    widgets::{Block, BorderType, Borders, Paragraph},
+    widgets::{Block, BorderType, Borders, Cell, Paragraph, Row, Table},
     Frame,
 };
-use crate::state::app::state::AppState;
-use crate::state::app::highlight::HighlightState;
-use crate::state::pages::canvas_state::CanvasState;
 use crate::components::handlers::canvas::render_canvas;
-use crate::state::pages::add_table::AddTableState;
+use crate::components::common::dialog;
 
-/// Renders a placeholder page for adding tables.
+/// Renders the Add New Table page layout, structuring the display of table information,
+/// input fields, and action buttons. Adapts layout based on terminal width.
 pub fn render_add_table(
     f: &mut Frame,
     area: Rect,
     theme: &Theme,
-    _app_state: &AppState,
+    app_state: &AppState, // Currently unused, might be needed later
     add_table_state: &mut AddTableState,
-    is_edit_mode: bool,
-    highlight_state: &HighlightState,
+    is_edit_mode: bool, // Determines if canvas inputs are in edit mode
+    highlight_state: &HighlightState, // For text highlighting in canvas
 ) {
-    // Main block for the whole page
+    // --- Configuration ---
+    // Threshold width to switch between wide and narrow layouts
+    const NARROW_LAYOUT_THRESHOLD: u16 = 120; // Adjust this value as needed
+
+    // --- State Checks ---
+    let focus_on_canvas_inputs = matches!(
+        add_table_state.current_focus,
+        AddTableFocus::InputTableName
+            | AddTableFocus::InputColumnName
+            | AddTableFocus::InputColumnType
+    );
+
+    // --- Main Page Block ---
     let main_block = Block::default()
         .title(" Add New Table ")
+        .title_alignment(Alignment::Center)
         .borders(Borders::ALL)
         .border_type(BorderType::Rounded)
         .border_style(Style::default().fg(theme.border))
@@ -33,148 +49,453 @@ pub fn render_add_table(
     let inner_area = main_block.inner(area);
     f.render_widget(main_block, area);
 
-    // Split the inner area horizontally: Left info pane | Right input/action pane
-    let horizontal_chunks = Layout::default()
-        .direction(Direction::Horizontal)
-        .constraints([
-            Constraint::Percentage(50), // Left Pane
-            Constraint::Percentage(50), // Right Pane
-        ].as_ref())
-        .split(inner_area);
+    // --- Fullscreen Columns Table Check (Narrow Screens Only) ---
+    if area.width < NARROW_LAYOUT_THRESHOLD && add_table_state.current_focus == AddTableFocus::InsideColumnsTable {
+        // Render ONLY the columns table taking the full inner area
+        let columns_border_style = Style::default().fg(theme.highlight); // Always highlighted when fullscreen
+        let column_rows: Vec<Row<'_>> = add_table_state
+            .columns
+            .iter()
+            .map(|col_def| {
+                Row::new(vec![
+                    Cell::from(if col_def.selected { "[*]" } else { "[ ]" }),
+                    Cell::from(col_def.name.clone()),
+                    Cell::from(col_def.data_type.clone()),
+                ])
+                .style(Style::default().fg(theme.fg))
+            })
+            .collect();
+        let header_cells = ["Sel", "Name", "Type"]
+            .iter()
+            .map(|h| Cell::from(*h).style(Style::default().fg(theme.accent)));
+        let header = Row::new(header_cells).height(1).bottom_margin(1);
+        let columns_table = Table::new(column_rows, [Constraint::Length(5), Constraint::Percentage(50), Constraint::Percentage(50)])
+            .header(header)
+            .block(
+                Block::default()
+                    .title(Span::styled(" Columns (Fullscreen) ", theme.fg)) // Indicate fullscreen
+                    .title_alignment(Alignment::Center)
+                    .borders(Borders::ALL)
+                    .border_type(BorderType::Rounded)
+                    .border_style(columns_border_style),
+            )
+            .row_highlight_style(
+                Style::default()
+                .add_modifier(Modifier::REVERSED)
+                .fg(theme.highlight),
+            )
+            .highlight_symbol(" > "); // Use the inside symbol
+        f.render_stateful_widget(columns_table, inner_area, &mut add_table_state.column_table_state);
+        return; // IMPORTANT: Stop rendering here for fullscreen mode
+    }
 
-    let left_pane = horizontal_chunks[0];
-    let right_pane = horizontal_chunks[1];
+    // --- Area Variable Declarations ---
+    let top_info_area: Rect;
+    let columns_area: Rect;
+    let canvas_area: Rect;
+    let add_button_area: Rect;
+    let indexes_area: Rect;
+    let links_area: Rect;
+    let bottom_buttons_area: Rect;
 
-    // --- Left Pane ---
-    let left_vertical_chunks = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Length(3), // Profile & Table Name header
-            Constraint::Min(5),    // Columns section (expandable)
-            Constraint::Length(1), // Separator
-            Constraint::Min(3),    // Indexes section (expandable)
-            Constraint::Length(1), // Separator
-            Constraint::Min(3),    // Links section (expandable)
-        ].as_ref())
-        .split(left_pane);
+    // --- Layout Decision ---
+    if area.width >= NARROW_LAYOUT_THRESHOLD {
+        // --- WIDE Layout (Based on first screenshot) ---
+        let main_chunks = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Length(3), // Top Info (Profile/Table Name) - Increased to 3 lines
+                Constraint::Min(10),   // Middle Area (Columns | Right Pane)
+                Constraint::Length(3), // Bottom Buttons
+            ])
+            .split(inner_area);
 
-    // Profile & Table Name section
-    let profile_text = Paragraph::new(vec![
-        Line::from(Span::styled("profile: default", theme.fg)), // Placeholder
-        Line::from(Span::styled("table name: [tablename]", theme.fg)), // Placeholder
-    ])
+        top_info_area = main_chunks[0];
+        let middle_area = main_chunks[1];
+        bottom_buttons_area = main_chunks[2];
+
+        // Split Middle Horizontally
+        let middle_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([
+                Constraint::Percentage(50), // Left: Columns Table
+                Constraint::Percentage(50), // Right: Inputs etc.
+            ])
+            .split(middle_area);
+
+        columns_area = middle_chunks[0];
+        let right_pane_area = middle_chunks[1];
+
+        // Split Right Pane Vertically
+        let right_pane_chunks = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Length(5), // Input Canvas Area
+                Constraint::Length(3), // Add Button Area
+                Constraint::Min(5),    // Indexes & Links Area
+            ])
+            .split(right_pane_area);
+
+        canvas_area = right_pane_chunks[0];
+        add_button_area = right_pane_chunks[1];
+        let indexes_links_area = right_pane_chunks[2];
+
+        // Split Indexes/Links Horizontally
+        let indexes_links_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([
+                Constraint::Percentage(50), // Indexes Table
+                Constraint::Percentage(50), // Links Table
+            ])
+            .split(indexes_links_area);
+        indexes_area = indexes_links_chunks[0];
+        links_area = indexes_links_chunks[1];
+
+        // --- Top Info Rendering (Wide - 2 lines) ---
+        let profile_text = Paragraph::new(vec![
+            Line::from(Span::styled(
+                format!("Profile: {}", add_table_state.profile_name),
+                theme.fg,
+            )),
+            Line::from(Span::styled(
+                format!("Table name: {}", add_table_state.table_name),
+                theme.fg,
+            )),
+        ])
+        .block(
+            Block::default()
+                .borders(Borders::BOTTOM)
+                .border_style(Style::default().fg(theme.secondary)),
+        );
+        f.render_widget(profile_text, top_info_area);
+    } else {
+        // --- NARROW Layout (Based on second screenshot) ---
+        let main_chunks = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Length(1), // Top: Profile & Table Name (Single Row)
+                Constraint::Length(5), // Column Definition Input Canvas Area
+                Constraint::Length(3), // Add Button Area
+                Constraint::Min(5),    // Columns Table Area
+                Constraint::Min(5),    // Indexes & Links Area
+                Constraint::Length(3), // Bottom: Save/Cancel Buttons
+            ])
+            .split(inner_area);
+
+        top_info_area = main_chunks[0];
+        canvas_area = main_chunks[1];
+        add_button_area = main_chunks[2];
+        columns_area = main_chunks[3];
+        let indexes_links_area = main_chunks[4];
+        bottom_buttons_area = main_chunks[5];
+
+        // Split Indexes/Links Horizontally
+        let indexes_links_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([
+                Constraint::Percentage(50), // Indexes Table
+                Constraint::Percentage(50), // Links Table
+            ])
+            .split(indexes_links_area);
+        indexes_area = indexes_links_chunks[0];
+        links_area = indexes_links_chunks[1];
+
+        // --- Top Info Rendering (Narrow - 1 line) ---
+        let top_info_chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([
+                Constraint::Percentage(50),
+                Constraint::Percentage(50),
+            ])
+            .split(top_info_area);
+
+        let profile_text = Paragraph::new(Span::styled(
+            format!("Profile: {}", add_table_state.profile_name),
+            theme.fg,
+        ))
+        .alignment(Alignment::Left);
+        f.render_widget(profile_text, top_info_chunks[0]);
+
+        let table_name_text = Paragraph::new(Span::styled(
+            format!("Table: {}", add_table_state.table_name),
+            theme.fg,
+        ))
+        .alignment(Alignment::Left);
+        f.render_widget(table_name_text, top_info_chunks[1]);
+    }
+
+    // --- Common Widget Rendering (Uses calculated areas) ---
+
+    // --- Columns Table Rendering ---
+    let columns_focused = matches!(add_table_state.current_focus, AddTableFocus::ColumnsTable | AddTableFocus::InsideColumnsTable);
+    let columns_border_style = if columns_focused {
+        Style::default().fg(theme.highlight)
+    } else {
+        Style::default().fg(theme.secondary)
+    };
+    let column_rows: Vec<Row<'_>> = add_table_state
+        .columns
+        .iter()
+        .map(|col_def| {
+            Row::new(vec![
+                Cell::from(if col_def.selected { "[*]" } else { "[ ]" }),
+                Cell::from(col_def.name.clone()),
+                Cell::from(col_def.data_type.clone()),
+            ])
+            .style(Style::default().fg(theme.fg))
+        })
+        .collect();
+    let header_cells = ["Sel", "Name", "Type"]
+        .iter()
+        .map(|h| Cell::from(*h).style(Style::default().fg(theme.accent)));
+    let header = Row::new(header_cells).height(1).bottom_margin(1);
+    let columns_highlight_symbol = if add_table_state.current_focus == AddTableFocus::InsideColumnsTable { " > " } else { "   " };
+    let columns_table = Table::new(
+        column_rows,
+        [ // Define constraints for 3 columns: Sel, Name, Type
+            Constraint::Length(5),
+            Constraint::Percentage(60),
+            Constraint::Percentage(35),
+        ],
+    )
+    .header(header)
     .block(
         Block::default()
-            .borders(Borders::BOTTOM)
-            .border_style(Style::default().fg(theme.secondary)),
+            .title(Span::styled(" Columns ", theme.fg))
+            .title_alignment(Alignment::Center)
+            .borders(Borders::ALL)
+            .border_type(BorderType::Rounded)
+            .border_style(columns_border_style),
+    )
+    .row_highlight_style(
+        Style::default()
+            .add_modifier(Modifier::REVERSED)
+            .fg(theme.highlight),
+    )
+    .highlight_symbol(" > ");
+    f.render_stateful_widget(
+        columns_table,
+        columns_area,
+        &mut add_table_state.column_table_state,
     );
-    f.render_widget(profile_text, left_vertical_chunks[0]);
 
-    // Columns section
-    let columns_text = Paragraph::new(vec![
-        Line::from(Span::styled("Name                  Type", theme.accent)), // Header
-    ])
-    .block(Block::default().title(Span::styled(" Columns ", theme.fg)));
-    f.render_widget(columns_text, left_vertical_chunks[1]);
-
-    // Indexes section
-    let indexes_text = Paragraph::new(vec![
-        Line::from(Span::styled("Column name", theme.accent)), // Header
-    ])
-    .block(
-        Block::default()
-            .title(Span::styled(" Indexes ", theme.fg))
-            .borders(Borders::TOP) // Separator from Columns
-            .border_style(Style::default().fg(theme.secondary)),
-    );
-    f.render_widget(indexes_text, left_vertical_chunks[3]);
-
-    // Links section
-    let links_text = Paragraph::new(vec![
-        Line::from(Span::styled("Linked table          Required", theme.accent)), // Header
-    ])
-    .block(
-        Block::default()
-            .title(Span::styled(" Links ", theme.fg))
-            .borders(Borders::TOP) // Separator from Indexes
-            .border_style(Style::default().fg(theme.secondary)),
-    );
-    f.render_widget(links_text, left_vertical_chunks[5]);
-
-    // --- Right Pane ---
-    let right_vertical_chunks = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Length(5), // Area for render_canvas (3 fields + 2 border)
-            Constraint::Length(3), // Add Button Area
-            Constraint::Min(1),    // Spacer
-            Constraint::Length(3), // Save/Cancel buttons area
-        ].as_ref())
-        .split(right_pane);
-
-    let canvas_area = right_vertical_chunks[0];
-    let add_button_area = right_vertical_chunks[1];
-    let bottom_buttons_area = right_vertical_chunks[3];
-
-    // --- Use render_canvas for Inputs ---
+    // --- Canvas Rendering (Column Definition Input) ---
     let _active_field_rect = render_canvas(
         f,
         canvas_area,
         add_table_state,
-        &[
-            "Table name",
-            "Name",
-            "Type",
-        ],
+        &add_table_state.fields(),
         &add_table_state.current_field(),
-        &add_table_state.inputs().iter().map(|s| *s).collect::<Vec<&String>>(),
+        &add_table_state.inputs(),
         theme,
-        is_edit_mode,
+        is_edit_mode && focus_on_canvas_inputs,
         highlight_state,
     );
 
-    // Add Button (Placeholder)
+    // --- Button Style Helpers ---
+    let get_button_style = |button_focus: AddTableFocus, current_focus| {
+        // Only handles text style (FG + Bold) now, no BG
+        let is_focused = current_focus == button_focus;
+        let base_style = Style::default().fg(if is_focused {
+            theme.highlight // Highlighted text color
+        } else {
+            theme.secondary // Normal text color
+        });
+        if is_focused {
+            base_style.add_modifier(Modifier::BOLD)
+        } else {
+            base_style
+        }
+    };
+    // Updated signature to accept bool and theme
+    let get_button_border_style = |is_focused: bool, theme: &Theme| {
+        if is_focused {
+            Style::default().fg(theme.highlight)
+        } else {
+            Style::default().fg(theme.secondary)
+        }
+    };
+
+    // --- Add Button Rendering ---
+    // Determine if the add button is focused
+    let is_add_button_focused = add_table_state.current_focus == AddTableFocus::AddColumnButton;
+
+    // Create the Add button Paragraph widget
     let add_button = Paragraph::new(" Add ")
-        .style(Style::default().fg(theme.secondary))
+        .style(get_button_style(AddTableFocus::AddColumnButton, add_table_state.current_focus)) // Use existing closure
         .alignment(Alignment::Center)
         .block(
             Block::default()
-                .borders(Borders::ALL)
-                .border_type(BorderType::Rounded)
-                .border_style(Style::default().fg(theme.secondary)),
+            .borders(Borders::ALL)
+            .border_type(BorderType::Rounded)
+            .border_style(get_button_border_style(is_add_button_focused, theme)), // Pass bool and theme
         );
+
+    // Render the button in its designated area
     f.render_widget(add_button, add_button_area);
 
-    // Bottom Buttons Area (Save, Cancel)
+    // --- Indexes Table Rendering ---
+    let indexes_focused = matches!(add_table_state.current_focus, AddTableFocus::IndexesTable | AddTableFocus::InsideIndexesTable);
+    let indexes_border_style = if indexes_focused {
+        Style::default().fg(theme.highlight)
+    } else {
+        Style::default().fg(theme.secondary)
+    };
+    let index_rows: Vec<Row<'_>> = add_table_state
+        .indexes
+        .iter()
+        .map(|index_name| {
+            Row::new(vec![Cell::from(index_name.clone())])
+                .style(Style::default().fg(theme.fg))
+        })
+        .collect();
+    let index_header_cells = ["Column Name"]
+        .iter()
+        .map(|h| Cell::from(*h).style(Style::default().fg(theme.accent)));
+    let index_header = Row::new(index_header_cells).height(1).bottom_margin(1);
+    let indexes_highlight_symbol = if add_table_state.current_focus == AddTableFocus::InsideIndexesTable { " > " } else { "   " };
+    let indexes_table =
+        Table::new(index_rows, [Constraint::Percentage(100)])
+            .header(index_header)
+            .block(
+                Block::default()
+                    .title(Span::styled(" Indexes ", theme.fg))
+                    .title_alignment(Alignment::Center)
+                    .borders(Borders::ALL)
+                    .border_type(BorderType::Rounded)
+                    .border_style(indexes_border_style),
+            )
+            .row_highlight_style(
+                Style::default()
+                    .add_modifier(Modifier::REVERSED)
+                    .fg(theme.highlight),
+            )
+            .highlight_symbol(" > ");
+    f.render_stateful_widget(
+        indexes_table,
+        indexes_area,
+        &mut add_table_state.index_table_state,
+    );
+
+    // --- Links Table Rendering ---
+    let links_focused = matches!(add_table_state.current_focus, AddTableFocus::LinksTable | AddTableFocus::InsideLinksTable);
+    let links_border_style = if links_focused {
+        Style::default().fg(theme.highlight)
+    } else {
+        Style::default().fg(theme.secondary)
+    };
+    let link_rows: Vec<Row<'_>> = add_table_state
+        .links
+        .iter()
+        .map(|link_def| {
+            Row::new(vec![
+                Cell::from(link_def.linked_table_name.clone()),
+                Cell::from(if link_def.is_required { "[X]" } else { "[ ]" }),
+            ])
+            .style(Style::default().fg(theme.fg))
+        })
+        .collect();
+    let link_header_cells = ["Linked Table", "Selected"]
+        .iter()
+        .map(|h| Cell::from(*h).style(Style::default().fg(theme.accent)));
+    let link_header = Row::new(link_header_cells).height(1).bottom_margin(1);
+    let links_highlight_symbol = if add_table_state.current_focus == AddTableFocus::InsideLinksTable { " > " } else { "   " };
+    let links_table =
+        Table::new(link_rows, [Constraint::Percentage(80), Constraint::Min(5)])
+            .header(link_header)
+            .block(
+                Block::default()
+                    .title(Span::styled(" Links ", theme.fg))
+                    .title_alignment(Alignment::Center)
+                    .borders(Borders::ALL)
+                    .border_type(BorderType::Rounded)
+                    .border_style(links_border_style),
+            )
+            .row_highlight_style(
+                Style::default()
+                    .add_modifier(Modifier::REVERSED)
+                    .fg(theme.highlight),
+            )
+            .highlight_symbol(" > ");
+    f.render_stateful_widget(
+        links_table,
+        links_area,
+        &mut add_table_state.link_table_state,
+    );
+
+    // --- Save/Cancel Buttons Rendering ---
     let bottom_button_chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([
-            Constraint::Percentage(50), // Save Button
-            Constraint::Percentage(50), // Cancel Button
-        ].as_ref())
+            Constraint::Percentage(33), // Save Button
+            Constraint::Percentage(34), // Delete Button
+            Constraint::Percentage(33), // Cancel Button
+        ])
         .split(bottom_buttons_area);
 
-    // Save Button (Placeholder)
     let save_button = Paragraph::new(" Save table ")
-        .style(Style::default().fg(theme.secondary))
+        .style(get_button_style(
+            AddTableFocus::SaveButton,
+            add_table_state.current_focus,
+        ))
         .alignment(Alignment::Center)
         .block(
             Block::default()
                 .borders(Borders::ALL)
                 .border_type(BorderType::Rounded)
-                .border_style(Style::default().fg(theme.secondary)),
+                .border_style(get_button_border_style(
+                    add_table_state.current_focus == AddTableFocus::SaveButton, // Pass bool
+                    theme,
+                )),
         );
     f.render_widget(save_button, bottom_button_chunks[0]);
 
-    // Cancel Button (Placeholder)
-    let cancel_button = Paragraph::new(" Cancel ")
-        .style(Style::default().fg(theme.secondary))
+    let delete_button = Paragraph::new(" Delete Selected ")
+        .style(get_button_style(
+            AddTableFocus::DeleteSelectedButton,
+            add_table_state.current_focus,
+        ))
         .alignment(Alignment::Center)
         .block(
             Block::default()
                 .borders(Borders::ALL)
                 .border_type(BorderType::Rounded)
-                .border_style(Style::default().fg(theme.secondary)),
+                .border_style(get_button_border_style(
+                    add_table_state.current_focus == AddTableFocus::DeleteSelectedButton, // Pass bool
+                    theme,
+                )),
         );
-    f.render_widget(cancel_button, bottom_button_chunks[1]);
+    f.render_widget(delete_button, bottom_button_chunks[1]);
+
+    let cancel_button = Paragraph::new(" Cancel ")
+        .style(get_button_style(
+            AddTableFocus::CancelButton,
+            add_table_state.current_focus,
+        ))
+        .alignment(Alignment::Center)
+        .block(
+            Block::default()
+                .borders(Borders::ALL)
+                .border_type(BorderType::Rounded)
+                .border_style(get_button_border_style(
+                    add_table_state.current_focus == AddTableFocus::CancelButton, // Pass bool
+                    theme,
+                )),
+        );
+    f.render_widget(cancel_button, bottom_button_chunks[2]);
+
+    // --- DIALOG ---
+    // Render the dialog overlay if it's active
+    if app_state.ui.dialog.dialog_show { // Use the passed-in app_state
+        dialog::render_dialog(
+            f,
+            f.area(), // Render over the whole frame area
+            theme,
+            &app_state.ui.dialog.dialog_title,
+            &app_state.ui.dialog.dialog_message,
+            &app_state.ui.dialog.dialog_buttons,
+            app_state.ui.dialog.dialog_active_button_index,
+            app_state.ui.dialog.is_loading,
+        );
+    }
 }

client/src/components/auth/login.rs

@@ -142,7 +142,8 @@ pub fn render_login(
             &app_state.ui.dialog.dialog_title,
             &app_state.ui.dialog.dialog_message,
             &app_state.ui.dialog.dialog_buttons, // Pass buttons slice
-            app_state.ui.dialog.dialog_active_button_index, // Pass active index
+            app_state.ui.dialog.dialog_active_button_index, 
+            app_state.ui.dialog.is_loading,
         );
     }
 }

client/src/components/auth/register.rs

@@ -168,6 +168,7 @@ pub fn render_register(
             &app_state.ui.dialog.dialog_message,
             &app_state.ui.dialog.dialog_buttons,
             app_state.ui.dialog.dialog_active_button_index,
+            app_state.ui.dialog.is_loading,
         );
     }
 }

client/src/components/common/dialog.rs

@@ -18,6 +18,7 @@ pub fn render_dialog(
     dialog_message: &str,
     dialog_buttons: &[String],
     dialog_active_button_index: usize,
+    is_loading: bool,
 ) {
     // Calculate required height based on the actual number of lines in the message
     let message_lines: Vec<_> = dialog_message.lines().collect();
@@ -63,27 +64,36 @@ pub fn render_dialog(
         vertical: 1,   // Top/Bottom padding inside border
     });
 
-    // Layout for Message and Buttons based on actual message height
-    let mut constraints = vec![
-        // Allocate space for message, ensuring at least 1 line height
-        Constraint::Length(message_height.max(1)), // Use actual calculated height
-    ];
-    if button_row_height > 0 {
-        constraints.push(Constraint::Length(button_row_height));
-    }
+    if is_loading {
+        // --- Loading State ---
+        let loading_text = Paragraph::new(dialog_message) // Use the message passed for loading
+            .style(Style::default().fg(theme.fg).add_modifier(Modifier::ITALIC))
+            .alignment(Alignment::Center);
+        // Render loading message centered in the inner area
+        f.render_widget(loading_text, inner_area);
+    } else {
+        // --- Normal State (Message + Buttons) ---
 
-    let chunks = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints(constraints)
-        .split(inner_area);
+        // Layout for Message and Buttons based on actual message height
+        let mut constraints = vec![
+            // Allocate space for message, ensuring at least 1 line height
+            Constraint::Length(message_height.max(1)), // Use actual calculated height
+        ];
+        if button_row_height > 0 {
+            constraints.push(Constraint::Length(button_row_height));
+        }
 
-    // Render Message
-    let available_width = inner_area.width as usize;
-    let ellipsis = "...";
-    let ellipsis_width = UnicodeWidthStr::width(ellipsis);
+        let chunks = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints(constraints)
+            .split(inner_area);
 
-    let processed_lines: Vec<Line> =
-        message_lines
+        // Render Message
+        let available_width = inner_area.width as usize;
+        let ellipsis = "...";
+        let ellipsis_width = UnicodeWidthStr::width(ellipsis);
+
+        let processed_lines: Vec<Line> = message_lines
             .into_iter()
             .map(|line| {
                 let line_width = UnicodeWidthStr::width(line);
@@ -91,81 +101,83 @@ pub fn render_dialog(
                     // Truncate with ellipsis
                     let mut truncated_len = 0;
                     let mut current_width = 0;
-                    // Iterate over graphemes to handle multi-byte characters correctly
                     for (idx, grapheme) in line.grapheme_indices(true) {
                         let grapheme_width = UnicodeWidthStr::width(grapheme);
-                        if current_width + grapheme_width > available_width.saturating_sub(ellipsis_width) {
-                            break; // Stop before exceeding width needed for text + ellipsis
+                        if current_width + grapheme_width
+                            > available_width.saturating_sub(ellipsis_width)
+                        {
+                            break;
                         }
                         current_width += grapheme_width;
-                        truncated_len = idx + grapheme.len(); // Store the byte index of the end of the last fitting grapheme
+                        truncated_len = idx + grapheme.len();
                     }
-                    let truncated_line = format!("{}{}", &line[..truncated_len], ellipsis);
-                    Line::from(Span::styled(truncated_line, Style::default().fg(theme.fg)))
+                    let truncated_line =
+                        format!("{}{}", &line[..truncated_len], ellipsis);
+                    Line::from(Span::styled(
+                            truncated_line,
+                            Style::default().fg(theme.fg),
+                    ))
                 } else {
-                    // Line fits, use it as is
                     Line::from(Span::styled(line, Style::default().fg(theme.fg)))
                 }
             })
-            .collect();
+        .collect();
 
-    let message_paragraph =
-        Paragraph::new(Text::from(processed_lines)).alignment(Alignment::Center);
-    // Render message in the first chunk
-    f.render_widget(message_paragraph, chunks[0]);
+        let message_paragraph =
+            Paragraph::new(Text::from(processed_lines)).alignment(Alignment::Center);
+        f.render_widget(message_paragraph, chunks[0]); // Render message in the first chunk
 
-    // 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();
+        // 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();
 
-        // 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<_>>();
+            let button_constraints = std::iter::repeat(Constraint::Ratio(
+                    1,
+                    button_count as u32,
+            ))
+                .take(button_count)
+                .collect::<Vec<_>>();
 
-        let button_chunks = Layout::default()
-            .direction(Direction::Horizontal)
-            .constraints(button_constraints)
-            .horizontal_margin(1) // Add space between buttons
-            .split(button_area);
+            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;
-            }
+            for (i, button_label) in dialog_buttons.iter().enumerate() {
+                if i >= button_chunks.len() {
+                    break;
+                }
 
-            let is_active = i == dialog_active_button_index;
-            let (button_style, border_style) = if is_active {
-                (
-                    Style::default()
+                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
-                )
-            };
+                        Style::default().fg(theme.accent),
+                    )
+                } else {
+                    (
+                        Style::default().fg(theme.fg),
+                        Style::default().fg(theme.border),
+                    )
+                };
 
-            let button_block = Block::default()
-                .borders(Borders::ALL)
-                .border_type(BorderType::Plain)
-                .border_style(border_style);
+                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())
+                f.render_widget(
+                    Paragraph::new(button_label.as_str())
                     .block(button_block)
                     .style(button_style)
                     .alignment(Alignment::Center),
-                button_chunks[i],
-            );
+                    button_chunks[i],
+                );
+            }
         }
     }
 }

client/src/functions/modes/edit.rs

@@ -2,3 +2,4 @@
 
 pub mod form_e;
 pub mod auth_e;
+pub mod add_table_e;

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

@@ -0,0 +1,341 @@
+// src/functions/modes/edit/add_table_e.rs
+use crate::state::pages::add_table::AddTableState;
+use crate::state::pages::canvas_state::CanvasState; // Use trait
+use crossterm::event::{KeyCode, KeyEvent};
+use std::error::Error;
+
+#[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
+    }
+}
+
+/// Executes edit actions for the AddTable view canvas.
+pub async fn execute_edit_action(
+    action: &str,
+    key: KeyEvent, // Needed for insert_char
+    state: &mut AddTableState,
+    ideal_cursor_column: &mut usize,
+    // Add other params like grpc_client if needed for future actions (e.g., validation)
+) -> Result<String, Box<dyn Error>> {
+    // Use the CanvasState trait methods implemented for AddTableState
+    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()) // No message needed for char insertion
+        }
+        "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 = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let last_field_index = num_fields - 1;
+                // Prevent cycling forward
+                if current_field < last_field_index {
+                    state.set_current_field(current_field + 1);
+                }
+                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 = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                if current_field > 0 {
+                    state.set_current_field(current_field - 1);
+                }
+                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 current_field = state.current_field();
+            // Prevent moving up from the first field
+            if current_field > 0 {
+                let new_field = 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("ahoj".to_string())
+        }
+        "move_down" => {
+            let num_fields = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let last_field_index = num_fields - 1;
+                if current_field < last_field_index {
+                    let new_field = 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_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" => {
+            if AddTableState::INPUT_FIELD_COUNT > 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("".to_string())
+        }
+        "move_last_line" => {
+            let num_fields = AddTableState::INPUT_FIELD_COUNT;
+            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("".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("".to_string())
+        }
+        // Actions handled by main event loop (mode changes, save, revert)
+        "exit_edit_mode" | "save" | "revert" => {
+            Ok("Action handled by main loop".to_string())
+        }
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}

client/src/functions/modes/navigation/add_table_nav.rs

@@ -5,209 +5,328 @@ use crate::state::{
     pages::add_table::{AddTableFocus, AddTableState},
 };
 use crossterm::event::{KeyEvent};
-use ratatui::widgets::TableState; // Import TableState
+use ratatui::widgets::TableState;
+use crate::tui::functions::common::add_table::handle_add_column_action;
+use crate::ui::handlers::context::DialogPurpose;
 
 /// Handles navigation events specifically for the Add Table view.
 /// Returns true if the event was handled, false otherwise.
 pub fn handle_add_table_navigation(
     key: KeyEvent,
     config: &Config,
-    _app_state: &AppState, // Keep for potential future use (e.g., checking permissions)
+    app_state: &mut AppState,
     add_table_state: &mut AddTableState,
     command_message: &mut String,
 ) -> bool {
     let action = config.get_general_action(key.code, key.modifiers);
     let current_focus = add_table_state.current_focus;
     let mut handled = true; // Assume handled unless logic determines otherwise
+    let mut new_focus = current_focus; // Initialize new_focus
+
+    // Define focus groups for horizontal navigation
+    let is_left_pane_block_focus = matches!(current_focus, // Focus on the table blocks
+        AddTableFocus::ColumnsTable | AddTableFocus::IndexesTable | AddTableFocus::LinksTable
+    );
+    let is_inside_table_focus = matches!(current_focus, // Focus inside for scrolling
+        AddTableFocus::InsideColumnsTable | AddTableFocus::InsideIndexesTable | AddTableFocus::InsideLinksTable
+    );
+    let is_right_pane_general_focus = matches!(current_focus, // Non-canvas elements in right pane
+         AddTableFocus::AddColumnButton | AddTableFocus::SaveButton | AddTableFocus::DeleteSelectedButton | AddTableFocus::CancelButton
+     );
+    let is_canvas_input_focus = matches!(current_focus,
+        AddTableFocus::InputTableName | AddTableFocus::InputColumnName | AddTableFocus::InputColumnType
+    );
 
     match action.as_deref() {
+       // --- Handle Exiting Table Scroll Mode ---
+       Some("exit_table_scroll") => {
+           match current_focus {
+               AddTableFocus::InsideColumnsTable => {
+                   add_table_state.column_table_state.select(None);
+                   new_focus = AddTableFocus::ColumnsTable;
+                   *command_message = "Exited Columns Table".to_string();
+               }
+               AddTableFocus::InsideIndexesTable => {
+                   add_table_state.index_table_state.select(None);
+                   new_focus = AddTableFocus::IndexesTable;
+                   *command_message = "Exited Indexes Table".to_string();
+               }
+               AddTableFocus::InsideLinksTable => {
+                   add_table_state.link_table_state.select(None);
+                   new_focus = AddTableFocus::LinksTable;
+                   *command_message = "Exited Links Table".to_string();
+               }
+               _ => {
+                   // Action triggered but not applicable in this focus state
+                   handled = false;
+               }
+           }
+           // If handled (i.e., focus changed), handled remains true.
+           // If not handled, handled becomes false.
+       }
+
         // --- Vertical Navigation (Up/Down) ---
         Some("move_up") => {
-            let mut new_focus = current_focus; // Start with current focus
             match current_focus {
-                AddTableFocus::InputTableName => new_focus = AddTableFocus::CancelButton, // Wrap top
+                AddTableFocus::InputTableName => new_focus = AddTableFocus::CancelButton,
                 AddTableFocus::InputColumnName => new_focus = AddTableFocus::InputTableName,
                 AddTableFocus::InputColumnType => new_focus = AddTableFocus::InputColumnName,
                 AddTableFocus::AddColumnButton => new_focus = AddTableFocus::InputColumnType,
-                AddTableFocus::ColumnsTable => {
-                    if !navigate_table_up(&mut add_table_state.column_table_state, add_table_state.columns.len()) {
-                        new_focus = AddTableFocus::AddColumnButton; // Move focus up if at table top
-                    }
-                    // Keep focus on table while navigating within it
+                // Navigate between blocks when focus is on the table block itself
+                AddTableFocus::ColumnsTable => new_focus = AddTableFocus::AddColumnButton, // Move up to right pane
+                AddTableFocus::IndexesTable => new_focus = AddTableFocus::ColumnsTable,
+                AddTableFocus::LinksTable => new_focus = AddTableFocus::IndexesTable,
+                // Scroll inside the table when focus is internal
+                AddTableFocus::InsideColumnsTable => {
+                    navigate_table_up(&mut add_table_state.column_table_state, add_table_state.columns.len());
+                    // Stay inside the table, don't change new_focus
                 }
-                AddTableFocus::IndexesTable => {
-                    if !navigate_table_up(&mut add_table_state.index_table_state, add_table_state.indexes.len()) {
-                        new_focus = AddTableFocus::ColumnsTable; // Move focus up
-                    }
+                AddTableFocus::InsideIndexesTable => {
+                    navigate_table_up(&mut add_table_state.index_table_state, add_table_state.indexes.len());
+                    // Stay inside the table
                 }
-                AddTableFocus::LinksTable => {
-                    if !navigate_table_up(&mut add_table_state.link_table_state, add_table_state.links.len()) {
-                        new_focus = AddTableFocus::IndexesTable; // Move focus up
-                    }
+                AddTableFocus::InsideLinksTable => {
+                    navigate_table_up(&mut add_table_state.link_table_state, add_table_state.links.len());
+                    // Stay inside the table
                 }
                 AddTableFocus::SaveButton => new_focus = AddTableFocus::LinksTable,
-                AddTableFocus::CancelButton => new_focus = AddTableFocus::SaveButton,
+                AddTableFocus::DeleteSelectedButton => new_focus = AddTableFocus::SaveButton,
+                AddTableFocus::CancelButton => new_focus = AddTableFocus::DeleteSelectedButton,
             }
-            add_table_state.current_focus = new_focus;
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
         }
         Some("move_down") => {
-            let mut new_focus = current_focus; // Start with current focus
             match current_focus {
                 AddTableFocus::InputTableName => new_focus = AddTableFocus::InputColumnName,
                 AddTableFocus::InputColumnName => new_focus = AddTableFocus::InputColumnType,
                 AddTableFocus::InputColumnType => new_focus = AddTableFocus::AddColumnButton,
                 AddTableFocus::AddColumnButton => new_focus = AddTableFocus::ColumnsTable,
-                AddTableFocus::ColumnsTable => {
-                    if !navigate_table_down(&mut add_table_state.column_table_state, add_table_state.columns.len()) {
-                        new_focus = AddTableFocus::IndexesTable; // Move focus down if at table bottom
-                    }
-                    // Keep focus on table while navigating within it
+                // Navigate between blocks when focus is on the table block itself
+                AddTableFocus::ColumnsTable => new_focus = AddTableFocus::IndexesTable,
+                AddTableFocus::IndexesTable => new_focus = AddTableFocus::LinksTable,
+                AddTableFocus::LinksTable => new_focus = AddTableFocus::SaveButton, // Move down to right pane
+                // Scroll inside the table when focus is internal
+                AddTableFocus::InsideColumnsTable => {
+                    navigate_table_down(&mut add_table_state.column_table_state, add_table_state.columns.len());
+                    // Stay inside the table
                 }
-                AddTableFocus::IndexesTable => {
-                    if !navigate_table_down(&mut add_table_state.index_table_state, add_table_state.indexes.len()) {
-                        new_focus = AddTableFocus::LinksTable; // Move focus down
-                    }
+                AddTableFocus::InsideIndexesTable => {
+                    navigate_table_down(&mut add_table_state.index_table_state, add_table_state.indexes.len());
+                    // Stay inside the table
                 }
-                AddTableFocus::LinksTable => {
-                    if !navigate_table_down(&mut add_table_state.link_table_state, add_table_state.links.len()) {
-                        new_focus = AddTableFocus::SaveButton; // Move focus down
-                    }
+                AddTableFocus::InsideLinksTable => {
+                    navigate_table_down(&mut add_table_state.link_table_state, add_table_state.links.len());
+                    // Stay inside the table
                 }
-                AddTableFocus::SaveButton => new_focus = AddTableFocus::CancelButton,
-                AddTableFocus::CancelButton => new_focus = AddTableFocus::InputTableName, // Wrap bottom
+                AddTableFocus::SaveButton => new_focus = AddTableFocus::DeleteSelectedButton,
+                AddTableFocus::DeleteSelectedButton => new_focus = AddTableFocus::CancelButton,
+                AddTableFocus::CancelButton => new_focus = AddTableFocus::InputTableName,
             }
-            add_table_state.current_focus = new_focus;
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
         }
 
         // --- Horizontal Navigation (Left/Right) ---
-        Some("next_option") => { // 'l' or Right
-            add_table_state.current_focus = match current_focus {
-                AddTableFocus::SaveButton => AddTableFocus::CancelButton,
-                _ => current_focus, // No change for others yet
-            };
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
+        Some("next_option") => { // 'l' or Right: Move from Left Pane to Right Pane
+            // Horizontal nav within bottom buttons
+            if current_focus == AddTableFocus::SaveButton {
+                new_focus = AddTableFocus::DeleteSelectedButton;
+            } else if current_focus == AddTableFocus::DeleteSelectedButton {
+                new_focus = AddTableFocus::CancelButton;
+            }        
         }
-        Some("previous_option") => { // 'h' or Left
-            add_table_state.current_focus = match current_focus {
-                AddTableFocus::CancelButton => AddTableFocus::SaveButton,
-                _ => current_focus, // No change for others yet
-            };
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
+        Some("previous_option") => { // 'h' or Left: Move from Right Pane to Left Pane
+            // Horizontal nav within bottom buttons
+            if current_focus == AddTableFocus::CancelButton {
+                new_focus = AddTableFocus::DeleteSelectedButton;
+            } else if current_focus == AddTableFocus::DeleteSelectedButton {
+                new_focus = AddTableFocus::SaveButton;
+            }        
         }
 
-        // --- Tab / Shift+Tab Navigation ---
+        // --- Tab / Shift+Tab Navigation (Keep as vertical cycle) ---
         Some("next_field") => { // Tab
-            add_table_state.current_focus = match current_focus {
+            new_focus = match current_focus {
                 AddTableFocus::InputTableName => AddTableFocus::InputColumnName,
                 AddTableFocus::InputColumnName => AddTableFocus::InputColumnType,
                 AddTableFocus::InputColumnType => AddTableFocus::AddColumnButton,
                 AddTableFocus::AddColumnButton => AddTableFocus::ColumnsTable,
-                AddTableFocus::ColumnsTable => AddTableFocus::IndexesTable,
-                AddTableFocus::IndexesTable => AddTableFocus::LinksTable,
-                AddTableFocus::LinksTable => AddTableFocus::SaveButton,
-                AddTableFocus::SaveButton => AddTableFocus::CancelButton,
+                // Treat Inside* same as block focus for tabbing out
+                AddTableFocus::ColumnsTable | AddTableFocus::InsideColumnsTable => AddTableFocus::IndexesTable,
+                AddTableFocus::IndexesTable | AddTableFocus::InsideIndexesTable => AddTableFocus::LinksTable,
+                AddTableFocus::LinksTable | AddTableFocus::InsideLinksTable => AddTableFocus::SaveButton,
+                AddTableFocus::SaveButton => AddTableFocus::DeleteSelectedButton,
+                AddTableFocus::DeleteSelectedButton => AddTableFocus::CancelButton,
                 AddTableFocus::CancelButton => AddTableFocus::InputTableName, // Wrap
             };
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
         }
         Some("prev_field") => { // Shift+Tab
-            add_table_state.current_focus = match current_focus {
+            new_focus = match current_focus {
                 AddTableFocus::InputTableName => AddTableFocus::CancelButton, // Wrap
                 AddTableFocus::InputColumnName => AddTableFocus::InputTableName,
                 AddTableFocus::InputColumnType => AddTableFocus::InputColumnName,
                 AddTableFocus::AddColumnButton => AddTableFocus::InputColumnType,
-                AddTableFocus::ColumnsTable => AddTableFocus::AddColumnButton,
-                AddTableFocus::IndexesTable => AddTableFocus::ColumnsTable,
-                AddTableFocus::LinksTable => AddTableFocus::IndexesTable,
+                // Treat Inside* same as block focus for tabbing out
+                AddTableFocus::ColumnsTable | AddTableFocus::InsideColumnsTable => AddTableFocus::AddColumnButton,
+                AddTableFocus::IndexesTable | AddTableFocus::InsideIndexesTable => AddTableFocus::ColumnsTable,
+                AddTableFocus::LinksTable | AddTableFocus::InsideLinksTable => AddTableFocus::IndexesTable,
                 AddTableFocus::SaveButton => AddTableFocus::LinksTable,
-                AddTableFocus::CancelButton => AddTableFocus::SaveButton,
+                AddTableFocus::DeleteSelectedButton => AddTableFocus::SaveButton,
+                AddTableFocus::CancelButton => AddTableFocus::DeleteSelectedButton,
             };
-            *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
         }
 
         // --- Selection ---
         Some("select") => {
             match current_focus {
+                // --- Enter/Exit Table Focus ---
+                AddTableFocus::ColumnsTable => {
+                    new_focus = AddTableFocus::InsideColumnsTable;
+                    // Select first item if none selected when entering
+                    if add_table_state.column_table_state.selected().is_none() && !add_table_state.columns.is_empty() {
+                        add_table_state.column_table_state.select(Some(0));
+                    }
+                    *command_message = "Entered Columns Table (Scroll with Up/Down, Select to exit)".to_string();
+                }
+                AddTableFocus::IndexesTable => {
+                    new_focus = AddTableFocus::InsideIndexesTable;
+                    if add_table_state.index_table_state.selected().is_none() && !add_table_state.indexes.is_empty() {
+                        add_table_state.index_table_state.select(Some(0));
+                    }
+                    *command_message = "Entered Indexes Table (Scroll with Up/Down, Select to exit)".to_string();
+                }
+                AddTableFocus::LinksTable => {
+                    new_focus = AddTableFocus::InsideLinksTable;
+                    if add_table_state.link_table_state.selected().is_none() && !add_table_state.links.is_empty() {
+                        add_table_state.link_table_state.select(Some(0));
+                    }
+                    *command_message = "Entered Links Table (Scroll with Up/Down, Select to toggle/exit)".to_string();
+                }
+                AddTableFocus::InsideColumnsTable => {
+                    // Toggle selection when pressing select *inside* the columns table
+                    if let Some(index) = add_table_state.column_table_state.selected() {
+                        if let Some(col) = add_table_state.columns.get_mut(index) {
+                            col.selected = !col.selected;
+                            add_table_state.has_unsaved_changes = true;
+                            *command_message = format!(
+                                "Toggled selection for column: {} to {}",
+                                col.name, col.selected
+                            );
+                        }
+                    } else {
+                        *command_message = "No column highlighted to toggle selection".to_string();
+                    }
+                }
+                AddTableFocus::InsideIndexesTable => {
+                    // Select does nothing here anymore, only Esc exits.
+                    if let Some(index) = add_table_state.index_table_state.selected() {
+                        *command_message = format!("Selected index index {} (Press Esc to exit scroll mode)", index);
+                    } else {
+                        *command_message = "No index selected (Press Esc to exit scroll mode)".to_string();
+                    }
+                }
+                AddTableFocus::InsideLinksTable => {
+                    // Toggle selection when pressing select *inside* the links table
+                    if let Some(index) = add_table_state.link_table_state.selected() {
+                        if let Some(link) = add_table_state.links.get_mut(index) {
+                            link.selected = !link.selected; // Toggle the selected state
+                            add_table_state.has_unsaved_changes = true; // Mark changes
+                            *command_message = format!(
+                                "Toggled selection for link: {} to {}",
+                                link.linked_table_name, link.selected
+                            );
+                        } else {
+                            *command_message = "Error: Selected link index out of bounds".to_string();
+                        }
+                    } else {
+                        *command_message = "No link selected to toggle".to_string();
+                    }
+                    // Stay inside the links table after toggling
+                    new_focus = AddTableFocus::InsideLinksTable;
+                    // Alternative: Exit after toggle:
+                    // new_focus = AddTableFocus::LinksTable;
+                    // *command_message = format!("{} - Exited Links Table", command_message);
+                }
+                // --- Other Select Actions ---
                 AddTableFocus::AddColumnButton => {
-                    *command_message = "Action: Add Column (Not Implemented)".to_string();
-                    // TODO: Implement logic to add column based on inputs
-                    // Clear input fields, add to columns list, mark unsaved changes
-                    // add_table_state.add_column(); // Example method call
+                    if let Some(focus_after_add) = handle_add_column_action(add_table_state, command_message) {
+                        new_focus = focus_after_add;
+                    }
                 }
                 AddTableFocus::SaveButton => {
                     *command_message = "Action: Save Table (Not Implemented)".to_string();
-                    // TODO: Implement logic to save table (e.g., call API)
-                    // Mark changes as saved
-                    // add_table_state.save_table(); // Example method call
+                    // TODO: Implement logic
+                }
+                AddTableFocus::DeleteSelectedButton => {
+                    // --- Show Confirmation Dialog ---
+                    // Collect tuples of (index, name, type) for selected columns
+                    let columns_to_delete: Vec<(usize, String, String)> = add_table_state
+                        .columns
+                        .iter()
+                        .enumerate() // Get index along with the column
+                        .filter(|(_index, col)| col.selected) // Filter based on selection
+                        .map(|(index, col)| (index, col.name.clone(), col.data_type.clone())) // Map to (index, name, type)
+                        .collect();
+
+                    if columns_to_delete.is_empty() {
+                        *command_message = "No columns selected for deletion.".to_string();
+                    } else {
+                        // Format the message to include index, name, and type
+                        let column_details: String = columns_to_delete
+                            .iter()
+                            // Add 1 to index for 1-based numbering for user display
+                            .map(|(index, name, dtype)| format!("{}. {} ({})", index + 1, name, dtype))
+                            .collect::<Vec<String>>()
+                            .join("\n");
+
+                        // Use the formatted column_details string in the message
+                        let message = format!(
+                            "Delete the following columns?\n\n{}",
+                            column_details
+                        );
+                        let buttons = vec!["Confirm".to_string(), "Cancel".to_string()];
+                        app_state.show_dialog(
+                            "Confirm Deletion",
+                            &message,
+                            buttons,
+                            DialogPurpose::ConfirmDeleteColumns,
+                        );
+                    }
                 }
                 AddTableFocus::CancelButton => {
                     *command_message = "Action: Cancel Add Table".to_string();
-                    // TODO: Implement logic to navigate back (e.g., update AppView history)
-                    // Maybe show a confirmation dialog if there are unsaved changes
-                    // buffer_state.go_back(); // Example call
+                    // TODO: Implement logic
                 }
-                // Selecting input fields usually means entering Edit mode (handled elsewhere)
-                // Selecting tables might mean focusing on them for editing/deletion (TODO)
-                AddTableFocus::ColumnsTable => {
-                     if let Some(index) = add_table_state.column_table_state.selected() {
-                         *command_message = format!("Selected column index {}", index);
-                         // TODO: Add logic for editing/deleting selected column
-                     } else {
-                         *command_message = "No column selected".to_string();
-                     }
-                }
-                 AddTableFocus::IndexesTable => {
-                     if let Some(index) = add_table_state.index_table_state.selected() {
-                         *command_message = format!("Selected index index {}", index);
-                         // TODO: Add logic for editing/deleting selected index
-                     } else {
-                          *command_message = "No index selected".to_string();
-                     }
-                 }
-                 AddTableFocus::LinksTable => {
-                     if let Some(index) = add_table_state.link_table_state.selected() {
-                         *command_message = format!("Selected link index {}", index);
-                         // TODO: Add logic for editing/deleting selected link
-                     } else {
-                          *command_message = "No link selected".to_string();
-                     }
-                 }
-                _ => {
-                    // For InputTableName, InputColumnName, InputColumnType,
-                    // the main event loop should handle 'select' by potentially
-                    // switching to Edit mode if not already in it.
-                    // We don't need specific logic here for that.
+                _ => { // Input fields
                     *command_message = format!("Select on {:?}", current_focus);
                     handled = false; // Let main loop handle edit mode toggle maybe
                 }
             }
+            // Keep handled = true for select actions unless specifically set to false
         }
 
-        // --- Other General Keys (Ignore for add_table nav) ---
+        // --- Other General Keys ---
         Some("toggle_sidebar") | Some("toggle_buffer_list") => {
-            handled = false; // Let global handler manage these
+            handled = false;
         }
 
         // --- No matching action ---
-        _ => handled = false, // Event not handled by add_table navigation
+        _ => handled = false,
     }
 
-    // If focus changed TO a table, select the first row if nothing is selected
-    if handled && current_focus != add_table_state.current_focus {
-        match add_table_state.current_focus {
-            AddTableFocus::ColumnsTable if add_table_state.column_table_state.selected().is_none() && !add_table_state.columns.is_empty() => {
-                add_table_state.column_table_state.select(Some(0));
-            }
-            AddTableFocus::IndexesTable if add_table_state.index_table_state.selected().is_none() && !add_table_state.indexes.is_empty() => {
-                add_table_state.index_table_state.select(Some(0));
-            }
-             AddTableFocus::LinksTable if add_table_state.link_table_state.selected().is_none() && !add_table_state.links.is_empty() => {
-                add_table_state.link_table_state.select(Some(0));
-            }
-            _ => {} // No action needed for other focus states
+    // Update focus state if it changed and was handled
+    if handled && current_focus != new_focus {
+        add_table_state.current_focus = new_focus;
+        // Avoid overwriting specific messages set during 'select' handling
+        if command_message.is_empty() || command_message.starts_with("Focus set to") {
+             *command_message = format!("Focus set to {:?}", add_table_state.current_focus);
         }
+
+        // Check if the *new* focus target is one of the canvas input fields
+        let new_is_canvas_input_focus = matches!(new_focus,
+            AddTableFocus::InputTableName | AddTableFocus::InputColumnName | AddTableFocus::InputColumnType
+        );
+        // Focus is outside canvas if it's not an input field
+        app_state.ui.focus_outside_canvas = !new_is_canvas_input_focus;
+    } else if !handled {
+        // command_message.clear(); // Optional: Clear message if not handled here
     }
 
     handled
@@ -217,21 +336,20 @@ pub fn handle_add_table_navigation(
 // Helper function for navigating up within a table state
 // Returns true if navigation happened within the table, false if it reached the top
 fn navigate_table_up(table_state: &mut TableState, item_count: usize) -> bool {
-    if item_count == 0 { return false; } // Cannot navigate empty table
+    if item_count == 0 { return false; }
     let current_selection = table_state.selected();
     match current_selection {
         Some(index) => {
             if index > 0 {
                 table_state.select(Some(index - 1));
-                true // Moved up within table
+                true // Navigation happened
             } else {
                 false // Was at the top
             }
         }
-        None => {
-            // If nothing selected, moving up could select the last item
+        None => { // No item selected, select the last one
             table_state.select(Some(item_count - 1));
-            true
+            true // Navigation happened (selection set)
         }
     }
 }
@@ -239,21 +357,20 @@ fn navigate_table_up(table_state: &mut TableState, item_count: usize) -> bool {
 // Helper function for navigating down within a table state
 // Returns true if navigation happened within the table, false if it reached the bottom
 fn navigate_table_down(table_state: &mut TableState, item_count: usize) -> bool {
-     if item_count == 0 { return false; } // Cannot navigate empty table
+     if item_count == 0 { return false; }
     let current_selection = table_state.selected();
     match current_selection {
         Some(index) => {
             if index < item_count - 1 {
                 table_state.select(Some(index + 1));
-                true // Moved down within table
+                true // Navigation happened
             } else {
                 false // Was at the bottom
             }
         }
-        None => {
-             // If nothing selected, moving down could select the first item
+        None => { // No item selected, select the first one
              table_state.select(Some(0));
-             true
+             true // Navigation happened (selection set)
         }
     }
 }

client/src/functions/modes/navigation/admin_nav.rs

@@ -8,13 +8,14 @@ use crate::state::{
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use crate::state::app::buffer::AppView;
 use crate::state::app::buffer::BufferState;
+use crate::state::pages::add_table::AddTableState;
 
 /// Handles navigation events specifically for the Admin Panel view.
 /// Returns true if the event was handled, false otherwise.
 pub fn handle_admin_navigation(
     key: KeyEvent,
     config: &Config,
-    app_state: &AppState,
+    app_state: &mut AppState,
     admin_state: &mut AdminState,
     buffer_state: &mut BufferState,
     command_message: &mut String,
@@ -160,8 +161,37 @@ pub fn handle_admin_navigation(
                     // TODO: Trigger action for Button 1
                 }
                 AdminFocus::Button2 => {
-                   buffer_state.update_history(AppView::AddTable);
-                   *command_message = "Navigating to Add Table page...".to_string();
+                   // --- Prepare AddTableState based on persistent selections ---
+                   if let Some(p_idx) = admin_state.selected_profile_index {
+                       if let Some(profile) = app_state.profile_tree.profiles.get(p_idx) {
+                           let selected_profile_name = profile.name.clone();
+
+
+                           // Create and populate the new AddTableState
+                           let new_add_table_state = AddTableState {
+                               profile_name: selected_profile_name,
+                               // Reset other fields to defaults for a fresh start
+                               ..AddTableState::default()
+                           };
+
+                           // Assign the prepared state
+                           admin_state.add_table_state = new_add_table_state;
+
+                           // Switch view
+                           buffer_state.update_history(AppView::AddTable);
+                           app_state.ui.focus_outside_canvas = false;
+                           *command_message = format!(
+                               "Navigating to Add Table for profile '{}'...",
+                               admin_state.add_table_state.profile_name
+                           );
+
+                       } else {
+                           *command_message = "Error: Selected profile index out of bounds.".to_string();
+                       }
+                   } else {
+                       *command_message = "Please select a profile ([*]) first.".to_string();
+                   }
+                   // --- End preparation ---
                 }
                 AdminFocus::Button3 => {
                     *command_message = "Action: Change Table (Not Implemented)".to_string();

client/src/functions/modes/read_only.rs

@@ -2,3 +2,4 @@
 
 pub mod auth_ro;
 pub mod form_ro;
+pub mod add_table_ro;

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

@@ -0,0 +1,244 @@
+// src/functions/modes/read_only/add_table_ro.rs
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::state::pages::add_table::AddTableState;
+use crate::state::pages::canvas_state::CanvasState; // Use trait for common actions
+use crate::state::app::state::AppState;
+use std::error::Error;
+
+// Re-use word navigation helpers if they are public or move them to a common module
+// For now, duplicating them here for simplicity. Consider refactoring later.
+#[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
+}
+
+// Note: find_prev_word_end might need adjustments based on desired behavior.
+// This version finds the end of the word *before* the previous word start.
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let prev_start = find_prev_word_start(text, current_pos);
+    if prev_start == 0 { return 0; }
+    // Find the end of the word that starts at prev_start - 1
+    find_word_end(text, prev_start.saturating_sub(1))
+}
+
+
+/// Executes read-only actions for the AddTable view canvas.
+pub async fn execute_action(
+    action: &str,
+    app_state: &mut AppState, // Needed for focus_outside_canvas
+    state: &mut AddTableState,
+    ideal_cursor_column: &mut usize,
+    key_sequence_tracker: &mut KeySequenceTracker,
+    command_message: &mut String, // Keep for potential messages
+) -> Result<String, Box<dyn Error>> {
+    // Use the CanvasState trait methods implemented for AddTableState
+    match action {
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields == 0 { return Ok("No fields.".to_string()); }
+            let current_field = state.current_field(); // Gets the index (0, 1, or 2)
+
+            if current_field > 0 {
+                // This handles moving from field 2 -> 1, or 1 -> 0
+                let new_field = current_field - 1;
+                state.set_current_field(new_field);
+                // ... (rest of the logic to set cursor position) ...
+            } else {
+                // --- THIS IS WHERE THE FIX GOES ---
+                // current_field is 0 (InputTableName), and user pressed Up.
+                // We need to move focus *outside* the canvas.
+
+                // Set the flag to indicate focus is leaving the canvas
+                app_state.ui.focus_outside_canvas = true;
+
+                // Decide which element gets focus. Based on your layout and the
+                // downward navigation (CancelButton wraps to InputTableName),
+                // moving up from InputTableName should likely go to CancelButton.
+                state.current_focus = crate::state::pages::add_table::AddTableFocus::CancelButton;
+
+                // Reset the sequence tracker as the action is complete
+                key_sequence_tracker.reset();
+
+                // Return a message indicating the focus change
+                return Ok("Focus moved above canvas".to_string());
+                // --- END FIX ---
+            }
+            // If we moved within the canvas (e.g., 1 -> 0), return empty string
+            Ok("".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields == 0 { return Ok("No fields.".to_string()); }
+            let current_field = state.current_field();
+            let last_field_index = num_fields - 1;
+
+            if current_field < last_field_index {
+                let new_field = current_field + 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_cursor_pos = current_input.len(); // Allow cursor at end
+                let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+                state.set_current_cursor_pos(new_pos);
+            } else {
+                // Move focus outside canvas when moving down from the last field
+                app_state.ui.focus_outside_canvas = true;
+                // Set focus to the first element outside canvas (AddColumnButton)
+                state.current_focus = crate::state::pages::add_table::AddTableFocus::AddColumnButton;
+                key_sequence_tracker.reset();
+                return Ok("Focus moved below canvas".to_string());
+            }
+            Ok("".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            if AddTableState::INPUT_FIELD_COUNT > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_cursor_pos = current_input.len();
+                let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos; // Update ideal column
+            }
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = AddTableState::INPUT_FIELD_COUNT;
+            if num_fields > 0 {
+                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 = current_input.len();
+                let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos; // Update ideal column
+            }
+            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();
+            // Allow moving cursor one position past the end
+            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_word_next" => {
+            let current_input = state.get_current_input();
+            let new_pos = find_next_word_start(current_input, state.current_cursor_pos());
+            let final_pos = new_pos.min(current_input.len()); // Allow cursor at end
+            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();
+            let current_pos = state.current_cursor_pos();
+            let new_pos = find_word_end(current_input, current_pos);
+            // If find_word_end returns current_pos, try starting search from next char
+            let final_pos = if new_pos == current_pos && current_pos < current_input.len() {
+                find_word_end(current_input, current_pos + 1)
+            } else {
+                new_pos
+            };
+            let max_valid_index = current_input.len(); // Allow cursor at end
+            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();
+            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();
+            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("".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(); // Allow cursor at end
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        // Actions handled by main event loop (mode changes)
+        "enter_edit_mode_before" | "enter_edit_mode_after" | "enter_command_mode" | "exit_highlight_mode" => {
+             key_sequence_tracker.reset();
+             Ok("Mode change handled by main loop".to_string())
+        }
+        _ => {
+             key_sequence_tracker.reset();
+             command_message.clear(); // Clear message for unhandled actions
+             Ok(format!("Unknown read-only action: {}", action))
+        },
+    }
+}
+

client/src/modes/canvas/edit.rs

@@ -1,13 +1,17 @@
 // src/modes/canvas/edit.rs
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::pages::{auth::{LoginState, RegisterState}, canvas_state::CanvasState};
+use crate::state::pages::{
+    auth::{LoginState, RegisterState},
+    canvas_state::CanvasState,
+};
 use crate::state::pages::form::FormState;
+use crate::state::pages::add_table::AddTableState;
 use crate::modes::handlers::event::EventOutcome;
 use crate::functions::modes::edit::{auth_e, form_e};
+use crate::functions::modes::edit::add_table_e;
 use crate::state::app::state::AppState;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-// Removed duplicate/unused imports
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EditEventOutcome {
@@ -21,73 +25,136 @@ pub async fn handle_edit_event(
     form_state: &mut FormState,
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
+    add_table_state: &mut AddTableState,
     ideal_cursor_column: &mut usize,
-    // command_message: &mut String, // Removed as messages are returned
     current_position: &mut u64,
     total_count: u64,
     grpc_client: &mut GrpcClient,
     app_state: &AppState,
 ) -> Result<EditEventOutcome, Box<dyn std::error::Error>> {
-
-    // Global command mode check
+    // Global command mode check (should ideally be handled before calling this function)
     if let Some("enter_command_mode") = config.get_action_for_key_in_mode(
         &config.keybindings.global,
         key.code,
-        key.modifiers
+        key.modifiers,
     ) {
-        return Ok(EditEventOutcome::Message("Switching to Command Mode...".to_string()));
+        return Ok(EditEventOutcome::Message(
+            "Command mode entry handled globally.".to_string(),
+        ));
     }
 
-    // Common actions (save/revert)
     if let Some(action) = config.get_action_for_key_in_mode(
         &config.keybindings.common,
         key.code,
-        key.modifiers
-    ) {
+        key.modifiers,
+    ).as_deref() {
         if matches!(action, "save" | "revert") {
-            // Ensure all branches result in Result<String, Error> before the final Ok(...) wrap
             let message_string: String = if app_state.ui.show_login {
                 auth_e::execute_common_action(
                     action,
                     login_state,
                     grpc_client,
                     current_position,
-                    total_count
-                ).await? // Results in String on success
+                    total_count,
+                )
+                .await?
             } else if app_state.ui.show_register {
                 auth_e::execute_common_action(
                     action,
                     register_state,
                     grpc_client,
                     current_position,
-                    total_count
-                ).await? // Results in String on success
+                    total_count,
+                )
+                .await?
+            } else if app_state.ui.show_add_table {
+                format!(
+                    "Action '{}' not fully implemented for Add Table view here.",
+                    action
+                )
             } else {
                 let outcome = form_e::execute_common_action(
                     action,
                     form_state,
                     grpc_client,
                     current_position,
-                    total_count
-                ).await?; // This returns EventOutcome on success
-
-                // Extract the message string from the EventOutcome
+                    total_count,
+                )
+                .await?;
                 match outcome {
                     EventOutcome::Ok(msg) => msg,
                     EventOutcome::DataSaved(_, msg) => msg,
-                    _ => format!("Unexpected outcome from common action: {:?}", outcome),
+                    _ => format!(
+                        "Unexpected outcome from common action: {:?}",
+                        outcome
+                    ),
                 }
             };
-            // Wrap the resulting String message
             return Ok(EditEventOutcome::Message(message_string));
         }
     }
 
     // Edit-specific actions
-    if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
+    if let Some(action) =
+        config.get_edit_action_for_key(key.code, key.modifiers)
+            .as_deref() {
+        // Handle enter_decider first
+        if action == "enter_decider" {
+            let effective_action = if app_state.ui.show_register 
+                && register_state.in_suggestion_mode 
+                && register_state.current_field() == 4 {
+                "select_suggestion"
+            } else {
+                "next_field"
+            };
+            
+            let msg = if app_state.ui.show_login {
+                auth_e::execute_edit_action(
+                    effective_action,
+                    key,
+                    login_state,
+                    ideal_cursor_column,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                )
+                .await?
+            } else if app_state.ui.show_add_table {
+                add_table_e::execute_edit_action(
+                    effective_action,
+                    key,
+                    add_table_state,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_register {
+                auth_e::execute_edit_action(
+                    effective_action,
+                    key,
+                    register_state,
+                    ideal_cursor_column,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                )
+                .await?
+            } else {
+                form_e::execute_edit_action(
+                    effective_action,
+                    key,
+                    form_state,
+                    ideal_cursor_column,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                )
+                .await?
+            };
+            return Ok(EditEventOutcome::Message(msg));
+        }
+
         if action == "exit" {
             if app_state.ui.show_register && register_state.in_suggestion_mode {
-                // Call the action, get Result<String, Error>
                 let msg = auth_e::execute_edit_action(
                     "exit_suggestion_mode",
                     key,
@@ -96,30 +163,54 @@ pub async fn handle_edit_event(
                     grpc_client,
                     current_position,
                     total_count,
-                ).await?; // Results in String on success
-                // Wrap the String message
+                )
+                .await?;
                 return Ok(EditEventOutcome::Message(msg));
             } else {
-                // Signal exit
                 return Ok(EditEventOutcome::ExitEditMode);
             }
         }
 
-        // Special handling for role field suggestions
+        // Special handling for role field suggestions (Register view only)
         if app_state.ui.show_register && register_state.current_field() == 4 {
-            if !register_state.in_suggestion_mode && key.code == KeyCode::Tab && key.modifiers == KeyModifiers::NONE {
+            if !register_state.in_suggestion_mode
+                && key.code == KeyCode::Tab
+                && key.modifiers == KeyModifiers::NONE
+            {
                 register_state.update_role_suggestions();
                 if !register_state.role_suggestions.is_empty() {
                     register_state.in_suggestion_mode = true;
                     register_state.selected_suggestion_index = Some(0);
-                    return Ok(EditEventOutcome::Message("Suggestions shown".to_string()));
-                } else { // Added else here for clarity
-                    return Ok(EditEventOutcome::Message("No suggestions available".to_string()));
+                    return Ok(EditEventOutcome::Message(
+                        "Suggestions shown".to_string(),
+                    ));
+                } else {
+                    return Ok(EditEventOutcome::Message(
+                        "No suggestions available".to_string(),
+                    ));
                 }
             }
+            if register_state.in_suggestion_mode
+                && matches!(
+                    action,
+                    "suggestion_down" | "suggestion_up"
+                )
+            {
+                let msg = auth_e::execute_edit_action(
+                    action,
+                    key,
+                    register_state,
+                    ideal_cursor_column,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                )
+                .await?;
+                return Ok(EditEventOutcome::Message(msg));
+            }
         }
 
-        // Execute other edit actions
+        // Execute other edit actions based on the current view
         let msg = if app_state.ui.show_login {
             auth_e::execute_edit_action(
                 action,
@@ -128,8 +219,17 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
+        } else if app_state.ui.show_add_table {
+            add_table_e::execute_edit_action(
+                action,
+                key,
+                add_table_state,
+                ideal_cursor_column,
+            )
+            .await?
         } else if app_state.ui.show_register {
             auth_e::execute_edit_action(
                 action,
@@ -138,8 +238,9 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
         } else {
             form_e::execute_edit_action(
                 action,
@@ -148,22 +249,21 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
         };
-        // Wrap the resulting String message
         return Ok(EditEventOutcome::Message(msg));
     }
 
-    // Character insertion
-    if let KeyCode::Char(_) = key.code {
+    // --- Character insertion ---
+    if let KeyCode::Char(c) = key.code {
         if app_state.ui.show_register && register_state.in_suggestion_mode {
             register_state.in_suggestion_mode = false;
             register_state.show_role_suggestions = false;
             register_state.selected_suggestion_index = None;
         }
 
-        // Execute insert_char action
         let msg = if app_state.ui.show_login {
             auth_e::execute_edit_action(
                 "insert_char",
@@ -172,8 +272,17 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
+        } else if app_state.ui.show_add_table {
+            add_table_e::execute_edit_action(
+                "insert_char",
+                key,
+                add_table_state,
+                ideal_cursor_column,
+            )
+            .await?
         } else if app_state.ui.show_register {
             auth_e::execute_edit_action(
                 "insert_char",
@@ -182,8 +291,9 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
         } else {
             form_e::execute_edit_action(
                 "insert_char",
@@ -192,14 +302,19 @@ pub async fn handle_edit_event(
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
         };
-        // Wrap the resulting String message
+        
+        if app_state.ui.show_register && register_state.current_field() == 4 {
+             register_state.update_role_suggestions();
+        }
+
         return Ok(EditEventOutcome::Message(msg));
     }
 
-    // Handle Backspace/Delete
+    // --- Handle Backspace/Delete ---
     if matches!(key.code, KeyCode::Backspace | KeyCode::Delete) {
         if app_state.ui.show_register && register_state.in_suggestion_mode {
             register_state.in_suggestion_mode = false;
@@ -207,28 +322,60 @@ pub async fn handle_edit_event(
             register_state.selected_suggestion_index = None;
         }
 
-        let action_str = if key.code == KeyCode::Backspace { "backspace" } else { "delete_char" };
-        // Ensure both branches result in a String *before* wrapping
-        let result_msg: String = if app_state.ui.show_register {
-             auth_e::execute_edit_action(
+        let action_str = if key.code == KeyCode::Backspace {
+            "delete_char_backward"
+        } else {
+            "delete_char_forward"
+        };
+
+        let result_msg: String = if app_state.ui.show_login {
+            auth_e::execute_edit_action(
+                action_str,
+                key,
+                login_state,
+                ideal_cursor_column,
+                grpc_client,
+                current_position,
+                total_count,
+            )
+            .await?
+        } else if app_state.ui.show_add_table {
+            add_table_e::execute_edit_action(
+                action_str,
+                key,
+                add_table_state,
+                ideal_cursor_column,
+            )
+            .await?
+        } else if app_state.ui.show_register {
+            auth_e::execute_edit_action(
                 action_str,
                 key,
                 register_state,
                 ideal_cursor_column,
                 grpc_client,
                 current_position,
-                total_count
-            ).await? // Results in String
+                total_count,
+            )
+            .await?
         } else {
-             // Return String directly, not Ok(String)
-             "Action not applicable here".to_string()
-        }; // Semicolon here ends the if/else expression
+            form_e::execute_edit_action(
+                action_str,
+                key,
+                form_state,
+                ideal_cursor_column,
+                grpc_client,
+                current_position,
+                total_count
+            ).await?
+        };
+         
+        if app_state.ui.show_register && register_state.current_field() == 4 {
+             register_state.update_role_suggestions();
+        }
 
-        // Wrap the resulting String message
         return Ok(EditEventOutcome::Message(result_msg));
     }
 
-    // Default return if no other handler matched
     Ok(EditEventOutcome::Message("".to_string()))
 }
-

client/src/modes/canvas/read_only.rs

@@ -6,8 +6,9 @@ use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::{canvas_state::CanvasState, auth::RegisterState};
 use crate::state::pages::auth::LoginState;
 use crate::state::pages::form::FormState;
+use crate::state::pages::add_table::AddTableState;
 use crate::state::app::state::AppState;
-use crate::functions::modes::read_only::{auth_ro, form_ro};
+use crate::functions::modes::read_only::{auth_ro, form_ro, add_table_ro};
 use crossterm::event::KeyEvent;
 
 pub async fn handle_read_only_event(
@@ -17,6 +18,7 @@ pub async fn handle_read_only_event(
     form_state: &mut FormState,
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
+    add_table_state: &mut AddTableState,
     key_sequence_tracker: &mut KeySequenceTracker,
     current_position: &mut u64,
     total_count: u64,
@@ -32,34 +34,17 @@ pub async fn handle_read_only_event(
     }
 
     if config.is_enter_edit_mode_after(key.code, key.modifiers) {
-        let (current_input, current_pos) = if app_state.ui.show_login { // Check Login first
-            (
-                login_state.get_current_input(),
-                login_state.current_cursor_pos(),
-            )
-        } else if app_state.ui.show_register { // Then check Register
-            (
-                register_state.get_current_input(),
-                register_state.current_cursor_pos(),
-            )
-        } else {
-            (
-                form_state.get_current_input(),
-                form_state.current_cursor_pos(),
-            ) // Default to Form
-        };
+        // Determine target state to adjust cursor
+        let target_state: &mut dyn CanvasState = if app_state.ui.show_login { login_state }
+            else if app_state.ui.show_register { register_state }
+            else if app_state.ui.show_add_table { add_table_state }
+            else { form_state };
+        let current_input = target_state.get_current_input();
+        let current_pos = target_state.current_cursor_pos();
 
         if !current_input.is_empty() && current_pos < current_input.len() {
-            if app_state.ui.show_login {
-                login_state.set_current_cursor_pos(current_pos + 1);
-                *ideal_cursor_column = login_state.current_cursor_pos();
-            } else if app_state.ui.show_register {
-                register_state.set_current_cursor_pos(current_pos + 1);
-                *ideal_cursor_column = register_state.current_cursor_pos();
-            } else { // Default to Form
-                form_state.set_current_cursor_pos(current_pos + 1);
-                *ideal_cursor_column = form_state.current_cursor_pos();
-            }
+            target_state.set_current_cursor_pos(current_pos + 1);
+            *ideal_cursor_column = target_state.current_cursor_pos();
         }
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode (after cursor)".to_string();
@@ -83,7 +68,7 @@ pub async fn handle_read_only_event(
         key_sequence_tracker.add_key(key.code);
         let sequence = key_sequence_tracker.get_sequence();
 
-        if let Some(action) = config.matches_key_sequence_generalized(&sequence) {
+        if let Some(action) = config.matches_key_sequence_generalized(&sequence).as_deref() {
             let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                 crate::tui::functions::form::handle_action(
                     action,
@@ -96,6 +81,15 @@ pub async fn handle_read_only_event(
                 .await?
             } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
                 crate::tui::functions::login::handle_action(action).await?
+            } else if app_state.ui.show_add_table {
+                add_table_ro::execute_action(
+                    action,
+                    app_state,
+                    add_table_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                ).await?
             } else if app_state.ui.show_register{
                 auth_ro::execute_action(
                     action,
@@ -134,7 +128,7 @@ pub async fn handle_read_only_event(
         }
 
         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) {
+            if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers).as_deref() {
                 let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                     crate::tui::functions::form::handle_action(
                         action,
@@ -147,6 +141,15 @@ pub async fn handle_read_only_event(
                     .await?
                 } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
                     crate::tui::functions::login::handle_action(action).await?
+                } else if app_state.ui.show_add_table {
+                    add_table_ro::execute_action(
+                        action,
+                        app_state,
+                        add_table_state,
+                        ideal_cursor_column,
+                        key_sequence_tracker,
+                        command_message,
+                    ).await?
                 } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                     auth_ro::execute_action(
                         action,
@@ -184,7 +187,7 @@ pub async fn handle_read_only_event(
     } else {
         key_sequence_tracker.reset();
 
-        if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
+        if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers).as_deref() {
             let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
                 crate::tui::functions::form::handle_action(
                     action,
@@ -195,8 +198,17 @@ pub async fn handle_read_only_event(
                     ideal_cursor_column,
                 )
                 .await?
-            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) { // Handle login context actions
+            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
                 crate::tui::functions::login::handle_action(action).await?
+            } else if app_state.ui.show_add_table {
+                add_table_ro::execute_action(
+                    action,
+                    app_state,
+                    add_table_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                ).await?
             } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
                 auth_ro::execute_action(
                     action,

client/src/modes/general/dialog.rs

@@ -6,10 +6,11 @@ use crate::ui::handlers::context::DialogPurpose;
 use crate::state::app::state::AppState;
 use crate::state::app::buffer::BufferState;
 use crate::state::pages::auth::AuthState;
-use crate::state::pages::auth::LoginState;
-use crate::state::pages::auth::RegisterState;
+use crate::state::pages::auth::{LoginState, RegisterState};
+use crate::state::pages::admin::AdminState;
 use crate::modes::handlers::event::EventOutcome;
 use crate::tui::functions::common::{login, register};
+use crate::tui::functions::common::add_table::handle_delete_selected_columns;
 
 /// Handles key events specifically when a dialog is active.
 /// Returns Some(Result<EventOutcome, Error>) if the event was handled (consumed),
@@ -22,6 +23,7 @@ pub async fn handle_dialog_event(
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
     buffer_state: &mut BufferState,
+    admin_state: &mut AdminState,
 ) -> Option<Result<EventOutcome, Box<dyn std::error::Error>>> {
     if let Event::Key(key) = event {
         // Always allow Esc to dismiss
@@ -114,6 +116,20 @@ pub async fn handle_dialog_event(
                                 }
                             }
                         }
+                        DialogPurpose::ConfirmDeleteColumns => {
+                            match selected_index {
+                                0 => { // "Confirm" button selected
+                                    let outcome_message = handle_delete_selected_columns(&mut admin_state.add_table_state);
+                                    app_state.hide_dialog();
+                                    return Some(Ok(EventOutcome::Ok(outcome_message)));
+                                }
+                                1 => { // "Cancel" button selected
+                                    app_state.hide_dialog();
+                                    return Some(Ok(EventOutcome::Ok("Deletion cancelled.".to_string())));
+                                }
+                                _ => { /* Handle unexpected index */ }
+                            }
+                        }
                     }
                 }
                 _ => {} // Ignore other general actions when dialog is shown

client/src/modes/handlers/event.rs

@@ -6,6 +6,7 @@ use crate::services::auth::AuthClient;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::ui::handlers::context::UiContext;
+use crate::ui::handlers::context::DialogPurpose;
 use crate::functions::common::buffer;
 use crate::tui::{
     terminal::core::TerminalCore,
@@ -28,6 +29,7 @@ use crate::state::{
         auth::{AuthState, LoginState, RegisterState},
         admin::AdminState,
         canvas_state::CanvasState,
+        add_table::AddTableState,
         form::FormState,
         intro::IntroState,
     },
@@ -115,7 +117,14 @@ impl EventHandler {
 
         if app_state.ui.dialog.dialog_show {
             if let Some(dialog_result) = dialog::handle_dialog_event(
-                &event, config, app_state, auth_state, login_state, register_state, buffer_state
+                &event,
+                config,
+                app_state,
+                auth_state,
+                login_state,
+                register_state,
+                buffer_state,
+                admin_state,
             ).await {
                 return dialog_result;
             }
@@ -218,11 +227,21 @@ impl EventHandler {
                                     message = format!("Intro Option {} selected", index);
                                 }
                                 UiContext::Login => {
-                                    message = match index {
-                                        0 => login::save(auth_state, login_state, &mut self.auth_client, app_state).await?,
+                                    let login_action_message = match index {
+                                        0 => { // Index 0 corresponds to the "Login" button
+                                            match login::initiate_login(app_state, login_state).await {
+                                                Ok(outcome) => return Ok(outcome),
+                                                Err(e) => {
+                                                    app_state.show_dialog("Error", &format!("Failed to initiate login: {}", e), vec!["OK".to_string()], DialogPurpose::LoginFailed);
+                                                    login_state.login_request_pending = false;
+                                                    "Error initiating login".to_string()
+                                                }
+                                            }
+                                        },
                                         1 => login::back_to_main(login_state, app_state, buffer_state).await,
                                         _ => "Invalid Login Option".to_string(),
                                     };
+                                    message = login_action_message;
                                 }
                                 UiContext::Register => {
                                     message = match index {
@@ -273,7 +292,7 @@ impl EventHandler {
                         return Ok(EventOutcome::Ok(self.command_message.clone()));
                     }
                     // Check for entering edit mode (before cursor)
-                    else if config.get_read_only_action_for_key(key_code, modifiers) == Some("enter_edit_mode_before")
+                    else if config.get_read_only_action_for_key(key_code, modifiers).as_deref() == Some("enter_edit_mode_before")
                         && ModeManager::can_enter_edit_mode(current_mode) {
                         self.is_edit_mode = true;
                         self.edit_mode_cooldown = true;
@@ -282,7 +301,7 @@ impl EventHandler {
                         return Ok(EventOutcome::Ok(self.command_message.clone()));
                     }
                     // Check for entering edit mode (after cursor)
-                    else if config.get_read_only_action_for_key(key_code, modifiers) == Some("enter_edit_mode_after")
+                    else if config.get_read_only_action_for_key(key_code, modifiers).as_deref() == Some("enter_edit_mode_after")
                         && ModeManager::can_enter_edit_mode(current_mode) {
                         let current_input = if app_state.ui.show_login || app_state.ui.show_register{
                             login_state.get_current_input()
@@ -306,6 +325,7 @@ impl EventHandler {
                         }
                         self.is_edit_mode = true;
                         self.edit_mode_cooldown = true;
+                        app_state.ui.focus_outside_canvas = false;
                         self.command_message = "Edit mode (after cursor)".to_string();
                         terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
                         return Ok(EventOutcome::Ok(self.command_message.clone()));
@@ -349,6 +369,7 @@ impl EventHandler {
                         form_state,
                         login_state,
                         register_state,
+                        &mut admin_state.add_table_state,
                         &mut self.key_sequence_tracker,
                         current_position,
                         total_count,
@@ -383,7 +404,7 @@ impl EventHandler {
 
                     let (_should_exit, message) = read_only::handle_read_only_event(
                         app_state, key, config, form_state, login_state,
-                        register_state, &mut self.key_sequence_tracker,
+                        register_state, &mut admin_state.add_table_state, &mut self.key_sequence_tracker,
                         current_position, total_count, grpc_client,
                         &mut self.command_message, &mut self.edit_mode_cooldown,
                         &mut self.ideal_cursor_column,
@@ -431,6 +452,7 @@ impl EventHandler {
                         form_state,
                         login_state,
                         register_state,
+                        &mut admin_state.add_table_state,
                         &mut self.ideal_cursor_column,
                         current_position,
                         total_count,

client/src/modes/handlers/mode_manager.rs

@@ -2,6 +2,8 @@
 use crate::state::app::state::AppState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::app::highlight::HighlightState;
+use crate::state::pages::add_table::AddTableFocus;
+use crate::state::pages::admin::AdminState;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AppMode {
@@ -25,21 +27,24 @@ impl ModeManager {
             return AppMode::Highlight;
         }
 
-        if app_state.ui.focus_outside_canvas || app_state.ui.show_add_table{
+        if app_state.ui.focus_outside_canvas {
             return AppMode::General;
         }
 
-        if app_state.ui.show_login || app_state.ui.show_register {
-            if event_handler.is_edit_mode {
-                AppMode::Edit
+        let is_canvas_view = app_state.ui.show_login
+            || app_state.ui.show_register
+            || app_state.ui.show_form
+            || app_state.ui.show_add_table;
+
+        if is_canvas_view {
+            if app_state.ui.focus_outside_canvas {
+                AppMode::General
             } else {
-                AppMode::ReadOnly
-            }
-        } else if app_state.ui.show_form {
-            if event_handler.is_edit_mode {
-                AppMode::Edit
-            } else {
-                AppMode::ReadOnly
+                if event_handler.is_edit_mode { 
+                    AppMode::Edit 
+                } else { 
+                    AppMode::ReadOnly 
+                }
             }
         } else {
             AppMode::General

client/src/modes/highlight/highlight.rs

@@ -6,6 +6,7 @@ use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::app::state::AppState;
 use crate::state::pages::auth::{LoginState, RegisterState};
+use crate::state::pages::add_table::AddTableState;
 use crate::state::pages::form::FormState;
 use crate::modes::handlers::event::EventOutcome;
 use crate::modes::read_only; // Import the ReadOnly handler
@@ -21,6 +22,7 @@ pub async fn handle_highlight_event(
     form_state: &mut FormState,
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
+    add_table_state: &mut AddTableState,
     key_sequence_tracker: &mut KeySequenceTracker,
     current_position: &mut u64,
     total_count: u64,
@@ -38,6 +40,7 @@ pub async fn handle_highlight_event(
         form_state,
         login_state,
         register_state,
+        add_table_state,
         key_sequence_tracker,
         current_position,
         total_count,

client/src/state/app/state.rs

@@ -12,6 +12,7 @@ pub struct DialogState {
     pub dialog_buttons: Vec<String>,
     pub dialog_active_button_index: usize,
     pub purpose: Option<DialogPurpose>,
+    pub is_loading: bool,
 }
 
 pub struct UiState {
@@ -86,10 +87,41 @@ impl AppState {
         self.ui.dialog.dialog_buttons = buttons;
         self.ui.dialog.dialog_active_button_index = 0;
         self.ui.dialog.purpose = Some(purpose);
+        self.ui.dialog.is_loading = false;
         self.ui.dialog.dialog_show = true;
         self.ui.focus_outside_canvas = true;
     }
 
+    /// Shows a dialog specifically for loading states.
+    pub fn show_loading_dialog(&mut self, title: &str, message: &str) {
+        self.ui.dialog.dialog_title = title.to_string();
+        self.ui.dialog.dialog_message = message.to_string();
+        self.ui.dialog.dialog_buttons.clear(); // No buttons during loading
+        self.ui.dialog.dialog_active_button_index = 0;
+        self.ui.dialog.purpose = None; // Purpose is set when loading finishes
+        self.ui.dialog.is_loading = true;
+        self.ui.dialog.dialog_show = true;
+        self.ui.focus_outside_canvas = true; // Keep focus management consistent
+    }
+
+    /// Updates the content of an existing dialog, typically after loading.
+    pub fn update_dialog_content(
+        &mut self,
+        message: &str,
+        buttons: Vec<String>,
+        purpose: DialogPurpose,
+    ) {
+        if self.ui.dialog.dialog_show {
+            self.ui.dialog.dialog_message = message.to_string();
+            self.ui.dialog.dialog_buttons = buttons;
+            self.ui.dialog.dialog_active_button_index = 0; // Reset focus
+            self.ui.dialog.purpose = Some(purpose);
+            self.ui.dialog.is_loading = false; // Loading finished
+                                               // Keep dialog_show = true
+                                               // Keep focus_outside_canvas = true
+        }
+    }
+
     /// Hides the dialog and clears its content.
     pub fn hide_dialog(&mut self) {
         self.ui.dialog.dialog_show = false;
@@ -156,6 +188,7 @@ impl Default for DialogState {
             dialog_buttons: Vec::new(),
             dialog_active_button_index: 0,
             purpose: None,
+            is_loading: false,
         }
     }
 }

client/src/state/pages/add_table.rs

@@ -6,12 +6,14 @@ use ratatui::widgets::TableState;
 pub struct ColumnDefinition {
     pub name: String,
     pub data_type: String,
+    pub selected: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct LinkDefinition {
     pub linked_table_name: String,
     pub is_required: bool,
+    pub selected: bool,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -25,8 +27,13 @@ pub enum AddTableFocus {
     ColumnsTable,
     IndexesTable,
     LinksTable,
+    // Inside Tables (Scrolling Focus)
+    InsideColumnsTable,
+    InsideIndexesTable,
+    InsideLinksTable,
     // Buttons
     SaveButton,
+    DeleteSelectedButton,
     CancelButton,
 }
 
@@ -34,6 +41,7 @@ pub enum AddTableFocus {
 pub struct AddTableState {
     pub profile_name: String,
     pub table_name: String,
+    pub table_name_input: String,
     pub column_name_input: String,
     pub column_type_input: String,
     pub columns: Vec<ColumnDefinition>,
@@ -53,23 +61,18 @@ impl Default for AddTableState {
     fn default() -> Self {
         // Initialize with some dummy data for demonstration
         AddTableState {
-            profile_name: "default".to_string(), // Should be set dynamically
-            table_name: String::new(), // Start empty
+            profile_name: "default".to_string(),
+            table_name: String::new(),
+            table_name_input: String::new(),
             column_name_input: String::new(),
             column_type_input: String::new(),
-            columns: vec![
-                ColumnDefinition { name: "id".to_string(), data_type: "INTEGER".to_string() },
-                ColumnDefinition { name: "name".to_string(), data_type: "TEXT".to_string() },
-            ],
-            indexes: vec!["id".to_string()],
-            links: vec![
-                LinkDefinition { linked_table_name: "related_table".to_string(), is_required: true },
-                LinkDefinition { linked_table_name: "another_table".to_string(), is_required: false },
-            ],
+            columns: Vec::new(),
+            indexes: Vec::new(),
+            links: Vec::new(),
             current_focus: AddTableFocus::InputTableName,
-            column_table_state: TableState::default().with_selected(0),
-            index_table_state: TableState::default().with_selected(0),
-            link_table_state: TableState::default().with_selected(0),
+            column_table_state: TableState::default(),
+            index_table_state: TableState::default(),
+            link_table_state: TableState::default(),
             table_name_cursor_pos: 0,
             column_name_cursor_pos: 0,
             column_type_cursor_pos: 0,
@@ -79,7 +82,7 @@ impl Default for AddTableState {
 }
 
 impl AddTableState {
-    const INPUT_FIELD_COUNT: usize = 3;
+    pub const INPUT_FIELD_COUNT: usize = 3;
 }
 
 // Implement CanvasState for the input fields
@@ -108,12 +111,12 @@ impl CanvasState for AddTableState {
     }
 
     fn inputs(&self) -> Vec<&String> {
-        vec![&self.table_name, &self.column_name_input, &self.column_type_input]
+        vec![&self.table_name_input, &self.column_name_input, &self.column_type_input]
     }
 
     fn get_current_input(&self) -> &str {
         match self.current_focus {
-            AddTableFocus::InputTableName => &self.table_name,
+            AddTableFocus::InputTableName => &self.table_name_input,
             AddTableFocus::InputColumnName => &self.column_name_input,
             AddTableFocus::InputColumnType => &self.column_type_input,
             _ => "", // Should not happen if called correctly
@@ -122,14 +125,10 @@ impl CanvasState for AddTableState {
 
     fn get_current_input_mut(&mut self) -> &mut String {
         match self.current_focus {
-            AddTableFocus::InputTableName => &mut self.table_name,
+            AddTableFocus::InputTableName => &mut self.table_name_input,
             AddTableFocus::InputColumnName => &mut self.column_name_input,
             AddTableFocus::InputColumnType => &mut self.column_type_input,
-            // This case needs careful handling. If focus isn't on an input,
-            // which mutable string should we return? Returning the first one
-            // might be unexpected. Consider panicking or returning Option if this state is invalid.
-            // For now, returning the first field to avoid panics during rendering.
-            _ => &mut self.table_name,
+            _ => &mut self.table_name_input,
         }
     }
 

client/src/state/pages/auth.rs

@@ -29,6 +29,7 @@ pub struct LoginState {
     pub current_field: usize,
     pub current_cursor_pos: usize,
     pub has_unsaved_changes: bool,
+    pub login_request_pending: bool,
 }
 
 /// Represents the state of the Registration form UI
@@ -71,6 +72,7 @@ impl LoginState {
             current_field: 0,
             current_cursor_pos: 0,
             has_unsaved_changes: false,
+            login_request_pending: false,
         }
     }
 }

client/src/tui/functions/common.rs

@@ -3,3 +3,4 @@
 pub mod form;
 pub mod login;
 pub mod register;
+pub mod add_table;

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

@@ -0,0 +1,100 @@
+// src/tui/functions/common/add_table.rs
+use crate::state::pages::add_table::{
+    AddTableFocus, AddTableState, ColumnDefinition,
+};
+
+/// Handles the logic for adding a column when the "Add" button is activated.
+///
+/// Takes the mutable state and command message string.
+/// Returns `Some(AddTableFocus)` indicating the desired focus state after a successful add,
+/// or `None` if the action failed (e.g., validation error).
+pub fn handle_add_column_action(
+    add_table_state: &mut AddTableState,
+    command_message: &mut String,
+) -> Option<AddTableFocus> {
+
+    // Trim and create owned Strings from inputs
+    let table_name_in = add_table_state.table_name_input.trim();
+    let column_name_in = add_table_state.column_name_input.trim();
+    let column_type_in = add_table_state.column_type_input.trim(); 
+
+    // Validate all inputs needed for this combined action
+    let has_table_name = !table_name_in.is_empty();
+    let has_column_name = !column_name_in.is_empty();
+    let has_column_type = !column_type_in.is_empty();
+
+    match (has_table_name, has_column_name, has_column_type) {
+        // Case 1: Both column fields have input (Table name is optional here)
+        (_, true, true) => {
+            let mut msg = String::new();
+            // Optionally update table name if provided
+            if has_table_name {
+                add_table_state.table_name = table_name_in.to_string();
+                msg.push_str(&format!("Table name set to '{}'. ", add_table_state.table_name));
+            }
+            // Add the column
+            let new_column = ColumnDefinition {
+                name: column_name_in.to_string(),
+                data_type: column_type_in.to_string(),
+                selected: false,
+            };
+            add_table_state.columns.push(new_column.clone()); // Clone for msg
+            msg.push_str(&format!("Column '{}' added.", new_column.name));
+            *command_message = msg;
+
+            // Clear all inputs and reset cursors
+            add_table_state.table_name_input.clear();
+            add_table_state.column_name_input.clear();
+            add_table_state.column_type_input.clear();
+            add_table_state.table_name_cursor_pos = 0;
+            add_table_state.column_name_cursor_pos = 0;
+            add_table_state.column_type_cursor_pos = 0;
+            add_table_state.has_unsaved_changes = true;
+            Some(AddTableFocus::InputColumnName) // Focus for next column
+        }
+        // Case 2: Only one column field has input (Error)
+        (_, true, false) | (_, false, true) => {
+            *command_message = "Both Column Name and Type are required to add a column.".to_string();
+            None // Indicate validation failure
+        }
+        // Case 3: Only Table name has input (No column input)
+        (true, false, false) => {
+            add_table_state.table_name = table_name_in.to_string();
+            *command_message = format!("Table name set to '{}'.", add_table_state.table_name);
+            // Clear only table name input
+            add_table_state.table_name_input.clear();
+            add_table_state.table_name_cursor_pos = 0;
+            add_table_state.has_unsaved_changes = true;
+            Some(AddTableFocus::InputTableName) // Keep focus here
+        }
+        // Case 4: All fields are empty
+        (false, false, false) => {
+            *command_message = "No input provided.".to_string();
+            None
+        }
+    }
+}
+
+/// Handles deleting columns marked as selected in the AddTableState.
+pub fn handle_delete_selected_columns(
+    add_table_state: &mut AddTableState,
+) -> String {
+    let initial_count = add_table_state.columns.len();
+    // Keep only the columns that are NOT selected
+    add_table_state.columns.retain(|col| !col.selected);
+    let deleted_count = initial_count - add_table_state.columns.len();
+
+    if deleted_count > 0 {
+        add_table_state.has_unsaved_changes = true;
+        // Reset selection highlight as indices have changed
+        add_table_state.column_table_state.select(None);
+        // Optionally, select the first item if the list is not empty
+        // if !add_table_state.columns.is_empty() {
+        //     add_table_state.column_table_state.select(Some(0));
+        // }
+        format!("Deleted {} selected column(s).", deleted_count)
+    } else {
+        "No columns marked for deletion.".to_string()
+    }
+}
+

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

@@ -7,9 +7,11 @@ use crate::state::app::state::AppState;
 use crate::state::app::buffer::{AppView, BufferState};
 use crate::state::pages::canvas_state::CanvasState;
 use crate::ui::handlers::context::DialogPurpose;
+use crate::modes::handlers::event::EventOutcome; // Make sure this is imported
 
 /// Attempts to log the user in using the provided credentials via gRPC.
 /// Updates AuthState and AppState on success or failure.
+/// (This is your existing function - remains unchanged)
 pub async fn save(
     auth_state: &mut AuthState,
     login_state: &mut LoginState,
@@ -21,24 +23,25 @@ pub async fn save(
 
     // Clear previous error/dialog state before attempting
     login_state.error_message = None;
-    // Use the helper to ensure dialog is hidden and cleared properly
-    app_state.hide_dialog();
+    app_state.hide_dialog(); // Hide any previous dialog
 
     // Call the gRPC login method
     match auth_client.login(identifier, password).await {
         Ok(response) => {
-            // Store authentication details on success
+            // Store authentication details using correct field names
             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.decoded_username = Some(response.username.clone());
             login_state.set_has_unsaved_changes(false);
+            login_state.error_message = None;
 
+            // Format the success message using response data
             let success_message = format!(
                 "Login Successful!\n\n\
-                 Username: {}\n\
-                 User ID: {}\n\
-                 Role: {}",
+                Username: {}\n\
+                User ID: {}\n\
+                Role: {}",
                 response.username,
                 response.user_id,
                 response.role
@@ -50,37 +53,53 @@ pub async fn save(
                 vec!["Menu".to_string(), "Exit".to_string()],
                 DialogPurpose::LoginSuccess,
             );
-
+            login_state.password.clear();
+            login_state.current_cursor_pos = 0;
             Ok("Login successful, details shown in dialog.".to_string())
         }
         Err(e) => {
             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()],
                 DialogPurpose::LoginFailed,
             );
-
+            login_state.error_message = Some(error_message.clone());
             login_state.set_has_unsaved_changes(true);
-
             Ok(format!("Login failed: {}", error_message))
         }
     }
 }
 
+// --- Add this new function ---
+/// Sets the stage for login: shows loading dialog and sets the pending flag.
+/// Call this from the event handler when login is triggered.
+pub async fn initiate_login(
+    app_state: &mut AppState,
+    login_state: &mut LoginState,
+) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+    // Show the loading dialog immediately
+    app_state.show_loading_dialog("Logging In", "Please wait...");
+    // Set the flag in LoginState to indicate the actual save should run next loop
+    login_state.login_request_pending = true;
+    // Return immediately to allow redraw
+    Ok(EventOutcome::Ok("Login initiated.".to_string()))
+}
+// --- End of new function ---
+
+
 /// Reverts the login form fields to empty and returns to the previous screen (Intro).
 pub async fn revert(
     login_state: &mut LoginState,
-    app_state: &mut AppState,
+    _app_state: &mut AppState, // Keep signature consistent if needed elsewhere
 ) -> String {
     // Clear the input fields
     login_state.username.clear();
     login_state.password.clear();
     login_state.error_message = None;
     login_state.set_has_unsaved_changes(false);
+    login_state.login_request_pending = false; // Ensure flag is reset on revert
 
     "Login reverted".to_string()
 }
@@ -95,9 +114,10 @@ pub async fn back_to_main(
     login_state.password.clear();
     login_state.error_message = None;
     login_state.set_has_unsaved_changes(false);
+    login_state.login_request_pending = false; // Ensure flag is reset
 
     // Ensure dialog is hidden if revert is called
-    app_state.hide_dialog(); // Uncomment if needed
+    app_state.hide_dialog();
 
     // Navigation logic
     buffer_state.close_active_buffer();
@@ -109,3 +129,4 @@ pub async fn back_to_main(
 
     "Returned to main menu".to_string()
 }
+

client/src/ui/handlers/context.rs

@@ -15,6 +15,7 @@ pub enum DialogPurpose {
     LoginFailed,
     RegisterSuccess,
     RegisterFailed,
+    ConfirmDeleteColumns, // add_table delete selected Columns
     // TODO in the future:
     // ConfirmQuit,
 }

client/src/ui/handlers/ui.rs

@@ -3,6 +3,7 @@
 use crate::config::binds::config::Config;
 use crate::config::colors::themes::Theme;
 use crate::services::grpc_client::GrpcClient;
+use crate::services::auth::AuthClient; // <-- Add AuthClient import
 use crate::services::ui_service::UiService;
 use crate::modes::common::commands::CommandHandler;
 use crate::modes::handlers::event::{EventHandler, EventOutcome};
@@ -17,11 +18,15 @@ use crate::state::pages::intro::IntroState;
 use crate::state::app::buffer::BufferState;
 use crate::state::app::buffer::AppView;
 use crate::state::app::state::AppState;
- // Import SaveOutcome
+use crate::ui::handlers::context::DialogPurpose; // <-- Add DialogPurpose import
+// Import SaveOutcome
 use crate::tui::terminal::{EventReader, TerminalCore};
 use crate::ui::handlers::render::render_ui;
+use crate::tui::functions::common::login; // <-- Add login module import
 use std::time::Instant;
 use crossterm::cursor::SetCursorStyle;
+use crossterm::event as crossterm_event;
+use tracing::{info, error};
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
@@ -57,9 +62,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let mut current_fps = 0.0;
 
     loop {
-        // Determine edit mode based on EventHandler state
-        let is_edit_mode = event_handler.is_edit_mode;
-
         // --- Synchronize UI View from Active Buffer ---
         if let Some(active_view) = buffer_state.get_active_view() {
             // Reset all flags first
@@ -87,6 +89,10 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         }
         // --- End Synchronization ---
 
+        // --- 3. Draw UI ---
+        // Draw the current state *first*. This ensures the loading dialog
+        // set in the *previous* iteration gets rendered before the pending
+        // action check below.
         terminal.draw(|f| {
             render_ui(
                 f,
@@ -98,7 +104,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 &mut admin_state,
                 &buffer_state,
                 &theme,
-                is_edit_mode,
+                event_handler.is_edit_mode, // Use event_handler's state
                 &event_handler.highlight_state,
                 app_state.total_count,
                 app_state.current_position,
@@ -112,77 +118,108 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         })?;
 
         // --- Cursor Visibility Logic ---
+        // (Keep existing cursor logic here - depends on state drawn above)
         let current_mode = ModeManager::derive_mode(&app_state, &event_handler);
         match current_mode {
-            AppMode::Edit => {
-                terminal.show_cursor()?;
-            }
-            AppMode::Highlight => {
-                terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
-                terminal.show_cursor()?;
-            }
+            AppMode::Edit => { terminal.show_cursor()?; }
+            AppMode::Highlight => { terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?; terminal.show_cursor()?; }
             AppMode::ReadOnly => {
-                if !app_state.ui.focus_outside_canvas {
-                    terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
-                } else {
-                    terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?;
-                }
+                if !app_state.ui.focus_outside_canvas { terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?; }
+                else { terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?; }
                 terminal.show_cursor()?;
             }
             AppMode::General => {
-                if app_state.ui.focus_outside_canvas {
-                    terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?;
-                    terminal.show_cursor()?;
-                } else {
-                    terminal.hide_cursor()?;
-                }
-            }
-            AppMode::Command => {
-                terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?;
-                terminal.show_cursor()?;
+                if app_state.ui.focus_outside_canvas { terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?; terminal.show_cursor()?; }
+                else { terminal.hide_cursor()?; }
             }
+            AppMode::Command => { terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?; terminal.show_cursor()?; }
         }
         // --- End Cursor Visibility Logic ---
 
-        let total_count = app_state.total_count; // Keep track for save logic
+        // --- 2. Check for Pending Login Action ---
+        if login_state.login_request_pending {
+            // Reset the flag *before* calling save
+            login_state.login_request_pending = false;
+
+            // Create AuthClient and call save
+            match AuthClient::new().await {
+                Ok(mut auth_client_instance) => {
+                    // Call the ORIGINAL save function from the login module
+                    let save_result = login::save(
+                        &mut auth_state,
+                        &mut login_state,
+                        &mut auth_client_instance, // Pass the new client instance
+                        &mut app_state,
+                    ).await;
+
+                    // Use tracing for logging the outcome
+                    match save_result {
+                        // save returns Result<String, Error>, Ok contains the message
+                        Ok(msg) => info!(message = %msg, "Login save result"), // Use tracing::info!
+                        Err(e) => error!(error = %e, "Error during login save"), // Use tracing::error!
+                    }
+                    // Note: save already handles showing the final dialog (success/failure)
+                }
+                Err(e) => {
+                    // Handle client connection error - show dialog directly
+                    // Ensure flag is already false here
+                    app_state.show_dialog( // Use show_dialog, not update_dialog_content
+                        "Login Failed",
+                        &format!("Connection Error: {}", e),
+                        vec!["OK".to_string()],
+                        DialogPurpose::LoginFailed, // Use appropriate purpose
+                    );
+                    login_state.error_message = Some(format!("Connection Error: {}", e));
+                    error!(error = %e, "Failed to create AuthClient"); // Use tracing::error!
+                }
+            }
+            // After save runs, the state (dialog content, etc.) is updated.
+            // The *next* iteration's draw call will show the final result.
+        } // --- End Pending Login Check ---
+
+        let total_count = app_state.total_count;
         let mut current_position = app_state.current_position;
         let position_before_event = current_position;
 
-        let event = event_reader.read_event()?;
-
-        // Get the outcome from the event handler
-        let event_outcome_result = event_handler
-            .handle_event(
-                event,
-                &config,
-                &mut terminal,
-                &mut grpc_client,
-                &mut command_handler,
-                &mut form_state,
-                &mut auth_state,
-                &mut login_state,
-                &mut register_state,
-                &mut intro_state,
-                &mut admin_state,
-                &mut buffer_state,
-                &mut app_state,
-                total_count,
-                &mut current_position,
-            )
-            .await;
+        // --- 1. Handle Terminal Events ---
+        let mut event_outcome_result = Ok(EventOutcome::Ok(String::new()));
+        // Poll for events *after* drawing and checking pending actions
+        if crossterm_event::poll(std::time::Duration::from_millis(20))? {
+            let event = event_reader.read_event()?;
+            event_outcome_result = event_handler
+                .handle_event(
+                    event,
+                    &config,
+                    &mut terminal,
+                    &mut grpc_client,
+                    &mut command_handler,
+                    &mut form_state,
+                    &mut auth_state,
+                    &mut login_state,
+                    &mut register_state,
+                    &mut intro_state,
+                    &mut admin_state,
+                    &mut buffer_state,
+                    &mut app_state,
+                    total_count,
+                    &mut current_position,
+                )
+                .await;
+        }
 
         // Update position based on handler's modification
+        // This happens *after* the event is handled
         app_state.current_position = current_position;
 
         // --- Centralized Consequence Handling ---
         let mut should_exit = false;
         match event_outcome_result {
-            // Handle the Result first
             Ok(outcome) => match outcome {
-                // Handle the Ok variant containing EventOutcome
                 EventOutcome::Ok(message) => {
                     if !message.is_empty() {
-                        event_handler.command_message = message;
+                        // Update command message only if event handling produced one
+                        // Avoid overwriting messages potentially set by pending actions
+                        // event_handler.command_message = message;
                     }
                 }
                 EventOutcome::Exit(message) => {
@@ -191,8 +228,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 }
                 EventOutcome::DataSaved(save_outcome, message) => {
                     event_handler.command_message = message; // Show save status
-
-                    // *** Delegate outcome handling to UiService ***
                     if let Err(e) = UiService::handle_save_outcome(
                         save_outcome,
                         &mut grpc_client,
@@ -201,30 +236,26 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                     )
                     .await
                     {
-                        // Handle potential errors from the outcome handler itself
                         event_handler.command_message =
                             format!("Error handling save outcome: {}", e);
                     }
-                    // No count update needed for UpdatedExisting or NoChange
                 }
-                EventOutcome::ButtonSelected { context, index } => {
-                    event_handler.command_message = "Internal error: Unexpected button state".to_string();
+                EventOutcome::ButtonSelected { context: _, index: _ } => {
+                    // This case should ideally be fully handled within handle_event
+                    // If initiate_login was called, it returned early.
+                    // If not, the message was set and returned via Ok(message).
+                    // Log if necessary, but likely no action needed here.
+                    // log::warn!("ButtonSelected outcome reached main loop unexpectedly.");
                 }
             },
             Err(e) => {
-                // Handle errors from handle_event, e.g., log or display
                 event_handler.command_message = format!("Error: {}", e);
-                // Decide if the error is fatal, maybe set should_exit = true;
             }
-        }
+        } // --- End Consequence Handling ---
 
-        // --- Position Change Handling (after outcome processing) ---
-        let position_changed =
-            app_state.current_position != position_before_event; // Calculate after potential update
-                                                                 // Recalculate total_count *after* potential update
+        // --- Position Change Handling (after outcome processing and pending actions) ---
+        let position_changed = app_state.current_position != position_before_event;
         let current_total_count = app_state.total_count;
-
-        // Handle position changes and update form state (Only when form is shown)
         if app_state.ui.show_form {
             if position_changed && !event_handler.is_edit_mode {
                 let current_input = form_state.get_current_input();
@@ -295,7 +326,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                     event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         } else if app_state.ui.show_register {
-            if !event_handler.is_edit_mode {
+             if !event_handler.is_edit_mode {
                 let current_input = register_state.get_current_input();
                 let max_cursor_pos = if !current_input.is_empty() {
                     current_input.len() - 1
@@ -305,7 +336,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 register_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         } else if app_state.ui.show_login {
-            if !event_handler.is_edit_mode {
+             if !event_handler.is_edit_mode {
                 let current_input = login_state.get_current_input();
                 let max_cursor_pos = if !current_input.is_empty() {
                     current_input.len() - 1
@@ -315,10 +346,10 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 login_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         }
+        // --- End Position Change Handling ---
 
-        // Check exit condition *after* processing outcome
+        // Check exit condition *after* all processing for the iteration
         if should_exit {
-            // terminal.cleanup()?; // Optional: Drop handles this
             return Ok(());
         }
 
@@ -329,6 +360,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         if frame_duration.as_secs_f64() > 1e-6 {
             current_fps = 1.0 / frame_duration.as_secs_f64();
         }
-    }
+    } // End main loop
 }