Version updated to 2.2.0

bitwpfi.php

@@ -4,7 +4,7 @@
  * Plugin Name: Bit Integrations
  * Plugin URI:  https://bitapps.pro/bit-integrations
  * Description: Bit Integrations is a platform that integrates with over 200+ different platforms to help with various tasks on your WordPress site, like WooCommerce, Form builder, Page builder, LMS, Sales funnels, Bookings, CRM, Webhooks, Email marketing, Social media and Spreadsheets, etc
- * Version:     2.2.0
+ * Version:     2.2.1
  * Author:    Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -23,7 +23,7 @@
 $btcbi_db_version = '1.0';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.2.0');
+define('BTCBI_VERSION', '2.2.1');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

frontend-dev/src/components/AllIntegrations/ActiveCampaign/ActiveCampaignIntegLayout.jsx

@@ -5,11 +5,24 @@ import MultiSelect from 'react-multiple-select-dropdown-lite'
 import Loader from '../../Loaders/Loader'
 import { addFieldMap } from '../IntegrationHelpers/IntegrationHelpers'
 import ActiveCampaignActions from './ActiveCampaignActions'
-import { refreshActiveCampaingAccounts, refreshActiveCampaingHeader, refreshActiveCampaingList, refreshActiveCampaingTags } from './ActiveCampaignCommonFunc'
+import {
+  refreshActiveCampaingAccounts,
+  refreshActiveCampaingHeader,
+  refreshActiveCampaingList,
+  refreshActiveCampaingTags
+} from './ActiveCampaignCommonFunc'
 import ActiveCampaignFieldMap from './ActiveCampaignFieldMap'
 import { create } from 'mutative'
 
-export default function ActiveCampaignIntegLayout({ formID, formFields, activeCampaingConf, setActiveCampaingConf, isLoading, setIsLoading, setSnackbar }) {
+export default function ActiveCampaignIntegLayout({
+  formID,
+  formFields,
+  activeCampaingConf,
+  setActiveCampaingConf,
+  isLoading,
+  setIsLoading,
+  setSnackbar
+}) {
   const setTags = (val) => {
     const newConf = { ...activeCampaingConf }
     if (val) {
@@ -19,21 +32,25 @@ export default function ActiveCampaignIntegLayout({ formID, formFields, activeCa
     }
     setActiveCampaingConf({ ...newConf })
   }
-  const setAccount = val => {
+  const setAccount = (val) => {
     console.log(val)
-    setActiveCampaingConf(prevConf => create(prevConf, draftConf => {
-      if (val) {
-        draftConf.selectedAccount = val
-      } else {
-        delete draftConf.selectedAccount
-      }
-    }))
+    setActiveCampaingConf((prevConf) =>
+      create(prevConf, (draftConf) => {
+        if (val) {
+          draftConf.selectedAccount = val
+        } else {
+          delete draftConf.selectedAccount
+        }
+      })
+    )
   }
 
-  const setJobTitle = val => {
-    setActiveCampaingConf(prevConf => create(prevConf, draftConf => {
-      draftConf['job_title'] = val
-    }))
+  const setJobTitle = (val) => {
+    setActiveCampaingConf((prevConf) =>
+      create(prevConf, (draftConf) => {
+        draftConf['job_title'] = val
+      })
+    )
   }
 
   const handleInput = (e) => {
@@ -52,110 +69,222 @@ export default function ActiveCampaignIntegLayout({ formID, formFields, activeCa
   const activeCampaignLists = activeCampaingConf?.default?.activeCampaignLists
 
   useEffect(() => {
-    activeCampaignLists && refreshActiveCampaingTags(activeCampaingConf, setActiveCampaingConf, setIsLoading, setSnackbar)
+    activeCampaignLists &&
+      refreshActiveCampaingTags(
+        activeCampaingConf,
+        setActiveCampaingConf,
+        setIsLoading,
+        setSnackbar
+      )
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [activeCampaignLists])
 
   return (
     <>
       <br />
       <b className="wdt-200 d-in-b">{__('List:', 'bit-integrations')}</b>
-      <select value={activeCampaingConf?.listId} name="listId" id="" className="btcd-paper-inp w-5" onChange={handleInput}>
+      <select
+        value={activeCampaingConf?.listId}
+        name="listId"
+        id=""
+        className="btcd-paper-inp w-5"
+        onChange={handleInput}>
         <option value="">{__('Select List', 'bit-integrations')}</option>
-        {
-          activeCampaingConf?.default?.activeCampaignLists && Object.keys(activeCampaingConf.default.activeCampaignLists).map(listname => (
-            <option key={`${listname + 1}`} value={activeCampaingConf.default.activeCampaignLists[listname].listId}>
+        {activeCampaingConf?.default?.activeCampaignLists &&
+          Object.keys(activeCampaingConf.default.activeCampaignLists).map((listname) => (
+            <option
+              key={`${listname + 1}`}
+              value={activeCampaingConf.default.activeCampaignLists[listname].listId}>
               {activeCampaingConf.default.activeCampaignLists[listname].listName}
             </option>
-          ))
-        }
+          ))}
       </select>
-      <button onClick={() => refreshActiveCampaingList(activeCampaingConf, setActiveCampaingConf, setIsLoading, setSnackbar)} className="icn-btn sh-sm ml-2 mr-2 tooltip" style={{ '--tooltip-txt': '"Refresh Activecapmaign list"' }} type="button" disabled={isLoading}>&#x21BB;</button>
+      <button
+        onClick={() =>
+          refreshActiveCampaingList(
+            activeCampaingConf,
+            setActiveCampaingConf,
+            setIsLoading,
+            setSnackbar
+          )
+        }
+        className="icn-btn sh-sm ml-2 mr-2 tooltip"
+        style={{ '--tooltip-txt': '"Refresh Activecapmaign list"' }}
+        type="button"
+        disabled={isLoading}>
+        &#x21BB;
+      </button>
       <br />
       <br />
       <div className="d-flx">
-        <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">{__('Tags: ', 'bit-integrations')}</b>
+        <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">
+          {__('Tags: ', 'bit-integrations')}
+        </b>
         <MultiSelect
           defaultValue={activeCampaingConf?.tagIds}
           className="btcd-paper-drpdwn w-5"
-          options={activeCampaingConf?.default?.activeCampaignTags && Object.keys(activeCampaingConf.default.activeCampaignTags).map(tag => ({ label: activeCampaingConf.default.activeCampaignTags[tag].tagName, value: activeCampaingConf.default.activeCampaignTags[tag].tagId }))}
-          onChange={val => setTags(val)}
+          options={
+            activeCampaingConf?.default?.activeCampaignTags &&
+            Object.keys(activeCampaingConf.default.activeCampaignTags).map((tag) => ({
+              label: activeCampaingConf.default.activeCampaignTags[tag].tagName,
+              value: activeCampaingConf.default.activeCampaignTags[tag].tagId
+            }))
+          }
+          onChange={(val) => setTags(val)}
         />
-        <button onClick={() => refreshActiveCampaingTags(activeCampaingConf, setActiveCampaingConf, setIsLoading, setSnackbar)} className="icn-btn sh-sm ml-2 mr-2 tooltip" style={{ '--tooltip-txt': `'${__('Refresh Activecapmaign Tags', 'bit-integrations')}'` }} type="button" disabled={isLoading}>&#x21BB;</button>
+        <button
+          onClick={() =>
+            refreshActiveCampaingTags(
+              activeCampaingConf,
+              setActiveCampaingConf,
+              setIsLoading,
+              setSnackbar
+            )
+          }
+          className="icn-btn sh-sm ml-2 mr-2 tooltip"
+          style={{ '--tooltip-txt': `'${__('Refresh Activecapmaign Tags', 'bit-integrations')}'` }}
+          type="button"
+          disabled={isLoading}>
+          &#x21BB;
+        </button>
       </div>
       <br />
-      {activeCampaingConf?.accounts &&
+      {activeCampaingConf?.accounts && (
         <>
           <div className="d-flx">
-            <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">{__('Account: ', 'bit-integrations')}</b>
+            <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">
+              {__('Account: ', 'bit-integrations')}
+            </b>
             <MultiSelect
               defaultValue={activeCampaingConf?.selectedAccount}
               className="btcd-paper-drpdwn w-5"
-              options={activeCampaingConf?.accounts && activeCampaingConf.accounts.map(account => ({ label: account.name, value: account.id }))}
+              options={
+                activeCampaingConf?.accounts &&
+                activeCampaingConf.accounts.map((account) => ({
+                  label: account.name,
+                  value: account.id
+                }))
+              }
               onChange={setAccount}
               singleSelect
             />
-            <button onClick={() => refreshActiveCampaingAccounts(activeCampaingConf, setActiveCampaingConf, setIsLoading, setSnackbar)} className="icn-btn sh-sm ml-2 mr-2 tooltip" style={{ '--tooltip-txt': `'${__('Refresh Activecapmaign Tags', 'bit-integrations')}'` }} type="button" disabled={isLoading}>&#x21BB;</button>
+            <button
+              onClick={() =>
+                refreshActiveCampaingAccounts(
+                  activeCampaingConf,
+                  setActiveCampaingConf,
+                  setIsLoading,
+                  setSnackbar
+                )
+              }
+              className="icn-btn sh-sm ml-2 mr-2 tooltip"
+              style={{
+                '--tooltip-txt': `'${__('Refresh Activecapmaign Tags', 'bit-integrations')}'`
+              }}
+              type="button"
+              disabled={isLoading}>
+              &#x21BB;
+            </button>
           </div>
           <br />
         </>
-      }
-      {activeCampaingConf?.selectedAccount &&
+      )}
+      {activeCampaingConf?.selectedAccount && (
         <>
           <div className="d-flx">
-            <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">{__('Job Title:', 'bit-integrations')}</b>
-            <input className="btcd-paper-inp w-5 mt-1" onChange={e => setJobTitle(e.target.value)} name="job_title" value={activeCampaingConf.job_title} type="text" placeholder={__('Job Title...', 'bit-integrations')} />
+            <b style={{ marginTop: '15px' }} className="wdt-200 d-in-b">
+              {__('Job Title:', 'bit-integrations')}
+            </b>
+            <input
+              className="btcd-paper-inp w-5 mt-1"
+              onChange={(e) => setJobTitle(e.target.value)}
+              name="job_title"
+              value={activeCampaingConf.job_title}
+              type="text"
+              placeholder={__('Job Title...', 'bit-integrations')}
+            />
           </div>
           <br />
         </>
-      }
+      )}
       {isLoading && (
-        <Loader style={{
-          display: 'flex',
-          justifyContent: 'center',
-          alignItems: 'center',
-          height: 100,
-          transform: 'scale(0.7)',
-        }}
+        <Loader
+          style={{
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+            height: 100,
+            transform: 'scale(0.7)'
+          }}
         />
       )}
 
       <div className="mt-4">
         <b className="wdt-100">{__('Map Fields', 'bit-integrations')}</b>
-        <button onClick={() => refreshActiveCampaingHeader(activeCampaingConf, setActiveCampaingConf, setIsLoading, setSnackbar)} className="icn-btn sh-sm ml-2 mr-2 tooltip" style={{ '--tooltip-txt': `'${__('Refresh Activecapmaign Field', 'bit-integrations')}'` }} type="button" disabled={isLoading}>&#x21BB;</button>
+        <button
+          onClick={() =>
+            refreshActiveCampaingHeader(
+              activeCampaingConf,
+              setActiveCampaingConf,
+              setIsLoading,
+              setSnackbar
+            )
+          }
+          className="icn-btn sh-sm ml-2 mr-2 tooltip"
+          style={{ '--tooltip-txt': `'${__('Refresh Activecapmaign Field', 'bit-integrations')}'` }}
+          type="button"
+          disabled={isLoading}>
+          &#x21BB;
+        </button>
       </div>
-      {
-        (activeCampaingConf?.listId || activeCampaingConf?.default?.fields) && (
-          <>
-            <div className="btcd-hr mt-1" />
-            <div className="flx flx-around mt-2 mb-2 btcbi-field-map-label">
-              <div className="txt-dp"><b>{__('Form Fields', 'bit-integrations')}</b></div>
-              <div className="txt-dp"><b>{__('ActiveCampaign Fields', 'bit-integrations')}</b></div>
+      {(activeCampaingConf?.listId || activeCampaingConf?.default?.fields) && (
+        <>
+          <div className="btcd-hr mt-1" />
+          <div className="flx flx-around mt-2 mb-2 btcbi-field-map-label">
+            <div className="txt-dp">
+              <b>{__('Form Fields', 'bit-integrations')}</b>
+            </div>
+            <div className="txt-dp">
+              <b>{__('ActiveCampaign Fields', 'bit-integrations')}</b>
             </div>
+          </div>
 
-            {activeCampaingConf.field_map.map((itm, i) => (
-              <ActiveCampaignFieldMap
-                key={`Activecampaign-m-${i + 9}`}
-                i={i}
-                field={itm}
-                activeCampaingConf={activeCampaingConf}
-                formFields={formFields}
-                setActiveCampaingConf={setActiveCampaingConf}
-              />
-            ))}
-            <div className="txt-center btcbi-field-map-button mt-2"><button onClick={() => addFieldMap(activeCampaingConf.field_map.length, activeCampaingConf, setActiveCampaingConf)} className="icn-btn sh-sm" type="button">+</button></div>
-            <br />
-            <br />
-            <div className="mt-4"><b className="wdt-100">{__('Actions', 'bit-integrations')}</b></div>
-            <div className="btcd-hr mt-1" />
-            <ActiveCampaignActions
+          {activeCampaingConf.field_map.map((itm, i) => (
+            <ActiveCampaignFieldMap
+              key={`Activecampaign-m-${i + 9}`}
+              i={i}
+              field={itm}
               activeCampaingConf={activeCampaingConf}
+              formFields={formFields}
               setActiveCampaingConf={setActiveCampaingConf}
             />
-          </>
-        )
-      }
-
+          ))}
+          <div className="txt-center btcbi-field-map-button mt-2">
+            <button
+              onClick={() =>
+                addFieldMap(
+                  activeCampaingConf.field_map.length,
+                  activeCampaingConf,
+                  setActiveCampaingConf
+                )
+              }
+              className="icn-btn sh-sm"
+              type="button">
+              +
+            </button>
+          </div>
+          <br />
+          <br />
+          <div className="mt-4">
+            <b className="wdt-100">{__('Utilities', 'bit-integrations')}</b>
+          </div>
+          <div className="btcd-hr mt-1" />
+          <ActiveCampaignActions
+            activeCampaingConf={activeCampaingConf}
+            setActiveCampaingConf={setActiveCampaingConf}
+          />
+        </>
+      )}
     </>
   )
 }