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

Move filter removal functionality to Premium

Browse Source 
[MAILPOET-3929]
This commit is contained in:
wxa
2021-12-06 17:51:28 +03:00
committed by Veljko V
parent 6c5eac8a58
commit 3e8b15c6e7
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/src/common/button/icon/minus.tsx
View File

@@ -1,9 +0,0 @@
import React from 'react';
const MinusIcon = (
<svg viewBox="0 0 24 24">
<path d="M20 14H4V10H20V14Z" />
</svg>
);
export { MinusIcon };

20
assets/js/src/segments/dynamic/form.tsx
View File

@@ -12,7 +12,6 @@ import { Grid } from 'common/grid';
import { SubscribersCounter } from './subscribers_counter'; import { SubscribersCounter } from './subscribers_counter';
import { FormFilterFields } from './form_filter_fields'; import { FormFilterFields } from './form_filter_fields';
import { isFormValid } from './validator'; import { isFormValid } from './validator';
import { MinusIcon } from '../../common/button/icon/minus';
import plusIcon from '../../common/button/icon/plus'; import plusIcon from '../../common/button/icon/plus';
import APIErrorsNotice from '../../notices/api_errors_notice'; import APIErrorsNotice from '../../notices/api_errors_notice';
import { PrivacyProtectionNotice } from './privacy_protection_notice'; import { PrivacyProtectionNotice } from './privacy_protection_notice';
@@ -32,6 +31,7 @@ interface Props {
} }
const FiltersBefore = Hooks.applyFilters('mailpoet_dynamic_segments_form_filters_before', (): React.FunctionComponent => null); const FiltersBefore = Hooks.applyFilters('mailpoet_dynamic_segments_form_filters_before', (): React.FunctionComponent => null);
const FilterBefore = Hooks.applyFilters('mailpoet_dynamic_filters_filter_before', (): React.FunctionComponent => null);
const FilterAfter = Hooks.applyFilters('mailpoet_dynamic_filters_filter_after', (): JSX.Element => ( const FilterAfter = Hooks.applyFilters('mailpoet_dynamic_filters_filter_after', (): JSX.Element => (
<div className="mailpoet-gap" /> <div className="mailpoet-gap" />
)); ));
@@ -122,23 +122,7 @@ export const Form: React.FunctionComponent<Props> = ({
{Array.isArray(filterRows) && filterRows.map((filterRow, index) => ( {Array.isArray(filterRows) && filterRows.map((filterRow, index) => (
<React.Fragment key={filterRow.index}> <React.Fragment key={filterRow.index}>
<Grid.ThreeColumns automationId={`filter-row-${index}`}> <Grid.ThreeColumns automationId={`filter-row-${index}`}>
{filterRows.length > 1 && ( <FilterBefore filterRows={filterRows} index={index} />
<a
href={undefined}
className="mailpoet-form-segment-delete"
data-automation-id="delete-filter-row"
onClick={(e) => {
e.preventDefault();
const filters = segment.filters;
filters.splice(index, 1);
updateSegment({
filters,
});
}}
>
{MinusIcon}
</a>
)}
<Grid.CenteredRow> <Grid.CenteredRow>
<Select <Select
dimension="small" dimension="small"