Plugin version updated to 2.3.2

.vscode/settings.json

@@ -66,13 +66,10 @@
     "testdox",
     "yoast"
   ],
-  "[typescript, javascript, typescriptreact, json, css]": {
+  "[typescript, javascript, typescriptreact, javascriptreact, json, css]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[php]": {
     "editor.defaultFormatter": "junstyle.php-cs-fixer"
   },
-  "[javascriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
 }

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.3.1
+ * Version:     2.3.2
  * Author:    Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -20,10 +20,10 @@
     exit;
 }
 global $btcbi_db_version;
-$btcbi_db_version = '1.0';
+$btcbi_db_version = '1.1';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.3.1');
+define('BTCBI_VERSION', '2.3.2');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

composer.json

@@ -22,7 +22,7 @@
         }
     },
     "require": {
-        "bitapps/wp-telemetry": "^0.0.8",
+        "bitapps/wp-telemetry": "v0.0.9",
         "typisttech/imposter-plugin": "*"
     },
   "extra": {

frontend-dev/.prettierrc

@@ -1,7 +1,7 @@
 {
   "semi": false,
   "tabWidth": 2,
-  "printWidth": 100,
+  "printWidth": 105,
   "singleQuote": true,
   "trailingComma": "none",
   "jsxBracketSameLine": true

frontend-dev/bin/mkdir-language.js

@@ -0,0 +1,8 @@
+const fs = require('fs')
+const path = require('path')
+
+const dirPath = path.join(__dirname, '../../languages')
+
+if (!fs.existsSync(dirPath)) {
+  fs.mkdirSync(dirPath, { recursive: true })
+}

frontend-dev/package.json

@@ -65,7 +65,7 @@
     "i18n": "pnpm i18n:gettext-parser && pnpm i18n:php && pnpm i18n:pot",
     "i18n:gettext-parser": "npx react-gettext-parser --output ./locale.pot --config ./gettext-parser.config.js  './src/**/{*.js,*.jsx}'",
     "i18n:json": "npx po2json locale.pot ../languages/btcbi-admin-script.json -f jed1.x",
-    "i18n:mkdir": "[ ! -d \"../languages/\" ] && mkdir '../languages/'",
+    "i18n:mkdir": "node ./bin/mkdir-language.js",
     "i18n:php": "node ./pot-to-php.js locale.pot ../languages/generatedString.php bit-integrations",
     "i18n:pot": "wp i18n make-pot ../ --include=*.php --skip-js --slug=bit-integrations --headers='{\"Last-Translator\":\"developer@bitcode.pro\",\"Language-Team\":\"support@bitcode.pro\",\"PO-Revision-Date\":\"\"}'",
     "clean": "rimraf node_modules yarn.lock package-lock.json pnpm-lock.yaml",

frontend-dev/src/App.jsx

@@ -4,18 +4,14 @@
 /* eslint-disable react/jsx-one-expression-per-line */
 
 import { lazy, Suspense, useEffect, useState } from 'react'
-import { Link, Navigate, NavLink, Route, Routes } from 'react-router-dom'
+import { Route, Routes } from 'react-router-dom'
 import './resource/sass/app.scss'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Toaster } from 'react-hot-toast'
 import logo from '../logo.svg'
-import Integrations from './components/Integrations'
 import Loader from './components/Loaders/Loader'
 import TableLoader from './components/Loaders/TableLoader2'
 import useFetch from './hooks/useFetch'
-import DocSupport from './pages/DocSupport'
-import FlowBuilder from './pages/FlowBuilder'
-import Settings from './pages/Settings'
 import './resource/icons/style.css'
 import { __ } from './Utils/i18nwrap'
 import { $btcbi } from './GlobalStates'
@@ -25,7 +21,12 @@ import { useRecoilValue } from 'recoil'
 import 'regenerator-runtime/runtime.js'
 import AnnouncementModal from './pages/AnnouncementModal'
 import ProModalBtn from './components/Utilities/ProModalBtn'
+const AuthResponse = lazy(() => import('./pages/AuthResponse'))
 const AllIntegrations = lazy(() => import('./pages/AllIntegrations'))
+const Integrations = lazy(() => import('./components/Integrations'))
+const Settings = lazy(() => import('./pages/Settings'))
+const DocSupport = lazy(() => import('./pages/DocSupport'))
+const FlowBuilder = lazy(() => import('./pages/FlowBuilder'))
 const Error404 = lazy(() => import('./pages/Error404'))
 
 function App() {
@@ -147,6 +148,15 @@ function App() {
               }
             />
 
+            <Route
+              path="/auth-response/*"
+              element={
+                <Suspense fallback={<Loader className="g-c" style={loaderStyle} />}>
+                  <AuthResponse />
+                </Suspense>
+              }
+            />
+
             <Route path="*" element={<Error404 />} />
           </Routes>
         </div>

frontend-dev/src/GlobalStates.js

@@ -1,9 +1,20 @@
 import { atom } from 'recoil'
+import { atomWithBroadcast } from './components/atomWithBroadcast'
 
 // atoms
 // eslint-disable-next-line no-undef
 export const $btcbi = atom({ key: '$btcbi', default: typeof btcbi !== 'undefined' ? btcbi : {} })
 export const $newFlow = atom({ key: '$newFlow', default: {}, dangerouslyAllowMutability: true })
-export const $actionConf = atom({ key: '$actionConf', default: {}, dangerouslyAllowMutability: true })
-export const $formFields = atom({ key: '$formFields', default: {}, dangerouslyAllowMutability: true })
+export const $actionConf = atom({
+  key: '$actionConf',
+  default: {},
+  dangerouslyAllowMutability: true
+})
+export const $formFields = atom({
+  key: '$formFields',
+  default: {},
+  dangerouslyAllowMutability: true
+})
 export const $flowStep = atom({ key: '$flowStep', default: 1, dangerouslyAllowMutability: true })
+
+export const authInfoAtom = atomWithBroadcast('authInfo', {});

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

@@ -121,6 +121,11 @@ function EditFormInteg({ setSnackbar, className = '' }) {
       ).then((res) => {
         if (res.success) {
           setFormFields(res.data.fields)
+          setFlow((prevFlow) =>
+            create(prevFlow, (draftFlow) => {
+              draftFlow.flow_details.fields = res.data.fields
+            })
+          )
         }
         return res.data
       })

frontend-dev/src/components/AllIntegrations/GlobalIntegrationHelper.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-unused-expressions */
 
+import bitsFetch from "../../Utils/bitsFetch"
+
 export const addFieldMap = (i, confTmp, setConf) => {
   const newConf = { ...confTmp }
   newConf.field_map.splice(i, 0, {})
@@ -31,3 +33,18 @@ export const handleCustomValue = (event, index, conftTmp, setConf) => {
   newConf.field_map[index].customValue = event.target.value
   setConf({ ...newConf })
 }
+
+export const handleAuthData = async (actionName, tokenDetails, userInfo, setAuthData) => {
+  const requestParams = {};
+  requestParams.actionName = actionName
+  requestParams.tokenDetails = tokenDetails
+  requestParams.userInfo = userInfo
+  await bitsFetch(requestParams, 'store/authData').then((resp) => {
+    if (resp.success) {
+      if (resp.data.data.length > 0) {
+        setAuthData(resp.data.data);
+      }
+      // setSnackbar({ show: true, msg: 'Authorization Data Fetched Successfully' })
+    }
+  })
+}

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

@@ -5,12 +5,13 @@ import BackIcn from '../../../Icons/BackIcn'
 import { __ } from '../../../Utils/i18nwrap'
 import SnackMsg from '../../Utilities/SnackMsg'
 import Steps from '../../Utilities/Steps'
-import { setGrantTokenResponse } from '../IntegrationHelpers/GoogleIntegrationHelpers'
 import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers'
 import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
 import GoogleSheetAuthorization from './GoogleSheetAuthorization'
 import { handleInput, checkMappedFields } from './GoogleSheetCommonFunc'
 import GoogleSheetIntegLayout from './GoogleSheetIntegLayout'
+import bitsFetch from '../../../Utils/bitsFetch'
+
 
 function GoogleSheet({ formFields, setFlow, flow, allIntegURL }) {
   const navigate = useNavigate()
@@ -36,9 +37,19 @@ function GoogleSheet({ formFields, setFlow, flow, allIntegURL }) {
   })
 
   useEffect(() => {
-    window.opener && setGrantTokenResponse('googleSheet')
+    if (sheetConf.oneClickAuthCredentials === undefined) {
+      const requestParams = {
+        actionName: "googleSheet",
+      }
+      bitsFetch(null, 'get/credentials', requestParams, 'Get').then((res) => {
+        setSheetConf((prevConf) => {
+          return { ...prevConf, oneClickAuthCredentials: res.data }
+        })
+      })
+    }
   }, [])
 
+
   const nextPage = () => {
     setTimeout(() => {
       document.getElementById('btcd-settings-wrp').scrollTop = 0