text area working now perfectly well
This commit is contained in:
filipriec
@@ -1,4 +1,4 @@
|
||||
// client/src/functions/modes/navigation/add_logic_nav.rs
|
||||
// src/functions/modes/navigation/add_logic_nav.rs
|
||||
use crate::config::binds::config::Config;
|
||||
use crate::state::{
|
||||
app::state::AppState,
|
||||
@@ -6,17 +6,19 @@ use crate::state::{
|
||||
app::buffer::AppView,
|
||||
app::buffer::BufferState,
|
||||
};
|
||||
use crate::state::pages::canvas_state::CanvasState;
|
||||
use crossterm::event::{KeyEvent};
|
||||
// Now that client/Cargo.toml uses crossterm 0.28.1,
|
||||
// this KeyEvent will match what ratatui and tui-textarea expect.
|
||||
use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
|
||||
use crate::services::GrpcClient;
|
||||
use tokio::sync::mpsc;
|
||||
use anyhow::Result;
|
||||
use common::proto::multieko2::table_script::{PostTableScriptRequest};
|
||||
use common::proto::multieko2::table_script::PostTableScriptRequest;
|
||||
use tui_textarea::Input as TextAreaInput; // Import with an alias
|
||||
|
||||
pub type SaveLogicResultSender = mpsc::Sender<Result<String>>;
|
||||
|
||||
pub fn handle_add_logic_navigation(
|
||||
key: KeyEvent,
|
||||
key_event: KeyEvent, // This is crossterm::event::KeyEvent v0.28.1
|
||||
config: &Config,
|
||||
app_state: &mut AppState,
|
||||
add_logic_state: &mut AddLogicState,
|
||||
@@ -26,250 +28,180 @@ pub fn handle_add_logic_navigation(
|
||||
save_logic_sender: SaveLogicResultSender,
|
||||
command_message: &mut String,
|
||||
) -> bool {
|
||||
let action = config.get_general_action(key.code, key.modifiers).map(String::from);
|
||||
let action = config.get_general_action(key_event.code, key_event.modifiers).map(String::from);
|
||||
let mut handled = false;
|
||||
|
||||
// Check if focus is on canvas input fields
|
||||
let focus_on_canvas_inputs = matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription
|
||||
);
|
||||
if add_logic_state.current_focus == AddLogicFocus::InputScriptContent {
|
||||
// Add explicit type annotation for .into()
|
||||
let textarea_input: TextAreaInput = key_event.into();
|
||||
|
||||
// Handle script content editing separately (multiline)
|
||||
if *is_edit_mode && add_logic_state.current_focus == AddLogicFocus::InputScriptContent {
|
||||
match key.code {
|
||||
crossterm::event::KeyCode::Char(c) => {
|
||||
add_logic_state.script_content_input.push(c);
|
||||
add_logic_state.has_unsaved_changes = true;
|
||||
handled = true;
|
||||
if *is_edit_mode {
|
||||
if key_event.code == KeyCode::Esc && key_event.modifiers == KeyModifiers::NONE {
|
||||
*is_edit_mode = false;
|
||||
*command_message = "Exited script edit mode. Press Ctrl+E/Enter to re-enter.".to_string();
|
||||
return true;
|
||||
}
|
||||
crossterm::event::KeyCode::Enter => {
|
||||
add_logic_state.script_content_input.push('\n');
|
||||
|
||||
let changed = add_logic_state.script_content_editor.borrow_mut().input(textarea_input);
|
||||
if changed {
|
||||
add_logic_state.has_unsaved_changes = true;
|
||||
add_logic_state.script_content_scroll.0 = add_logic_state.script_content_scroll.0.saturating_add(1);
|
||||
handled = true;
|
||||
}
|
||||
crossterm::event::KeyCode::Backspace => {
|
||||
if !add_logic_state.script_content_input.is_empty() {
|
||||
add_logic_state.script_content_input.pop();
|
||||
add_logic_state.has_unsaved_changes = true;
|
||||
handled = true;
|
||||
} else {
|
||||
match key_event.code {
|
||||
KeyCode::Enter if key_event.modifiers == KeyModifiers::NONE => {
|
||||
*is_edit_mode = true;
|
||||
*command_message = "Entered script edit mode.".to_string();
|
||||
handled = true;
|
||||
}
|
||||
KeyCode::Up | KeyCode::Down | KeyCode::PageUp | KeyCode::PageDown |
|
||||
KeyCode::Left | KeyCode::Right | KeyCode::Home | KeyCode::End => {
|
||||
let changed = add_logic_state.script_content_editor.borrow_mut().input(textarea_input);
|
||||
if changed {
|
||||
add_logic_state.has_unsaved_changes = true;
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
KeyCode::Esc if key_event.modifiers == KeyModifiers::NONE => {
|
||||
add_logic_state.current_focus = AddLogicFocus::InputDescription;
|
||||
app_state.ui.focus_outside_canvas = false;
|
||||
*command_message = "Script content unfocused.".to_string();
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription);
|
||||
handled = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
if handled { return true; }
|
||||
}
|
||||
|
||||
// ... (rest of the function remains the same)
|
||||
match action.as_deref() {
|
||||
Some("exit_view") | Some("cancel_action") => {
|
||||
buffer_state.update_history(AppView::Admin);
|
||||
app_state.ui.show_add_logic = false;
|
||||
*command_message = "Exited Add Logic".to_string();
|
||||
handled = true;
|
||||
}
|
||||
Some("next_field") => {
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::SaveButton,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::CancelButton,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::InputLogicName,
|
||||
};
|
||||
if previous_focus == AddLogicFocus::InputScriptContent &&
|
||||
add_logic_state.current_focus != AddLogicFocus::InputScriptContent {
|
||||
*is_edit_mode = false;
|
||||
}
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription);
|
||||
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent
|
||||
);
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
handled = true;
|
||||
}
|
||||
Some("prev_field") => {
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::CancelButton,
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputLogicName,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::SaveButton,
|
||||
};
|
||||
if previous_focus == AddLogicFocus::InputScriptContent &&
|
||||
add_logic_state.current_focus != AddLogicFocus::InputScriptContent {
|
||||
*is_edit_mode = false;
|
||||
}
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription);
|
||||
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent
|
||||
);
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
handled = true;
|
||||
}
|
||||
Some("select") => {
|
||||
match add_logic_state.current_focus {
|
||||
AddLogicFocus::SaveButton => {
|
||||
if let Some(table_def_id) = add_logic_state.selected_table_id {
|
||||
let script_lines = add_logic_state.script_content_editor.borrow().lines().to_vec();
|
||||
let script_content = script_lines.join("\n");
|
||||
|
||||
if add_logic_state.target_column_input.trim().is_empty() {
|
||||
*command_message = "Cannot save: Target Column cannot be empty.".to_string();
|
||||
} else if script_content.trim().is_empty() {
|
||||
*command_message = "Cannot save: Script Content cannot be empty.".to_string();
|
||||
} else {
|
||||
*command_message = "Saving logic script...".to_string();
|
||||
app_state.show_loading_dialog("Saving Script", "Please wait...");
|
||||
|
||||
let request = PostTableScriptRequest {
|
||||
table_definition_id: table_def_id,
|
||||
target_column: add_logic_state.target_column_input.trim().to_string(),
|
||||
script: script_content.trim().to_string(),
|
||||
description: add_logic_state.description_input.trim().to_string(),
|
||||
};
|
||||
let mut client_clone = grpc_client.clone();
|
||||
let sender_clone = save_logic_sender.clone();
|
||||
tokio::spawn(async move {
|
||||
let result = client_clone.post_table_script(request).await
|
||||
.map(|res| format!("Script saved with ID: {}", res.id))
|
||||
.map_err(|e| anyhow::anyhow!("gRPC call failed: {}", e));
|
||||
if sender_clone.send(result).await.is_err() {
|
||||
// Log error or handle if receiver dropped
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
*command_message = "Cannot save: Table Definition ID is missing.".to_string();
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
AddLogicFocus::CancelButton => {
|
||||
buffer_state.update_history(AppView::Admin);
|
||||
app_state.ui.show_add_logic = false;
|
||||
*command_message = "Cancelled Add Logic".to_string();
|
||||
handled = true;
|
||||
}
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription => {
|
||||
*is_edit_mode = !*is_edit_mode;
|
||||
*command_message = format!("Field edit mode: {}", if *is_edit_mode { "ON" } else { "OFF" });
|
||||
handled = true;
|
||||
}
|
||||
AddLogicFocus::InputScriptContent => {
|
||||
if !*is_edit_mode {
|
||||
*is_edit_mode = true;
|
||||
*command_message = "Entered script edit mode.".to_string();
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
if !handled {
|
||||
match action.as_deref() {
|
||||
Some("exit_view") | Some("cancel_action") => {
|
||||
buffer_state.update_history(AppView::Admin); // Fixed: was AdminPanel
|
||||
app_state.ui.focus_outside_canvas = true;
|
||||
*command_message = "Exited Add Logic".to_string();
|
||||
handled = true;
|
||||
}
|
||||
Some("next_field") => {
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::SaveButton,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::CancelButton,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::InputLogicName,
|
||||
};
|
||||
|
||||
// Update canvas field index only when moving between canvas inputs
|
||||
if matches!(previous_focus, AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn) {
|
||||
if matches!(add_logic_state.current_focus, AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription) {
|
||||
let new_field = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputTargetColumn => 1,
|
||||
AddLogicFocus::InputDescription => 2,
|
||||
_ => 0,
|
||||
};
|
||||
add_logic_state.set_current_field(new_field);
|
||||
}
|
||||
Some("toggle_edit_mode") => {
|
||||
match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent => {
|
||||
*is_edit_mode = !*is_edit_mode;
|
||||
*command_message = format!("Edit mode: {}", if *is_edit_mode { "ON" } else { "OFF" });
|
||||
}
|
||||
|
||||
// Update focus outside canvas flag
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription
|
||||
);
|
||||
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn |
|
||||
AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent);
|
||||
handled = true;
|
||||
}
|
||||
Some("prev_field") => {
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::CancelButton,
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputLogicName,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::SaveButton,
|
||||
};
|
||||
|
||||
// Update canvas field index only when moving between canvas inputs
|
||||
if matches!(previous_focus, AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription) {
|
||||
if matches!(add_logic_state.current_focus, AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn) {
|
||||
let new_field = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => 0,
|
||||
AddLogicFocus::InputTargetColumn => 1,
|
||||
_ => 0,
|
||||
};
|
||||
add_logic_state.set_current_field(new_field);
|
||||
}
|
||||
}
|
||||
|
||||
// Update focus outside canvas flag
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription
|
||||
);
|
||||
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn |
|
||||
AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent);
|
||||
handled = true;
|
||||
}
|
||||
Some("next_option") => { // Horizontal next
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::SaveButton,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::CancelButton,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::InputLogicName, // Cycle back
|
||||
};
|
||||
// Update canvas field index if moving within canvas inputs
|
||||
if matches!(add_logic_state.current_focus, AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription) {
|
||||
let new_field = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => 0,
|
||||
AddLogicFocus::InputTargetColumn => 1,
|
||||
AddLogicFocus::InputDescription => 2,
|
||||
_ => add_logic_state.current_field(), // Should not happen
|
||||
};
|
||||
add_logic_state.set_current_field(new_field);
|
||||
}
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription
|
||||
);
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn |
|
||||
AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent);
|
||||
handled = true;
|
||||
}
|
||||
Some("previous_option") => { // Horizontal previous
|
||||
let previous_focus = add_logic_state.current_focus;
|
||||
add_logic_state.current_focus = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => AddLogicFocus::CancelButton, // Cycle back
|
||||
AddLogicFocus::InputTargetColumn => AddLogicFocus::InputLogicName,
|
||||
AddLogicFocus::InputDescription => AddLogicFocus::InputTargetColumn,
|
||||
AddLogicFocus::InputScriptContent => AddLogicFocus::InputDescription,
|
||||
AddLogicFocus::SaveButton => AddLogicFocus::InputScriptContent,
|
||||
AddLogicFocus::CancelButton => AddLogicFocus::SaveButton,
|
||||
};
|
||||
// Update canvas field index if moving within canvas inputs
|
||||
if matches!(add_logic_state.current_focus, AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription) {
|
||||
let new_field = match add_logic_state.current_focus {
|
||||
AddLogicFocus::InputLogicName => 0,
|
||||
AddLogicFocus::InputTargetColumn => 1,
|
||||
AddLogicFocus::InputDescription => 2,
|
||||
_ => add_logic_state.current_field(), // Should not happen
|
||||
};
|
||||
add_logic_state.set_current_field(new_field);
|
||||
}
|
||||
app_state.ui.focus_outside_canvas = !matches!(
|
||||
add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription
|
||||
);
|
||||
*command_message = format!("Focus: {:?}", add_logic_state.current_focus);
|
||||
*is_edit_mode = matches!(add_logic_state.current_focus,
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn |
|
||||
AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent);
|
||||
handled = true;
|
||||
}
|
||||
Some("select") => {
|
||||
match add_logic_state.current_focus {
|
||||
AddLogicFocus::SaveButton => {
|
||||
if let Some(table_def_id) = add_logic_state.selected_table_id {
|
||||
if add_logic_state.target_column_input.trim().is_empty() {
|
||||
*command_message = "Cannot save: Target Column cannot be empty.".to_string();
|
||||
} else if add_logic_state.script_content_input.trim().is_empty() {
|
||||
*command_message = "Cannot save: Script Content cannot be empty.".to_string();
|
||||
} else {
|
||||
*command_message = "Saving logic script...".to_string();
|
||||
app_state.show_loading_dialog("Saving Script", "Please wait...");
|
||||
|
||||
let request = PostTableScriptRequest {
|
||||
table_definition_id: table_def_id,
|
||||
target_column: add_logic_state.target_column_input.trim().to_string(),
|
||||
script: add_logic_state.script_content_input.trim().to_string(),
|
||||
description: add_logic_state.description_input.trim().to_string(),
|
||||
};
|
||||
|
||||
let mut client_clone = grpc_client.clone();
|
||||
let sender_clone = save_logic_sender.clone();
|
||||
|
||||
tokio::spawn(async move {
|
||||
let result = client_clone.post_table_script(request).await
|
||||
.map(|res| format!("Script saved with ID: {}", res.id))
|
||||
.map_err(|e| anyhow::anyhow!("gRPC call failed: {}", e));
|
||||
let _ = sender_clone.send(result).await;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
*command_message = "Cannot save: Table Definition ID is missing.".to_string();
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
AddLogicFocus::CancelButton => {
|
||||
buffer_state.update_history(AppView::Admin); // Fixed: was AdminPanel
|
||||
app_state.ui.focus_outside_canvas = true;
|
||||
*command_message = "Cancelled Add Logic".to_string();
|
||||
handled = true;
|
||||
}
|
||||
AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn |
|
||||
AddLogicFocus::InputDescription | AddLogicFocus::InputScriptContent => {
|
||||
if !*is_edit_mode {
|
||||
*is_edit_mode = true;
|
||||
*command_message = "Edit mode: ON".to_string();
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
_ => {
|
||||
*command_message = "Cannot toggle edit mode here.".to_string();
|
||||
}
|
||||
}
|
||||
Some("toggle_edit_mode") => {
|
||||
*is_edit_mode = !*is_edit_mode;
|
||||
*command_message = format!("Edit mode: {}", if *is_edit_mode { "ON" } else { "OFF" });
|
||||
handled = true;
|
||||
}
|
||||
// Handle script content scrolling when not in edit mode
|
||||
_ if !*is_edit_mode && add_logic_state.current_focus == AddLogicFocus::InputScriptContent => {
|
||||
match action.as_deref() {
|
||||
Some("move_up") => {
|
||||
add_logic_state.script_content_scroll.0 = add_logic_state.script_content_scroll.0.saturating_sub(1);
|
||||
handled = true;
|
||||
}
|
||||
Some("move_down") => {
|
||||
add_logic_state.script_content_scroll.0 = add_logic_state.script_content_scroll.0.saturating_add(1);
|
||||
handled = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
handled = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
handled
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user