Skip to content

Revert "fix: Delete option is present for approved expense" #78003

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

Closed
stitesExpensify wants to merge 1 commit into from
Closed

Revert "fix: Delete option is present for approved expense" #78003

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
7 changes: 5 additions & 2 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2725,13 +2725,16 @@ function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry<Report>, isRep
if (!isMoneyRequestReport(moneyRequestReport) || isReportArchived) {
return false;
}
// 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(moneyRequestReport?.policyID);

// Adding or deleting transactions is not allowed on a closed report
if (moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED && !isOpenReport(moneyRequestReport)) {
return false;
}

if (isProcessingReport(moneyRequestReport) && isExpenseReport(moneyRequestReport)) {
if (isInstantSubmitEnabled(policy) && isProcessingReport(moneyRequestReport)) {
return isAwaitingFirstLevelApproval(moneyRequestReport);
}

Expand Down Expand Up @@ -2959,7 +2962,7 @@ function canDeleteMoneyRequestReport(report: Report, reportTransactions: Transac
}

const isReportSubmitter = isCurrentUserSubmitter(report);
return isReportSubmitter && (isOpenReport(report) || (isProcessingReport(report) && isAwaitingFirstLevelApproval(report)));
return isReportSubmitter && isReportOpenOrProcessing;
}

return false;
Expand Down
109 changes: 43 additions & 66 deletions tests/unit/ReportSecondaryActionUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,15 +1398,13 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
});

it('includes DELETE option for owner of single processing expense transaction which is not forwarded', async () => {
it('includes DELETE option for owner of single processing expense transaction', async () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: APPROVER_ACCOUNT_ID,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
policyID: POLICY_ID,
} as unknown as Report;

const TRANSACTION_ID = 'TRANSACTION_ID';
Expand All @@ -1416,17 +1414,8 @@ describe('getSecondaryAction', () => {
reportID: REPORT_ID,
} as unknown as Transaction;

const policy = {
id: POLICY_ID,
employeeList: {
[EMPLOYEE_EMAIL]: {
email: EMPLOYEE_EMAIL,
submitsTo: APPROVER_EMAIL,
},
},
} as unknown as Policy;
const policy = {} as unknown as Policy;
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);

const result = getSecondaryReportActions({
currentUserEmail: EMPLOYEE_EMAIL,
Expand All @@ -1441,15 +1430,13 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
});

it('includes DELETE option for owner of processing expense report which is not forwarded', async () => {
it('includes DELETE option for owner of processing expense report', async () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: APPROVER_ACCOUNT_ID,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
policyID: POLICY_ID,
} as unknown as Report;

const TRANSACTION_ID = 'TRANSACTION_ID';
Expand All @@ -1465,17 +1452,8 @@ describe('getSecondaryAction', () => {
reportID: REPORT_ID,
} as unknown as Transaction;

const policy = {
id: POLICY_ID,
employeeList: {
[EMPLOYEE_EMAIL]: {
email: EMPLOYEE_EMAIL,
submitsTo: APPROVER_EMAIL,
},
},
} as unknown as Policy;
const policy = {} as unknown as Policy;
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);

const result = getSecondaryReportActions({
currentUserEmail: EMPLOYEE_EMAIL,
Expand All @@ -1490,46 +1468,6 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
});

it('does not includes DELETE option for report that has been forwarded', async () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: MANAGER_ACCOUNT_ID,
policyID: POLICY_ID,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
} as unknown as Report;

const TRANSACTION_ID = 'TRANSACTION_ID';

const transaction = {
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
} as unknown as Transaction;

const policy = {
id: POLICY_ID,
approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
approver: APPROVER_EMAIL,
} as unknown as Policy;

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);

const result = getSecondaryReportActions({
currentUserEmail: EMPLOYEE_EMAIL,
currentUserAccountID: EMPLOYEE_ACCOUNT_ID,
report,
chatReport,
reportTransactions: [transaction],
originalTransaction: {} as Transaction,
violations: {},
policy,
});
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
});

it('does not include DELETE option for corporate liability card transaction', async () => {
const report = {
reportID: REPORT_ID,
Expand Down Expand Up @@ -1618,6 +1556,45 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
});

it('includes DELETE option for report that has been forwarded', async () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: MANAGER_ACCOUNT_ID,
policyID: POLICY_ID,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
} as unknown as Report;

const TRANSACTION_ID = 'TRANSACTION_ID';

const transaction = {
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
} as unknown as Transaction;

const policy = {
id: POLICY_ID,
approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
approver: APPROVER_EMAIL,
} as unknown as Policy;

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);

const result = getSecondaryReportActions({
currentUserEmail: EMPLOYEE_EMAIL,
currentUserAccountID: EMPLOYEE_ACCOUNT_ID,
report,
chatReport,
reportTransactions: [transaction],
originalTransaction: {} as Transaction,
violations: {},
policy,
});
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
});
it('include DELETE option for demo transaction', async () => {
const report = {
reportID: REPORT_ID,
Expand Down
19 changes: 2 additions & 17 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ describe('ReportUtils', () => {
type: CONST.POLICY.TYPE.TEAM,
name: '',
role: 'user',
owner: currentUserEmail,
owner: '',
outputCurrency: '',
isPolicyExpenseChatEnabled: false,
};
Expand All @@ -3038,7 +3038,6 @@ describe('ReportUtils', () => {
parentReportID: '101',
policyID: paidPolicy.id,
ownerAccountID: currentUserAccountID,
managerID: currentUserAccountID,
};
const moneyRequestOptions = temporary_getMoneyRequestOptions(report, paidPolicy, [currentUserAccountID, participantsAccountIDs.at(0) ?? CONST.DEFAULT_NUMBER_ID]);
expect(moneyRequestOptions.length).toBe(2);
Expand Down Expand Up @@ -3776,26 +3775,13 @@ describe('ReportUtils', () => {
reportID: '1',
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: currentUserAccountID,
managerID: currentUserAccountID,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
participants: {
[currentUserAccountID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
},
policyID: '11',
};

const expenseReportPolicy = {
id: '11',
employeeList: {
[currentUserEmail]: {
email: currentUserEmail,
submitsTo: currentUserEmail,
},
},
};

await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}11`, expenseReportPolicy); // Wait for Onyx to load session data before calling canDeleteMoneyRequestReport,
// Wait for Onyx to load session data before calling canDeleteMoneyRequestReport,
// since it relies on the session subscription for currentUserAccountID.
await new Promise<void>((resolve) => {
const connection = Onyx.connectWithoutView({
Expand All @@ -3806,7 +3792,6 @@ describe('ReportUtils', () => {
},
});
});

expect(canDeleteMoneyRequestReport(expenseReport, [], [])).toBe(true);
});
});
Expand Down
Loading