Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 4 deletions src/libs/ReportSecondaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,19 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], viol
if (!isCurrentUserManager) {
return false;
}
const isExpenseReport = isExpenseReportUtils(report);
const isReportApprover = isApproverUtils(policy, currentUserAccountID);
const isProcessingReport = isProcessingReportUtils(report);
const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));
if (!isProcessingReport) {
return false;
}

const isPreventSelfApprovalEnabled = policy?.preventSelfApproval;
const isReportSubmitter = isCurrentUserSubmitter(report.reportID);

if (isPreventSelfApprovalEnabled && isReportSubmitter) {
return false;
}
const isExpenseReport = isExpenseReportUtils(report);
const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));

if (isExpenseReport && isProcessingReport && reportHasDuplicatedTransactions) {
return true;
Expand All @@ -199,7 +201,7 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], viol
const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;

const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationForMultipleTransactions(transactionIDs, report, policy, violations);

const isReportApprover = isApproverUtils(policy, currentUserAccountID);
const userControlsReport = isReportApprover || isAdmin;
return userControlsReport && shouldShowBrokenConnectionViolation;
}
Expand Down
83 changes: 77 additions & 6 deletions tests/unit/ReportSecondaryActionUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,14 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
});

it('includes APPROVE option for report with RTER violations for all transactions', () => {
it('includes APPROVE option for report with RTER violations when it is submitted', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: EMPLOYEE_ACCOUNT_ID,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
} as unknown as Report;
const policy = {
approver: EMPLOYEE_EMAIL,
Expand Down Expand Up @@ -183,16 +185,52 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
});

it('includes APPROVE option for admin and report with broken connection', () => {
it('does not include APPROVE option for report with RTER violations when it is not submitted', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
managerID: EMPLOYEE_ACCOUNT_ID,
stateNum: CONST.REPORT.STATE_NUM.OPEN,
statusNum: CONST.REPORT.STATUS_NUM.OPEN,
} as unknown as Report;
const policy = {
approver: EMPLOYEE_EMAIL,
} as unknown as Policy;
const TRANSACTION_ID = 'TRANSACTION_ID';

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

const violation = {
name: CONST.VIOLATIONS.RTER,
data: {
pendingPattern: true,
rterType: CONST.RTER_VIOLATION_TYPES.SEVEN_DAY_HOLD,
},
} as unknown as TransactionViolation;

const result = getSecondaryReportActions({
report,
chatReport,
reportTransactions: [transaction],
violations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]},
policy,
});
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
});

it('includes APPROVE option for admin with report having broken connection when it is submitted', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
managerID: EMPLOYEE_ACCOUNT_ID,
} as unknown as Report;
const policy = {role: CONST.POLICY.ROLE.ADMIN} as unknown as Policy;
const policy = {role: CONST.POLICY.ROLE.ADMIN, autoReporting: true, autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT} as unknown as Policy;
const TRANSACTION_ID = 'TRANSACTION_ID';

const transaction = {
Expand All @@ -216,7 +254,40 @@ describe('getSecondaryAction', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
});

it('does not include APPROVE option for report with transactions are being scanned', () => {
it('does not include APPROVE option for admin with report having broken connection that is not submitted', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
stateNum: CONST.REPORT.STATE_NUM.OPEN,
statusNum: CONST.REPORT.STATUS_NUM.OPEN,
managerID: EMPLOYEE_ACCOUNT_ID,
} as unknown as Report;
const policy = {role: CONST.POLICY.ROLE.ADMIN} as unknown as Policy;
const TRANSACTION_ID = 'TRANSACTION_ID';

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

const violation = {
name: CONST.VIOLATIONS.RTER,
data: {
rterType: CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION,
},
} as unknown as TransactionViolation;

const result = getSecondaryReportActions({
report,
chatReport,
reportTransactions: [transaction],
violations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]},
policy,
});
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
});

it('does not include APPROVE option for report with transactions that are being scanned', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
Expand Down Expand Up @@ -944,7 +1015,7 @@ describe('getSecondaryTransactionThreadActions', () => {
expect(getSecondaryTransactionThreadActions(report, {} as Transaction, [], policy)).toEqual(result);
});

it('include HOLD option ', () => {
it('includes HOLD option', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
Expand All @@ -964,7 +1035,7 @@ describe('getSecondaryTransactionThreadActions', () => {
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
});

it('include DELETE option for expense report submitter', async () => {
it('includes DELETE option for expense report submitter', async () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
Expand Down