Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add select with operator

Browse Source 
[MAILPOET-3954]
This commit is contained in:
Jan Lysý
2021-11-23 17:41:52 +01:00
committed by Veljko V
parent 040bf7e294
commit eedca86fe4
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
View File

@@ -8,6 +8,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
import { Grid } from 'common/grid'; import { Grid } from 'common/grid';
import Input from 'common/form/input/input'; import Input from 'common/form/input/input';
import { import {
AnyValueTypes,
SegmentTypes, SegmentTypes,
SelectOption, SelectOption,
WindowProductCategories, WindowProductCategories,
@@ -44,7 +45,8 @@ export function validateWooCommerce(formItems: WooCommerceFormItem): boolean {
return false; return false;
} }
const purchasedProductIsInvalid = formItems.product_ids === undefined const purchasedProductIsInvalid = formItems.product_ids === undefined
|| formItems.product_ids.length === 0; || formItems.product_ids.length === 0
|| !formItems.operator;
if (formItems.action === WooCommerceActionTypes.PURCHASED_PRODUCT && purchasedProductIsInvalid) { if (formItems.action === WooCommerceActionTypes.PURCHASED_PRODUCT && purchasedProductIsInvalid) {
return false; return false;
} }
@@ -123,11 +125,33 @@ export const WooCommerceFields: React.FunctionComponent<Props> = ({ filterIndex
) { ) {
updateSegmentFilter({ total_spent_type: '>' }, filterIndex); updateSegmentFilter({ total_spent_type: '>' }, filterIndex);
} }
if (
segment.action === WooCommerceActionTypes.PURCHASED_PRODUCT
&& segment.operator !== AnyValueTypes.ALL
&& segment.operator !== AnyValueTypes.ANY
&& segment.operator !== AnyValueTypes.NONE
) {
updateSegmentFilter({ operator: AnyValueTypes.ANY }, filterIndex);
}
}, [updateSegmentFilter, segment, filterIndex]); }, [updateSegmentFilter, segment, filterIndex]);
if (segment.action === WooCommerceActionTypes.PURCHASED_PRODUCT) { if (segment.action === WooCommerceActionTypes.PURCHASED_PRODUCT) {
optionFields = ( optionFields = (
<> <>
<Grid.CenteredRow>
<Select
key="select-operator"
value={segment.operator}
onChange={(e): void => updateSegmentFilter(
{ operator: e.target.value },
filterIndex
)}
>
<option value={AnyValueTypes.ANY}>{MailPoet.I18n.t('anyOf')}</option>
<option value={AnyValueTypes.ALL}>{MailPoet.I18n.t('allOf')}</option>
<option value={AnyValueTypes.NONE}>{MailPoet.I18n.t('noneOf')}</option>
</Select>
</Grid.CenteredRow>
<Grid.CenteredRow> <Grid.CenteredRow>
<ReactSelect <ReactSelect
isMulti isMulti