Custom Post: Support update parent page (#25398)

* Decouple PostSettingsViewModelProtocol from Page

* Show the "Parent Page" settings

* Show selected post

* Update page picker UI

* Fetch parent page title

* Add WpService property

* Fix unit tests compilation issues

* Fix merge conflict resolution

Author: crazytonyli

Tests/KeystoneTests/Tests/Features/Posts/CustomPostEditorServiceTests.swift

@@ -2,8 +2,9 @@ import Testing
 import Foundation
 import WordPressAPI
 import WordPressAPIInternal
-import WordPressCore
+
 @testable import WordPress
+@testable import WordPressCore
 @testable import WordPressData
 
 @MainActor
@@ -166,14 +167,14 @@ private func makeService(
         api: api,
         siteURL: URL(string: "https://example.com")!
     )
-    let postService = PostService(noHandle: .init())
+    let wpService = try api.createSelfHostedService(cache: .bootstrap())
 
     return CustomPostEditorService(
         blog: blog,
         post: post,
         details: makePostTypeDetails(),
         client: client,
-        service: postService
+        wpService: wpService
     )
 }
 

WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostEditor.swift

@@ -6,20 +6,20 @@ import WordPressAPI
 import WordPressAPIInternal
 
 struct CustomPostEditor: View {
-    let service: WordPressAPIInternal.PostService
+    let wpService: WpService
     let client: WordPressClient
     let post: AnyPostWithEditContext?
     let details: PostTypeDetailsWithEditContext
     let blog: Blog
 
     var body: some View {
-        ViewControllerWrapper(service: service, client: client, post: post, details: details, blog: blog)
+        ViewControllerWrapper(wpService: wpService, client: client, post: post, details: details, blog: blog)
             .ignoresSafeArea()
     }
 }
 
 private struct ViewControllerWrapper: UIViewControllerRepresentable {
-    let service: WordPressAPIInternal.PostService
+    let wpService: WpService
     let client: WordPressClient
     let post: AnyPostWithEditContext?
     let details: PostTypeDetailsWithEditContext
@@ -29,7 +29,7 @@ private struct ViewControllerWrapper: UIViewControllerRepresentable {
     var dismiss: DismissAction
 
     func makeUIViewController(context: Context) -> UIViewController {
-        let viewController = CustomPostEditorViewController(blog: blog, service: service, client: client, post: post, details: details) {
+        let viewController = CustomPostEditorViewController(blog: blog, wpService: wpService, client: client, post: post, details: details) {
             dismiss()
         }
         return UINavigationController(rootViewController: viewController)

WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostEditorService.swift

@@ -27,7 +27,7 @@ class CustomPostEditorService {
     private var state: State
     let details: PostTypeDetailsWithEditContext
     let client: WordPressClient
-    let service: WordPressAPIInternal.PostService
+    let wpService: WpService
     let taxonomies: [SiteTaxonomy]
     private var initialSettings: PostSettings
 
@@ -68,7 +68,7 @@ class CustomPostEditorService {
         post: AnyPostWithEditContext?,
         details: PostTypeDetailsWithEditContext,
         client: WordPressClient,
-        service: WordPressAPIInternal.PostService
+        wpService: WpService
     ) {
         if let post {
             self.state = .existingPost(post)
@@ -77,7 +77,7 @@ class CustomPostEditorService {
         }
         self.details = details
         self.client = client
-        self.service = service
+        self.wpService = wpService
 
         let capabilities = PostSettingsCapabilities(from: details)
         // At the moment, category & tags are separated from custom taxonomies. We can unify them as taxonomies later,
@@ -192,7 +192,7 @@ class CustomPostEditorService {
         guard try await !hasBeenModified(post: post) else { throw PostUpdateError.conflicts }
 
         let endpoint = details.toPostEndpointType()
-        let updatedPost = try await service.updatePost(endpointType: endpoint, postId: post.id, params: params)
+        let updatedPost = try await wpService.posts().updatePost(endpointType: endpoint, postId: post.id, params: params)
         state = .existingPost(updatedPost)
         initialSettings = settings
 
@@ -203,7 +203,7 @@ class CustomPostEditorService {
     @discardableResult
     private func create(params: PostCreateParams) async throws -> AnyPostWithEditContext {
         let endpoint = details.toPostEndpointType()
-        let createdPost = try await service.createPost(endpointType: endpoint, params: params)
+        let createdPost = try await wpService.posts().createPost(endpointType: endpoint, params: params)
         state = .existingPost(createdPost)
         initialSettings = settings
         return createdPost

WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostListView.swift

@@ -15,6 +15,8 @@ struct CustomPostListView<Header: View>: View {
     let details: PostTypeDetailsWithEditContext
     let client: WordPressClient
     let mediaHost: MediaHost?
+    let showsPostActions: Bool
+    let selectedPostID: Int64?
     let onSelectPost: (AnyPostWithEditContext) -> Void
     @ViewBuilder let header: () -> Header
 
@@ -23,13 +25,17 @@ struct CustomPostListView<Header: View>: View {
         details: PostTypeDetailsWithEditContext,
         client: WordPressClient,
         mediaHost: MediaHost? = nil,
+        showsPostActions: Bool = true,
+        selectedPostID: Int64? = nil,
         onSelectPost: @escaping (AnyPostWithEditContext) -> Void
     ) where Header == EmptyView {
         self.viewModel = viewModel
         self.details = details
         self.client = client
-        self.onSelectPost = onSelectPost
         self.mediaHost = mediaHost
+        self.showsPostActions = showsPostActions
+        self.selectedPostID = selectedPostID
+        self.onSelectPost = onSelectPost
         self.header = { EmptyView() }
     }
 
@@ -38,14 +44,18 @@ struct CustomPostListView<Header: View>: View {
         details: PostTypeDetailsWithEditContext,
         client: WordPressClient,
         mediaHost: MediaHost? = nil,
+        showsPostActions: Bool = true,
+        selectedPostID: Int64? = nil,
         onSelectPost: @escaping (AnyPostWithEditContext) -> Void,
         @ViewBuilder header: @escaping () -> Header
     ) {
         self.viewModel = viewModel
         self.details = details
         self.client = client
-        self.onSelectPost = onSelectPost
         self.mediaHost = mediaHost
+        self.showsPostActions = showsPostActions
+        self.selectedPostID = selectedPostID
+        self.onSelectPost = onSelectPost
         self.header = header
     }
 
@@ -57,6 +67,8 @@ struct CustomPostListView<Header: View>: View {
             client: client,
             onSelectPost: onSelectPost,
             mediaHost: mediaHost,
+            showsPostActions: showsPostActions,
+            selectedPostID: selectedPostID,
             indentationMap: viewModel.indentationMap,
             header: header
         )
@@ -122,6 +134,8 @@ private struct PaginatedList<Header: View>: View {
     let client: WordPressClient?
     let onSelectPost: (AnyPostWithEditContext) -> Void
     let mediaHost: MediaHost?
+    let showsPostActions: Bool
+    let selectedPostID: Int64?
     let indentationMap: CustomPostListViewModel.IndentationMap
     @ViewBuilder let header: () -> Header
 
@@ -135,6 +149,8 @@ private struct PaginatedList<Header: View>: View {
         client: WordPressClient? = nil,
         onSelectPost: @escaping (AnyPostWithEditContext) -> Void,
         mediaHost: MediaHost? = nil,
+        showsPostActions: Bool = true,
+        selectedPostID: Int64? = nil,
         indentationMap: CustomPostListViewModel.IndentationMap = [:]
     ) where Header == EmptyView {
         self.viewModel = viewModel
@@ -143,6 +159,8 @@ private struct PaginatedList<Header: View>: View {
         self.client = client
         self.onSelectPost = onSelectPost
         self.mediaHost = mediaHost
+        self.showsPostActions = showsPostActions
+        self.selectedPostID = selectedPostID
         self.indentationMap = indentationMap
         self.header = { EmptyView() }
     }
@@ -154,6 +172,8 @@ private struct PaginatedList<Header: View>: View {
         client: WordPressClient? = nil,
         onSelectPost: @escaping (AnyPostWithEditContext) -> Void,
         mediaHost: MediaHost? = nil,
+        showsPostActions: Bool = true,
+        selectedPostID: Int64? = nil,
         indentationMap: CustomPostListViewModel.IndentationMap = [:],
         @ViewBuilder header: @escaping () -> Header
     ) {
@@ -163,6 +183,8 @@ private struct PaginatedList<Header: View>: View {
         self.client = client
         self.onSelectPost = onSelectPost
         self.mediaHost = mediaHost
+        self.showsPostActions = showsPostActions
+        self.selectedPostID = selectedPostID
         self.indentationMap = indentationMap
         self.header = header
     }
@@ -197,7 +219,9 @@ private struct PaginatedList<Header: View>: View {
                 client: client,
                 onSelectPost: onSelectPost,
                 mediaHost: mediaHost,
-                viewModel: viewModel
+                viewModel: viewModel,
+                showsPostActions: showsPostActions,
+                selectedPostID: selectedPostID
             )
             .task {
                 await onRowAppear(item: item)
@@ -213,6 +237,8 @@ private struct PaginatedList<Header: View>: View {
                 onSelectPost: onSelectPost,
                 mediaHost: mediaHost,
                 viewModel: viewModel,
+                showsPostActions: showsPostActions,
+                selectedPostID: selectedPostID,
                 indentationLevel: indentationMap[item.id]?.indentationLevel ?? 0,
                 showSubdirectoryIcon: showSubdirectoryIcon(at: index)
             )
@@ -280,6 +306,8 @@ private struct ForEachContent: View {
     let onSelectPost: (AnyPostWithEditContext) -> Void
     let mediaHost: MediaHost?
     @ObservedObject var viewModel: CustomPostListViewModel
+    var showsPostActions: Bool = true
+    var selectedPostID: Int64?
 
     var body: some View {
         switch item.state {
@@ -288,29 +316,40 @@ private struct ForEachContent: View {
         case .loaded(let fullPost, _):
             if let post = item.post {
                 let isPending = viewModel.pendingPostIDs.contains(item.id)
-                Button {
+                let button = Button {
                     onSelectPost(fullPost)
                 } label: {
-                    PostContent(post: post, client: client, mediaHost: mediaHost)
-                }
-                .buttonStyle(.plain)
-                .contextMenu {
-                    if !isPending {
-                        PostActionMenuContent(post: fullPost, viewModel: viewModel)
+                    HStack {
+                        PostContent(post: post, client: client, mediaHost: mediaHost)
+                        if selectedPostID == fullPost.id {
+                            Image(systemName: "checkmark.circle.fill")
+                                .foregroundStyle(.tint)
+                        }
                     }
                 }
-                .overlay(alignment: .topTrailing) {
-                    if isPending {
-                        ProgressView()
-                            .frame(width: 28, height: 28)
-                            .offset(y: -6)
-                    } else {
-                        PostActionMenu(post: fullPost, viewModel: viewModel)
-                            .offset(y: -6)
-                    }
+                .buttonStyle(.plain)
+
+                if isPending {
+                    button
+                        .overlay(alignment: .topTrailing) {
+                            ProgressView()
+                                .frame(width: 28, height: 28)
+                                .offset(y: -6)
+                        }
+                        .opacity(0.4)
+                        .disabled(true)
+                } else if showsPostActions {
+                    button
+                        .contextMenu {
+                            PostActionMenuContent(post: fullPost, viewModel: viewModel)
+                        }
+                        .overlay(alignment: .topTrailing) {
+                            PostActionMenu(post: fullPost, viewModel: viewModel)
+                                .offset(y: -6)
+                        }
+                } else {
+                    button
                 }
-                .opacity(isPending ? 0.4 : 1)
-                .disabled(isPending)
             }
 
         case .loading:
@@ -340,6 +379,8 @@ private struct ForEachContentWithIndentation: View {
     let onSelectPost: (AnyPostWithEditContext) -> Void
     let mediaHost: MediaHost?
     let viewModel: CustomPostListViewModel
+    var showsPostActions: Bool = true
+    var selectedPostID: Int64?
     let indentationLevel: Int
     let showSubdirectoryIcon: Bool
 
@@ -357,7 +398,9 @@ private struct ForEachContentWithIndentation: View {
                 client: client,
                 onSelectPost: onSelectPost,
                 mediaHost: mediaHost,
-                viewModel: viewModel
+                viewModel: viewModel,
+                showsPostActions: showsPostActions,
+                selectedPostID: selectedPostID
             )
         }
         .padding(.leading, CGFloat(max(0, indentationLevel - 1)) * 32)

WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostListViewModel.swift

@@ -292,7 +292,7 @@ final class CustomPostListViewModel: ObservableObject {
             post: post,
             details: details,
             client: client,
-            service: service.posts()
+            wpService: service
         )
         PublishPostViewController.show(
             editorService: editorService,
@@ -384,7 +384,7 @@ final class CustomPostListViewModel: ObservableObject {
                 post: post,
                 details: details,
                 client: client,
-                service: service.posts()
+                wpService: service
             )
             let viewModel = CustomPostSettingsViewModel(editorService: editorService, blog: blog, isStandalone: true)
             let settingsVC = PostSettingsViewController(viewModel: viewModel)