From 67035b926687fbb40d79ae08b1b02436f8fdcde2 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Fri, 13 Jan 2023 17:38:31 -0800
Subject: [PATCH] Fixed: Monitoring episodes modal not closing after saving

---
 frontend/src/Series/Details/SeriesDetailsSeason.js       | 9 +++++----
 .../MonitoringOptionsModalContentConnector.js            | 3 +--
 frontend/src/Store/Actions/seriesActions.js              | 1 +
 src/Sonarr.Api.V3/SeasonPass/SeasonPassController.cs     | 2 +-
 src/Sonarr.Api.V3/Series/SeriesController.cs             | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Series/Details/SeriesDetailsSeason.js b/frontend/src/Series/Details/SeriesDetailsSeason.js
index 5a9128329..fd826e519 100644
--- a/frontend/src/Series/Details/SeriesDetailsSeason.js
+++ b/frontend/src/Series/Details/SeriesDetailsSeason.js
@@ -225,7 +225,8 @@ class SeriesDetailsSeason extends Component {
       episodeFileCount,
       totalEpisodeCount,
       monitoredEpisodeCount,
-      hasMonitoredEpisodes
+      hasMonitoredEpisodes,
+      sizeOnDisk
     } = getSeasonStatistics(items);
 
     const {
@@ -273,7 +274,7 @@ class SeriesDetailsSeason extends Component {
                     totalEpisodeCount={totalEpisodeCount}
                     monitoredEpisodeCount={monitoredEpisodeCount}
                     episodeFileCount={episodeFileCount}
-                    sizeOnDisk={statistics.sizeOnDisk}
+                    sizeOnDisk={sizeOnDisk}
                   />
                 </div>
               }
@@ -281,9 +282,9 @@ class SeriesDetailsSeason extends Component {
             />
 
             {
-              statistics.sizeOnDisk ?
+              sizeOnDisk ?
                 <div className={styles.sizeOnDisk}>
-                  {formatBytes(statistics.sizeOnDisk)}
+                  {formatBytes(sizeOnDisk)}
                 </div> :
                 null
             }
diff --git a/frontend/src/Series/MonitoringOptions/MonitoringOptionsModalContentConnector.js b/frontend/src/Series/MonitoringOptions/MonitoringOptionsModalContentConnector.js
index c7b9e8c17..cd3dd8a8f 100644
--- a/frontend/src/Series/MonitoringOptions/MonitoringOptionsModalContentConnector.js
+++ b/frontend/src/Series/MonitoringOptions/MonitoringOptionsModalContentConnector.js
@@ -70,8 +70,7 @@ MonitoringOptionsModalContentConnector.propTypes = {
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   dispatchUpdateMonitoringOptions: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(MonitoringOptionsModalContentConnector);
diff --git a/frontend/src/Store/Actions/seriesActions.js b/frontend/src/Store/Actions/seriesActions.js
index 3c695b675..8a0c741be 100644
--- a/frontend/src/Store/Actions/seriesActions.js
+++ b/frontend/src/Store/Actions/seriesActions.js
@@ -641,6 +641,7 @@ export const actionHandlers = handleThunks({
       }),
       dataType: 'json'
     }).request;
+
     promise.done((data) => {
       dispatch(fetchEpisodes({ seriesId: id }));
 
diff --git a/src/Sonarr.Api.V3/SeasonPass/SeasonPassController.cs b/src/Sonarr.Api.V3/SeasonPass/SeasonPassController.cs
index f152c76b2..be45658b0 100644
--- a/src/Sonarr.Api.V3/SeasonPass/SeasonPassController.cs
+++ b/src/Sonarr.Api.V3/SeasonPass/SeasonPassController.cs
@@ -53,7 +53,7 @@ namespace Sonarr.Api.V3.SeasonPass
                 _episodeMonitoredService.SetEpisodeMonitoredStatus(series, resource.MonitoringOptions);
             }
 
-            return Accepted();
+            return Accepted(new object());
         }
     }
 }
diff --git a/src/Sonarr.Api.V3/Series/SeriesController.cs b/src/Sonarr.Api.V3/Series/SeriesController.cs
index 344a084c0..06e80e855 100644
--- a/src/Sonarr.Api.V3/Series/SeriesController.cs
+++ b/src/Sonarr.Api.V3/Series/SeriesController.cs
@@ -284,7 +284,7 @@ namespace Sonarr.Api.V3.Series
         [NonAction]
         public void Handle(SeriesEditedEvent message)
         {
-            var resource = message.Series.ToResource();
+            var resource = GetSeriesResource(message.Series, false);
             resource.EpisodesChanged = message.EpisodesChanged;
             BroadcastResourceChange(ModelAction.Updated, resource);
         }