Skip to content

Commit 0124492

Browse files
committed
refactor: sanitize code
1 parent 472d4d1 commit 0124492

File tree

9 files changed

+17
-41
lines changed

9 files changed

+17
-41
lines changed

frontend-dev/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import { useRecoilState, useRecoilValue } from 'recoil'
44
import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates'
55
import { __ } from '../../../Utils/i18nwrap'
66
import SnackMsg from '../../Utilities/SnackMsg'
7-
import EditFormInteg from '../EditFormInteg'
8-
import SetEditIntegComponents from '../IntegrationHelpers/SetEditIntegComponents'
97
import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers'
108
import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
9+
import SetEditIntegComponents from '../IntegrationHelpers/SetEditIntegComponents'
1110
import { checkMappedFields, handleInput } from './MailerPressCommonFunc'
1211
import MailerPressIntegLayout from './MailerPressIntegLayout'
1312

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPress.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,4 @@ export default function MailerPress({ formFields, setFlow, flow, allIntegURL })
104104
</div>
105105
)
106106
}
107+

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPressAuthorization.jsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ import { useState } from 'react'
22
import BackIcn from '../../../Icons/BackIcn'
33
import bitsFetch from '../../../Utils/bitsFetch'
44
import { __ } from '../../../Utils/i18nwrap'
5-
import LoaderSm from '../../Loaders/LoaderSm'
6-
import {
7-
refreshMailerPressLists,
8-
refreshMailerPressTags,
9-
mailerPressListHeaders
10-
} from './MailerPressCommonFunc'
115
import tutorialLinks from '../../../Utils/StaticData/tutorialLinks'
6+
import LoaderSm from '../../Loaders/LoaderSm'
127
import TutorialLink from '../../Utilities/TutorialLink'
138

149
export default function MailerPressAuthorization({

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPressCommonFunc.js

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { create } from 'mutative'
12
import toast from 'react-hot-toast'
23
import bitsFetch from '../../../Utils/bitsFetch'
3-
import { __, sprintf } from '../../../Utils/i18nwrap'
4-
import { create } from 'mutative'
4+
import { __ } from '../../../Utils/i18nwrap'
55

66
export const handleInput = (e, mailerPressConf, setMailerPressConf) => {
77
const { name, value } = e.target
@@ -55,35 +55,13 @@ export const refreshMailerPressTags = (setMailerPressConf, setIsLoading, setSnac
5555
.catch(() => setIsLoading(false))
5656
}
5757

58-
export const mailerPressListHeaders = (setMailerPressConf, setIsLoading, setSnackbar) => {
59-
setIsLoading(true)
60-
bitsFetch(null, 'mailer_press_list_headers')
61-
.then(result => {
62-
if (result && result.success) {
63-
setMailerPressConf(oldConf => {
64-
const newConf = { ...oldConf }
65-
if (result.data.mailerPressFields) {
66-
newConf.mailerPressFields = result.data.mailerPressFields
67-
}
68-
return newConf
69-
})
70-
setIsLoading(false)
71-
toast.success(__('Fields fetched successfully', 'bit-integrations'))
72-
return
73-
}
74-
setIsLoading(false)
75-
toast.error(__('MailerPress field fetch failed. Please try again', 'bit-integrations'))
76-
})
77-
.catch(() => setIsLoading(false))
78-
}
79-
8058
export const checkMappedFields = mailerPressConf => {
8159
const mappedFields = mailerPressConf?.field_map
8260
? mailerPressConf.field_map.filter(
8361
mappedField =>
8462
!mappedField.formField ||
8563
!mappedField.mailerPressField ||
86-
(!mappedField.formField === 'custom' && !mappedField.customValue)
64+
(mappedField.formField === 'custom' && !mappedField.customValue)
8765
)
8866
: []
8967
if (mappedFields.length > 0) {

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPressFieldMap.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useRecoilValue } from 'recoil'
22
import { $btcbi } from '../../../GlobalStates'
3-
import { __ } from '../../../Utils/i18nwrap'
3+
import { __, sprintf } from '../../../Utils/i18nwrap'
44
import { SmartTagField } from '../../../Utils/StaticData/SmartTagField'
55
import TagifyInput from '../../Utilities/TagifyInput'
66
import {

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPressIntegLayout.jsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
import { create } from 'mutative'
12
import MultiSelect from 'react-multiple-select-dropdown-lite'
3+
import { useRecoilValue } from 'recoil'
4+
import { $btcbi } from '../../../GlobalStates'
25
import { __ } from '../../../Utils/i18nwrap'
36
import Loader from '../../Loaders/Loader'
7+
import { checkIsPro, getProLabel } from '../../Utilities/ProUtilHelpers'
48
import { addFieldMap } from '../IntegrationHelpers/IntegrationHelpers'
59
import {
610
generateMappedField,
711
refreshMailerPressLists,
812
refreshMailerPressTags
913
} from './MailerPressCommonFunc'
1014
import MailerPressFieldMap from './MailerPressFieldMap'
11-
import { create } from 'mutative'
1215
import { ContactFields, emailField, modules } from './staticData'
13-
import { generate } from 'nth-check'
14-
import { checkIsPro, getProLabel } from '../../Utilities/ProUtilHelpers'
15-
import { useRecoilValue } from 'recoil'
16-
import { $btcbi } from '../../../GlobalStates'
1716

1817
export default function MailerPressIntegLayout({
1918
formID,

includes/Actions/MailerPress/MailerPressController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,4 @@ private static function convertStringToArray($value, $separator = ',')
150150
return array_filter($array);
151151
}
152152
}
153+

includes/Actions/MailerPress/RecordApiHelper.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ function ($id) {
178178
'message' => $isUpdate ? __('Contact updated successfully', 'bit-integrations') : __('Contact created successfully', 'bit-integrations')
179179
];
180180
}
181+
182+
return [
183+
'success' => false,
184+
'message' => $result['message'] ?? __('Failed to create or update contact', 'bit-integrations')
185+
];
181186
}
182187

183188
/**

includes/Actions/MailerPress/Routes.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@
1010
Route::post('mailer_press_authorize', [MailerPressController::class, 'mailerPressAuthorize']);
1111
Route::post('refresh_mailer_press_lists', [MailerPressController::class, 'refreshLists']);
1212
Route::post('refresh_mailer_press_tags', [MailerPressController::class, 'refreshTags']);
13-
Route::post('mailer_press_list_headers', [MailerPressController::class, 'mailerPressListHeaders']);
14-

0 commit comments

Comments
 (0)