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

Protect: Integrate ThreatsDataViews Component #40076

Merged
merged 8 commits into from
Dec 5, 2024

Conversation

nateweller
Copy link
Contributor

@nateweller nateweller commented Nov 6, 2024

Proposed changes:

  • Replaces the custom threats sidebar and accordion with the new ThreatsDataViews component.
  • Removes the separate implementation of /scan/history and /scan/history/:status, but maintains support for those URL paths by automatically applying the history filter to the main /scan route component on load.
  • Moves assorted types and utilities up into the @automattic/jetpack-scan package.
  • Ensures fixer API responses are camelized for consistency.
  • Updates scan onboarding steps for the new UI.

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

peb6dq-31T-p2

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

No

Testing instructions:

  • Go to /wp-admin/admin.php?page=jetpack-protect
  • Thoroughly test the scan tab:
    • View free and paid threat results, as well as empty states.
    • Test auto-fixers.
    • Test loading the page via /scan/history and/or /scan/history/fixed.

Screenshots:

Screenshot 2024-12-04 at 2 15 56 PM

@nateweller nateweller self-assigned this Nov 6, 2024
@nateweller nateweller requested a review from a team November 6, 2024 20:38
@github-actions github-actions bot added [Package] Protect Models [Package] Protect Status [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Tests] Includes Tests labels Nov 6, 2024
Copy link
Contributor

github-actions bot commented Nov 6, 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 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!


Protect plugin:

  • Next scheduled release: none scheduled.

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

@nateweller nateweller force-pushed the add/protect/threats-data-views branch from 8053c3f to ea8b837 Compare November 6, 2024 20:45
Copy link
Contributor

github-actions bot commented Nov 6, 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/protect/threats-data-views 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 add/protect/threats-data-views
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/protect/threats-data-views
    

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

@nateweller nateweller force-pushed the add/protect/threats-data-views branch 5 times, most recently from 9634495 to d5226e6 Compare November 8, 2024 17:10
@nateweller nateweller changed the base branch from trunk to update/protect-status-format November 8, 2024 17:10
@nateweller nateweller force-pushed the update/protect-status-format branch from 5e90fd0 to 6dcbb38 Compare November 8, 2024 17:11
@github-actions github-actions bot added [Block] Subscriptions [mu wpcom Feature] Wpcom Global Styles [Package] Jetpack mu wpcom WordPress.com Features [Package] Search Contains core Search functionality for Jetpack and Search plugins [Package] Sync [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. Admin Page React-powered dashboard under the Jetpack menu Docs labels Nov 8, 2024
@nateweller nateweller force-pushed the add/protect/threats-data-views branch 3 times, most recently from 60c0bb6 to 922fef5 Compare November 8, 2024 17:14
Copy link
Contributor

@dkmyta dkmyta left a comment

Choose a reason for hiding this comment

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

Let's merge it!

Init project branch

Init project branch

Init project branch
Init project branch

Init project branch

Init project branch

Init project branch
Transpile textdomain from @wordpress/dataviews

Run tools/check-intra-monorepo-deps.sh -u

Minor adjustments

Add upgrade prompt to scan header

Add ShieldIcon component

Fix typo

Co-authored-by: dkmyta <43220201+dkmyta@users.noreply.github.com>

Fix typo

Co-authored-by: dkmyta <43220201+dkmyta@users.noreply.github.com>

Update copy

Co-authored-by: dkmyta <43220201+dkmyta@users.noreply.github.com>

Improve mobile styling of scan page header

Fix typo

Add tooltip to header upgrade prompt

changelog
@nateweller nateweller force-pushed the add/protect/threats-data-views branch from c722920 to ecdf64e Compare December 5, 2024 17:50
@nateweller nateweller merged commit 1118627 into add/protect/core Dec 5, 2024
14 of 15 checks passed
@nateweller nateweller deleted the add/protect/threats-data-views branch December 5, 2024 17:50
@github-actions github-actions bot removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Status] Needs Team Review labels Dec 5, 2024
@nateweller nateweller mentioned this pull request Dec 5, 2024
3 tasks
dkmyta added a commit that referenced this pull request Dec 10, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 11, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 15, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 17, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 18, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JS Package] Scan [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. RNA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants