bug fixes, perf

Author: achristmascarl

.config/config.json5

@@ -3,7 +3,6 @@
     "Menu": {
       "<Ctrl-c>": "Quit", 
       "q": "AbortQuery",
-      "r": "LoadMenu",
       "<Alt-1>": "FocusMenu",
       "<Alt-2>": "FocusEditor",
       "<Alt-3>": "FocusData",

src/components/editor.rs

@@ -36,22 +36,13 @@ struct Selection {
 pub struct Editor<'a> {
   command_tx: Option<UnboundedSender<Action>>,
   config: Config,
-  lines: Vec<Vec<char>>,
-  cursor: CursorPosition,
   selection: Option<Selection>,
   textarea: TextArea<'a>,
 }
 
 impl<'a> Editor<'a> {
   pub fn new() -> Self {
-    Editor {
-      command_tx: None,
-      config: Config::default(),
-      cursor: CursorPosition { row: 0, col: 0 },
-      selection: None,
-      lines: vec![vec![]],
-      textarea: TextArea::default(),
-    }
+    Editor { command_tx: None, config: Config::default(), selection: None, textarea: TextArea::default() }
   }
 }
 
@@ -86,8 +77,7 @@ impl<'a> Component for Editor<'a> {
   fn update(&mut self, action: Action, app_state: &AppState) -> Result<Option<Action>> {
     if let Action::MenuSelect(schema, table) = action {
       let query = format!("select * from {}.{} limit 100", schema, table);
-      let chars: Vec<char> = format!("select * from {}.{} limit 100", schema, table).chars().collect();
-      self.lines = vec![chars];
+      self.textarea = TextArea::from(vec![query.clone()]);
       self.command_tx.as_ref().unwrap().send(Action::Query(query))?;
     } else if let Action::SubmitEditorQuery = action {
       if let Some(sender) = &self.command_tx {

src/components/menu.rs

@@ -83,9 +83,19 @@ impl Menu {
     match self.menu_focus {
       MenuFocus::Table => {
         if let Some(i) = self.list_state.selected() {
-          let tables = self.table_map.get_index(self.schema_index).unwrap().1;
-          self.list_state =
-            ListState::default().with_selected(Some(i.saturating_add(1).clamp(0, tables.len().saturating_sub(1))));
+          let tables = self.table_map.get_index(self.schema_index).unwrap().1.to_owned();
+          let filtered_tables: Vec<String> = tables
+            .into_iter()
+            .filter(|t| {
+              if let Some(search) = self.search.as_ref() {
+                t.to_lowercase().contains(search.to_lowercase().trim())
+              } else {
+                true
+              }
+            })
+            .collect();
+          self.list_state = ListState::default()
+            .with_selected(Some(i.saturating_add(1).clamp(0, filtered_tables.len().saturating_sub(1))));
         }
       },
       MenuFocus::Schema => {
@@ -109,8 +119,18 @@ impl Menu {
     match self.menu_focus {
       MenuFocus::Table => {
         if let Some(i) = self.list_state.selected() {
-          let tables = self.table_map.get_index(self.schema_index).unwrap().1;
-          self.list_state = ListState::default().with_selected(Some(tables.len().saturating_sub(1)));
+          let tables = self.table_map.get_index(self.schema_index).unwrap().1.to_owned();
+          let filtered_tables: Vec<String> = tables
+            .into_iter()
+            .filter(|t| {
+              if let Some(search) = self.search.as_ref() {
+                t.to_lowercase().contains(search.to_lowercase().trim())
+              } else {
+                true
+              }
+            })
+            .collect();
+          self.list_state = ListState::default().with_selected(Some(filtered_tables.len().saturating_sub(1)));
         }
       },
       MenuFocus::Schema => {
@@ -214,6 +234,7 @@ impl Component for Menu {
               KeyCode::Char('k') => self.scroll_up(),
               KeyCode::Char('g') => self.scroll_top(),
               KeyCode::Char('G') => self.scroll_bottom(),
+              KeyCode::Char('R') => self.command_tx.as_ref().unwrap().send(Action::LoadMenu)?,
               _ => {},
             }
           }
@@ -223,7 +244,22 @@ impl Component for Menu {
             self.search_focused = false;
           } else if let Some(selected) = self.list_state.selected() {
             let (schema, tables) = self.table_map.get_index(self.schema_index).unwrap();
-            self.command_tx.as_ref().unwrap().send(Action::MenuSelect(schema.clone(), tables[selected].clone()))?;
+            let filtered_tables: Vec<String> = tables
+              .iter()
+              .filter(|t| {
+                if let Some(search) = self.search.as_ref() {
+                  t.to_lowercase().contains(search.to_lowercase().trim())
+                } else {
+                  true
+                }
+              })
+              .cloned()
+              .collect();
+            self
+              .command_tx
+              .as_ref()
+              .unwrap()
+              .send(Action::MenuSelect(schema.clone(), filtered_tables[selected].clone()))?;
           }
         },
         KeyCode::Esc => self.reset_search(),

src/components/scroll_table.rs

@@ -61,7 +61,7 @@ impl<'a> ScrollTable<'a> {
     column_width: u16,
   ) -> &mut Self {
     let requested_width = column_width.saturating_mul(column_count as u16);
-    let max_height = u16::MAX.saturating_div(requested_width);
+    let max_height = u16::MAX.saturating_div(std::cmp::max(1, requested_width));
     self.table = *table;
     self.column_width = column_width;
     self.requested_width = requested_width;

src/tui.rs

@@ -58,7 +58,7 @@ pub struct Tui {
 impl Tui {
   pub fn new() -> Result<Self> {
     let tick_rate = 4.0;
-    let frame_rate = 30.0;
+    let frame_rate = 15.0;
     let terminal = ratatui::Terminal::new(Backend::new(io()))?;
     let (event_tx, event_rx) = mpsc::unbounded_channel();
     let cancellation_token = CancellationToken::new();