filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working fetch of the columns properly well, but the rest doesnt

Browse Source
This commit is contained in:
filipriec
2025-02-21 12:27:51 +01:00
parent e52e287c32
commit 6112fa0b0c
6 changed files with 164 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/adresar/handlers/get_table_structure.rs
View File

@@ -8,12 +8,6 @@ pub async fn get_table_structure(
_request: Empty, _request: Empty,
) -> Result<TableStructureResponse, Status> { ) -> Result<TableStructureResponse, Status> {
let columns = vec![ let columns = vec![
TableColumn {
name: "id".to_string(),
data_type: "BIGSERIAL".to_string(),
is_nullable: false,
is_primary_key: true,
},
TableColumn { TableColumn {
name: "firma".to_string(), name: "firma".to_string(),
data_type: "TEXT".to_string(), data_type: "TEXT".to_string(),

12
src/client/terminal.rs
View File

@@ -123,4 +123,16 @@ impl AppTerminal {
let response = self.grpc_client.put_adresar(request).await?; let response = self.grpc_client.put_adresar(request).await?;
Ok(response) Ok(response)
} }
/// Fetch the table structure once at startup.
///
/// TODO: In the future, refactor to subscribe to changes rather than one-time fetch.
pub async fn get_table_structure(
&mut self,
) -> Result<crate::proto::multieko2::TableStructureResponse, Box<dyn std::error::Error>> {
// Note: Adjust the request according to your proto definitions.
let request = tonic::Request::new(crate::proto::multieko2::Empty::default());
let response = self.grpc_client.get_table_structure(request).await?;
Ok(response.into_inner())
}
} }

161
src/client/ui/handlers/event.rs
View File

@@ -1,4 +1,5 @@
// src/client/ui/handlers/event.rs // src/client/ui/handlers/event.rs
use crossterm::event::{Event, KeyCode, KeyModifiers}; use crossterm::event::{Event, KeyCode, KeyModifiers};
use crossterm::cursor::{SetCursorStyle}; use crossterm::cursor::{SetCursorStyle};
use crate::client::terminal::AppTerminal; use crate::client::terminal::AppTerminal;
@@ -66,23 +67,24 @@ impl EventHandler {
*current_position = new_position; *current_position = new_position;
match app_terminal.get_adresar_by_position(*current_position).await { match app_terminal.get_adresar_by_position(*current_position).await {
Ok(response) => { Ok(response) => {
// Update all form fields // Update all form fields dynamically
form_state.id = response.id; form_state.values = vec![
form_state.firma = response.firma; response.firma,
form_state.kz = response.kz; response.kz,
form_state.drc = response.drc; response.drc,
form_state.ulica = response.ulica; response.ulica,
form_state.psc = response.psc; response.psc,
form_state.mesto = response.mesto; response.mesto,
form_state.stat = response.stat; response.stat,
form_state.banka = response.banka; response.banka,
form_state.ucet = response.ucet; response.ucet,
form_state.skladm = response.skladm; response.skladm,
form_state.ico = response.ico; response.ico,
form_state.kontakt = response.kontakt; response.kontakt,
form_state.telefon = response.telefon; response.telefon,
form_state.skladu = response.skladu; response.skladu,
form_state.fax = response.fax; response.fax,
];
let current_input = form_state.get_current_input(); let current_input = form_state.get_current_input();
form_state.current_cursor_pos = self.ideal_cursor_column.min(current_input.len()); form_state.current_cursor_pos = self.ideal_cursor_column.min(current_input.len());
@@ -102,23 +104,24 @@ impl EventHandler {
if *current_position <= total_count { if *current_position <= total_count {
match app_terminal.get_adresar_by_position(*current_position).await { match app_terminal.get_adresar_by_position(*current_position).await {
Ok(response) => { Ok(response) => {
// Update all form fields // Update all form fields dynamically
form_state.id = response.id; form_state.values = vec![
form_state.firma = response.firma; response.firma,
form_state.kz = response.kz; response.kz,
form_state.drc = response.drc; response.drc,
form_state.ulica = response.ulica; response.ulica,
form_state.psc = response.psc; response.psc,
form_state.mesto = response.mesto; response.mesto,
form_state.stat = response.stat; response.stat,
form_state.banka = response.banka; response.banka,
form_state.ucet = response.ucet; response.ucet,
form_state.skladm = response.skladm; response.skladm,
form_state.ico = response.ico; response.ico,
form_state.kontakt = response.kontakt; response.kontakt,
form_state.telefon = response.telefon; response.telefon,
form_state.skladu = response.skladu; response.skladu,
form_state.fax = response.fax; response.fax,
];
let current_input = form_state.get_current_input(); let current_input = form_state.get_current_input();
form_state.current_cursor_pos = self.ideal_cursor_column.min(current_input.len()); form_state.current_cursor_pos = self.ideal_cursor_column.min(current_input.len());
@@ -204,21 +207,21 @@ impl EventHandler {
match key.code { match key.code {
KeyCode::Enter => { KeyCode::Enter => {
let form_data = PostAdresarRequest { let form_data = PostAdresarRequest {
firma: form_state.firma.clone(), firma: form_state.values[0].clone(),
kz: form_state.kz.clone(), kz: form_state.values[1].clone(),
drc: form_state.drc.clone(), drc: form_state.values[2].clone(),
ulica: form_state.ulica.clone(), ulica: form_state.values[3].clone(),
psc: form_state.psc.clone(), psc: form_state.values[4].clone(),
mesto: form_state.mesto.clone(), mesto: form_state.values[5].clone(),
stat: form_state.stat.clone(), stat: form_state.values[6].clone(),
banka: form_state.banka.clone(), banka: form_state.values[7].clone(),
ucet: form_state.ucet.clone(), ucet: form_state.values[8].clone(),
skladm: form_state.skladm.clone(), skladm: form_state.values[9].clone(),
ico: form_state.ico.clone(), ico: form_state.values[10].clone(),
kontakt: form_state.kontakt.clone(), kontakt: form_state.values[11].clone(),
telefon: form_state.telefon.clone(), telefon: form_state.values[12].clone(),
skladu: form_state.skladu.clone(), skladu: form_state.values[13].clone(),
fax: form_state.fax.clone(), fax: form_state.values[14].clone(),
}; };
let command = self.command_input.trim(); let command = self.command_input.trim();
@@ -236,21 +239,21 @@ impl EventHandler {
let message = if is_new { let message = if is_new {
// POST new entry // POST new entry
let post_request = PostAdresarRequest { let post_request = PostAdresarRequest {
firma: form_state.firma.clone(), firma: form_state.values[0].clone(),
kz: form_state.kz.clone(), kz: form_state.values[1].clone(),
drc: form_state.drc.clone(), drc: form_state.values[2].clone(),
ulica: form_state.ulica.clone(), ulica: form_state.values[3].clone(),
psc: form_state.psc.clone(), psc: form_state.values[4].clone(),
mesto: form_state.mesto.clone(), mesto: form_state.values[5].clone(),
stat: form_state.stat.clone(), stat: form_state.values[6].clone(),
banka: form_state.banka.clone(), banka: form_state.values[7].clone(),
ucet: form_state.ucet.clone(), ucet: form_state.values[8].clone(),
skladm: form_state.skladm.clone(), skladm: form_state.values[9].clone(),
ico: form_state.ico.clone(), ico: form_state.values[10].clone(),
kontakt: form_state.kontakt.clone(), kontakt: form_state.values[11].clone(),
telefon: form_state.telefon.clone(), telefon: form_state.values[12].clone(),
skladu: form_state.skladu.clone(), skladu: form_state.values[13].clone(),
fax: form_state.fax.clone(), fax: form_state.values[14].clone(),
}; };
let response = app_terminal.post_adresar(post_request).await?; let response = app_terminal.post_adresar(post_request).await?;
// Update state // Update state
@@ -262,21 +265,21 @@ impl EventHandler {
// PUT existing entry // PUT existing entry
let put_request = PutAdresarRequest { let put_request = PutAdresarRequest {
id: form_state.id, id: form_state.id,
firma: form_state.firma.clone(), firma: form_state.values[0].clone(),
kz: form_state.kz.clone(), kz: form_state.values[1].clone(),
drc: form_state.drc.clone(), drc: form_state.values[2].clone(),
ulica: form_state.ulica.clone(), ulica: form_state.values[3].clone(),
psc: form_state.psc.clone(), psc: form_state.values[4].clone(),
mesto: form_state.mesto.clone(), mesto: form_state.values[5].clone(),
stat: form_state.stat.clone(), stat: form_state.values[6].clone(),
banka: form_state.banka.clone(), banka: form_state.values[7].clone(),
ucet: form_state.ucet.clone(), ucet: form_state.values[8].clone(),
skladm: form_state.skladm.clone(), skladm: form_state.values[9].clone(),
ico: form_state.ico.clone(), ico: form_state.values[10].clone(),
kontakt: form_state.kontakt.clone(), kontakt: form_state.values[11].clone(),
telefon: form_state.telefon.clone(), telefon: form_state.values[12].clone(),
skladu: form_state.skladu.clone(), skladu: form_state.values[13].clone(),
fax: form_state.fax.clone(), fax: form_state.values[14].clone(),
}; };
let response = app_terminal.put_adresar(put_request).await?; let response = app_terminal.put_adresar(put_request).await?;
"Entry updated".to_string() "Entry updated".to_string()

119
src/client/ui/handlers/form.rs
View File

@@ -1,58 +1,33 @@
// src/client/ui/handlers/form.rs // src/client/ui/handlers/form.rs
use crate::client::components1::render_form; use crate::client::components1::render_form;
use crate::client::colors::Theme; use crate::client::colors::Theme;
use ratatui::layout::Rect; use ratatui::layout::Rect;
use ratatui::Frame; use ratatui::Frame;
pub struct FormState { pub struct FormState {
pub id: i64, pub id: i64,
pub firma: String, pub fields: Vec<String>, // Use Vec<String> for dynamic field names
pub kz: String, pub values: Vec<String>, // Store field values dynamically
pub drc: String,
pub ulica: String,
pub psc: String,
pub mesto: String,
pub stat: String,
pub banka: String,
pub ucet: String,
pub skladm: String,
pub ico: String,
pub kontakt: String,
pub telefon: String,
pub skladu: String,
pub fax: String,
pub current_field: usize, pub current_field: usize,
pub fields: Vec<&'static str>,
pub has_unsaved_changes: bool, pub has_unsaved_changes: bool,
pub current_cursor_pos: usize, pub current_cursor_pos: usize,
} }
impl FormState { impl FormState {
pub fn new() -> Self { /// Create a new FormState with dynamic fields.
pub fn new(fields: Vec<String>) -> Self {
let values = vec![String::new(); fields.len()]; // Initialize values for each field
FormState { FormState {
id: 0, id: 0,
firma: String::new(), fields,
kz: String::new(), values,
drc: String::new(),
ulica: String::new(),
psc: String::new(),
mesto: String::new(),
stat: String::new(),
banka: String::new(),
ucet: String::new(),
skladm: String::new(),
ico: String::new(),
kontakt: String::new(),
telefon: String::new(),
skladu: String::new(),
fax: String::new(),
current_field: 0, current_field: 0,
has_unsaved_changes: false, has_unsaved_changes: false,
current_cursor_pos: 0, current_cursor_pos: 0,
fields: vec![
"Firma", "KZ", "DRC", "Ulica", "PSC", "Mesto", "Stat", "Banka",
"Ucet", "Skladm", "ICO", "Kontakt", "Telefon", "Skladu", "Fax",
],
} }
} }
pub fn render( pub fn render(
&self, &self,
f: &mut Frame, f: &mut Frame,
@@ -62,80 +37,40 @@ impl FormState {
total_count: u64, total_count: u64,
current_position: u64, current_position: u64,
) { ) {
// Convert Vec<String> to Vec<&str> for fields
let fields: Vec<&str> = self.fields.iter().map(|s| s.as_str()).collect();
// Convert Vec<String> to Vec<&String> for values
let values: Vec<&String> = self.values.iter().collect();
render_form( render_form(
f, f,
area, area,
self, self,
&self.fields, &fields,
&self.current_field, &self.current_field,
&[ &values,
&self.firma, &self.kz, &self.drc, &self.ulica, &self.psc, &self.mesto, &self.stat, &self.banka,
&self.ucet, &self.skladm, &self.ico, &self.kontakt, &self.telefon, &self.skladu, &self.fax,
],
&theme, &theme,
is_edit_mode, is_edit_mode,
total_count, total_count,
current_position, current_position,
); );
} }
pub fn reset_to_empty(&mut self) { pub fn reset_to_empty(&mut self) {
self.firma.clear(); self.values.iter_mut().for_each(|v| v.clear()); // Clear all values
self.kz.clear();
self.drc.clear();
self.ulica.clear();
self.psc.clear();
self.mesto.clear();
self.stat.clear();
self.banka.clear();
self.ucet.clear();
self.skladm.clear();
self.ico.clear();
self.kontakt.clear();
self.telefon.clear();
self.skladu.clear();
self.fax.clear();
self.has_unsaved_changes = false; self.has_unsaved_changes = false;
} }
pub fn get_current_input(&self) -> &str { pub fn get_current_input(&self) -> &str {
match self.current_field { self.values
0 => &self.firma, .get(self.current_field)
1 => &self.kz, .map(|s| s.as_str())
2 => &self.drc, .unwrap_or("")
3 => &self.ulica,
4 => &self.psc,
5 => &self.mesto,
6 => &self.stat,
7 => &self.banka,
8 => &self.ucet,
9 => &self.skladm,
10 => &self.ico,
11 => &self.kontakt,
12 => &self.telefon,
13 => &self.skladu,
14 => &self.fax,
_ => "",
}
} }
pub fn get_current_input_mut(&mut self) -> &mut String { pub fn get_current_input_mut(&mut self) -> &mut String {
match self.current_field { self.values
0 => &mut self.firma, .get_mut(self.current_field)
1 => &mut self.kz, .expect("Invalid current_field index")
2 => &mut self.drc,
3 => &mut self.ulica,
4 => &mut self.psc,
5 => &mut self.mesto,
6 => &mut self.stat,
7 => &mut self.banka,
8 => &mut self.ucet,
9 => &mut self.skladm,
10 => &mut self.ico,
11 => &mut self.kontakt,
12 => &mut self.telefon,
13 => &mut self.skladu,
14 => &mut self.fax,
_ => &mut self.firma, // Default to first field
}
} }
} }

5
src/client/ui/handlers/render.rs
View File

@@ -37,12 +37,11 @@ pub fn render_ui(
form_state.render(f, main_chunks[0], theme, is_edit_mode, total_count, current_position); form_state.render(f, main_chunks[0], theme, is_edit_mode, total_count, current_position);
// Right panel - Preview Card // Right panel - Preview Card
let preview_values: Vec<&String> = form_state.values.iter().collect();
render_preview_card( render_preview_card(
f, f,
main_chunks[1], main_chunks[1],
&[ &preview_values, // Pass dynamic values as &[&String]
&form_state.firma, &form_state.ulica, &form_state.mesto, &form_state.psc, &form_state.ico, &form_state.kontakt, &form_state.telefon,
],
&theme, &theme,
); );

74
src/client/ui/handlers/ui.rs
View File

@@ -3,26 +3,35 @@
use crate::client::terminal::AppTerminal; use crate::client::terminal::AppTerminal;
use crate::client::colors::Theme; use crate::client::colors::Theme;
use crate::client::config::Config; use crate::client::config::Config;
use crate::client::ui::handlers::{ use crate::client::ui::handlers::{event::EventHandler, form::FormState, state::AppState, render::render_ui};
event::EventHandler,
form::FormState,
state::AppState,
render::render_ui
};
pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> { pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
let config = Config::load()?; let config = Config::load()?;
let mut app_terminal = AppTerminal::new().await?; let mut app_terminal = AppTerminal::new().await?;
let theme = Theme::dark(); let theme = Theme::dark();
let mut form_state = FormState::new(); // Fetch table structure at startup (one-time)
// TODO: Later, consider implementing a live update for table structure changes.
let table_structure = app_terminal.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();
let mut app_state = AppState::new()?; let mut app_state = AppState::new()?;
// Fetch the total count of Adresar entries // Fetch the total count of Adresar entries
let total_count = app_terminal.get_adresar_count().await?; let total_count = app_terminal.get_adresar_count().await?;
app_state.update_total_count(total_count); app_state.update_total_count(total_count);
app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
form_state.reset_to_empty(); form_state.reset_to_empty();
loop { loop {
@@ -72,11 +81,32 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
.await .await
{ {
Ok(response) => { Ok(response) => {
update_form_state_from_response(&mut form_state, response); // 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,
];
let current_input = form_state.get_current_input();
form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(current_input.len());
form_state.has_unsaved_changes = false;
event_handler.command_message = format!("Loaded entry {}", app_state.current_position);
} }
Err(e) => { Err(e) => {
event_handler.command_message = event_handler.command_message = format!("Error loading entry: {}", e);
format!("Error loading entry: {}", e);
} }
} }
} else { } else {
@@ -91,25 +121,3 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
} }
} }
} }
// Helper function to update form state from gRPC response
fn update_form_state_from_response(form_state: &mut FormState, response: crate::proto::multieko2::AdresarResponse) {
form_state.firma = response.firma;
form_state.kz = response.kz;
form_state.drc = response.drc;
form_state.ulica = response.ulica;
form_state.psc = response.psc;
form_state.mesto = response.mesto;
form_state.stat = response.stat;
form_state.banka = response.banka;
form_state.ucet = response.ucet;
form_state.skladm = response.skladm;
form_state.ico = response.ico;
form_state.kontakt = response.kontakt;
form_state.telefon = response.telefon;
form_state.skladu = response.skladu;
form_state.fax = response.fax;
form_state.current_field = 0;
form_state.has_unsaved_changes = false;
}