default sorting options for different report types

actualbudget · Jan 13, 2025 · 5dd53db · 5dd53db
1 parent e54a9fa
commit 5dd53db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/packages/desktop-client/src/components/reports/disabledList.ts b/packages/desktop-client/src/components/reports/disabledList.ts
@@ -48,6 +48,7 @@ type graphOptions = {
   defaultSplit: string;
   disabledType: string[];
   defaultType: string;
+  defaultSort: string;
   disableLegend?: boolean;
   disableLabel?: boolean;
   disableSort?: boolean;
@@ -61,13 +62,15 @@ const totalGraphOptions: graphOptions[] = [
     defaultType: 'Payment',
     disableLegend: true,
     disableLabel: true,
+    defaultSort: 'Budget',
   },
   {
     description: 'BarGraph',
     disabledSplit: [],
     defaultSplit: 'Category',
     disabledType: [],
     defaultType: 'Payment',
+    defaultSort: 'Descending',
   },
   {
     description: 'AreaGraph',
@@ -77,13 +80,15 @@ const totalGraphOptions: graphOptions[] = [
     defaultType: 'Payment',
     disableLegend: true,
     disableSort: true,
+    defaultSort: 'Descending',
   },
   {
     description: 'DonutGraph',
     disabledSplit: [],
     defaultSplit: 'Category',
     disabledType: ['Net'],
     defaultType: 'Payment',
+    defaultSort: 'Descending',
   },
 ];
 
@@ -97,6 +102,7 @@ const timeGraphOptions: graphOptions[] = [
     disableLegend: true,
     disableLabel: true,
     disableSort: true,
+    defaultSort: 'Descending',
   },
   {
     description: 'StackedBarGraph',
@@ -105,6 +111,7 @@ const timeGraphOptions: graphOptions[] = [
     disabledType: [],
     defaultType: 'Payment',
     disableSort: true,
+    defaultSort: 'Descending',
   },
   {
     description: 'LineGraph',
@@ -115,6 +122,7 @@ const timeGraphOptions: graphOptions[] = [
     disableLegend: false,
     disableLabel: true,
     disableSort: true,
+    defaultSort: 'Descending',
   },
 ];
 
@@ -174,7 +182,7 @@ export function disabledLegendLabel(
 export function defaultsGraphList(
   item: string,
   newGraph: string,
-  type: 'defaultSplit' | 'defaultType',
+  type: 'defaultSplit' | 'defaultType' | 'defaultSort',
 ) {
   const graphList = modeOptions.find(d => d.description === item);
   if (!graphList) {

diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -542,6 +542,12 @@ function CustomReportInner({ report: initialReport }: CustomReportInnerProps) {
       setSessionReport('balanceType', cond);
       setBalanceType(cond);
     }
+
+    const defaultSort = defaultsGraphList(mode, chooseGraph, 'defaultSort');
+    if (defaultSort) {
+      setSessionReport('sortBy', defaultSort);
+      setSortBy(defaultSort);
+    }
   };
 
   const isItemDisabled = (type: string) => {

diff --git a/packages/loot-core/migrations/1736640000000__custom_report_sorting.sql b/packages/loot-core/migrations/1736640000000__custom_report_sorting.sql
@@ -2,5 +2,6 @@ BEGIN TRANSACTION;
 
 ALTER TABLE custom_reports ADD COLUMN sort_by TEXT DEFAULT 'Descending';
 UPDATE custom_reports SET sort_by = 'Descending';
+UPDATE custom_reports SET sort_by = 'Budget' where graph_type = 'TableGraph';
 
 COMMIT;