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.

Sign up for GitHub

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

Jump to bottom

Licensing: Add conditional Protect redirect post Scan license activation #39007

Merged
merged 10 commits into from
Sep 3, 2024
Merged

Licensing: Add conditional Protect redirect post Scan license activation #39007

merged 10 commits into from
Sep 3, 2024

Conversation

dkmyta
Copy link
Contributor

@dkmyta dkmyta commented Aug 21, 2024

Description

After a Scan license is activated in My Jetpack, the ActivationScreenSuccessInfo component displays a link to View scan results in Jetpack Cloud. As part of the standalone first initiative, when we detect that Jetpack Protect is active, we should always direct users to the Protect UI to view these results.

Proposed changes:

  • Rearranges the current links
  • Adds conditional logic to update the View scan results redirect to Cloud or Protect when applicable

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?

  • No

Testing instructions:

  • Create a new JN instance using the beta tester with Jetpack installed using this branch
  • Purchase a Scan license from jetpack.com but don't yet assign it to a site
  • Refer to Store Admin for your user and locate the license key
  • Proceed to the JN site and to /wp-admin/admin.php?page=my-jetpack#/add-license
  • Enter key and select activate, from the post activation screen verify that the UI display as in the provided screenshot
  • Ensure that the View scan results link redirects to Scan's Cloud dashboard and that the View my plans link performs as expected
  • Perform the same steps once again but this time after first installing and activating Protect
  • Verify that the View scan results link now redirect to /wp-admin/admin.php?page=jetpack-protect#/scan
  • Ensure no regressions are introduced and that other license activations are unaffected by the changes

Screenshot

Screen Shot on 2024-08-21 at 14-29-40

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 21, 2024 •
edited
Loading

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/licensing-protect-redirect branch.

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

    bin/jetpack-downloader test jetpack add/licensing-protect-redirect

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
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 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!

@dkmyta dkmyta marked this pull request as ready for review August 23, 2024 16:20
@dkmyta dkmyta requested a review from a team August 26, 2024 20:11
@dkmyta dkmyta self-assigned this Aug 26, 2024
nateweller
nateweller reviewed Aug 29, 2024
View reviewed changes
projects/js-packages/licensing/components/activation-screen-success-info/primary-link/index.jsx Outdated
@@ -48,6 +49,17 @@ const PrimaryLink = props => {
);
}

if ( productGroup === 'jetpack_scan' ) {
const redirectSource = isJetpackProtectActive
? siteAdminUrl + 'admin.php?page=jetpack-protect#/scan'
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
? siteAdminUrl + 'admin.php?page=jetpack-protect#/scan'
? siteAdminUrl + 'admin.php?page=jetpack-protect'

nateweller
nateweller previously approved these changes Aug 29, 2024
View reviewed changes
@nateweller
Copy link
Contributor

Would also be ideal if we could update the copy:

"You can see your security scans on cloud.jetpack.com"

@dkmyta dkmyta merged commit 64dca5e into trunk Sep 3, 2024
71 checks passed
@dkmyta dkmyta deleted the add/licensing-protect-redirect branch September 3, 2024 19:18
gogdzl pushed a commit that referenced this pull request Oct 25, 2024
@dkmyta @gogdzl
Licensing: Add conditional Protect redirect post Scan license activat…
e658957 
…ion (#39007)

* Add Protect redirect to activation-screen-success-info primary-link

* Revert unintended changes

* changelog

* Fix versions

* Revert version update

* Update redirect path
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nateweller nateweller nateweller approved these changes

Assignees

@dkmyta dkmyta

Labels
[JS Package] Licensing RNA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dkmyta @nateweller