Refactored the movie_details_popup data into the MovieDetailsModal so things are neater and to follow the same format I've already established for other modals

src/app/radarr/mod.rs

@@ -81,21 +81,26 @@ impl<'a> App<'a> {
           .await;
       }
       ActiveRadarrBlock::Cast | ActiveRadarrBlock::Crew => {
-        if self.data.radarr_data.movie_cast.items.is_empty()
-          || self.data.radarr_data.movie_crew.items.is_empty()
-        {
-          self
-            .dispatch_network_event(RadarrEvent::GetMovieCredits.into())
-            .await;
+        match self.data.radarr_data.movie_details_modal.as_ref() {
+          Some(movie_details_modal)
+            if movie_details_modal.movie_cast.items.is_empty()
+              || movie_details_modal.movie_crew.items.is_empty() =>
+          {
+            self
+              .dispatch_network_event(RadarrEvent::GetMovieCredits.into())
+              .await;
+          }
+          _ => (),
         }
       }
-      ActiveRadarrBlock::ManualSearch => {
-        if self.data.radarr_data.movie_releases.items.is_empty() {
+      ActiveRadarrBlock::ManualSearch => match self.data.radarr_data.movie_details_modal.as_ref() {
+        Some(movie_details_modal) if movie_details_modal.movie_releases.items.is_empty() => {
           self
             .dispatch_network_event(RadarrEvent::GetReleases.into())
             .await;
         }
-      }
+        _ => (),
+      },
       _ => (),
     }
 

src/app/radarr/radarr_tests.rs

@@ -7,7 +7,8 @@ mod tests {
     use crate::app::radarr::ActiveRadarrBlock;
     use crate::app::App;
     use crate::models::radarr_models::{Collection, CollectionMovie, Credit, Release};
-    use crate::models::StatefulTable;
+    use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
+
     use crate::network::radarr_network::RadarrEvent;
     use crate::network::NetworkEvent;
 
@@ -275,9 +276,7 @@ mod tests {
       let (mut app, mut sync_network_rx) = construct_app_unit();
 
       for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
-        app.data.radarr_data.movie_cast = StatefulTable::default();
-        app.data.radarr_data.movie_crew = StatefulTable::default();
-
+        app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
         app.dispatch_by_radarr_block(active_radarr_block).await;
 
         assert!(app.is_loading);
@@ -295,11 +294,11 @@ mod tests {
       let (mut app, mut sync_network_rx) = construct_app_unit();
 
       for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
-        app
-          .data
-          .radarr_data
+        let mut movie_details_modal = MovieDetailsModal::default();
+        movie_details_modal
           .movie_cast
           .set_items(vec![Credit::default()]);
+        app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
         app.dispatch_by_radarr_block(active_radarr_block).await;
 
@@ -318,11 +317,11 @@ mod tests {
       let (mut app, mut sync_network_rx) = construct_app_unit();
 
       for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
-        app
-          .data
-          .radarr_data
+        let mut movie_details_modal = MovieDetailsModal::default();
+        movie_details_modal
           .movie_crew
           .set_items(vec![Credit::default()]);
+        app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
         app.dispatch_by_radarr_block(active_radarr_block).await;
 
@@ -341,16 +340,14 @@ mod tests {
       let mut app = App::default();
 
       for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
-        app
-          .data
-          .radarr_data
+        let mut movie_details_modal = MovieDetailsModal::default();
+        movie_details_modal
           .movie_cast
           .set_items(vec![Credit::default()]);
-        app
-          .data
-          .radarr_data
+        movie_details_modal
           .movie_crew
           .set_items(vec![Credit::default()]);
+        app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
         app.dispatch_by_radarr_block(active_radarr_block).await;
 
@@ -363,6 +360,7 @@ mod tests {
     #[tokio::test]
     async fn test_dispatch_by_manual_search_block() {
       let (mut app, mut sync_network_rx) = construct_app_unit();
+      app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
 
       app
         .dispatch_by_radarr_block(&ActiveRadarrBlock::ManualSearch)
@@ -380,11 +378,11 @@ mod tests {
     #[tokio::test]
     async fn test_dispatch_by_manual_search_block_movie_releases_non_empty() {
       let mut app = App::default();
-      app
-        .data
-        .radarr_data
+      let mut movie_details_modal = MovieDetailsModal::default();
+      movie_details_modal
         .movie_releases
         .set_items(vec![Release::default()]);
+      app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       app
         .dispatch_by_radarr_block(&ActiveRadarrBlock::ManualSearch)