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

Fix settings rendering on the Advanced Fraud Protection page #9521

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Fix settings rendering on the Advanced Fraud Protection page #9521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20defea
Remove protectionSettingsChanged state from the advanced fraud protec…
eduardoumpierre Oct 4, 2024
7d90a1b
Update the setState flow to rely on protectionSettingsUI as the sourc…
eduardoumpierre Oct 4, 2024
81c86b6
Update unit tests
eduardoumpierre Oct 4, 2024
2945eb4
Add changelog entry
eduardoumpierre Oct 4, 2024
1a7d3e1
Fix array dependency of confirmLeaveCallback
eduardoumpierre Oct 4, 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
4 changes: 4 additions & 0 deletions changelog/fix-9520-advanced-fraud-protection-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fix settings display on the advanced fraud protection page.
4 changes: 2 additions & 2 deletions client/settings/fraud-protection/advanced-settings/allow-countries-notice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ interface AllowedCountriesNoticeProps {
const AllowedCountriesNotice: React.FC< AllowedCountriesNoticeProps > = ( {
setting,
} ) => {
const { protectionSettingsUI, protectionSettingsChanged } = useContext(
const { protectionSettingsUI } = useContext(
FraudPreventionSettingsContext
);
const [ isBlocking, setIsBlocking ] = useState(
protectionSettingsUI[ setting ]?.block ?? false
);
useEffect( () => {
setIsBlocking( protectionSettingsUI[ setting ]?.block ?? false );
}, [ protectionSettingsUI, setting, protectionSettingsChanged ] );
}, [ protectionSettingsUI, setting ] );

const supportedCountriesType = getSupportedCountriesType();
const settingCountries = getSettingCountries();
Expand Down
61 changes: 18 additions & 43 deletions client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/**
* External dependencies
*/
import React, {
useContext,
useEffect,
useState,
useMemo,
Dispatch,
SetStateAction,
} from 'react';
import React, { useContext, useMemo, Dispatch, SetStateAction } from 'react';
import { __ } from '@wordpress/i18n';
import { TextControl } from '@wordpress/components';

Expand Down Expand Up @@ -36,7 +29,6 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
const {
protectionSettingsUI,
setProtectionSettingsUI,
setProtectionSettingsChanged,
setIsDirty,
} = useContext( FraudPreventionSettingsContext );

Expand All @@ -48,40 +40,29 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
[ protectionSettingsUI, setting ]
);

const minItemsTemp = parseInt( settingUI.min_items + '', 10 );
const maxItemsTemp = parseInt( settingUI.max_items + '', 10 );
const minItems = parseInt( settingUI?.min_items + '', 10 );
const maxItems = parseInt( settingUI?.max_items + '', 10 );
Comment on lines +43 to +44
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to the PR, just out of curiosity, wouldn't be better to use Number here? It will remove the need to cast to string and use a radix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think it would be better to use Number here instead of the multiple parseInt, but I'd be more comfortable having it in a different PR. I can open an enhancement issue to address that. It could even be something that we do on cooldown weeks. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, definitely something to explore on a cooldown or similar 🙂


const [ minItemsCount, setMinItemsCount ] = useState(
isNaN( minItemsTemp ) ? '' : minItemsTemp
);
const [ maxItemsCount, setMaxItemsCount ] = useState(
isNaN( maxItemsTemp ) ? '' : maxItemsTemp
);

useEffect( () => {
settingUI.min_items = minItemsCount
? parseInt( minItemsCount + '', 10 )
: minItemsCount;
settingUI.max_items = maxItemsCount
? parseInt( maxItemsCount + '', 10 )
: maxItemsCount;
setProtectionSettingsUI( protectionSettingsUI );
setProtectionSettingsChanged( ( prev ) => ! prev );
}, [
settingUI,
minItemsCount,
maxItemsCount,
protectionSettingsUI,
setProtectionSettingsUI,
setProtectionSettingsChanged,
] );
const minItemsCount = isNaN( minItems ) ? '' : minItems;
const maxItemsCount = isNaN( maxItems ) ? '' : maxItems;

const isItemRangeEmpty =
! parseInt( minItemsCount + '', 10 ) &&
! parseInt( maxItemsCount + '', 10 );
const isMinGreaterThanMax =
parseInt( minItemsCount + '', 10 ) > parseInt( maxItemsCount + '', 10 );

const handleInputChange = ( name: string ) => ( val: string ) => {
setProtectionSettingsUI( ( settings ) => ( {
...settings,
[ setting ]: {
...settings[ setting ],
[ name ]: val ? parseInt( val + '', 10 ) : val,
},
} ) );
setIsDirty( true );
};

