Self approval stays enabled if all members are removed by multi selection #73676
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -203,7 +203,7 @@ | |
| }; | ||
|
|
||
| const allPolicies: OnyxCollection<Policy> = {}; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.POLICY, | ||
| callback: (val, key) => { | ||
| if (!key) { | ||
|
|
@@ -219,7 +219,7 @@ | |
| }); | ||
|
|
||
| let allReports: OnyxCollection<Report>; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.REPORT, | ||
| waitForCollectionCallback: true, | ||
| callback: (value) => { | ||
|
|
@@ -228,7 +228,7 @@ | |
| }); | ||
|
|
||
| let allReportActions: OnyxCollection<ReportActions>; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, | ||
| waitForCollectionCallback: true, | ||
| callback: (actions) => { | ||
|
|
@@ -238,7 +238,7 @@ | |
|
|
||
| let sessionEmail = ''; | ||
| let sessionAccountID = 0; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.SESSION, | ||
| callback: (val) => { | ||
| sessionEmail = val?.email ?? ''; | ||
|
|
@@ -247,13 +247,13 @@ | |
| }); | ||
|
|
||
| let allPersonalDetails: OnyxEntry<PersonalDetailsList>; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.PERSONAL_DETAILS_LIST, | ||
| callback: (val) => (allPersonalDetails = val), | ||
| }); | ||
|
|
||
| let allRecentlyUsedCurrencies: string[]; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.RECENTLY_USED_CURRENCIES, | ||
| callback: (val) => (allRecentlyUsedCurrencies = val ?? []), | ||
| }); | ||
|
|
@@ -5677,18 +5677,13 @@ | |
| }); | ||
| } | ||
|
|
||
| function getSetPolicyPreventSelfApprovalOnyxData(policyID: string, preventSelfApproval: boolean): OnyxData { | ||
| // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 | ||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| const policy = getPolicy(policyID); | ||
|
|
||
| if (preventSelfApproval === policy?.preventSelfApproval) { | ||
| return {}; | ||
| } | ||
|
|
||
| const optimisticData: OnyxUpdate[] = [ | ||
|
|
@@ -5733,6 +5728,25 @@ | |
| }, | ||
| ]; | ||
|
|
||
| return {optimisticData, failureData, successData}; | ||
| } | ||
|
|
||
| /** | ||
| * Call the API to enable or disable self approvals for the reports | ||
| * @param policyID - id of the policy to apply the naming pattern to | ||
| * @param preventSelfApproval - flag whether to prevent workspace members from approving their own expense reports | ||
| */ | ||
| function setPolicyPreventSelfApproval(policyID: string, preventSelfApproval: boolean) { | ||
| // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 | ||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| const policy = getPolicy(policyID); | ||
|
|
||
| if (preventSelfApproval === policy?.preventSelfApproval) { | ||
| return; | ||
| } | ||
|
|
||
| const {optimisticData, failureData, successData} = getSetPolicyPreventSelfApprovalOnyxData(policyID, preventSelfApproval); | ||
|
|
||
| const parameters: SetPolicyPreventSelfApprovalParams = { | ||
| preventSelfApproval, | ||
| policyID, | ||
|
|
@@ -6532,4 +6546,5 @@ | |
| clearPolicyTitleFieldError, | ||
| inviteWorkspaceEmployeesToUber, | ||
| setWorkspaceConfirmationCurrency, | ||
| getSetPolicyPreventSelfApprovalOnyxData, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; | |
| import type {ApprovalWorkflowOnyx, PersonalDetailsList, Policy} from '@src/types/onyx'; | ||
| import type {Approver, Member} from '@src/types/onyx/ApprovalWorkflow'; | ||
| import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow'; | ||
| import type {OnyxData} from '@src/types/onyx/Request'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
|
|
||
| type SetApprovalWorkflowApproverParams = { | ||
|
|
@@ -82,9 +83,9 @@ function createApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, policy: Onyx | |
| API.write(WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData}); | ||
| } | ||
|
|
||
| function getUpdateApprovalWorkflowOnyxData(approvalWorkflow: ApprovalWorkflow, membersToRemove: Member[], approversToRemove: Approver[], policy: OnyxEntry<Policy>): OnyxData { | ||
| if (!policy) { | ||
| return {}; | ||
| } | ||
|
|
||
| const previousDefaultApprover = getDefaultApprover(policy); | ||
|
|
@@ -101,7 +102,7 @@ function updateApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, membersToRem | |
|
|
||
| // If there are no changes to the employees list, we can exit early | ||
| if (isEmptyObject(updatedEmployees) && !newDefaultApprover) { | ||
| return {}; | ||
| } | ||
|
|
||
| const optimisticData: OnyxUpdate[] = [ | ||
|
|
@@ -142,6 +143,33 @@ function updateApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, membersToRem | |
| }, | ||
| ]; | ||
|
|
||
| return {optimisticData, failureData, successData}; | ||
| } | ||
|
|
||
| function updateApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, membersToRemove: Member[], approversToRemove: Approver[], policy: OnyxEntry<Policy>) { | ||
| if (!policy) { | ||
| return; | ||
| } | ||
|
|
||
| const previousDefaultApprover = getDefaultApprover(policy); | ||
| const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers.at(0)?.email : undefined; | ||
| const previousEmployeeList = Object.fromEntries(Object.entries(policy.employeeList ?? {}).map(([key, value]) => [key, {...value, pendingAction: null}])); | ||
| const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({ | ||
| previousEmployeeList, | ||
| approvalWorkflow, | ||
| type: CONST.APPROVAL_WORKFLOW.TYPE.UPDATE, | ||
| membersToRemove, | ||
| approversToRemove, | ||
| defaultApprover: newDefaultApprover ?? previousDefaultApprover ?? '', | ||
| }); | ||
|
|
||
| // If there are no changes to the employees list, we can exit early | ||
| if (isEmptyObject(updatedEmployees) && !newDefaultApprover) { | ||
| return; | ||
| } | ||
|
Comment on lines
+154
to
+169
Contributor
There was a problem hiding this comment. Can we return this from |
||
|
|
||
| const {optimisticData, failureData, successData} = getUpdateApprovalWorkflowOnyxData(approvalWorkflow, membersToRemove, approversToRemove, policy); | ||
|
|
||
| const parameters: UpdateWorkspaceApprovalParams = { | ||
| policyID: policy.id, | ||
| employees: JSON.stringify(Object.values(updatedEmployees)), | ||
|
|
@@ -150,12 +178,12 @@ function updateApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, membersToRem | |
| API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData}); | ||
| } | ||
|
|
||
| function getRemoveApprovalWorkflowOnyxData(approvalWorkflow: ApprovalWorkflow, policy: OnyxEntry<Policy>): OnyxData { | ||
| if (!policy) { | ||
| return {}; | ||
| } | ||
|
|
||
| const previousEmployeeList = policy.employeeList ?? {}; | ||
| const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.REMOVE}); | ||
| const updatedEmployeeList = {...previousEmployeeList, ...updatedEmployees}; | ||
|
|
||
|
|
@@ -200,6 +228,19 @@ function removeApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, policy: Onyx | |
| }, | ||
| ]; | ||
|
|
||
| return {optimisticData, failureData, successData}; | ||
| } | ||
|
|
||
| function removeApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, policy: OnyxEntry<Policy>) { | ||
| if (!policy) { | ||
| return; | ||
| } | ||
|
|
||
| const previousEmployeeList = Object.fromEntries(Object.entries(policy.employeeList ?? {}).map(([key, value]) => [key, {...value, pendingAction: null}])); | ||
| const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.REMOVE}); | ||
|
Comment on lines
+239
to
+240
Contributor
There was a problem hiding this comment. Can we return this from |
||
|
|
||
| const {optimisticData, failureData, successData} = getRemoveApprovalWorkflowOnyxData(approvalWorkflow, policy); | ||
|
|
||
| const parameters: RemoveWorkspaceApprovalParams = {policyID: policy.id, employees: JSON.stringify(Object.values(updatedEmployees))}; | ||
| API.write(WRITE_COMMANDS.REMOVE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData}); | ||
| } | ||
|
|
@@ -322,4 +363,6 @@ export { | |
| clearApprovalWorkflowApprovers, | ||
| clearApprovalWorkflow, | ||
| validateApprovalWorkflow, | ||
| getRemoveApprovalWorkflowOnyxData, | ||
| getUpdateApprovalWorkflowOnyxData, | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make it
letand move the onyx update assignment out ofif... else...statement