A local-first personal finance app
[AI] Default new transaction amount filters to positive values (#8726)
JerryNee543622a5bb8e
diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.test.tsx b/packages/desktop-client/src/components/filters/FiltersMenu.test.tsxnew file mode 100644index 0000000000..0d8243f8f7--- /dev/null+++ b/packages/desktop-client/src/components/filters/FiltersMenu.test.tsx@@ -0,0 +1,57 @@+import type { ComponentProps } from 'react';++import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';++import { TestProviders } from '#mocks';++import { FilterEditor } from './FiltersMenu';++describe('FilterEditor amount sign', () => {+ const renderEditor = (+ props: Partial<ComponentProps<typeof FilterEditor>> = {},+ ) => {+ const onSave = vi.fn();+ render(+ <FilterEditor+ field="amount"+ op="gt"+ // New filters render null values as empty strings.+ value=""+ onSave={onSave}+ onClose={vi.fn()}+ {...props}+ />,+ { wrapper: TestProviders },+ );+ return { onSave };+ };++ it('submits a positive amount for a filter created without a value', async () => {+ const user = userEvent.setup();+ const { onSave } = renderEditor();++ await user.clear(screen.getByRole('textbox'));+ await user.type(screen.getByRole('textbox'), '150');+ await user.click(screen.getByRole('button', { name: 'Apply' }));++ expect(onSave).toHaveBeenCalledWith(+ expect.objectContaining({ field: 'amount', op: 'gt', value: 15000 }),+ );+ });++ it('keeps an existing negative amount negative when edited', async () => {+ const user = userEvent.setup();+ const { onSave } = renderEditor({ value: -15000 });++ expect(+ screen.getByRole('button', { name: 'Make positive' }),+ ).toBeInTheDocument();++ await user.click(screen.getByRole('button', { name: 'Apply' }));++ expect(onSave).toHaveBeenCalledWith(+ expect.objectContaining({ field: 'amount', op: 'gt', value: -15000 }),+ );+ });+});diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.tsx b/packages/desktop-client/src/components/filters/FiltersMenu.tsxindex e8c511ad08..5d79460251 100644--- a/packages/desktop-client/src/components/filters/FiltersMenu.tsx+++ b/packages/desktop-client/src/components/filters/FiltersMenu.tsx@@ -34,6 +34,7 @@ import {} from 'date-fns';import { TagMultiAutocomplete } from '#components/autocomplete/TagMultiAutocomplete';+import { AmountInput } from '#components/util/AmountInput';import { GenericInput } from '#components/util/GenericInput';import { useAccounts } from '#hooks/useAccounts';import { useCategories } from '#hooks/useCategories';@@ -101,6 +102,7 @@ function ConfigureField<T extends RuleConditionEntity>({const payees = usePayees();const field = initialField === 'category_group' ? 'category' : initialField;const [subfield, setSubfield] = useState(initialSubfield);+ const fieldOptions = subfieldToOptions(field, subfield);const inputRef = useRef<AmountInputRef>(null);const prevOp = useRef<T['op'] | null>(null);const prevSubfield = useRef<string | null>(null);@@ -455,9 +457,10 @@ function ConfigureField<T extends RuleConditionEntity>({if (parsed == null) {submitValue = value; // keep previous if parsing failed} else {- const opts = subfieldToOptions(field, subfield);submitValue =- opts?.inflow || opts?.outflow ? Math.abs(parsed) : parsed;+ fieldOptions?.inflow || fieldOptions?.outflow+ ? Math.abs(parsed)+ : parsed;}}} catch {@@ -474,11 +477,24 @@ function ConfigureField<T extends RuleConditionEntity>({field: storableField,op,value: submitValue,- options: subfieldToOptions(field, subfield),+ options: fieldOptions,});}}>- {type !== 'boolean' &&+ {field === 'amount' && (+ <AmountInput+ ref={inputRef}+ value={typeof value === 'number' ? value : 0}+ zeroSign="+"+ sign={+ fieldOptions?.inflow || fieldOptions?.outflow ? '+' : undefined+ }+ style={{ marginTop: 10 }}+ onUpdate={v => dispatch({ type: 'set-value', value: v })}+ />+ )}+ {field !== 'amount' &&+ type !== 'boolean' &&(field !== 'notes' || !isTagOp(op)) &&(field !== 'payee' || !isIdOp(op)) &&(field !== 'account' || !isNoValueAccountOp(op)) && (@@ -506,7 +522,7 @@ function ConfigureField<T extends RuleConditionEntity>({// @ts-expect-error - fix memulti={op === 'oneOf' || op === 'notOneOf'}op={op}- options={subfieldToOptions(field, subfield)}+ options={fieldOptions}style={{ marginTop: 10 }}// oxlint-disable-next-line typescript/no-explicit-anyonChange={(v: any) => {diff --git a/upcoming-release-notes/fix-positive-amount-filter-default.md b/upcoming-release-notes/fix-positive-amount-filter-default.mdnew file mode 100644index 0000000000..898c0b0086--- /dev/null+++ b/upcoming-release-notes/fix-positive-amount-filter-default.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [JerryNee]+---++Default new transaction amount filters to a positive value