Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(account-settings): refactor formValidation, updateAccountSettings & dataProcessing #242

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+156 −185
Open

refactor(account-settings): refactor formValidation, updateAccountSettings & dataProcessing #242

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed8f767
refactor(account-settings): rename isEdit to pristine in the dataProc…
icatalina Feb 5, 2025
96b0f5a
refactor(account-settings): separate getAccountSettingsFields & getPa…
icatalina Feb 5, 2025
280c3a2
refactor(account-settings): separate formValidation from error notifi…
icatalina Feb 5, 2025
a933208
refactor(account-settings): reorganise account settings update
icatalina Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 23 additions & 35 deletions apps/storefront/src/pages/AccountSetting/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ function AccountSetting() {
try {
setLoading(true);

const accountFormAllFields = await getB2BAccountFormFields(isBCUser ? 1 : 2);

const fn = isBCUser ? getBCAccountSettings : getB2BAccountSettings;

const params = isBCUser
Expand All @@ -132,6 +130,7 @@ function AccountSetting() {

const { [key]: accountSettings } = await fn(params);

const accountFormAllFields = await getB2BAccountFormFields(isBCUser ? 1 : 2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"how many fields do you want? One, two..?" 😆

const accountFormFields = getAccountFormFields(
accountFormAllFields.accountFormFields || [],
);
Expand Down Expand Up @@ -201,19 +200,17 @@ function AccountSetting() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const handleGetUserExtraFields = (data: CustomFieldItems) => {
let userExtraFieldsInfo: CustomFieldItems[] = [];
const handleGetUserExtraFields = (
data: CustomFieldItems,
accountInfoFormFields: Partial<Fields>[],
) => {
const userExtraFields = accountInfoFormFields.filter(
(item: CustomFieldItems) => item.custom && item.groupId === 1,
);
if (userExtraFields.length > 0) {
userExtraFieldsInfo = userExtraFields.map((item: CustomFieldItems) => ({
fieldName: deCodeField(item?.name || ''),
fieldValue: data[item.name],
}));
}

return userExtraFieldsInfo;
return userExtraFields.map((item: CustomFieldItems) => ({
fieldName: deCodeField(item?.name || ''),
fieldValue: data[item.name],
}));
};

const handleAddUserClick = () => {
Expand Down Expand Up @@ -249,39 +246,30 @@ function AccountSetting() {
});
}

let userExtraFields: CustomFieldItems[] = [];
if (!isBCUser) {
userExtraFields = handleGetUserExtraFields(data);
}

const dataProcessingFn = isBCUser ? bcSubmitDataProcessing : b2bSubmitDataProcessing;

if (isValid && emailFlag && passwordFlag) {
const param = dataProcessingFn(data, accountSettings, decryptionFields, extraFields);
const dataProcessingFn = isBCUser ? bcSubmitDataProcessing : b2bSubmitDataProcessing;
const payload = dataProcessingFn(data, accountSettings, decryptionFields, extraFields);

if (param) {
if (payload) {
if (!isBCUser) {
param.companyId = companyId;
param.extraFields = userExtraFields;
payload.companyId = companyId;
payload.extraFields = handleGetUserExtraFields(data, accountInfoFormFields);
}

const requestFn = isBCUser ? updateBCAccountSettings : updateB2BAccountSettings;

const newParams: CustomFieldItems = {
...param,
currentPassword: param.currentPassword,
};

if (param.newPassword === '' && param.confirmPassword === '') {
delete newParams.newPassword;
delete newParams.confirmPassword;
if (payload.newPassword === '' && payload.confirmPassword === '') {
delete payload.newPassword;
delete payload.confirmPassword;
}
await requestFn(newParams);
} else {
}

if (!payload) {
snackbar.success(b3Lang('accountSettings.notification.noEdits'));
return;
}

const requestFn = isBCUser ? updateBCAccountSettings : updateB2BAccountSettings;
await requestFn(payload);

if (
(data.password && data.currentPassword) ||
customer.emailAddress !== trim(data.email)
Expand Down