Skip to content

Protect: Update Threat Icons #40621

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

Merged
nateweller merged 19 commits into from
Dec 18, 2024
Merged

Protect: Update Threat Icons #40621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b04eeff
Init project branch
nateweller Nov 14, 2024
eba4892
Protect: minor enhancements to scan report data
nateweller Dec 15, 2024
d16a2a6
Remove file extension name property
nateweller Dec 17, 2024
4b339dc
Remove unused import
nateweller Dec 17, 2024
2f44be8
Init project branch
nateweller Nov 14, 2024
ee50c09
Scan Report: add min width to status icon to center with column label
nateweller Dec 15, 2024
e0ab4db
Init project branch
nateweller Nov 14, 2024
3136c28
Apply max width to hero content
nateweller Dec 15, 2024
c3f5cf4
Init project branch
nateweller Nov 14, 2024
a529dba
Protect: only show Scan Report when scan is in progress or has result…
nateweller Dec 15, 2024
0096404
Init project branch
nateweller Nov 14, 2024
afd7886
Protect: only show Scan Report when scan is in progress or has result…
nateweller Dec 15, 2024
12484d6
Protect: only show Threats DataViews when scan is in progress or has …
nateweller Dec 15, 2024
48eecea
Init project branch
nateweller Nov 14, 2024
e6fa532
Protect: only show Threats DataViews when scan is in progress or has …
nateweller Dec 15, 2024
21039d2
Protect: use error variant for threats in home hero, use solid varian…
nateweller Dec 15, 2024
2c07ff5
Fix merge conflict
nateweller Dec 17, 2024
243b439
Use outline variant for shield icon in scan error stat card
nateweller Dec 17, 2024
7a374a5
Merge branch 'add/protect/core' into update/protect/threat-icons
nateweller Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions projects/plugins/protect/src/js/components/admin-section-hero/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,7 @@ AdminSectionHero.Heading = ( {
<H3 mb={ 1 } { ...props }>
{ children }
{ !! icon && (
<ShieldIcon
height={ 38 }
variant={ icon }
outline
fill="default"
className={ styles[ 'heading-icon' ] }
/>
<ShieldIcon height={ 38 } variant={ icon } className={ styles[ 'heading-icon' ] } />
) }
</H3>
);
Expand Down
10 changes: 2 additions & 8 deletions projects/plugins/protect/src/js/routes/home/home-statcards.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,9 @@ const HomeStatCards = () => {
if ( scanning ) {
scanIcon = <Spinner />;
} else if ( scanError ) {
scanIcon = <ShieldIcon variant="error" height={ ICON_HEIGHT } />;
scanIcon = <ShieldIcon variant="error" outline height={ ICON_HEIGHT } />;
} else {
scanIcon = (
<ShieldIcon
variant={ numThreats ? 'warning' : 'success' }
height={ ICON_HEIGHT }
color={ numThreats ? '#F0B849' : '#069E08' }
/>
);
scanIcon = <ShieldIcon variant={ numThreats ? 'error' : 'success' } height={ ICON_HEIGHT } />;
}

let scanLabel;
Expand Down
3 changes: 2 additions & 1 deletion projects/plugins/protect/src/js/routes/scan/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ const ScanPage = () => {
currentScanStatus = 'active';
}

const hasActiveThreats = status && status.threats.length;
const hasHistory = history && history.threats.length;
const showResults = !! status.threats.length || hasHistory;
const showResults = hasActiveThreats || hasHistory;

const filters = useMemo( () => {
if ( location.pathname.includes( '/scan/history' ) ) {
Expand Down
Loading