-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Custom Posts: Add Set as Homepage / Posts Page actions #25575
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
crazytonyli
wants to merge
9
commits into
trunk
Choose a base branch
from
task/1981-page-specific-actions
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6e2870b
Format files in preparation for page attribute actions
crazytonyli 91a2869
Replace isHomepage with PageRole enum in custom post list
crazytonyli 81e2aa7
Add setAsHomepage/setAsPostsPage/setAsRegularPage actions
crazytonyli 8cf4277
Add Page Attributes submenu and posts page badge
crazytonyli 997c2c1
Gate page attribute actions on manage_options capability
crazytonyli bf9934e
Refetch site settings on pull-to-refresh
crazytonyli f12059d
Show page-role badges on the All tab
crazytonyli 18eaac3
Move PageRoleTests into the WordPressTest target's synchronized folder
crazytonyli c09db1b
Consolidate page-role success notices into a single string
crazytonyli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
Tests/KeystoneTests/Tests/Features/CustomPostTypes/PageRoleTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import Testing | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test doesn't seem to be executed by anything – it doesn't show up in Buildkite and Claude is indicating it's not wired up by the Xcode project file |
||
| @testable import WordPress | ||
|
|
||
| @Suite("markPageRoles") | ||
| struct MarkPageRolesTests { | ||
|
|
||
| private func makeItem(id: Int64) -> CustomPostCollectionItem { | ||
| let post = CustomPostCollectionDisplayPost( | ||
| date: Date(), | ||
| title: "Page \(id)", | ||
| content: nil, | ||
| status: .publish | ||
| ) | ||
| return CustomPostCollectionItem(id: id, post: post, state: .loading) | ||
| } | ||
|
|
||
| @Test("marks homepage and posts page on separate items") | ||
| func marksHomepageAndPostsPage() { | ||
| var items = [makeItem(id: 1), makeItem(id: 2), makeItem(id: 3)] | ||
| items.markPageRoles(homepageID: 1, postsPageID: 2) | ||
| #expect(items[0].pageRole == .homepage) | ||
| #expect(items[1].pageRole == .postsPage) | ||
| #expect(items[2].pageRole == nil) | ||
| } | ||
|
|
||
| @Test("nil IDs result in no roles assigned") | ||
| func nilIDs() { | ||
| var items = [makeItem(id: 1), makeItem(id: 2)] | ||
| items.markPageRoles(homepageID: nil, postsPageID: nil) | ||
| #expect(items[0].pageRole == nil) | ||
| #expect(items[1].pageRole == nil) | ||
| } | ||
|
|
||
| @Test("only homepage ID provided") | ||
| func onlyHomepageID() { | ||
| var items = [makeItem(id: 1), makeItem(id: 2)] | ||
| items.markPageRoles(homepageID: 1, postsPageID: nil) | ||
| #expect(items[0].pageRole == .homepage) | ||
| #expect(items[1].pageRole == nil) | ||
| } | ||
|
|
||
| @Test("only posts page ID provided") | ||
| func onlyPostsPageID() { | ||
| var items = [makeItem(id: 1), makeItem(id: 2)] | ||
| items.markPageRoles(homepageID: nil, postsPageID: 2) | ||
| #expect(items[0].pageRole == nil) | ||
| #expect(items[1].pageRole == .postsPage) | ||
| } | ||
|
|
||
| @Test("ID not found in items does nothing") | ||
| func idNotFound() { | ||
| var items = [makeItem(id: 1)] | ||
| items.markPageRoles(homepageID: 99, postsPageID: 100) | ||
| #expect(items[0].pageRole == nil) | ||
| } | ||
|
|
||
| @Test("same ID for both roles assigns postsPage (last-write wins)") | ||
| func sameIDForBothRoles() { | ||
| var items = [makeItem(id: 1)] | ||
| items.markPageRoles(homepageID: 1, postsPageID: 1) | ||
| #expect(items[0].pageRole == .postsPage) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do this, I think we need to invalidate (or reassign)
loadSiteSettingsTask(or make an async accessor?)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I don't quite understand the issue. Do you mean explicty cancel the task like:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would work, though it's probably better to just let the original finish and await the result?
The idea is that if the user pulls to refresh more than once, do we want multiple in-flight network requests?