Merge branch 'trunk' into task/19812-handle-simplified-ui

Author: hassaanelgarem

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 -----
 * [***] [internal] A significant refactor to the app’s architecture was made to allow for the new simplified UI. Regression testing on the app’s main flows is needed. [#19817]
 
+
 21.4
 -----
 * [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717]

WordPress/Classes/Stores/StatsPeriodStore.swift

@@ -384,6 +384,12 @@ private extension StatsPeriodStore {
             return
         }
 
+        let group = DispatchGroup()
+
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching likes summary.")
+        }
         let likesOperation = PeriodOperation(service: service, for: period, date: date, limit: 14) { [weak self] (likes: StatsLikesSummaryTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching likes summary: \(String(describing: error?.localizedDescription))")
@@ -392,9 +398,17 @@ private extension StatsPeriodStore {
             DDLogInfo("Stats Period: Finished fetching likes summary.")
             DispatchQueue.main.async {
                 self?.receivedLikesSummary(likes, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching likes summary.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching posts.")
+        }
         let topPostsOperation = PeriodOperation(service: service, for: period, date: date) { [weak self] (posts: StatsTopPostsTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching posts: \(String(describing: error?.localizedDescription))")
@@ -404,9 +418,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedPostsAndPages(posts, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching posts.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching referrers.")
+        }
         let topReferrers = PeriodOperation(service: service, for: period, date: date) { [weak self] (referrers: StatsTopReferrersTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching referrers: \(String(describing: error?.localizedDescription))")
@@ -416,9 +438,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedReferrers(referrers, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching referrers.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching published.")
+        }
         let topPublished = PublishedPostOperation(service: service, for: period, date: date) { [weak self] (published: StatsPublishedPostsTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching published: \(String(describing: error?.localizedDescription))")
@@ -428,9 +458,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedPublished(published, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching published.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching clicks.")
+        }
         let topClicks = PeriodOperation(service: service, for: period, date: date) { [weak self] (clicks: StatsTopClicksTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching clicks: \(String(describing: error?.localizedDescription))")
@@ -440,9 +478,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedClicks(clicks, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching clicks.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching authors.")
+        }
         let topAuthors = PeriodOperation(service: service, for: period, date: date) { [weak self] (authors: StatsTopAuthorsTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching authors: \(String(describing: error?.localizedDescription))")
@@ -452,9 +498,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedAuthors(authors, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching authors.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching search terms.")
+        }
         let topSearchTerms = PeriodOperation(service: service, for: period, date: date) { [weak self] (searchTerms: StatsSearchTermTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching search terms: \(String(describing: error?.localizedDescription))")
@@ -464,9 +518,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedSearchTerms(searchTerms, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching search terms.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching countries.")
+        }
         let topCountries = PeriodOperation(service: service, for: period, date: date, limit: 0) { [weak self] (countries: StatsTopCountryTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching countries: \(String(describing: error?.localizedDescription))")
@@ -476,9 +538,17 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedCountries(countries, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching countries.")
+                    group.leave()
+                }
             }
         }
 
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching videos.")
+        }
         let topVideos = PeriodOperation(service: service, for: period, date: date) { [weak self] (videos: StatsTopVideosTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error fetching videos: \(String(describing: error?.localizedDescription))")
@@ -488,11 +558,19 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedVideos(videos, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching videos.")
+                    group.leave()
+                }
             }
         }
 
         // 'limit' in this context is used for the 'num' parameter for the 'file-downloads' endpoint.
         // 'num' relates to the "number of periods to include in the query".
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.enter()
+            DDLogInfo("Stats Period: Enter group fetching file downloads.")
+        }
         let topFileDownloads = PeriodOperation(service: service, for: period, date: date, limit: 1) { [weak self] (downloads: StatsFileDownloadsTimeIntervalData?, error: Error?) in
             if error != nil {
                 DDLogError("Stats Period: Error file downloads: \(String(describing: error?.localizedDescription))")
@@ -502,6 +580,10 @@ private extension StatsPeriodStore {
 
             DispatchQueue.main.async {
                 self?.receivedFileDownloads(downloads, error)
+                if FeatureFlag.statsNewAppearance.enabled {
+                    DDLogInfo("Stats Period: Leave group fetching file downloads.")
+                    group.leave()
+                }
             }
         }
 
@@ -516,6 +598,13 @@ private extension StatsPeriodStore {
                                       topVideos,
                                       topFileDownloads],
                                      waitUntilFinished: false)
+
+        if FeatureFlag.statsNewAppearance.enabled {
+            group.notify(queue: .main) { [weak self] in
+                DDLogInfo("Stats Period: Finished fetchAsyncData.")
+                self?.persistToCoreData()
+            }
+        }
     }
 
     func fetchSummaryLikesData(date: Date, period: StatsPeriodUnit) {

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -329,14 +329,19 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         setupWordPressExtensions()
 
-        if FeatureFlag.contentMigration.enabled {
+        if AppConfiguration.isWordPress,
+           FeatureFlag.contentMigration.enabled {
             // To prevent race condition, initialize the shared instance synchronously so it can listen to account change notifications.
             let _ = ContentMigrationCoordinator.shared
 
-            // Start proactively exporting WP data in the background if the conditions are fulfilled.
-            // This needs to be called after `setupWordPressExtensions` because it updates the stored data.
-            DispatchQueue.global().async {
-                ContentMigrationCoordinator.shared.startOnceIfNeeded()
+            let launchUrl = launchOptions[.url] as? URL
+            let exportUrl = URL(string: "\(AppScheme.wordpressMigrationV1.rawValue)\(WordPressExportRoute().path.removingPrefix("/"))")
+            if launchUrl != exportUrl {
+                // Start proactively exporting WP data in the background if the conditions are fulfilled.
+                // This needs to be called after `setupWordPressExtensions` because it updates the stored data.
+                DispatchQueue.global().async {
+                    ContentMigrationCoordinator.shared.startOnceIfNeeded()
+                }
             }
         }
 

WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift

@@ -6,25 +6,36 @@
         .init()
     }()
 
+    var previousMigrationError: MigrationError? {
+        guard let storedErrorValue = sharedPersistentRepository?.string(forKey: .exportErrorSharedKey) else {
+            return nil
+        }
+
+        return .init(rawValue: storedErrorValue)
+    }
+
     // MARK: Dependencies
 
     private let coreDataStack: CoreDataStack
     private let dataMigrator: ContentDataMigrating
     private let notificationCenter: NotificationCenter
     private let userPersistentRepository: UserPersistentRepository
+    private let sharedPersistentRepository: UserPersistentRepository?
     private let eligibilityProvider: ContentMigrationEligibilityProvider
     private let tracker: MigrationAnalyticsTracker
 
     init(coreDataStack: CoreDataStack = ContextManager.shared,
          dataMigrator: ContentDataMigrating = DataMigrator(),
          notificationCenter: NotificationCenter = .default,
          userPersistentRepository: UserPersistentRepository = UserDefaults.standard,
+         sharedPersistentRepository: UserPersistentRepository? = UserDefaults(suiteName: WPAppGroupName),
          eligibilityProvider: ContentMigrationEligibilityProvider = AppConfiguration(),
          tracker: MigrationAnalyticsTracker = .init()) {
         self.coreDataStack = coreDataStack
         self.dataMigrator = dataMigrator
         self.notificationCenter = notificationCenter
         self.userPersistentRepository = userPersistentRepository
+        self.sharedPersistentRepository = sharedPersistentRepository
         self.eligibilityProvider = eligibilityProvider
         self.tracker = tracker
 
@@ -34,7 +45,7 @@
         ensureBackupDataDeletedOnLogout()
     }
 
-    enum ContentMigrationCoordinatorError: LocalizedError {
+    enum MigrationError: String, LocalizedError {
         case ineligible
         case exportFailure
         case localDraftsNotSynced
@@ -58,30 +69,30 @@
     /// just let the user continue with the original intent in case of failure.
     ///
     /// - Parameter completion: Closure called after the export process completes.
-    func startAndDo(completion: ((Result<Void, ContentMigrationCoordinatorError>) -> Void)? = nil) {
+    func startAndDo(completion: ((Result<Void, MigrationError>) -> Void)? = nil) {
         guard eligibilityProvider.isEligibleForMigration else {
             tracker.trackContentExportEligibility(eligible: false)
-            completion?(.failure(.ineligible))
+            processResult(.failure(.ineligible), completion: completion)
             return
         }
 
         guard isLocalPostsSynced() else {
-            let error = ContentMigrationCoordinatorError.localDraftsNotSynced
+            let error = MigrationError.localDraftsNotSynced
             tracker.trackContentExportFailed(reason: error.localizedDescription)
-            completion?(.failure(error))
+            processResult(.failure(error), completion: completion)
             return
         }
 
         dataMigrator.exportData { [weak self] result in
             switch result {
             case .success:
                 self?.tracker.trackContentExportSucceeded()
-                completion?(.success(()))
+                self?.processResult(.success(()), completion: completion)
 
             case .failure(let error):
                 DDLogError("[Jetpack Migration] Error exporting data: \(error)")
                 self?.tracker.trackContentExportFailed(reason: error.localizedDescription)
-                completion?(.failure(.exportFailure))
+                self?.processResult(.failure(.exportFailure), completion: completion)
             }
         }
     }
@@ -147,6 +158,11 @@ private extension ContentMigrationCoordinator {
     /// This prevents the user from entering the migration flow and immediately gets shown with a login pop-up (since we couldn't migrate the authToken anymore).
     ///
     func ensureBackupDataDeletedOnLogout() {
+        // we only need to listen to changes from the WordPress side.
+        guard AppConfiguration.isWordPress else {
+            return
+        }
+
         notificationCenter.addObserver(forName: .WPAccountDefaultWordPressComAccountChanged, object: nil, queue: nil) { [weak self] notification in
             // nil notification object means it's a logout event.
             guard let self,
@@ -157,6 +173,30 @@ private extension ContentMigrationCoordinator {
             self.cleanupExportedDataIfNeeded()
         }
     }
+
+    /// A "middleware" logic that attempts to record (or clear) any migration error to the App Group space
+    /// before calling the completion block.
+    ///
+    /// - Parameters:
+    ///   - result: The `Result` object from the export process.
+    ///   - completion: Closure that'll be executed after the process completes.
+    func processResult(_ result: Result<Void, MigrationError>, completion: ((Result<Void, MigrationError>) -> Void)?) {
+        // make sure that we're only intercepting from the WordPress side.
+        guard AppConfiguration.isWordPress else {
+            completion?(result)
+            return
+        }
+
+        switch result {
+        case .success:
+            sharedPersistentRepository?.removeObject(forKey: .exportErrorSharedKey)
+
+        case .failure(let error):
+            sharedPersistentRepository?.set(error.rawValue, forKey: .exportErrorSharedKey)
+        }
+
+        completion?(result)
+    }
 }
 
 // MARK: - Content Migration Eligibility Provider
@@ -176,4 +216,5 @@ extension AppConfiguration: ContentMigrationEligibilityProvider {
 
 private extension String {
     static let oneOffMigrationKey = "wordpress_one_off_export"
+    static let exportErrorSharedKey = "wordpress_shared_export_error"
 }

WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift

@@ -8,6 +8,7 @@ class SiteStatsImmuTableRows {
     /// Helper method to create the rows for the Views and Visitors section
     ///
     static func viewVisitorsImmuTableRows(_ statsSummaryTimeIntervalData: StatsSummaryTimeIntervalData?,
+                                          selectedSegment: StatsSegmentedControlData.Segment,
                                           periodDate: Date,
                                           periodEndDate: Date? = nil,
                                           statsLineChartViewDelegate: StatsLineChartViewDelegate?,
@@ -62,12 +63,13 @@ class SiteStatsImmuTableRows {
             }
 
             let row = ViewsVisitorsRow(
-                    segmentsData: [viewsSegmentData, visitorsSegmentData],
-                    chartData: lineChartData,
-                    chartStyling: lineChartStyling,
-                    period: StatsPeriodUnit.day,
-                    statsLineChartViewDelegate: statsLineChartViewDelegate,
-                    siteStatsInsightsDelegate: siteStatsInsightsDelegate, xAxisDates: xAxisDates
+                segmentsData: [viewsSegmentData, visitorsSegmentData],
+                selectedSegment: selectedSegment,
+                chartData: lineChartData,
+                chartStyling: lineChartStyling,
+                period: StatsPeriodUnit.day,
+                statsLineChartViewDelegate: statsLineChartViewDelegate,
+                siteStatsInsightsDelegate: siteStatsInsightsDelegate, xAxisDates: xAxisDates
             )
             tableRows.append(row)
         }