Merge pull request #474 from woocommerce/issue/434-updating-dashboard-ghosts-behavior

Updating Dashboard Ghosts Behavior

Author: jleandroperez

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -42,8 +42,8 @@ class DashboardViewController: UIViewController {
         configureView()
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         reloadData()
     }
 

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/PeriodDataViewController.swift

@@ -145,6 +145,12 @@ extension PeriodDataViewController {
 
 extension PeriodDataViewController {
 
+    /// Indicates if the receiver has Remote Stats, or not.
+    ///
+    var shouldDisplayGhostContent: Bool {
+        return orderStats == nil
+    }
+
     /// Displays the Placeholder Period Graph + Starts the Animation.
     /// Why is this public? Because the actual Sync OP is handled by StoreStatsViewController. We coordinate multiple
     /// placeholder animations from that spot!

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/StoreStatsViewController.swift

@@ -69,7 +69,7 @@ extension StoreStatsViewController {
     func syncAllStats(onCompletion: (() -> Void)? = nil) {
         let group = DispatchGroup()
 
-        displayGhostContent()
+        ensureGhostContentIsDisplayed()
 
         periodVCs.forEach { (vc) in
             group.enter()
@@ -97,6 +97,16 @@ extension StoreStatsViewController {
 //
 private extension StoreStatsViewController {
 
+    /// Displays the Ghost Placeholder whenever there is no visible data.
+    ///
+    func ensureGhostContentIsDisplayed() {
+        guard visibleChildViewController.shouldDisplayGhostContent else {
+            return
+        }
+
+        displayGhostContent()
+    }
+
     /// Locks UI Interaction and displays Ghost Placeholder animations.
     ///
     func displayGhostContent() {

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/TopPerformerDataViewController.swift

@@ -10,7 +10,11 @@ class TopPerformerDataViewController: UIViewController, IndicatorInfoProvider {
 
     // MARK: - Properties
 
-    public let granularity: StatGranularity
+    let granularity: StatGranularity
+
+    var hasTopEarnerStatsItems: Bool {
+        return (topEarnerStats?.items?.count ?? 0) > 0
+    }
 
     @IBOutlet private weak var tableView: IntrinsicTableView!
 
@@ -33,10 +37,6 @@ class TopPerformerDataViewController: UIViewController, IndicatorInfoProvider {
         return resultsController.fetchedObjects.first
     }
 
-    private var hasTopEarnerStatsItems: Bool {
-        return (topEarnerStats?.items?.count ?? 0) > 0
-    }
-
     private var tabDescription: String {
         switch granularity {
         case .day:

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/TopPerformersViewController.swift

@@ -62,7 +62,7 @@ extension TopPerformersViewController {
     func syncTopPerformers(onCompletion: (() -> Void)? = nil) {
         let group = DispatchGroup()
 
-        displayGhostContent()
+        ensureGhostContentIsDisplayed()
 
         dataVCs.forEach { vc in
             group.enter()
@@ -83,6 +83,16 @@ extension TopPerformersViewController {
 //
 private extension TopPerformersViewController {
 
+    /// Displays the Ghost Placeholder whenever there is no visible data.
+    ///
+    func ensureGhostContentIsDisplayed() {
+        guard visibleChildViewController.hasTopEarnerStatsItems == false else {
+            return
+        }
+
+        displayGhostContent()
+    }
+
     /// Locks UI Interaction and displays Ghost Placeholder animations.
     ///
     func displayGhostContent() {