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.

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

Protect: Hide Scan Report When No Data #40619

Merged
merged 11 commits into from
Dec 18, 2024
Merged

Protect: Hide Scan Report When No Data #40619

Changes from all commits
Commits
Show all changes
11 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
4668396
Merge branch 'add/protect/core' into update/protect/hide-scan-report-…
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
27 changes: 16 additions & 11 deletions projects/plugins/protect/src/js/routes/home/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { AdminSection, Container, Col, ScanReport } from '@automattic/jetpack-components';
import { useMemo } from 'react';
import AdminPage from '../../components/admin-page';
import { SCAN_IN_PROGRESS_STATUSES } from '../../constants';
import useScanStatusQuery from '../../data/scan/use-scan-status-query';
import HomeAdminSectionHero from './home-admin-section-hero';
import styles from './styles.module.scss';
Expand Down Expand Up @@ -33,20 +34,24 @@
[ status ]
);

const showReport = !! status.lastChecked || SCAN_IN_PROGRESS_STATUSES.indexOf( status?.status ) >= 0;

Check failure on line 37 in projects/plugins/protect/src/js/routes/home/index.jsx

View workflow job for this annotation

GitHub Actions / ESLint (non-excluded files only) 

Replace `·` with `⏎↹↹`

return (
<AdminPage>
<HomeAdminSectionHero />
<AdminSection>
<Container
className={ styles[ 'scan-report-container' ] }
horizontalSpacing={ 5 }
horizontalGap={ 4 }
>
<Col>
<ScanReport dataSource={ status.dataSource } data={ data } />
</Col>
</Container>
</AdminSection>
{ showReport && (
<AdminSection>
<Container
className={ styles[ 'scan-report-container' ] }
horizontalSpacing={ 5 }
horizontalGap={ 4 }
>
<Col>
<ScanReport dataSource={ status.dataSource } data={ data } />
</Col>
</Container>
</AdminSection>
) }
</AdminPage>
);
};
Expand Down
Loading