refactor filter into widget

jvanbuel · Dec 9, 2024 · 2560ae4 · 2560ae4
1 parent 6420cb0
commit 2560ae4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 57 deletions.
diff --git a/src/app/model/config.rs b/src/app/model/config.rs
@@ -2,9 +2,9 @@ use crossterm::event::KeyCode;
 use log::debug;
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::style::{Modifier, Styled, Stylize};
+use ratatui::style::{Modifier, Stylize};
 use ratatui::text::Line;
-use ratatui::widgets::{Block, BorderType, Borders, Paragraph, Row, StatefulWidget, Table, Widget};
+use ratatui::widgets::{Block, BorderType, Borders, Row, StatefulWidget, Table, Widget};
 
 use crate::airflow::config::AirflowConfig;
 use crate::app::events::custom::FlowrsEvent;
@@ -122,18 +122,7 @@ impl Widget for &mut ConfigModel {
                 .margin(0)
                 .split(area);
 
-            let filter = self.filter.prefix().clone();
-
-            let paragraph = Paragraph::new(filter.unwrap_or("".to_string()))
-                .block(
-                    Block::default()
-                        .border_type(BorderType::Rounded)
-                        .borders(Borders::ALL)
-                        .title("filter"),
-                )
-                .set_style(DEFAULT_STYLE);
-
-            Widget::render(paragraph, rects[1], buf);
+            self.filter.render(rects[1], buf);
 
             rects
         } else {

diff --git a/src/app/model/dagruns.rs b/src/app/model/dagruns.rs
@@ -1,7 +1,7 @@
 use crossterm::event::KeyCode;
 use log::debug;
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::style::{Modifier, Style, Styled, Stylize};
+use ratatui::style::{Modifier, Style, Stylize};
 use ratatui::text::{Line, Span};
 use ratatui::widgets::{
     Block, BorderType, Borders, Clear, Paragraph, Row, Scrollbar, ScrollbarOrientation,
@@ -308,19 +308,7 @@ impl Widget for &mut DagRunModel {
                 .margin(0)
                 .split(area);
 
-            let filter = self.filter.prefix().clone();
-
-            let paragraph = Paragraph::new(filter.unwrap_or("".to_string()))
-                .block(
-                    Block::default()
-                        .border_type(BorderType::Rounded)
-                        .borders(Borders::ALL)
-                        .title("filter"),
-                )
-                .set_style(DEFAULT_STYLE);
-
-            Widget::render(paragraph, rects[1], buf);
-
+            self.filter.render(rects[1], buf);
             rects
         } else {
             Layout::default()

diff --git a/src/app/model/dags.rs b/src/app/model/dags.rs
@@ -4,9 +4,9 @@ use crossterm::event::KeyCode;
 use log::debug;
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::style::{Color, Modifier, Style, Styled, Stylize};
+use ratatui::style::{Color, Modifier, Style, Stylize};
 use ratatui::text::{Line, Span};
-use ratatui::widgets::{Block, BorderType, Borders, Paragraph, Row, StatefulWidget, Table, Widget};
+use ratatui::widgets::{Block, BorderType, Borders, Row, StatefulWidget, Table, Widget};
 use time::OffsetDateTime;
 
 use crate::airflow::model::dag::Dag;
@@ -186,18 +186,7 @@ impl Widget for &mut DagModel {
                 .margin(0)
                 .split(area);
 
-            let filter = self.filter.prefix().clone();
-
-            let paragraph = Paragraph::new(filter.unwrap_or("".to_string()))
-                .block(
-                    Block::default()
-                        .border_type(BorderType::Rounded)
-                        .borders(Borders::ALL)
-                        .title("filter"),
-                )
-                .set_style(DEFAULT_STYLE);
-
-            Widget::render(paragraph, rects[1], buf);
+            self.filter.render(rects[1], buf);
 
             rects
         } else {

diff --git a/src/app/model/filter.rs b/src/app/model/filter.rs
@@ -1,4 +1,12 @@
 use crossterm::event::{KeyCode, KeyEvent};
+use ratatui::{
+    buffer::Buffer,
+    layout::Rect,
+    style::Styled,
+    widgets::{Block, BorderType, Borders, Paragraph, Widget},
+};
+
+use crate::ui::constants::DEFAULT_STYLE;
 
 pub struct Filter {
     pub enabled: bool,
@@ -58,3 +66,20 @@ impl Default for Filter {
         Self::new()
     }
 }
+
+impl Widget for &Filter {
+    fn render(self, area: Rect, buf: &mut Buffer) {
+        let filter = self.prefix().clone();
+
+        let paragraph = Paragraph::new(filter.unwrap_or("".to_string()))
+            .block(
+                Block::default()
+                    .border_type(BorderType::Rounded)
+                    .borders(Borders::ALL)
+                    .title("filter"),
+            )
+            .set_style(DEFAULT_STYLE);
+
+        Widget::render(paragraph, area, buf);
+    }
+}
diff --git a/src/app/model/taskinstances.rs b/src/app/model/taskinstances.rs
@@ -6,9 +6,9 @@ use crossterm::event::KeyCode;
 use log::debug;
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::style::{Modifier, Style, Styled, Stylize};
+use ratatui::style::{Modifier, Style, Stylize};
 use ratatui::text::Line;
-use ratatui::widgets::{Block, BorderType, Borders, Paragraph, Row, StatefulWidget, Table, Widget};
+use ratatui::widgets::{Block, BorderType, Borders, Row, StatefulWidget, Table, Widget};
 use time::format_description;
 
 use crate::airflow::model::taskinstance::TaskInstance;
@@ -251,19 +251,7 @@ impl Widget for &mut TaskInstanceModel {
                 .margin(0)
                 .split(area);
 
-            let filter = self.filter.prefix().clone();
-
-            let paragraph = Paragraph::new(filter.unwrap_or("".to_string()))
-                .block(
-                    Block::default()
-                        .border_type(BorderType::Rounded)
-                        .borders(Borders::ALL)
-                        .title("filter"),
-                )
-                .set_style(DEFAULT_STYLE);
-
-            Widget::render(paragraph, rects[1], buffer);
-
+            self.filter.render(rects[1], buffer);
             rects
         } else {
             Layout::default()