Skip to content

Commit bd3540f

Browse files
abdul-kaioumabdul-kaioum
authored
Merge pull request #36 from Bit-Apps-Pro/niloy-dev
Issues on 2.2.3 fixed.
2 parents ebf41e1 + ecd26c6 commit bd3540f

File tree

12 files changed

+8300
-10488
lines changed

12 files changed

+8300
-10488
lines changed

‎frontend-dev/pnpm-lock.yaml‎

Lines changed: 7920 additions & 10291 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend-dev/src/Utils/StaticData/userField.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,46 @@ export const userFields = [
33
{
44
key: 'user_email',
55
name: 'Email',
6-
required: true,
6+
required: true
77
},
88
{
99
key: 'user_login',
1010
name: 'Username',
11+
required: false
1112
},
1213
{
1314
key: 'nickname',
1415
name: 'Nickname',
16+
required: false
1517
},
1618
{
1719
key: 'display_name',
1820
name: 'Display Name',
21+
required: false
1922
},
2023
{
2124
key: 'first_name',
2225
name: 'First Name',
26+
required: false
2327
},
2428
{
2529
key: 'last_name',
2630
name: 'Last Name',
31+
required: false
2732
},
2833
{
2934
key: 'user_pass',
3035
name: 'Password',
36+
required: false
3137
},
3238
{
3339
key: 'user_url',
3440
name: 'Website',
41+
required: false
3542
},
3643
{
3744
key: 'description',
3845
name: 'Biographical Info',
39-
},
46+
required: false
47+
}
4048
]

