fix(radarr): Build and pass the edit indexer settings body with the EditAllIndexerSettings event when publishing to the networking channel

src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs

@@ -2,6 +2,7 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
+use crate::models::radarr_models::IndexerSettings;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
 };
@@ -19,6 +20,14 @@ pub(super) struct IndexerSettingsHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
+impl<'a, 'b> IndexerSettingsHandler<'a, 'b> {
+  fn build_edit_indexer_settings_body(&mut self) -> IndexerSettings {
+    let indexer_settings = self.app.data.radarr_data.indexer_settings.clone().unwrap();
+    self.app.data.radarr_data.indexer_settings = None;
+    indexer_settings
+  }
+}
+
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandler<'a, 'b> {
   fn accepts(active_block: ActiveRadarrBlock) -> bool {
     INDEXER_SETTINGS_BLOCKS.contains(&active_block)
@@ -166,12 +175,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
       ActiveRadarrBlock::AllIndexerSettingsPrompt => {
         match self.app.data.radarr_data.selected_block.get_active_block() {
           ActiveRadarrBlock::IndexerSettingsConfirmPrompt => {
-            let radarr_data = &mut self.app.data.radarr_data;
-            if radarr_data.prompt_confirm {
-              radarr_data.prompt_confirm_action = Some(RadarrEvent::EditAllIndexerSettings(None));
+            if self.app.data.radarr_data.prompt_confirm {
+              self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::EditAllIndexerSettings(self.build_edit_indexer_settings_body()));
               self.app.should_refresh = true;
             } else {
-              radarr_data.indexer_settings = None;
+              self.app.data.radarr_data.indexer_settings = None;
             }
 
             self.app.pop_navigation_stack();
@@ -259,7 +267,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
-            Some(RadarrEvent::EditAllIndexerSettings(None));
+            Some(RadarrEvent::EditAllIndexerSettings(self.build_edit_indexer_settings_body()));
           self.app.should_refresh = true;
 
           self.app.pop_navigation_stack();

src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs

@@ -1,11 +1,13 @@
 #[cfg(test)]
 mod tests {
+  use pretty_assertions::assert_eq;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::radarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
+  use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer_settings;
   use crate::handlers::KeyEventHandler;
   use crate::models::radarr_models::IndexerSettings;
   use crate::models::servarr_data::radarr::radarr_data::{
@@ -472,7 +474,7 @@ mod tests {
         .radarr_data
         .selected_block
         .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
-      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
+      app.data.radarr_data.indexer_settings = Some(indexer_settings());
       app.data.radarr_data.prompt_confirm = true;
 
       IndexerSettingsHandler::with(
@@ -486,9 +488,9 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::EditAllIndexerSettings(None))
+        Some(RadarrEvent::EditAllIndexerSettings(indexer_settings()))
       );
-      assert!(app.data.radarr_data.indexer_settings.is_some());
+      assert!(app.data.radarr_data.indexer_settings.is_none());
       assert!(app.should_refresh);
     }
 
@@ -858,7 +860,7 @@ mod tests {
   }
 
   mod test_handle_key_char {
-    use pretty_assertions::assert_str_eq;
+    use pretty_assertions::{assert_eq, assert_str_eq};
 
     use crate::{
       models::{
@@ -937,7 +939,7 @@ mod tests {
         .radarr_data
         .selected_block
         .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
-      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
+      app.data.radarr_data.indexer_settings = Some(indexer_settings());
 
       IndexerSettingsHandler::with(
         DEFAULT_KEYBINDINGS.confirm.key,
@@ -950,9 +952,9 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::EditAllIndexerSettings(None))
+        Some(RadarrEvent::EditAllIndexerSettings(indexer_settings()))
       );
-      assert!(app.data.radarr_data.indexer_settings.is_some());
+      assert!(app.data.radarr_data.indexer_settings.is_none());
       assert!(app.should_refresh);
     }
   }
@@ -968,6 +970,22 @@ mod tests {
     })
   }
 
+  #[test]
+  fn test_build_edit_indexer_settings_body() {
+    let mut app = App::default();
+    app.data.radarr_data.indexer_settings = Some(indexer_settings());
+
+    let body = IndexerSettingsHandler::with(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::AllIndexerSettingsPrompt,
+      None,
+    ).build_edit_indexer_settings_body();
+
+    assert_eq!(body, indexer_settings());
+    assert!(app.data.radarr_data.indexer_settings.is_none());
+  }
+
   #[test]
   fn test_edit_indexer_settings_handler_not_ready_when_loading() {
     let mut app = App::default();