return (
<div className="fraud-protection-rule-toggle-children-container">
<strong>Limits</strong>
Expand All @@ -98,10 +79,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
placeholder={ '0' }
value={ minItemsCount }
type="number"
onChange={ ( value ) => {
setMinItemsCount( value );
setIsDirty( true );
} }
onChange={ handleInputChange( 'min_items' ) }
onKeyDown={ ( e ) =>
/^[+-.,e]$/m.test( e.key ) && e.preventDefault()
}
Expand All @@ -125,10 +103,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
placeholder={ '0' }
type="number"
value={ maxItemsCount }
onChange={ ( value ) => {
setMaxItemsCount( value );
setIsDirty( true );
} }
onChange={ handleInputChange( 'max_items' ) }
onKeyDown={ ( e ) =>
/^[+-.,e]$/m.test( e.key ) && e.preventDefault()
}
Expand Down
52 changes: 16 additions & 36 deletions client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/**
* External dependencies
*/
import React, {
useContext,
useEffect,
useState,
useMemo,
SetStateAction,
Dispatch,
} from 'react';
import React, { useContext, useMemo, SetStateAction, Dispatch } from 'react';
import { __ } from '@wordpress/i18n';
import AmountInput from 'wcpay/components/amount-input';

Expand Down Expand Up @@ -55,7 +48,6 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
const {
protectionSettingsUI,
setProtectionSettingsUI,
setProtectionSettingsChanged,
setIsDirty,
} = useContext( FraudPreventionSettingsContext );

Expand All @@ -67,25 +59,8 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
[ protectionSettingsUI, setting ]
);

const minAmountTemp = parseFloat( settingUI.min_amount + '' );
const maxAmountTemp = parseFloat( settingUI.max_amount + '' );

const [ minAmount, setMinAmount ] = useState( minAmountTemp ?? '' );
const [ maxAmount, setMaxAmount ] = useState( maxAmountTemp ?? '' );

useEffect( () => {
settingUI.min_amount = minAmount ? parseFloat( minAmount + '' ) : null;
settingUI.max_amount = maxAmount ? parseFloat( maxAmount + '' ) : null;
setProtectionSettingsUI( protectionSettingsUI );
setProtectionSettingsChanged( ( prev ) => ! prev );
}, [
minAmount,
maxAmount,
protectionSettingsUI,
setProtectionSettingsUI,
setProtectionSettingsChanged,
settingUI,
] );
const minAmount = parseFloat( settingUI.min_amount + '' );
const maxAmount = parseFloat( settingUI.max_amount + '' );

const areInputsEmpty =
! getFloatValue( minAmount + '' ) && ! getFloatValue( maxAmount + '' );
Expand All @@ -96,6 +71,17 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo

const currencySymbol = getCurrencySymbol();

const handleAmountInputChange = ( name: string ) => ( val: string ) => {
setProtectionSettingsUI( ( settings ) => ( {
...settings,
[ setting ]: {
...settings[ setting ],
[ name ]: val ? parseFloat( val + '' ) : null,
},
} ) );
setIsDirty( true );
};

