Skip to content

Commit 7f24732

Browse files
committed
fix: salesforce field mapping issue fixed
1 parent 82f36db commit 7f24732

File tree

3 files changed

+42
-85
lines changed

3 files changed

+42
-85
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function Salesforce({ formFields, setFlow, flow, allIntegURL }) {
3737
type: 'Salesforce',
3838
clientId: '',
3939
clientSecret: '',
40-
field_map: [{ formField: '', selesforceField: '' }],
40+
field_map: [],
4141
selesforceActionModules: action_modules,
4242
action_modules,
4343
actions: {}

frontend-dev/src/components/AllIntegrations/Salesforce/SalesforceCommonFunc.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ export const generateMappedField = (salesforceConf, actionName) => {
637637
const fieldMap = salesforceConf?.field_map || []
638638

639639
const mappedFieldKeys = fieldMap.reduce((arr, item) => {
640-
const key = item.salesforceField ?? item.selesforceField
640+
const key = item.selesforceField ?? item.selesforceField
641641
if (key) arr.push(key)
642642
return arr
643643
}, [])
@@ -648,11 +648,11 @@ export const generateMappedField = (salesforceConf, actionName) => {
648648
if (unmappedRequiredFields.length > 0) {
649649
const requiredMappings = unmappedRequiredFields.map(field => ({
650650
formField: '',
651-
salesforceField: field.key
651+
selesforceField: field.key
652652
}))
653653
fieldMap.push(...requiredMappings)
654654
} else if (fieldMap.length === 0) {
655-
fieldMap.push({ formField: '', salesforceField: '' })
655+
fieldMap.push({ formField: '', selesforceField: '' })
656656
}
657657

658658
return fieldMap
@@ -688,7 +688,7 @@ export const handleAuthorize = (
688688
grantTokenResponse = JSON.parse(bitformsZoho)
689689
localStorage.removeItem('__salesforce')
690690
}
691-
console.log(grantTokenResponse)
691+
692692
if (
693693
!grantTokenResponse.code ||
694694
grantTokenResponse.error ||

frontend-dev/src/components/AllIntegrations/Salesforce/SalesforceIntegLayout.jsx

Lines changed: 37 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ export default function SalesforceIntegLayout({
3838
}
3939
}, [salesforceConf?.actionName])
4040

41-
const handleInputP = (e) => {
41+
const handleInputP = e => {
4242
const newConf = { ...salesforceConf }
4343
const { name, value } = e.target
4444
newConf[name] = value
45+
newConf.field_map = []
4546

4647
if (e.target.value !== '') {
4748
const actName = value
@@ -56,14 +57,7 @@ export default function SalesforceIntegLayout({
5657
setSnackbar
5758
)
5859
} else if (actName === 'lead-create') {
59-
getAllCustomFields(
60-
formID,
61-
'lead-create',
62-
newConf,
63-
setSalesforceConf,
64-
setIsLoading,
65-
setSnackbar
66-
)
60+
getAllCustomFields(formID, 'lead-create', newConf, setSalesforceConf, setIsLoading, setSnackbar)
6761
} else if (actName === 'account-create') {
6862
getAllCustomFields(
6963
formID,
@@ -101,23 +95,9 @@ export default function SalesforceIntegLayout({
10195
setSnackbar
10296
)
10397
} else if (actName === 'event-create') {
104-
getAllCustomFields(
105-
formID,
106-
'event-create',
107-
newConf,
108-
setSalesforceConf,
109-
setIsLoading,
110-
setSnackbar
111-
)
98+
getAllCustomFields(formID, 'event-create', newConf, setSalesforceConf, setIsLoading, setSnackbar)
11299
} else if (actName === 'case-create') {
113-
getAllCustomFields(
114-
formID,
115-
'case-create',
116-
newConf,
117-
setSalesforceConf,
118-
setIsLoading,
119-
setSnackbar
120-
)
100+
getAllCustomFields(formID, 'case-create', newConf, setSalesforceConf, setIsLoading, setSnackbar)
121101
} else if (actName !== 'task-create') {
122102
getAllCustomFields(formID, actName, newConf, setSalesforceConf, setIsLoading, setSnackbar)
123103
}
@@ -172,23 +152,17 @@ export default function SalesforceIntegLayout({
172152
defaultValue={salesforceConf?.campaignId}
173153
options={
174154
salesforceConf?.default?.campaignLists &&
175-
salesforceConf.default.campaignLists.map((item) => ({
155+
salesforceConf.default.campaignLists.map(item => ({
176156
label: item.Name,
177157
value: item.Id
178158
}))
179159
}
180-
onChange={(val) => changeHandler(val, 'campaignId')}
160+
onChange={val => changeHandler(val, 'campaignId')}
181161
singleSelect
182162
/>
183163
<button
184164
onClick={() =>
185-
getAllCampaignList(
186-
formID,
187-
salesforceConf,
188-
setSalesforceConf,
189-
setIsLoading,
190-
setSnackbar
191-
)
165+
getAllCampaignList(formID, salesforceConf, setSalesforceConf, setIsLoading, setSnackbar)
192166
}
193167
className="icn-btn sh-sm ml-2 mr-2 tooltip"
194168
style={{ '--tooltip-txt': `'${__('Fetch Campaign lists', 'bit-integrations')}'` }}
@@ -212,9 +186,9 @@ export default function SalesforceIntegLayout({
212186
defaultValue={salesforceConf?.leadId}
213187
options={
214188
salesforceConf?.default?.leadLists &&
215-
salesforceConf.default.leadLists.map((item) => ({ label: item.Name, value: item.Id }))
189+
salesforceConf.default.leadLists.map(item => ({ label: item.Name, value: item.Id }))
216190
}
217-
onChange={(val) => changeHandler(val, 'leadId')}
191+
onChange={val => changeHandler(val, 'leadId')}
218192
singleSelect
219193
/>
220194
<button
@@ -239,23 +213,17 @@ export default function SalesforceIntegLayout({
239213
defaultValue={salesforceConf?.contactId}
240214
options={
241215
salesforceConf?.default?.contactLists &&
242-
salesforceConf.default.contactLists.map((item) => ({
216+
salesforceConf.default.contactLists.map(item => ({
243217
label: item.Name,
244218
value: item.Id
245219
}))
246220
}
247-
onChange={(val) => changeHandler(val, 'contactId')}
221+
onChange={val => changeHandler(val, 'contactId')}
248222
singleSelect
249223
/>
250224
<button
251225
onClick={() =>
252-
getAllContactList(
253-
formID,
254-
salesforceConf,
255-
setSalesforceConf,
256-
setIsLoading,
257-
setSnackbar
258-
)
226+
getAllContactList(formID, salesforceConf, setSalesforceConf, setIsLoading, setSnackbar)
259227
}
260228
className="icn-btn sh-sm ml-2 mr-2 tooltip"
261229
style={{ '--tooltip-txt': `'${__('Fetch Contact lists', 'bit-integrations')}'` }}
@@ -275,23 +243,17 @@ export default function SalesforceIntegLayout({
275243
defaultValue={salesforceConf?.accountId}
276244
options={
277245
salesforceConf?.default?.accountLists &&
278-
salesforceConf.default.accountLists.map((item) => ({
246+
salesforceConf.default.accountLists.map(item => ({
279247
label: item.Name,
280248
value: item.Id
281249
}))
282250
}
283-
onChange={(val) => changeHandler(val, 'accountId')}
251+
onChange={val => changeHandler(val, 'accountId')}
284252
singleSelect
285253
/>
286254
<button
287255
onClick={() =>
288-
getAllAccountList(
289-
formID,
290-
salesforceConf,
291-
setSalesforceConf,
292-
setIsLoading,
293-
setSnackbar
294-
)
256+
getAllAccountList(formID, salesforceConf, setSalesforceConf, setIsLoading, setSnackbar)
295257
}
296258
className="icn-btn sh-sm ml-2 mr-2 tooltip"
297259
style={{ '--tooltip-txt': `'${__('Fetch Account lists', 'bit-integrations')}'` }}
@@ -309,12 +271,12 @@ export default function SalesforceIntegLayout({
309271
defaultValue={salesforceConf?.statusId}
310272
options={
311273
salesforceConf?.campaignMemberStatus &&
312-
salesforceConf.campaignMemberStatus.map((item) => ({
274+
salesforceConf.campaignMemberStatus.map(item => ({
313275
label: item.label,
314276
value: item.value
315277
}))
316278
}
317-
onChange={(val) => changeHandler(val, 'statusId')}
279+
onChange={val => changeHandler(val, 'statusId')}
318280
singleSelect
319281
/>
320282
</div>
@@ -326,8 +288,8 @@ export default function SalesforceIntegLayout({
326288
<MultiSelect
327289
className="w-5"
328290
defaultValue={salesforceConf?.subjectId}
329-
options={taskSubject.map((item) => ({ label: item.label, value: item.value }))}
330-
onChange={(val) => changeHandler(val, 'subjectId')}
291+
options={taskSubject.map(item => ({ label: item.label, value: item.value }))}
292+
onChange={val => changeHandler(val, 'subjectId')}
331293
singleSelect
332294
/>
333295
</div>
@@ -336,8 +298,8 @@ export default function SalesforceIntegLayout({
336298
<MultiSelect
337299
className="w-5"
338300
defaultValue={salesforceConf?.priorityId}
339-
options={taskPriority.map((item) => ({ label: item.label, value: item.value }))}
340-
onChange={(val) => changeHandler(val, 'priorityId')}
301+
options={taskPriority.map(item => ({ label: item.label, value: item.value }))}
302+
onChange={val => changeHandler(val, 'priorityId')}
341303
singleSelect
342304
/>
343305
</div>
@@ -346,8 +308,8 @@ export default function SalesforceIntegLayout({
346308
<MultiSelect
347309
className="w-5"
348310
defaultValue={salesforceConf?.statusId}
349-
options={taskStatus.map((item) => ({ label: item.label, value: item.value }))}
350-
onChange={(val) => changeHandler(val, 'statusId')}
311+
options={taskStatus.map(item => ({ label: item.label, value: item.value }))}
312+
onChange={val => changeHandler(val, 'statusId')}
351313
singleSelect
352314
/>
353315
</div>
@@ -417,12 +379,7 @@ export default function SalesforceIntegLayout({
417379
<div className="txt-center btcbi-field-map-button mt-2">
418380
<button
419381
onClick={() =>
420-
addFieldMap(
421-
salesforceConf.field_map.length,
422-
salesforceConf,
423-
setSalesforceConf,
424-
false
425-
)
382+
addFieldMap(salesforceConf.field_map.length, salesforceConf, setSalesforceConf, false)
426383
}
427384
className="icn-btn sh-sm"
428385
type="button">
@@ -436,18 +393,18 @@ export default function SalesforceIntegLayout({
436393
{['opportunity-create', 'event-create', 'case-create', 'account-create'].includes(
437394
salesforceConf?.actionName
438395
) && (
439-
<>
440-
<div className="mt-4">
441-
<b className="wdt-100">{__('Utilities', 'bit-integrations')}</b>
442-
</div>
443-
<div className="btcd-hr mt-1" />
444-
<SalesforceActions
445-
salesforceConf={salesforceConf}
446-
setSalesforceConf={setSalesforceConf}
447-
formFields={formFields}
448-
/>
449-
</>
450-
)}
396+
<>
397+
<div className="mt-4">
398+
<b className="wdt-100">{__('Utilities', 'bit-integrations')}</b>
399+
</div>
400+
<div className="btcd-hr mt-1" />
401+
<SalesforceActions
402+
salesforceConf={salesforceConf}
403+
setSalesforceConf={setSalesforceConf}
404+
formFields={formFields}
405+
/>
406+
</>
407+
)}
451408
</>
452409
)
453410
}

0 commit comments

Comments
 (0)