Protect: only show Threats DataViews when scan is in progress or has …

…results to show
Automattic · Dec 15, 2024 · c0531a2 · c0531a2
1 parent 02683dc
commit c0531a2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/projects/plugins/protect/src/js/routes/home/index.jsx b/projects/plugins/protect/src/js/routes/home/index.jsx
@@ -37,8 +37,6 @@ const HomePage = () => {
 
 	const showReport = status.lastChecked || isScanInProgress( status );
 
-	const showReport = status.lastChecked || isScanInProgress( status );
-
 	return (
 		<AdminPage>
 			<HomeAdminSectionHero />

diff --git a/projects/plugins/protect/src/js/routes/scan/index.jsx b/projects/plugins/protect/src/js/routes/scan/index.jsx
@@ -36,6 +36,8 @@ const ScanPage = () => {
 		currentScanStatus = 'active';
 	}
 
+	const showResults = status.lastChecked || isScanInProgress( status );
+
 	const filters = useMemo( () => {
 		if ( location.pathname.includes( '/scan/history' ) ) {
 			return [
@@ -69,33 +71,35 @@ const ScanPage = () => {
 		<OnboardingContext.Provider value={ onboardingSteps }>
 			<AdminPage>
 				<ScanAdminSectionHero />
-				<AdminSection>
-					<Container
-						className={ styles[ 'scan-results-container' ] }
-						horizontalSpacing={ 5 }
-						horizontalGap={ 4 }
-					>
-						<Col>
-							<div ref={ setScanResultsAnchor }>
-								<ScanResultsDataView filters={ filters } />
-							</div>
-							{ !! status && ! isScanInProgress( status ) && (
-								<OnboardingPopover
-									id={ hasPlan ? 'paid-scan-results' : 'free-scan-results' }
-									anchor={ scanResultsAnchor }
-									position={ 'top' }
-								/>
-							) }
-							{ !! status && ! isScanInProgress( status ) && hasPlan && (
-								<OnboardingPopover
-									id={ 'paid-understand-severity' }
-									anchor={ scanResultsAnchor }
-									position={ 'top' }
-								/>
-							) }
-						</Col>
-					</Container>
-				</AdminSection>
+				{ showResults && (
+					<AdminSection>
+						<Container
+							className={ styles[ 'scan-results-container' ] }
+							horizontalSpacing={ 5 }
+							horizontalGap={ 4 }
+						>
+							<Col>
+								<div ref={ setScanResultsAnchor }>
+									<ScanResultsDataView filters={ filters } />
+								</div>
+								{ !! status && ! isScanInProgress( status ) && (
+									<OnboardingPopover
+										id={ hasPlan ? 'paid-scan-results' : 'free-scan-results' }
+										anchor={ scanResultsAnchor }
+										position={ 'top' }
+									/>
+								) }
+								{ !! status && ! isScanInProgress( status ) && hasPlan && (
+									<OnboardingPopover
+										id={ 'paid-understand-severity' }
+										anchor={ scanResultsAnchor }
+										position={ 'top' }
+									/>
+								) }
+							</Col>
+						</Container>
+					</AdminSection>
+				) }
 			</AdminPage>
 		</OnboardingContext.Provider>
 	);