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

SSO: Add custom message to new user email #35395

Merged

Conversation

agrullon95
Copy link
Contributor

@agrullon95 agrullon95 commented Feb 1, 2024

Fixes Automattic/wp-calypso#86760

Proposed changes:

  • Adds a "Custom Message" field to the wp-admin new user form

New user form:

image

Email:
CleanShot 2024-02-01 at 10 40 34@2x

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:

  1. On an Atomic, JN, or whatever non-simple site, install Jetpack.
  2. Make sure SSO is on, it should be on by default.
  3. Sync this PR to your site.
  4. Navigate to /wp-admin/user-new.php
  5. Add a username, email, and custom message.
  6. Verify the custom message is sent in email.

@agrullon95 agrullon95 changed the base branch from trunk to add/sso-improvements February 1, 2024 15:41
@github-actions github-actions bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label Feb 1, 2024
Copy link
Contributor

github-actions bot commented Feb 1, 2024

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.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

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

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for March 5, 2024 (scheduled code freeze on February 26, 2024).

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 Feb 1, 2024
Copy link
Contributor

github-actions bot commented Feb 1, 2024

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/new-user-additional-email-message branch.

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

    bin/jetpack-downloader test jetpack add/new-user-additional-email-message
    

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

@crisbusquets
Copy link
Contributor

Great!

Works for me, @agrullon95 👍

Add-New-User-‹-My-WordPress-Site-—-WordPress

Inbox-phoenixowl777-proton-me-Proton-Mail

Comment on lines 604 to 612
public function jetpack_users_new_form_styles() {
?>
<style>
#createuser .form-field textarea {
width: 25em;
}
</style>
<?php
}
Copy link
Contributor

@escapemanuele escapemanuele Feb 2, 2024

Choose a reason for hiding this comment

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

This works! I wonder if we could leverage jetpack-sso-admin-create-user.css, enqueued by render_invitation_email_message when in user-new?

Maybe with a different wording we could use that function to add the Notice and enqueue all the CSS for that page.

Copy link
Contributor Author

@agrullon95 agrullon95 Feb 2, 2024

Choose a reason for hiding this comment

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

@escapemanuele - That's a good idea. We can leverage that CSS file. I'll move my styling into jetpack-sso-admin-create-user.css.

I think it makes more sense to use add_action( 'admin_print_styles-user-new.php', array( $this, 'jetpack_users_new_form_styles' ) );, move my styling into jetpack-sso-admin-create-user.css, then enqueue the CSS in that function (function jetpack_users_new_form_styles).

This way we can separate the styling and the notice logic.

WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

That makes totally sense for me @agrullon95 👍

Copy link
Contributor

@escapemanuele escapemanuele left a comment

Choose a reason for hiding this comment

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

Thanks for addressing my feedback, looks great now!

@alshakero
Copy link
Member

IMHO, this message field seems like an attribute of the user when it's not. Remember, the point of this project is gaining the trust of people who are used to WP Core. This field doesn't exist in Core and will be confusing unless explained well.

Let's give it a placeholder, something like:

"This user will be invited to WordPress.com, you can include a customized welcoming message that we'll make sure to pass along with the invitation".

@escapemanuele
Copy link
Contributor

Let's give it a placeholder,

Makes total sense 👍

@escapemanuele
Copy link
Contributor

Placeholder works!

image

Would it be better if we change the color to looks a little less like text and more like a placeholder? @agrullon95

@crisbusquets
Copy link
Contributor

Placeholder works!

image

Would it be better if we change the color to looks a little less like text and more like a placeholder? @agrullon95

Hi!

We can do this instead of a placeholder. This way the message is always visible, even if they edit the textarea. WDYT?

d_wpadmin_invite_message

Figma file: DASWajWXHUUjF4pu1yo4fI-fi-246_1228

@alshakero
Copy link
Member

I like this more than the placeholder for sure. I was a bit reluctant to suggest the placeholder idea because it misuses the field.

@alshakero
Copy link
Member

Pushed, beautiful now
image

@agrullon95 agrullon95 merged commit f34f2a6 into add/sso-improvements Feb 5, 2024
50 checks passed
@agrullon95 agrullon95 deleted the add/new-user-additional-email-message branch February 5, 2024 19:42
@github-actions github-actions bot removed [Status] Needs Team Review [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Feb 5, 2024
@alshakero alshakero mentioned this pull request Feb 5, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] SSO [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants