Refactored table filtering and searching so that they are now relative to the table being filtered/searched on. Also created two new widgets for error messages and popups to make life easier moving forward. Going to refactor table sorting into StatefulTable's as well so all tables can be searched, filtered, and sorted moving forwards.

src/handlers/radarr_handlers/collections/collections_handler_tests.rs

@@ -19,7 +19,6 @@ mod tests {
   mod test_handle_scroll_up_and_down {
     use rstest::rstest;
 
-    use crate::models::StatefulTable;
     use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
 
     use super::*;
@@ -34,55 +33,11 @@ mod tests {
       title,
       to_string
     );
-
-    #[rstest]
-    fn test_filtered_collections_scroll(
-      #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
-    ) {
-      let mut app = App::default();
-      let mut filtered_collections = StatefulTable::default();
-      filtered_collections.set_items(simple_stateful_iterable_vec!(
-        Collection,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_collections = Some(filtered_collections);
-
-      CollectionsHandler::with(&key, &mut app, &ActiveRadarrBlock::Collections, &None).handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 2"
-      );
-
-      CollectionsHandler::with(&key, &mut app, &ActiveRadarrBlock::Collections, &None).handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 1"
-      );
-    }
   }
 
   mod test_handle_home_end {
     use pretty_assertions::assert_eq;
 
-    use crate::models::StatefulTable;
     use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
 
     use super::*;
@@ -98,63 +53,10 @@ mod tests {
       to_string
     );
 
-    #[test]
-    fn test_filtered_collections_home_end() {
-      let mut app = App::default();
-      let mut filtered_collections = StatefulTable::default();
-      filtered_collections.set_items(extended_stateful_iterable_vec!(
-        Collection,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_collections = Some(filtered_collections);
-
-      CollectionsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
-        &mut app,
-        &ActiveRadarrBlock::Collections,
-        &None,
-      )
-      .handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 3"
-      );
-
-      CollectionsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
-        &mut app,
-        &ActiveRadarrBlock::Collections,
-        &None,
-      )
-      .handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 1"
-      );
-    }
-
     #[test]
     fn test_collection_search_box_home_end_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.collections.search = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.home.key,
@@ -168,6 +70,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .search
           .as_ref()
           .unwrap()
@@ -188,6 +91,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .search
           .as_ref()
           .unwrap()
