Skip to content

A local-first personal finance app

[AI] Fix custom reports for empty budgets (#8521)

mestredosmagos31423e4e52eaed3
diff --git a/packages/desktop-client/e2e/reports.test.ts b/packages/desktop-client/e2e/reports.test.ts
index c7a393d78e..114e782085 100644
--- a/packages/desktop-client/e2e/reports.test.ts
+++ b/packages/desktop-client/e2e/reports.test.ts
@@ -183,3 +183,45 @@ test.describe('Reports', () => {
});
});
});
+
+test.describe('Reports without transactions', () => {
+ let page: Page;
+
+ test.beforeEach(async ({ browser }) => {
+ page = await browser.newPage();
+ });
+
+ test.afterEach(async () => {
+ await page?.close();
+ });
+
+ test('creates a custom report in an empty budget', async () => {
+ const pageErrors: Error[] = [];
+ page.on('pageerror', error => pageErrors.push(error));
+
+ const configurationPage = new ConfigurationPage(page);
+ const navigation = new Navigation(page);
+
+ await page.goto('/');
+ await configurationPage.startFresh();
+
+ const reportsPage = await navigation.goToReportsPage();
+ await reportsPage.waitToLoad();
+ const customReportPage = await reportsPage.goToCustomReportPage();
+
+ await expect(page).toHaveURL(/\/reports\/custom/);
+ await expect(
+ customReportPage.pageContent.getByRole('button', {
+ name: 'Total',
+ exact: true,
+ }),
+ ).toBeVisible();
+ await expect(
+ customReportPage.pageContent.getByRole('button', {
+ name: 'Time',
+ exact: true,
+ }),
+ ).toBeVisible();
+ expect(pageErrors).toEqual([]);
+ });
+});
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
index 0b9be267c1..4e41e6cca2 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -22,7 +22,6 @@ import type {
} from '@actual-app/core/types/models';
import type { SyncedPrefs } from '@actual-app/core/types/prefs';
import type { TransObjectLiteral } from '@actual-app/core/types/util';
-import * as d from 'date-fns';
import { Warning } from '#components/alerts';
import { AppliedFilters } from '#components/filters/AppliedFilters';
@@ -333,8 +332,8 @@ function CustomReportInner({
const onSetAllIntervals = useEffectEvent(
async (
- earliestTransaction: TransactionEntity,
- latestTransaction: TransactionEntity,
+ earliestTransactionDate: TransactionEntity['date'],
+ latestTransactionDate: TransactionEntity['date'],
interval: CustomReportEntity['interval'],
) => {
const fromDate =
@@ -346,34 +345,18 @@ function CustomReportInner({
const earliestInterval =
interval === 'Weekly'
? monthUtils.weekFromDate(
- d.parseISO(
- fromDateRepr(
- earliestTransaction.date || monthUtils.currentDay(),
- ),
- ),
+ fromDateRepr(earliestTransactionDate),
firstDayOfWeekIdx,
)
- : monthUtils[fromDate](
- d.parseISO(
- fromDateRepr(
- earliestTransaction.date || monthUtils.currentDay(),
- ),
- ),
- );
+ : monthUtils[fromDate](fromDateRepr(earliestTransactionDate));
const latestInterval =
interval === 'Weekly'
? monthUtils.weekFromDate(
- d.parseISO(
- fromDateRepr(latestTransaction.date || monthUtils.currentDay()),
- ),
+ fromDateRepr(latestTransactionDate),
firstDayOfWeekIdx,
)
- : monthUtils[fromDate](
- d.parseISO(
- fromDateRepr(latestTransaction.date || monthUtils.currentDay()),
- ),
- );
+ : monthUtils[fromDate](fromDateRepr(latestTransactionDate));
const currentInterval =
interval === 'Weekly'
@@ -415,8 +398,8 @@ function CustomReportInner({
const onSetStartAndEndDates = useEffectEvent(
(
- earliestTransaction: TransactionEntity,
- latestTransaction: TransactionEntity,
+ earliestTransactionDate: TransactionEntity['date'],
+ latestTransactionDate: TransactionEntity['date'],
dateRange: CustomReportEntity['dateRange'],
isDateStatic: CustomReportEntity['isDateStatic'],
includeCurrentInterval: CustomReportEntity['includeCurrentInterval'],
@@ -424,10 +407,8 @@ function CustomReportInner({
if (!isDateStatic) {
const [dateStart, dateEnd] = getLiveRange(
dateRange,
- earliestTransaction
- ? earliestTransaction.date
- : monthUtils.currentDay(),
- latestTransaction ? latestTransaction.date : monthUtils.currentDay(),
+ earliestTransactionDate,
+ latestTransactionDate,
includeCurrentInterval,
firstDayOfWeekIdx,
);
@@ -442,21 +423,22 @@ function CustomReportInner({
onApplyFilterConditions(report.conditions, report.conditionsOp);
const earliestTransaction = await send('get-earliest-transaction');
- setEarliestTransactionDate(
- earliestTransaction
- ? earliestTransaction.date
- : monthUtils.currentDay(),
- );
-
const latestTransaction = await send('get-latest-transaction');
- setLatestTransactionDate(
- latestTransaction ? latestTransaction.date : monthUtils.currentDay(),
- );
+ const currentDay = monthUtils.currentDay();
+ const earliestTransactionDate = earliestTransaction?.date ?? currentDay;
+ const latestTransactionDate = latestTransaction?.date ?? currentDay;
- void onSetAllIntervals(earliestTransaction, latestTransaction, interval);
+ setEarliestTransactionDate(earliestTransactionDate);
+ setLatestTransactionDate(latestTransactionDate);
+
+ void onSetAllIntervals(
+ earliestTransactionDate,
+ latestTransactionDate,
+ interval,
+ );
onSetStartAndEndDates(
- earliestTransaction,
- latestTransaction,
+ earliestTransactionDate,
+ latestTransactionDate,
dateRange,
isDateStatic,
includeCurrentInterval,
diff --git a/upcoming-release-notes/fix-custom-report-empty-budget.md b/upcoming-release-notes/fix-custom-report-empty-budget.md
new file mode 100644
index 0000000000..f192e4f9aa
--- /dev/null
+++ b/upcoming-release-notes/fix-custom-report-empty-budget.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [mestredosmagos314]
+---
+
+Allow custom reports to be created in budgets without transactions