chore: bento unnecessary code removed

Author: RishadAlam

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

@@ -10,14 +10,13 @@ import Steps from '../../Utilities/Steps'
 import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers'
 import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
 import BentoAuthorization from './BentoAuthorization'
-import { checkMappedFields, generateMappedField } from './BentoCommonFunc'
+import { checkMappedFields } from './BentoCommonFunc'
 import BentoIntegLayout from './BentoIntegLayout'
 
 function Bento({ formFields, setFlow, flow, allIntegURL }) {
   const navigate = useNavigate()
   const [isLoading, setIsLoading] = useState(false)
   const [loading, setLoading] = useState({})
-
   const [step, setStep] = useState(1)
   const [snack, setSnackbar] = useState({ show: false })
 
@@ -53,16 +52,6 @@ function Bento({ formFields, setFlow, flow, allIntegURL }) {
       document.getElementById('btcd-settings-wrp').scrollTop = 0
     }, 300)
 
-    // if (!checkMappedFields(bentoConf)) {
-    //   toast.error(__('Please map mandatory fields', 'bit-integrations'))
-    //   return
-    // }
-
-    // if (!bentoConf.selectedEvent) {
-    //   toast.error(__('Please select a Event', 'bit-integrations'))
-    //   return
-    // }
-
     bentoConf.field_map.length > 0 && setStep(pageNo)
   }
 

frontend-dev/src/components/AllIntegrations/Bento/BentoActions.jsx

@@ -1,19 +1,18 @@
 /* eslint-disable max-len */
 /* eslint-disable no-param-reassign */
 
+import { create } from 'mutative'
+import { useState } from 'react'
+import MultiSelect from 'react-multiple-select-dropdown-lite'
 import 'react-multiple-select-dropdown-lite/dist/index.css'
 import { useRecoilValue } from 'recoil'
 import { $btcbi } from '../../../GlobalStates'
 import { __ } from '../../../Utils/i18nwrap'
+import Loader from '../../Loaders/Loader'
+import ConfirmModal from '../../Utilities/ConfirmModal'
 import TableCheckBox from '../../Utilities/TableCheckBox'
 import { ProFeatureTitle } from '../IntegrationHelpers/ActionProFeatureLabels'
-import { useState } from 'react'
-import { create } from 'mutative'
-import ConfirmModal from '../../Utilities/ConfirmModal'
-import MultiSelect from 'react-multiple-select-dropdown-lite'
 import { getAllTags } from './BentoCommonFunc'
-import Loader from '../../Loaders/Loader'
-import c from 'react-multiple-select-dropdown-lite'
 
 export default function BentoActions({
   bentoConf,

frontend-dev/src/components/AllIntegrations/Bento/BentoCommonFunc.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-console */
 /* eslint-disable no-else-return */
+import { create } from 'mutative'
 import toast from 'react-hot-toast'
 import bitsFetch from '../../../Utils/bitsFetch'
 import { __ } from '../../../Utils/i18nwrap'
-import { create } from 'mutative'
 
 export const handleInput = (e, salesmateConf, setSalesmateConf) => {
   const newConf = { ...salesmateConf }
@@ -18,6 +18,7 @@ export const handleInput = (e, salesmateConf, setSalesmateConf) => {
 
 export const generateMappedField = (bentoFields) => {
   const requiredFlds = bentoFields.filter((fld) => fld.required === true)
+
   return requiredFlds.length > 0
     ? requiredFlds.map((field) => ({
       formField: '',
@@ -33,13 +34,11 @@ export const checkMappedFields = (bentoConf) => {
         !mappedField.formField ||
         !mappedField.bentoFormField ||
         (mappedField.formField === 'custom' && !mappedField.customValue) ||
-        (mappedField.bentoFormField === 'customFieldKey' && !mappedField.customFieldKey)
+        (bentoConf.action === 'add_event' && mappedField.bentoFormField === 'customFieldKey' && !mappedField.customFieldKey)
     )
     : []
-  if (mappedFields.length > 0) {
-    return false
-  }
-  return true
+
+  return mappedFields.length <= 0
 }
 
 const setRequestParams = (config, customs = {}) => {

frontend-dev/src/components/AllIntegrations/Bento/BentoFieldMap.jsx

@@ -3,19 +3,19 @@ import { useRecoilValue } from 'recoil'
 import { $btcbi } from '../../../GlobalStates'
 import { SmartTagField } from '../../../Utils/StaticData/SmartTagField'
 import { __ } from '../../../Utils/i18nwrap'
+import CustomFieldKey from '../../Utilities/CustomFieldKey'
 import TagifyInput from '../../Utilities/TagifyInput'
 import { addFieldMap, delFieldMap, handleCustomValue, handleFieldMapping } from './IntegrationHelpers'
-import CustomFieldKey from '../../Utilities/CustomFieldKey'
 
 export default function BentoFieldMap({ i, formFields, field, bentoConf, setBentoConf }) {
+  const btcbi = useRecoilValue($btcbi)
+  const { isPro } = btcbi
+
   const requiredFields =
     (bentoConf?.bentoFields && bentoConf.bentoFields.filter(fld => fld.required === true)) || []
   const allNonRequiredFields =
     (bentoConf?.bentoFields && bentoConf.bentoFields.filter(fld => fld.required === false)) || []
 
-  const btcbi = useRecoilValue($btcbi)
-  const { isPro } = btcbi
-  console.log(bentoConf)
   return (
     <div className="flx mt-2 mb-2 btcbi-field-map">
       <div className="pos-rel flx">
@@ -82,7 +82,7 @@ export default function BentoFieldMap({ i, formFields, field, bentoConf, setBent
               <option value="customFieldKey">{__('Custom Field Key', 'bit-integrations')}</option>
             )}
           </select>
-          {field.bentoFormField === 'customFieldKey' && (
+          {field.bentoFormField === 'customFieldKey' && bentoConf.action === 'add_event' && (
             <CustomFieldKey
               field={field}
               index={i}

frontend-dev/src/components/AllIntegrations/Bento/BentoIntegLayout.jsx

@@ -1,17 +1,17 @@
 /* eslint-disable no-unused-vars */
+import { create } from 'mutative'
 import MultiSelect from 'react-multiple-select-dropdown-lite'
 import 'react-multiple-select-dropdown-lite/dist/index.css'
+import { useRecoilValue } from 'recoil'
+import { $btcbi } from '../../../GlobalStates'
 import { __ } from '../../../Utils/i18nwrap'
 import Loader from '../../Loaders/Loader'
+import Note from '../../Utilities/Note'
+import { checkIsPro, getProLabel } from '../../Utilities/ProUtilHelpers'
+import BentoActions from './BentoActions'
 import { getFields } from './BentoCommonFunc'
 import BentoFieldMap from './BentoFieldMap'
 import { addFieldMap } from './IntegrationHelpers'
-import { create } from 'mutative'
-import { useRecoilValue } from 'recoil'
-import { $btcbi } from '../../../GlobalStates'
-import Note from '../../Utilities/Note'
-import BentoActions from './BentoActions'
-import { checkIsPro, getProLabel } from '../../Utilities/ProUtilHelpers'
 
 export default function BentoIntegLayout({
   formFields,

frontend-dev/src/components/AllIntegrations/Bento/EditBento.jsx

@@ -2,17 +2,14 @@
 /* eslint-disable no-param-reassign */
 
 import { useState } from 'react'
-import { toast } from 'react-hot-toast'
 import { useNavigate } from 'react-router-dom'
 import { useRecoilState, useRecoilValue } from 'recoil'
 import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates'
 import { __ } from '../../../Utils/i18nwrap'
 import SnackMsg from '../../Utilities/SnackMsg'
-import EditFormInteg from '../EditFormInteg'
-import SetEditIntegComponents from '../IntegrationHelpers/SetEditIntegComponents'
-import EditWebhookInteg from '../EditWebhookInteg'
 import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers'
 import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
+import SetEditIntegComponents from '../IntegrationHelpers/SetEditIntegComponents'
 import { checkMappedFields, handleInput } from './BentoCommonFunc'
 import BentoIntegLayout from './BentoIntegLayout'