fix: Blocklist Item ID passed in the DeleteBlocklistItem event when sent to the networking channel

This commit is contained in:
2024-12-17 15:03:06 -07:00
parent 1d1e42aeb1
commit a308b8fe95
7 changed files with 42 additions and 59 deletions
@@ -160,7 +160,7 @@ mod tests {
#[case(
ActiveRadarrBlock::Blocklist,
ActiveRadarrBlock::DeleteBlocklistItemPrompt,
RadarrEvent::DeleteBlocklistItem(None)
RadarrEvent::DeleteBlocklistItem(3)
)]
#[case(
ActiveRadarrBlock::Blocklist,
@@ -361,7 +361,7 @@ mod tests {
#[case(
ActiveRadarrBlock::Blocklist,
ActiveRadarrBlock::DeleteBlocklistItemPrompt,
RadarrEvent::DeleteBlocklistItem(None)
RadarrEvent::DeleteBlocklistItem(3)
)]
#[case(
ActiveRadarrBlock::Blocklist,
@@ -540,6 +540,21 @@ mod tests {
}
})
}
#[test]
fn test_extract_blocklist_item_id() {
let mut app = App::default();
app.data.radarr_data.blocklist.set_items(blocklist_vec());
let blocklist_item_id = BlocklistHandler::with(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::Blocklist,
None,
).extract_blocklist_item_id();
assert_eq!(blocklist_item_id, 3);
}
#[test]
fn test_blocklist_handler_not_ready_when_loading() {
+12 -2
View File
@@ -28,6 +28,16 @@ impl<'a, 'b> BlocklistHandler<'a, 'b> {
self.app.data.radarr_data.blocklist,
BlocklistItem
);
fn extract_blocklist_item_id(&self) -> i64 {
self
.app
.data
.radarr_data
.blocklist
.current_selection()
.id
}
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a, 'b> {
@@ -99,7 +109,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
ActiveRadarrBlock::DeleteBlocklistItemPrompt => {
if self.app.data.radarr_data.prompt_confirm {
self.app.data.radarr_data.prompt_confirm_action =
Some(RadarrEvent::DeleteBlocklistItem(None));
Some(RadarrEvent::DeleteBlocklistItem(self.extract_blocklist_item_id()));
}
self.app.pop_navigation_stack();
@@ -152,7 +162,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
if key == DEFAULT_KEYBINDINGS.confirm.key {
self.app.data.radarr_data.prompt_confirm = true;
self.app.data.radarr_data.prompt_confirm_action =
Some(RadarrEvent::DeleteBlocklistItem(None));
Some(RadarrEvent::DeleteBlocklistItem(self.extract_blocklist_item_id()));
self.app.pop_navigation_stack();
}