Protect: Separate scan results and history DataViews #40845

dkmyta · 2025-01-03T19:22:43Z

Description

Restores a dedicated history route and integrates a unique ThreatsDataViews instance for scan history.

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

https://github.com/Automattic/jetpack-scan-team/issues/1619

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

No

Testing instructions:

Review ThreatsDataViews storybooks
Run this branch of Protect using the beta tester
Ensure that you can easily toggle between active and historic threats
Verify that /scan, /scan/history, /scan/history/fixed, /scan/history/ignored update the UI correctly
Ensure no regressions are introduced

Screenshots

github-actions · 2025-01-03T19:23:28Z

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 update/protect/separate-scan-and-history-dataviews 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 update/protect/separate-scan-and-history-dataviews

bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/protect/separate-scan-and-history-dataviews

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 · 2025-01-03T19:23:48Z

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.

🔴 Action required: Please add missing changelog entries for the following projects: projects/js-packages/components, projects/plugins/protect

Use the Jetpack CLI tool to generate changelog entries by running the following command: jetpack changelog add.
Guidelines: /docs/writing-a-good-changelog-entry.md

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
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.
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 · 2025-01-04T00:58:10Z

projects/js-packages/components/components/threats-data-views/index.tsx

 	onUnignoreThreats,
+	header,
 }: {
+	historic?: boolean;


What do you think about using a const type for this prop, something like type: 'current' | 'historic'?

Motivation being to keep things flexible for the future.

nateweller · 2025-01-04T01:18:01Z

projects/plugins/protect/src/js/routes/scan/scan-toggle-group-control.tsx

+	const selectedValue = location.pathname.includes( '/history' ) ? 'historic' : 'active';
+
+	const onChange = useCallback(
+		( value: string ) => {


Suggested change

( value: string ) => {

( value: 'active' | 'historic' ) => {

(IIRC, the threat status value used is "current", we could potentially use that here for consistency)

IIRC, the threat status value used is "current", we could potentially use that here for consistency

It is! I initially chose active as it first came up in the ToggleGroupControl task as Active threats was the toggle text, that then got passed along to keep things the same. Using current makes sense to me, what do think about updating the toggle text to Current threats also?

nateweller · 2025-01-04T01:57:04Z

Looking good and testing great so far 👍

This PR really bakes-in the boolean "is current or is historic" pattern, which I recognize matches the current implementation plans in Protect, but I think it is possible to achieve the two table integration without adding this specific logic to the <ThreatsDataViews> component (and beyond):

The main variation between the two tables is the fields/columns - could we allow the package consumer to specify specific table presets?

import ThreatsDataViews, { HISTORIC_TABLE_FIELDS } from '@...';

export const ThreatsHistory = () => {
    return <ThreatsDataViews fields={ HISTORIC_TABLE_FIELDS } />;
};

Interested on your take!

dkmyta · 2025-01-06T17:05:15Z

The main variation between the two tables is the fields/columns - could we allow the package consumer to specify specific table presets?

I like it! I agree with anything that leads to less conditional checks/content in the component as possible - I believe we'll have some similar challenges once we implement the more robust free view (with custom fields in the table and content in the modal), so setting a standard early is a good call!

nateweller

Rebased and made some minor adjustments in additional commits. Looks good to me! 🚀

* Init project branch * Protect: Refactor AdminSectionHero (#40516) * Restore history header * Pass status filter presets to consumer * Restore early return * Add plan level restrictions * Init project branch * Protect: Integrate ThreatsDataViews Component (#40076) * Separate scan and history DataViews * Reapply history routes * Add filters * Add toggle group control * Add historic flag * Update stories * Remove unneeded filter handling * Revert unnecessary threats data views updates * Fix import * Include fixer action as label in list view action dropdown * Add field constants * Reorg * Add initialFields prop, update active to current where applicable * Init project branch * Fix exports and imports * Move default values to function params * Fix ts warning * minor adjustment to definition of initial filters * Add tsc-expect-error to dummy arg for minification cases --------- Co-authored-by: Nate Weller <[email protected]> Co-authored-by: Nate Weller <[email protected]>

Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057) Protect: Update Scan and History headers (#40058) Protect: de-emphasize cloud link by using link variant (#40211) Protect: Add ShieldIcon Component (#40402) Protect: Integrate ThreatsDataViews Component (#40076) Components: Add ScanReport (#40419) Protect: Refactor AdminSectionHero (#40516) Protect: Update Scan History extension types (#40548) Protect: Add Home page (#40317) Protect: Integrate ScanReport (#40420) ScanReport: Fix defaultLayout (#40603) Update onboarding popover placement (#40550) Protect Meets Core: Home Page Scan Report Data Adjustments (#40616) Scan Report: Align Status Icon (#40617) Apply max width to hero content (#40618) Protect: Hide Scan Report When No Data (#40619) Protect: Hide Threats Report When No Data (#40620) Protect: Update Threat Icons (#40621) Protect: fix home page stat card spacing (#40623) ScanReport: Disable hiding relevant fields (#40602) Use error variant (#40832) Protect: Restore HistoryAdminSectionHero (#40551) Protect: Separate scan results and history DataViews (#40845) ThreatsDataViews: Improve responsiveness (#40670) ThreatsDataViews: ThreatModal integration (#40202) Protect Meets Core: Fix "0" rendered by conditional render chain (#40882)

dkmyta self-assigned this Jan 3, 2025

github-actions bot added [JS Package] Components [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Status] In Progress RNA labels Jan 3, 2025

github-actions bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Jan 3, 2025

dkmyta marked this pull request as ready for review January 3, 2025 19:55

This was referenced Jan 3, 2025

ThreatsDataViews: History fields preset #40580

Closed

ThreatsDataViews: Sort by status and severity by default #40502

Closed

Base automatically changed from restore/protect/history-admin-section-hero to add/protect/core January 4, 2025 00:53

nateweller reviewed Jan 4, 2025

View reviewed changes

nateweller force-pushed the add/protect/core branch from 61b5561 to 060637b Compare January 6, 2025 18:13

github-actions bot added the [JS Package] Scan label Jan 6, 2025

dkmyta requested a review from nateweller January 6, 2025 23:34

dkmyta mentioned this pull request Jan 8, 2025

ThreatsDataViews: ThreatModal integration #40202

Merged

3 tasks

nateweller force-pushed the add/protect/core branch from 060637b to 9e6adfb Compare January 12, 2025 19:20

nateweller and others added 9 commits January 12, 2025 12:01

Init project branch

4c95bfe

Protect: Refactor AdminSectionHero (#40516)

91ce2ed

Restore history header

35cd0cf

Pass status filter presets to consumer

5ad53b7

Restore early return

e21bb59

Add plan level restrictions

50a5849

Init project branch

d738a65

Protect: Integrate ThreatsDataViews Component (#40076)

b93cfa2

Separate scan and history DataViews

19bc943

nateweller force-pushed the update/protect/separate-scan-and-history-dataviews branch from f65e174 to 8960ec6 Compare January 12, 2025 20:18

nateweller added 4 commits January 12, 2025 14:42

Move default values to function params

ec33096

Fix ts warning

5ccae12

minor adjustment to definition of initial filters

dcb2887

Add tsc-expect-error to dummy arg for minification cases

c8cd20e

nateweller approved these changes Jan 12, 2025

View reviewed changes

dkmyta merged commit b5461e6 into add/protect/core Jan 14, 2025
69 of 70 checks passed

dkmyta deleted the update/protect/separate-scan-and-history-dataviews branch January 14, 2025 02:47

github-actions bot removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. [Status] In Progress labels Jan 14, 2025

jeherve added the [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it label Jan 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Protect: Separate scan results and history DataViews #40845

Protect: Separate scan results and history DataViews #40845

Uh oh!

dkmyta commented Jan 3, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jan 3, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jan 3, 2025 •

edited

Loading

Uh oh!

nateweller Jan 4, 2025

Uh oh!

nateweller Jan 4, 2025

Uh oh!

nateweller Jan 4, 2025

Uh oh!

dkmyta Jan 6, 2025 •

edited

Loading

Uh oh!

nateweller commented Jan 4, 2025 •

edited

Loading

Uh oh!

dkmyta commented Jan 6, 2025 •

edited

Loading

Uh oh!

nateweller left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Protect: Separate scan results and history DataViews #40845

Protect: Separate scan results and history DataViews #40845

Uh oh!

Conversation

dkmyta commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Other information:

Jetpack product discussion

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

Testing instructions:

Screenshots

Uh oh!

github-actions bot commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nateweller Jan 4, 2025

Choose a reason for hiding this comment

Uh oh!

nateweller Jan 4, 2025

Choose a reason for hiding this comment

Uh oh!

nateweller Jan 4, 2025

Choose a reason for hiding this comment

Uh oh!

dkmyta Jan 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nateweller commented Jan 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dkmyta commented Jan 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nateweller left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dkmyta commented Jan 3, 2025 •

edited

Loading

github-actions bot commented Jan 3, 2025 •

edited

Loading

github-actions bot commented Jan 3, 2025 •

edited

Loading

dkmyta Jan 6, 2025 •

edited

Loading

nateweller commented Jan 4, 2025 •

edited

Loading

dkmyta commented Jan 6, 2025 •

edited

Loading