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

Update modal elements for My Jetpack modal interstitial #41300

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from

Conversation

grzegorz-cp
Copy link
Contributor

Fixes https://github.com/Automattic/jetpack-roadmap/issues/2125

Proposed changes:

  • introduce a new component using product slug to get the correct price
  • add a new list component displaying features
  • fix layout to stretch content in the left column
  • fix component CSS variables for My Jetpack
  • remove unused hideCloseButton prop
  • prepare the modal component to be used with specific products and update exported file structure

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:

  • Checkout this branch locally
  • Run storybook with cd projects/js-packages/storybook and pnpm run storybook:dev
  • When storybook loads, navigate to My Jetpack and test Product Interstitial Modal

SCR-20250124-pkhb

@grzegorz-cp grzegorz-cp requested a review from a team January 24, 2025 06:55
@grzegorz-cp grzegorz-cp self-assigned this Jan 24, 2025
Copy link
Contributor

github-actions bot commented Jan 24, 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 add/my-jetpack-modal-interstitial-update branch.

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

    bin/jetpack-downloader test jetpack add/my-jetpack-modal-interstitial-update
    

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

Copy link
Contributor

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!

@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 24, 2025
Copy link
Contributor

@elliottprogrammer elliottprogrammer left a comment

Choose a reason for hiding this comment

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

The interstitial(s) are lookin really nice @grzegorz-cp! 😃.
The testing instructions didn't state what I should be testing exactly, like the design, or certain specific functionality, or just an overall review of the code & appearance, etc. So I went ahead and just pointed out some small improvements in the code, and also I see some design discrepancies between the Figma design and the interstitial modal, that I have pointed out in the screenshot below:

Screenshot 2025-01-24 at 5 22 03 PM

Other than that, everything is looking really nice! 🙌

interface ProductInterstitialModalProps {
title: string;
description?: string;
triggerButton?: React.ReactNode;
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, maybe a nitpick, but this prop name is confusing, since it's type is ReactNode, I was expecting this prop would pass in an entire button element or any sort of trigger component, but it turns out that this is just the button "label" (or text). Ideally this would be named triggerButtonLabel or triggerButtonText.

Comment on lines +21 to +22
buttonDisabled?: boolean;
buttonExternalLink?: boolean;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if this is an actual WordPress coding standard, but all boolean variables ideally should be prefixed with is, has, can, should, etc. So for example, the boolean props here in this component would ideally be renamed to:
isSecondaryButtonExternal,
isButtonDisabled,
isButtonExternal

fluid={ false }
>
{
// left column - always takes 33% of the width or the full with for small breakpoint
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick, "full with" is misspelled. It should be "full width".

{
link: (
<Button
href="https://jetpack.com/redirect/?source=ai-assistant-fair-usage-policy"
Copy link
Contributor

Choose a reason for hiding this comment

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

To utilize the benefits if Jetpack Redirects ( PCYsg-pY7-p2 ), this href should be:
href={ getRedirectUrl( 'ai-assistant-fair-usage-policy' ) }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Package] My Jetpack [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants