UI Modernization: Posts & Pages 📦

Podfile

@@ -50,7 +50,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  pod 'WordPressKit', '~> 8.7', '>= 8.7.1'
+  pod 'WordPressKit', '~> 8.8'
   # 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.7.1):
+  - WordPressKit (8.8.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -126,7 +126,7 @@ DEPENDENCIES:
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
   - WordPressAuthenticator (~> 7.2.1-beta.2)
-  - WordPressKit (>= 8.7.1, ~> 8.7)
+  - WordPressKit (~> 8.8)
   - WordPressShared (~> 2.2)
   - WordPressUI (~> 1.15)
   - WPMediaPicker (>= 1.8.10, ~> 1.8)
@@ -226,7 +226,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
   WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
   WordPressAuthenticator: 1d73abee8fdd87032e987c40f140423a6aa0e577
-  WordPressKit: 33a0571389da6b40c765398a8c84da72f5514a6f
+  WordPressKit: df18103fb11fefcbccad6aa4df222dc7d408ade5
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   WPMediaPicker: 332812329cbdc672cdb385b8ac3a389f668d3012
@@ -240,6 +240,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: fe27477bb386333975be481e9f9718ea47ec4e29
+PODFILE CHECKSUM: 9859c4a7e3c33bfba28627d1a7509f2f1182f08e
 
 COCOAPODS: 1.12.1

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"

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -255,6 +255,7 @@ import Foundation
 
     // Post List
     case postListShareAction
+    case postListCommentsAction
     case postListSetAsPostsPageAction
     case postListSetHomePageAction
 
@@ -960,6 +961,8 @@ import Foundation
         // Post List
         case .postListShareAction:
             return "post_list_button_pressed"
+        case .postListCommentsAction:
+            return "post_list_button_pressed"
         case .postListSetAsPostsPageAction:
             return "post_list_button_pressed"
         case .postListSetHomePageAction:
@@ -1415,6 +1418,8 @@ import Foundation
             return ["via": "tenor"]
         case .postListShareAction:
             return ["button": "share"]
+        case .postListCommentsAction:
+            return ["button": "comments"]
         case .postListSetAsPostsPageAction:
             return ["button": "set_posts_page"]
         case .postListSetHomePageAction:

WordPress/Classes/Utility/Media/ImageLoader.swift

@@ -32,7 +32,7 @@ import AutomatticTracks
     // MARK: Private Fields
 
     private unowned let imageView: CachedAnimatedImageView
-    private let loadingIndicator: CircularProgressView
+    private let loadingIndicator: ActivityIndicatorType
 
     private var successHandler: ImageLoaderSuccessBlock?
     private var errorHandler: ImageLoaderFailureBlock?
@@ -47,17 +47,28 @@ import AutomatticTracks
         return requestOptions
     }()
 
-    @objc init(imageView: CachedAnimatedImageView, gifStrategy: GIFStrategy = .mediumGIFs) {
+    @objc convenience init(imageView: CachedAnimatedImageView, gifStrategy: GIFStrategy = .mediumGIFs) {
+        self.init(imageView: imageView, gifStrategy: gifStrategy, loadingIndicator: nil)
+    }
+
+    init(imageView: CachedAnimatedImageView, gifStrategy: GIFStrategy = .mediumGIFs, loadingIndicator: ActivityIndicatorType?) {
         self.imageView = imageView
         imageView.gifStrategy = gifStrategy
-        loadingIndicator = CircularProgressView(style: .primary)
+
+        if let loadingIndicator {
+            self.loadingIndicator = loadingIndicator
+        } else {
+            let loadingIndicator = CircularProgressView(style: .primary)
+            WPStyleGuide.styleProgressViewWhite(loadingIndicator)
+            self.loadingIndicator = loadingIndicator
+        }
 
         super.init()
 
-        WPStyleGuide.styleProgressViewWhite(loadingIndicator)
-        imageView.addLoadingIndicator(loadingIndicator, style: .fullView)
+        imageView.addLoadingIndicator(self.loadingIndicator, style: .fullView)
     }
 
+
     /// Removes the gif animation and prevents it from animate again.
     /// Call this in a table/collection cell's `prepareForReuse()`.
     ///
@@ -298,7 +309,7 @@ import AutomatticTracks
             }
 
             if self.imageView.shouldShowLoadingIndicator {
-                self.loadingIndicator.state = .error
+                (self.loadingIndicator as? CircularProgressView)?.state = .error
             }
 
             self.errorHandler?(error)