automagically reverse sort direction, add options for alphabetical an…

…d budget sort order
actualbudget · Jan 13, 2025 · dc8cd63 · dc8cd63
1 parent 04d7609
commit dc8cd63
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 9 deletions.
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -23,7 +23,7 @@ export const defaultReport: CustomReportEntity = {
   groupBy: 'Category',
   interval: 'Monthly',
   balanceType: 'Payment',
-  sortBy: 'Ascending',
+  sortBy: 'Descending',
   showEmpty: false,
   showOffBudget: false,
   showHiddenCategories: false,
@@ -53,6 +53,8 @@ const groupByOptions = [
 const sortByOptions = [
   { description: t('Ascending'), format: 'asc' as const },
   { description: t('Descending'), format: 'desc' as const },
+  { description: t('Name'), format: 'name' as const },
+  { description: t('Budget'), format: 'budget' as const },
 ];
 
 export type dateRangeProps = {

diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -362,7 +362,7 @@ function CustomReportInner({ report: initialReport }: CustomReportInnerProps) {
 
   const balanceTypeOp: balanceTypeOpType =
     ReportOptions.balanceTypeMap.get(balanceType) || 'totalDebts';
-  const sortByOp: sortByOpType = ReportOptions.sortByMap.get(sortBy) || 'asc';
+  const sortByOp: sortByOpType = ReportOptions.sortByMap.get(sortBy) || 'desc';
   const payees = usePayees();
   const accounts = useAccounts();
 

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts
@@ -70,7 +70,7 @@ export function createCustomSpreadsheet({
   showUncategorized,
   groupBy = '',
   balanceTypeOp = 'totalDebts',
-  sortByOp = 'asc',
+  sortByOp = 'desc',
   payees = [],
   accounts = [],
   graphType,

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts b/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts
@@ -4,22 +4,40 @@ import {
   type GroupedEntity,
 } from 'loot-core/src/types/models/reports';
 
+const reverseSort: Partial<Record<sortByOpType, sortByOpType>> = {
+  asc: 'desc',
+  desc: 'asc',
+};
+
+const balanceTypesToReverse = ['totalDebts', 'netDebts'];
+
+const shouldReverse = (balanceTypeOp: balanceTypeOpType) =>
+  balanceTypesToReverse.includes(balanceTypeOp);
+
 export function sortData({
   balanceTypeOp,
   sortByOp,
 }: {
   balanceTypeOp?: balanceTypeOpType;
   sortByOp?: sortByOpType;
 }): (a: GroupedEntity, b: GroupedEntity) => number {
+  if (!balanceTypeOp || !sortByOp) return () => 0;
+
+  if (shouldReverse(balanceTypeOp)) {
+    sortByOp = reverseSort[sortByOp] ?? sortByOp;
+  }
+
   // Return a comparator function
   return (a, b) => {
-    if (!balanceTypeOp) return 0;
-
     let comparison = 0;
     if (sortByOp === 'asc') {
       comparison = a[balanceTypeOp] - b[balanceTypeOp];
     } else if (sortByOp === 'desc') {
       comparison = b[balanceTypeOp] - a[balanceTypeOp];
+    } else if (sortByOp === 'name') {
+      comparison = (a.name ?? '').localeCompare(b.name ?? '');
+    } else if (sortByOp === 'budget') {
+      comparison = 0;
     }
 
     return comparison;

diff --git a/packages/loot-core/migrations/1736640000000__custom_report_sorting.sql b/packages/loot-core/migrations/1736640000000__custom_report_sorting.sql
@@ -1,6 +1,6 @@
 BEGIN TRANSACTION;
 
-ALTER TABLE custom_reports ADD COLUMN sort_by TEXT DEFAULT 'asc';
-UPDATE custom_reports SET sort_by = 'asc';
+ALTER TABLE custom_reports ADD COLUMN sort_by TEXT DEFAULT 'desc';
+UPDATE custom_reports SET sort_by = 'desc';
 
 COMMIT;
diff --git a/packages/loot-core/src/server/aql/schema/index.ts b/packages/loot-core/src/server/aql/schema/index.ts
@@ -142,7 +142,7 @@ export const schema = {
     date_range: f('string'),
     mode: f('string', { default: 'total' }),
     group_by: f('string', { default: 'Category' }),
-    sort_by: f('string', { default: 'asc' }),
+    sort_by: f('string', { default: 'desc' }),
     balance_type: f('string', { default: 'Expense' }),
     show_empty: f('integer', { default: 0 }),
     show_offbudget: f('integer', { default: 0 }),

diff --git a/packages/loot-core/src/types/models/reports.d.ts b/packages/loot-core/src/types/models/reports.d.ts
@@ -31,7 +31,7 @@ export type balanceTypeOpType =
   | 'netAssets'
   | 'netDebts';
 
-export type sortByOpType = 'asc' | 'desc';
+export type sortByOpType = 'asc' | 'desc' | 'name' | 'budget';
 
 export type SpendingMonthEntity = Record<
   string | number,