Highlight errors on table

Author: replydev

src/interface/app.rs

@@ -11,7 +11,7 @@ use tui::style::{Color, Modifier, Style};
 use tui::terminal::Frame;
 use tui::widgets::{Block, Borders, Cell, Clear, Gauge, Paragraph, Row, Table, Wrap};
 
-use crate::interface::table::{fill_table, StatefulTable};
+use crate::interface::stateful_table::{fill_table, StatefulTable};
 use crate::utils::percentage;
 
 use super::enums::PopupAction;
@@ -20,7 +20,7 @@ use super::popup::centered_rect;
 const LARGE_APPLICATION_WIDTH: u16 = 75;
 
 /// Application result type.
-pub type AppResult<T> = std::result::Result<T, Box<dyn error::Error>>;
+pub type AppResult<T> = Result<T, Box<dyn error::Error>>;
 
 /// Application.
 pub struct App {
@@ -222,14 +222,9 @@ impl App {
             .height(1)
             .bottom_margin(1);
         let rows = self.table.items.iter().map(|item| {
-            let height = item
-                .iter()
-                .map(|content| content.chars().filter(|c| *c == '\n').count())
-                .max()
-                .unwrap_or(0)
-                + 1;
-            let cells = item.iter().map(|c| Cell::from(c.as_str()));
-            Row::new(cells).height(height as u16).bottom_margin(1)
+            Row::new(item.cells())
+                .height(item.height())
+                .bottom_margin(1)
         });
 
         let t = Table::new(rows)

src/interface/handler.rs

@@ -214,7 +214,7 @@ fn delete_selected_code(app: &mut App) -> Result<String, String> {
 fn copy_selected_code_to_clipboard(app: &mut App) -> String {
     match app.table.state.selected() {
         Some(selected) => match app.table.items.get(selected) {
-            Some(element) => match element.get(3) {
+            Some(element) => match element.values.get(3) {
                 Some(otp_code) => {
                     if let Ok(result) = copy_string_to_clipboard(otp_code.to_owned()) {
                         match result {
@@ -261,9 +261,10 @@ fn handle_switch_page(app: &mut App, page: Page) {
 
 fn search_and_select(app: &mut App) {
     // Check for issuer
-    for row in app.table.items.iter().enumerate() {
-        let (index, values) = row;
-        if values
+    for iter in app.table.items.iter().enumerate() {
+        let (index, row) = iter;
+        if row
+            .values
             .get(1)
             .unwrap()
             .to_lowercase()
@@ -274,9 +275,10 @@ fn search_and_select(app: &mut App) {
         }
     }
     // Check for label
-    for row in app.table.items.iter().enumerate() {
-        let (index, values) = row;
-        if values
+    for iter in app.table.items.iter().enumerate() {
+        let (index, row) = iter;
+        if row
+            .values
             .get(2)
             .unwrap()
             .to_lowercase()
@@ -287,9 +289,10 @@ fn search_and_select(app: &mut App) {
         }
     }
     // Check if issuer contains the query
-    for row in app.table.items.iter().enumerate() {
-        let (index, values) = row;
-        if values
+    for iter in app.table.items.iter().enumerate() {
+        let (index, row) = iter;
+        if row
+            .values
             .get(1)
             .unwrap()
             .to_lowercase()
@@ -300,9 +303,10 @@ fn search_and_select(app: &mut App) {
         }
     }
     // Check if label contains the query
-    for row in app.table.items.iter().enumerate() {
-        let (index, values) = row;
-        if values
+    for iter in app.table.items.iter().enumerate() {
+        let (index, row) = iter;
+        if row
+            .values
             .get(2)
             .unwrap()
             .to_lowercase()

src/interface/mod.rs

@@ -3,5 +3,6 @@ mod enums;
 pub mod event;
 pub mod handler;
 mod popup;
-pub mod table;
+mod row;
+pub mod stateful_table;
 pub mod ui;

src/interface/row.rs

@@ -0,0 +1,37 @@
+use tui::style::Color::{Black, Yellow};
+use tui::style::Style;
+use tui::widgets::Cell;
+
+pub(crate) struct Row {
+    pub(crate) values: Vec<String>,
+    has_error: bool,
+}
+
+impl Row {
+    pub(crate) fn new(values: Vec<String>, has_error: bool) -> Self {
+        Row { values, has_error }
+    }
+    pub fn height(&self) -> u16 {
+        (self
+            .values
+            .iter()
+            .map(|content| content.chars().filter(|c| *c == '\n').count())
+            .max()
+            .unwrap_or(0)
+            + 1) as u16
+    }
+
+    pub fn cells(&self) -> Vec<Cell> {
+        self.values
+            .iter()
+            .map(|c| {
+                let style = if self.has_error {
+                    Style::default().bg(Yellow).fg(Black)
+                } else {
+                    Style::default()
+                };
+                Cell::from(c.as_str()).style(style)
+            })
+            .collect()
+    }
+}

src/interface/table.rs renamed to src/interface/stateful_table.rs

@@ -1,10 +1,11 @@
+use crate::interface::row::Row;
 use tui::widgets::TableState;
 
 use crate::otp::{otp_element::OTPElement, otp_type::OTPType};
 
 pub struct StatefulTable {
     pub(crate) state: TableState,
-    pub(crate) items: Vec<Vec<String>>,
+    pub(crate) items: Vec<Row>,
 }
 
 impl StatefulTable {
@@ -66,14 +67,20 @@ pub fn fill_table(table: &mut StatefulTable, elements: &[OTPElement]) {
             },
             _ => element.label.to_owned(),
         };
-        table.items.push(vec![
-            (i + 1).to_string(),
-            element.issuer.to_owned(),
-            label,
-            match element.get_otp_code() {
-                Ok(result) => result,
-                Err(error) => error.to_string(),
-            },
-        ]);
+        let result = element.get_otp_code();
+
+        let error = result.is_err();
+        table.items.push(Row::new(
+            vec![
+                (i + 1).to_string(),
+                element.issuer.to_owned(),
+                label,
+                match result {
+                    Ok(code) => code,
+                    Err(e) => e.to_string(),
+                },
+            ],
+            error,
+        ));
     }
 }