@@ -200,7 +104,7 @@ mod tests {
     #[test]
     fn test_collection_filter_box_home_end_keys() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.collections.filter = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.home.key,
@@ -214,6 +118,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .filter
           .as_ref()
           .unwrap()
@@ -234,6 +139,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .filter
           .as_ref()
           .unwrap()
@@ -326,7 +232,7 @@ mod tests {
     #[test]
     fn test_collection_search_box_left_right_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.collections.search = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.left.key,
@@ -340,6 +246,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .search
           .as_ref()
           .unwrap()
@@ -360,6 +267,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .search
           .as_ref()
           .unwrap()
@@ -372,7 +280,7 @@ mod tests {
     #[test]
     fn test_collection_filter_box_left_right_keys() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.collections.filter = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.left.key,
@@ -386,6 +294,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .filter
           .as_ref()
           .unwrap()
@@ -406,6 +315,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .collections
           .filter
           .as_ref()
           .unwrap()
@@ -417,7 +327,6 @@ mod tests {
   }
 
   mod test_handle_submit {
-    use crate::models::StatefulTable;
     use pretty_assertions::assert_eq;
 
     use crate::network::radarr_network::RadarrEvent;
@@ -457,7 +366,7 @@ mod tests {
           Collection,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.search = Some("Test 2".into());
+      app.data.radarr_data.collections.search = Some("Test 2".into());
 
       CollectionsHandler::with(
         &SUBMIT_KEY,
@@ -496,7 +405,7 @@ mod tests {
           Collection,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.search = Some("Test 5".into());
+      app.data.radarr_data.collections.search = Some("Test 5".into());
 
       CollectionsHandler::with(
         &SUBMIT_KEY,
@@ -527,13 +436,15 @@ mod tests {
       let mut app = App::default();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
-      let mut filtered_collections = StatefulTable::default();
-      filtered_collections.set_items(extended_stateful_iterable_vec!(
-        Collection,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_collections = Some(filtered_collections);
-      app.data.radarr_data.search = Some("Test 2".into());
+      app
+        .data
+        .radarr_data
+        .collections
+        .set_items(extended_stateful_iterable_vec!(
+          Collection,
+          HorizontallyScrollableText
+        ));
+      app.data.radarr_data.collections.search = Some("Test 2".into());
 
       CollectionsHandler::with(
         &SUBMIT_KEY,
@@ -547,9 +458,7 @@ mod tests {
         app
           .data
           .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
+          .collections
           .current_selection()
           .title
           .text,
@@ -574,7 +483,7 @@ mod tests {
           Collection,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.collections.filter = Some("Test".into());
 
       CollectionsHandler::with(
         &SUBMIT_KEY,
@@ -584,15 +493,16 @@ mod tests {
       )
       .handle();
 
-      assert!(app.data.radarr_data.filtered_collections.is_some());
+      assert!(!app.should_ignore_quit_key);
+      assert!(app.data.radarr_data.collections.filtered_items.is_some());
       assert_eq!(
         app
           .data
           .radarr_data
-          .filtered_collections
+          .collections
+          .filtered_items
           .as_ref()
           .unwrap()
-          .items
           .len(),
         3
       );
@@ -600,9 +510,7 @@ mod tests {
         app
           .data
           .radarr_data
-          .filtered_collections
-          .as_ref()
-          .unwrap()
+          .collections
           .current_selection()
           .title
           .text,
@@ -627,7 +535,7 @@ mod tests {
           Collection,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.filter = Some("Test 5".into());
+      app.data.radarr_data.collections.filter = Some("Test 5".into());
 
       CollectionsHandler::with(
         &SUBMIT_KEY,
@@ -637,7 +545,8 @@ mod tests {
       )
       .handle();
 
-      assert!(app.data.radarr_data.filtered_collections.is_none());
+      assert!(!app.should_ignore_quit_key);
+      assert!(app.data.radarr_data.collections.filtered_items.is_none());
       assert_eq!(
         app.get_current_route(),
         &ActiveRadarrBlock::FilterCollectionsError.into()
@@ -695,9 +604,10 @@ mod tests {
 
   mod test_handle_esc {
     use pretty_assertions::assert_eq;
+    use ratatui::widgets::TableState;
 
     use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
-    use crate::{assert_filter_reset, assert_search_reset};
+    use crate::models::StatefulTable;
 
     use super::*;
 
@@ -716,6 +626,7 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.collections.search = Some("Test".into());
 
       CollectionsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
@@ -724,7 +635,7 @@ mod tests {
         &ActiveRadarrBlock::Collections.into()
       );
       assert!(!app.should_ignore_quit_key);
-      assert_search_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.collections.search, None);
     }
 
     #[rstest]
@@ -740,6 +651,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.collections = StatefulTable {
+        filter: Some("Test".into()),
+        filtered_items: Some(Vec::new()),
+        filtered_state: Some(TableState::default()),
+        ..StatefulTable::default()
+      };
 
       CollectionsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
@@ -748,7 +665,9 @@ mod tests {
         &ActiveRadarrBlock::Collections.into()
       );
       assert!(!app.should_ignore_quit_key);
-      assert_filter_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.collections.filter, None);
+      assert_eq!(app.data.radarr_data.collections.filtered_items, None);
+      assert_eq!(app.data.radarr_data.collections.filtered_state, None);
     }
 
     #[test]
@@ -780,6 +699,13 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.collections = StatefulTable {
+        search: Some("Test".into()),
+        filter: Some("Test".into()),
+        filtered_items: Some(Vec::new()),
+        filtered_state: Some(TableState::default()),
+        ..StatefulTable::default()
+      };
 
       CollectionsHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::Collections, &None).handle();
 
@@ -788,8 +714,10 @@ mod tests {
         &ActiveRadarrBlock::Collections.into()
       );
       assert!(app.error.text.is_empty());
-      assert_search_reset!(app.data.radarr_data);
-      assert_filter_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.collections.search, None);
+      assert_eq!(app.data.radarr_data.collections.filter, None);
+      assert_eq!(app.data.radarr_data.collections.filtered_items, None);
+      assert_eq!(app.data.radarr_data.collections.filtered_state, None);
     }
   }
 
@@ -805,6 +733,7 @@ mod tests {
       RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS,
     };
 
+    use crate::models::StatefulTable;
     use crate::{assert_refresh_key, test_edit_collection_key};
 
     use super::*;
@@ -825,9 +754,11 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::SearchCollection.into()
       );
-      assert!(app.data.radarr_data.is_searching);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.search.is_some());
+      assert_eq!(
+        app.data.radarr_data.collections.search,
+        Some(HorizontallyScrollableText::default())
+      );
     }
 
     #[test]
@@ -846,9 +777,8 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::FilterCollections.into()
       );
-      assert!(app.data.radarr_data.is_filtering);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.filter.is_some());
+      assert!(app.data.radarr_data.collections.filter.is_some());
     }
 
     #[test]
@@ -857,6 +787,8 @@ mod tests {
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.collections = StatefulTable::default();
+      app.data.radarr_data.collections.filter = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.filter.key,
@@ -870,10 +802,13 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::FilterCollections.into()
       );
-      assert!(app.data.radarr_data.is_filtering);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.filter.is_some());
-      assert!(app.data.radarr_data.filtered_collections.is_none());
+      assert_eq!(
+        app.data.radarr_data.collections.filter,
+        Some(HorizontallyScrollableText::default())
+      );
+      assert!(app.data.radarr_data.collections.filtered_items.is_none());
+      assert!(app.data.radarr_data.collections.filtered_state.is_none());
     }
 
     #[test]
@@ -911,7 +846,7 @@ mod tests {
     #[test]
     fn test_search_collections_box_backspace_key() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.collections.search = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.backspace.key,
@@ -921,13 +856,24 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
+      assert_str_eq!(
+        app
+          .data
+          .radarr_data
+          .collections
+          .search
+          .as_ref()
+          .unwrap()
+          .text,
+        "Tes"
+      );
     }
 
     #[test]
     fn test_filter_collections_box_backspace_key() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.collections = StatefulTable::default();
+      app.data.radarr_data.collections.filter = Some("Test".into());
 
       CollectionsHandler::with(
         &DEFAULT_KEYBINDINGS.backspace.key,
@@ -937,13 +883,23 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "Tes");
+      assert_str_eq!(
+        app
+          .data
+          .radarr_data
+          .collections
+          .filter
+          .as_ref()
+          .unwrap()
+          .text,
+        "Tes"
+      );
     }
 
     #[test]
     fn test_search_collections_box_char_key() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.collections.search = Some(HorizontallyScrollableText::default());
 
       CollectionsHandler::with(
         &Key::Char('h'),
@@ -953,13 +909,24 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
+      assert_str_eq!(
+        app
+          .data
+          .radarr_data
+          .collections
+          .search
+          .as_ref()
+          .unwrap()
+          .text,
+        "h"
+      );
     }
 
     #[test]
     fn test_filter_collections_box_char_key() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.collections = StatefulTable::default();
+      app.data.radarr_data.collections.filter = Some(HorizontallyScrollableText::default());
 
       CollectionsHandler::with(
         &Key::Char('h'),
@@ -969,7 +936,17 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "h");
+      assert_str_eq!(
+        app
+          .data
+          .radarr_data
+          .collections
+          .filter
+          .as_ref()
+          .unwrap()
+          .text,
+        "h"
+      );
     }
   }
 

src/handlers/radarr_handlers/collections/mod.rs

@@ -8,10 +8,9 @@ use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, COLLECTIONS_BLOCKS, EDIT_COLLECTION_SELECTION_BLOCKS,
 };
-use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable, StatefulTable};
+use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
 use crate::network::radarr_network::RadarrEvent;
-use crate::utils::strip_non_search_characters;
-use crate::{filter_table, handle_text_box_keys, handle_text_box_left_right_keys, search_table};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
 
 mod collection_details_handler;
 mod edit_collection_handler;
@@ -68,38 +67,24 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
 
   fn handle_scroll_up(&mut self) {
     if self.active_radarr_block == &ActiveRadarrBlock::Collections {
-      if let Some(filtered_collections) = self.app.data.radarr_data.filtered_collections.as_mut() {
-        filtered_collections.scroll_up();
-      } else {
-        self.app.data.radarr_data.collections.scroll_up()
-      }
+      self.app.data.radarr_data.collections.scroll_up()
     }
   }
 
   fn handle_scroll_down(&mut self) {
     if self.active_radarr_block == &ActiveRadarrBlock::Collections {
-      if let Some(filtered_collections) = self.app.data.radarr_data.filtered_collections.as_mut() {
-        filtered_collections.scroll_down();
-      } else {
-        self.app.data.radarr_data.collections.scroll_down()
-      }
+      self.app.data.radarr_data.collections.scroll_down()
     }
   }
 
   fn handle_home(&mut self) {
     match self.active_radarr_block {
-      ActiveRadarrBlock::Collections => {
-        if let Some(filtered_collections) = self.app.data.radarr_data.filtered_collections.as_mut()
-        {
-          filtered_collections.scroll_to_top();
-        } else {
-          self.app.data.radarr_data.collections.scroll_to_top()
-        }
-      }
+      ActiveRadarrBlock::Collections => self.app.data.radarr_data.collections.scroll_to_top(),
       ActiveRadarrBlock::SearchCollection => self
         .app
         .data
         .radarr_data
+        .collections
         .search
         .as_mut()
         .unwrap()
@@ -108,6 +93,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         .app
         .data
         .radarr_data
+        .collections
         .filter
         .as_mut()
         .unwrap()
@@ -118,18 +104,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
 
   fn handle_end(&mut self) {
     match self.active_radarr_block {
-      ActiveRadarrBlock::Collections => {
-        if let Some(filtered_collections) = self.app.data.radarr_data.filtered_collections.as_mut()
-        {
-          filtered_collections.scroll_to_bottom();
-        } else {
-          self.app.data.radarr_data.collections.scroll_to_bottom()
-        }
-      }
+      ActiveRadarrBlock::Collections => self.app.data.radarr_data.collections.scroll_to_bottom(),
       ActiveRadarrBlock::SearchCollection => self
         .app
         .data
         .radarr_data
+        .collections
         .search
         .as_mut()
         .unwrap()
@@ -138,6 +118,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         .app
         .data
         .radarr_data
+        .collections
         .filter
         .as_mut()
         .unwrap()
@@ -156,14 +137,28 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         handle_text_box_left_right_keys!(
           self,
           self.key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .search
+            .as_mut()
+            .unwrap()
         )
       }
       ActiveRadarrBlock::FilterCollections => {
         handle_text_box_left_right_keys!(
           self,
           self.key,
-          self.app.data.radarr_data.filter.as_mut().unwrap()
+          self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .filter
+            .as_mut()
+            .unwrap()
         )
       }
       _ => (),
@@ -176,28 +171,42 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         .app
         .push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into()),
       ActiveRadarrBlock::SearchCollection => {
-        if self.app.data.radarr_data.filtered_collections.is_some() {
-          search_table!(
-            self.app,
-            filtered_collections,
-            ActiveRadarrBlock::SearchCollectionError,
-            true
-          );
-        } else {
-          search_table!(
-            self.app,
-            collections,
-            ActiveRadarrBlock::SearchCollectionError
-          );
+        self.app.pop_navigation_stack();
+        self.app.should_ignore_quit_key = false;
+
+        if self.app.data.radarr_data.collections.search.is_some() {
+          let has_match = self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .apply_search(|collection| &collection.title.text);
+
+          if !has_match {
+            self
+              .app
+              .push_navigation_stack(ActiveRadarrBlock::SearchCollectionError.into());
+          }
         }
       }
       ActiveRadarrBlock::FilterCollections => {
-        filter_table!(
-          self.app,
-          collections,
-          filtered_collections,
-          ActiveRadarrBlock::FilterCollectionsError
-        );
+        self.app.pop_navigation_stack();
+        self.app.should_ignore_quit_key = false;
+
+        if self.app.data.radarr_data.collections.filter.is_some() {
+          let has_matches = self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .apply_filter(|collection| &collection.title.text);
+
+          if !has_matches {
+            self
+              .app
+              .push_navigation_stack(ActiveRadarrBlock::FilterCollectionsError.into());
+          }
+        }
       }
       ActiveRadarrBlock::UpdateAllCollectionsPrompt => {
         if self.app.data.radarr_data.prompt_confirm {
@@ -214,12 +223,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
     match self.active_radarr_block {
       ActiveRadarrBlock::FilterCollections | ActiveRadarrBlock::FilterCollectionsError => {
         self.app.pop_navigation_stack();
-        self.app.data.radarr_data.reset_filter();
+        self.app.data.radarr_data.collections.reset_filter();
         self.app.should_ignore_quit_key = false;
       }
       ActiveRadarrBlock::SearchCollection | ActiveRadarrBlock::SearchCollectionError => {
         self.app.pop_navigation_stack();
-        self.app.data.radarr_data.reset_search();
+        self.app.data.radarr_data.collections.reset_search();
         self.app.should_ignore_quit_key = false;
       }
       ActiveRadarrBlock::UpdateAllCollectionsPrompt => {
@@ -227,8 +236,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         self.app.data.radarr_data.prompt_confirm = false;
       }
       _ => {
-        self.app.data.radarr_data.reset_search();
-        self.app.data.radarr_data.reset_filter();
+        self.app.data.radarr_data.collections.reset_search();
+        self.app.data.radarr_data.collections.reset_filter();
         handle_clear_errors(self.app);
       }
     }
@@ -242,17 +251,17 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
-          self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
-          self.app.data.radarr_data.is_searching = true;
+          self.app.data.radarr_data.collections.search =
+            Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
         _ if *key == DEFAULT_KEYBINDINGS.filter.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::FilterCollections.into());
-          self.app.data.radarr_data.reset_filter();
-          self.app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
-          self.app.data.radarr_data.is_filtering = true;
+          self.app.data.radarr_data.collections.reset_filter();
+          self.app.data.radarr_data.collections.filter =
+            Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
         _ if *key == DEFAULT_KEYBINDINGS.edit.key => {
@@ -282,14 +291,28 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
         handle_text_box_keys!(
           self,
           key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .search
+            .as_mut()
+            .unwrap()
         )
       }
       ActiveRadarrBlock::FilterCollections => {
         handle_text_box_keys!(
           self,
           key,
-          self.app.data.radarr_data.filter.as_mut().unwrap()
+          self
+            .app
+            .data
+            .radarr_data
+            .collections
+            .filter
+            .as_mut()
+            .unwrap()
         )
       }
       _ => (),

src/handlers/radarr_handlers/library/add_movie_handler.rs

@@ -193,7 +193,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
         .app
         .data
         .radarr_data
-        .search
+        .add_movie_search
         .as_mut()
         .unwrap()
         .scroll_home(),
@@ -260,7 +260,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
         .app
         .data
         .radarr_data
-        .search
+        .add_movie_search
         .as_mut()
         .unwrap()
         .reset_offset(),
@@ -286,7 +286,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
         handle_text_box_left_right_keys!(
           self,
           self.key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self.app.data.radarr_data.add_movie_search.as_mut().unwrap()
         )
       }
       ActiveRadarrBlock::AddMovieTagsInput => {
@@ -314,7 +314,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
           .app
           .data
           .radarr_data
-          .search
+          .add_movie_search
           .as_mut()
           .unwrap()
           .text
@@ -407,7 +407,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
     match self.active_radarr_block {
       ActiveRadarrBlock::AddMovieSearchInput => {
         self.app.pop_navigation_stack();
-        self.app.data.radarr_data.reset_search();
+        self.app.data.radarr_data.add_movie_search = None;
         self.app.should_ignore_quit_key = false;
       }
       ActiveRadarrBlock::AddMovieSearchResults | ActiveRadarrBlock::AddMovieEmptySearchResults => {
@@ -440,7 +440,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
         handle_text_box_keys!(
           self,
           key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self.app.data.radarr_data.add_movie_search.as_mut().unwrap()
         )
       }
       ActiveRadarrBlock::AddMovieTagsInput => {

src/handlers/radarr_handlers/library/add_movie_handler_tests.rs

@@ -632,7 +632,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_home_end_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
         &DEFAULT_KEYBINDINGS.home.key,
@@ -646,7 +646,7 @@ mod tests {
         *app
           .data
           .radarr_data
-          .search
+          .add_movie_search
           .as_ref()
           .unwrap()
           .offset
@@ -666,7 +666,7 @@ mod tests {
         *app
           .data
           .radarr_data
-          .search
+          .add_movie_search
           .as_ref()
           .unwrap()
           .offset
@@ -749,7 +749,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_left_right_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
         &DEFAULT_KEYBINDINGS.left.key,
@@ -763,7 +763,7 @@ mod tests {
         *app
           .data
           .radarr_data
-          .search
+          .add_movie_search
           .as_ref()
           .unwrap()
           .offset
@@ -783,7 +783,7 @@ mod tests {
         *app
           .data
           .radarr_data
-          .search
+          .add_movie_search
           .as_ref()
           .unwrap()
           .offset
@@ -863,7 +863,7 @@ mod tests {
     fn test_add_movie_search_input_submit() {
       let mut app = App::default();
       app.should_ignore_quit_key = true;
-      app.data.radarr_data.search = Some("test".into());
+      app.data.radarr_data.add_movie_search = Some("test".into());
 
       AddMovieHandler::with(
         &SUBMIT_KEY,
@@ -883,7 +883,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_submit_noop_on_empty_search() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
       app.should_ignore_quit_key = true;
 
@@ -1147,7 +1147,7 @@ mod tests {
     use crate::models::servarr_data::radarr::modals::AddMovieModal;
     use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
     use crate::models::StatefulTable;
-    use crate::{assert_search_reset, simple_stateful_iterable_vec};
+    use crate::simple_stateful_iterable_vec;
 
     use super::*;
 
@@ -1170,7 +1170,7 @@ mod tests {
 
       assert!(!app.should_ignore_quit_key);
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
-      assert_search_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.add_movie_search, None);
     }
 
     #[test]
@@ -1344,7 +1344,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_backspace() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
         &DEFAULT_KEYBINDINGS.backspace.key,
@@ -1354,7 +1354,10 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
+      assert_str_eq!(
+        app.data.radarr_data.add_movie_search.as_ref().unwrap().text,
+        "Tes"
+      );
     }
 
     #[test]
@@ -1389,7 +1392,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_char_key() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
 
       AddMovieHandler::with(
         &Key::Char('h'),
@@ -1399,7 +1402,10 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
+      assert_str_eq!(
+        app.data.radarr_data.add_movie_search.as_ref().unwrap().text,
+        "h"
+      );
     }
 
     #[test]

src/handlers/radarr_handlers/library/library_handler_tests.rs

@@ -18,7 +18,6 @@ mod tests {
   use crate::test_handler_delegation;
 
   mod test_handle_scroll_up_and_down {
-    use crate::models::StatefulTable;
     use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
 
     use super::*;
@@ -33,55 +32,11 @@ mod tests {
       title,
       to_string
     );
-
-    #[rstest]
-    fn test_filtered_movies_scroll(
-      #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
-    ) {
-      let mut app = App::default();
-      let mut filtered_movies = StatefulTable::default();
-      filtered_movies.set_items(simple_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_movies = Some(filtered_movies);
-
-      LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 2"
-      );
-
-      LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 1"
-      );
-    }
   }
 
   mod test_handle_home_end {
     use pretty_assertions::assert_eq;
 
-    use crate::models::StatefulTable;
     use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
 
     use super::*;
@@ -97,63 +52,10 @@ mod tests {
       to_string
     );
 
-    #[test]
-    fn test_filtered_movies_home_end() {
-      let mut app = App::default();
-      let mut filtered_movies = StatefulTable::default();
-      filtered_movies.set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_movies = Some(filtered_movies);
-
-      LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
-        &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
-      )
-      .handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 3"
-      );
-
-      LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
-        &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
-      )
-      .handle();
-
-      assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .to_string(),
-        "Test 1"
-      );
-    }
-
     #[test]
     fn test_movie_search_box_home_end_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.home.key,
@@ -167,6 +69,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .search
           .as_ref()
           .unwrap()
@@ -187,6 +90,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .search
           .as_ref()
           .unwrap()
@@ -199,7 +103,7 @@ mod tests {
     #[test]
     fn test_movie_filter_box_home_end_keys() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.home.key,
@@ -213,6 +117,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .filter
           .as_ref()
           .unwrap()
@@ -233,6 +138,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .filter
           .as_ref()
           .unwrap()
@@ -349,7 +255,7 @@ mod tests {
     #[test]
     fn test_movie_search_box_left_right_keys() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.left.key,
@@ -363,6 +269,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .search
           .as_ref()
           .unwrap()
@@ -383,6 +290,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .search
           .as_ref()
           .unwrap()
@@ -395,7 +303,7 @@ mod tests {
     #[test]
     fn test_movie_filter_box_left_right_keys() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.left.key,
@@ -409,6 +317,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .filter
           .as_ref()
           .unwrap()
@@ -429,6 +338,7 @@ mod tests {
         *app
           .data
           .radarr_data
+          .movies
           .filter
           .as_ref()
           .unwrap()
@@ -443,7 +353,6 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     use crate::extended_stateful_iterable_vec;
-    use crate::models::StatefulTable;
     use crate::network::radarr_network::RadarrEvent;
 
     use super::*;
@@ -475,7 +384,7 @@ mod tests {
           Movie,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.search = Some("Test 2".into());
+      app.data.radarr_data.movies.search = Some("Test 2".into());
 
       LibraryHandler::with(
         &SUBMIT_KEY,
@@ -505,7 +414,7 @@ mod tests {
           Movie,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.search = Some("Test 5".into());
+      app.data.radarr_data.movies.search = Some("Test 5".into());
 
       LibraryHandler::with(
         &SUBMIT_KEY,
@@ -530,13 +439,15 @@ mod tests {
       let mut app = App::default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
-      let mut filtered_movies = StatefulTable::default();
-      filtered_movies.set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-      app.data.radarr_data.filtered_movies = Some(filtered_movies);
-      app.data.radarr_data.search = Some("Test 2".into());
+      app
+        .data
+        .radarr_data
+        .movies
+        .set_filtered_items(extended_stateful_iterable_vec!(
+          Movie,
+          HorizontallyScrollableText
+        ));
+      app.data.radarr_data.movies.search = Some("Test 2".into());
 
       LibraryHandler::with(
         &SUBMIT_KEY,
@@ -547,15 +458,7 @@ mod tests {
       .handle();
 
       assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .text,
+        app.data.radarr_data.movies.current_selection().title.text,
         "Test 2"
       );
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
@@ -574,7 +477,7 @@ mod tests {
           Movie,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
         &SUBMIT_KEY,
@@ -584,28 +487,21 @@ mod tests {
       )
       .handle();
 
-      assert!(app.data.radarr_data.filtered_movies.is_some());
+      assert!(app.data.radarr_data.movies.filtered_items.is_some());
+      assert!(!app.should_ignore_quit_key);
       assert_eq!(
         app
           .data
           .radarr_data
-          .filtered_movies
+          .movies
+          .filtered_items
           .as_ref()
           .unwrap()
-          .items
           .len(),
         3
       );
       assert_str_eq!(
-        app
-          .data
-          .radarr_data
-          .filtered_movies
-          .as_ref()
-          .unwrap()
-          .current_selection()
-          .title
-          .text,
+        app.data.radarr_data.movies.current_selection().title.text,
         "Test 1"
       );
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
@@ -624,7 +520,7 @@ mod tests {
           Movie,
           HorizontallyScrollableText
         ));
-      app.data.radarr_data.filter = Some("Test 5".into());
+      app.data.radarr_data.movies.filter = Some("Test 5".into());
 
       LibraryHandler::with(
         &SUBMIT_KEY,
@@ -634,7 +530,8 @@ mod tests {
       )
       .handle();
 
-      assert!(app.data.radarr_data.filtered_movies.is_none());
+      assert!(!app.should_ignore_quit_key);
+      assert!(app.data.radarr_data.movies.filtered_items.is_none());
       assert_eq!(
         app.get_current_route(),
         &ActiveRadarrBlock::FilterMoviesError.into()
@@ -686,9 +583,10 @@ mod tests {
 
   mod test_handle_esc {
     use pretty_assertions::assert_eq;
+    use ratatui::widgets::TableState;
 
     use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
-    use crate::{assert_filter_reset, assert_search_reset};
+    use crate::models::StatefulTable;
 
     use super::*;
 
@@ -704,12 +602,13 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
-      assert_search_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.movies.search, None);
     }
 
     #[rstest]
@@ -722,12 +621,20 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.movies = StatefulTable {
+        filter: Some("Test".into()),
+        filtered_items: Some(Vec::new()),
+        filtered_state: Some(TableState::default()),
+        ..StatefulTable::default()
+      };
 
       LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
-      assert_filter_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.movies.filter, None);
+      assert_eq!(app.data.radarr_data.movies.filtered_items, None);
+      assert_eq!(app.data.radarr_data.movies.filtered_state, None);
     }
 
     #[test]
@@ -756,13 +663,22 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.movies = StatefulTable {
+        search: Some("Test".into()),
+        filter: Some("Test".into()),
+        filtered_items: Some(Vec::new()),
+        filtered_state: Some(TableState::default()),
+        ..StatefulTable::default()
+      };
 
       LibraryHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
 
       assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
       assert!(app.error.text.is_empty());
-      assert_search_reset!(app.data.radarr_data);
-      assert_filter_reset!(app.data.radarr_data);
+      assert_eq!(app.data.radarr_data.movies.search, None);
+      assert_eq!(app.data.radarr_data.movies.filter, None);
+      assert_eq!(app.data.radarr_data.movies.filtered_items, None);
+      assert_eq!(app.data.radarr_data.movies.filtered_state, None);
     }
   }
 
@@ -778,6 +694,7 @@ mod tests {
       RadarrData, EDIT_MOVIE_SELECTION_BLOCKS,
     };
 
+    use crate::models::StatefulTable;
     use crate::{assert_refresh_key, test_edit_movie_key};
 
     use super::*;
@@ -798,14 +715,17 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::SearchMovie.into()
       );
-      assert!(app.data.radarr_data.is_searching);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.search.is_some());
+      assert_eq!(
+        app.data.radarr_data.movies.search,
+        Some(HorizontallyScrollableText::default())
+      );
     }
 
     #[test]
     fn test_filter_movies_key() {
       let mut app = App::default();
+      app.data.radarr_data.movies = StatefulTable::default();
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.filter.key,
@@ -819,9 +739,8 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::FilterMovies.into()
       );
-      assert!(app.data.radarr_data.is_filtering);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.filter.is_some());
+      assert!(app.data.radarr_data.movies.filter.is_some());
     }
 
     #[test]
@@ -830,6 +749,8 @@ mod tests {
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.data.radarr_data = create_test_radarr_data();
+      app.data.radarr_data.movies = StatefulTable::default();
+      app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.filter.key,
@@ -843,10 +764,13 @@ mod tests {
         app.get_current_route(),
         &ActiveRadarrBlock::FilterMovies.into()
       );
-      assert!(app.data.radarr_data.is_filtering);
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.filter.is_some());
-      assert!(app.data.radarr_data.filtered_movies.is_none());
+      assert_eq!(
+        app.data.radarr_data.movies.filter,
+        Some(HorizontallyScrollableText::default())
+      );
+      assert!(app.data.radarr_data.movies.filtered_items.is_none());
+      assert!(app.data.radarr_data.movies.filtered_state.is_none());
     }
 
     #[test]
@@ -866,7 +790,7 @@ mod tests {
         &ActiveRadarrBlock::AddMovieSearchInput.into()
       );
       assert!(app.should_ignore_quit_key);
-      assert!(app.data.radarr_data.search.is_some());
+      assert!(app.data.radarr_data.add_movie_search.is_some());
     }
 
     #[test]
@@ -904,7 +828,7 @@ mod tests {
     #[test]
     fn test_search_movies_box_backspace_key() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some("Test".into());
+      app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.backspace.key,
@@ -914,13 +838,17 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
+      assert_str_eq!(
+        app.data.radarr_data.movies.search.as_ref().unwrap().text,
+        "Tes"
+      );
     }
 
     #[test]
     fn test_filter_movies_box_backspace_key() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some("Test".into());
+      app.data.radarr_data.movies = StatefulTable::default();
+      app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
         &DEFAULT_KEYBINDINGS.backspace.key,
@@ -930,13 +858,16 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "Tes");
+      assert_str_eq!(
+        app.data.radarr_data.movies.filter.as_ref().unwrap().text,
+        "Tes"
+      );
     }
 
     #[test]
     fn test_search_movies_box_char_key() {
       let mut app = App::default();
-      app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
 
       LibraryHandler::with(
         &Key::Char('h'),
@@ -946,13 +877,17 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
+      assert_str_eq!(
+        app.data.radarr_data.movies.search.as_ref().unwrap().text,
+        "h"
+      );
     }
 
     #[test]
     fn test_filter_movies_box_char_key() {
       let mut app = App::default();
-      app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
+      app.data.radarr_data.movies = StatefulTable::default();
+      app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
 
       LibraryHandler::with(
         &Key::Char('h'),
@@ -962,7 +897,10 @@ mod tests {
       )
       .handle();
 
-      assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "h");
+      assert_str_eq!(
+        app.data.radarr_data.movies.filter.as_ref().unwrap().text,
+        "h"
+      );
     }
   }
 

src/handlers/radarr_handlers/library/mod.rs

@@ -11,10 +11,9 @@ use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, DELETE_MOVIE_SELECTION_BLOCKS, EDIT_MOVIE_SELECTION_BLOCKS, LIBRARY_BLOCKS,
 };
-use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable, StatefulTable};
+use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
 use crate::network::radarr_network::RadarrEvent;
-use crate::utils::strip_non_search_characters;
-use crate::{filter_table, handle_text_box_keys, handle_text_box_left_right_keys, search_table};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
 
 mod add_movie_handler;
 mod delete_movie_handler;
@@ -81,38 +80,25 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
 
   fn handle_scroll_up(&mut self) {
     if self.active_radarr_block == &ActiveRadarrBlock::Movies {
-      if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
-        filtered_movies.scroll_up();
-      } else {
-        self.app.data.radarr_data.movies.scroll_up()
-      }
+      self.app.data.radarr_data.movies.scroll_up()
     }
   }
 
   fn handle_scroll_down(&mut self) {
     if self.active_radarr_block == &ActiveRadarrBlock::Movies {
-      if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
-        filtered_movies.scroll_down();
-      } else {
-        self.app.data.radarr_data.movies.scroll_down()
-      }
+      self.app.data.radarr_data.movies.scroll_down()
     }
   }
 
   fn handle_home(&mut self) {
     match self.active_radarr_block {
-      ActiveRadarrBlock::Movies => {
-        if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
-          filtered_movies.scroll_to_top();
-        } else {
-          self.app.data.radarr_data.movies.scroll_to_top()
-        }
-      }
+      ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_to_top(),
       ActiveRadarrBlock::SearchMovie => {
         self
           .app
           .data
           .radarr_data
+          .movies
           .search
           .as_mut()
           .unwrap()
@@ -123,6 +109,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           .app
           .data
           .radarr_data
+          .movies
           .filter
           .as_mut()
           .unwrap()
@@ -134,17 +121,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
 
   fn handle_end(&mut self) {
     match self.active_radarr_block {
-      ActiveRadarrBlock::Movies => {
-        if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
-          filtered_movies.scroll_to_bottom();
-        } else {
-          self.app.data.radarr_data.movies.scroll_to_bottom()
-        }
-      }
+      ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_to_bottom(),
       ActiveRadarrBlock::SearchMovie => self
         .app
         .data
         .radarr_data
+        .movies
         .search
         .as_mut()
         .unwrap()
@@ -153,6 +135,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         .app
         .data
         .radarr_data
+        .movies
         .filter
         .as_mut()
         .unwrap()
@@ -179,14 +162,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         handle_text_box_left_right_keys!(
           self,
           self.key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self.app.data.radarr_data.movies.search.as_mut().unwrap()
         )
       }
       ActiveRadarrBlock::FilterMovies => {
         handle_text_box_left_right_keys!(
           self,
           self.key,
-          self.app.data.radarr_data.filter.as_mut().unwrap()
+          self.app.data.radarr_data.movies.filter.as_mut().unwrap()
         )
       }
       _ => (),
@@ -199,24 +182,42 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         .app
         .push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()),
       ActiveRadarrBlock::SearchMovie => {
-        if self.app.data.radarr_data.filtered_movies.is_some() {
-          search_table!(
-            self.app,
-            filtered_movies,
-            ActiveRadarrBlock::SearchMovieError,
-            true
-          );
-        } else {
-          search_table!(self.app, movies, ActiveRadarrBlock::SearchMovieError);
+        self.app.pop_navigation_stack();
+        self.app.should_ignore_quit_key = false;
+
+        if self.app.data.radarr_data.movies.search.is_some() {
+          let has_match = self
+            .app
+            .data
+            .radarr_data
+            .movies
+            .apply_search(|movie| &movie.title.text);
+
+          if !has_match {
+            self
+              .app
+              .push_navigation_stack(ActiveRadarrBlock::SearchMovieError.into());
+          }
         }
       }
       ActiveRadarrBlock::FilterMovies => {
-        filter_table!(
-          self.app,
-          movies,
-          filtered_movies,
-          ActiveRadarrBlock::FilterMoviesError
-        );
+        self.app.pop_navigation_stack();
+        self.app.should_ignore_quit_key = false;
+
+        if self.app.data.radarr_data.movies.filter.is_some() {
+          let has_matches = self
+            .app
+            .data
+            .radarr_data
+            .movies
+            .apply_filter(|movie| &movie.title.text);
+
+          if !has_matches {
+            self
+              .app
+              .push_navigation_stack(ActiveRadarrBlock::FilterMoviesError.into());
+          }
+        }
       }
       ActiveRadarrBlock::UpdateAllMoviesPrompt => {
         if self.app.data.radarr_data.prompt_confirm {
@@ -233,12 +234,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
     match self.active_radarr_block {
       ActiveRadarrBlock::FilterMovies | ActiveRadarrBlock::FilterMoviesError => {
         self.app.pop_navigation_stack();
-        self.app.data.radarr_data.reset_filter();
+        self.app.data.radarr_data.movies.reset_filter();
         self.app.should_ignore_quit_key = false;
       }
       ActiveRadarrBlock::SearchMovie | ActiveRadarrBlock::SearchMovieError => {
         self.app.pop_navigation_stack();
-        self.app.data.radarr_data.reset_search();
+        self.app.data.radarr_data.movies.reset_search();
         self.app.should_ignore_quit_key = false;
       }
       ActiveRadarrBlock::UpdateAllMoviesPrompt => {
@@ -246,8 +247,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         self.app.data.radarr_data.prompt_confirm = false;
       }
       _ => {
-        self.app.data.radarr_data.reset_search();
-        self.app.data.radarr_data.reset_filter();
+        self.app.data.radarr_data.movies.reset_search();
+        self.app.data.radarr_data.movies.reset_filter();
         handle_clear_errors(self.app);
       }
     }
@@ -261,17 +262,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
-          self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
-          self.app.data.radarr_data.is_searching = true;
+          self.app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
         _ if *key == DEFAULT_KEYBINDINGS.filter.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
-          self.app.data.radarr_data.reset_filter();
-          self.app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
-          self.app.data.radarr_data.is_filtering = true;
+          self.app.data.radarr_data.movies.reset_filter();
+          self.app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
         _ if *key == DEFAULT_KEYBINDINGS.edit.key => {
@@ -290,7 +289,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
-          self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
+          self.app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
         _ if *key == DEFAULT_KEYBINDINGS.update.key => {
@@ -307,14 +306,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         handle_text_box_keys!(
           self,
           key,
-          self.app.data.radarr_data.search.as_mut().unwrap()
+          self.app.data.radarr_data.movies.search.as_mut().unwrap()
         )
       }
       ActiveRadarrBlock::FilterMovies => {
         handle_text_box_keys!(
           self,
           key,
-          self.app.data.radarr_data.filter.as_mut().unwrap()
+          self.app.data.radarr_data.movies.filter.as_mut().unwrap()
         )
       }
       _ => (),

src/handlers/radarr_handlers/mod.rs

@@ -179,44 +179,3 @@ macro_rules! search_table {
     }
   };
 }
-
-#[macro_export]
-macro_rules! filter_table {
-  ($app:expr, $source_table_ref:ident, $filter_table_ref:ident, $error_block:expr) => {
-    let empty_filter = match $app.data.radarr_data.filter.as_ref() {
-      Some(filter) if filter.text.is_empty() => true,
-      _ => false,
-    };
-    let filter_matches = match $app.data.radarr_data.filter.as_ref() {
-      Some(filter) if !filter.text.is_empty() => {
-        let scrubbed_filter = strip_non_search_characters(&filter.text.clone());
-
-        $app
-          .data
-          .radarr_data
-          .$source_table_ref
-          .items
-          .iter()
-          .filter(|item| strip_non_search_characters(&item.title.text).contains(&scrubbed_filter))
-          .cloned()
-          .collect()
-      }
-      _ => Vec::new(),
-    };
-
-    $app.data.radarr_data.filter = None;
-    $app.data.radarr_data.is_filtering = false;
-    $app.should_ignore_quit_key = false;
-
-    if filter_matches.is_empty() && !empty_filter {
-      $app.pop_and_push_navigation_stack($error_block.into());
-    } else if empty_filter {
-      $app.pop_navigation_stack();
-    } else {
-      $app.pop_navigation_stack();
-      let mut filter_table = StatefulTable::default();
-      filter_table.set_items(filter_matches);
-      $app.data.radarr_data.$filter_table_ref = Some(filter_table);
-    }
-  };
-}

src/handlers/radarr_handlers/radarr_handler_test_utils.rs

@@ -11,7 +11,6 @@ mod utils {
           (1111, "Any".to_owned()),
         ]),
         tags_map: BiMap::from_iter([(1, "test".to_owned())]),
-        filtered_movies: None,
         ..create_test_radarr_data()
       };
       radarr_data.movies.set_items(vec![Movie {
@@ -126,7 +125,6 @@ mod utils {
           (2222, "HD - 1080p".to_owned()),
           (1111, "Any".to_owned()),
         ]),
-        filtered_collections: None,
         ..create_test_radarr_data()
       };
       radarr_data.collections.set_items(vec![Collection {

src/handlers/radarr_handlers/radarr_handler_tests.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod tests {
-  use pretty_assertions::{assert_eq, assert_str_eq};
+  use pretty_assertions::assert_eq;
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
@@ -8,249 +8,8 @@ mod tests {
   use crate::app::App;
   use crate::handlers::radarr_handlers::{handle_change_tab_left_right_keys, RadarrHandler};
   use crate::handlers::KeyEventHandler;
-  use crate::models::radarr_models::Movie;
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-  use crate::models::{HorizontallyScrollableText, StatefulTable};
-  use crate::utils::strip_non_search_characters;
-  use crate::{
-    extended_stateful_iterable_vec, filter_table, search_table, test_handler_delegation,
-  };
-
-  #[test]
-  fn test_search_table_macro() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.search = Some("Test 2".into());
-    app.data.radarr_data.is_searching = true;
-    app.should_ignore_quit_key = true;
-
-    search_table!(app, movies, ActiveRadarrBlock::SearchMovieError);
-
-    assert_str_eq!(
-      app.data.radarr_data.movies.current_selection().title.text,
-      "Test 2"
-    );
-    assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
-    assert!(!app.data.radarr_data.is_searching);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.search.is_none());
-  }
-
-  #[test]
-  fn test_search_table_macro_empty_search() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.search = Some("".into());
-    app.data.radarr_data.is_searching = true;
-    app.should_ignore_quit_key = true;
-
-    search_table!(app, movies, ActiveRadarrBlock::SearchMovieError);
-
-    assert_str_eq!(
-      app.data.radarr_data.movies.current_selection().title.text,
-      "Test 1"
-    );
-    assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
-    assert!(!app.data.radarr_data.is_searching);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.search.is_none());
-  }
-
-  #[test]
-  fn test_search_table_macro_error_on_no_search_hits() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.search = Some("Test 5".into());
-    app.data.radarr_data.is_searching = true;
-    app.should_ignore_quit_key = true;
-
-    search_table!(app, movies, ActiveRadarrBlock::SearchMovieError);
-
-    assert_str_eq!(
-      app.data.radarr_data.movies.current_selection().title.text,
-      "Test 1"
-    );
-    assert_eq!(
-      app.get_current_route(),
-      &ActiveRadarrBlock::SearchMovieError.into()
-    );
-    assert!(!app.data.radarr_data.is_searching);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.search.is_none());
-  }
-
-  #[test]
-  fn test_filter_table_macro() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.filter = Some("Test 2".into());
-    app.data.radarr_data.is_filtering = true;
-    app.should_ignore_quit_key = true;
-
-    filter_table!(
-      app,
-      movies,
-      filtered_movies,
-      ActiveRadarrBlock::FilterMoviesError
-    );
-
-    assert!(app.data.radarr_data.filtered_movies.is_some());
-    assert_eq!(
-      app
-        .data
-        .radarr_data
-        .filtered_movies
-        .as_ref()
-        .unwrap()
-        .items
-        .len(),
-      1
-    );
-    assert_str_eq!(
-      app.data.radarr_data.filtered_movies.as_ref().unwrap().items[0]
-        .title
-        .text,
-      "Test 2"
-    );
-    assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
-    assert!(!app.data.radarr_data.is_filtering);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.filter.is_none());
-  }
-
-  #[test]
-  fn test_filter_table_macro_reset_and_pop_on_empty_filter() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.filter = Some("".into());
-    app.data.radarr_data.is_filtering = true;
-    app.should_ignore_quit_key = true;
-
-    filter_table!(
-      app,
-      movies,
-      filtered_movies,
-      ActiveRadarrBlock::FilterMoviesError
-    );
-
-    assert!(app.data.radarr_data.filtered_movies.is_none());
-    assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
-    assert!(!app.data.radarr_data.is_filtering);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.filter.is_none());
-  }
-
-  #[test]
-  fn test_filter_table_error_on_no_filter_matches() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.filter = Some("Test 5".into());
-    app.data.radarr_data.is_filtering = true;
-    app.should_ignore_quit_key = true;
-
-    filter_table!(
-      app,
-      movies,
-      filtered_movies,
-      ActiveRadarrBlock::FilterMoviesError
-    );
-
-    assert!(app.data.radarr_data.filtered_movies.is_none());
-    assert_eq!(
-      app.get_current_route(),
-      &ActiveRadarrBlock::FilterMoviesError.into()
-    );
-    assert!(!app.data.radarr_data.is_filtering);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.filter.is_none());
-  }
-
-  #[test]
-  fn test_filter_table_macro_error_on_none_filter() {
-    let mut app = App::default();
-    app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
-    app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
-    app
-      .data
-      .radarr_data
-      .movies
-      .set_items(extended_stateful_iterable_vec!(
-        Movie,
-        HorizontallyScrollableText
-      ));
-    app.data.radarr_data.is_filtering = true;
-    app.should_ignore_quit_key = true;
-
-    filter_table!(
-      app,
-      movies,
-      filtered_movies,
-      ActiveRadarrBlock::FilterMoviesError
-    );
-
-    assert!(app.data.radarr_data.filtered_movies.is_none());
-    assert_eq!(
-      app.get_current_route(),
-      &ActiveRadarrBlock::FilterMoviesError.into()
-    );
-    assert!(!app.data.radarr_data.is_filtering);
-    assert!(!app.should_ignore_quit_key);
-    assert!(app.data.radarr_data.filter.is_none());
-  }
+  use crate::test_handler_delegation;
 
   #[rstest]
   #[case(0, ActiveRadarrBlock::System, ActiveRadarrBlock::Downloads)]
@@ -375,9 +134,6 @@ mod tests {
 
   #[rstest]
   fn test_delegates_indexers_blocks_to_indexers_handler(
-    // Add these once implemented:
-    // ActiveRadarrBlock::AddIndexer,
-    // ActiveRadarrBlock::EditIndexer,
     #[values(
       ActiveRadarrBlock::DeleteIndexerPrompt,
       ActiveRadarrBlock::Indexers,