fix: Pass the indexer ID in with the DeleteIndexer event when sending to the networking channel

src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs

@@ -1,5 +1,6 @@
 #[cfg(test)]
 mod tests {
+  use pretty_assertions::assert_eq;
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
@@ -7,6 +8,7 @@ mod tests {
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::radarr_handlers::indexers::IndexersHandler;
+  use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
   use crate::handlers::KeyEventHandler;
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, EDIT_INDEXER_BLOCKS, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
@@ -123,17 +125,17 @@ mod tests {
   }
 
   mod test_handle_submit {
+    use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
     use crate::models::servarr_data::modals::EditIndexerModal;
     use crate::models::servarr_data::radarr::radarr_data::{
       RadarrData, EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
     };
     use crate::models::servarr_models::{Indexer, IndexerField};
+    use crate::network::radarr_network::RadarrEvent;
     use bimap::BiMap;
     use pretty_assertions::assert_eq;
     use serde_json::{Number, Value};
 
-    use crate::network::radarr_network::RadarrEvent;
-
     use super::*;
 
     const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -243,7 +245,7 @@ mod tests {
         .data
         .radarr_data
         .indexers
-        .set_items(vec![Indexer::default()]);
+        .set_items(vec![indexer()]);
       app.data.radarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
@@ -259,7 +261,7 @@ mod tests {
       assert!(app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::DeleteIndexer(None))
+        Some(RadarrEvent::DeleteIndexer(1))
       );
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
     }
@@ -348,13 +350,13 @@ mod tests {
   mod test_handle_key_char {
     use pretty_assertions::assert_eq;
 
+    use super::*;
+    use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
     use crate::{
       models::servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
       network::radarr_network::RadarrEvent,
     };
 
-    use super::*;
-
     #[test]
     fn test_refresh_indexers_key() {
       let mut app = App::default();
@@ -546,7 +548,7 @@ mod tests {
         .data
         .radarr_data
         .indexers
-        .set_items(vec![Indexer::default()]);
+        .set_items(vec![indexer()]);
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
 
@@ -561,7 +563,7 @@ mod tests {
       assert!(app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::DeleteIndexer(None))
+        Some(RadarrEvent::DeleteIndexer(1))
       );
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
     }
@@ -639,6 +641,21 @@ mod tests {
     })
   }
 
+  #[test]
+  fn test_extract_indexer_id() {
+    let mut app = App::default();
+    app.data.radarr_data.indexers.set_items(vec![indexer()]);
+
+    let indexer_id = IndexersHandler::with(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::Indexers,
+      None,
+    ).extract_indexer_id();
+
+    assert_eq!(indexer_id, 1);
+  }
+
   #[test]
   fn test_indexers_handler_not_ready_when_loading() {
     let mut app = App::default();

src/handlers/radarr_handlers/indexers/mod.rs

@@ -33,6 +33,16 @@ pub(super) struct IndexersHandler<'a, 'b> {
 
 impl<'a, 'b> IndexersHandler<'a, 'b> {
   handle_table_events!(self, indexers, self.app.data.radarr_data.indexers, Indexer);
+  
+  fn extract_indexer_id(&self) -> i64 {
+    self
+      .app
+      .data
+      .radarr_data
+      .indexers
+      .current_selection()
+      .id
+  }
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a, 'b> {
@@ -115,9 +125,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
   fn handle_submit(&mut self) {
     match self.active_radarr_block {
       ActiveRadarrBlock::DeleteIndexerPrompt => {
+        let indexer_id = self.extract_indexer_id();
         let radarr_data = &mut self.app.data.radarr_data;
         if radarr_data.prompt_confirm {
-          radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteIndexer(None));
+          radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteIndexer(indexer_id));
         }
 
         self.app.pop_navigation_stack();
@@ -189,7 +200,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
       ActiveRadarrBlock::DeleteIndexerPrompt => {
         if key == DEFAULT_KEYBINDINGS.confirm.key {
           self.app.data.radarr_data.prompt_confirm = true;
-          self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteIndexer(None));
+          self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteIndexer(self.extract_indexer_id()));
 
           self.app.pop_navigation_stack();
         }