Refactored the filter and search logic to follow the established modal logic and added some refactored functions to the UI module as well to clean up the UI code too

src/handlers/radarr_handlers/collections/collections_handler_tests.rs

@@ -370,6 +370,8 @@ mod tests {
     #[test]
     fn test_search_collections_submit() {
       let mut app = App::default();
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
       app
         .data
         .radarr_data
@@ -398,11 +400,56 @@ mod tests {
           .text,
         "Test 2"
       );
+      assert_eq!(
+        app.get_current_route(),
+        &ActiveRadarrBlock::Collections.into()
+      );
+    }
+
+    #[test]
+    fn test_search_collections_submit_error_on_no_search_hits() {
+      let mut app = App::default();
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
+      app
+        .data
+        .radarr_data
+        .collections
+        .set_items(extended_stateful_iterable_vec!(
+          Collection,
+          HorizontallyScrollableText
+        ));
+      app.data.radarr_data.search = Some("Test 5".into());
+
+      CollectionsHandler::with(
+        &SUBMIT_KEY,
+        &mut app,
+        &ActiveRadarrBlock::SearchCollection,
+        &None,
+      )
+      .handle();
+
+      assert_str_eq!(
+        app
+          .data
+          .radarr_data
+          .collections
+          .current_selection()
+          .title
+          .text,
+        "Test 1"
+      );
+      assert_eq!(
+        app.get_current_route(),
+        &ActiveRadarrBlock::SearchCollectionError.into()
+      );
     }
 
     #[test]
     fn test_search_filtered_collections_submit() {
       let mut app = App::default();
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
       app
         .data
         .radarr_data
@@ -431,11 +478,17 @@ mod tests {
           .text,
         "Test 2"
       );
+      assert_eq!(
+        app.get_current_route(),
+        &ActiveRadarrBlock::Collections.into()
+      );
     }
 
     #[test]
     fn test_filter_collections_submit() {
       let mut app = App::default();
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.push_navigation_stack(ActiveRadarrBlock::FilterCollections.into());
       app
         .data
         .radarr_data
@@ -465,6 +518,40 @@ mod tests {
           .text,
         "Test 1"
       );
+      assert_eq!(
+        app.get_current_route(),
+        &ActiveRadarrBlock::Collections.into()
+      );
+    }
+
+    #[test]
+    fn test_filter_collections_submit_error_on_no_filter_matches() {
+      let mut app = App::default();
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.push_navigation_stack(ActiveRadarrBlock::FilterCollections.into());
+      app
+        .data
+        .radarr_data
+        .collections
+        .set_items(extended_stateful_iterable_vec!(
+          Collection,
+          HorizontallyScrollableText
+        ));
+      app.data.radarr_data.filter = Some("Test 5".into());
+
+      CollectionsHandler::with(
+        &SUBMIT_KEY,
+        &mut app,
+        &ActiveRadarrBlock::FilterCollections,
+        &None,
+      )
+      .handle();
+
+      assert!(app.data.radarr_data.filtered_collections.items.is_empty());
+      assert_eq!(
+        app.get_current_route(),
+        &ActiveRadarrBlock::FilterCollectionsError.into()
+      );
     }
 
     #[test]
@@ -526,21 +613,21 @@ mod tests {
 
     const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
 
-    #[test]
-    fn test_search_collection_block_esc() {
+    #[rstest]
+    fn test_search_collection_block_esc(
+      #[values(
+        ActiveRadarrBlock::SearchCollection,
+        ActiveRadarrBlock::SearchCollectionError
+      )]
+      active_radarr_block: ActiveRadarrBlock,
+    ) {
       let mut app = App::default();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
-      app.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
+      app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
 
-      CollectionsHandler::with(
-        &ESC_KEY,
-        &mut app,
-        &ActiveRadarrBlock::SearchCollection,
-        &None,
-      )
-      .handle();
+      CollectionsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
       assert_eq!(
         app.get_current_route(),
@@ -550,21 +637,21 @@ mod tests {
       assert_search_reset!(app.data.radarr_data);
     }
 
-    #[test]
-    fn test_filter_collections_block_esc() {
+    #[rstest]
+    fn test_filter_collections_block_esc(
+      #[values(
+        ActiveRadarrBlock::FilterCollections,
+        ActiveRadarrBlock::FilterCollectionsError
+      )]
+      active_radarr_block: ActiveRadarrBlock,
+    ) {
       let mut app = App::default();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
-      app.push_navigation_stack(ActiveRadarrBlock::FilterCollections.into());
+      app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
 
-      CollectionsHandler::with(
-        &ESC_KEY,
-        &mut app,
-        &ActiveRadarrBlock::FilterCollections,
-        &None,
-      )
-      .handle();
+      CollectionsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
 
       assert_eq!(
         app.get_current_route(),
@@ -675,6 +762,31 @@ mod tests {
       assert!(app.data.radarr_data.filter.is_some());
     }
 
+    #[test]
+    fn test_filter_collections_key_resets_previous_filter() {
+      let mut app = App::default();
+      app.should_ignore_quit_key = true;
+      app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
+      app.data.radarr_data = create_test_radarr_data();
+
+      CollectionsHandler::with(
+        &DEFAULT_KEYBINDINGS.filter.key,
+        &mut app,
+        &ActiveRadarrBlock::Collections,
+        &None,
+      )
+      .handle();
+
+      assert_eq!(
+        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.items.is_empty());
+    }
+
     #[test]
     fn test_collection_edit_key() {
       test_edit_collection_key!(

src/handlers/radarr_handlers/collections/mod.rs

@@ -3,16 +3,15 @@ use crate::app::App;
 use crate::event::Key;
 use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
 use crate::handlers::radarr_handlers::collections::edit_collection_handler::EditCollectionHandler;
-use crate::handlers::radarr_handlers::{
-  filter_table, handle_change_tab_left_right_keys, search_table,
-};
+use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 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};
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::utils::strip_non_search_characters;
+use crate::{filter_table, handle_text_box_keys, handle_text_box_left_right_keys, search_table};
 
 mod collection_details_handler;
 mod edit_collection_handler;
@@ -221,46 +220,26 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
           .items
           .is_empty()
         {
-          let selected_index = search_table(
+          search_table!(
             self.app,
-            &self.app.data.radarr_data.collections.items.clone(),
-            |collection| &collection.title.text,
+            collections,
+            ActiveRadarrBlock::SearchCollectionError
           );
-          self
-            .app
-            .data
-            .radarr_data
-            .collections
-            .select_index(selected_index);
         } else {
-          let selected_index = search_table(
+          search_table!(
             self.app,
-            &self.app.data.radarr_data.filtered_collections.items.clone(),
-            |collection| &collection.title.text,
+            filtered_collections,
+            ActiveRadarrBlock::SearchCollectionError
           );
-          self
-            .app
-            .data
-            .radarr_data
-            .filtered_collections
-            .select_index(selected_index);
         }
       }
       ActiveRadarrBlock::FilterCollections => {
-        let filtered_collections = filter_table(
+        filter_table!(
           self.app,
-          &self.app.data.radarr_data.collections.items.clone(),
-          |collection| &collection.title.text,
+          collections,
+          filtered_collections,
+          ActiveRadarrBlock::FilterCollectionsError
         );
-
-        if !filtered_collections.is_empty() {
-          self
-            .app
-            .data
-            .radarr_data
-            .filtered_collections
-            .set_items(filtered_collections);
-        }
       }
       ActiveRadarrBlock::UpdateAllCollectionsPrompt => {
         if self.app.data.radarr_data.prompt_confirm {
@@ -275,12 +254,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
 
   fn handle_esc(&mut self) {
     match self.active_radarr_block {
-      ActiveRadarrBlock::FilterCollections => {
+      ActiveRadarrBlock::FilterCollections | ActiveRadarrBlock::FilterCollectionsError => {
         self.app.pop_navigation_stack();
         self.app.data.radarr_data.reset_filter();
         self.app.should_ignore_quit_key = false;
       }
-      ActiveRadarrBlock::SearchCollection => {
+      ActiveRadarrBlock::SearchCollection | ActiveRadarrBlock::SearchCollectionError => {
         self.app.pop_navigation_stack();
         self.app.data.radarr_data.reset_search();
         self.app.should_ignore_quit_key = false;
@@ -313,6 +292,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
           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.should_ignore_quit_key = true;