Skip to content

Fix Workflows off submission fallback #97705

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

Open
KJ21-ENG wants to merge 1 commit into
base: main
Choose a base branch
from
+101 −15
Open

Fix Workflows off submission fallback #97705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/libs/actions/Policy/Policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5230,6 +5230,7 @@ function enablePolicyWorkflows(
enabled: boolean,
currentApprovalMode: Policy['approvalMode'],
currentAutoReporting: Policy['autoReporting'],
currentAutoReportingFrequency: Policy['autoReportingFrequency'],
currentHarvesting: Policy['harvesting'],
currentReimbursementChoice: Policy['reimbursementChoice'],
) {
Expand All @@ -5243,9 +5244,10 @@ function enablePolicyWorkflows(
...(!enabled
? {
approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
autoReporting: false,
autoReporting: true,
autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
harvesting: {
enabled: false,
enabled: true,
},
reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
}
Expand All @@ -5256,6 +5258,7 @@ function enablePolicyWorkflows(
? {
approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
autoReportingFrequency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
harvesting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
}
Expand All @@ -5275,6 +5278,7 @@ function enablePolicyWorkflows(
? {
approvalMode: null,
autoReporting: null,
autoReportingFrequency: null,
harvesting: null,
reimbursementChoice: null,
}
Expand All @@ -5293,6 +5297,7 @@ function enablePolicyWorkflows(
? {
approvalMode: currentApprovalMode,
autoReporting: currentAutoReporting,
autoReportingFrequency: currentAutoReportingFrequency ?? null,
harvesting: currentHarvesting,
reimbursementChoice: currentReimbursementChoice,
}
Expand All @@ -5303,6 +5308,7 @@ function enablePolicyWorkflows(
? {
approvalMode: null,
autoReporting: null,
autoReportingFrequency: null,
harvesting: null,
reimbursementChoice: null,
}
Expand Down
10 changes: 9 additions & 1 deletion src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,15 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
if (!policyID) {
return;
}
enablePolicyWorkflows(policyID, isEnabled, policy?.approvalMode, policy?.autoReporting, policy?.harvesting, policy?.reimbursementChoice);
enablePolicyWorkflows(
policyID,
isEnabled,
policy?.approvalMode,
policy?.autoReporting,
policy?.autoReportingFrequency,
policy?.harvesting,
policy?.reimbursementChoice,
);
}}
onPress={() => {
if (!policyID) {
Expand Down
96 changes: 84 additions & 12 deletions tests/actions/PolicyTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5263,7 +5263,7 @@ describe('actions/Policy', () => {

// When enablePolicyWorkflows is called to enable workflows
mockFetch.pause();
Policy.enablePolicyWorkflows(policyID, true, undefined, undefined, undefined, undefined);
Policy.enablePolicyWorkflows(policyID, true, undefined, undefined, undefined, undefined, undefined);
await waitForBatchedUpdates();

// Then workflows should be enabled optimistically
Expand All @@ -5279,34 +5279,106 @@ describe('actions/Policy', () => {
expect(updatedPolicy?.pendingFields?.areWorkflowsEnabled).toBeUndefined();
});

it('should revert policy workflows when fail', async () => {
it('should disable policy workflows with instant submission optimistically and succeed', async () => {
// Given a policy with workflows enabled
const policyID = '1';
const fakePolicy = {
id: policyID,
areWorkflowsEnabled: true,
approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
autoReporting: true,
harvesting: {enabled: true, jobID: 123},
autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY,
harvesting: {enabled: false},
reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
};
Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, fakePolicy);
await waitForBatchedUpdates();

// When enablePolicyWorkflows is called to disable workflows and fails
mockFetch.fail();
Policy.enablePolicyWorkflows(policyID, false, fakePolicy.approvalMode, fakePolicy.autoReporting, fakePolicy.harvesting, fakePolicy.reimbursementChoice);
// When enablePolicyWorkflows is called to disable workflows
mockFetch.pause();
Policy.enablePolicyWorkflows(
policyID,
false,
fakePolicy.approvalMode,
fakePolicy.autoReporting,
fakePolicy.autoReportingFrequency,
fakePolicy.harvesting,
fakePolicy.reimbursementChoice,
);
await waitForBatchedUpdates();

// Then workflows should be reverted to enabled and other fields restored
const updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
expect(updatedPolicy?.areWorkflowsEnabled).toBe(true);
expect(updatedPolicy?.approvalMode).toBe(CONST.POLICY.APPROVAL_MODE.ADVANCED);
// Then workflows should be disabled with instant submission optimistically
let updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
expect(updatedPolicy?.areWorkflowsEnabled).toBe(false);
expect(updatedPolicy?.approvalMode).toBe(CONST.POLICY.APPROVAL_MODE.OPTIONAL);
expect(updatedPolicy?.autoReporting).toBe(true);
expect(updatedPolicy?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT);
expect(updatedPolicy?.harvesting?.enabled).toBe(true);
expect(updatedPolicy?.reimbursementChoice).toBe(CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES);
expect(updatedPolicy?.reimbursementChoice).toBe(CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO);
expect(updatedPolicy?.pendingFields).toMatchObject({
areWorkflowsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
autoReportingFrequency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
harvesting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
});

// When the fetch resumes and succeeds
await mockFetch.resume();

// Then all workflow pending fields should be cleared
updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
expect(updatedPolicy?.pendingFields?.areWorkflowsEnabled).toBeUndefined();
});
expect(updatedPolicy?.pendingFields?.approvalMode).toBeUndefined();
expect(updatedPolicy?.pendingFields?.autoReporting).toBeUndefined();
expect(updatedPolicy?.pendingFields?.autoReportingFrequency).toBeUndefined();
expect(updatedPolicy?.pendingFields?.harvesting).toBeUndefined();
expect(updatedPolicy?.pendingFields?.reimbursementChoice).toBeUndefined();
});

it.each([CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY, undefined] as const)(
'should revert policy workflows when fail with auto reporting frequency %s',
async (autoReportingFrequency) => {
// Given a policy with workflows enabled
const policyID = '1';
const fakePolicy = {
id: policyID,
areWorkflowsEnabled: true,
approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
autoReporting: true,
autoReportingFrequency,
harvesting: {enabled: true, jobID: 123},
reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
};
Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, fakePolicy);
await waitForBatchedUpdates();

// When enablePolicyWorkflows is called to disable workflows and fails
mockFetch.fail();
Policy.enablePolicyWorkflows(
policyID,
false,
fakePolicy.approvalMode,
fakePolicy.autoReporting,
fakePolicy.autoReportingFrequency,
fakePolicy.harvesting,
fakePolicy.reimbursementChoice,
);
await waitForBatchedUpdates();

// Then workflows should be reverted to enabled and other fields restored
const updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
expect(updatedPolicy?.areWorkflowsEnabled).toBe(true);
expect(updatedPolicy?.approvalMode).toBe(CONST.POLICY.APPROVAL_MODE.ADVANCED);
expect(updatedPolicy?.autoReporting).toBe(true);
expect(updatedPolicy?.autoReportingFrequency).toBe(autoReportingFrequency);
expect(updatedPolicy?.harvesting?.enabled).toBe(true);
expect(updatedPolicy?.reimbursementChoice).toBe(CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES);
expect(updatedPolicy?.pendingFields?.areWorkflowsEnabled).toBeUndefined();
expect(updatedPolicy?.pendingFields?.autoReportingFrequency).toBeUndefined();
},
);
});
describe('enableDistanceRequestTax', () => {
it('should enable distance request tax optimistically and succeed', async () => {
Expand Down
Loading