cargo fix

Cargo.lock

@@ -109,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "arc-swap"
@@ -423,6 +423,7 @@ dependencies = [
 name = "client"
 version = "0.3.13"
 dependencies = [
+ "anyhow",
  "async-trait",
  "common",
  "crossterm",
@@ -1656,9 +1657,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/Cargo.toml

@@ -5,6 +5,7 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
+anyhow = "1.0.98"
 async-trait = "0.1.88"
 common = { path = "../common" }
 

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

@@ -13,6 +13,7 @@ use ratatui::{
     Frame,
 };
 use crate::components::handlers::canvas::render_canvas;
+use crate::components::common::dialog;
 
 /// Renders the Add New Table page layout, structuring the display of table information,
 /// input fields, and action buttons. Adapts layout based on terminal width.
@@ -20,7 +21,7 @@ pub fn render_add_table(
     f: &mut Frame,
     area: Rect,
     theme: &Theme,
-    _app_state: &AppState, // Currently unused, might be needed later
+    app_state: &AppState, // Currently unused, might be needed later
     add_table_state: &mut AddTableState,
     is_edit_mode: bool, // Determines if canvas inputs are in edit mode
     highlight_state: &HighlightState, // For text highlighting in canvas
@@ -48,6 +49,46 @@ pub fn render_add_table(
     let inner_area = main_block.inner(area);
     f.render_widget(main_block, 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
+    }
+
     // --- Area Variable Declarations ---
     let top_info_area: Rect;
     let columns_area: Rect;
@@ -77,8 +118,8 @@ pub fn render_add_table(
         let middle_chunks = Layout::default()
             .direction(Direction::Horizontal)
             .constraints([
-                Constraint::Percentage(60), // Left: Columns Table
-                Constraint::Percentage(40), // Right: Inputs etc.
+                Constraint::Percentage(50), // Left: Columns Table
+                Constraint::Percentage(50), // Right: Inputs etc.
             ])
             .split(middle_area);
 
@@ -186,8 +227,7 @@ pub fn render_add_table(
     // --- Common Widget Rendering (Uses calculated areas) ---
 
     // --- Columns Table Rendering ---
-    let columns_focused =
-        add_table_state.current_focus == AddTableFocus::ColumnsTable;
+    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 {
@@ -198,27 +238,31 @@ pub fn render_add_table(
         .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();
-    // Use different headers/constraints based on layout? For now, keep consistent.
-    let header_cells = ["Name", "Type"]
+    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::Percentage(60), Constraint::Percentage(40)],
+        [ // Define constraints for 3 columns: Sel, Name, Type
+            Constraint::Length(5),
+            Constraint::Percentage(60),
+            Constraint::Percentage(35),
+        ],
     )
     .header(header)
     .block(
         Block::default()
             .title(Span::styled(" Columns ", theme.fg))
             .title_alignment(Alignment::Center)
-            .borders(Borders::ALL) // Use ALL borders for consistency
+            .borders(Borders::ALL)
             .border_type(BorderType::Rounded)
             .border_style(columns_border_style),
     )
@@ -249,22 +293,22 @@ pub fn render_add_table(
 
     // --- 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.bg // Reversed text color
+            theme.highlight // Highlighted text color
         } else {
             theme.secondary // Normal text color
         });
         if is_focused {
-            base_style
-                .add_modifier(Modifier::BOLD)
-                .bg(theme.highlight) // Reversed background
+            base_style.add_modifier(Modifier::BOLD)
         } else {
             base_style
         }
     };
-    let get_button_border_style = |button_focus: AddTableFocus, current_focus| {
-        if current_focus == button_focus {
+    // 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)
@@ -272,26 +316,25 @@ pub fn render_add_table(
     };
 
     // --- 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(get_button_style(
-            AddTableFocus::AddColumnButton,
-            add_table_state.current_focus,
-        ))
+        .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(get_button_border_style(
-                    AddTableFocus::AddColumnButton,
-                    add_table_state.current_focus,
-                )),
+            .borders(Borders::ALL)
+            .border_type(BorderType::Rounded)
+            .border_style(get_button_border_style(is_add_button_focused, theme)), // Pass bool and theme
         );
-    f.render_widget(add_button, add_button_area); // Render into the calculated area
+
+    // Render the button in its designated area
+    f.render_widget(add_button, add_button_area);
 
     // --- Indexes Table Rendering ---
-    let indexes_focused =
-        add_table_state.current_focus == AddTableFocus::IndexesTable;
+    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 {
@@ -333,7 +376,7 @@ pub fn render_add_table(
     );
 
     // --- Links Table Rendering ---
-    let links_focused = add_table_state.current_focus == AddTableFocus::LinksTable;
+    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 {
@@ -350,7 +393,7 @@ pub fn render_add_table(
             .style(Style::default().fg(theme.fg))
         })
         .collect();
-    let link_header_cells = ["Linked Table", "Req"]
+    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);
@@ -381,9 +424,9 @@ pub fn render_add_table(
     let bottom_button_chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([
-           Constraint::Percentage(33), // Save Button
-           Constraint::Percentage(34), // Delete Button
-           Constraint::Percentage(33), // Cancel Button
+            Constraint::Percentage(33), // Save Button
+            Constraint::Percentage(34), // Delete Button
+            Constraint::Percentage(33), // Cancel Button
         ])
         .split(bottom_buttons_area);
 
@@ -398,28 +441,28 @@ pub fn render_add_table(
                 .borders(Borders::ALL)
                 .border_type(BorderType::Rounded)
                 .border_style(get_button_border_style(
-                    AddTableFocus::SaveButton,
-                    add_table_state.current_focus,
+                    add_table_state.current_focus == AddTableFocus::SaveButton, // Pass bool
+                    theme,
                 )),
         );
     f.render_widget(save_button, bottom_button_chunks[0]);
 
-   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(get_button_border_style(
-                   AddTableFocus::DeleteSelectedButton,
-                   add_table_state.current_focus,
-               )),
-       );
-   f.render_widget(delete_button, bottom_button_chunks[1]);
+    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(get_button_border_style(
+                    add_table_state.current_focus == AddTableFocus::DeleteSelectedButton, // Pass bool
+                    theme,
+                )),
+        );
+    f.render_widget(delete_button, bottom_button_chunks[1]);
 
     let cancel_button = Paragraph::new(" Cancel ")
         .style(get_button_style(
@@ -432,9 +475,24 @@ pub fn render_add_table(
                 .borders(Borders::ALL)
                 .border_type(BorderType::Rounded)
                 .border_style(get_button_border_style(
-                    AddTableFocus::CancelButton,
-                    add_table_state.current_focus,
+                    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/admin/admin_panel.rs

@@ -6,7 +6,7 @@ use crate::state::app::state::AppState;
 use crate::state::pages::admin::AdminState;
 use common::proto::multieko2::table_definition::ProfileTreeResponse;
 use ratatui::{
-    layout::{Alignment, Constraint, Direction, Layout, Rect},
+    layout::{Constraint, Direction, Layout, Rect},
     style::Style,
     text::{Line, Span, Text},
     widgets::{Block, BorderType, Borders, List, ListItem, Paragraph, Wrap},

client/src/components/admin/admin_panel_admin.rs

@@ -7,7 +7,7 @@ use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::Style,
     text::{Line, Span, Text}, // Added Text
-    widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph},
+    widgets::{Block, BorderType, Borders, List, ListItem, Paragraph},
     Frame,
 };
 
@@ -66,8 +66,7 @@ pub fn render_admin_panel_admin(
         .enumerate()
         .map(|(idx, profile)| {
             // Check persistent selection for prefix, navigation state for style/highlight
-            let is_selected = admin_state.selected_profile_index == Some(idx); // Use persistent state for [*]
-            let is_navigated = admin_state.profile_list_state.selected() == Some(idx); // Use nav state for highlight/>
+            let is_selected = admin_state.selected_profile_index == Some(idx);
             let prefix = if is_selected { "[*] " } else { "[ ] " };
             let style = if is_selected { // Style based on selection too
                 Style::default().fg(theme.highlight).add_modifier(ratatui::style::Modifier::BOLD)

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

@@ -152,7 +152,7 @@ pub fn render_register(
             let selected = state.get_selected_suggestion_index();
             if !suggestions.is_empty() {
                 if let Some(input_rect) = active_field_rect {
-                    autocomplete::render_autocomplete_dropdown(f, input_rect, f.size(), theme, suggestions, selected);
+                    autocomplete::render_autocomplete_dropdown(f, input_rect, f.area(), theme, suggestions, selected);
                 }    
             }
         }
@@ -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/components/handlers/buffer_list.rs

@@ -4,7 +4,7 @@ use crate::config::colors::themes::Theme;
 use crate::state::app::buffer::BufferState;
 use ratatui::{
     layout::{Alignment, Rect},
-    style::{Style, Stylize},
+    style::Style,
     text::{Line, Span},
     widgets::Paragraph,
     Frame,

client/src/config/binds/config.rs

@@ -3,6 +3,7 @@
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::path::Path;
+use anyhow::{Context, Result};
 use crossterm::event::{KeyCode, KeyModifiers};
 
 #[derive(Debug, Deserialize, Default)]
@@ -43,11 +44,11 @@ pub struct ModeKeybindings {
 
 impl Config {
     /// Loads the configuration from "config.toml" in the client crate directory.
-    pub fn load() -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn load() -> Result<Self> {
         let manifest_dir = env!("CARGO_MANIFEST_DIR");
         let config_path = Path::new(manifest_dir).join("config.toml");
         let config_str = std::fs::read_to_string(&config_path)
-            .map_err(|e| format!("Failed to read config file at {:?}: {}", config_path, e))?;
+             .with_context(|| format!("Failed to read config file at {:?}", config_path))?;
         let config: Config = toml::from_str(&config_str)?;
         Ok(config)
     }

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

@@ -2,7 +2,7 @@
 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;
+use anyhow::Result;
 
 #[derive(PartialEq)]
 enum CharType {
@@ -134,7 +134,7 @@ pub async fn execute_edit_action(
     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>> {
+) -> Result<String> {
     // Use the CanvasState trait methods implemented for AddTableState
     match action {
         "insert_char" => {
@@ -186,8 +186,11 @@ pub async fn execute_edit_action(
             let num_fields = AddTableState::INPUT_FIELD_COUNT;
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = (current_field + 1) % num_fields;
-                state.set_current_field(new_field);
+                let 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));
@@ -198,12 +201,9 @@ pub async fn execute_edit_action(
             let num_fields = AddTableState::INPUT_FIELD_COUNT;
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = if current_field == 0 {
-                    num_fields - 1
-                } else {
-                    current_field - 1
-                };
-                state.set_current_field(new_field);
+                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));
@@ -227,18 +227,16 @@ pub async fn execute_edit_action(
             Ok("".to_string())
         }
         "move_up" => {
-            let num_fields = AddTableState::INPUT_FIELD_COUNT;
-            if num_fields > 0 {
-                let current_field = state.current_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));
-                }
+            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("".to_string())
+            Ok("ahoj".to_string())
         }
         "move_down" => {
             let num_fields = AddTableState::INPUT_FIELD_COUNT;

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

@@ -7,6 +7,7 @@ use crate::state::pages::auth::RegisterState;
 use crate::tui::functions::common::form::{revert, save};
 use crossterm::event::{KeyCode, KeyEvent};
 use std::any::Any;
+use anyhow::Result;
 
 pub async fn execute_common_action<S: CanvasState + Any>(
     action: &str,
@@ -14,7 +15,7 @@ pub async fn execute_common_action<S: CanvasState + Any>(
     grpc_client: &mut GrpcClient,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
     match action {
         "save" | "revert" => {
             if !state.has_unsaved_changes() {
@@ -62,10 +63,7 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
     key: KeyEvent,
     state: &mut S,
     ideal_cursor_column: &mut usize,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
     match action {
         "insert_char" => {
             if let KeyCode::Char(c) = key.code {
@@ -120,7 +118,7 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
             let num_fields = state.fields().len();
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = (current_field + 1) % num_fields;
+                let new_field = (current_field + 1).min(num_fields - 1);
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();
@@ -135,11 +133,7 @@ pub async fn execute_edit_action<S: CanvasState + Any + Send>(
             let num_fields = state.fields().len();
             if num_fields > 0 {
                 let current_field = state.current_field();
-                let new_field = if current_field == 0 {
-                    num_fields - 1
-                } else {
-                    current_field - 1
-                };
+                let new_field = current_field.saturating_sub(1);
                 state.set_current_field(new_field);
                 let current_input = state.get_current_input();
                 let max_pos = current_input.len();

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

@@ -8,6 +8,7 @@ use crate::tui::functions::common::form::SaveOutcome;
 use crate::modes::handlers::event::EventOutcome;
 use crossterm::event::{KeyCode, KeyEvent};
 use std::any::Any;
+use anyhow::Result;
 
 pub async fn execute_common_action<S: CanvasState + Any>(
     action: &str,
@@ -15,7 +16,7 @@ pub async fn execute_common_action<S: CanvasState + Any>(
     grpc_client: &mut GrpcClient,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+) -> Result<EventOutcome> {
     match action {
         "save" | "revert" => {
             if !state.has_unsaved_changes() {
@@ -76,10 +77,7 @@ pub async fn execute_edit_action<S: CanvasState>(
     key: KeyEvent,
     state: &mut S,
     ideal_cursor_column: &mut usize,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
     match action {
         "insert_char" => {
             if let KeyCode::Char(c) = key.code {

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

@@ -7,6 +7,7 @@ use crate::state::{
 use crossterm::event::{KeyEvent};
 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.
@@ -22,46 +23,61 @@ pub fn handle_add_table_navigation(
     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_focus = matches!(current_focus,
-        AddTableFocus::ColumnsTable | AddTableFocus::IndexesTable | AddTableFocus::LinksTable
-    );
-    let is_right_pane_general_focus = matches!(current_focus, // Non-canvas elements in right pane
-         AddTableFocus::AddColumnButton | AddTableFocus::SaveButton | 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") => {
             match current_focus {
-                AddTableFocus::InputTableName => new_focus = AddTableFocus::CancelButton, // Wrap top (right pane)
+                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 => { // Left pane navigation
-                    if !navigate_table_up(&mut add_table_state.column_table_state, add_table_state.columns.len()) {
-                        // If at top of columns, potentially wrap to bottom of left pane (LinksTable) or stay? Let's stay for now.
-                        // Or maybe move to AddColumnButton? Let's try moving up from right pane instead.
-                        new_focus = AddTableFocus::AddColumnButton; // Tentative: move focus up from right pane
-                    }
+                // 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;
-                    }
+                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;
-                    }
+                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, // Move up to left pane bottom
+                AddTableFocus::SaveButton => new_focus = AddTableFocus::LinksTable,
                 AddTableFocus::DeleteSelectedButton => new_focus = AddTableFocus::SaveButton,
                 AddTableFocus::CancelButton => new_focus = AddTableFocus::DeleteSelectedButton,
-
             }
         }
         Some("move_down") => {
@@ -69,57 +85,46 @@ pub fn handle_add_table_navigation(
                 AddTableFocus::InputTableName => new_focus = AddTableFocus::InputColumnName,
                 AddTableFocus::InputColumnName => new_focus = AddTableFocus::InputColumnType,
                 AddTableFocus::InputColumnType => new_focus = AddTableFocus::AddColumnButton,
-                AddTableFocus::AddColumnButton => new_focus = AddTableFocus::ColumnsTable, // Move down to left pane top
-                AddTableFocus::ColumnsTable => { // Left pane navigation
-                    if !navigate_table_down(&mut add_table_state.column_table_state, add_table_state.columns.len()) {
-                        new_focus = AddTableFocus::IndexesTable; // Move to next left pane item
-                    }
+                AddTableFocus::AddColumnButton => new_focus = AddTableFocus::ColumnsTable,
+                // 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;
-                    }
+                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 down to right pane bottom
-                    }
+                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::DeleteSelectedButton,
                 AddTableFocus::DeleteSelectedButton => new_focus = AddTableFocus::CancelButton,
-                AddTableFocus::CancelButton => new_focus = AddTableFocus::InputTableName, // Wrap bottom (right pane)
+                AddTableFocus::CancelButton => new_focus = AddTableFocus::InputTableName,
             }
         }
 
         // --- Horizontal Navigation (Left/Right) ---
         Some("next_option") => { // 'l' or Right: Move from Left Pane to Right Pane
-            if is_left_pane_focus {
-                new_focus = match current_focus {
-                    // Map left pane items to corresponding right pane items (approximate vertical alignment)
-                    AddTableFocus::ColumnsTable => AddTableFocus::InputTableName,
-                    AddTableFocus::IndexesTable => AddTableFocus::InputColumnName, // Or AddColumnButton?
-                    AddTableFocus::LinksTable => AddTableFocus::SaveButton,
-                    _ => current_focus, // Should not happen based on is_left_pane_focus
-                };
-            } else if is_right_pane_general_focus || is_canvas_input_focus {
-                 // If already in right pane, maybe wrap Save -> Cancel or stay? Let's handle Save->Cancel only.
-                 if current_focus == AddTableFocus::SaveButton {
-                     new_focus = AddTableFocus::CancelButton;
-                 }
-            }
+            // 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: Move from Right Pane to Left Pane
-            if is_right_pane_general_focus {
-                 new_focus = match current_focus {
-                    // Map right pane items back to left pane items (approximate vertical alignment)
-                    AddTableFocus::InputTableName | AddTableFocus::InputColumnName | AddTableFocus::InputColumnType | AddTableFocus::AddColumnButton => AddTableFocus::ColumnsTable, // Go to top of left pane
-                    AddTableFocus::SaveButton | AddTableFocus::CancelButton => AddTableFocus::LinksTable, // Go to bottom of left pane
-                    _ => current_focus, // Should not happen
-                 };
-            } else if is_left_pane_focus {
-                 // If already in left pane, pressing 'h' could wrap to Cancel button?
-                 new_focus = AddTableFocus::CancelButton; // Wrap left-to-right bottom
-            }
+            // 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 (Keep as vertical cycle) ---
@@ -129,9 +134,10 @@ pub fn handle_add_table_navigation(
                 AddTableFocus::InputColumnName => AddTableFocus::InputColumnType,
                 AddTableFocus::InputColumnType => AddTableFocus::AddColumnButton,
                 AddTableFocus::AddColumnButton => AddTableFocus::ColumnsTable,
-                AddTableFocus::ColumnsTable => AddTableFocus::IndexesTable,
-                AddTableFocus::IndexesTable => AddTableFocus::LinksTable,
-                AddTableFocus::LinksTable => AddTableFocus::SaveButton,
+                // 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
@@ -143,9 +149,10 @@ pub fn handle_add_table_navigation(
                 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::DeleteSelectedButton => AddTableFocus::SaveButton,
                 AddTableFocus::CancelButton => AddTableFocus::DeleteSelectedButton,
@@ -155,6 +162,75 @@ pub fn handle_add_table_navigation(
         // --- 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 => {
                     if let Some(focus_after_add) = handle_add_column_action(add_table_state, command_message) {
                         new_focus = focus_after_add;
@@ -165,28 +241,45 @@ pub fn handle_add_table_navigation(
                     // TODO: Implement logic
                 }
                 AddTableFocus::DeleteSelectedButton => {
-                    *command_message = "Action: Delete selected".to_string();
-                    // TODO: Implement logic
+                    // --- 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
                 }
-                AddTableFocus::ColumnsTable => {
-                     if let Some(index) = add_table_state.column_table_state.selected() {
-                         *command_message = format!("Selected column index {}", index);
-                     } 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);
-                     } 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);
-                     } else { *command_message = "No link selected".to_string(); }
-                 }
                 _ => { // Input fields
                     *command_message = format!("Select on {:?}", current_focus);
                     handled = false; // Let main loop handle edit mode toggle maybe
@@ -207,32 +300,19 @@ pub fn handle_add_table_navigation(
     // Update focus state if it changed and was handled
     if handled && current_focus != new_focus {
         add_table_state.current_focus = new_focus;
-        *command_message = format!("Focus set to {:?}", add_table_state.current_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);
+        }
 
-        // --- THIS IS THE KEY PART ---
         // 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
         );
-        // Set focus_outside_canvas based on whether the new focus is NOT an input field
-        app_state.ui.focus_outside_canvas = !new_is_canvas_input_focus; // <--- Sets the flag correctly
-        // --- END KEY PART ---
-
-
-        // Select first item when focusing a table
-        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));
-            }_ => {}
-        }
+        // 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
@@ -248,14 +328,14 @@ fn navigate_table_up(table_state: &mut TableState, item_count: usize) -> bool {
         Some(index) => {
             if index > 0 {
                 table_state.select(Some(index - 1));
-                true
+                true // Navigation happened
             } else {
                 false // Was at the top
             }
         }
-        None => {
-            table_state.select(Some(item_count - 1)); // Select last item
-            true
+        None => { // No item selected, select the last one
+            table_state.select(Some(item_count - 1));
+            true // Navigation happened (selection set)
         }
     }
 }
@@ -269,14 +349,14 @@ fn navigate_table_down(table_state: &mut TableState, item_count: usize) -> bool
         Some(index) => {
             if index < item_count - 1 {
                 table_state.select(Some(index + 1));
-                true
+                true // Navigation happened
             } else {
                 false // Was at the bottom
             }
         }
-        None => {
-             table_state.select(Some(0)); // Select first item
-             true
+        None => { // No item selected, select the first one
+             table_state.select(Some(0));
+             true // Navigation happened (selection set)
         }
     }
 }

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

@@ -5,7 +5,7 @@ use crate::state::{
     app::state::AppState,
     pages::admin::{AdminFocus, AdminState},
 };
-use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+use crossterm::event::KeyEvent;
 use crate::state::app::buffer::AppView;
 use crate::state::app::buffer::BufferState;
 use crate::state::pages::add_table::AddTableState;

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

@@ -3,7 +3,7 @@ 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;
+use anyhow::Result;
 
 // 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.
@@ -74,7 +74,7 @@ pub async fn execute_action(
     ideal_cursor_column: &mut usize,
     key_sequence_tracker: &mut KeySequenceTracker,
     command_message: &mut String, // Keep for potential messages
-) -> Result<String, Box<dyn Error>> {
+) -> Result<String> {
     // Use the CanvasState trait methods implemented for AddTableState
     match action {
         "move_up" => {

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

@@ -3,7 +3,7 @@
 use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::state::pages::canvas_state::CanvasState;
 use crate::state::app::state::AppState;
-use std::error::Error;
+use anyhow::Result;
 
 #[derive(PartialEq)]
 enum CharType {
@@ -19,7 +19,7 @@ pub async fn execute_action<S: CanvasState>(
     ideal_cursor_column: &mut usize,
     key_sequence_tracker: &mut KeySequenceTracker,
     command_message: &mut String,
-) -> Result<String, Box<dyn Error>> {
+) -> Result<String> {
     match action {
         "previous_entry" | "next_entry" => {
             key_sequence_tracker.reset();
@@ -252,28 +252,6 @@ fn find_next_word_start(text: &str, current_pos: usize) -> usize {
     pos
 }
 
-fn find_next_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-
-    let next_start = find_next_word_start(text, current_pos);
-
-    if next_start >= chars.len() {
-        return chars.len().saturating_sub(1);
-    }
-
-    let mut pos = next_start;
-    let word_type = get_char_type(chars[pos]);
-
-    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
-        pos += 1;
-    }
-
-    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
-}
-
 fn find_word_end(text: &str, current_pos: usize) -> usize {
     let chars: Vec<char> = text.chars().collect();
     let len = chars.len();
@@ -282,8 +260,6 @@ fn find_word_end(text: &str, current_pos: usize) -> usize {
     }
 
     let mut pos = current_pos.min(len - 1);
-    let original_pos = pos;
-
     let current_type = get_char_type(chars[pos]);
     if current_type != CharType::Whitespace {
         while pos < len && get_char_type(chars[pos]) == current_type {

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

@@ -2,7 +2,7 @@
 
 use crate::config::binds::key_sequences::KeySequenceTracker;
 use crate::state::pages::canvas_state::CanvasState;
-use std::error::Error;
+use anyhow::Result;
 
 #[derive(PartialEq)]
 enum CharType {
@@ -17,7 +17,7 @@ pub async fn execute_action<S: CanvasState>(
     ideal_cursor_column: &mut usize,
     key_sequence_tracker: &mut KeySequenceTracker,
     command_message: &mut String,
-) -> Result<String, Box<dyn Error>> {
+) -> Result<String> {
     match action {
         "previous_entry" | "next_entry" => {
             key_sequence_tracker.reset();
@@ -238,28 +238,6 @@ fn find_next_word_start(text: &str, current_pos: usize) -> usize {
     pos
 }
 
-fn find_next_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-
-    let next_start = find_next_word_start(text, current_pos);
-
-    if next_start >= chars.len() {
-        return chars.len().saturating_sub(1);
-    }
-
-    let mut pos = next_start;
-    let word_type = get_char_type(chars[pos]);
-
-    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
-        pos += 1;
-    }
-
-    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
-}
-
 fn find_word_end(text: &str, current_pos: usize) -> usize {
     let chars: Vec<char> = text.chars().collect();
     let len = chars.len();
@@ -268,8 +246,6 @@ fn find_word_end(text: &str, current_pos: usize) -> usize {
     }
 
     let mut pos = current_pos.min(len - 1);
-    let original_pos = pos;
-
     let current_type = get_char_type(chars[pos]);
     if current_type != CharType::Whitespace {
         while pos < len && get_char_type(chars[pos]) == current_type {

client/src/main.rs

@@ -1,10 +1,10 @@
 // client/src/main.rs
 use client::run_ui;
 use dotenvy::dotenv;
-use std::error::Error;
+use anyhow::Result;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<()> {
     dotenv().ok();
     run_ui().await
 }

client/src/modes/canvas/common_mode.rs

@@ -7,10 +7,11 @@ use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
 use crate::modes::handlers::event::EventOutcome;
 use crate::tui::functions::common::form::SaveOutcome;
+use anyhow::{Context, Result};
 use crate::tui::functions::common::{
     form::{save as form_save, revert as form_revert},
     login::{save as login_save, revert as login_revert},
-    register::{save as register_save, revert as register_revert},
+    register::{revert as register_revert},
 };
 
 pub async fn handle_core_action(
@@ -25,14 +26,11 @@ pub async fn handle_core_action(
     app_state: &mut AppState,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+) -> Result<EventOutcome> {
     match action {
         "save" => {
             if app_state.ui.show_login {
-                let message = login_save(auth_state, login_state, auth_client, app_state).await?;
-                Ok(EventOutcome::Ok(message))
-            } else if app_state.ui.show_register {
-                let message = register_save(register_state, auth_client, app_state).await?;
+                let message = login_save(auth_state, login_state, auth_client, app_state).await.context("Login save action failed")?;
                 Ok(EventOutcome::Ok(message))
             } else {
                 let save_outcome = form_save(
@@ -40,7 +38,7 @@ pub async fn handle_core_action(
                     grpc_client,
                     current_position,
                     total_count,
-                ).await?;
+                ).await.context("Register save action failed")?;
                 let message = match save_outcome {
                     SaveOutcome::NoChange => "No changes to save.".to_string(),
                     SaveOutcome::UpdatedExisting => "Entry updated.".to_string(),
@@ -55,9 +53,7 @@ pub async fn handle_core_action(
         },
         "save_and_quit" => {
             let message = if app_state.ui.show_login {
-                login_save(auth_state, login_state, auth_client, app_state).await?
-            } else if app_state.ui.show_register {
-                register_save(register_state, auth_client, app_state).await?
+                login_save(auth_state, login_state, auth_client, app_state).await.context("Login save n quit action failed")?
             } else {
                 let save_outcome = form_save(
                     form_state,
@@ -87,7 +83,7 @@ pub async fn handle_core_action(
                     grpc_client,
                     current_position,
                     total_count,
-                ).await?;
+                ).await.context("Form revert x action failed")?;
                 Ok(EventOutcome::Ok(message))
             }
         },

client/src/modes/canvas/edit.rs

@@ -6,11 +6,12 @@ use crate::state::pages::{
     canvas_state::CanvasState,
 };
 use crate::state::pages::form::FormState;
-use crate::state::pages::add_table::AddTableState; // Added
+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; // Added
+use crate::functions::modes::edit::add_table_e;
 use crate::state::app::state::AppState;
+use anyhow::Result;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -25,22 +26,19 @@ pub async fn handle_edit_event(
     form_state: &mut FormState,
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
-    add_table_state: &mut AddTableState, // Added
+    add_table_state: &mut AddTableState,
     ideal_cursor_column: &mut usize,
     current_position: &mut u64,
     total_count: u64,
     grpc_client: &mut GrpcClient,
     app_state: &AppState,
-) -> Result<EditEventOutcome, Box<dyn std::error::Error>> {
+) -> Result<EditEventOutcome> {
     // 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,
     ) {
-        // This mode change should likely be handled in event.rs
-        // Returning a message here might prevent the mode switch.
-        // Consider if this check is necessary here.
         return Ok(EditEventOutcome::Message(
             "Command mode entry handled globally.".to_string(),
         ));
@@ -62,7 +60,6 @@ pub async fn handle_edit_event(
                 )
                 .await?
             } else if app_state.ui.show_register {
-                // Keeping this block as requested
                 auth_e::execute_common_action(
                     action,
                     register_state,
@@ -70,14 +67,13 @@ pub async fn handle_edit_event(
                     current_position,
                     total_count,
                 )
-                .await? // Results in String on success
+                .await?
             } else if app_state.ui.show_add_table {
-                // Placeholder - common actions for AddTable might be different
                 format!(
                     "Action '{}' not fully implemented for Add Table view here.",
                     action
                 )
-            } else { // Assuming FormState otherwise
+            } else {
                 let outcome = form_e::execute_common_action(
                     action,
                     form_state,
@@ -103,29 +99,69 @@ pub async fn handle_edit_event(
     if let Some(action) =
         config.get_edit_action_for_key(key.code, key.modifiers)
             .as_deref() {
-        if action == "exit" {
-            // Handle exiting suggestion mode in Register view first
-            if app_state.ui.show_register && register_state.in_suggestion_mode {
-                let msg = auth_e::execute_edit_action(
-                    "exit_suggestion_mode", // Specific action for suggestion exit
+        // 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,
+                )
+                .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,
+                )
+                .await?
+            } else {
+                form_e::execute_edit_action(
+                    effective_action,
+                    key,
+                    form_state,
+                    ideal_cursor_column,
+                )
+                .await?
+            };
+            return Ok(EditEventOutcome::Message(msg));
+        }
+
+        if action == "exit" {
+            if app_state.ui.show_register && register_state.in_suggestion_mode {
+                let msg = auth_e::execute_edit_action(
+                    "exit_suggestion_mode",
                     key,
                     register_state,
                     ideal_cursor_column,
-                    grpc_client,
-                    current_position,
-                    total_count,
                 )
                 .await?;
                 return Ok(EditEventOutcome::Message(msg));
             } else {
-                // Signal exit from Edit mode
                 return Ok(EditEventOutcome::ExitEditMode);
             }
         }
 
         // Special handling for role field suggestions (Register view only)
         if app_state.ui.show_register && register_state.current_field() == 4 {
-            // Check if Tab was pressed to *enter* suggestion mode
             if !register_state.in_suggestion_mode
                 && key.code == KeyCode::Tab
                 && key.modifiers == KeyModifiers::NONE
@@ -133,7 +169,7 @@ pub async fn handle_edit_event(
                 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); // Select first suggestion
+                    register_state.selected_suggestion_index = Some(0);
                     return Ok(EditEventOutcome::Message(
                         "Suggestions shown".to_string(),
                     ));
@@ -143,23 +179,17 @@ pub async fn handle_edit_event(
                     ));
                 }
             }
-            // Handle suggestion navigation/selection if already in suggestion mode
             if register_state.in_suggestion_mode
                 && matches!(
                     action,
-                    "suggestion_down"
-                        | "suggestion_up"
-                        | "select_suggestion"
+                    "suggestion_down" | "suggestion_up"
                 )
             {
                 let msg = auth_e::execute_edit_action(
-                    action, // Pass the specific suggestion action
+                    action,
                     key,
                     register_state,
                     ideal_cursor_column,
-                    grpc_client,
-                    current_position,
-                    total_count,
                 )
                 .await?;
                 return Ok(EditEventOutcome::Message(msg));
@@ -173,9 +203,6 @@ pub async fn handle_edit_event(
                 key,
                 login_state,
                 ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
             )
             .await?
         } else if app_state.ui.show_add_table {
@@ -184,7 +211,6 @@ pub async fn handle_edit_event(
                 key,
                 add_table_state,
                 ideal_cursor_column,
-                // Pass other necessary params if add_table_e needs them
             )
             .await?
         } else if app_state.ui.show_register {
@@ -193,21 +219,14 @@ pub async fn handle_edit_event(
                 key,
                 register_state,
                 ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
             )
             .await?
         } else {
-            // Assuming FormState otherwise
             form_e::execute_edit_action(
                 action,
                 key,
                 form_state,
                 ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
             )
             .await?
         };
@@ -215,133 +234,49 @@ pub async fn handle_edit_event(
     }
 
     // --- Character insertion ---
-    if let KeyCode::Char(c) = key.code {
-        // Exit suggestion mode in Register view if a character is typed
-        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 based on the current view
-        let msg = if app_state.ui.show_login {
-            auth_e::execute_edit_action(
-                "insert_char",
-                key, // Pass the key event containing the char
-                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(
-                "insert_char",
-                key,
-                add_table_state,
-                ideal_cursor_column,
-            )
-            .await?
-        } else if app_state.ui.show_register {
-            auth_e::execute_edit_action(
-                "insert_char",
-                key,
-                register_state,
-                ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
-            )
-            .await?
-        } else {
-            // Assuming FormState otherwise
-            form_e::execute_edit_action(
-                "insert_char",
-                key,
-                form_state,
-                ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
-            )
-            .await?
-        };
-        // Update role suggestions after insertion if needed (Register view)
-        if app_state.ui.show_register && register_state.current_field() == 4 {
-             register_state.update_role_suggestions();
-        }
-
-        return Ok(EditEventOutcome::Message(msg));
+    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;
     }
 
-    // --- Handle Backspace/Delete ---
-    if matches!(key.code, KeyCode::Backspace | KeyCode::Delete) {
-        // Exit suggestion mode in Register view
-        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;
-        }
-
-        let action_str = if key.code == KeyCode::Backspace {
-            "delete_char_backward"
-        } else {
-            "delete_char_forward"
-        };
-
-        // Execute delete action based on the current view
-        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,
-            )
+    let msg = if app_state.ui.show_login {
+        auth_e::execute_edit_action(
+            "insert_char",
+            key,
+            login_state,
+            ideal_cursor_column,
+        )
             .await?
-        } else if app_state.ui.show_add_table {
-            add_table_e::execute_edit_action(
-                action_str,
-                key,
-                add_table_state,
-                ideal_cursor_column,
-            )
+    } 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(
-                action_str,
-                key,
-                register_state,
-                ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count,
-            )
+    } else if app_state.ui.show_register {
+        auth_e::execute_edit_action(
+            "insert_char",
+            key,
+            register_state,
+            ideal_cursor_column,
+        )
             .await?
-        } else {
-            // Assuming FormState otherwise
-             form_e::execute_edit_action(
-                action_str,
-                key,
-                form_state,
-                ideal_cursor_column,
-                grpc_client,
-                current_position,
-                total_count
-            ).await?
-        };
-         // Update role suggestions after deletion if needed (Register view)
-        if app_state.ui.show_register && register_state.current_field() == 4 {
-             register_state.update_role_suggestions();
-        }
+    } else {
+        form_e::execute_edit_action(
+            "insert_char",
+            key,
+            form_state,
+            ideal_cursor_column,
+        )
+            .await?
+    };
 
-        return Ok(EditEventOutcome::Message(result_msg));
+    if app_state.ui.show_register && register_state.current_field() == 4 {
+        register_state.update_role_suggestions();
     }
 
-    // Default return if no other handler matched
-    Ok(EditEventOutcome::Message("".to_string()))
+    return Ok(EditEventOutcome::Message(msg));
 }
-

client/src/modes/canvas/read_only.rs

@@ -10,6 +10,7 @@ use crate::state::pages::add_table::AddTableState;
 use crate::state::app::state::AppState;
 use crate::functions::modes::read_only::{auth_ro, form_ro, add_table_ro};
 use crossterm::event::KeyEvent;
+use anyhow::Result;
 
 pub async fn handle_read_only_event(
     app_state: &mut AppState,
@@ -26,7 +27,7 @@ pub async fn handle_read_only_event(
     command_message: &mut String,
     edit_mode_cooldown: &mut bool,
     ideal_cursor_column: &mut usize,
-) -> Result<(bool, String), Box<dyn std::error::Error>> {
+) -> Result<(bool, String)> {
     if config.is_enter_edit_mode_before(key.code, key.modifiers) {
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode".to_string();
@@ -59,10 +60,6 @@ pub async fn handle_read_only_event(
         "previous_entry",
         "next_entry",
     ];
-    // Add context actions specific to register if needed, otherwise reuse login/form ones
-    const CONTEXT_ACTIONS_REGISTER: &[&str] = &[
-        // Add actions like "next_field", "prev_field" if handled differently than general read-only
-    ];
 
     if key.modifiers.is_empty() {
         key_sequence_tracker.add_key(key.code);
@@ -150,7 +147,7 @@ pub async fn handle_read_only_event(
                         key_sequence_tracker,
                         command_message,
                     ).await?
-                } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
+                } else if app_state.ui.show_register {
                     auth_ro::execute_action(
                         action,
                         app_state,
@@ -209,7 +206,7 @@ pub async fn handle_read_only_event(
                     key_sequence_tracker,
                     command_message,
                 ).await?
-            } else if app_state.ui.show_register /* && CONTEXT_ACTIONS_REGISTER.contains(&action) */ { // Handle register general actions
+            } else if app_state.ui.show_register {
                 auth_ro::execute_action(
                     action,
                     app_state,

client/src/modes/common/command_mode.rs

@@ -10,7 +10,7 @@ use crate::tui::terminal::core::TerminalCore;
 use crate::tui::functions::common::form::{save, revert};
 use crate::modes::handlers::event::EventOutcome;
 use crate::tui::functions::common::form::SaveOutcome;
-use std::error::Error;
+use anyhow::Result;
 
 pub async fn handle_command_event(
     key: KeyEvent,
@@ -26,7 +26,7 @@ pub async fn handle_command_event(
     terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<EventOutcome, Box<dyn Error>> {
+) -> Result<EventOutcome> {
     // Exit command mode (via configurable keybinding)
     if config.is_exit_command_mode(key.code, key.modifiers) {
         command_input.clear();
@@ -84,7 +84,7 @@ async fn process_command(
     terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<EventOutcome, Box<dyn Error>> {
+) -> Result<EventOutcome> {
     // Clone the trimmed command to avoid borrow issues
     let command = command_input.trim().to_string();
     if command.is_empty() {

client/src/modes/common/commands.rs

@@ -3,6 +3,7 @@ use crate::tui::terminal::core::TerminalCore;
 use crate::state::app::state::AppState;
 use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState};
 use crate::state::pages::canvas_state::CanvasState;
+use anyhow::Result;
 
 pub struct CommandHandler;
 
@@ -19,7 +20,7 @@ impl CommandHandler {
         form_state: &FormState,
         login_state: &LoginState,
         register_state: &RegisterState,
-    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    ) -> Result<(bool, String)> {
         match action {
             "quit" => self.handle_quit(terminal, app_state, form_state, login_state, register_state).await,
             "force_quit" => self.handle_force_quit(terminal).await,
@@ -35,7 +36,7 @@ impl CommandHandler {
         form_state: &FormState,
         login_state: &LoginState,
         register_state: &RegisterState,
-    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    ) -> Result<(bool, String)> {
         // Use actual unsaved changes state instead of is_saved flag
         let has_unsaved = if app_state.ui.show_login {
             login_state.has_unsaved_changes()
@@ -56,7 +57,7 @@ impl CommandHandler {
     async fn handle_force_quit(
         &self,
         terminal: &mut TerminalCore,
-    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    ) -> Result<(bool, String)> {
         terminal.cleanup()?;
         Ok((true, "Force exiting without saving.".into()))
     }
@@ -64,7 +65,7 @@ impl CommandHandler {
     async fn handle_save_quit(
         &mut self,
         terminal: &mut TerminalCore,
-    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    ) -> Result<(bool, String)> {
         terminal.cleanup()?;
         Ok((true, "State saved. Exiting.".into()))
     }

client/src/modes/general/dialog.rs

@@ -5,11 +5,12 @@ use crate::config::binds::config::Config;
 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;
+use anyhow::Result;
 
 /// Handles key events specifically when a dialog is active.
 /// Returns Some(Result<EventOutcome, Error>) if the event was handled (consumed),
@@ -18,11 +19,11 @@ pub async fn handle_dialog_event(
     event: &Event,
     config: &Config,
     app_state: &mut AppState,
-    auth_state: &mut AuthState,
     login_state: &mut LoginState,
     register_state: &mut RegisterState,
     buffer_state: &mut BufferState,
-) -> Option<Result<EventOutcome, Box<dyn std::error::Error>>> {
+    admin_state: &mut AdminState,
+) -> Option<Result<EventOutcome>> {
     if let Event::Key(key) = event {
         // Always allow Esc to dismiss
         if key.code == KeyCode::Esc {
@@ -114,6 +115,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/general/navigation.rs

@@ -11,6 +11,7 @@ use crate::state::pages::admin::AdminState;
 use crate::state::pages::canvas_state::CanvasState;
 use crate::ui::handlers::context::UiContext;
 use crate::modes::handlers::event::EventOutcome;
+use anyhow::Result;
 
 pub async fn handle_navigation_event(
     key: KeyEvent,
@@ -24,7 +25,7 @@ pub async fn handle_navigation_event(
     command_mode: &mut bool,
     command_input: &mut String,
     command_message: &mut String,
-) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+) -> Result<EventOutcome> {
     if let Some(action) = config.get_general_action(key.code, key.modifiers) {
         match action {
             "move_up" => {

client/src/modes/handlers/event.rs

@@ -7,14 +7,11 @@ use crate::config::binds::config::Config;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::ui::handlers::context::UiContext;
 use crate::functions::common::buffer;
+use anyhow::Result;
 use crate::tui::{
     terminal::core::TerminalCore,
     functions::{
-        common::{
-            form::SaveOutcome,
-            login,
-            register,
-        },
+        common::{form::SaveOutcome, login, register},
     },
     {intro, admin},
 };
@@ -28,7 +25,6 @@ use crate::state::{
         auth::{AuthState, LoginState, RegisterState},
         admin::AdminState,
         canvas_state::CanvasState,
-        add_table::AddTableState,
         form::FormState,
         intro::IntroState,
     },
@@ -37,11 +33,13 @@ use crate::modes::{
     common::{command_mode, commands::CommandHandler},
     handlers::mode_manager::{ModeManager, AppMode},
     canvas::{edit, read_only, common_mode},
-    highlight::highlight,
     general::{navigation, dialog},
 };
 use crate::functions::modes::navigation::{admin_nav, add_table_nav};
 use crate::config::binds::key_sequences::KeySequenceTracker;
+use tokio::sync::mpsc;
+use crate::tui::functions::common::login::LoginResult;
+use crate::tui::functions::common::register::RegisterResult;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EventOutcome {
@@ -61,10 +59,15 @@ pub struct EventHandler {
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
     pub auth_client: AuthClient,
+    pub login_result_sender: mpsc::Sender<LoginResult>,
+    pub register_result_sender: mpsc::Sender<RegisterResult>,
 }
 
 impl EventHandler {
-    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
+    pub async fn new(
+        login_result_sender: mpsc::Sender<LoginResult>,
+        register_result_sender: mpsc::Sender<RegisterResult>,
+    ) -> Result<Self> {
         Ok(EventHandler {
             command_mode: false,
             command_input: String::new(),
@@ -75,6 +78,8 @@ impl EventHandler {
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
             auth_client: AuthClient::new().await?,
+            login_result_sender,
+            register_result_sender,
         })
     }
 
@@ -95,7 +100,7 @@ impl EventHandler {
         app_state: &mut AppState,
         total_count: u64,
         current_position: &mut u64,
-    ) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+    ) -> Result<EventOutcome> {
         let current_mode = ModeManager::derive_mode(app_state, self);
         app_state.update_mode(current_mode);
 
@@ -116,7 +121,13 @@ 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,
+                login_state,
+                register_state,
+                buffer_state,
+                admin_state,
             ).await {
                 return dialog_result;
             }
@@ -178,17 +189,15 @@ impl EventHandler {
                     }
                     // --- Add Table Page Navigation ---
                     if app_state.ui.show_add_table {
-                        if let Some(action) = config.get_general_action(key.code, key.modifiers) {
-                            if add_table_nav::handle_add_table_navigation(
-                                key,
-                                config,
-                                app_state,
-                                &mut admin_state.add_table_state,
-                                &mut self.command_message,
+                        if add_table_nav::handle_add_table_navigation(
+                            key,
+                            config,
+                            app_state,
+                            &mut admin_state.add_table_state,
+                            &mut self.command_message,
 
-                            ) {
-                                return Ok(EventOutcome::Ok(self.command_message.clone()));
-                            }
+                        ) {
+                            return Ok(EventOutcome::Ok(self.command_message.clone()));
                         }
                     }
 
@@ -207,8 +216,7 @@ impl EventHandler {
                     ).await;
                     match nav_outcome {
                         Ok(EventOutcome::ButtonSelected { context, index }) => {
-                            let mut message = String::from("Selected");
-                            match context {
+                            let message = match context {
                                 UiContext::Intro => {
                                     intro::handle_intro_selection(app_state, buffer_state, index);
                                     if app_state.ui.show_admin {
@@ -216,30 +224,36 @@ impl EventHandler {
                                             admin_state.profile_list_state.select(Some(0));
                                         }
                                     }
-                                    message = format!("Intro Option {} selected", index);
+                                    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 => {
+                                            login::initiate_login(login_state, app_state, self.login_result_sender.clone())
+                                        },
                                         1 => login::back_to_main(login_state, app_state, buffer_state).await,
                                         _ => "Invalid Login Option".to_string(),
                                     };
+                                    login_action_message
                                 }
                                 UiContext::Register => {
-                                    message = match index {
-                                        0 => register::save(register_state, &mut self.auth_client, app_state).await?,
+                                    let register_action_message = match index {
+                                        0 => {
+                                            register::initiate_registration(register_state, app_state, self.register_result_sender.clone())
+                                        },
                                         1 => register::back_to_login(register_state, app_state, buffer_state).await,
                                         _ => "Invalid Login Option".to_string(),
                                     };
+                                    register_action_message
                                 }
                                 UiContext::Admin => {
                                     admin::handle_admin_selection(app_state, admin_state);
-                                    message = format!("Admin Option {} selected", index);
+                                    format!("Admin Option {} selected", index)
                                 }
                                 UiContext::Dialog => {
-                                    message = "Internal error: Unexpected dialog state".to_string();
+                                    "Internal error: Unexpected dialog state".to_string()
                                 }
-                            }
+                            }; // Semicolon added here
                             return Ok(EventOutcome::Ok(message));
                         }
                         other => return other,
@@ -481,7 +495,7 @@ impl EventHandler {
                         }
                         Err(e) => {
                             // Handle error from the edit handler
-                            return Err(e);
+                            return Err(e.into());
                         }
                     }
                 }, // End AppMode::Edit

client/src/modes/handlers/mode_manager.rs

@@ -2,8 +2,6 @@
 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 {

client/src/modes/highlight/highlight.rs

@@ -9,8 +9,9 @@ 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
+use crate::modes::read_only;
 use crossterm::event::KeyEvent;
+use anyhow::Result;
 
 /// Handles events when in Highlight mode.
 /// Currently, it mostly delegates to the read_only handler for movement.
@@ -30,7 +31,7 @@ pub async fn handle_highlight_event(
     command_message: &mut String,
     edit_mode_cooldown: &mut bool,
     ideal_cursor_column: &mut usize,
-) -> Result<EventOutcome, Box<dyn std::error::Error>> {
+) -> Result<EventOutcome> {
     // Delegate movement and other actions to the read_only handler
     // The rendering logic will use the highlight_anchor to draw the selection
     let (should_exit, message) = read_only::handle_read_only_event(

client/src/modes/mod.rs

@@ -9,4 +9,3 @@ pub use handlers::*;
 pub use canvas::*;
 pub use general::*;
 pub use common::*;
-pub use highlight::*;

client/src/services/auth.rs

@@ -5,19 +5,22 @@ use common::proto::multieko2::auth::{
     LoginRequest, LoginResponse,
     RegisterRequest, AuthResponse,
 };
+use anyhow::{Context, Result};
 
 pub struct AuthClient {
     client: AuthServiceClient<Channel>,
 }
 
 impl AuthClient {
-    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
-        let client = AuthServiceClient::connect("http://[::1]:50051").await?;
+    pub async fn new() -> Result<Self> {
+        let client = AuthServiceClient::connect("http://[::1]:50051")
+            .await
+            .context("Failed to connect to auth service")?;
         Ok(Self { client })
     }
 
     /// Login user via gRPC.
-    pub async fn login(&mut self, identifier: String, password: String) -> Result<LoginResponse, Box<dyn std::error::Error>> {
+    pub async fn login(&mut self, identifier: String, password: String) -> Result<LoginResponse> {
         let request = tonic::Request::new(LoginRequest { identifier, password });
         let response = self.client.login(request).await?.into_inner();
         Ok(response)
@@ -31,7 +34,7 @@ impl AuthClient {
         password: Option<String>,
         password_confirmation: Option<String>,
         role: Option<String>,
-    ) -> Result<AuthResponse, Box<dyn std::error::Error>> {
+    ) -> Result<AuthResponse> {
         let request = tonic::Request::new(RegisterRequest {
             username,
             email,

client/src/services/grpc_client.rs

@@ -10,6 +10,7 @@ use common::proto::multieko2::table_definition::{
     table_definition_client::TableDefinitionClient,
     ProfileTreeResponse
 };
+use anyhow::Result;
 
 #[derive(Clone)]
 pub struct GrpcClient {
@@ -19,7 +20,7 @@ pub struct GrpcClient {
 }
 
 impl GrpcClient {
-    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
+    pub async fn new() -> Result<Self> {
         let adresar_client = AdresarClient::connect("http://[::1]:50051").await?;
         let table_structure_client = TableStructureServiceClient::connect("http://[::1]:50051").await?;
         let table_definition_client = TableDefinitionClient::connect("http://[::1]:50051").await?;
@@ -31,37 +32,37 @@ impl GrpcClient {
         })
     }
 
-    pub async fn get_adresar_count(&mut self) -> Result<u64, Box<dyn std::error::Error>> {
+    pub async fn get_adresar_count(&mut self) -> Result<u64> {
         let request = tonic::Request::new(Empty::default());
         let response: CountResponse = self.adresar_client.get_adresar_count(request).await?.into_inner();
         Ok(response.count as u64)
     }
 
-    pub async fn get_adresar_by_position(&mut self, position: u64) -> Result<AdresarResponse, Box<dyn std::error::Error>> {
+    pub async fn get_adresar_by_position(&mut self, position: u64) -> Result<AdresarResponse> {
         let request = tonic::Request::new(PositionRequest { position: position as i64 });
         let response: AdresarResponse = self.adresar_client.get_adresar_by_position(request).await?.into_inner();
         Ok(response)
     }
 
-    pub async fn post_adresar(&mut self, request: PostAdresarRequest) -> Result<tonic::Response<AdresarResponse>, Box<dyn std::error::Error>> {
+    pub async fn post_adresar(&mut self, request: PostAdresarRequest) -> Result<tonic::Response<AdresarResponse>> {
         let request = tonic::Request::new(request);
         let response = self.adresar_client.post_adresar(request).await?;
         Ok(response)
     }
 
-    pub async fn put_adresar(&mut self, request: PutAdresarRequest) -> Result<tonic::Response<AdresarResponse>, Box<dyn std::error::Error>> {
+    pub async fn put_adresar(&mut self, request: PutAdresarRequest) -> Result<tonic::Response<AdresarResponse>> {
         let request = tonic::Request::new(request);
         let response = self.adresar_client.put_adresar(request).await?;
         Ok(response)
     }
 
-    pub async fn get_table_structure(&mut self) -> Result<TableStructureResponse, Box<dyn std::error::Error>> {
+    pub async fn get_table_structure(&mut self) -> Result<TableStructureResponse> {
         let request = tonic::Request::new(Empty::default());
         let response = self.table_structure_client.get_adresar_table_structure(request).await?;
         Ok(response.into_inner())
     }
 
-    pub async fn get_profile_tree(&mut self) -> Result<ProfileTreeResponse, Box<dyn std::error::Error>> {
+    pub async fn get_profile_tree(&mut self) -> Result<ProfileTreeResponse> {
         let request = tonic::Request::new(Empty::default());
         let response = self.table_definition_client.get_profile_tree(request).await?;
         Ok(response.into_inner())

client/src/services/ui_service.rs

@@ -4,6 +4,7 @@ use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
 use crate::tui::functions::common::form::SaveOutcome;
 use crate::state::app::state::AppState;
+use anyhow::{Context, Result};
 
 pub struct UiService;
 
@@ -11,9 +12,9 @@ impl UiService {
     pub async fn initialize_app_state(
         grpc_client: &mut GrpcClient,
         app_state: &mut AppState,
-    ) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+    ) -> Result<Vec<String>> {
         // Fetch profile tree
-        let profile_tree = grpc_client.get_profile_tree().await?;
+        let profile_tree = grpc_client.get_profile_tree().await.context("Failed to get profile tree")?;
         app_state.profile_tree = profile_tree;
 
         // Fetch table structure
@@ -32,8 +33,8 @@ impl UiService {
     pub async fn initialize_adresar_count(
         grpc_client: &mut GrpcClient,
         app_state: &mut AppState,
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let total_count = grpc_client.get_adresar_count().await?;
+    ) -> Result<()> {
+        let total_count = grpc_client.get_adresar_count().await.context("Failed to get adresar count")?;
         app_state.update_total_count(total_count);
         app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
         Ok(())
@@ -42,18 +43,18 @@ impl UiService {
     pub async fn update_adresar_count(
         grpc_client: &mut GrpcClient,
         app_state: &mut AppState,
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let total_count = grpc_client.get_adresar_count().await?;
+    ) -> Result<()> {
+        let total_count = grpc_client.get_adresar_count().await.context("Failed to get adresar by position")?;
         app_state.update_total_count(total_count);
         Ok(())
     }
 
     pub async fn load_adresar_by_position(
         grpc_client: &mut GrpcClient,
-        app_state: &mut AppState,
+        _app_state: &mut AppState,
         form_state: &mut FormState,
         position: u64,
-    ) -> Result<String, Box<dyn std::error::Error>> {
+    ) -> Result<String> {
         match grpc_client.get_adresar_by_position(position).await {
             Ok(response) => {
                 // Set the ID properly
@@ -92,8 +93,8 @@ impl UiService {
         save_outcome: SaveOutcome,
         grpc_client: &mut GrpcClient,
         app_state: &mut AppState,
-        form_state: &mut FormState, // Needed to potentially update position/ID
-    ) -> Result<(), Box<dyn std::error::Error>> {
+        form_state: &mut FormState,
+    ) -> Result<()> {
         match save_outcome {
             SaveOutcome::CreatedNew(new_id) => {
                 // A new record was created, update the count!

client/src/state/app/state.rs

@@ -4,6 +4,7 @@ use std::env;
 use common::proto::multieko2::table_definition::ProfileTreeResponse;
 use crate::modes::handlers::mode_manager::AppMode;
 use crate::ui::handlers::context::DialogPurpose;
+use anyhow::Result;
 
 pub struct DialogState {
     pub dialog_show: bool,
@@ -12,6 +13,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 {
@@ -42,7 +44,7 @@ pub struct AppState {
 }
 
 impl AppState {
-    pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn new() -> Result<Self> {
         let current_dir = env::current_dir()?
             .to_string_lossy()
             .to_string();
@@ -86,10 +88,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 +189,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,6 +27,10 @@ pub enum AddTableFocus {
     ColumnsTable,
     IndexesTable,
     LinksTable,
+    // Inside Tables (Scrolling Focus)
+    InsideColumnsTable,
+    InsideIndexesTable,
+    InsideLinksTable,
     // Buttons
     SaveButton,
     DeleteSelectedButton,

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/add_table.rs

@@ -36,6 +36,7 @@ pub fn handle_add_column_action(
             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));
@@ -73,3 +74,27 @@ pub fn handle_add_column_action(
         }
     }
 }
+
+/// 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/form.rs

@@ -3,6 +3,7 @@
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
+use anyhow::Result;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SaveOutcome {
@@ -17,7 +18,7 @@ pub async fn save(
     grpc_client: &mut GrpcClient,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<SaveOutcome, Box<dyn std::error::Error>> { // <-- Return SaveOutcome
+) -> Result<SaveOutcome> { // <-- Return SaveOutcome
     if !form_state.has_unsaved_changes {
         return Ok(SaveOutcome::NoChange); // Early exit if no changes
     }
@@ -78,7 +79,7 @@ pub async fn revert(
     grpc_client: &mut GrpcClient,
     current_position: &mut u64,
     total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
     let is_new = *current_position == total_count + 1;
 
     if is_new {

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

@@ -7,6 +7,18 @@ 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 common::proto::multieko2::auth::LoginResponse;
+use anyhow::{Context, Result};
+use tokio::spawn;
+use tokio::sync::mpsc;
+use tracing::{info, error};
+
+#[derive(Debug)]
+pub enum LoginResult {
+    Success(LoginResponse),
+    Failure(String),
+    ConnectionError(String),
+}
 
 /// Attempts to log the user in using the provided credentials via gRPC.
 /// Updates AuthState and AppState on success or failure.
@@ -15,30 +27,47 @@ pub async fn save(
     login_state: &mut LoginState,
     auth_client: &mut AuthClient,
     app_state: &mut AppState,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
     let identifier = login_state.username.clone();
     let password = login_state.password.clone();
 
+    // --- Client-side validation ---
+    // Prevent login attempt if the identifier field is empty or whitespace.
+    if identifier.trim().is_empty() {
+        let error_message = "Username/Email cannot be empty.".to_string();
+        app_state.show_dialog(
+            "Login Failed",
+            &error_message,
+            vec!["OK".to_string()],
+            DialogPurpose::LoginFailed,
+        );
+        login_state.error_message = Some(error_message.clone());
+        return Err(anyhow::anyhow!(error_message));
+    }
+
     // 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 {
+    match auth_client.login(identifier.clone(), password).await
+        .with_context(|| format!("gRPC login attempt failed for identifier: {}", identifier))
+    {
         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,23 +79,24 @@ pub async fn save(
                 vec!["Menu".to_string(), "Exit".to_string()],
                 DialogPurpose::LoginSuccess,
             );
-
+            login_state.password.clear();
+            login_state.username.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))
+            login_state.username.clear();
+            login_state.password.clear();
+            Err(e)
         }
     }
 }
@@ -74,13 +104,14 @@ pub async fn save(
 /// 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 +126,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 +141,88 @@ pub async fn back_to_main(
 
     "Returned to main menu".to_string()
 }
+
+/// Validates input, shows loading, and spawns the login task.
+pub fn initiate_login(
+    login_state: &LoginState,
+    app_state: &mut AppState,
+    sender: mpsc::Sender<LoginResult>,
+) -> String {
+    let username = login_state.username.clone();
+    let password = login_state.password.clone();
+
+    // 1. Client-side validation
+    if username.trim().is_empty() {
+        app_state.show_dialog(
+            "Login Failed",
+            "Username/Email cannot be empty.",
+            vec!["OK".to_string()],
+            DialogPurpose::LoginFailed,
+        );
+        "Username cannot be empty.".to_string()
+    } else {
+        // 2. Show Loading Dialog
+        app_state.show_loading_dialog("Logging In", "Please wait...");
+
+        // 3. Spawn the login task
+        spawn(async move {
+            let login_outcome = match AuthClient::new().await {
+                Ok(mut auth_client) => {
+                    match auth_client.login(username.clone(), password).await
+                        .with_context(|| format!("Spawned login task failed for identifier: {}", username))
+                    {
+                        Ok(response) => LoginResult::Success(response),
+                        Err(e) => LoginResult::Failure(format!("{}", e)),
+                    }
+                }
+                Err(e) => LoginResult::ConnectionError(format!("Failed to create AuthClient: {}", e)),
+            };
+            // Send result back to the main UI thread
+            if let Err(e) = sender.send(login_outcome).await {
+                error!("Failed to send login result: {}", e);
+            }
+        });
+
+        // 4. Return immediately
+        "Login initiated.".to_string()
+    }
+}
+
+/// Handles the result received from the login task.
+/// Returns true if a redraw is needed.
+pub fn handle_login_result(
+    result: LoginResult,
+    app_state: &mut AppState,
+    auth_state: &mut AuthState,
+    login_state: &mut LoginState,
+) -> bool {
+    match result {
+        LoginResult::Success(response) => {
+            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());
+
+            let success_message = format!(
+                "Login Successful!\n\nUsername: {}\nUser ID: {}\nRole: {}",
+                response.username, response.user_id, response.role
+            );
+            app_state.update_dialog_content(
+                &success_message,
+                vec!["Menu".to_string(), "Exit".to_string()],
+                DialogPurpose::LoginSuccess,
+            );
+            info!(message = %success_message, "Login successful");
+        }
+        LoginResult::Failure(err_msg) | LoginResult::ConnectionError(err_msg) => {
+            app_state.update_dialog_content(&err_msg, vec!["OK".to_string()], DialogPurpose::LoginFailed);
+            login_state.error_message = Some(err_msg.clone());
+            error!(error = %err_msg, "Login failed/connection error");
+        }
+    }
+    login_state.username.clear();
+    login_state.password.clear();
+    login_state.set_has_unsaved_changes(false);
+    login_state.current_cursor_pos = 0;
+    true // Request redraw as dialog content changed
+}

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

@@ -8,108 +8,17 @@ use crate::state::{
 };
 use crate::ui::handlers::context::DialogPurpose;
 use crate::state::app::buffer::{AppView, BufferState};
+use common::proto::multieko2::auth::AuthResponse;
+use anyhow::Context;
+use tokio::spawn;
+use tokio::sync::mpsc;
+use tracing::{info, error};
 
-/// Attempts to register the user using the provided details via gRPC.
-/// Updates RegisterState and AppState on success or failure.
-pub async fn save(
-    register_state: &mut RegisterState,
-    auth_client: &mut AuthClient,
-    app_state: &mut AppState,
-) -> Result<String, Box<dyn std::error::Error>> {
-    let username = register_state.username.clone();
-    let email = register_state.email.clone();
-    // Handle optional passwords: send None if empty, Some(value) otherwise
-    let password = if register_state.password.is_empty() {
-        None
-    } else {
-        Some(register_state.password.clone())
-    };
-    let password_confirmation = if register_state.password_confirmation.is_empty() {
-        None
-    } else {
-        Some(register_state.password_confirmation.clone())
-    };
-    let role = if register_state.role.is_empty() {
-        None
-    } else {
-        Some(register_state.role.clone())
-    };
-
-    // Basic client-side validation (example)
-    if username.is_empty() {
-         app_state.show_dialog(
-            "Registration Failed",
-            "Username cannot be empty.",
-            vec!["OK".to_string()],
-            DialogPurpose::RegisterFailed,
-        );
-        register_state.error_message = Some("Username cannot be empty.".to_string());
-        return Ok("Registration failed: Username cannot be empty.".to_string());
-    }
-    if password.is_some() && password != password_confirmation {
-         app_state.show_dialog(
-            "Registration Failed",
-            "Passwords do not match.",
-            vec!["OK".to_string()],
-            DialogPurpose::RegisterFailed,
-        );
-        register_state.error_message = Some("Passwords do not match.".to_string());
-        return Ok("Registration failed: Passwords do not match.".to_string());
-    }
-
-
-    // Clear previous error/dialog state before attempting
-    register_state.error_message = None;
-    app_state.hide_dialog();
-
-    // Call the gRPC register method
-    match auth_client.register(username, email, password, password_confirmation, role).await {
-        Ok(response) => {
-            // Clear fields on success? Optional, maybe wait for dialog confirmation.
-            // register_state.username.clear();
-            // register_state.email.clear();
-            // register_state.password.clear();
-            // register_state.password_confirmation.clear();
-            register_state.set_has_unsaved_changes(false);
-
-            let success_message = format!(
-                "Registration Successful!\n\n\
-                 User ID: {}\n\
-                 Username: {}\n\
-                 Email: {}\n\
-                 Role: {}",
-                response.id,
-                response.username,
-                response.email,
-                response.role
-            );
-
-            // Show success dialog
-            app_state.show_dialog(
-                "Registration Success",
-                &success_message,
-                vec!["OK".to_string()], // Simple OK for now
-                DialogPurpose::RegisterSuccess,
-            );
-
-            Ok("Registration successful, details shown in dialog.".to_string())
-        }
-        Err(e) => {
-            let error_message = format!("{}", e);
-            register_state.error_message = Some(error_message.clone());
-            register_state.set_has_unsaved_changes(true); // Keep changes on error
-
-            // Show error dialog
-            app_state.show_dialog(
-                "Registration Failed",
-                &error_message,
-                vec!["OK".to_string()],
-                DialogPurpose::RegisterFailed,
-            );
-
-            Ok(format!("Registration failed: {}", error_message))
-        }
-    }
+#[derive(Debug)]
+pub enum RegisterResult {
+    Success(AuthResponse),
+    Failure(String),
+    ConnectionError(String),
 }
 
 /// Clears the registration form fields.
@@ -152,3 +61,89 @@ pub async fn back_to_login(
     "Returned to main menu".to_string()
 }
 
+/// Validates input, shows loading, and spawns the registration task.
+pub fn initiate_registration(
+    register_state: &RegisterState,
+    app_state: &mut AppState,
+    sender: mpsc::Sender<RegisterResult>,
+) -> String {
+    // Clone necessary data
+    let username = register_state.username.clone();
+    let email = register_state.email.clone();
+    let password = register_state.password.clone();
+    let password_confirmation = register_state.password_confirmation.clone();
+    let role = register_state.role.clone();
+
+    // 1. Client-side validation
+    if username.trim().is_empty() {
+        app_state.show_dialog("Registration Failed", "Username cannot be empty.", vec!["OK".to_string()], DialogPurpose::RegisterFailed);
+        "Username cannot be empty.".to_string()
+    } else if !password.is_empty() && password != password_confirmation {
+         app_state.show_dialog("Registration Failed", "Passwords do not match.", vec!["OK".to_string()], DialogPurpose::RegisterFailed);
+         "Passwords do not match.".to_string()
+    } else {
+        // 2. Show Loading Dialog
+        app_state.show_loading_dialog("Registering", "Please wait...");
+
+        // 3. Spawn the registration task
+        spawn(async move {
+            let register_outcome = match AuthClient::new().await {
+                Ok(mut auth_client) => {
+                    // Handle optional fields correctly for the gRPC call
+                    let password_opt = if password.is_empty() { None } else { Some(password) };
+                    let password_conf_opt = if password_confirmation.is_empty() { None } else { Some(password_confirmation) };
+                    let role_opt = if role.is_empty() { None } else { Some(role) };
+
+                    match auth_client.register(username.clone(), email, password_opt, password_conf_opt, role_opt).await
+                        .with_context(|| format!("Spawned register task failed for username: {}", username))
+                    {
+                        Ok(response) => RegisterResult::Success(response),
+                        Err(e) => RegisterResult::Failure(format!("{}", e)),
+                    }
+                }
+                Err(e) => RegisterResult::ConnectionError(format!("Failed to create AuthClient: {}", e)),
+            };
+            // Send result back to the main UI thread
+            if let Err(e) = sender.send(register_outcome).await {
+                 error!("Failed to send registration result: {}", e);
+            }
+        });
+
+        // 4. Return immediately
+        "Registration initiated.".to_string()
+    }
+}
+
+/// Handles the result received from the registration task.
+/// Returns true if a redraw is needed.
+pub fn handle_registration_result(
+    result: RegisterResult,
+    app_state: &mut AppState,
+    register_state: &mut RegisterState,
+) -> bool {
+    match result {
+        RegisterResult::Success(response) => {
+            let success_message = format!(
+                "Registration Successful!\n\nUser ID: {}\nUsername: {}\nEmail: {}\nRole: {}",
+                response.id, response.username, response.email, response.role
+            );
+            app_state.update_dialog_content(
+                &success_message,
+                vec!["OK".to_string()],
+                DialogPurpose::RegisterSuccess,
+            );
+            info!(message = %success_message, "Registration successful");
+        }
+        RegisterResult::Failure(err_msg) | RegisterResult::ConnectionError(err_msg) => {
+            app_state.update_dialog_content(
+                &err_msg,
+                vec!["OK".to_string()],
+                DialogPurpose::RegisterFailed,
+            );
+            register_state.error_message = Some(err_msg.clone());
+            error!(error = %err_msg, "Registration failed/connection error");
+        }
+    }
+    register_state.set_has_unsaved_changes(false); // Clear flag after processing
+    true // Request redraw as dialog content changed
+}

client/src/tui/functions/form.rs

@@ -2,6 +2,7 @@
 use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::canvas_state::CanvasState;
+use anyhow::{anyhow, Result};
 
 pub async fn handle_action(
     action: &str,
@@ -10,7 +11,7 @@ pub async fn handle_action(
     current_position: &mut u64,
     total_count: u64,
     ideal_cursor_column: &mut usize,
-) -> Result<String, Box<dyn std::error::Error>> {
+) -> Result<String> {
             // TODO store unsaved changes without deleting form state values
     // First check for unsaved changes in both cases
     if form_state.has_unsaved_changes() {
@@ -84,6 +85,7 @@ pub async fn handle_action(
                 Ok("Already at last entry".into())
             }
         }
-        _ => Err("Unknown form action".into())
+        _ => Err(anyhow!("Unknown form action: {}", action))
+
     }
 }            

client/src/tui/functions/login.rs

@@ -1,6 +1,8 @@
 // src/tui/functions/login.rs
 
-pub async fn handle_action(action: &str,) -> Result<String, Box<dyn std::error::Error>> {
+use anyhow::{anyhow, Result};
+
+pub async fn handle_action(action: &str,) -> Result<String> {
     match action {
         "previous_entry" => {
             Ok("Previous entry at tui/functions/login.rs not implemented".into())
@@ -8,6 +10,6 @@ pub async fn handle_action(action: &str,) -> Result<String, Box<dyn std::error::
         "next_entry" => {
             Ok("Next entry at tui/functions/login.rs not implemented".into())
         }
-        _ => Err("Unknown login action".into())
+        _ => Err(anyhow!("Unknown login action: {}", action))
     }
 }

client/src/tui/terminal/core.rs

@@ -7,13 +7,14 @@ use crossterm::{
 };
 use ratatui::{backend::CrosstermBackend, Terminal};
 use std::io::{self, stdout, Write};
+use anyhow::Result;
 
 pub struct TerminalCore {
     terminal: Terminal<CrosstermBackend<io::Stdout>>,
 }
 
 impl TerminalCore {
-    pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn new() -> Result<Self> {
         enable_raw_mode()?;
         let mut stdout = stdout();
         execute!(
@@ -27,7 +28,7 @@ impl TerminalCore {
         Ok(Self { terminal })
     }
 
-    pub fn draw<F>(&mut self, f: F) -> Result<(), Box<dyn std::error::Error>>
+    pub fn draw<F>(&mut self, f: F) -> Result<()>
     where
         F: FnOnce(&mut ratatui::Frame),
     {
@@ -35,7 +36,7 @@ impl TerminalCore {
         Ok(())
     }
 
-    pub fn cleanup(&mut self) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn cleanup(&mut self) -> Result<()> {
         let backend = self.terminal.backend_mut();
         execute!(
             backend,
@@ -56,7 +57,7 @@ impl TerminalCore {
     pub fn set_cursor_style(
         &mut self,
         style: SetCursorStyle,
-    ) -> Result<(), Box<dyn std::error::Error>> {
+    ) -> Result<()> {
         execute!(
             self.terminal.backend_mut(),
             style,
@@ -65,7 +66,7 @@ impl TerminalCore {
         Ok(())
     }
 
-    pub fn show_cursor(&mut self) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn show_cursor(&mut self) -> Result<()> {
         execute!(
             self.terminal.backend_mut(),
             Show
@@ -73,7 +74,7 @@ impl TerminalCore {
         Ok(())
     }
 
-    pub fn hide_cursor(&mut self) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn hide_cursor(&mut self) -> Result<()> {
         execute!(
             self.terminal.backend_mut(),
             Hide

client/src/tui/terminal/event_reader.rs

@@ -1,6 +1,7 @@
 // src/tui/terminal/event_reader.rs
 
 use crossterm::event::{self, Event};
+use anyhow::Result;
 
 pub struct EventReader;
 
@@ -9,7 +10,7 @@ impl EventReader {
         Self
     }
 
-    pub fn read_event(&self) -> Result<Event, Box<dyn std::error::Error>> {
+    pub fn read_event(&self) -> Result<Event> {
         Ok(event::read()?)
     }
 }

client/src/ui/docs/ui_redraws.md

@@ -0,0 +1,34 @@
+# UI Redraw Logic (`needs_redraw` Flag)
+
+## Problem
+
+The main UI loop in `client/src/ui/handlers/ui.rs` uses `crossterm_event::poll` with a short timeout to remain responsive to both user input and asynchronous operations (like login results arriving via channels). However, calling `terminal.draw()` unconditionally in every loop iteration caused constant UI refreshes and high CPU usage, even when idle.
+
+## Solution
+
+A boolean flag, `needs_redraw`, was introduced in the main loop scope to control when the UI is actually redrawn.
+
+## Mechanism
+
+1.  **Initialization:** `needs_redraw` is initialized to `true` before the loop starts to ensure the initial UI state is drawn.
+2.  **Conditional Drawing:** The `terminal.draw(...)` call is wrapped in an `if needs_redraw { ... }` block.
+3.  **Flag Reset:** Immediately after a successful `terminal.draw(...)` call, `needs_redraw` is set back to `false`.
+4.  **Triggering Redraws:** The `needs_redraw` flag is explicitly set to `true` only when a redraw is actually required.
+
+## When `needs_redraw` Must Be Set to `true`
+
+To ensure the UI stays up-to-date without unnecessary refreshes, `needs_redraw = true;` **must** be set in the following situations:
+
+1.  **After Handling User Input:** When `crossterm_event::poll` returns `true`, indicating a keyboard/mouse event was received and processed by `event_handler.handle_event`.
+2.  **During Active Loading States:** If an asynchronous operation is in progress and a visual indicator (like a loading dialog) is active (e.g., checking `if app_state.ui.dialog.is_loading`). This keeps the loading state visible while waiting for the result.
+3.  **After Processing Async Results:** When the result of an asynchronous operation (e.g., received from an `mpsc::channel` like `login_result_receiver`) is processed and the application state is updated (e.g., dialog content changed, data updated).
+4.  **After Internal State Changes:** If any logic *outside* the direct event handling block modifies state that needs to be visually reflected (e.g., the position change logic loading new data into the form).
+
+## Rationale
+
+This approach balances UI responsiveness for asynchronous tasks and user input with CPU efficiency by avoiding redraws when the application state is static.
+
+## Maintenance Note
+
+When adding new asynchronous operations or internal logic that modifies UI-relevant state outside the main event handler, developers **must remember** to set `needs_redraw = true` at the appropriate point after the state change to ensure the UI updates correctly. Failure to do so can result in a stale UI.
+

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

@@ -17,20 +17,35 @@ 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::tui::terminal::{EventReader, TerminalCore};
 use crate::ui::handlers::render::render_ui;
+use crate::tui::functions::common::login::LoginResult;
+use crate::tui::functions::common::register::RegisterResult;
+use crate::tui::functions::common::login;
+use crate::tui::functions::common::register;
 use std::time::Instant;
+use anyhow::{Context, Result};
 use crossterm::cursor::SetCursorStyle;
+use crossterm::event as crossterm_event;
+use tracing::error;
+use tokio::sync::mpsc;
 
-pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
-    let config = Config::load()?;
+pub async fn run_ui() -> Result<()> {
+    let config = Config::load().context("Failed to load configuration")?;
     let theme = Theme::from_str(&config.colors.theme);
-    let mut terminal = TerminalCore::new()?;
+    let mut terminal = TerminalCore::new().context("Failed to initialize terminal")?;
     let mut grpc_client = GrpcClient::new().await?;
     let mut command_handler = CommandHandler::new();
 
-    let mut event_handler = EventHandler::new().await?;
+    // --- Channel for Login Results ---
+    let (login_result_sender, mut login_result_receiver) =
+        mpsc::channel::<LoginResult>(1);
+    let (register_result_sender, mut register_result_receiver) =
+        mpsc::channel::<RegisterResult>(1);
+    let mut event_handler = EventHandler::new(
+        login_result_sender.clone(),
+        register_result_sender.clone(),
+    ).await.context("Failed to create event handler")?;
     let event_reader = EventReader::new();
 
     let mut auth_state = AuthState::default();
@@ -39,27 +54,24 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let mut intro_state = IntroState::default();
     let mut admin_state = AdminState::default();
     let mut buffer_state = BufferState::default();
-    let mut app_state = AppState::new()?;
+    let mut app_state = AppState::new().context("Failed to create initial app state")?;
 
     // Initialize app state with profile tree and table structure
     let column_names =
         UiService::initialize_app_state(&mut grpc_client, &mut app_state)
-            .await?;
+            .await.context("Failed to initialize app state from UI service")?;
     let mut form_state = FormState::new(column_names);
 
     // Fetch the total count of Adresar entries
-    UiService::initialize_adresar_count(&mut grpc_client, &mut app_state)
-        .await?;
+    UiService::initialize_adresar_count(&mut grpc_client, &mut app_state).await?;
     form_state.reset_to_empty();
 
     // --- FPS Calculation State ---
     let mut last_frame_time = Instant::now();
     let mut current_fps = 0.0;
+    let mut needs_redraw = true;
 
     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,102 +99,132 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         }
         // --- End Synchronization ---
 
-        terminal.draw(|f| {
-            render_ui(
-                f,
-                &mut form_state,
-                &mut auth_state,
-                &login_state,
-                &register_state,
-                &intro_state,
-                &mut admin_state,
-                &buffer_state,
-                &theme,
-                is_edit_mode,
-                &event_handler.highlight_state,
-                app_state.total_count,
-                app_state.current_position,
-                &app_state.current_dir,
-                &event_handler.command_input,
-                event_handler.command_mode,
-                &event_handler.command_message,
-                current_fps,
-                &app_state,
-            );
-        })?;
+        // --- 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.
+        if needs_redraw { 
+            terminal.draw(|f| {
+                render_ui(
+                    f,
+                    &mut form_state,
+                    &mut auth_state,
+                    &login_state,
+                    &register_state,
+                    &intro_state,
+                    &mut admin_state,
+                    &buffer_state,
+                    &theme,
+                    event_handler.is_edit_mode, // Use event_handler's state
+                    &event_handler.highlight_state,
+                    app_state.total_count,
+                    app_state.current_position,
+                    &app_state.current_dir,
+                    &event_handler.command_input,
+                    event_handler.command_mode,
+                    &event_handler.command_message,
+                    current_fps,
+                    &app_state,
+                );
+            }).context("Terminal draw call failed")?;
+            needs_redraw = false;
+        }
 
         // --- 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)?;
-                }
-                terminal.show_cursor()?;
+                if !app_state.ui.focus_outside_canvas { terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?; }
+                else { terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?; }
+                terminal.show_cursor().context("Failed to show cursor in ReadOnly mode")?;
             }
             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().context("Failed to show cursor in Command mode")?; }
         }
         // --- End Cursor Visibility Logic ---
 
-        let total_count = app_state.total_count; // Keep track for save logic
+        let total_count = app_state.total_count;
         let mut current_position = app_state.current_position;
         let position_before_event = current_position;
+        // --- Determine if redraw is needed based on active login ---
+        // Always redraw if the loading dialog is currently showing.
+        if app_state.ui.dialog.is_loading {
+            needs_redraw = true;
+        }
 
-        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(1))? {
+            let event = event_reader.read_event().context("Failed to read terminal 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;
+            needs_redraw = true;
+        }
 
         // Update position based on handler's modification
+        // This happens *after* the event is handled
         app_state.current_position = current_position;
 
+        // --- Check for Login Results from Channel ---
+        match login_result_receiver.try_recv() {
+            Ok(result) => {
+                if login::handle_login_result(result, &mut app_state, &mut auth_state, &mut login_state) {
+                    needs_redraw = true;
+                }
+            }
+            Err(mpsc::error::TryRecvError::Empty) => { /* No message waiting */ }
+            Err(mpsc::error::TryRecvError::Disconnected) => {
+                error!("Login result channel disconnected unexpectedly.");
+                // Optionally show an error dialog here
+            }
+        }
+
+        // --- Check for Register Results from Channel ---
+        match register_result_receiver.try_recv() {
+            Ok(result) => {
+                if register::handle_registration_result(result, &mut app_state, &mut register_state) {
+                    needs_redraw = true;
+                }
+            }
+            Err(mpsc::error::TryRecvError::Empty) => { /* No message waiting */ }
+            Err(mpsc::error::TryRecvError::Disconnected) => {
+                error!("Register result channel disconnected unexpectedly.");
+            }
+        }
+
         // --- 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 +233,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 +241,27 @@ 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)
+        let mut position_logic_needs_redraw = false;
         if app_state.ui.show_form {
             if position_changed && !event_handler.is_edit_mode {
                 let current_input = form_state.get_current_input();
@@ -235,6 +272,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 };
                 form_state.current_cursor_pos =
                     event_handler.ideal_cursor_column.min(max_cursor_pos);
+                position_logic_needs_redraw = true;
 
                 // Ensure position never exceeds total_count + 1
                 if app_state.current_position > current_total_count + 1 {
@@ -255,7 +293,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                         &mut form_state,
                         current_position_to_load,
                     )
-                    .await?;
+                    .await.with_context(|| format!("Failed to load adresar by position: {}", current_position_to_load))?;
 
                     let current_input = form_state.get_current_input();
                     let max_cursor_pos = if !event_handler.is_edit_mode
@@ -295,7 +333,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 +343,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 +353,13 @@ 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);
             }
         }
+        if position_logic_needs_redraw {
+            needs_redraw = true;
+        }
+        // --- 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 +370,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
 }