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

Subscription Block: Add success message #21273

Merged

Conversation

amustaque97
Copy link
Contributor

@amustaque97 amustaque97 commented Oct 2, 2021

Fixes #21187

Changes proposed in this Pull Request:

  • Updated projects/plugins/jetpack/extensions/blocks/subscriptions to support teaxtarea for success_message in the widget setttings.
  • Updated projects/plugins/jetpack/modules/subscriptions/views.php to support success_message when passed as an attribute to the shortcode.
  • Updated test cases of subscription form extension

Jetpack product discussion NA

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

Testing instructions:

  • Checkout to the PR branch
  • Build subscription extension
  • Enable jetpack subscription under discussion tab of jetpack settings
  • Go to appearance -> customize -> widgets -> footer#1 -> add a legacy widget subscription block (if it not already transformed to subscription block and then transform it to subscription block)
  • Select subscription block and click on show more settings and scroll down
  • Edit success message and publish it.
  • Open the site in incognito mode and then enter an email address
  • Verify success message.

Screenrecording https://youtu.be/Z5cSgh5neQA

arcangelini and others added 4 commits September 28, 2021 15:04
In this commit, I have updated all the files of subscription block extension
I have also updated the modules views.php file to support success_message as a
shortcode attribute.
@github-actions github-actions bot added [Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. labels Oct 2, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Oct 2, 2021

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.
  • ⚠️ All commits were linted before commit.
  • ✅ 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.



Jetpack plugin:

  • Next scheduled release: January 11, 2022.
  • Scheduled code freeze: January 3, 2022.

@github-actions github-actions bot added the OSS Citizen This Pull Request was opened by an Open Source contributor. label Oct 2, 2021
@sdixon194
Copy link
Contributor

Thanks for the contribution @amustaque97 ! Is this PR still in progress or ready for review?

@amustaque97
Copy link
Contributor Author

Thanks for the contribution @amustaque97 ! Is this PR still in progress or ready for review?

It is ready for review

@sdixon194 sdixon194 added the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Oct 4, 2021
Copy link
Contributor

@sdixon194 sdixon194 left a comment

Choose a reason for hiding this comment

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

This works for me! I have a few in line comments that I think we can tighten up. I'm also not an expert on block or react, so if someone else would like to take a look to make sure I'm not missing anything, that'd be appreciated too!

@sdixon194 sdixon194 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 Crew. Label will be renamed soon. labels Oct 6, 2021
jeherve
jeherve previously requested changes Oct 8, 2021
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.

Nice work! You'll now want to update the tests for the block to reflect your changes. You can check the projects/plugins/jetpack/extensions/blocks/subscriptions/test/ to find out more, and run cd projects/plugins/jetpack && pnpm test-extensions to run those tests locally.

@amustaque97
Copy link
Contributor Author

amustaque97 commented Oct 12, 2021

@jeherve, Thank you for the appreciation 🙌 and apologies for the delay 😞. I have fixed all the test cases. Please have a look again. All test cases are passing 😄
cc @sdixon194
image

@jeherve
Copy link
Member

jeherve commented Oct 14, 2021

Thank you. Could you run git merge origin/master in your branch one more time, after pulling the latest version of master in your fork?

@amustaque97
Copy link
Contributor Author

amustaque97 commented Oct 14, 2021

Thank you. Could you run git merge origin/master in your branch one more time, after pulling the latest version of master in your fork?

Took a merge from the master branch. Test cases are passing.

@jeherve jeherve dismissed stale reviews from sdixon194 and themself October 21, 2021 13:19

Changes addressed

Copy link
Contributor

@samiff samiff left a comment

Choose a reason for hiding this comment

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

Looking good @amustaque97 ! just some cleanup in v6/save.js is needed and I would try redoing the fixtures once that is completed 👍

On the sidebar of this PR I think there should be an option to let Jetpack maintainers write to your branch if you don't mind so we don't keep having to ask for a master merge 😉

Copy link
Contributor

@samiff samiff left a comment

Choose a reason for hiding this comment

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

Those last changes look good, and the tests are passing from what I see 👍

Master will need to be merged once more to bring this up to date.

@amustaque97
Copy link
Contributor Author

Thank you @jeherve and @samiff for helping me with this. I can see this PR took long than expected, more than 2 months to be exact 😅 . Thanks once again for helping me out with this and patiently reviewing my every single commit and multiple code reviews. ❤️

Please consider/ping me in other issues/PR related to deprecation implementation. Would love to get involved. 🚀

@samiff samiff mentioned this pull request Dec 7, 2021
@samiff samiff added [Status] Ready to Merge Go ahead, you can push that green button! 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 Dec 7, 2021
@samiff samiff enabled auto-merge (squash) December 7, 2021 18:58
@samiff samiff self-requested a review December 7, 2021 18:59
@samiff samiff merged commit c7071a6 into Automattic:master Dec 7, 2021
@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Dec 7, 2021
@samiff
Copy link
Contributor

samiff commented Dec 7, 2021

Thanks for working on this @amustaque97 🎉 This change will ship out in Jetpack version 10.5 which is scheduled to release on: 2022-01-11

Internal: D71163-code marked for 10.5 release (sync with wpcom release)
Edit: r236587-wpcom

davidlonjon added a commit that referenced this pull request Dec 9, 2021
* master: (24 commits)
  Replace base styles with component driven approach (#21938)
  Release Unreleased GH Actions, JS and Composer Packages (#22041)
  Have eslint and phpcs ignore jetpack_vendor (#22056)
  Update PHP 7.4 to 8.0 in our tools (#22046)
  Connection: Handle package versions on site registration (#22025)
  Backup plugin: Add the jetpack-identity-crisis package to composer.json (#22036)
  IDC UI: update the default text in the migrate card (#22033)
  Doc PHPCS updates (#22042)
  docker: Fix mu-plugins/fix-monorepo-plugins-url.php (#22044)
  E2E search plan data fixture (#22039)
  Composer Packages: change the package type to jetpack-library (#21934)
  Subscription Block: Add success message  (#21273)
  My Jetpack: do not ship scss and jsx files in production build. (#22032)
  Notes: Remove old code (#22026)
  SSO: Add filters for error text (#22004)
  Backport 10.4 Changelog (#22034)
  Releases: start 10.5-a.2 cycle (#22031)
  Releases: prepare changelogs for Jetpack version 10.5-a.1 (#22030)
  Monorepo now uses Composer 2.1 (#22028)
  Notifications: PHPCS (#22017)
  ...
@amustaque97 amustaque97 deleted the add/subscription-block-success-message branch January 1, 2022 19:51
@jeherve
Copy link
Member

jeherve commented Jan 3, 2022

Follow-up: #22193 seems to highlight an issue on WordPress.com Simple sites.

@samiff samiff added [Status] Needs Testing We need to add this change to the testing call for this month's release and removed [Status] Needs Testing We need to add this change to the testing call for this month's release labels Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Subscriptions [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. OSS Citizen This Pull Request was opened by an Open Source contributor. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ Touches WP.com Files [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Subscription Block: add setting for success message
6 participants