UI Modernization: Posts & Pages 📦

Podfile

@@ -51,7 +51,7 @@ end
 
 def wordpress_kit
   # Anything compatible with 8.9, starting from 8.9.1 which has a breaking change fix
-  pod 'WordPressKit', '~> 8.9', '>= 8.9.1'
+  pod 'WordPressKit', '~> 8.10'
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''

Podfile.lock

@@ -73,7 +73,7 @@ PODS:
     - WordPressKit (~> 8.7-beta)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (8.9.1):
+  - WordPressKit (8.10.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -126,14 +126,16 @@ DEPENDENCIES:
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
   - WordPressAuthenticator (>= 7.2.1, ~> 7.2)
-  - WordPressKit (>= 8.9.1, ~> 8.9)
+  - WordPressKit (~> 8.10)
   - WordPressShared (~> 2.2)
   - WordPressUI (~> 1.15)
   - WPMediaPicker (>= 1.8.10, ~> 1.8)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -164,7 +166,6 @@ SPEC REPOS:
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
     - WordPressAuthenticator
-    - WordPressKit
     - WordPressShared
     - WordPressUI
     - WPMediaPicker
@@ -222,7 +223,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
   WordPressAuthenticator: eb60491871a2b8819017deed2970b054d2678547
-  WordPressKit: e774ca87068b8ea02bbb0bd0b75b98aa5d722cb9
+  WordPressKit: 30510174ad90a997acef42a5880bdda45c5c66e9
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   WPMediaPicker: 332812329cbdc672cdb385b8ac3a389f668d3012
@@ -236,6 +237,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: d1c39154c0208187cdbc28e2ef2b968f382fdf4f
+PODFILE CHECKSUM: 87283d92c99164bd6b27423cd2474decb698219e
 
 COCOAPODS: 1.14.2

WordPress/Classes/Services/PostCoordinator.swift

@@ -2,6 +2,10 @@ import Aztec
 import Foundation
 import WordPressFlux
 
+protocol PostCoordinatorDelegate: AnyObject {
+    func postCoordinator(_ postCoordinator: PostCoordinator, promptForPasswordForBlog blog: Blog)
+}
+
 class PostCoordinator: NSObject {
 
     enum SavingError: Error {
@@ -17,8 +21,11 @@ class PostCoordinator: NSObject {
         coreDataStack.mainContext
     }
 
+    weak var delegate: PostCoordinatorDelegate?
+
     private let queue = DispatchQueue(label: "org.wordpress.postcoordinator")
 
+    private var pendingDeletionPostIDs: Set<NSManagedObjectID> = []
     private var observerUUIDs: [AbstractPost: UUID] = [:]
 
     private let mediaCoordinator: MediaCoordinator
@@ -469,6 +476,88 @@ class PostCoordinator: NSObject {
             self.actionDispatcherFacade.dispatch(NoticeAction.post(model.notice))
         }
     }
+
+    // MARK: - Trash/Delete
+
+    func isDeleting(_ post: AbstractPost) -> Bool {
+        pendingDeletionPostIDs.contains(post.objectID)
+    }
+
+    /// Moves the post to trash or delets it permanently in case it's already in trash.
+    @MainActor
+    func delete(_ post: AbstractPost) async {
+        assert(post.managedObjectContext == mainContext)
+
+        WPAnalytics.track(.postListTrashAction, withProperties: propertiesForAnalytics(for: post))
+
+        setPendingDeletion(true, post: post)
+
+        let originalStatus = post.status
+        let trashed = (post.status == .trash)
+
+        let repository = PostRepository(coreDataStack: ContextManager.shared)
+        do {
+            try await repository.trash(TaggedManagedObjectID(post))
+
+            if trashed {
+                cancelAnyPendingSaveOf(post: post)
+                MediaCoordinator.shared.cancelUploadOfAllMedia(for: post)
+            }
+
+            // Remove the trashed post from spotlight
+            SearchManager.shared.deleteSearchableItem(post)
+
+            let message: String
+            if post is Post {
+                message = NSLocalizedString("postsList.movePostToTrash.message", value: "Post moved to trash", comment: "A short message explaining that a post was moved to the trash bin.")
+            } else {
+                message = NSLocalizedString("postsList.movePageToTrash.message", value: "Page moved to trash", comment: "A short message explaining that a page was moved to the trash bin.")
+            }
+
+            let notice = Notice(title: message)
+            ActionDispatcher.dispatch(NoticeAction.dismiss)
+            ActionDispatcher.dispatch(NoticeAction.post(notice))
+
+            setPendingDeletion(false, post: post)
+        } catch {
+            if let error = error as NSError?, error.code == Constants.httpCodeForbidden {
+                delegate?.postCoordinator(self, promptForPasswordForBlog: post.blog)
+            } else {
+                WPError.showXMLRPCErrorAlert(error)
+            }
+
+            setPendingDeletion(false, post: post)
+        }
+    }
+
+    private func setPendingDeletion(_ isDeleting: Bool, post: AbstractPost) {
+        if isDeleting {
+            pendingDeletionPostIDs.insert(post.objectID)
+        } else {
+            pendingDeletionPostIDs.remove(post.objectID)
+        }
+        NotificationCenter.default.post(name: .postCoordinatorDidUpdate, object: self, userInfo: [
+            NSUpdatedObjectsKey: Set([post])
+        ])
+    }
+
+    private func propertiesForAnalytics(for post: AbstractPost) -> [String: AnyObject] {
+        var properties = [String: AnyObject]()
+        properties["type"] = ((post is Post) ? "post" : "page") as AnyObject
+        if let dotComID = post.blog.dotComID {
+            properties[WPAppAnalyticsKeyBlogID] = dotComID
+        }
+        return properties
+    }
+}
+
+private struct Constants {
+    static let httpCodeForbidden = 403
+}
+
+extension Foundation.Notification.Name {
+    /// Contains a set of updated objects under the `NSUpdatedObjectsKey` key
+    static let postCoordinatorDidUpdate = Foundation.Notification.Name("org.automattic.postCoordinatorDidUpdate")
 }
 
 // MARK: - Automatic Uploads

WordPress/Classes/Services/PostRepository.swift

@@ -231,3 +231,210 @@ final class PostRepository {
     }
 
 }
