compiled

client/src/components/auth/login.rs

@@ -10,8 +10,7 @@ use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
     style::{Style, Modifier, Color},  // Removed unused Color import
     widgets::{Block, BorderType, Borders, Paragraph},
-    Frame,
+    Frame,  // Removed unused Span import
-    text::Line,  // Removed unused Span import
 };
 
 pub fn render_login(

client/src/components/common/dialog.rs

@@ -1,7 +1,7 @@
 // src/components/common/dialog.rs
 use ratatui::{
     layout::{Constraint, Direction, Layout, Rect, Margin},
-    style::{Color, Modifier, Style},
+    style::{Modifier, Style},
     widgets::{Block, BorderType, Borders, Paragraph},
     Frame,
     text::{Text, Line, Span}

client/src/components/form/form.rs

@@ -9,7 +9,6 @@ use crate::config::colors::themes::Theme;
 use crate::state::canvas_state::CanvasState;
 use crate::components::handlers::canvas::render_canvas;
 
-// Original form renderer (keep for backward compatibility)
 pub fn render_form(
     f: &mut Frame,
     area: Rect,

client/src/modes/canvas/common.rs

@@ -1,18 +1,21 @@
 // src/modes/canvas/common.rs
 
-use crate::config::binds::config::Config;
 use crate::tui::terminal::core::TerminalCore;
-use crate::state::pages::form::FormState;
+use crate::state::pages::{form::FormState, auth::AuthState};
 use crate::state::state::AppState;
 use crate::services::grpc_client::GrpcClient;
+use crate::services::auth::AuthClient;
+use crate::tui::functions::common::{
+    form::{save as form_save, revert},
+    login::{save as login_save, cancel}
+};
 
-use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
-
-/// Main handler for common core actions
 pub async fn handle_core_action(
     action: &str,
     form_state: &mut FormState,
+    auth_state: &mut AuthState,
     grpc_client: &mut GrpcClient,
+    auth_client: &mut AuthClient,
     terminal: &mut TerminalCore,
     app_state: &mut AppState,
     current_position: &mut u64,
@@ -20,160 +23,53 @@ pub async fn handle_core_action(
 ) -> Result<(bool, String), Box<dyn std::error::Error>> {
     match action {
         "save" => {
-            let message = save(
+            if app_state.ui.show_login {
-                form_state,
+                let message = login_save(auth_state, auth_client, app_state).await?;
-                grpc_client,
+                Ok((false, message))
-                &mut app_state.ui.is_saved,
+            } else {
-                current_position,
+                let message = form_save(
-                total_count,
+                    form_state,
-            ).await?;
+                    grpc_client,
-            Ok((false, message))
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            }
         },
         "force_quit" => {
             terminal.cleanup()?;
             Ok((true, "Force exiting without saving.".to_string()))
         },
         "save_and_quit" => {
-            let message = save(
+            let message = if app_state.ui.show_login {
-                form_state,
+                login_save(auth_state, auth_client, app_state).await?
-                grpc_client,
+            } else {
-                &mut app_state.ui.is_saved,
+                form_save(
-                current_position,
+                    form_state,
-                total_count,
+                    grpc_client,
-            ).await?;
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                ).await?
+            };
             terminal.cleanup()?;
             Ok((true, format!("{}. Exiting application.", message)))
         },
         "revert" => {
-            let message = revert(
+            if app_state.ui.show_login {
-                form_state,
+                let message = cancel(auth_state, app_state).await;
-                grpc_client,
+                Ok((false, message))
-                current_position,
+            } else {
-                total_count,
+                let message = revert(
-            ).await?;
+                    form_state,
-            Ok((false, message))
+                    grpc_client,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            }
         },
-        // We should never hit this case with proper filtering
         _ => Ok((false, format!("Core action not handled: {}", action))),
     }
 }
-
-/// Helper function to check if a key event should trigger a core action
-pub fn is_core_action(config: &Config, key_code: crossterm::event::KeyCode, modifiers: crossterm::event::KeyModifiers) -> Option<String> {
-    // Check for core application actions (save, quit, etc.)
-    if let Some(action) = config.get_action_for_key_in_mode(
-        &config.keybindings.common,
-        key_code,
-        modifiers
-    ) {
-        match action {
-            "save" | "force_quit" | "save_and_quit" | "revert" => {
-                return Some(action.to_string())
-            },
-            _ => {} // Other actions are handled by their respective mode handlers
-        }
-    }
-    None
-}
-
-/// Shared logic for saving the current form state
-pub async fn save(
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    let is_new = *current_position == total_count + 1;
-
-    let message = if is_new {
-        let post_request = PostAdresarRequest {
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let response = grpc_client.post_adresar(post_request).await?;
-        let new_total = grpc_client.get_adresar_count().await?;
-        *current_position = new_total;
-        form_state.id = response.into_inner().id;
-        "New entry created".to_string()
-    } else {
-        let put_request = PutAdresarRequest {
-            id: form_state.id,
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let _ = grpc_client.put_adresar(put_request).await?;
-        "Entry updated".to_string()
-    };
-
-    *is_saved = true;
-    form_state.has_unsaved_changes = false;
-    Ok(message)
-}
-
-/// Discard changes since last save
-pub async fn revert(
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    let is_new = *current_position == total_count + 1;
-
-    if is_new {
-        // Clear all fields for new entries
-        form_state.values.iter_mut().for_each(|v| *v = String::new());
-        form_state.has_unsaved_changes = false;
-        return Ok("New entry cleared".to_string());
-    }
-
-    let data = grpc_client.get_adresar_by_position(*current_position).await?;
-
-    // Update form fields with saved values
-    form_state.values = vec![
-        data.firma,
-        data.kz,
-        data.drc,
-        data.ulica,
-        data.psc,
-        data.mesto,
-        data.stat,
-        data.banka,
-        data.ucet,
-        data.skladm,
-        data.ico,
-        data.kontakt,
-        data.telefon,
-        data.skladu,
-        data.fax,
-    ];
-
-    form_state.has_unsaved_changes = false;
-    Ok("Changes discarded, reloaded last saved version".to_string())
-}

client/src/modes/canvas/edit.rs

@@ -4,9 +4,8 @@
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
-use crate::modes::canvas::common;
 use crate::services::grpc_client::GrpcClient;
-
+use crate::tui::functions::common::form::{save, revert};
 
 pub async fn handle_edit_event_internal(
     key: KeyEvent,
@@ -68,7 +67,7 @@ async fn execute_common_action(
 ) -> Result<String, Box<dyn std::error::Error>> {
     match action {
         "save" => {
-            common::save(
+            save(
                 form_state,
                 grpc_client,
                 is_saved,
@@ -77,7 +76,7 @@ async fn execute_common_action(
             ).await
         },
         "revert" => {
-            common::revert(
+            revert(
                 form_state,
                 grpc_client,
                 current_position,
@@ -178,7 +177,7 @@ async fn execute_edit_action(
 ) -> Result<String, Box<dyn std::error::Error>> {
     match action {
         "save" => {
-            common::save(
+            save(
                 form_state,
                 grpc_client,  // Changed from AppTerminal
                 is_saved,

client/src/modes/canvas/read_only.rs

@@ -1,4 +1,3 @@
-        
 // src/modes/canvas/read_only.rs
 
 use crossterm::event::{KeyEvent};
@@ -187,11 +186,6 @@ async fn execute_action(
             command_message.clear();
             Ok("".to_string())
         }
-        "exit_edit_mode" => {
-            key_sequence_tracker.reset();
-            command_message.clear();
-            Ok("".to_string())
-        }
         "move_left" => {
             let current_pos = form_state.current_cursor_pos;
             form_state.current_cursor_pos = current_pos.saturating_sub(1);

client/src/modes/common/command_mode.rs

@@ -4,11 +4,9 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::tui::controls::commands::CommandHandler;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
-use crate::modes::{
+use crate::tui::functions::common::form::{save, revert};
-    canvas::{common},
-};
 
 pub async fn handle_command_event(
     key: KeyEvent,
@@ -97,7 +95,7 @@ async fn process_command(
             Ok((should_exit, message, true))
         },
         "save" => {
-            let message = common::save(
+            let message = save(
                 form_state,
                 grpc_client,
                 &mut command_handler.is_saved,
@@ -108,7 +106,7 @@ async fn process_command(
             return Ok((false, message, true));
         },
         "revert" => {
-            let message = common::revert(
+            let message = revert(
                 form_state,
                 grpc_client,
                 current_position,

client/src/modes/handlers/event.rs

@@ -5,7 +5,8 @@ use crate::tui::terminal::{
     core::TerminalCore,
 };
 use crate::services::grpc_client::GrpcClient;
-use crate::tui::controls::commands::CommandHandler;
+use crate::services::auth::AuthClient;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
@@ -27,11 +28,12 @@ pub struct EventHandler {
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
     pub auth_state: AuthState,
+    pub auth_client: AuthClient,
 }
 
 impl EventHandler {
-    pub fn new() -> Self {
+    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
-        EventHandler {
+        Ok(EventHandler {
             command_mode: false,
             command_input: String::new(),
             command_message: String::new(),
@@ -40,7 +42,8 @@ impl EventHandler {
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
             auth_state: AuthState::new(),
-        }
+            auth_client: AuthClient::new().await?,
+        })
     }
 
     pub async fn handle_event(
@@ -131,7 +134,9 @@ impl EventHandler {
                                 return common::handle_core_action(
                                     action,
                                     form_state,
+                                    &mut self.auth_state,
                                     grpc_client,
+                                    &mut self.auth_client,
                                     terminal,
                                     app_state,
                                     current_position,
@@ -191,7 +196,9 @@ impl EventHandler {
                                 return common::handle_core_action(
                                     action,
                                     form_state,
+                                    &mut self.auth_state,
                                     grpc_client,
+                                    &mut self.auth_client,
                                     terminal,
                                     app_state,
                                     current_position,

client/src/services/adresar.rs

@@ -1 +0,0 @@
-// src/services/adresar.rs

client/src/services/auth.rs

@@ -0,0 +1,23 @@
+// src/services/auth.rs
+use tonic::transport::Channel;
+use common::proto::multieko2::auth::{
+    auth_service_client::AuthServiceClient,
+    LoginRequest, LoginResponse
+};
+
+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?;
+        Ok(Self { client })
+    }
+
+    pub async fn login(&mut self, identifier: String, password: String) -> Result<LoginResponse, Box<dyn std::error::Error>> {
+        let request = tonic::Request::new(LoginRequest { identifier, password });
+        let response = self.client.login(request).await?.into_inner();
+        Ok(response)
+    }
+}

client/src/services/grpc_client.rs

@@ -10,17 +10,12 @@ use common::proto::multieko2::table_definition::{
     table_definition_client::TableDefinitionClient,
     ProfileTreeResponse
 };
-use common::proto::multieko2::auth::{
-    auth_service_client::AuthServiceClient,
-    LoginRequest, LoginResponse
-};
 
 #[derive(Clone)]
 pub struct GrpcClient {
     adresar_client: AdresarClient<Channel>,
     table_structure_client: TableStructureServiceClient<Channel>,
     table_definition_client: TableDefinitionClient<Channel>,
-    auth_client: AuthServiceClient<Channel>,
 }
 
 impl GrpcClient {
@@ -28,13 +23,11 @@ impl GrpcClient {
         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?;
-        let auth_client = AuthServiceClient::connect("http://[::1]:50051").await?;
 
         Ok(Self {
             adresar_client,
             table_structure_client,
             table_definition_client,
-            auth_client,
         })
     }
 
@@ -73,10 +66,4 @@ impl GrpcClient {
         let response = self.table_definition_client.get_profile_tree(request).await?;
         Ok(response.into_inner())
     }
-
-    pub async fn login(&mut self, identifier: String, password: String) -> Result<LoginResponse, Box<dyn std::error::Error>> {
-        let request = tonic::Request::new(LoginRequest { identifier, password });
-        let response = self.auth_client.login(request).await?.into_inner();
-        Ok(response)
-    }
 }

client/src/services/mod.rs

@@ -1,13 +1,9 @@
 // services/mod.rs
 
 pub mod grpc_client;
-pub mod adresar;
-pub mod table;
-pub mod profile;
 pub mod auth;
+pub mod ui_service;
 
 pub use grpc_client::*;
-pub use adresar::*;
+pub use ui_service::*;
-pub use table::*;
-pub use profile::*;
 pub use auth::*;

client/src/services/profile.rs

@@ -1 +0,0 @@
-// src/services/profile.rs

client/src/services/table.rs

@@ -1 +0,0 @@
-// src/services/table.rs

client/src/services/ui_service.rs

@@ -0,0 +1,89 @@
+// src/services/ui_service.rs
+
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::form::FormState;
+use crate::state::state::AppState;
+
+pub struct UiService;
+
+impl UiService {
+    pub async fn initialize_app_state(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+    ) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+        // Fetch profile tree
+        let profile_tree = grpc_client.get_profile_tree().await?;
+        app_state.profile_tree = profile_tree;
+
+        // Fetch table structure
+        let table_structure = grpc_client.get_table_structure().await?;
+
+        // Extract the column names from the response
+        let column_names: Vec<String> = table_structure
+            .columns
+            .iter()
+            .map(|col| col.name.clone())
+            .collect();
+
+        Ok(column_names)
+    }
+
+    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?;
+        app_state.update_total_count(total_count);
+        app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
+        Ok(())
+    }
+
+    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?;
+        app_state.update_total_count(total_count);
+        Ok(())
+    }
+
+    pub async fn load_adresar_by_position(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+        form_state: &mut FormState,
+        position: u64,
+    ) -> Result<String, Box<dyn std::error::Error>> {
+        match grpc_client.get_adresar_by_position(position).await {
+            Ok(response) => {
+                // Set the ID properly
+                form_state.id = response.id;
+
+                // Update form values dynamically
+                form_state.values = vec![
+                    response.firma,
+                    response.kz,
+                    response.drc,
+                    response.ulica,
+                    response.psc,
+                    response.mesto,
+                    response.stat,
+                    response.banka,
+                    response.ucet,
+                    response.skladm,
+                    response.ico,
+                    response.kontakt,
+                    response.telefon,
+                    response.skladu,
+                    response.fax,
+                ];
+
+                form_state.has_unsaved_changes = false;
+                Ok(format!("Loaded entry {}", position))
+            }
+            Err(e) => {
+                Ok(format!("Error loading entry: {}", e))
+            }
+        }
+    }
+}
+

client/src/tui/controls.rs

@@ -1,5 +0,0 @@
-// src/tui/controls.rs
-
-pub mod commands;
-
-pub use commands::*;

client/src/tui/functions.rs

@@ -4,7 +4,9 @@ pub mod admin;
 pub mod intro;
 pub mod login;
 pub mod form;
+pub mod common;
 
 pub use admin::*;
 pub use intro::*;
 pub use form::*;
+pub use common::*;

client/src/tui/functions/common.rs

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

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

@@ -0,0 +1,107 @@
+// src/tui/functions/common/form.rs
+
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::form::FormState;
+use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
+
+/// Shared logic for saving the current form state
+pub async fn save(
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    let is_new = *current_position == total_count + 1;
+
+    let message = if is_new {
+        let post_request = PostAdresarRequest {
+            firma: form_state.values[0].clone(),
+            kz: form_state.values[1].clone(),
+            drc: form_state.values[2].clone(),
+            ulica: form_state.values[3].clone(),
+            psc: form_state.values[4].clone(),
+            mesto: form_state.values[5].clone(),
+            stat: form_state.values[6].clone(),
+            banka: form_state.values[7].clone(),
+            ucet: form_state.values[8].clone(),
+            skladm: form_state.values[9].clone(),
+            ico: form_state.values[10].clone(),
+            kontakt: form_state.values[11].clone(),
+            telefon: form_state.values[12].clone(),
+            skladu: form_state.values[13].clone(),
+            fax: form_state.values[14].clone(),
+        };
+        let response = grpc_client.post_adresar(post_request).await?;
+        let new_total = grpc_client.get_adresar_count().await?;
+        *current_position = new_total;
+        form_state.id = response.into_inner().id;
+        "New entry created".to_string()
+    } else {
+        let put_request = PutAdresarRequest {
+            id: form_state.id,
+            firma: form_state.values[0].clone(),
+            kz: form_state.values[1].clone(),
+            drc: form_state.values[2].clone(),
+            ulica: form_state.values[3].clone(),
+            psc: form_state.values[4].clone(),
+            mesto: form_state.values[5].clone(),
+            stat: form_state.values[6].clone(),
+            banka: form_state.values[7].clone(),
+            ucet: form_state.values[8].clone(),
+            skladm: form_state.values[9].clone(),
+            ico: form_state.values[10].clone(),
+            kontakt: form_state.values[11].clone(),
+            telefon: form_state.values[12].clone(),
+            skladu: form_state.values[13].clone(),
+            fax: form_state.values[14].clone(),
+        };
+        let _ = grpc_client.put_adresar(put_request).await?;
+        "Entry updated".to_string()
+    };
+
+    *is_saved = true;
+    form_state.has_unsaved_changes = false;
+    Ok(message)
+}
+
+/// Discard changes since last save
+pub async fn revert(
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    let is_new = *current_position == total_count + 1;
+
+    if is_new {
+        // Clear all fields for new entries
+        form_state.values.iter_mut().for_each(|v| *v = String::new());
+        form_state.has_unsaved_changes = false;
+        return Ok("New entry cleared".to_string());
+    }
+
+    let data = grpc_client.get_adresar_by_position(*current_position).await?;
+
+    // Update form fields with saved values
+    form_state.values = vec![
+        data.firma,
+        data.kz,
+        data.drc,
+        data.ulica,
+        data.psc,
+        data.mesto,
+        data.stat,
+        data.banka,
+        data.ucet,
+        data.skladm,
+        data.ico,
+        data.kontakt,
+        data.telefon,
+        data.skladu,
+        data.fax,
+    ];
+
+    form_state.has_unsaved_changes = false;
+    Ok("Changes discarded, reloaded last saved version".to_string())
+}

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

@@ -0,0 +1,45 @@
+// src/tui/functions/common/login.rs
+use crate::services::auth::AuthClient;
+use crate::state::pages::auth::AuthState;
+use crate::state::state::AppState;
+
+pub async fn save(
+    auth_state: &mut AuthState,
+    auth_client: &mut AuthClient,
+    app_state: &mut AppState,
+) -> Result<String, Box<dyn std::error::Error>> {
+    let identifier = auth_state.username.clone();
+    let password = auth_state.password.clone();
+
+    match auth_client.login(identifier, password).await {
+        Ok(response) => {
+            auth_state.auth_token = Some(response.access_token);
+            auth_state.user_id = Some(response.user_id);
+            auth_state.role = Some(response.role);
+            auth_state.error_message = None;
+            
+            // Update app state to show main interface
+            app_state.ui.show_login = false;
+            app_state.ui.show_form = true;
+            
+            Ok("Login successful!".to_string())
+        }
+        Err(e) => {
+            let error_message = format!("Login failed: {}", e);
+            auth_state.error_message = Some(error_message.clone());
+            Ok(error_message)
+        }
+    }
+}
+
+pub async fn cancel(
+    auth_state: &mut AuthState,
+    app_state: &mut AppState,
+) -> String {
+    auth_state.username.clear();
+    auth_state.password.clear();
+    auth_state.error_message = None;
+    app_state.ui.show_login = false;
+    app_state.ui.show_intro = true;
+    "Login canceled".to_string()
+}

client/src/tui/functions/form.rs

@@ -1,7 +1,6 @@
 // src/tui/functions/form.rs
 use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
-use common::proto::multieko2::adresar::AdresarResponse;
 
 pub async fn handle_action(
     action: &str,

client/src/tui/mod.rs

@@ -1,5 +1,5 @@
 // src/tui/mod.rs
 pub mod terminal;
-pub mod controls;
 pub mod functions;
 
+pub use functions::*;

client/src/ui/handlers/ui.rs

@@ -2,8 +2,10 @@
 
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
-use crate::tui::controls::CommandHandler;
+use crate::services::auth::AuthClient;
+use crate::services::ui_service::UiService;  // Add this import
 use crate::tui::terminal::EventReader;
+use crate::tui::functions::common::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;
@@ -16,6 +18,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
     let mut terminal = TerminalCore::new()?;
     let mut grpc_client = GrpcClient::new().await?;
+    let mut auth_client = AuthClient::new().await?;
     let mut command_handler = CommandHandler::new();
     let theme = Theme::from_str(&config.colors.theme);
     let mut auth_state = AuthState::default();
@@ -23,36 +26,22 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     // Initialize app_state first
     let mut app_state = AppState::new()?;
 
-    // Fetch profile tree and table structure
+    // Initialize app state with profile tree and table structure
-    let profile_tree = grpc_client.get_profile_tree().await?;
+    let column_names = UiService::initialize_app_state(&mut grpc_client, &mut app_state).await?;
-    app_state.profile_tree = profile_tree;
-
-    // Fetch table structure at startup (one-time)
-    let table_structure = grpc_client.get_table_structure().await?;
-
-    // Extract the column names from the response
-    let column_names: Vec<String> = table_structure
-        .columns
-        .iter()
-        .map(|col| col.name.clone())
-        .collect();
 
     // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
     // The rest of your UI initialization remains the same
-    let mut event_handler = EventHandler::new();
+    let mut event_handler = EventHandler::new().await?;
     let event_reader = EventReader::new();
 
     // Fetch the total count of Adresar entries
-    let total_count = grpc_client.get_adresar_count().await?;
+    UiService::initialize_adresar_count(&mut grpc_client, &mut app_state).await?;
-    app_state.update_total_count(total_count);
-    app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
     form_state.reset_to_empty();
 
     loop {
-        let total_count = grpc_client.get_adresar_count().await?;
+        UiService::update_adresar_count(&mut grpc_client, &mut app_state).await?;
-        app_state.update_total_count(total_count);
 
         terminal.draw(|f| {
             render_ui(
@@ -109,44 +98,22 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 form_state.current_field = 0;
             } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
                 // Existing entry - load data
-                match grpc_client.get_adresar_by_position(app_state.current_position).await {
+                let current_position = app_state.current_position;
-                    Ok(response) => {
+                let message = UiService::load_adresar_by_position(
-                        // Set the ID properly
+                    &mut grpc_client,
-                        form_state.id = response.id;
+                    &mut app_state,
+                    &mut form_state,
+                    current_position
+                ).await?;                
 
-                        // Update form values dynamically
+                let current_input = form_state.get_current_input();
-                        form_state.values = vec![
+                let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
-                            response.firma,
+                    current_input.len() - 1  // In readonly mode, limit to last character
-                            response.kz,
+                } else {
-                            response.drc,
+                    current_input.len()
-                            response.ulica,
+                };
-                            response.psc,
+                form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                            response.mesto,
+                event_handler.command_message = message;
-                            response.stat,
-                            response.banka,
-                            response.ucet,
-                            response.skladm,
-                            response.ico,
-                            response.kontakt,
-                            response.telefon,
-                            response.skladu,
-                            response.fax,
-                        ];
-
-                        let current_input = form_state.get_current_input();
-                        let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
-                            current_input.len() - 1  // In readonly mode, limit to last character
-                        } else {
-                            current_input.len()
-                        };
-                        form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                        form_state.has_unsaved_changes = false;
-                        event_handler.command_message = format!("Loaded entry {}", app_state.current_position);
-                    }
-                    Err(e) => {
-                        event_handler.command_message = format!("Error loading entry: {}", e);
-                    }
-                }
             } else {
                 // Invalid position - reset to first entry
                 app_state.current_position = 1;
@@ -159,3 +126,4 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 }
+