‎frontend-dev/src/components/AllIntegrations/Klaviyo/KlaviyoIntegLayout.jsx‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,54 @@ function KlaviyoIntegLayout({ klaviyoConf, setKlaviyoConf, formFields, loading,
2727
return (
2828
<div>
2929
<b className="wdt-200 d-in-b mt-2">{__('List:', 'bit-integrations')}</b>
30-
<select name="listId" value={klaviyoConf.listId} onChange={handleList} className="btcd-paper-inp w-5">
30+
<select
31+
name="listId"
32+
value={klaviyoConf.listId}
33+
onChange={handleList}
34+
className="btcd-paper-inp w-5">
3135
<option value="">{__('Select List', 'bit-integrations')}</option>
32-
{
33-
klaviyoConf?.default?.lists && klaviyoConf.default.lists.map(list => (
34-
<option key={list.id} value={list.id}>
35-
{list.attributes.name}
36+
{klaviyoConf?.default?.lists &&
37+
klaviyoConf.default.lists.map((list, key) => (
38+
<option key={key} value={list?.id}>
39+
{list?.attributes?.name}
3640
</option>
37-
))
38-
}
41+
))}
3942
</select>
40-
<button onClick={() => getAllLists(klaviyoConf, setKlaviyoConf, loading, setLoading)} className="icn-btn sh-sm ml-2 mr-2 tooltip" style={{ '--tooltip-txt': '"Refresh list"' }} type="button" disabled={loading.list}>&#x21BB;</button>
43+
<button
44+
onClick={() => getAllLists(klaviyoConf, setKlaviyoConf, loading, setLoading)}
45+
className="icn-btn sh-sm ml-2 mr-2 tooltip"
46+
style={{ '--tooltip-txt': '"Refresh list"' }}
47+
type="button"
48+
disabled={loading.list}>
49+
&#x21BB;
50+
</button>
4151

4252
{/* When user refresh the List then loader call */}
4353

4454
{loading.list && (
45-
<Loader style={{
46-
display: 'flex',
47-
justifyContent: 'center',
48-
alignItems: 'center',
49-
height: 100,
50-
transform: 'scale(0.7)',
51-
}}
55+
<Loader
56+
style={{
57+
display: 'flex',
58+
justifyContent: 'center',
59+
alignItems: 'center',
60+
height: 100,
61+
transform: 'scale(0.7)'
62+
}}
5263
/>
5364
)}
5465

5566
{klaviyoConf?.listId && (
5667
<div className="mt-5">
57-
<b className="wdt-100">
58-
{__('Field Map', 'bit-integrations')}
59-
</b>
68+
<b className="wdt-100">{__('Field Map', 'bit-integrations')}</b>
6069

6170
<div className="btcd-hr mt-2 mb-4" />
6271
<div className="flx flx-around mt-2 mb-2 btcbi-field-map-label">
63-
<div className="txt-dp"><b>{__('Form Fields', 'bit-integrations')}</b></div>
64-
<div className="txt-dp"><b>{__('Klaviyo Fields', 'bit-integrations')}</b></div>
72+
<div className="txt-dp">
73+
<b>{__('Form Fields', 'bit-integrations')}</b>
74+
</div>
75+
<div className="txt-dp">
76+
<b>{__('Klaviyo Fields', 'bit-integrations')}</b>
77+
</div>
6578
</div>
6679
{klaviyoConf?.field_map.map((itm, i) => (
6780
<KlaviyoFieldMap
@@ -73,7 +86,16 @@ function KlaviyoIntegLayout({ klaviyoConf, setKlaviyoConf, formFields, loading,
7386
setKlaviyoConf={setKlaviyoConf}
7487
/>
7588
))}
76-
<div className="txt-center btcbi-field-map-button mt-2"><button onClick={() => addFieldMap(klaviyoConf.field_map.length, klaviyoConf, setKlaviyoConf, false)} className="icn-btn sh-sm" type="button">+</button></div>
89+
<div className="txt-center btcbi-field-map-button mt-2">
90+
<button
91+
onClick={() =>
92+
addFieldMap(klaviyoConf.field_map.length, klaviyoConf, setKlaviyoConf, false)
93+
}
94+
className="icn-btn sh-sm"
95+
type="button">
96+
+
97+
</button>
98+
</div>
7799
</div>
78100
)}
79101
</div>

‎frontend-dev/src/components/AllIntegrations/Registration/EditRegistration.jsx‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ import TableCheckBox from '../../Utilities/TableCheckBox'
2020
import ConditionalLogic from '../../ConditionalLogic'
2121
import CheckBox from '../../Utilities/CheckBox'
2222
import Note from '../../Utilities/Note'
23+
import RegistrationActions from './RegistrationActions'
24+
import tutorialLinks from '../../../Utils/StaticData/tutorialLinks'
25+
import TutorialLink from '../../Utilities/TutorialLink'
2326

2427
export default function EditRegistration({ allIntegURL }) {
2528
const navigate = useNavigate()
@@ -30,14 +33,11 @@ export default function EditRegistration({ allIntegURL }) {
3033
const [flow, setFlow] = useRecoilState($newFlow)
3134
const formFields = useRecoilValue($formFields)
3235
const [userConf, setUserConf] = useRecoilState($actionConf)
36+
const { registration } = tutorialLinks
3337

3438
useEffect(() => {
3539
const tmpConf = { ...userConf }
36-
bitsFetch({}, 'role/list', null, 'GET').then((res) => {
37-
if (res?.success && res !== undefined) {
38-
setRoles(Object.values(res?.data))
39-
}
40-
})
40+
4141
if (!tmpConf?.user_map?.[0]?.userField) {
4242
tmpConf.user_map = userFields
4343
.filter((fld) => fld.required)
@@ -103,13 +103,20 @@ export default function EditRegistration({ allIntegURL }) {
103103
</ul>`
104104

105105
return (
106-
<div>
106+
<div style={{ width: 900 }}>
107107
<SnackMsg snack={snack} setSnackbar={setSnackbar} />
108+
{registration?.youTubeLink && (
109+
<TutorialLink title="Registration" youTubeLink={registration?.youTubeLink} />
110+
)}
111+
{registration?.docLink && (
112+
<TutorialLink title="Registration" docLink={registration?.docLink} />
113+
)}
114+
<br />
108115
<br />
109116

110117
<SetEditIntegComponents entity={flow.triggered_entity} setSnackbar={setSnackbar} />
111-
<div className="font-w-m mt-3">{__('Action type', 'bit-integrations')}</div>
112-
<div>
118+
<div className="flx mt-3">
119+
<div className="wdt-200 d-in-b">{__('Action type', 'bit-integrations')}</div>
113120
<CheckBox
114121
radio
115122
name="action_type"
@@ -127,6 +134,8 @@ export default function EditRegistration({ allIntegURL }) {
127134
title={__('Updated User', 'bit-integrations')}
128135
/>
129136
</div>
137+
<br />
138+
<br />
130139

131140
<div>
132141
<UserFieldMap
@@ -137,6 +146,7 @@ export default function EditRegistration({ allIntegURL }) {
137146
roles={roles}
138147
userFields={userFields}
139148
/>
149+
<br />
140150
</div>
141151
<div>
142152
<UserMetaField
@@ -148,6 +158,19 @@ export default function EditRegistration({ allIntegURL }) {
148158
<br />
149159
</div>
150160

161+
<div className="mt-4">
162+
<b className="wdt-100">{__('Utilities', 'bit-integrations')}</b>
163+
</div>
164+
<div className="btcd-hr mt-1" />
165+
<RegistrationActions userConf={userConf} setUserConf={setUserConf} />
166+
167+
<br />
168+
<Note
169+
note={
170+
userConf?.action_type === 'updated_user' ? userUpdateInstruction : userCreateInstruction
171+
}
172+
/>
173+
151174
{userConf?.condition && (
152175
<>
153176
<div className="flx">
@@ -170,12 +193,6 @@ export default function EditRegistration({ allIntegURL }) {
170193
</>
171194
)}
172195

173-
{userConf?.action_type === 'updated_user' ? (
174-
<Note note={userUpdateInstruction} />
175-
) : (
176-
<Note note={userCreateInstruction} />
177-
)}
178-
179196
<button
180197
className="btn f-left btcd-btn-lg purple sh-sm flx"
181198
type="button"

0 commit comments

Comments
 (0)