Skip to content

MPDX-9600 - Staff Expense Report: Sort Income and Expenses in CSV exports by date #1788

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

Merged
zweatshirt merged 1 commit into from
May 19, 2026
Merged

MPDX-9600 - Staff Expense Report: Sort Income and Expenses in CSV exports by date #1788

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
14 changes: 12 additions & 2 deletions src/components/Reports/StaffExpenseReport/DownloadButtonGroup/downloadReport.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { StaffExpenseCategoryEnum } from 'src/graphql/types.generated';
import { ReportType } from '../Helpers/StaffReportEnum';
import { Transaction } from '../Helpers/filterTransactions';
import { createCsvReport } from './downloadReport';
import { createCsvReport, dateSortTransactions } from './downloadReport';

const mockData: Transaction[] = [
{
id: '1',
category: StaffExpenseCategoryEnum.MinistryReimbursement,
displayCategory: 'Ministry Reimbursement',
fundType: 'Primary',
transactedAt: '2025-07-01',
transactedAt: '2025-10-01',
amount: -2724,
},
{
Expand Down Expand Up @@ -113,4 +113,14 @@ describe('downloadReport', () => {
expect(clickMock).toHaveBeenCalled();
expect(removeChildMock).toHaveBeenCalledWith(realLink);
});

describe('dateSortTransactions', () => {
it('sorts transactions by ascending date', () => {
expect(
dateSortTransactions(mockData).map(
(transaction) => transaction.transactedAt,
),
).toEqual(['2025-08-01', '2025-09-01', '2025-10-01']);
});
});
});
9 changes: 8 additions & 1 deletion src/components/Reports/StaffExpenseReport/DownloadButtonGroup/downloadReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ const createTable = (
transactions: Transaction[],
locale: string,
) => {
const dateSortedTransactions = dateSortTransactions(transactions);
const csvData = [
[title],
csvHeader,
...transactions.map((transaction) => [
...dateSortedTransactions.map((transaction) => [
dateFormat(DateTime.fromISO(transaction.transactedAt), locale),
transaction.displayCategory,
currencyFormat(transaction.amount, 'USD', locale),
Expand All @@ -24,6 +25,12 @@ const createTable = (
return csvData;
};

export function dateSortTransactions(transactions: Transaction[]) {
return [...transactions].sort((transactionA, transactionB) =>
transactionA.transactedAt.localeCompare(transactionB.transactedAt),
);
}

function createCombinedReport(
transactions: Transaction[],
titles: { income: string; expense: string },
Expand Down
Loading