Open-source personal finance manager. Self-hosted, privacy-first.
adding tx type expense/income filter
Tássio Noronhab59015487cc9
diff --git a/frontend/src/components/transactions-filter-bar.tsx b/frontend/src/components/transactions-filter-bar.tsxindex 7624bac1..1cdd31db 100644--- a/frontend/src/components/transactions-filter-bar.tsx+++ b/frontend/src/components/transactions-filter-bar.tsx@@ -3,6 +3,7 @@ import { getAccountName } from '@/lib/account-utils'import { useTranslation } from 'react-i18next'import { format, startOfMonth, startOfYear, subDays } from 'date-fns'import {+ ArrowUpDown,Calendar as CalendarIcon,Check,ChevronRight,@@ -53,6 +54,8 @@ interface TransactionsFilterBarProps {onPayeeChange: (value: string) => voidfilterGroupId: stringonGroupIdChange: (value: string) => void+ filterType: string+ onTypeChange: (value: string) => voidfilterFrom: stringfilterTo: stringonDateRangeChange: (from: string, to: string) => void@@ -85,6 +88,8 @@ export function TransactionsFilterBar({onPayeeChange,filterGroupId,onGroupIdChange,+ filterType,+ onTypeChange,filterFrom,filterTo,onDateRangeChange,@@ -163,10 +168,18 @@ export function TransactionsFilterBar({filterUncategorized ||!!filterPayee ||!!filterGroupId ||+ !!filterType ||!!filterFrom ||!!filterTo ||searchInput.trim().length > 0+ const typeLabel =+ filterType === 'credit'+ ? t('transactions.income')+ : filterType === 'debit'+ ? t('transactions.expense')+ : ''+const dateLabel = useMemo(() => {if (!filterFrom && !filterTo) return nullconst fmt = (iso: string) =>@@ -553,6 +566,48 @@ export function TransactionsFilterBar({</DropdownMenuPortal></DropdownMenuSub>+ {/* Type submenu (single — income vs expense) */}+ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="gap-2 text-[13px]">+ <ArrowUpDown size={14} className="text-muted-foreground" />+ <span className="flex-1">{t('transactions.type')}</span>+ {typeLabel && (+ <span className="max-w-[90px] truncate text-[11px] text-muted-foreground">+ {typeLabel}+ </span>+ )}+ </DropdownMenuSubTrigger>+ <DropdownMenuPortal>+ <DropdownMenuSubContent+ sideOffset={8}+ className="w-[200px] p-1"+ >+ {[+ { value: '', label: t('transactions.all') },+ { value: 'credit', label: t('transactions.income') },+ { value: 'debit', label: t('transactions.expense') },+ ].map((opt) => (+ <DropdownMenuItem+ key={opt.value || 'all'}+ onSelect={() => onTypeChange(opt.value)}+ className={cn(+ 'gap-2 rounded-sm px-2 py-1.5 text-[13px]',+ filterType === opt.value && 'bg-primary/5',+ )}+ >+ <span className="size-2.5 shrink-0" />+ <span className="min-w-0 flex-1 truncate text-left">+ {opt.label}+ </span>+ {filterType === opt.value && (+ <Check size={13} className="text-primary" />+ )}+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubContent>+ </DropdownMenuPortal>+ </DropdownMenuSub>+{/* Date range submenu with presets */}<DropdownMenuSub><DropdownMenuSubTrigger className="gap-2 text-[13px]">@@ -650,6 +705,7 @@ export function TransactionsFilterBar({filterCategoryIds.length > 0 ||filterUncategorized ||!!selectedPayee ||+ !!typeLabel ||!!dateLabel) && (<div className="flex flex-wrap items-center gap-1 border-t border-border/60 px-2 py-1.5">{filterAccountIds.map((id) => {@@ -701,6 +757,14 @@ export function TransactionsFilterBar({onRemove={() => onPayeeChange('')}/>)}+ {typeLabel && (+ <FilterChip+ icon={<ArrowUpDown size={12} />}+ label={t('transactions.type')}+ value={typeLabel}+ onRemove={() => onTypeChange('')}+ />+ )}{dateLabel && (<FilterChipicon={<CalendarIcon size={12} />}diff --git a/frontend/src/pages/transactions.tsx b/frontend/src/pages/transactions.tsxindex 537c21e2..7be186c0 100644--- a/frontend/src/pages/transactions.tsx+++ b/frontend/src/pages/transactions.tsx@@ -81,6 +81,7 @@ export default function TransactionsPage() {const [duplicateDraft, setDuplicateDraft] = useState<Partial<Transaction> | null>(null)const [filterPayee, setFilterPayee] = useState<string>(searchParams.get('payee_id') ?? '')const [filterGroupId, setFilterGroupId] = useState<string>(searchParams.get('group_id') ?? '')+ const [filterType, setFilterType] = useState<string>(searchParams.get('type') ?? '')const [tagFilters, setTagFilters] = useState<string[]>([])// When the page is opened with a `group_id`, fetch its name so the@@ -137,6 +138,7 @@ export default function TransactionsPage() {setTagFilters(tags ? tags.split(',') : []);setFilterPayee(searchParams.get('payee_id') ?? '')setFilterGroupId(searchParams.get('group_id') ?? '')+ setFilterType(searchParams.get('type') ?? '')const categories = searchParams.get('category_id');setFilterCategoryIds(categories ? categories.split(',') : []);setFilterUncategorized(searchParams.get('uncategorized') === '1');@@ -156,6 +158,7 @@ export default function TransactionsPage() {['tags', tagFilters.join(',')],['payee_id', filterPayee],['group_id', filterGroupId],+ ['type', filterType],['category_id', filterCategoryIds.join(',')],['uncategorized', filterUncategorized ? '1' : ''],['account_id', filterAccountIds.join(',')],@@ -174,6 +177,7 @@ export default function TransactionsPage() {tagFilters,filterPayee,filterGroupId,+ filterType,filterCategoryIds,filterUncategorized,filterAccountIds,@@ -194,7 +198,7 @@ export default function TransactionsPage() {useEffect(() => {setSelectedIds(new Set())setBulkCategory('')- }, [page, filterAccountIds, filterCategoryIds, filterUncategorized, filterPayee, filterFrom, filterTo, searchQuery])+ }, [page, filterAccountIds, filterCategoryIds, filterUncategorized, filterPayee, filterType, filterFrom, filterTo, searchQuery])// Scroll to and flash a highlighted row after navigation (e.g. opened via// the command palette). Re-runs whenever highlightId or the current data@@ -218,7 +222,7 @@ export default function TransactionsPage() {}, [highlightId, searchQuery, filterPayee, filterCategoryIds, page])const { data, isLoading } = useQuery({- queryKey: ['transactions', page, filterAccountIds, filterCategoryIds, filterUncategorized, filterPayee, filterGroupId, filterFrom, filterTo, searchQuery, tagFilters],+ queryKey: ['transactions', page, filterAccountIds, filterCategoryIds, filterUncategorized, filterPayee, filterGroupId, filterType, filterFrom, filterTo, searchQuery, tagFilters],queryFn: () =>transactions.list({page,@@ -227,6 +231,7 @@ export default function TransactionsPage() {category_ids: filterCategoryIds.length > 0 ? filterCategoryIds : undefined,payee_id: filterPayee || undefined,group_id: filterGroupId || undefined,+ type: filterType || undefined,uncategorized: filterUncategorized ? true : undefined,from: filterFrom || undefined,to: filterTo || undefined,@@ -575,6 +580,8 @@ export default function TransactionsPage() {onPayeeChange={(v) => { setFilterPayee(v); setPage(1) }}filterGroupId={filterGroupId}onGroupIdChange={(v) => { setFilterGroupId(v); setPage(1) }}+ filterType={filterType}+ onTypeChange={(v) => { setFilterType(v); setPage(1) }}filterFrom={filterFrom}filterTo={filterTo}onDateRangeChange={(from, to) => { setFilterFrom(from); setFilterTo(to); setPage(1) }}@@ -586,6 +593,7 @@ export default function TransactionsPage() {setFilterUncategorized(false)setFilterPayee('')setFilterGroupId('')+ setFilterType('')setSearchInput('')setSearchQuery('')clearTagFilters()