+
+// MARK: - Posts/Pages List
+
+private final class PostRepositoryPostsSerivceRemoteOptions: NSObject, PostServiceRemoteOptions {
+    struct Options {
+        var statuses: [String]?
+        var number: Int = 100
+        var offset: Int = 0
+        var order: PostServiceResultsOrder = .descending
+        var orderBy: PostServiceResultsOrdering = .byDate
+        var authorID: NSNumber?
+        var search: String?
+        var meta: String? = "autosave"
+        var tag: String?
+    }
+
+    var options: Options
+
+    init(options: Options) {
+        self.options = options
+    }
+
+    func statuses() -> [String]? {
+        options.statuses
+    }
+
+    func number() -> NSNumber {
+        NSNumber(value: options.number)
+    }
+
+    func offset() -> NSNumber {
+        NSNumber(value: options.offset)
+    }
+
+    func order() -> PostServiceResultsOrder {
+        options.order
+    }
+
+    func orderBy() -> PostServiceResultsOrdering {
+        options.orderBy
+    }
+
+    func authorID() -> NSNumber? {
+        options.authorID
+    }
+
+    func search() -> String? {
+        options.search
+    }
+
+    func meta() -> String? {
+        options.meta
+    }
+
+    func tag() -> String! {
+        options.tag
+    }
+}
+
+private extension PostServiceRemote {
+
+    func getPosts(ofType type: String, options: PostRepositoryPostsSerivceRemoteOptions) async throws -> [RemotePost] {
+        try await withCheckedThrowingContinuation { continuation in
+            self.getPostsOfType(type, options: self.dictionary(with: options), success: {
+                continuation.resume(returning: $0 ?? [])
+            }, failure: {
+                continuation.resume(throwing: $0!)
+            })
+        }
+    }
+}
+
+extension PostRepository {
+
+    /// Fetch posts or pages from the given site page by page. All fetched posts are saved to the local database.
+    ///
+    /// - Parameters:
+    ///   - type: `Post.self` and `Page.self` are the only acceptable types.
+    ///   - statuses: Filter posts or pages with given status.
+    ///   - authorUserID: Filter posts or pages that are authored by given user.
+    ///   - offset: The position of the paginated request. Pass 0 for the first page and count of already fetched results for following pages.
+    ///   - number: Number of posts or pages should be fetched.
+    ///   - blogID: The blog from which to fetch posts or pages
+    /// - Returns: Object identifiers of the fetched posts.
+    /// - SeeAlso: https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/posts/
+    func paginate<P: AbstractPost>(
+        type: P.Type = P.self,
+        statuses: [BasePost.Status],
+        authorUserID: NSNumber? = nil,
+        offset: Int,
+        number: Int,
+        in blogID: TaggedManagedObjectID<Blog>
+    ) async throws -> [TaggedManagedObjectID<P>] {
+        try await fetch(
+            type: type,
+            statuses: statuses,
+            authorUserID: authorUserID,
+            range: offset..<(offset + max(number, 0)),
+            orderBy: .byDate,
+            descending: true,
+            // Only delete other local posts if the current call is the first pagination request.
+            deleteOtherLocalPosts: offset == 0,
+            in: blogID
+        )
+    }
+
+    /// Search posts or pages in the given site. All fetched posts are saved to the local database.
+    ///
+    /// - Parameters:
+    ///   - type: `Post.self` and `Page.self` are the only acceptable types.
+    ///   - input: The text input from user. Or `nil` for searching all posts or pages.
+    ///   - statuses: Filter posts or pages with given status.
+    ///   - authorUserID: Filter posts or pages that are authored by given user.
+    ///   - limit: Number of posts or pages should be fetched.
+    ///   - orderBy: The property by which to sort posts or pages.
+    ///   - descending: Whether to sort the results in descending order.
+    ///   - blogID: The blog from which to search posts or pages
+    /// - Returns: Object identifiers of the search result.
+    /// - SeeAlso: https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/posts/
+    func search<P: AbstractPost>(
+        type: P.Type = P.self,
+        input: String?,
+        statuses: [BasePost.Status],
+        authorUserID: NSNumber? = nil,
+        limit: Int,
+        orderBy: PostServiceResultsOrdering,
+        descending: Bool,
+        in blogID: TaggedManagedObjectID<Blog>
+    ) async throws -> [TaggedManagedObjectID<P>] {
+        try await fetch(
+            type: type,
+            searchInput: input,
+            statuses: statuses,
+            authorUserID: authorUserID,
+            range: 0..<max(limit, 0),
+            orderBy: orderBy,
+            descending: descending,
+            deleteOtherLocalPosts: false,
+            in: blogID
+        )
+    }
+
+    private func fetch<P: AbstractPost>(
+        type: P.Type,
+        searchInput: String? = nil,
+        statuses: [BasePost.Status]?,
+        authorUserID: NSNumber?,
+        range: Range<Int>,
+        orderBy: PostServiceResultsOrdering = .byDate,
+        descending: Bool = true,
+        deleteOtherLocalPosts: Bool,
+        in blogID: TaggedManagedObjectID<Blog>
+    ) async throws -> [TaggedManagedObjectID<P>] {
+        assert(type == Post.self || type == Page.self, "Only support fetching Post or Page")
+        assert(range.lowerBound >= 0)
+
+        let postType: String
+        if type == Post.self {
+            postType = "post"
+        } else if type == Page.self {
+            postType = "page"
+        } else {
+            // There is an assertion above to ensure the app doesn't fall into this case.
+            return []
+        }
+
+        let remote = try await coreDataStack.performQuery { [remoteFactory] context in
+            let blog = try context.existingObject(with: blogID)
+            return remoteFactory.forBlog(blog)
+        }
+        guard let remote else {
+            throw PostRepository.Error.remoteAPIUnavailable
+        }
+
+        let options = PostRepositoryPostsSerivceRemoteOptions(options: .init(
+            statuses: statuses?.strings,
+            number: range.count,
+            offset: range.lowerBound,
+            order: descending ? .descending : .ascending,
+            orderBy: orderBy,
+            authorID: authorUserID,
+            search: searchInput
+        ))
+        let remotePosts = try await remote.getPosts(ofType: postType, options: options)
+
+        let updatedPosts = try await coreDataStack.performAndSave { context in
+            let updatedPosts = PostHelper.merge(
+                remotePosts,
+                ofType: postType,
+                withStatuses: statuses?.strings,
+                byAuthor: authorUserID,
+                for: try context.existingObject(with: blogID),
+                purgeExisting: deleteOtherLocalPosts,
+                in: context
+            )
+            return updatedPosts.map {
+                guard let post = $0 as? P else {
+                    fatalError("Expecting a \(postType) as \(type), but got \($0)")
+                }
+                return TaggedManagedObjectID(post)
+            }
+        }
+
+        return updatedPosts
+    }
+
+}

WordPress/Classes/Services/PostServiceOptions.h

@@ -25,5 +25,6 @@
 @property (nonatomic, strong) NSNumber *authorID;
 @property (nonatomic, copy) NSString *search;
 @property (nonatomic, copy) NSString *meta;
+@property (nonatomic, copy) NSString *tag;
 
 @end

WordPress/Classes/System/WordPress-Bridging-Header.h

@@ -38,7 +38,6 @@
 
 #import "NSObject+Helpers.h"
 
-#import "PageListTableViewCell.h"
 #import "PageSettingsViewController.h"
 #import "PostContentProvider.h"
 #import "PostCategory.h"