feat: agrupar lançamentos por data

This commit is contained in:
Felipe Coutinho
2026-06-28 19:48:39 -03:00
parent 24709ec232
commit f3c3d98aeb
18 changed files with 3275 additions and 55 deletions

View File

@@ -82,6 +82,7 @@ interface TransactionsPageProps {
allowCreate?: boolean;
noteAsColumn?: boolean;
columnOrder?: string[] | null;
groupTransactionsByDate?: boolean;
defaultCardId?: string | null;
defaultPaymentMethod?: string | null;
lockCardSelection?: boolean;
@@ -119,6 +120,7 @@ export function TransactionsPage({
allowCreate = true,
noteAsColumn = false,
columnOrder = null,
groupTransactionsByDate = true,
defaultCardId,
defaultPaymentMethod,
lockCardSelection,
@@ -745,6 +747,7 @@ export function TransactionsPage({
currentUserId={currentUserId}
noteAsColumn={noteAsColumn}
columnOrder={columnOrder}
groupTransactionsByDate={groupTransactionsByDate}
payerFilterOptions={payerFilterOptions}
categoryFilterOptions={categoryFilterOptions}
accountCardFilterOptions={accountCardFilterOptions}

View File

@@ -51,6 +51,7 @@ type BuildColumnsArgs = {
onConvertToRecurring?: (item: TransactionItem) => void;
isSettlementLoading: (id: string) => boolean;
showActions: boolean;
showDateGroups: boolean;
columnOrder?: string[] | null;
};
@@ -115,6 +116,7 @@ function buildColumns({
onConvertToRecurring,
isSettlementLoading,
showActions,
showDateGroups,
}: BuildColumnsArgs): ColumnDef<TransactionItem>[] {
const noop = () => undefined;
const handleEdit = onEdit ?? noop;
@@ -194,12 +196,14 @@ function buildColumns({
<span className="flex items-center gap-2">
<EstablishmentLogo name={name} size={32} />
<span className="flex flex-col py-0.5">
<span className="text-xs text-muted-foreground flex items-center gap-2">
{formatDate(purchaseDate)}
{dueDateLabel ? (
<span className="text-primary">{dueDateLabel}</span>
) : null}
</span>
{showDateGroups ? null : (
<span className="text-xs text-muted-foreground flex items-center gap-2">
{formatDate(purchaseDate)}
{dueDateLabel ? (
<span className="text-primary">{dueDateLabel}</span>
) : null}
</span>
)}
<span className="flex items-center gap-1">
<Tooltip>
<TooltipTrigger asChild>
@@ -254,6 +258,15 @@ function buildColumns({
</Badge>
) : null}
{showDateGroups && dueDateLabel ? (
<Badge
variant="outline"
className="px-2 text-xs text-primary"
>
{dueDateLabel}
</Badge>
) : null}
{isAnticipated && (
<Tooltip>
<TooltipTrigger asChild>

View File

@@ -20,7 +20,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { formatDate } from "@/shared/utils/date";
import { formatDate, formatDateGroupLabel } from "@/shared/utils/date";
import { getConditionIcon, getPaymentMethodIcon } from "@/shared/utils/icons";
import { cn } from "@/shared/utils/ui";
import type { TransactionItem } from "../types";
@@ -43,6 +43,7 @@ type TransactionsMobileListProps = {
onConvertToRecurring?: (item: TransactionItem) => void;
isSettlementLoading: (id: string) => boolean;
showActions?: boolean;
showDateGroups?: boolean;
};
export function TransactionsMobileList({
@@ -61,28 +62,87 @@ export function TransactionsMobileList({
onConvertToRecurring,
isSettlementLoading,
showActions = true,
showDateGroups = true,
}: TransactionsMobileListProps) {
const groups = data.reduce<
Array<{ date: string; label: string; items: TransactionItem[] }>
>((acc, item) => {
const date = item.purchaseDate?.slice(0, 10) ?? "";
const existingGroup = acc.find((group) => group.date === date);
if (existingGroup) {
existingGroup.items.push(item);
return acc;
}
acc.push({
date,
label: formatDateGroupLabel(item.purchaseDate),
items: [item],
});
return acc;
}, []);
if (!showDateGroups) {
return (
<div className="space-y-3 md:hidden">
{data.map((item) => (
<TransactionMobileCard
key={item.id}
item={item}
currentUserId={currentUserId}
onEdit={onEdit}
onCopy={onCopy}
onImport={onImport}
onConfirmDelete={onConfirmDelete}
onViewDetails={onViewDetails}
onRefund={onRefund}
onToggleSettlement={onToggleSettlement}
onAnticipate={onAnticipate}
onViewAnticipationHistory={onViewAnticipationHistory}
onConvertToInstallment={onConvertToInstallment}
onConvertToRecurring={onConvertToRecurring}
isSettlementLoading={isSettlementLoading}
showActions={showActions}
showDate
/>
))}
</div>
);
}
return (
<div className="space-y-3 md:hidden">
{data.map((item) => (
<TransactionMobileCard
key={item.id}
item={item}
currentUserId={currentUserId}
onEdit={onEdit}
onCopy={onCopy}
onImport={onImport}
onConfirmDelete={onConfirmDelete}
onViewDetails={onViewDetails}
onRefund={onRefund}
onToggleSettlement={onToggleSettlement}
onAnticipate={onAnticipate}
onViewAnticipationHistory={onViewAnticipationHistory}
onConvertToInstallment={onConvertToInstallment}
onConvertToRecurring={onConvertToRecurring}
isSettlementLoading={isSettlementLoading}
showActions={showActions}
/>
<div className="space-y-4 md:hidden">
{groups.map((group, groupIndex) => (
<section
key={`${group.date || group.label}-${groupIndex}`}
className="space-y-2"
>
<div className="rounded-md border bg-muted/60 px-3 py-1.5 text-xs font-semibold tracking-wide text-muted-foreground">
{group.label}
</div>
<div className="space-y-3">
{group.items.map((item) => (
<TransactionMobileCard
key={item.id}
item={item}
currentUserId={currentUserId}
onEdit={onEdit}
onCopy={onCopy}
onImport={onImport}
onConfirmDelete={onConfirmDelete}
onViewDetails={onViewDetails}
onRefund={onRefund}
onToggleSettlement={onToggleSettlement}
onAnticipate={onAnticipate}
onViewAnticipationHistory={onViewAnticipationHistory}
onConvertToInstallment={onConvertToInstallment}
onConvertToRecurring={onConvertToRecurring}
isSettlementLoading={isSettlementLoading}
showActions={showActions}
/>
))}
</div>
</section>
))}
</div>
);
@@ -90,6 +150,7 @@ export function TransactionsMobileList({
type TransactionMobileCardProps = Omit<TransactionsMobileListProps, "data"> & {
item: TransactionItem;
showDate?: boolean;
};
function TransactionMobileCard({
@@ -108,6 +169,7 @@ function TransactionMobileCard({
onConvertToRecurring,
isSettlementLoading,
showActions = true,
showDate = false,
}: TransactionMobileCardProps) {
const installmentBadge =
item.currentInstallment && item.installmentCount
@@ -156,10 +218,12 @@ function TransactionMobileCard({
{item.name}
</h3>
<div className="mt-1 flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
<span className="inline-flex items-center gap-1">
<RiCalendarEventLine className="size-3.5" aria-hidden />
{formatDate(item.purchaseDate)}
</span>
{showDate ? (
<span className="inline-flex items-center gap-1">
<RiCalendarEventLine className="size-3.5" aria-hidden />
{formatDate(item.purchaseDate)}
</span>
) : null}
{dueDateLabel ? (
<span className="font-medium text-primary">
{dueDateLabel}

View File

@@ -9,13 +9,14 @@ import {
getCoreRowModel,
getPaginationRowModel,
getSortedRowModel,
type Row,
type RowSelectionState,
type SortingState,
useReactTable,
type VisibilityState,
} from "@tanstack/react-table";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { type ReactNode, useMemo, useState } from "react";
import { Fragment, type ReactNode, useMemo, useState } from "react";
import type {
TransactionsExportContext,
TransactionsPaginationState,
@@ -37,6 +38,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { formatDateGroupLabel } from "@/shared/utils/date";
import { cn } from "@/shared/utils/ui";
import { TransactionsExport } from "../transactions-export";
import type {
@@ -79,6 +81,7 @@ type TransactionsTableProps = {
isSettlementLoading?: (id: string) => boolean;
showActions?: boolean;
showFilters?: boolean;
groupTransactionsByDate?: boolean;
};
export function TransactionsTable({
@@ -110,6 +113,7 @@ export function TransactionsTable({
isSettlementLoading,
showActions = true,
showFilters = true,
groupTransactionsByDate = true,
}: TransactionsTableProps) {
const router = useRouter();
const pathname = usePathname();
@@ -145,12 +149,14 @@ export function TransactionsTable({
onViewAnticipationHistory,
isSettlementLoading: isSettlementLoading ?? (() => false),
showActions,
showDateGroups: groupTransactionsByDate,
columnOrder: columnOrderPreference,
}),
[
currentUserId,
noteAsColumn,
columnOrderPreference,
groupTransactionsByDate,
onEdit,
onCopy,
onImport,
@@ -191,6 +197,24 @@ export function TransactionsTable({
const rowModel = table.getRowModel();
const hasRows = rowModel.rows.length > 0;
const groupedRows = rowModel.rows.reduce<
Array<{ date: string; label: string; rows: Row<TransactionItem>[] }>
>((acc, row) => {
const date = row.original.purchaseDate?.slice(0, 10) ?? "";
const existingGroup = acc.find((group) => group.date === date);
if (existingGroup) {
existingGroup.rows.push(row);
return acc;
}
acc.push({
date,
label: formatDateGroupLabel(row.original.purchaseDate),
rows: [row],
});
return acc;
}, []);
const visibleColumnCount = table.getVisibleLeafColumns().length;
const totalRows = isServerPaginated
? (serverPagination?.totalItems ?? 0)
: table.getCoreRowModel().rows.length;
@@ -275,6 +299,25 @@ export function TransactionsTable({
const showTopControls =
Boolean(createSlot) || Boolean(onMassAdd) || showFilters;
const renderTransactionRow = (row: Row<TransactionItem>) => (
<TableRow
key={row.id}
className={cn(
row.original.paymentMethod === "Boleto" &&
row.original.dueDate &&
!row.original.isSettled &&
new Date(row.original.dueDate) < new Date()
? "bg-destructive/3 hover:bg-destructive/5"
: undefined,
)}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell>
))}
</TableRow>
);
return (
<TooltipProvider>
@@ -366,7 +409,7 @@ export function TransactionsTable({
) : null}
<Card className="py-2">
<CardContent className="px-2 py-4 sm:px-4">
<CardContent className="px-2 sm:px-4">
{hasRows ? (
<>
<TransactionsMobileList
@@ -383,6 +426,7 @@ export function TransactionsTable({
onViewAnticipationHistory={onViewAnticipationHistory}
isSettlementLoading={isSettlementLoading ?? (() => false)}
showActions={showActions}
showDateGroups={groupTransactionsByDate}
/>
<div className="hidden overflow-x-auto md:block">
@@ -407,28 +451,23 @@ export function TransactionsTable({
))}
</TableHeader>
<TableBody>
{rowModel.rows.map((row) => (
<TableRow
key={row.id}
className={cn(
row.original.paymentMethod === "Boleto" &&
row.original.dueDate &&
!row.original.isSettled &&
new Date(row.original.dueDate) < new Date()
? "bg-destructive/3 hover:bg-destructive/5"
: undefined,
)}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
cell.getContext(),
)}
</TableCell>
))}
</TableRow>
))}
{groupTransactionsByDate
? groupedRows.map((group, groupIndex) => (
<Fragment
key={`${group.date || group.label}-${groupIndex}`}
>
<TableRow className="border-y bg-muted/40 hover:bg-muted/60">
<TableCell
colSpan={visibleColumnCount}
className="h-9 px-3 py-2 text-xs font-semibold text-muted-foreground"
>
{group.label}
</TableCell>
</TableRow>
{group.rows.map(renderTransactionRow)}
</Fragment>
))
: rowModel.rows.map(renderTransactionRow)}
</TableBody>
</Table>
</div>