Shield memberships blocks for unconnected jetpack sites #39390

millerf · 2024-09-13T10:24:07Z

Fixes #39308

Proposed changes:

Do not register Memberships blocks that actively use Jetpack connection when the site is not connected to Jetpack
[front-end] Use of utility function Jetpack_Memberships::is_enabled_jetpack_recurring_payments()
[admin] Check for proper JP connection

Note: Simple payments blocks. (aka as Paypal button) is not shielded as it does not need a JP connection to be working

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

See #39308 (comment)

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Create a JP site with a connection
- Make sure Donations, Payment Button and Premium content buttons are now available
- Create a post with a paid-content, a subscription and a simple-payments block
- Make sure the blocks is available on the front-end
Disconnect the site from wp-admin/admin.php?page=my-jetpack
- Disconnect the site
- Make sure the block is not available in the admin
- Make sure the blocks are still available on the previously-created post

Use of Jetpack_Memberships::is_enabled_jetpack_recurring_payments()

…ed-jetpack-sites

…_wpcom_simple()

github-actions · 2024-09-13T10:25:03Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the add/shield-memberships-blocks-for-unconnected-jetpack-sites branch.

To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack add/shield-memberships-blocks-for-unconnected-jetpack-sites

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2024-09-13T10:25:08Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

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.

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Choose a review path based on your changes:
- A. Team Review: add the "[Status] Needs Team Review" label
  - For most changes, including minor cross-team impacts.
  - Example: Updating a team-specific component or a small change to a shared library.
- B. Crew Review: add the "[Status] Needs Review" label
  - For significant changes to core functionality.
  - Example: Major updates to a shared library or complex features.
