feat: add account and category filter functionality to TransactionsPage; implement hooks for filtering transactions based on selected accounts and categories
This commit is contained in:
@@ -27,6 +27,8 @@ import { useTransactionsPage } from "@/hooks/use-transactions-page";
|
|||||||
import { useTransactionMutations } from "@/hooks/use-transaction-mutations";
|
import { useTransactionMutations } from "@/hooks/use-transaction-mutations";
|
||||||
import { useTransactionRules } from "@/hooks/use-transaction-rules";
|
import { useTransactionRules } from "@/hooks/use-transaction-rules";
|
||||||
import { useTransactionsChartData } from "@/hooks/use-transactions-chart-data";
|
import { useTransactionsChartData } from "@/hooks/use-transactions-chart-data";
|
||||||
|
import { useTransactionsForAccountFilter } from "@/hooks/use-transactions-for-account-filter";
|
||||||
|
import { useTransactionsForCategoryFilter } from "@/hooks/use-transactions-for-category-filter";
|
||||||
import { useLocalStorage } from "@/hooks/use-local-storage";
|
import { useLocalStorage } from "@/hooks/use-local-storage";
|
||||||
|
|
||||||
export default function TransactionsPage() {
|
export default function TransactionsPage() {
|
||||||
@@ -113,6 +115,28 @@ export default function TransactionsPage() {
|
|||||||
searchQuery,
|
searchQuery,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Transactions for account filter (filtered by categories, period, search, reconciled - NOT by accounts)
|
||||||
|
const { transactions: transactionsForAccountFilter } =
|
||||||
|
useTransactionsForAccountFilter({
|
||||||
|
selectedCategories,
|
||||||
|
period,
|
||||||
|
customStartDate,
|
||||||
|
customEndDate,
|
||||||
|
showReconciled,
|
||||||
|
searchQuery,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Transactions for category filter (filtered by accounts, period, search, reconciled - NOT by categories)
|
||||||
|
const { transactions: transactionsForCategoryFilter } =
|
||||||
|
useTransactionsForCategoryFilter({
|
||||||
|
selectedAccounts,
|
||||||
|
period,
|
||||||
|
customStartDate,
|
||||||
|
customEndDate,
|
||||||
|
showReconciled,
|
||||||
|
searchQuery,
|
||||||
|
});
|
||||||
|
|
||||||
const invalidateAll = useCallback(() => {
|
const invalidateAll = useCallback(() => {
|
||||||
invalidateTransactions();
|
invalidateTransactions();
|
||||||
queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
|
queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
|
||||||
@@ -157,11 +181,6 @@ export default function TransactionsPage() {
|
|||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
// For filter comboboxes, we'll use empty arrays for now
|
|
||||||
// They can be enhanced later with separate queries if needed
|
|
||||||
const transactionsForAccountFilter: never[] = [];
|
|
||||||
const transactionsForCategoryFilter: never[] = [];
|
|
||||||
|
|
||||||
// Early return for loading state - prevents sidebar flash
|
// Early return for loading state - prevents sidebar flash
|
||||||
if (isLoadingMetadata || !metadata) {
|
if (isLoadingMetadata || !metadata) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
109
hooks/use-transactions-for-account-filter.ts
Normal file
109
hooks/use-transactions-for-account-filter.ts
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useMemo } from "react";
|
||||||
|
import { useTransactions } from "@/lib/hooks";
|
||||||
|
import { useBankingMetadata } from "@/lib/hooks";
|
||||||
|
import type { TransactionsPaginatedParams } from "@/services/banking.service";
|
||||||
|
|
||||||
|
interface UseTransactionsForAccountFilterParams {
|
||||||
|
selectedCategories: string[];
|
||||||
|
period: "1month" | "3months" | "6months" | "12months" | "custom" | "all";
|
||||||
|
customStartDate?: Date;
|
||||||
|
customEndDate?: Date;
|
||||||
|
showReconciled: string;
|
||||||
|
searchQuery: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hook to fetch transactions filtered by categories, period, search, reconciled
|
||||||
|
* but NOT by accounts. Used for displaying account totals in account filter.
|
||||||
|
*/
|
||||||
|
export function useTransactionsForAccountFilter({
|
||||||
|
selectedCategories,
|
||||||
|
period,
|
||||||
|
customStartDate,
|
||||||
|
customEndDate,
|
||||||
|
showReconciled,
|
||||||
|
searchQuery,
|
||||||
|
}: UseTransactionsForAccountFilterParams) {
|
||||||
|
const { data: metadata } = useBankingMetadata();
|
||||||
|
|
||||||
|
// Calculate start date based on period
|
||||||
|
const startDate = useMemo(() => {
|
||||||
|
const now = new Date();
|
||||||
|
switch (period) {
|
||||||
|
case "1month":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 1, 1);
|
||||||
|
case "3months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 3, 1);
|
||||||
|
case "6months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 6, 1);
|
||||||
|
case "12months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 12, 1);
|
||||||
|
case "custom":
|
||||||
|
return customStartDate || new Date(0);
|
||||||
|
default:
|
||||||
|
return new Date(0);
|
||||||
|
}
|
||||||
|
}, [period, customStartDate]);
|
||||||
|
|
||||||
|
// Calculate end date (only for custom period)
|
||||||
|
const endDate = useMemo(() => {
|
||||||
|
if (period === "custom" && customEndDate) {
|
||||||
|
return customEndDate;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}, [period, customEndDate]);
|
||||||
|
|
||||||
|
// Build params for fetching all transactions (no pagination, no account filter)
|
||||||
|
const filterParams = useMemo<TransactionsPaginatedParams>(() => {
|
||||||
|
const params: TransactionsPaginatedParams = {
|
||||||
|
limit: 10000, // Large limit to get all transactions
|
||||||
|
offset: 0,
|
||||||
|
sortField: "date",
|
||||||
|
sortOrder: "asc",
|
||||||
|
};
|
||||||
|
|
||||||
|
if (startDate && period !== "all") {
|
||||||
|
params.startDate = startDate.toISOString().split("T")[0];
|
||||||
|
}
|
||||||
|
if (endDate) {
|
||||||
|
params.endDate = endDate.toISOString().split("T")[0];
|
||||||
|
}
|
||||||
|
// NOTE: We intentionally don't filter by accounts here
|
||||||
|
if (!selectedCategories.includes("all")) {
|
||||||
|
if (selectedCategories.includes("uncategorized")) {
|
||||||
|
params.includeUncategorized = true;
|
||||||
|
} else {
|
||||||
|
params.categoryIds = selectedCategories;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (searchQuery) {
|
||||||
|
params.search = searchQuery;
|
||||||
|
}
|
||||||
|
if (showReconciled !== "all") {
|
||||||
|
params.isReconciled = showReconciled === "reconciled";
|
||||||
|
}
|
||||||
|
|
||||||
|
return params;
|
||||||
|
}, [
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
selectedCategories,
|
||||||
|
searchQuery,
|
||||||
|
showReconciled,
|
||||||
|
period,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Fetch all filtered transactions (without account filter)
|
||||||
|
const { data: transactionsData, isLoading } = useTransactions(
|
||||||
|
filterParams,
|
||||||
|
!!metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
transactions: transactionsData?.transactions || [],
|
||||||
|
isLoading,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
105
hooks/use-transactions-for-category-filter.ts
Normal file
105
hooks/use-transactions-for-category-filter.ts
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useMemo } from "react";
|
||||||
|
import { useTransactions } from "@/lib/hooks";
|
||||||
|
import { useBankingMetadata } from "@/lib/hooks";
|
||||||
|
import type { TransactionsPaginatedParams } from "@/services/banking.service";
|
||||||
|
|
||||||
|
interface UseTransactionsForCategoryFilterParams {
|
||||||
|
selectedAccounts: string[];
|
||||||
|
period: "1month" | "3months" | "6months" | "12months" | "custom" | "all";
|
||||||
|
customStartDate?: Date;
|
||||||
|
customEndDate?: Date;
|
||||||
|
showReconciled: string;
|
||||||
|
searchQuery: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hook to fetch transactions filtered by accounts, period, search, reconciled
|
||||||
|
* but NOT by categories. Used for displaying transaction counts in category filter.
|
||||||
|
*/
|
||||||
|
export function useTransactionsForCategoryFilter({
|
||||||
|
selectedAccounts,
|
||||||
|
period,
|
||||||
|
customStartDate,
|
||||||
|
customEndDate,
|
||||||
|
showReconciled,
|
||||||
|
searchQuery,
|
||||||
|
}: UseTransactionsForCategoryFilterParams) {
|
||||||
|
const { data: metadata } = useBankingMetadata();
|
||||||
|
|
||||||
|
// Calculate start date based on period
|
||||||
|
const startDate = useMemo(() => {
|
||||||
|
const now = new Date();
|
||||||
|
switch (period) {
|
||||||
|
case "1month":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 1, 1);
|
||||||
|
case "3months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 3, 1);
|
||||||
|
case "6months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 6, 1);
|
||||||
|
case "12months":
|
||||||
|
return new Date(now.getFullYear(), now.getMonth() - 12, 1);
|
||||||
|
case "custom":
|
||||||
|
return customStartDate || new Date(0);
|
||||||
|
default:
|
||||||
|
return new Date(0);
|
||||||
|
}
|
||||||
|
}, [period, customStartDate]);
|
||||||
|
|
||||||
|
// Calculate end date (only for custom period)
|
||||||
|
const endDate = useMemo(() => {
|
||||||
|
if (period === "custom" && customEndDate) {
|
||||||
|
return customEndDate;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}, [period, customEndDate]);
|
||||||
|
|
||||||
|
// Build params for fetching all transactions (no pagination, no category filter)
|
||||||
|
const filterParams = useMemo<TransactionsPaginatedParams>(() => {
|
||||||
|
const params: TransactionsPaginatedParams = {
|
||||||
|
limit: 10000, // Large limit to get all transactions
|
||||||
|
offset: 0,
|
||||||
|
sortField: "date",
|
||||||
|
sortOrder: "asc",
|
||||||
|
};
|
||||||
|
|
||||||
|
if (startDate && period !== "all") {
|
||||||
|
params.startDate = startDate.toISOString().split("T")[0];
|
||||||
|
}
|
||||||
|
if (endDate) {
|
||||||
|
params.endDate = endDate.toISOString().split("T")[0];
|
||||||
|
}
|
||||||
|
if (!selectedAccounts.includes("all")) {
|
||||||
|
params.accountIds = selectedAccounts;
|
||||||
|
}
|
||||||
|
// NOTE: We intentionally don't filter by categories here
|
||||||
|
if (searchQuery) {
|
||||||
|
params.search = searchQuery;
|
||||||
|
}
|
||||||
|
if (showReconciled !== "all") {
|
||||||
|
params.isReconciled = showReconciled === "reconciled";
|
||||||
|
}
|
||||||
|
|
||||||
|
return params;
|
||||||
|
}, [
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
selectedAccounts,
|
||||||
|
searchQuery,
|
||||||
|
showReconciled,
|
||||||
|
period,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Fetch all filtered transactions (without category filter)
|
||||||
|
const { data: transactionsData, isLoading } = useTransactions(
|
||||||
|
filterParams,
|
||||||
|
!!metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
transactions: transactionsData?.transactions || [],
|
||||||
|
isLoading,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user