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

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

* 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: add HMR support Revert "Protect: add HMR support" This reverts commit 06497a0.

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

* 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: add HMR support Revert "Protect: add HMR support" This reverts commit 06497a0.

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

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.

…ction-hero

nateweller · 2025-01-04T00:58:10Z

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

 }: {
+	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 and others added 30 commits December 9, 2024 09:47

Init project branch

4dd60b7

Protect: Add Go to Cloud and Scan now button to Protect primary header (

ff92d88

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

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

9fec011

Protect: add ShieldIcon component

af172c9

Protect: Add ShieldIcon Component (#40402)

00283bc

Protect: Integrate ThreatsDataViews Component (#40076)

f580ace

Components: Add ScanReport (#40419)

c384d69

Fix type errors

68569f2

Protect: add HMR support Revert "Protect: add HMR support" This reverts commit 06497a0.

Protect: Refactor AdminSectionHero (#40516)

91ee20a

Restore history header

5892e03

Pass status filter presets to consumer

ffb3ab0

Restore early return

3ad2ee8

Add plan level restrictions

7ca9b41

Init project branch

609a47e

Protect: Add Go to Cloud and Scan now button to Protect primary header (

43b9566

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

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

d7ec48a

Protect: add ShieldIcon component

3195cb3

Protect: Add ShieldIcon Component (#40402)

1b4eca4

Protect: Integrate ThreatsDataViews Component (#40076)

3d878c7

Components: Add ScanReport (#40419)

e5d5b04

Fix type errors

7ef8809

Protect: add HMR support Revert "Protect: add HMR support" This reverts commit 06497a0.

Protect: Refactor AdminSectionHero (#40516)

55a8d4f

Protect: Update Scan History extension types (#40548)

f33e209

Protect: Integrate ScanReport (#40420)

88960de

Fix duplicate imports

62314b0

ScanReport: Fix defaultLayout (#40603)

a0e7243

Update onboarding popover placement (#40550)

113e002

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 would need you to make some changes or provide some more details about your PR. Thank you! label Jan 3, 2025

dkmyta and others added 8 commits January 3, 2025 11:28

Update stories

cdac95f

Remove unneeded filter handling

010b2c1

Revert unnecessary threats data views updates

c86dc12

Fix import

d86c933

Add size prop

407e4ba

Use error variant (#40832)

f672f0a

Merge branch 'add/protect/core' into restore/protect/history-admin-se…

1c72079

…ction-hero

Rebase

856479c

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

dkmyta added 3 commits January 3, 2025 13:11

Include fixer action as label in list view action dropdown

137f2a8

Add field constants

1c24e44

Reorg

8038593

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

Add initialFields prop, update active to current where applicable

4068ba6

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

Rebase, fix conflicts

19b7834

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Protect: Separate scan results and history DataViews #40845

Protect: Separate scan results and history DataViews #40845

dkmyta commented Jan 3, 2025 •

edited

Loading

github-actions bot commented Jan 3, 2025 •

edited

Loading

nateweller Jan 4, 2025

nateweller Jan 4, 2025

nateweller Jan 4, 2025

dkmyta Jan 6, 2025 •

edited

Loading

nateweller commented Jan 4, 2025 •

edited

Loading

dkmyta commented Jan 6, 2025 •

edited

Loading

Protect: Separate scan results and history DataViews #40845

Are you sure you want to change the base?

Protect: Separate scan results and history DataViews #40845

Conversation

dkmyta commented Jan 3, 2025 • edited Loading

Description

Other information:

Jetpack product discussion

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

Testing instructions:

Screenshots

github-actions bot commented Jan 3, 2025 • edited Loading

nateweller Jan 4, 2025

Choose a reason for hiding this comment

nateweller Jan 4, 2025

Choose a reason for hiding this comment

nateweller Jan 4, 2025

Choose a reason for hiding this comment

dkmyta Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

nateweller commented Jan 4, 2025 • edited Loading

dkmyta commented Jan 6, 2025 • edited Loading

dkmyta 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