-
Notifications
You must be signed in to change notification settings - Fork 800
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: Refactor useProtectData hook #38637
Protect: Refactor useProtectData hook #38637
Conversation
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
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: Use the Jetpack CLI tool to generate changelog entries by running the following command: Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped. Protect plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. |
aa4673e
to
ef2b246
Compare
3cc2669
to
d330262
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On a fresh JT instance, without an upgrade, I can see that the initial Protect status report has been generated (properly set in the jetpackProtectInitialState
var, JPDB, and in the jetpack_protect_status
option), however, the Summary
and ThreatsList
components are empty:
Also wanted to note as it may be related to the change, the Scan UI was initially in an error state briefly before entering the scanning state.
Looks like the issue is that the hook is now only providing the extensions that have threats, I will fix that up. The flash of the error state appears to be on the project branch, will make a PR or issue for that as well. |
ef2b246
to
92949ab
Compare
9d976a8
to
15538a8
Compare
28fc596
to
86e5844
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code is clean and initial testing in a functioning environment shows it works.
I noticed something though that may be related to the current updates or may be more related to the prior addition of scanError
selector and related adjustments. Manually setting the error
var in useProtectData
and visiting the ScanHistoryRoute
component displays the ErrorScreen
. Similarly, setting the scanError
selector to return an error works. However, when simulating an actual error (for example updating my hosts
file to point at public-api.wordpress.com
but not running my sandbox to make wpcom
requests fail provides for some unexpected results) first the ScanRoute
component displays an empty list, with some relevant data missing:
Then shortly after (likely after the first status poll) the error display:
The ScanHistoryRoute
performs similarly. I can see in both cases that the status
and scanHistory
initial state variables are populated correctly with error details so it would seem this maybe be more related to the frontend handling of such data.
Perhaps this is not the best way to generate an actual error but I think it does uncover that there is an issue.
Perhaps not specific to these changes, but similar to the issue with the filters routes, we'll need to redirect Interestingly enough, we do have a block for this in
|
if ( statusIsFetching ) { | ||
return <Spinner />; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
15538a8
to
fd3d09a
Compare
3bfe9ae
to
8c869aa
Compare
8c869aa
to
f2a8039
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good!
…38815) * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * changelog * Protect: Separate scanner and history views via React Router and UI adjustments (#38325) * Run ./tools/fixup-project-versions.sh * Restore project versions * Run ./tools/fixup-project-versions.sh * Remove todo comment (#38628) * Fix History error state, add access points, and fix hidden filters (#38656) * Only display the manual scan message under the scanner threats list (#38626) * Protect: Add unignore threat capabilities (#38094) * Add Scan_History class * changelog * Update changelog * Merge trunk, fix versions * Add initial UI for scan history * Add firstDetected and fixedOn details to threat cards * Fix ignored message * Fix console error * Adjust wording and styles * Optimize * Fix firstDetected and fixedOn property retrieval issues, add todos * Remove unneeded ref * Consolidate scan history UI to existing components * Remove todos * Return false for scanHistory when upgrade is missing * Manage ScanPage states when viewing history * Move source data logic to useProtectData hook * Improve Summary component Button logic * ScanPage refactoring * Reapply missing scanIsUnavailable check * Add comments * Hide ignore when viewing threats, and clear history cache when updating or fixing * Add unignore actions and conditional handling to the UI * Add null coalescing to core threat prop assignment * Fix core threat normalization * Optimizations and refactoring * Revert standarization, and use conditionals * Add dummy arg to avoid bad translation minification * Changlog entry * Move viewingScanHistory out of initial state * Use threat status over lack of fixedOn to display unignore button * Add foundation for unignore request * Remove need for signature_id * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * Init feature branch * Init feature branch * Init feature branch * Use react router for threat history, separate scan and history root components, minor UI adjustments * changelog * Add dummy args to avoid bad minification * Hide scan section navigation when user has no plan * Wrap ScanButton with forwardRef * Add onboarding popover to Scan Now button in empty state * Fix filtering of core threat history * Redirect to /scan from /scan/history when user has no plan * Fix animation glitch in onboarding popover * Remove unnecessary additions * Further removals after failed base merge * More removals * Add todos * Use status to conditional render unignore action button * Move ignore/unignore actions to dedicated modals * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * changelog * Protect: Separate scanner and history views via React Router and UI adjustments (#38325) * Run ./tools/fixup-project-versions.sh * Restore project versions * Run ./tools/fixup-project-versions.sh * Remove todo comment (#38628) * Remove changelog * Display fix threat button only for current threats * Further unification * Refresh scan history after unignore * Update projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx Co-authored-by: Nate Weller <[email protected]> * Fix lint errors --------- Co-authored-by: Nate Weller <[email protected]> Co-authored-by: Nate Weller <[email protected]> * Do not show scan error when optimistically scanning (#38703) * Refactor useProtectData hook (#38637) * Fixup project versions * Update deactivation method to delete relevant options * changelog * Simplify * Remove changelog entries * Remove changelog entries * Remove changelog entries * changelog * Revert unintended Jetpack changes --------- Co-authored-by: Nate Weller <[email protected]> Co-authored-by: Nate Weller <[email protected]>
…38815) * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * changelog * Protect: Separate scanner and history views via React Router and UI adjustments (#38325) * Run ./tools/fixup-project-versions.sh * Restore project versions * Run ./tools/fixup-project-versions.sh * Remove todo comment (#38628) * Fix History error state, add access points, and fix hidden filters (#38656) * Only display the manual scan message under the scanner threats list (#38626) * Protect: Add unignore threat capabilities (#38094) * Add Scan_History class * changelog * Update changelog * Merge trunk, fix versions * Add initial UI for scan history * Add firstDetected and fixedOn details to threat cards * Fix ignored message * Fix console error * Adjust wording and styles * Optimize * Fix firstDetected and fixedOn property retrieval issues, add todos * Remove unneeded ref * Consolidate scan history UI to existing components * Remove todos * Return false for scanHistory when upgrade is missing * Manage ScanPage states when viewing history * Move source data logic to useProtectData hook * Improve Summary component Button logic * ScanPage refactoring * Reapply missing scanIsUnavailable check * Add comments * Hide ignore when viewing threats, and clear history cache when updating or fixing * Add unignore actions and conditional handling to the UI * Add null coalescing to core threat prop assignment * Fix core threat normalization * Optimizations and refactoring * Revert standarization, and use conditionals * Add dummy arg to avoid bad translation minification * Changlog entry * Move viewingScanHistory out of initial state * Use threat status over lack of fixedOn to display unignore button * Add foundation for unignore request * Remove need for signature_id * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * Init feature branch * Init feature branch * Init feature branch * Use react router for threat history, separate scan and history root components, minor UI adjustments * changelog * Add dummy args to avoid bad minification * Hide scan section navigation when user has no plan * Wrap ScanButton with forwardRef * Add onboarding popover to Scan Now button in empty state * Fix filtering of core threat history * Redirect to /scan from /scan/history when user has no plan * Fix animation glitch in onboarding popover * Remove unnecessary additions * Further removals after failed base merge * More removals * Add todos * Use status to conditional render unignore action button * Move ignore/unignore actions to dedicated modals * Add TypeScript support to Jetpack Protect * Downgrade typescript to 5.0.4, to match other monorepo projects * Add TypeScript support to Jetpack Protect * Init feature branch * Protect: Add Scan_History class (#37903) * Protect: Add Scan History UI (#37988) * changelog * Protect: Separate scanner and history views via React Router and UI adjustments (#38325) * Run ./tools/fixup-project-versions.sh * Restore project versions * Run ./tools/fixup-project-versions.sh * Remove todo comment (#38628) * Remove changelog * Display fix threat button only for current threats * Further unification * Refresh scan history after unignore * Update projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx Co-authored-by: Nate Weller <[email protected]> * Fix lint errors --------- Co-authored-by: Nate Weller <[email protected]> Co-authored-by: Nate Weller <[email protected]> * Do not show scan error when optimistically scanning (#38703) * Refactor useProtectData hook (#38637) * Fixup project versions * Update deactivation method to delete relevant options * changelog * Simplify * Remove changelog entries * Remove changelog entries * Remove changelog entries * changelog * Revert unintended Jetpack changes --------- Co-authored-by: Nate Weller <[email protected]> Co-authored-by: Nate Weller <[email protected]>
The intention of this PR is to enable the ability to access assorted threat counts, ultimately to disable status filters that have no related threats under the current selected category.
Also improves performance and usability of the hook.
Proposed changes:
useProtectData()
hook.useProtectData()
hook to use a single memo-ized loop to generate and filter all threats in one go.counts
property touseProtectData()
hook, which tracks the amount of total and currently filtered threats across categories.core
,plugins
,themes
,files
, anddatabase
properties into athreats
property inuseProtectData()
's return value.Other information:
Jetpack product discussion
N/A
Does this pull request change what data or activity we track or use?
No
Testing instructions: