fix: flowlu tagify custom field issue fixed

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/Flowlu/FlowluFieldMap.jsx

@@ -4,16 +4,14 @@ import { $btcbi } from '../../../GlobalStates'
 import { SmartTagField } from '../../../Utils/StaticData/SmartTagField'
 import { __ } from '../../../Utils/i18nwrap'
 import CustomField from './CustomField'
-import { addFieldMap, delFieldMap, handleFieldMapping } from './IntegrationHelpers'
+import { addFieldMap, delFieldMap, handleCustomValue, handleFieldMapping } from './IntegrationHelpers'
+import TagifyInput from '../../Utilities/TagifyInput'
 
 export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFlowluConf }) {
   const requiredFields =
-    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter((fld) => fld.required === true)) ||
-    []
+    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter(fld => fld.required === true)) || []
   const allNonRequiredFields =
-    (flowluConf?.flowluFields &&
-      flowluConf?.flowluFields.filter((fld) => fld.required === false)) ||
-    []
+    (flowluConf?.flowluFields && flowluConf?.flowluFields.filter(fld => fld.required === false)) || []
 
   const btcbi = useRecoilValue($btcbi)
   const { isPro } = btcbi
@@ -26,10 +24,10 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
             className="btcd-paper-inp mr-2"
             name="formField"
             value={field.formField || ''}
-            onChange={(ev) => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
+            onChange={ev => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
             <option value="">{__('Select Field', 'bit-integrations')}</option>
             <optgroup label={__('Form Fields', 'bit-integrations')}>
-              {formFields?.map((f) => (
+              {formFields?.map(f => (
                 <option key={`ff-rm-${f.name}`} value={f.name}>
                   {f.label}
                 </option>
@@ -42,7 +40,7 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
                 isPro ? '' : `(${__('Pro', 'bit-integrations')})`
               )}>
               {isPro &&
-                SmartTagField?.map((f) => (
+                SmartTagField?.map(f => (
                   <option key={`ff-rm-${f.name}`} value={f.name}>
                     {f.label}
                   </option>
@@ -51,25 +49,23 @@ export default function FlowluFieldMap({ i, formFields, field, flowluConf, setFl
           </select>
 
           {field.formField === 'custom' && (
-            <CustomField
-              field={field}
-              index={i}
-              conf={flowluConf}
-              setConf={setFlowluConf}
-              fieldValue="customValue"
-              fieldLabel="Custom Value"
+            <TagifyInput
+              onChange={e => handleCustomValue(e, i, flowluConf, setFlowluConf)}
+              label={__('Custom Value', 'bit-integrations')}
               className="mr-2"
+              type="text"
+              value={field.customValue}
+              placeholder={__('Custom Value', 'bit-integrations')}
+              formFields={formFields}
             />
           )}
 
           <select
             className="btcd-paper-inp"
             disabled={i < requiredFields.length}
             name="flowluFormField"
-            value={
-              i < requiredFields.length ? requiredFields[i].key || '' : field.flowluFormField || ''
-            }
-            onChange={(ev) => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
+            value={i < requiredFields.length ? requiredFields[i].key || '' : field.flowluFormField || ''}
+            onChange={ev => handleFieldMapping(ev, i, flowluConf, setFlowluConf)}>
             <option value="">{__('Select Field', 'bit-integrations')}</option>
             {i < requiredFields.length ? (
               <option key={requiredFields[i].key} value={requiredFields[i].key}>

includes/Actions/Encharge/RecordApiHelper.php

@@ -6,8 +6,9 @@
 
 namespace BitCode\FI\Actions\Encharge;
 
-use BitCode\FI\Core\Util\HttpHelper;
 use BitCode\FI\Log\LogHandler;
+use BitCode\FI\Core\Util\Common;
+use BitCode\FI\Core\Util\HttpHelper;
 
 /**
  * Provide functionality for Record insert
@@ -47,7 +48,7 @@ public function execute($fieldValues, $fieldMap, $tags)
             if (!empty($fieldPair->enChargeFields)) {
                 // echo $fieldPair->enChargeFields . ' ' . $fieldPair->formField;
                 if ($fieldPair->formField === 'custom' && isset($fieldPair->customValue)) {
-                    $fieldData[$fieldPair->enChargeFields] = $fieldPair->customValue;
+                    $fieldData[$fieldPair->enChargeFields] = Common::replaceFieldWithValue($fieldPair->customValue, $fieldValues);
                 } elseif (!\is_null($fieldValues[$fieldPair->formField])) {
                     $fieldData[$fieldPair->enChargeFields] = $fieldValues[$fieldPair->formField];
                 }

includes/Actions/Flowlu/RecordApiHelper.php

@@ -6,8 +6,9 @@
 
 namespace BitCode\FI\Actions\Flowlu;
 
-use BitCode\FI\Core\Util\HttpHelper;
 use BitCode\FI\Log\LogHandler;
+use BitCode\FI\Core\Util\Common;
+use BitCode\FI\Core\Util\HttpHelper;
 
 /**
  * Provide functionality for Record insert, upsert
@@ -122,7 +123,10 @@ public function generateReqDataFromFieldMap($data, $fieldMap)
         foreach ($fieldMap as $value) {
             $triggerValue = $value->formField;
             $actionValue = $value->flowluFormField;
-            $dataFinal[$actionValue] = ($triggerValue === 'custom') ? $value->customValue : $data[$triggerValue];
+
+            $dataFinal[$actionValue] = ($triggerValue === 'custom' && !empty($value->customValue))
+                ? Common::replaceFieldWithValue($value->customValue, $data)
+                : $data[$triggerValue];
         }
 
         return $dataFinal;