Skip to content

Commit

Permalink
update error field to be keyed by email
Browse files Browse the repository at this point in the history
  • Loading branch information
@rushatgabhane
rushatgabhane committed Oct 28, 2024
1 parent 7266a96 commit aa00cbe
Showing 1 changed file with 42 additions and 21 deletions.
63 changes: 42 additions & 21 deletions src/libs/actions/Delegate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
: {
...delegate,
isLoading: true,
errorFields: {addDelegate: null},
pendingFields: {email: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
},
Expand All @@ -204,7 +203,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
email,
role,
isLoading: true,
errorFields: {addDelegate: null},
pendingFields: {email: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
},
Expand All @@ -218,6 +216,11 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
value: {
delegatedAccess: {
delegates: optimisticDelegateData(),
errorFields: {
addDelegate: {
[email]: null,
},
},
},
isLoading: true,
},
Expand All @@ -233,7 +236,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
: {
...delegate,
isLoading: false,
errorFields: {addDelegate: null},
pendingAction: null,
pendingFields: {email: null, role: null},
optimisticAccountID: undefined,
Expand All @@ -247,7 +249,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
{
email,
role,
errorFields: {addDelegate: null},
isLoading: false,
pendingAction: null,
pendingFields: {email: null, role: null},
Expand All @@ -263,6 +264,11 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
value: {
delegatedAccess: {
delegates: successDelegateData(),
errorFields: {
addDelegate: {
[email]: null,
},
},
},
isLoading: false,
},
Expand All @@ -278,7 +284,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
: {
...delegate,
isLoading: false,
errorFields: {addDelegate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.validateSecondaryLogin')},
},
) ?? []
);
Expand All @@ -289,9 +294,6 @@ function addDelegate(email: string, role: DelegateRole, validateCode: string) {
{
email,
role,
errorFields: {
addDelegate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.validateSecondaryLogin'),
},
isLoading: false,
pendingFields: {email: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
Expand Down Expand Up @@ -328,11 +330,15 @@ function removeDelegate(email: string) {
key: ONYXKEYS.ACCOUNT,
value: {
delegatedAccess: {
errorFields: {
removeDelegate: {
[email]: null,
},
},
delegates: delegatedAccess.delegates?.map((delegate) =>
delegate.email === email
? {
...delegate,
errorFields: {removeDelegate: null},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
pendingFields: {email: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, role: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
}
Expand Down Expand Up @@ -361,13 +367,15 @@ function removeDelegate(email: string) {
key: ONYXKEYS.ACCOUNT,
value: {
delegatedAccess: {
errorFields: {
removeDelegate: {
[email]: null,
},
},
delegates: delegatedAccess.delegates?.map((delegate) =>
delegate.email === email
? {
...delegate,
errorFields: {
removeDelegate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
},
pendingAction: null,
pendingFields: undefined,
}
Expand All @@ -383,14 +391,18 @@ function removeDelegate(email: string) {
API.write(WRITE_COMMANDS.REMOVE_DELEGATE, parameters, {optimisticData, successData, failureData});
}

function clearAddDelegateErrors(email: string, fieldName: string) {
function clearDelegateErrorsByField(email: string, fieldName: string) {
if (!delegatedAccess?.delegates) {
return;
}

Onyx.merge(ONYXKEYS.ACCOUNT, {
delegatedAccess: {
delegates: delegatedAccess.delegates.map((delegate) => (delegate.email !== email ? delegate : {...delegate, errorFields: {...delegate.errorFields, [fieldName]: null}})),
errorFields: {
[fieldName]: {
[email]: null,
},
},
},
});
}
Expand Down Expand Up @@ -422,12 +434,16 @@ function updateDelegateRole(email: string, role: DelegateRole, validateCode: str
key: ONYXKEYS.ACCOUNT,
value: {
delegatedAccess: {
errorFields: {
updateDelegateRole: {
[email]: null,
},
},
delegates: delegatedAccess.delegates.map((delegate) =>
delegate.email === email
? {
...delegate,
role,
errorFields: {updateDelegateRole: null},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
pendingFields: {role: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
isLoading: true,
Expand All @@ -445,12 +461,16 @@ function updateDelegateRole(email: string, role: DelegateRole, validateCode: str
key: ONYXKEYS.ACCOUNT,
value: {
delegatedAccess: {
errorFields: {
updateDelegateRole: {
[email]: null,
},
},
delegates: delegatedAccess.delegates.map((delegate) =>
delegate.email === email
? {
...delegate,
role,
errorFields: {updateDelegateRole: null},
pendingAction: null,
pendingFields: {role: null},
isLoading: false,
Expand All @@ -472,9 +492,6 @@ function updateDelegateRole(email: string, role: DelegateRole, validateCode: str
delegate.email === email
? {
...delegate,
errorFields: {
updateDelegateRole: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('delegate.genericError'),
},
isLoading: false,
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
pendingFields: {role: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
Expand Down Expand Up @@ -502,12 +519,16 @@ function updateDelegateRoleOptimistically(email: string, role: DelegateRole) {
key: ONYXKEYS.ACCOUNT,
value: {
delegatedAccess: {
errorFields: {
updateDelegateRole: {
[email]: null,
},
},
delegates: delegatedAccess.delegates.map((delegate) =>
delegate.email === email
? {
...delegate,
role,
errorFields: {updateDelegateRole: null},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
pendingFields: {role: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
}
Expand Down Expand Up @@ -568,7 +589,7 @@ export {
clearDelegatorErrors,
addDelegate,
requestValidationCode,
clearAddDelegateErrors,
clearDelegateErrorsByField,
removePendingDelegate,
restoreDelegateSession,
isConnectedAsDelegate,
Expand Down

0 comments on commit aa00cbe

Please sign in to comment.