Refresh stats after switching back to the app (#23643)

* Stats: Refresh current tab when view controller is not updated Relates to #23604. * Move adding observer code to viewWillAppear to match the removing code Relates to #23604.
wordpress-mobile · Oct 3, 2024 · 2f9b9a2 · 2f9b9a2
1 parent d30b801
commit 2f9b9a2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 13 deletions.
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
@@ -86,7 +86,7 @@ class SiteStatsInsightsTableViewController: SiteStatsBaseTableViewController, St
         viewModel?.removeListeners()
     }
 
-    private func refreshInsights(forceRefresh: Bool = false) {
+    func refreshInsights(forceRefresh: Bool = false) {
         viewModel?.refreshInsights(forceRefresh: forceRefresh)
     }
 

diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift
@@ -135,6 +135,15 @@ final class SiteStatsPeriodTableViewController: SiteStatsBaseTableViewController
         }
     }
 
+    func refreshData() {
+        guard viewIsVisible() else {
+            refreshControl.endRefreshing()
+            return
+        }
+        addViewModelListeners()
+        viewModel.refreshTrafficOverviewData(withDate: datePickerViewModel.date, forPeriod: datePickerViewModel.period)
+    }
+
 }
 
 // MARK: - Private Extension
@@ -190,15 +199,6 @@ private extension SiteStatsPeriodTableViewController {
         refreshData()
     }
 
-    func refreshData() {
-        guard viewIsVisible() else {
-            refreshControl.endRefreshing()
-            return
-        }
-        addViewModelListeners()
-        viewModel.refreshTrafficOverviewData(withDate: datePickerViewModel.date, forPeriod: datePickerViewModel.period)
-    }
-
     func applyTableUpdates() {
         tableHandler.diffableDataSource.apply(viewModel.tableViewSnapshot(), animatingDifferences: false)
     }

diff --git a/...ress/Classes/ViewRelated/Stats/Shared Views/Post Stats/PostStatsTableViewController.swift b/...ress/Classes/ViewRelated/Stats/Shared Views/Post Stats/PostStatsTableViewController.swift
@@ -44,11 +44,11 @@ class PostStatsTableViewController: UITableViewController, StoryboardLoadable {
         ImmuTable.registerRows(tableRowTypes(), tableView: tableView)
         initViewModel()
         trackAccessEvent()
-        addWillEnterForegroundObserver()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        addWillEnterForegroundObserver()
         JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(in: self, source: .stats)
     }
 

diff --git a/...sses/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift b/...sses/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift
@@ -52,6 +52,10 @@ class SiteStatsDetailTableViewController: UITableViewController, StoryboardLoada
         ImmuTable.registerRows(tableRowTypes(), tableView: tableView)
         tableView.register(SiteStatsTableHeaderView.defaultNib,
                            forHeaderFooterViewReuseIdentifier: SiteStatsTableHeaderView.defaultNibName)
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         addWillEnterForegroundObserver()
     }
 

diff --git a/...Related/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift b/...Related/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift
@@ -34,6 +34,10 @@ class SiteStatsInsightsDetailsTableViewController: SiteStatsBaseTableViewControl
         refreshControl.addTarget(self, action: #selector(refreshData), for: .valueChanged)
         tableView.estimatedSectionHeaderHeight = SiteStatsTableHeaderView.estimatedHeight
         ImmuTable.registerRows(tableRowTypes(), tableView: tableView)
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         addWillEnterForegroundObserver()
     }
 

diff --git a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
@@ -104,13 +104,13 @@ class SiteStatsDashboardViewController: UIViewController {
         setupFilterBar()
         restoreSelectedDateFromUserDefaults()
         restoreSelectedTabFromUserDefaults()
-        addWillEnterForegroundObserver()
         configureNavBar()
         view.accessibilityIdentifier = "stats-dashboard"
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        addWillEnterForegroundObserver()
         JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(in: self, source: .stats)
     }
 
@@ -244,18 +244,24 @@ private extension SiteStatsDashboardViewController {
                 pageViewController?.setViewControllers([insightsTableViewController],
                                                        direction: .forward,
                                                        animated: false)
+            } else {
+                insightsTableViewController.refreshInsights()
             }
         case .traffic:
             if oldSelectedTab != .traffic || pageViewControllerIsEmpty {
                 pageViewController?.setViewControllers([trafficTableViewController],
                                                        direction: .forward,
                                                        animated: false)
+            } else {
+                trafficTableViewController.refreshData()
             }
         case .subscribers:
             if oldSelectedTab != .subscribers || pageViewControllerIsEmpty {
                 pageViewController?.setViewControllers([subscribersViewController],
                                                        direction: .forward,
                                                        animated: false)
+            } else {
+                subscribersViewController.refreshData()
             }
         }
     }

diff --git a/WordPress/Classes/ViewRelated/Stats/Subscribers/StatsSubscribersViewController.swift b/WordPress/Classes/ViewRelated/Stats/Subscribers/StatsSubscribersViewController.swift
@@ -58,7 +58,7 @@ final class StatsSubscribersViewController: SiteStatsBaseTableViewController {
         cancellables = []
     }
 
-    @objc private func refreshData() {
+    @objc func refreshData() {
         viewModel.refreshData()
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {