Skip to content

Commit 6cef00d

Browse files
RishadAlamRishadAlam
committed
refactor: wishlist sanitize codes
1 parent d99c088 commit 6cef00d

File tree

6 files changed

+27
-124
lines changed

6 files changed

+27
-124
lines changed

‎frontend-dev/src/components/AllIntegrations/WishlistMember/EditWishlistMember.jsx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ function EditWishlistMember({ allIntegURL }) {
2323
const formFields = useRecoilValue($formFields)
2424
const [isLoading, setIsLoading] = useState(false)
2525
const [snack, setSnackbar] = useState({ show: false })
26+
const [name, setName] = useState(wishlistMemberConf?.name || '')
27+
2628
const saveConfig = () => {
2729
if (checkValidation(wishlistMemberConf)) {
2830
setSnackbar({
@@ -44,6 +46,7 @@ function EditWishlistMember({ allIntegURL }) {
4446
setSnackbar
4547
})
4648
}
49+
4750
return (
4851
<div style={{ width: 900 }}>
4952
<SnackMsg snack={snack} setSnackbar={setSnackbar} />
@@ -52,9 +55,12 @@ function EditWishlistMember({ allIntegURL }) {
5255
<b className="wdt-200 d-in-b">{__('Integration Name:', 'bit-integrations')}</b>
5356
<input
5457
className="btcd-paper-inp w-5"
55-
onChange={e => setIntegrationName(e, setWishlistMemberConf)}
58+
onChange={e => {
59+
setName(e.target.value)
60+
setIntegrationName(e, setWishlistMemberConf)
61+
}}
5662
name="name"
57-
value={wishlistMemberConf.name}
63+
value={name}
5864
type="text"
5965
placeholder={__('Integration Name...', 'bit-integrations')}
6066
/>
@@ -77,7 +83,7 @@ function EditWishlistMember({ allIntegURL }) {
7783
<IntegrationStepThree
7884
edit
7985
saveConfig={saveConfig}
80-
disabled={wishlistMemberConf.lists === '' || wishlistMemberConf.field_map.length < 1}
86+
disabled={checkValidation(wishlistMemberConf)}
8187
isLoading={isLoading}
8288
dataConf={wishlistMemberConf}
8389
setDataConf={setWishlistMemberConf}

‎frontend-dev/src/components/AllIntegrations/WishlistMember/WishlistMemberActions.jsx‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎frontend-dev/src/components/AllIntegrations/WishlistMember/WishlistMemberIntegLayout.jsx‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default function WishlistMemberIntegLayout({
5656
closeOnSelect
5757
/>
5858
</div>
59+
5960
{['create_member', 'add_member_to_level', 'remove_member_from_level'].includes(
6061
wishlistMemberConf?.action
6162
) && (
@@ -141,14 +142,6 @@ export default function WishlistMemberIntegLayout({
141142
</button>
142143
</div>
143144
)}
144-
145-
{/* <br />
146-
<br />
147-
<WishlistMemberActions
148-
wishlistMemberConf={wishlistMemberConf}
149-
setWishlistMemberConf={setWishlistMemberConf}
150-
formFields={formFields}
151-
/> */}
152145
</>
153146
)}
154147
</>

‎frontend-dev/src/components/AllIntegrations/WishlistMember/staticData.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
import { create } from 'lodash'
21
import { __ } from '../../../Utils/i18nwrap'
32

43
export const modules = [
5-
{ label: __('Create New Level', 'bit-integrations'), value: 'create_level', isPro: false },
6-
{ label: __('Update Level', 'bit-integrations'), value: 'update_level', isPro: true },
7-
{ label: __('Delete Level', 'bit-integrations'), value: 'delete_level', isPro: true },
8-
{ label: __('Create New Member', 'bit-integrations'), value: 'create_member', isPro: true },
9-
{ label: __('Update Member Data', 'bit-integrations'), value: 'update_member', isPro: true },
10-
{ label: __('Delete Member', 'bit-integrations'), value: 'delete_member', isPro: true },
11-
{ label: __('Add Member To Level', 'bit-integrations'), value: 'add_member_to_level', isPro: true },
4+
{ label: __('Create New Level', 'bit-integrations'), value: 'create_level', is_pro: false },
5+
{ label: __('Update Level', 'bit-integrations'), value: 'update_level', is_pro: true },
6+
{ label: __('Delete Level', 'bit-integrations'), value: 'delete_level', is_pro: true },
7+
{ label: __('Create New Member', 'bit-integrations'), value: 'create_member', is_pro: true },
8+
{ label: __('Update Member Data', 'bit-integrations'), value: 'update_member', is_pro: true },
9+
{ label: __('Delete Member', 'bit-integrations'), value: 'delete_member', is_pro: true },
10+
{ label: __('Add Member To Level', 'bit-integrations'), value: 'add_member_to_level', is_pro: true },
1211
{
1312
label: __('Remove Member From Level', 'bit-integrations'),
1413
value: 'remove_member_from_level',
15-
isPro: true
14+
is_pro: true
1615
}
1716
]
1817

‎includes/Actions/WishlistMember/RecordApiHelper.php‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function createMember($finalData)
9191
);
9292
}
9393

94-
public function updateMember($finalData)
94+
public function handleMemberEvents($finalData, $hook)
9595
{
9696
if (empty($finalData['user_email'])) {
9797
return [
@@ -101,39 +101,11 @@ public function updateMember($finalData)
101101
}
102102

103103
return self::handleFilterResponse(
104-
apply_filters('wishlist_update_member', false, $finalData)
104+
apply_filters($hook, false, $finalData)
105105
);
106106
}
107107

108-
public function deleteMember($finalData)
109-
{
110-
if (empty($finalData['user_email'])) {
111-
return [
112-
'success' => false,
113-
'ERROR' => __('Email is a required field.', 'bit-integrations')
114-
];
115-
}
116-
117-
return self::handleFilterResponse(
118-
apply_filters('wishlist_delete_member', false, $finalData)
119-
);
120-
}
121-
122-
public function addMemberToLevel($finalData)
123-
{
124-
if (empty($finalData['user_email']) || empty($this->integrationDetails->level_id)) {
125-
return [
126-
'success' => false,
127-
'ERROR' => __('Email and level are required fields.', 'bit-integrations')
128-
];
129-
}
130-
131-
return self::handleFilterResponse(
132-
apply_filters('wishlist_add_member_to_level', false, $finalData, $this->integrationDetails->level_id)
133-
);
134-
}
135-
136-
public function removeMemberFromLevel($finalData)
108+
public function handleMemberAddOrRemoveFromLevel($finalData, $hook)
137109
{
138110
if (empty($finalData['user_email']) || empty($this->integrationDetails->level_id)) {
139111
return [
@@ -143,7 +115,7 @@ public function removeMemberFromLevel($finalData)
143115
}
144116

145117
return self::handleFilterResponse(
146-
apply_filters('wishlist_remove_member_from_level', false, $finalData, $this->integrationDetails->level_id)
118+
apply_filters($hook, false, $finalData, $this->integrationDetails->level_id)
147119
);
148120
}
149121

@@ -187,28 +159,28 @@ public function execute($fieldValues, $fieldMap, $action)
187159
case 'update_member':
188160
$type = 'member';
189161
$type_name = 'Update Member';
190-
$recordApiResponse = $this->updateMember($finalData);
162+
$recordApiResponse = $this->handleMemberEvents($finalData, 'wishlist_update_member');
191163

192164
break;
193165

194166
case 'delete_member':
195167
$type = 'member';
196168
$type_name = 'Delete Member';
197-
$recordApiResponse = $this->deleteMember($finalData);
169+
$recordApiResponse = $this->handleMemberEvents($finalData, 'wishlist_delete_member');
198170

199171
break;
200172

201173
case 'add_member_to_level':
202174
$type = 'member';
203175
$type_name = 'Add Member To Level';
204-
$recordApiResponse = $this->addMemberToLevel($finalData);
176+
$recordApiResponse = $this->handleMemberAddOrRemoveFromLevel($finalData, 'wishlist_add_member_to_level');
205177

206178
break;
207179

208180
case 'remove_member_from_level':
209181
$type = 'member';
210182
$type_name = 'Remove Member From Level';
211-
$recordApiResponse = $this->removeMemberFromLevel($finalData);
183+
$recordApiResponse = $this->handleMemberAddOrRemoveFromLevel($finalData, 'wishlist_remove_member_from_level');
212184

213185
break;
214186

‎includes/Actions/WishlistMember/WishlistMemberController.php‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public static function isPluginInstalled()
2424
}
2525

2626
/**
27-
* Validate if WishlistMember plugin exists or not. If not exits then terminate
28-
* request and send an error response.
27+
* Validate if WishlistMember plugin exists or not.
2928
*/
3029
public static function authorization()
3130
{
@@ -70,25 +69,6 @@ function ($level) {
7069
wp_send_json_success($allLevels, 200);
7170
}
7271

73-
public static function wishlistMemberListHeaders()
74-
{
75-
self::isExists();
76-
$mailpoet_api = \WishlistMember\API\API::MP('v1');
77-
$subscriber_form_fields = $mailpoet_api->getSubscriberFields();
78-
79-
$allList = [];
80-
81-
foreach ($subscriber_form_fields as $fields) {
82-
$allList[$fields['name']] = (object) [
83-
'id' => $fields['id'],
84-
'name' => $fields['name'],
85-
'required' => $fields['params']['required']
86-
];
87-
}
88-
$response['wishlistMemberFields'] = $allList;
89-
wp_send_json_success($response, 200);
90-
}
91-
9272
public function execute($integrationData, $fieldValues)
9373
{
9474
$integrationDetails = $integrationData->flow_details;

0 commit comments

Comments
 (0)