- C. Both: Start with Team, then request Crew
  - For complex changes or when you need extra confidence.
  - Example: Refactor affecting multiple systems.
Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for October 1, 2024 (scheduled code freeze on September 30, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php

pottedmeat

Code looks good and this tested as expected.

jeherve

This seems to test well for me on WordPress.com Simple.

CodeyGuyDylan · 2024-10-04T19:15:05Z

@millerf and @jeherve, as part of this project (pbNhbs-bHl-p2) we are trying to make the connection nudge consistent across Jetpack including the editor with the Jetpack blocks. Read this comment for more context (pbNhbs-bHl-p2#comment-23877) but we were wondering if we could initialize the blocks in the case of a site without a connected user and show a connection banner instead? That way the user still knows they exist and can still find them, but is directed towards what to do to resolve the issue.

cc: @robertsreberski

The banner would look like it does in this PR and is currently used in the AI block.

CodeyGuyDylan · 2024-10-04T20:11:11Z

FYI, this PR is what I have in mind for this

jeherve · 2024-10-07T15:13:26Z

we were wondering if we could initialize the blocks in the case of a site without a connected user and show a connection banner instead?

That seems like a better user experience indeed. We would just need to account for cases like this PR solved: some blocks may need the user connection to display their original state or to make an API request that will return information the block needs. For such blocks, it would be better if there was some kind of placeholder state imo.

CodeyGuyDylan · 2024-10-07T16:48:39Z

That seems like a better user experience indeed. We would just need to account for cases like this PR solved: some blocks may need the user connection to display their original state or to make an API request that will return information the block needs. For such blocks, it would be better if there was some kind of placeholder state imo.

In the PR that I shared, the connection banner component there is a prop called "explanation" that displays a message as to what they'd be connecting their user account for (ex. "Connect your WordPress.com account to enable payment buttons on your site.")

Was that the kind of thing you had in mind or am I misunderstanding?

CodeyGuyDylan · 2024-10-07T17:22:42Z

The PR I opened got approved but I'll wait for confirmation that is what you meant before merging 😄

* Do not register memberships buttons when site is not available Use of Jetpack_Memberships::is_enabled_jetpack_recurring_payments() * Create add-shield-memberships-blocks-for-unconnected-jetpack-sites * Introduce should_enable_monetize_blocks_in_editor * Use manager * Replace ( defined( 'IS_WPCOM' ) && IS_WPCOM ) with ( new Host() )->is_wpcom_simple() * Use $is_offline_mode * return is_enabled_jetpack_recurring_payments() in front-end * Update add-shield-memberships-blocks-for-unconnected-jetpack-sites * Prevent paid-content to be displayed if the site is not connected

millerf added 7 commits September 10, 2024 12:05

Do not register memberships buttons when site is not available

547a66c

Use of Jetpack_Memberships::is_enabled_jetpack_recurring_payments()

Create add-shield-memberships-blocks-for-unconnected-jetpack-sites

500d944

Introduce should_enable_monetize_blocks_in_editor

8fbdb40

Merge branch 'trunk' into add/shield-memberships-blocks-for-unconnect…

274e5db

…ed-jetpack-sites

Use manager

52d3027

Replace ( defined( 'IS_WPCOM' ) && IS_WPCOM ) with ( new Host() )->is…

1b33441

…_wpcom_simple()

Use $is_offline_mode

4e335dc

github-actions bot added [Block] Donations [Block] Paid Content aka Premium Content [Block] Payment Buttons [Block] Subscriptions [Feature] Memberships [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Sep 13, 2024

github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Sep 13, 2024

return is_enabled_jetpack_recurring_payments() in front-end

9bd2397

millerf requested review from jeherve September 13, 2024 10:43

millerf changed the title ~~[WiP] Add/shield memberships blocks for unconnected jetpack sites~~ [WiP] Sep 13, 2024

millerf changed the title ~~[WiP]~~ Add/shield memberships blocks for unconnected jetpack sites Sep 13, 2024

Update add-shield-memberships-blocks-for-unconnected-jetpack-sites

6fdafa5

millerf self-assigned this Sep 13, 2024

millerf added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Sep 13, 2024

Prevent paid-content to be displayed if the site is not connected

2e3ced6

millerf mentioned this pull request Sep 13, 2024

Revert "Add/shield memberships blocks for unconnected jetpack sites" #39376

Merged

pottedmeat reviewed Sep 13, 2024

View reviewed changes

projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php Show resolved Hide resolved

pottedmeat approved these changes Sep 13, 2024

View reviewed changes

jeherve approved these changes Sep 18, 2024

View reviewed changes

jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Sep 18, 2024

millerf merged commit 8caefec into trunk Sep 23, 2024
59 checks passed

millerf deleted the add/shield-memberships-blocks-for-unconnected-jetpack-sites branch September 23, 2024 13:26

github-actions bot added this to the jetpack/13.9 milestone Sep 23, 2024

github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Sep 23, 2024

oskosk changed the title ~~Add/shield memberships blocks for unconnected jetpack sites~~ Shield memberships blocks for unconnected jetpack sites Sep 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shield memberships blocks for unconnected jetpack sites #39390

Shield memberships blocks for unconnected jetpack sites #39390

millerf commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

pottedmeat left a comment

jeherve left a comment

CodeyGuyDylan commented Oct 4, 2024

CodeyGuyDylan commented Oct 4, 2024

jeherve commented Oct 7, 2024

CodeyGuyDylan commented Oct 7, 2024

CodeyGuyDylan commented Oct 7, 2024

Shield memberships blocks for unconnected jetpack sites #39390

Shield memberships blocks for unconnected jetpack sites #39390

Conversation

millerf commented Sep 13, 2024 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Sep 13, 2024 • edited Loading

github-actions bot commented Sep 13, 2024 • edited Loading

pottedmeat left a comment

Choose a reason for hiding this comment

jeherve left a comment

Choose a reason for hiding this comment

CodeyGuyDylan commented Oct 4, 2024

CodeyGuyDylan commented Oct 4, 2024

jeherve commented Oct 7, 2024

CodeyGuyDylan commented Oct 7, 2024

CodeyGuyDylan commented Oct 7, 2024

millerf commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading

github-actions bot commented Sep 13, 2024 •

edited

Loading