diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts index b71d4ebe040..864554c33d7 100644 --- a/packages/desktop-client/src/components/reports/ReportOptions.ts +++ b/packages/desktop-client/src/components/reports/ReportOptions.ts @@ -7,6 +7,7 @@ import { type CategoryEntity, type CategoryGroupEntity, type PayeeEntity, + type sortByOpType, } from 'loot-core/src/types/models'; const startDate = monthUtils.subMonths(monthUtils.currentMonth(), 5) + '-01'; @@ -23,7 +24,7 @@ export const defaultReport: CustomReportEntity = { groupBy: 'Category', interval: 'Monthly', balanceType: 'Payment', - sortBy: 'Descending', + sortBy: 'desc', showEmpty: false, showOffBudget: false, showHiddenCategories: false, @@ -50,7 +51,10 @@ const groupByOptions = [ { description: 'Interval' }, ]; -const sortByOptions = [ +const sortByOptions: { + description: string; + format: sortByOpType; +}[] = [ { description: t('Ascending'), format: 'asc' as const }, { description: t('Descending'), format: 'desc' as const }, { description: t('Name'), format: 'name' as const }, diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.tsx b/packages/desktop-client/src/components/reports/ReportSidebar.tsx index e4bc7ccf529..80f876bf080 100644 --- a/packages/desktop-client/src/components/reports/ReportSidebar.tsx +++ b/packages/desktop-client/src/components/reports/ReportSidebar.tsx @@ -5,7 +5,10 @@ import * as monthUtils from 'loot-core/src/shared/months'; import { type CategoryEntity } from 'loot-core/types/models/category'; import { type CategoryGroupEntity } from 'loot-core/types/models/category-group'; import { type TimeFrame } from 'loot-core/types/models/dashboard'; -import { type CustomReportEntity } from 'loot-core/types/models/reports'; +import { + type CustomReportEntity, + type sortByOpType, +} from 'loot-core/types/models/reports'; import { type SyncedPrefs } from 'loot-core/types/prefs'; import { styles } from '../../style/styles'; @@ -143,7 +146,8 @@ export function ReportSidebar({ setBalanceType(cond); }; - const onChangeSortBy = (cond: string) => { + const onChangeSortBy = (cond?: sortByOpType) => { + cond ??= 'desc'; setSessionReport('sortBy', cond); onReportChange({ type: 'modify' }); setSortBy(cond); @@ -297,12 +301,12 @@ export function ReportSidebar({