-
Notifications
You must be signed in to change notification settings - Fork 799
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
Widget Visibility: ensure we find the correct site type #22527
Conversation
We previously relied on wpcom, which unfortunately won't work here; it does end up being defined even on Jetpack sites, because of the additional scripts from WordPress.com that are enqueued in the admin.
Caution: This PR has changes that must be merged to WordPress.com |
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖 The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available. Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped. Jetpack plugin:
|
@@ -148,7 +158,7 @@ const VisibilityRule = props => { | |||
{ label: __( 'Category', 'jetpack' ), value: 'category' }, | |||
{ label: __( 'Author', 'jetpack' ), value: 'author' }, | |||
] | |||
.concat( isWpcom ? [] : optionsDisabledOnWpcom ) | |||
.concat( 'simple' === getSiteType() ? [] : optionsDisabledOnWpcom ) |
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 could be missing something, but could the existing isSimpleSite()
util be used here?
export function isSimpleSite() { |
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.
Unfortunately since it's not part of the same bundle (Blocks vs. Widget Visibility), we cannot fully rely on it. That's what I started from here though. In the future, and once we have a shared utility like in #22505, we could use it in both places.
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.
Got it, I haven't delved into the webpack setup so just assumed it would be imported and bundled up. Thanks for the explanation 👍
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.
Now that this was moved to an external js package, we can import it instead of duplicating it! 🥳 #22741
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.
Tested that user/role options showed up on a WPorg site, but were hidden on simple wpcom.
Great news! One last step: head over to your WordPress.com diff, D73881-code, and commit it. Thank you! |
r239359-wpcom |
Changes proposed in this Pull Request:
We previously relied on
wpcom
, which unfortunately won't work here; it does end up being defined even on Jetpack sites, because of the additional scripts from WordPress.com that are enqueued in the admin.This was reported here: p8oabR-Nm-p2#comment-5896
Jetpack product discussion
Does this pull request change what data or activity we track or use?
Testing instructions: