refactor(ui): Simplified the popup delegation so all future UI is easier to implement

src/ui/sonarr_ui/system/system_details_ui.rs

@@ -10,7 +10,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SYSTEM
 use crate::models::sonarr_models::SonarrTask;
 use crate::models::Route;
 use crate::ui::sonarr_ui::system::{
-  draw_queued_events, draw_system_ui_layout, extract_task_props, TASK_TABLE_CONSTRAINTS,
+  draw_queued_events, extract_task_props, TASK_TABLE_CONSTRAINTS,
   TASK_TABLE_HEADERS,
 };
 use crate::ui::styles::ManagarrStyle;
@@ -20,7 +20,7 @@ use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup_over, DrawUi};
+use crate::ui::{draw_popup, DrawUi};
 
 #[cfg(test)]
 #[path = "system_details_ui_tests.rs"]
@@ -37,33 +37,27 @@ impl DrawUi for SystemDetailsUi {
     false
   }
 
-  fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
+  fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
     if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
       match active_sonarr_block {
         ActiveSonarrBlock::SystemLogs => {
-          draw_system_ui_layout(f, app, area);
           draw_logs_popup(f, app);
         }
         ActiveSonarrBlock::SystemTasks | ActiveSonarrBlock::SystemTaskStartConfirmPrompt => {
-          draw_popup_over(
+          draw_popup(
             f,
             app,
-            area,
-            draw_system_ui_layout,
             draw_tasks_popup,
             Size::Large,
           )
         }
-        ActiveSonarrBlock::SystemQueuedEvents => draw_popup_over(
+        ActiveSonarrBlock::SystemQueuedEvents => draw_popup(
           f,
           app,
-          area,
-          draw_system_ui_layout,
           draw_queued_events,
           Size::Medium,
         ),
         ActiveSonarrBlock::SystemUpdates => {
-          draw_system_ui_layout(f, app, area);
           draw_updates_popup(f, app);
         }
         _ => (),
@@ -158,7 +152,7 @@ fn draw_updates_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
   let updates = app.data.sonarr_data.updates.get_text();
   let block = title_block("Updates");
 
-  if !updates.is_empty() {
+  if !updates.is_empty() && !app.is_loading {
     let updates_paragraph = Paragraph::new(Text::from(updates))
       .block(borderless_block())
       .scroll((app.data.sonarr_data.updates.offset, 0));