Merge remote-tracking branch 'origin/trunk' into fix/skip-perform-on-confined-concurrency

dvdchr · dvdchr · commit 8ff226cd366d · 2022-12-12T13:37:42.000+07:00
diff --git a/Podfile b/Podfile
@@ -91,7 +91,7 @@ def shared_style_pods
 end
 
 def gutenberg_pods
-  gutenberg tag: 'v1.86.0-alpha1'
+  gutenberg tag: 'v1.86.0'
 end
 
 def gutenberg(options)
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,8 +1,11 @@
 21.4
 -----
+* [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717]
 * [*] Share extension navigation bar is no longer transparent [#19700]
-* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app. [#19759]
+* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app for users migrating from the WordPress app. [#19759]
 * [***] You can now migrate your site content to the Jetpack app without a hitch. [#19759]
+* [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193]
+* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590]
 
 21.3
 -----
diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m
@@ -105,6 +105,11 @@ - (void)prepareForDeletion
 {
     [super prepareForDeletion];
 
+    // delete stored password in the keychain for self-hosted sites.
+    if ([self.username length] > 0 && [self.xmlrpc length] > 0) {
+        self.password = nil;
+    }
+
     [_xmlrpcApi invalidateAndCancelTasks];
     [_wordPressOrgRestApi invalidateAndCancelTasks];
 }
diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
@@ -481,7 +481,7 @@ - (void)removeBlog:(Blog *)blog
         [accountService purgeAccountIfUnused:account];
     }
 
-    [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
+    [[ContextManager sharedInstance] saveContextAndWait:self.managedObjectContext];
     [WPAnalytics refreshMetadata];
 }
 
diff --git a/WordPress/Classes/Services/JetpackNotificationMigrationService.swift b/WordPress/Classes/Services/JetpackNotificationMigrationService.swift
@@ -22,7 +22,7 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer
     private let jetpackNotificationMigrationDefaultsKey = "jetpackNotificationMigrationDefaultsKey"
 
     private var jetpackMigrationPreventDuplicateNotifications: Bool {
-        return FeatureFlag.jetpackMigrationPreventDuplicateNotifications.enabled
+        return featureFlagStore.value(for: FeatureFlag.jetpackMigrationPreventDuplicateNotifications)
     }
 
     private var notificationSettingsService: NotificationSettingsService?
diff --git a/WordPress/Classes/Services/PostService.h b/WordPress/Classes/Services/PostService.h
@@ -160,6 +160,13 @@ forceDraftIfCreating:(BOOL)forceDraftIfCreating
            success:(nullable void (^)(void))success
            failure:(void (^)(NSError * _Nullable error))failure;
 
+/**
+ Creates a RemotePost from an AbstractPost to be used for API calls.
+
+ @param post The AbstractPost used to create the RemotePost
+ */
+- (RemotePost *)remotePostWithPost:(AbstractPost *)post;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/WordPress/Classes/Services/PostService.m b/WordPress/Classes/Services/PostService.m
@@ -814,7 +814,11 @@ - (RemotePost *)remotePostWithPost:(AbstractPost *)post
     remotePost.password = post.password;
     remotePost.type = @"post";
     remotePost.authorAvatarURL = post.authorAvatarURL;
-    remotePost.authorID = post.authorID;
+    // If a Post's authorID is 0 (the default Core Data value)
+    // or nil, don't send it to the API.
+    if (post.authorID.integerValue != 0) {
+        remotePost.authorID = post.authorID;
+    }
     remotePost.excerpt = post.mt_excerpt;
     remotePost.slug = post.wp_slug;
 
diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -330,6 +330,9 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         setupWordPressExtensions()
 
         if 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 {
diff --git a/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift b/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift
@@ -158,6 +158,17 @@ class BloggingRemindersScheduler {
         }
     }
 
+    /// Deletes backup reminders if it exists.
+    ///
+    static func deleteBackupReminders() {
+        guard FeatureFlag.contentMigration.enabled,
+              let sharedFileURL = sharedDataFileURL() else {
+            return
+        }
+
+        try? FileManager.default.removeItem(at: sharedFileURL)
+    }
+
     private static func copyStoreToSharedFile() {
         guard let store = try? defaultStore(),
               let sharedFileUrl = sharedDataFileURL() else {
diff --git a/WordPress/Classes/Utility/CoreDataHelper.swift b/WordPress/Classes/Utility/CoreDataHelper.swift
@@ -220,13 +220,12 @@ extension CoreDataStack {
         }
     }
 
+    // MARK: - Database Migration
+
     /// Creates a copy of the current open store and saves it to the specified destination
     /// - Parameter backupLocation: Location to save the store copy to
     func createStoreCopy(to backupLocation: URL) throws {
-        let (backupLocation, shmLocation, walLocation) = databaseFiles(for: backupLocation)
-        try? FileManager.default.removeItem(at: backupLocation)
-        try? FileManager.default.removeItem(at: shmLocation)
-        try? FileManager.default.removeItem(at: walLocation)
+        try? removeBackupData(from: backupLocation)
         guard let storeCoordinator = mainContext.persistentStoreCoordinator,
               let store = storeCoordinator.persistentStores.first else {
             throw ContextManager.ContextManagerError.missingCoordinatorOrStore
@@ -245,6 +244,15 @@ extension CoreDataStack {
                                                         withType: storeCopy.type)
     }
 
+    /// Removes any copy of the store from the backup location.
+    /// - Parameter backupLocation: Where the backup store is located.
+    func removeBackupData(from location: URL) throws {
+        let (backupLocation, shmLocation, walLocation) = databaseFiles(for: location)
+        try FileManager.default.removeItem(at: backupLocation)
+        try FileManager.default.removeItem(at: shmLocation)
+        try FileManager.default.removeItem(at: walLocation)
+    }
+
     /// Replaces the current active store with the database at the specified location.
     ///
     /// The following steps are performed:
diff --git a/WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift b/WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift
@@ -1,29 +1,37 @@
 /// Encapsulates logic related to content migration from WordPress to Jetpack.
 ///
-class ContentMigrationCoordinator {
+@objc class ContentMigrationCoordinator: NSObject {
 
-    static var shared: ContentMigrationCoordinator = {
+    @objc static var shared: ContentMigrationCoordinator = {
         .init()
     }()
 
     // MARK: Dependencies
 
     private let coreDataStack: CoreDataStack
     private let dataMigrator: ContentDataMigrating
+    private let notificationCenter: NotificationCenter
     private let userPersistentRepository: UserPersistentRepository
     private let eligibilityProvider: ContentMigrationEligibilityProvider
     private let tracker: MigrationAnalyticsTracker
 
     init(coreDataStack: CoreDataStack = ContextManager.shared,
          dataMigrator: ContentDataMigrating = DataMigrator(),
+         notificationCenter: NotificationCenter = .default,
          userPersistentRepository: UserPersistentRepository = UserDefaults.standard,
          eligibilityProvider: ContentMigrationEligibilityProvider = AppConfiguration(),
          tracker: MigrationAnalyticsTracker = .init()) {
         self.coreDataStack = coreDataStack
         self.dataMigrator = dataMigrator
+        self.notificationCenter = notificationCenter
         self.userPersistentRepository = userPersistentRepository
         self.eligibilityProvider = eligibilityProvider
         self.tracker = tracker
+
+        super.init()
+
+        // register for account change notification.
+        ensureBackupDataDeletedOnLogout()
     }
 
     enum ContentMigrationCoordinatorError: LocalizedError {
@@ -99,9 +107,25 @@ class ContentMigrationCoordinator {
             completion?()
         }
     }
+
+    /// Attempts to clean up the exported data by re-exporting user content if they're still eligible, or deleting them otherwise.
+    /// Re-exporting user content ensures that the exported data will match the latest state of Account and Blogs.
+    ///
+    @objc func cleanupExportedDataIfNeeded() {
+        // try to re-export the user content if they're still eligible.
+        startAndDo { [weak self] result in
+            switch result {
+            case .failure(let error) where error == .ineligible:
+                // if the user is no longer eligible, ensure that any exported contents are deleted.
+                self?.dataMigrator.deleteExportedData()
+            default:
+                break
+            }
+        }
+    }
 }
 
-// MARK: - Preflights Local Draft Check
+// MARK: - Private Helpers
 
 private extension ContentMigrationCoordinator {
 
@@ -119,11 +143,26 @@ private extension ContentMigrationCoordinator {
         return count == 0
     }
 
+    /// When the user logs out, ensure that any exported data is deleted if it exists at the backup location.
+    /// 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() {
+        notificationCenter.addObserver(forName: .WPAccountDefaultWordPressComAccountChanged, object: nil, queue: nil) { [weak self] notification in
+            // nil notification object means it's a logout event.
+            guard let self,
+                  notification.object == nil else {
+                return
+            }
+
+            self.cleanupExportedDataIfNeeded()
+        }
+    }
 }
 
 // MARK: - Content Migration Eligibility Provider
 
 protocol ContentMigrationEligibilityProvider {
+    /// Determines if we should export user's content data in the current app state.
     var isEligibleForMigration: Bool { get }
 }
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -1699,6 +1699,11 @@ - (void)confirmRemoveSite
     BlogService *blogService = [[BlogService alloc] initWithManagedObjectContext:context];
     [blogService removeBlog:self.blog];
     [[WordPressAppDelegate shared] trackLogoutIfNeeded];
+
+    if ([Feature enabled:FeatureFlagContentMigration] && [AppConfiguration isWordPress]) {
+        [ContentMigrationCoordinator.shared cleanupExportedDataIfNeeded];
+    }
+
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController.m
@@ -709,6 +709,11 @@ - (void)confirmRemoveSiteForIndexPath:(NSIndexPath *)indexPath
     NSManagedObjectContext *context = [[ContextManager sharedInstance] mainContext];
     BlogService *blogService = [[BlogService alloc] initWithManagedObjectContext:context];
     [blogService removeBlog:blog];
+
+    if ([Feature enabled:FeatureFlagContentMigration] && [AppConfiguration isWordPress]) {
+        [ContentMigrationCoordinator.shared cleanupExportedDataIfNeeded];
+    }
+
     [self.tableView reloadData];
 }
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift b/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-class DynamicHeightCollectionView: AccessibleCollectionView {
+class DynamicHeightCollectionView: UICollectionView {
     override func layoutSubviews() {
         super.layoutSubviews()
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift b/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift
@@ -37,6 +37,14 @@ class TopicsCollectionView: DynamicHeightCollectionView {
     func collapse() {
         coordinator?.changeState(.collapsed)
     }
+
+    override func accessibilityElementCount() -> Int {
+        guard let dataSource else {
+            return 0
+        }
+
+        return dataSource.collectionView(self, numberOfItemsInSection: 0)
+    }
 }
 
 extension TopicsCollectionView: ReaderTopicCollectionViewCoordinatorDelegate {
diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift
@@ -319,15 +319,17 @@ class SiteStatsInsightsDetailsViewModel: Observable {
                 }
             }
         case .insightsFollowersWordPress, .insightsFollowersEmail, .insightsFollowerTotals:
-            let status = statSection == .insightsFollowersWordPress ? insightsStore.allDotComFollowersStatus : insightsStore.allEmailFollowersStatus
-            let type: InsightType = statSection == .insightsFollowersWordPress ? .allDotComFollowers : .allEmailFollowers
+            let status = insightsStore.followersTotalsStatus
+            let type: InsightType = .followersTotals
             return insightsImmuTable(for: (type, status)) {
                 var rows = [ImmuTableRow]()
                 rows.append(TotalInsightStatsRow(dataRow: createFollowerTotalInsightsRow(), statSection: .insightsFollowerTotals, siteStatsInsightsDelegate: nil))
 
-                let dotComFollowersCount = insightsStore.getAllDotComFollowers()?.dotComFollowersCount ?? 0
-                let emailFollowersCount = insightsStore.getAllEmailFollowers()?.emailFollowersCount ?? 0
+                let dotComFollowersCount = insightsStore.getDotComFollowers()?.dotComFollowersCount ?? 0
+                let emailFollowersCount = insightsStore.getEmailFollowers()?.emailFollowersCount ?? 0
                 let publicizeCount = insightsStore.getPublicizeCount()
+                let totalFollowers = insightsStore.getTotalFollowerCount()
+                let totalFollowersCountManual = dotComFollowersCount + emailFollowersCount + publicizeCount
 
                 if dotComFollowersCount > 0 || emailFollowersCount > 0 || publicizeCount > 0 {
                     let chartViewModel = StatsFollowersChartViewModel(dotComFollowersCount: dotComFollowersCount,
@@ -527,8 +529,8 @@ class SiteStatsInsightsDetailsViewModel: Observable {
                 forceRefresh: forceRefresh))
     }
 
-    func refreshFollowers() {
-        ActionDispatcher.dispatch(InsightAction.refreshFollowers)
+    func refreshFollowers(forceRefresh: Bool = true) {
+        ActionDispatcher.dispatch(InsightAction.refreshInsights(forceRefresh: forceRefresh))
     }
 
     func refreshComments() {
@@ -634,7 +636,7 @@ private extension SiteStatsInsightsDetailsViewModel {
     func queryForInsightStatSection(_ statSection: StatSection) -> InsightQuery? {
         switch statSection {
         case .insightsFollowersWordPress, .insightsFollowersEmail, .insightsFollowerTotals:
-            return .allFollowers
+            return .insights // use .insights here which is same as top level insights screen
         case .insightsCommentsAuthors, .insightsCommentsPosts, .insightsCommentsTotals:
             return .allComments
         case .insightsTagsAndCategories:
@@ -692,11 +694,11 @@ private extension SiteStatsInsightsDetailsViewModel {
 
         switch followerType {
         case .insightsFollowersWordPress:
-            followers = insightsStore.getAllDotComFollowers()?.topDotComFollowers ?? []
-            totalFollowers = insightsStore.getAllDotComFollowers()?.dotComFollowersCount
+            followers = insightsStore.getDotComFollowers()?.topDotComFollowers ?? []
+            totalFollowers = insightsStore.getDotComFollowers()?.dotComFollowersCount
         case .insightsFollowersEmail:
-            followers = insightsStore.getAllEmailFollowers()?.topEmailFollowers ?? []
-            totalFollowers = insightsStore.getAllEmailFollowers()?.emailFollowersCount
+            followers = insightsStore.getEmailFollowers()?.topEmailFollowers ?? []
+            totalFollowers = insightsStore.getEmailFollowers()?.emailFollowersCount
         default:
             break
         }
diff --git a/WordPress/Classes/ViewRelated/System/Action Sheet/BloggingPromptsHeaderView.swift b/WordPress/Classes/ViewRelated/System/Action Sheet/BloggingPromptsHeaderView.swift
@@ -58,7 +58,7 @@ private extension BloggingPromptsHeaderView {
     func configureStrings() {
         titleLabel.text = Strings.title
         infoButton.accessibilityLabel = Strings.infoButtonAccessibilityLabel
-        answerPromptButton.titleLabel?.text = Strings.answerButtonTitle
+        answerPromptButton.setTitle(Strings.answerButtonTitle, for: .normal)
         answeredLabel.text = Strings.answeredLabelTitle
         shareButton.titleLabel?.text = Strings.shareButtonTitle
     }
diff --git a/WordPress/Jetpack/Classes/Utility/DataMigrator.swift b/WordPress/Jetpack/Classes/Utility/DataMigrator.swift
@@ -1,6 +1,16 @@
 protocol ContentDataMigrating {
+    /// Exports user content data to a shared location that's accessible by the Jetpack app.
+    ///
+    /// - Parameter completion: Closure called after the export process completes.
     func exportData(completion: ((Result<Void, DataMigrationError>) -> Void)?)
+
+    /// Imports user's WordPress content data from the shared location.
+    ///
+    /// - Parameter completion: Closure called after the export process completes.
     func importData(completion: ((Result<Void, DataMigrationError>) -> Void)?)
+
+    /// Deletes any exported user content at the shared location if it exists.
+    func deleteExportedData()
 }
 
 enum DataMigrationError: LocalizedError {
@@ -83,6 +93,26 @@ extension DataMigrator: ContentDataMigrating {
         BloggingRemindersScheduler.handleRemindersMigration()
         completion?(.success(()))
     }
+
+    func deleteExportedData() {
+        guard let backupLocation,
+              let sharedDefaults else {
+            return
+        }
+
+        // mark this as false regardless if any of the steps below fails.
+        // this serves as the first stopgap that prevents the migration process on the Jetpack side.
+        isDataReadyToMigrate = false
+
+        // remove database backup
+        try? coreDataStack.removeBackupData(from: backupLocation)
+
+        // remove user defaults backup
+        sharedDefaults.removeObject(forKey: DefaultsWrapper.dictKey)
+
+        // remove blogging reminders backup
+        BloggingRemindersScheduler.deleteBackupReminders()
+    }
 }
 
 // MARK: - Private Functions
diff --git a/WordPress/UITestsFoundation/Screens/Editor/BlockEditorScreen.swift b/WordPress/UITestsFoundation/Screens/Editor/BlockEditorScreen.swift
@@ -39,6 +39,7 @@ public class BlockEditorScreen: ScreenObject {
      */
     public func enterTextInTitle(text: String) -> BlockEditorScreen {
         let titleView = app.otherElements["Post title. Empty"].firstMatch // Uses a localized string
+        XCTAssert(titleView.waitForExistence(timeout: 3), "Title View does not exist!")
 
         titleView.tap()
         titleView.typeText(text)
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
diff --git a/WordPress/WordPressStatsWidgets/SiteListProvider.swift b/WordPress/WordPressStatsWidgets/SiteListProvider.swift
diff --git a/WordPress/WordPressTest/Classes/Stores/StatsInsightsStoreTests.swift b/WordPress/WordPressTest/Classes/Stores/StatsInsightsStoreTests.swift
diff --git a/WordPress/WordPressTest/ContentMigrationCoordinatorTests.swift b/WordPress/WordPressTest/ContentMigrationCoordinatorTests.swift
diff --git a/WordPress/WordPressTest/DataMigratorTests.swift b/WordPress/WordPressTest/DataMigratorTests.swift
diff --git a/WordPress/WordPressTest/MediaURLExporterTests.swift b/WordPress/WordPressTest/MediaURLExporterTests.swift
diff --git a/WordPress/WordPressTest/Services/PostServiceWPComTests.swift b/WordPress/WordPressTest/Services/PostServiceWPComTests.swift

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,11 @@ - (void)prepareForDeletion`
`105`	`105`	`{`
`106`	`106`	`[super prepareForDeletion];`
`107`	`107`
	`108`	`+ // delete stored password in the keychain for self-hosted sites.`
	`109`	`+ if ([self.username length] > 0 && [self.xmlrpc length] > 0) {`
	`110`	`+ self.password = nil;`
	`111`	`+ }`
	`112`	`+`
`108`	`113`	`[_xmlrpcApi invalidateAndCancelTasks];`
`109`	`114`	`[_wordPressOrgRestApi invalidateAndCancelTasks];`
`110`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ - (void)removeBlog:(Blog *)blog`
`481`	`481`	`[accountService purgeAccountIfUnused:account];`
`482`	`482`	`}`
`483`	`483`
`484`		`- [[ContextManager sharedInstance] saveContext:self.managedObjectContext];`
	`484`	`+ [[ContextManager sharedInstance] saveContextAndWait:self.managedObjectContext];`
`485`	`485`	`[WPAnalytics refreshMetadata];`
`486`	`486`	`}`
`487`	`487`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer`
`22`	`22`	`private let jetpackNotificationMigrationDefaultsKey = "jetpackNotificationMigrationDefaultsKey"`
`23`	`23`
`24`	`24`	`private var jetpackMigrationPreventDuplicateNotifications: Bool {`
`25`		`- return FeatureFlag.jetpackMigrationPreventDuplicateNotifications.enabled`
	`25`	`+ return featureFlagStore.value(for: FeatureFlag.jetpackMigrationPreventDuplicateNotifications)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private var notificationSettingsService: NotificationSettingsService?`