Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Remove unneeded filter handling
  • Loading branch information
dkmyta committed Jan 3, 2025
commit 010b2c19c0709d8ae53a2b6ed1ecb4a65d6bc7ce
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
import { dateI18n } from '@wordpress/date';
import { __ } from '@wordpress/i18n';
import { Icon } from '@wordpress/icons';
import { useCallback, useMemo, useState, useEffect } from 'react';
import { useCallback, useMemo, useState } from 'react';
import Badge from '../badge';
import ThreatFixerButton from '../threat-fixer-button';
import ThreatSeverityBadge from '../threat-severity-badge';
Expand Down Expand Up @@ -55,7 +55,6 @@ import ThreatsStatusToggleGroupControl from './threats-status-toggle-group-contr
* @param {Function} props.isThreatEligibleForFix - Function to determine if a threat is eligible for fixing.
* @param {Function} props.isThreatEligibleForIgnore - Function to determine if a threat is eligible for ignoring.
* @param {Function} props.isThreatEligibleForUnignore - Function to determine if a threat is eligible for unignoring.
* @param {Function} props.onStatusFilterChange - Callback function run when the status filter changes.
*
* @return {JSX.Element} The ThreatsDataViews component.
*/
Expand All @@ -69,7 +68,6 @@ export default function ThreatsDataViews( {
onFixThreats,
onIgnoreThreats,
onUnignoreThreats,
onStatusFilterChange,
}: {
data: Threat[];
filters?: Filter[];
Expand All @@ -80,7 +78,6 @@ export default function ThreatsDataViews( {
onFixThreats?: ( threats: Threat[] ) => void;
onIgnoreThreats?: ActionButton< Threat >[ 'callback' ];
onUnignoreThreats?: ActionButton< Threat >[ 'callback' ];
onStatusFilterChange?: ( newStatus: 'active' | 'historic' | null ) => void;
} ): JSX.Element {
const baseView = {
sort: {
Expand Down Expand Up @@ -535,11 +532,6 @@ export default function ThreatsDataViews( {
*/
const getItemId = useCallback( ( item: Threat ) => item.id.toString(), [] );

// Notify the consumer whenever the selectedStatusFilter changes
useEffect( () => {
onStatusFilterChange?.( selectedStatusFilter );
}, [ selectedStatusFilter, onStatusFilterChange ] );

return (
<DataViews
actions={ actions }
Expand Down
19 changes: 3 additions & 16 deletions projects/plugins/protect/src/js/routes/scan/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AdminSection, Container, Col } from '@automattic/jetpack-components';
import { useMemo, useState, useCallback } from 'react';
import { useMemo, useState } from 'react';
import { useLocation, useParams } from 'react-router-dom';
import AdminPage from '../../components/admin-page';
import OnboardingPopover from '../../components/onboarding-popover';
Expand All @@ -8,7 +8,6 @@ import useScanStatusQuery, { isScanInProgress } from '../../data/scan/use-scan-s
import useAnalyticsTracks from '../../hooks/use-analytics-tracks';
import { OnboardingContext } from '../../hooks/use-onboarding';
import usePlan from '../../hooks/use-plan';
import HistoryAdminSectionHero from './history-admin-section-hero';
import onboardingSteps from './onboarding-steps';
import ScanAdminSectionHero from './scan-admin-section-hero';
import ScanResultsDataView from './scan-results-data-view';
Expand All @@ -29,11 +28,6 @@ const ScanPage = () => {
const { data: history } = useHistoryQuery();

const [ scanResultsAnchor, setScanResultsAnchor ] = useState( null );
const [ statusFilter, setStatusFilter ] = useState( 'active' );

const handleStatusFilterChange = useCallback( newStatusFilter => {
setStatusFilter( newStatusFilter );
}, [] );

let currentScanStatus;
if ( status.error ) {
Expand Down Expand Up @@ -80,11 +74,7 @@ const ScanPage = () => {
return (
<OnboardingContext.Provider value={ onboardingSteps }>
<AdminPage>
{ 'historic' === statusFilter ? (
<HistoryAdminSectionHero />
) : (
<ScanAdminSectionHero size={ showResults ? 'normal' : 'large' } />
) }
<ScanAdminSectionHero size={ showResults ? 'normal' : 'large' } />
{ showResults && (
<AdminSection>
<Container
Expand All @@ -94,10 +84,7 @@ const ScanPage = () => {
>
<Col>
<div ref={ setScanResultsAnchor }>
<ScanResultsDataView
filters={ filters }
onStatusFilterChange={ hasPlan ? handleStatusFilterChange : null }
/>
<ScanResultsDataView filters={ filters } />
</div>
{ !! status && ! isScanInProgress( status ) && (
<OnboardingPopover
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@ import useModal from '../../hooks/use-modal';
/**
* Scan Results Data View
*
* @param {object} props - Component props.
* @param {Array} props.filters - Default filters to apply to the data view.
* @param {Function} props.onStatusFilterChange - Callback function to handle status filter changes.
* @param {object} props - Component props.
* @param {Array} props.filters - Default filters to apply to the data view.
*
* @return {JSX.Element} ScanResultDataView component.
*/
export default function ScanResultsDataView( {
filters = [],
onStatusFilterChange,
}: {
filters: React.ComponentProps< typeof ThreatsDataViews >[ 'filters' ];
onStatusFilterChange: ( newStatus: 'active' | 'historic' | null ) => void;
} ) {
const { setModal } = useModal();

Expand Down Expand Up @@ -54,7 +51,6 @@ export default function ScanResultsDataView( {
onFixThreats={ onFixThreats }
onIgnoreThreats={ onIgnoreThreats }
onUnignoreThreats={ onUnignoreThreats }
onStatusFilterChange={ onStatusFilterChange }
/>
);
}
Loading