return (
<div className="fraud-protection-rule-toggle-children-container">
<strong>Limits</strong>
Expand All @@ -112,10 +98,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
prefix={ currencySymbol }
placeholder={ '0.00' }
value={ minAmount.toString() }
onChange={ ( val ) => {
setMinAmount( Number( val ) );
setIsDirty( true );
} }
onChange={ handleAmountInputChange( 'min_amount' ) }
help={ __(
'Leave blank for no limit',
'woocommerce-payments'
Expand All @@ -134,10 +117,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
prefix={ currencySymbol }
placeholder={ '0.00' }
value={ maxAmount.toString() }
onChange={ ( val ) => {
setMaxAmount( Number( val ) );
setIsDirty( true );
} }
onChange={ handleAmountInputChange( 'max_amount' ) }
help={ __(
'Leave blank for no limit',
'woocommerce-payments'
Expand Down
2 changes: 2 additions & 0 deletions ...raud-protection/advanced-settings/cards/test/__snapshots__/address-mismatch.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ exports[`Address mismatch card renders correctly when enabled 1`] = `
>
<input
aria-describedby="inspector-toggle-control-1__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-1"
type="checkbox"
Expand Down Expand Up @@ -265,6 +266,7 @@ exports[`Address mismatch card renders correctly when enabled and checked 1`] =
>
<input
aria-describedby="inspector-toggle-control-2__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-2"
type="checkbox"
Expand Down
8 changes: 5 additions & 3 deletions ...tection/advanced-settings/cards/test/__snapshots__/international-ip-address.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ exports[`International IP address card renders correctly when enabled 1`] = `
>
<input
aria-describedby="inspector-toggle-control-2__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-2"
type="checkbox"
Expand Down Expand Up @@ -137,7 +138,7 @@ exports[`International IP address card renders correctly when enabled 1`] = `
data-wp-c16t="true"
data-wp-component="FlexItem"
>
Orders from outside of the following countries will be blocked by the filter:
Orders from outside of the following countries will be screened by the filter:
<strong>
Canada, United States
</strong>
Expand Down Expand Up @@ -232,6 +233,7 @@ exports[`International IP address card renders correctly when enabled and checke
>
<input
aria-describedby="inspector-toggle-control-3__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-3"
type="checkbox"
Expand Down Expand Up @@ -588,7 +590,7 @@ exports[`International IP address card renders correctly when woocommerce_allowe
data-wp-c16t="true"
data-wp-component="FlexItem"
>
Orders from the following countries will be blocked by the filter:
Orders from the following countries will be screened by the filter:
<strong>
Canada, United States
</strong>
Expand Down Expand Up @@ -753,7 +755,7 @@ exports[`International IP address card renders correctly when woocommerce_allowe
data-wp-c16t="true"
data-wp-component="FlexItem"
>
Orders from outside of the following countries will be blocked by the filter:
Orders from outside of the following countries will be screened by the filter:
<strong>
Canada, United States
</strong>
Expand Down
2 changes: 2 additions & 0 deletions ...d-protection/advanced-settings/cards/test/__snapshots__/ip-address-mismatch.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ exports[`International billing address card renders correctly when enabled 1`] =
>
<input
aria-describedby="inspector-toggle-control-1__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-1"
type="checkbox"
Expand Down Expand Up @@ -289,6 +290,7 @@ exports[`International billing address card renders correctly when enabled and c
>
<input
aria-describedby="inspector-toggle-control-2__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-2"
type="checkbox"
Expand Down
2 changes: 2 additions & 0 deletions ...protection/advanced-settings/cards/test/__snapshots__/order-items-threshold.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ exports[`Order items threshold card renders correctly when enabled 1`] = `
>
<input
aria-describedby="inspector-toggle-control-1__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-1"
type="checkbox"
Expand Down Expand Up @@ -389,6 +390,7 @@ exports[`Order items threshold card renders correctly when enabled and checked 1
>
<input
aria-describedby="inspector-toggle-control-2__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-2"
type="checkbox"
Expand Down
2 changes: 2 additions & 0 deletions ...tection/advanced-settings/cards/test/__snapshots__/purchase-price-threshold.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ exports[`Purchase price threshold card renders correctly when enabled 1`] = `
>
<input
aria-describedby="inspector-toggle-control-1__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-1"
type="checkbox"
Expand Down Expand Up @@ -391,6 +392,7 @@ exports[`Purchase price threshold card renders correctly when enabled and checke
>
<input
aria-describedby="inspector-toggle-control-2__help"
checked=""
class="components-form-toggle__input"
id="inspector-toggle-control-2"
type="checkbox"
Expand Down
2 changes: 0 additions & 2 deletions client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ describe( 'Address mismatch card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
test( 'renders correctly', () => {
Expand Down
4 changes: 0 additions & 4 deletions client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ describe( 'AVS mismatch card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
const { container } = render(
Expand Down Expand Up @@ -69,8 +67,6 @@ describe( 'AVS mismatch card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
const { container } = render(
Expand Down
4 changes: 0 additions & 4 deletions client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ describe( 'CVC verification card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
const { container } = render(
Expand Down Expand Up @@ -72,8 +70,6 @@ describe( 'CVC verification card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
const { container } = render(
Expand Down
2 changes: 0 additions & 2 deletions .../settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ describe( 'International IP address card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
isDirty: false,
setIsDirty: jest.fn(),
};
Expand Down
2 changes: 0 additions & 2 deletions client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ describe( 'International billing address card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
global.wcSettings = {
Expand Down
2 changes: 0 additions & 2 deletions client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ describe( 'Order items threshold card', () => {
const contextValue = {
protectionSettingsUI: settings,
setProtectionSettingsUI: setSettings,
protectionSettingsChanged: false,
setProtectionSettingsChanged: jest.fn(),
setIsDirty: jest.fn(),
};
test( 'renders correctly', () => {
Expand Down
Loading
Loading