Skip to content
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

Upsell nudge: fix click Safari, disable block #40902

Merged
merged 5 commits into from
Jan 15, 2025
Merged

Conversation

ellatrix
Copy link
Contributor

@ellatrix ellatrix commented Jan 8, 2025

Fixes Automattic/wp-calypso#96513

Proposed changes:

  • When clicking the "Upgrade" button for a paid block in Safari, the nudge/banner shouldn't disappear. This is fixed by making sure the whole wrapper div receives the block props.
  • I've also removed the separate hook that adds the has-warning class. First, it is confusing that the logic is spread over two hooks. It also allows me to only pass the class to the nested BlockEdit, so that the nudge is not semitransparent.
  • In turn, that allows me to remove the custom logic that overrides core styles that disable the block when there's a warning. Which also fixes the media placeholder buttons that are currently clickable in trunk.

It would be nice if this nudge can be re-designed to use the block toolbar for example, instead of overriding the block content in a hacky way. Thoughts?

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

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

Testing instructions:

  • Use Safari.
  • Go to wp-admin/site-editor.php and edit a template.
  • Add a video block.
  • The upgrade nudge should be clickable.

@ellatrix ellatrix added the [Type] Bug When a feature is broken and / or not performing as intended label Jan 8, 2025
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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 fix/upsell-nudge-safari branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/upsell-nudge-safari
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/upsell-nudge-safari
    

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 github-actions bot added [Block] Contact Form Form block (also see Contact Form label) [Block] VideoPress [Feature] Contact Form [JS Package] Shared Extension Utils [Package] Forms [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ RNA labels Jan 8, 2025
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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 a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. 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.
  3. 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 February 4, 2025 (scheduled code freeze on undefined).

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

@github-actions 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 Jan 8, 2025
@ellatrix ellatrix added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Jan 8, 2025
@jeherve jeherve added Plans 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 Jan 9, 2025
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tests well for me. I only have a remark on the patch <> major version bump on the JS package.

@@ -0,0 +1,4 @@
Significance: patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're effectively removing something entirely from the package and since that package is published to npm, I think a major version bump may be more appropriate here, so we don't accidentally break things for folks who may use the package and who may not expect functionality to be removed with a patch release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're just removing code, no? It's not a user facing thing that is removed? Let me know if you still think major is appropriate here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're only removing code indeed, but that changelog is not aimed at site owners. It is aimed at consumers of the @automattic/jetpack-shared-extension-utils package, i.e. developers. They may be interested in knowing that a function they may have been using will be removed entirely from the package.

I would personally consider this as a major change for consumers of the package, so they'll know to be mindful before they update the package version in their apps.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update. I just pushed 241b062 as a final tweak, so the major bump only happens in the package where we have the major change. In the other packages, we're not introducing any change that would break backward compatibility.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@jeherve jeherve added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Jan 10, 2025
@ellatrix ellatrix 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 Jan 14, 2025
@jeherve jeherve added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Jan 14, 2025
@ellatrix ellatrix 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 Jan 14, 2025
@jeherve 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 Jan 14, 2025
@ellatrix ellatrix merged commit c1371cc into trunk Jan 15, 2025
65 checks passed
@ellatrix ellatrix deleted the fix/upsell-nudge-safari branch January 15, 2025 13:54
@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Jan 15, 2025
@github-actions github-actions bot added this to the jetpack/14.3 milestone Jan 15, 2025
ellatrix added a commit that referenced this pull request Jan 17, 2025
dsas pushed a commit that referenced this pull request Jan 17, 2025
This reverts commit c1371cc.

See p1737057925999759-slack-C02FMH4G8
coder-karen pushed a commit that referenced this pull request Jan 24, 2025
This reverts commit c1371cc.

See p1737057925999759-slack-C02FMH4G8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Contact Form Form block (also see Contact Form label) [Block] VideoPress [Feature] Contact Form [JS Package] Shared Extension Utils [Package] Forms Plans [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ RNA [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Safari]Editor/templates: Not possible to upgrade from a premium block
2 participants