split config in modes/canvas is fixed and working properly well

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,12 +1,10 @@
 // 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::state::AppState;
 use crate::services::grpc_client::GrpcClient;
-
-use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
+use crate::tui::functions::common::form::{save, revert};
 
 /// Main handler for common core actions
 pub async fn handle_core_action(
@@ -53,127 +51,6 @@ pub async fn handle_core_action(
             ).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::{
-    canvas::{common},
-};
+use crate::tui::functions::common::form::{save, revert};
 
 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,7 @@ use crate::tui::terminal::{
     core::TerminalCore,
 };
 use crate::services::grpc_client::GrpcClient;
-use crate::tui::controls::commands::CommandHandler;
+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;

client/src/services/auth.rs

@@ -1,5 +1,4 @@
-// src/services/login.rs
-
+// src/services/auth.rs
 use tonic::transport::Channel;
 use common::proto::multieko2::auth::{
     auth_service_client::AuthServiceClient,

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,6 @@
+// src/tui/functions/common.rs
+pub mod commands;
+pub mod form;
+
+pub use commands::*;
+pub use form::*;

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/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

@@ -3,8 +3,8 @@
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::ui_service::UiService;  // Add this import
-use crate::tui::controls::CommandHandler;
 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;