Merge base

Automattic · Aug 28, 2024 · 25b5a39 · 25b5a39
2 parents 3695e1a + 4eac461
commit 25b5a39
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/projects/plugins/protect/src/js/components/fix-all-threats-modal/index.jsx b/projects/plugins/protect/src/js/components/fix-all-threats-modal/index.jsx
@@ -1,7 +1,7 @@
 import { Button, Text } from '@automattic/jetpack-components';
 import { __ } from '@wordpress/i18n';
 import { useCallback, useState } from 'react';
-import useFixersMutation from '../../data/scan/use-fixers-mutation';
+import useFixers from '../../hooks/use-fixers';
 import useModal from '../../hooks/use-modal';
 import CredentialsGate from '../credentials-gate';
 import ThreatFixHeader from '../threat-fix-header';
@@ -10,25 +10,25 @@ import styles from './styles.module.scss';
 
 const FixAllThreatsModal = ( { threatList = [] } ) => {
 	const { setModal } = useModal();
-	const fixersMutation = useFixersMutation();
+	const { fixThreats, isLoading: isFixersLoading } = useFixers();
 
 	const [ threatIds, setThreatIds ] = useState( threatList.map( ( { id } ) => parseInt( id ) ) );
 
-	const handleCancelClick = () => {
+	const handleCancelClick = useCallback( () => {
 		return event => {
 			event.preventDefault();
 			setModal( { type: null } );
 		};
-	};
+	}, [ setModal ] );
 
-	const handleFixClick = () => {
+	const handleFixClick = useCallback( () => {
 		return async event => {
 			event.preventDefault();
 
-			await fixersMutation.mutateAsync( threatIds );
+			await fixThreats( threatIds );
 			setModal( { type: null } );
 		};
-	};
+	}, [ fixThreats, setModal, threatIds ] );
 
 	const handleCheckboxClick = useCallback(
 		( checked, threat ) => {
@@ -67,7 +67,7 @@ const FixAllThreatsModal = ( { threatList = [] } ) => {
 						{ __( 'Cancel', 'jetpack-protect' ) }
 					</Button>
 					<Button
-						isLoading={ fixersMutation.isLoading }
+						isLoading={ isFixersLoading }
 						onClick={ handleFixClick() }
 						disabled={ ! threatIds.length }
 					>

diff --git a/projects/plugins/protect/src/js/components/fix-threat-modal/index.jsx b/projects/plugins/protect/src/js/components/fix-threat-modal/index.jsx
@@ -1,6 +1,6 @@
 import { Button, Text } from '@automattic/jetpack-components';
 import { __ } from '@wordpress/i18n';
-import useFixersMutation from '../../data/scan/use-fixers-mutation';
+import useFixers from '../../hooks/use-fixers';
 import useModal from '../../hooks/use-modal';
 import CredentialsGate from '../credentials-gate';
 import ThreatFixHeader from '../threat-fix-header';
@@ -9,7 +9,7 @@ import styles from './styles.module.scss';
 
 const FixThreatModal = ( { id, fixable, label, icon, severity } ) => {
 	const { setModal } = useModal();
-	const fixersMutation = useFixersMutation();
+	const { fixThreats, isLoading: isFixersLoading } = useFixers();
 
 	const handleCancelClick = () => {
 		return event => {
@@ -21,7 +21,7 @@ const FixThreatModal = ( { id, fixable, label, icon, severity } ) => {
 	const handleFixClick = () => {
 		return async event => {
 			event.preventDefault();
-			await fixersMutation.mutateAsync( [ id ] );
+			await fixThreats( [ id ] );
 			setModal( { type: null } );
 		};
 	};
@@ -47,7 +47,7 @@ const FixThreatModal = ( { id, fixable, label, icon, severity } ) => {
 					<Button variant="secondary" onClick={ handleCancelClick() }>
 						{ __( 'Cancel', 'jetpack-protect' ) }
 					</Button>
-					<Button isLoading={ fixersMutation.isLoading } onClick={ handleFixClick() }>
+					<Button isLoading={ isFixersLoading } onClick={ handleFixClick() }>
 						{ __( 'Fix threat', 'jetpack-protect' ) }
 					</Button>
 				</div>

diff --git a/projects/plugins/protect/src/js/hooks/use-fixers.ts b/projects/plugins/protect/src/js/hooks/use-fixers.ts
@@ -12,13 +12,14 @@ export default function useFixers() {
 	const { fixableThreats } = status;
 	const fixersMutation = useFixersMutation();
 
-	const { data: fixersStatus } = useFixersQuery( { threatIds: fixableThreats } );
+	const { data: fixersStatus } = useFixersQuery( { threatIds: fixableThreats, usePolling: true } );
 
 	const fixThreats = async ( threatIds: number[] ) => fixersMutation.mutateAsync( threatIds );
 
 	return {
 		fixableThreats,
 		fixersStatus,
 		fixThreats,
+		isLoading: fixersMutation.isPending,
 	};
 }