refactor(BlockSelectionState): Refactored so selection of blocks in 2x2 grids is more intuitive and added left() and right() methods to aid this effort.

2024-11-30 12:22:46 -07:00
parent 9b2040059d
commit f7c96d81e9
27 changed files with 472 additions and 387 deletions
@@ -4,7 +4,7 @@ use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys};

 #[cfg(test)]
 #[path = "edit_indexer_handler_tests.rs"]
@@ -46,13 +46,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'

  fn handle_scroll_up(&mut self) {
    if self.active_radarr_block == ActiveRadarrBlock::EditIndexerPrompt {
-      self.app.data.radarr_data.selected_block.previous();
+      self.app.data.radarr_data.selected_block.up();
    }
  }

  fn handle_scroll_down(&mut self) {
    if self.active_radarr_block == ActiveRadarrBlock::EditIndexerPrompt {
-      self.app.data.radarr_data.selected_block.next();
+      self.app.data.radarr_data.selected_block.down();
    }
  }

@@ -183,15 +183,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
  fn handle_left_right_action(&mut self) {
    match self.active_radarr_block {
      ActiveRadarrBlock::EditIndexerPrompt => {
-        if self.app.data.radarr_data.selected_block.get_active_block()
-          == ActiveRadarrBlock::EditIndexerConfirmPrompt
-        {
-          handle_prompt_toggle(self.app, self.key);
-        } else {
-          let len = self.app.data.radarr_data.selected_block.blocks.len();
-          let idx = self.app.data.radarr_data.selected_block.index;
-          self.app.data.radarr_data.selected_block.index = (idx + 5) % len;
-        }
+        handle_prompt_left_right_keys!(
+          self,
+          ActiveRadarrBlock::EditIndexerConfirmPrompt,
+          radarr_data
+        );
      }
      ActiveRadarrBlock::EditIndexerNameInput => {
        handle_text_box_left_right_keys!(
@@ -25,8 +25,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.next();
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.down();

      EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();

@@ -51,8 +51,8 @@ mod tests {
      app.is_loading = true;
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.next();
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.down();

      EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();

@@ -346,8 +346,8 @@ mod tests {
    fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1;
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1;

      EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();

@@ -381,14 +381,14 @@ mod tests {
    )]
    fn test_left_right_block_toggle_torrents(
      #[values(Key::Left, Key::Right)] key: Key,
-      #[case] starting_index: usize,
+      #[case] starting_y_index: usize,
      #[case] left_block: ActiveRadarrBlock,
      #[case] right_block: ActiveRadarrBlock,
    ) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = starting_index;
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = starting_y_index;

      assert_eq!(
        app.data.radarr_data.selected_block.get_active_block(),
@@ -428,14 +428,14 @@ mod tests {
    )]
    fn test_left_right_block_toggle_nzb(
      #[values(Key::Left, Key::Right)] key: Key,
-      #[case] starting_index: usize,
+      #[case] starting_y_index: usize,
      #[case] left_block: ActiveRadarrBlock,
      #[case] right_block: ActiveRadarrBlock,
    ) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_NZB_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = starting_index;
+        BlockSelectionState::new(EDIT_INDEXER_NZB_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = starting_y_index;

      assert_eq!(
        app.data.radarr_data.selected_block.get_active_block(),
@@ -463,8 +463,8 @@ mod tests {
    ) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_NZB_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = 3;
+        BlockSelectionState::new(EDIT_INDEXER_NZB_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = 3;
      app.data.radarr_data.prompt_confirm = false;

      assert_eq!(
@@ -765,12 +765,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());

      EditIndexerHandler::with(
@@ -793,12 +793,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.prompt_confirm = true;

@@ -846,25 +846,26 @@ mod tests {
    }

    #[rstest]
-    #[case(0, ActiveRadarrBlock::EditIndexerNameInput)]
-    #[case(5, ActiveRadarrBlock::EditIndexerUrlInput)]
-    #[case(6, ActiveRadarrBlock::EditIndexerApiKeyInput)]
-    #[case(7, ActiveRadarrBlock::EditIndexerSeedRatioInput)]
-    #[case(8, ActiveRadarrBlock::EditIndexerTagsInput)]
+    #[case(0, 0, ActiveRadarrBlock::EditIndexerNameInput)]
+    #[case(0, 1, ActiveRadarrBlock::EditIndexerUrlInput)]
+    #[case(1, 1, ActiveRadarrBlock::EditIndexerApiKeyInput)]
+    #[case(2, 1, ActiveRadarrBlock::EditIndexerSeedRatioInput)]
+    #[case(3, 1, ActiveRadarrBlock::EditIndexerTagsInput)]
    fn test_edit_indexer_prompt_submit_input_fields(
-      #[case] starting_index: usize,
+      #[case] starting_y: usize,
+      #[case] starting_x: usize,
      #[case] block: ActiveRadarrBlock,
    ) {
      let mut app = App::default();
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(starting_index);
+        .set_index(starting_x, starting_y);

      EditIndexerHandler::with(
        SUBMIT_KEY,
@@ -883,8 +884,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(1);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(0, 1);
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());

      EditIndexerHandler::with(
@@ -935,8 +936,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(2);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(0, 2);
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());

      EditIndexerHandler::with(
@@ -987,8 +988,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(3);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(0, 3);
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());

      EditIndexerHandler::with(
@@ -1560,12 +1561,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+        BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());

      EditIndexerHandler::with(
@@ -6,7 +6,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
  ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
 };
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys};

 #[cfg(test)]
 #[path = "edit_indexer_settings_handler_tests.rs"]
@@ -50,7 +50,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
    let indexer_settings = self.app.data.radarr_data.indexer_settings.as_mut().unwrap();
    match self.active_radarr_block {
      ActiveRadarrBlock::AllIndexerSettingsPrompt => {
-        self.app.data.radarr_data.selected_block.previous();
+        self.app.data.radarr_data.selected_block.up();
      }
      ActiveRadarrBlock::IndexerSettingsMinimumAgeInput => {
        indexer_settings.minimum_age += 1;
@@ -75,7 +75,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
    let indexer_settings = self.app.data.radarr_data.indexer_settings.as_mut().unwrap();
    match self.active_radarr_block {
      ActiveRadarrBlock::AllIndexerSettingsPrompt => {
-        self.app.data.radarr_data.selected_block.next()
+        self.app.data.radarr_data.selected_block.down()
      }
      ActiveRadarrBlock::IndexerSettingsMinimumAgeInput => {
        if indexer_settings.minimum_age > 0 {
@@ -137,15 +137,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
  fn handle_left_right_action(&mut self) {
    match self.active_radarr_block {
      ActiveRadarrBlock::AllIndexerSettingsPrompt => {
-        if self.app.data.radarr_data.selected_block.get_active_block()
-          == ActiveRadarrBlock::IndexerSettingsConfirmPrompt
-        {
-          handle_prompt_toggle(self.app, self.key);
-        } else {
-          let len = self.app.data.radarr_data.selected_block.blocks.len();
-          let idx = self.app.data.radarr_data.selected_block.index;
-          self.app.data.radarr_data.selected_block.index = (idx + 5) % len;
-        }
+        handle_prompt_left_right_keys!(
+          self,
+          ActiveRadarrBlock::IndexerSettingsConfirmPrompt,
+          radarr_data
+        );
      }
      ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput => {
        handle_text_box_left_right_keys!(
@@ -98,8 +98,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.next();
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.down();

      IndexerSettingsHandler::with(
        key,
@@ -130,8 +130,8 @@ mod tests {
      app.is_loading = true;
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.next();
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.down();

      IndexerSettingsHandler::with(
        key,
@@ -276,8 +276,8 @@ mod tests {
    fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1;
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1;

      IndexerSettingsHandler::with(
        key,
@@ -323,14 +323,14 @@ mod tests {
    )]
    fn test_left_right_block_toggle(
      #[values(Key::Left, Key::Right)] key: Key,
-      #[case] starting_index: usize,
+      #[case] starting_y_index: usize,
      #[case] left_block: ActiveRadarrBlock,
      #[case] right_block: ActiveRadarrBlock,
    ) {
      let mut app = App::default();
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.index = starting_index;
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.y = starting_y_index;

      assert_eq!(
        app.data.radarr_data.selected_block.get_active_block(),
@@ -438,12 +438,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());

      IndexerSettingsHandler::with(
@@ -466,12 +466,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.data.radarr_data.prompt_confirm = true;

@@ -517,21 +517,26 @@ mod tests {
    }

    #[rstest]
-    #[case(ActiveRadarrBlock::IndexerSettingsMinimumAgeInput, 0)]
-    #[case(ActiveRadarrBlock::IndexerSettingsRetentionInput, 1)]
-    #[case(ActiveRadarrBlock::IndexerSettingsMaximumSizeInput, 2)]
-    #[case(ActiveRadarrBlock::IndexerSettingsAvailabilityDelayInput, 5)]
-    #[case(ActiveRadarrBlock::IndexerSettingsRssSyncIntervalInput, 6)]
+    #[case(ActiveRadarrBlock::IndexerSettingsMinimumAgeInput, 0, 0)]
+    #[case(ActiveRadarrBlock::IndexerSettingsRetentionInput, 1, 0)]
+    #[case(ActiveRadarrBlock::IndexerSettingsMaximumSizeInput, 2, 0)]
+    #[case(ActiveRadarrBlock::IndexerSettingsAvailabilityDelayInput, 0, 1)]
+    #[case(ActiveRadarrBlock::IndexerSettingsRssSyncIntervalInput, 1, 1)]
    fn test_edit_indexer_settings_prompt_submit_selected_block(
      #[case] selected_block: ActiveRadarrBlock,
-      #[case] index: usize,
+      #[case] y_index: usize,
+      #[case] x_index: usize,
    ) {
      let mut app = App::default();
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(index);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app
+        .data
+        .radarr_data
+        .selected_block
+        .set_index(x_index, y_index);

      IndexerSettingsHandler::with(
        SUBMIT_KEY,
@@ -546,15 +551,19 @@ mod tests {

    #[rstest]
    fn test_edit_indexer_settings_prompt_submit_selected_block_no_op_when_not_ready(
-      #[values(0, 1, 2, 5, 6)] index: usize,
+      #[values((0, 0), (1, 0), (2, 0), (0, 1), (1, 1))] index: (usize, usize),
    ) {
      let mut app = App::default();
      app.is_loading = true;
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(index);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app
+        .data
+        .radarr_data
+        .selected_block
+        .set_index(index.1, index.0);

      IndexerSettingsHandler::with(
        SUBMIT_KEY,
@@ -576,8 +585,8 @@ mod tests {
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(7);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(1, 2);

      IndexerSettingsHandler::with(
        SUBMIT_KEY,
@@ -599,8 +608,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(3);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(0, 3);
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());

      IndexerSettingsHandler::with(
@@ -653,8 +662,8 @@ mod tests {
      let mut app = App::default();
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
-      app.data.radarr_data.selected_block.set_index(8);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
+      app.data.radarr_data.selected_block.set_index(1, 3);
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());

      IndexerSettingsHandler::with(
@@ -922,12 +931,12 @@ mod tests {
      app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
      app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
      app.data.radarr_data.selected_block =
-        BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
+        BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
      app
        .data
        .radarr_data
        .selected_block
-        .set_index(INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
+        .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
      app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());

      IndexerSettingsHandler::with(
@@ -311,12 +311,12 @@ mod tests {
      if torrent_protocol {
        assert_eq!(
          app.data.radarr_data.selected_block.blocks,
-          &EDIT_INDEXER_TORRENT_SELECTION_BLOCKS
+          EDIT_INDEXER_TORRENT_SELECTION_BLOCKS
        );
      } else {
        assert_eq!(
          app.data.radarr_data.selected_block.blocks,
-          &EDIT_INDEXER_NZB_SELECTION_BLOCKS
+          EDIT_INDEXER_NZB_SELECTION_BLOCKS
        );
      }
    }
@@ -570,7 +570,7 @@ mod tests {
      );
      assert_eq!(
        app.data.radarr_data.selected_block.blocks,
-        &INDEXER_SETTINGS_SELECTION_BLOCKS
+        INDEXER_SETTINGS_SELECTION_BLOCKS
      );
    }

@@ -141,10 +141,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
          .protocol;
        if protocol == "torrent" {
          self.app.data.radarr_data.selected_block =
-            BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
+            BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
        } else {
          self.app.data.radarr_data.selected_block =
-            BlockSelectionState::new(&EDIT_INDEXER_NZB_SELECTION_BLOCKS);
+            BlockSelectionState::new(EDIT_INDEXER_NZB_SELECTION_BLOCKS);
        }
      }
      _ => (),
@@ -192,7 +192,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
            .app
            .push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
          self.app.data.radarr_data.selected_block =
-            BlockSelectionState::new(&INDEXER_SETTINGS_SELECTION_BLOCKS);
+            BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
        }
        _ => (),
      },