-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Add/layout grid block availability #16543
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
Conversation
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
Generated by 🚫 dangerJS |
chipsnyder
left a comment
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.
Good start here @enejb 👍 Just has a couple of minor tweaks then I can dive in and really start testing.
| .mentions: FeatureFlag.gutenbergMentions.enabled && SuggestionService.shared.shouldShowSuggestions(for: post.blog), | ||
| .xposts: FeatureFlag.gutenbergXposts.enabled && SiteSuggestionService.shared.shouldShowSuggestions(for: post.blog), | ||
| .contactInfoBlock: post.blog.supports(.contactInfo) && FeatureFlag.contactInfo.enabled, | ||
| .layoutGridBlock: FeatureFlag.layoutGrid.enabled, |
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.
I believe this meant to also call into post.blog.supports(.layoutGrid)
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.
Good catch this is fixed now.
chipsnyder
left a comment
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.
This doesn't build for me this time :/
WordPress/Classes/Models/Blog.m
Outdated
|
|
||
| - (BOOL)supportsLayoutGrid | ||
| { | ||
| if (!FeatureFlag.layoutGrid.enabled) { |
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.
This PR doesn't build for me. It looks like we forgot to convert this to Objective-C. You can use the Feature class to make that change.
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.
This should be fixed now.
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.
This should be fixed now.
👍 I'll do another round of testing tomorrow
4532c5c to
7098efb
Compare
chipsnyder
left a comment
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.
This looks good to me now. Since we took care of the downstream issues I wonder if we even need to introduce the feature flag, or if we can just have it enabled for when the branches merge?
|
Just a note to say that I'm running the code freeze for 17.6 today. Before code freezing, I look at all the approved PRs and merge them. This PR is not assigned the 17.6 milestone, though. On top of that, it has a long history and there is a suggestion for extra work / simplification from the reviewer. As such, I won't be merging it into Let me know if you really need this in 17.6, so much that it can't wait two weeks, and we'll put it as a followup. 😄 👍 Thanks 🙇♂️ |
|
We are hoping to merge this into 17.7 now. Thanks for checking @mokagio |
7098efb to
d4cff8c
Compare
This PR is similar to #16347
It adds the availability information that is needed for the layout grid block to be available to only .com sites for now and in the future to all sites that have the layout grid block.
Related PR:
WordPress/gutenberg#31777
Related wordpress-mobile/gutenberg-mobile#3513
To test:
CASE A:
- An business site, as well as a simple site, should see the layout grid block.
CASE B:
- An Jetpack site or a .org site should NOT see the layout grid block.
To test:
Regression Notes
N/A
PR submission checklist:
RELEASE-NOTES.txtif necessary.