= {};
const orphans: Category[] = [];
@@ -77,7 +78,7 @@ export default function CategoriesPage() {
.filter((c: Category) => c.parentId !== null)
.forEach((child: Category) => {
const parentExists = parents.some(
- (p: Category) => p.id === child.parentId,
+ (p: Category) => p.id === child.parentId
);
if (parentExists) {
if (!children[child.parentId!]) {
@@ -105,8 +106,7 @@ export default function CategoriesPage() {
}, [parentCategories.length]);
const refresh = useCallback(() => {
- queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
- queryClient.invalidateQueries({ queryKey: ["category-stats"] });
+ invalidateAllCategoryQueries(queryClient);
}, [queryClient]);
const getCategoryStats = useCallback(
@@ -136,7 +136,7 @@ export default function CategoriesPage() {
return { total, count };
},
- [categoryStats, childrenByParent],
+ [categoryStats, childrenByParent]
);
if (isLoadingMetadata || !metadata || isLoadingStats || !categoryStats) {
@@ -248,7 +248,7 @@ export default function CategoriesPage() {
try {
// Fetch uncategorized transactions
const uncategorizedResponse = await fetch(
- "/api/banking/transactions?limit=1000&offset=0&includeUncategorized=true",
+ "/api/banking/transactions?limit=1000&offset=0&includeUncategorized=true"
);
if (!uncategorizedResponse.ok) {
throw new Error("Failed to fetch uncategorized transactions");
@@ -261,11 +261,11 @@ export default function CategoriesPage() {
for (const transaction of uncategorized) {
const categoryId = autoCategorize(
transaction.description + " " + (transaction.memo || ""),
- metadata.categories,
+ metadata.categories
);
if (categoryId) {
const category = metadata.categories.find(
- (c: Category) => c.id === categoryId,
+ (c: Category) => c.id === categoryId
);
if (category) {
results.push({ transaction, category });
@@ -299,9 +299,9 @@ export default function CategoriesPage() {
return children.some(
(c) =>
c.name.toLowerCase().includes(query) ||
- c.keywords.some((k) => k.toLowerCase().includes(query)),
+ c.keywords.some((k) => k.toLowerCase().includes(query))
);
- },
+ }
);
return (
@@ -346,9 +346,9 @@ export default function CategoriesPage() {
(c) =>
c.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
c.keywords.some((k) =>
- k.toLowerCase().includes(searchQuery.toLowerCase()),
+ k.toLowerCase().includes(searchQuery.toLowerCase())
) ||
- parent.name.toLowerCase().includes(searchQuery.toLowerCase()),
+ parent.name.toLowerCase().includes(searchQuery.toLowerCase())
)
: allChildren;
const stats = getCategoryStats(parent.id, true);
@@ -435,7 +435,7 @@ export default function CategoriesPage() {
{new Date(result.transaction.date).toLocaleDateString(
- "fr-FR",
+ "fr-FR"
)}
{" • "}
{new Intl.NumberFormat("fr-FR", {
diff --git a/app/rules/page.tsx b/app/rules/page.tsx
index cf77a89..978c365 100644
--- a/app/rules/page.tsx
+++ b/app/rules/page.tsx
@@ -18,6 +18,10 @@ import {
suggestKeyword,
} from "@/components/rules/constants";
import type { Transaction } from "@/lib/types";
+import {
+ invalidateAllTransactionQueries,
+ invalidateAllCategoryQueries,
+} from "@/lib/cache-utils";
interface TransactionGroup {
key: string;
@@ -42,21 +46,19 @@ export default function RulesPage() {
offset: 0,
includeUncategorized: true,
},
- !!metadata,
+ !!metadata
);
const refresh = useCallback(() => {
- invalidateTransactions();
- queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
- queryClient.invalidateQueries({ queryKey: ["category-stats"] });
- queryClient.invalidateQueries({ queryKey: ["accounts-with-stats"] });
- }, [invalidateTransactions, queryClient]);
+ invalidateAllTransactionQueries(queryClient);
+ invalidateAllCategoryQueries(queryClient);
+ }, [queryClient]);
const [searchQuery, setSearchQuery] = useState("");
const [sortBy, setSortBy] = useState<"count" | "amount" | "name">("count");
const [filterMinCount, setFilterMinCount] = useState(2);
const [expandedGroups, setExpandedGroups] = useState>(new Set());
const [selectedGroup, setSelectedGroup] = useState(
- null,
+ null
);
const [isDialogOpen, setIsDialogOpen] = useState(false);
const [isAutoCategorizing, setIsAutoCategorizing] = useState(false);
@@ -87,7 +89,7 @@ export default function RulesPage() {
totalAmount: transactions.reduce((sum, t) => sum + t.amount, 0),
suggestedKeyword: suggestKeyword(descriptions),
};
- },
+ }
);
// Filter by search query
@@ -98,7 +100,7 @@ export default function RulesPage() {
(g) =>
g.displayName.toLowerCase().includes(query) ||
g.key.includes(query) ||
- g.suggestedKeyword.toLowerCase().includes(query),
+ g.suggestedKeyword.toLowerCase().includes(query)
);
}
@@ -167,7 +169,7 @@ export default function RulesPage() {
// 1. Add keyword to category
const category = metadata.categories.find(
- (c: { id: string }) => c.id === ruleData.categoryId,
+ (c: { id: string }) => c.id === ruleData.categoryId
);
if (!category) {
throw new Error("Category not found");
@@ -175,7 +177,7 @@ export default function RulesPage() {
// Check if keyword already exists
const keywordExists = category.keywords.some(
- (k: string) => k.toLowerCase() === ruleData.keyword.toLowerCase(),
+ (k: string) => k.toLowerCase() === ruleData.keyword.toLowerCase()
);
if (!keywordExists) {
@@ -193,14 +195,16 @@ export default function RulesPage() {
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ id, categoryId: ruleData.categoryId }),
- }),
- ),
+ })
+ )
);
}
- refresh();
+ // Invalider toutes les queries liées
+ invalidateAllTransactionQueries(queryClient);
+ invalidateAllCategoryQueries(queryClient);
},
- [metadata, refresh],
+ [metadata, queryClient]
);
const handleAutoCategorize = useCallback(async () => {
@@ -214,7 +218,7 @@ export default function RulesPage() {
for (const transaction of uncategorized) {
const categoryId = autoCategorize(
transaction.description + " " + (transaction.memo || ""),
- metadata.categories,
+ metadata.categories
);
if (categoryId) {
await fetch("/api/banking/transactions", {
@@ -226,9 +230,11 @@ export default function RulesPage() {
}
}
- refresh();
+ // Invalider toutes les queries liées
+ invalidateAllTransactionQueries(queryClient);
+ invalidateAllCategoryQueries(queryClient);
alert(
- `${categorizedCount} transaction(s) catégorisée(s) automatiquement`,
+ `${categorizedCount} transaction(s) catégorisée(s) automatiquement`
);
} catch (error) {
console.error("Error auto-categorizing:", error);
@@ -236,7 +242,7 @@ export default function RulesPage() {
} finally {
setIsAutoCategorizing(false);
}
- }, [metadata, transactionsData, refresh]);
+ }, [metadata, transactionsData, queryClient]);
const handleCategorizeGroup = useCallback(
async (group: TransactionGroup, categoryId: string | null) => {
@@ -247,16 +253,18 @@ export default function RulesPage() {
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ ...t, categoryId }),
- }),
- ),
+ })
+ )
);
- refresh();
+ // Invalider toutes les queries liées
+ invalidateAllTransactionQueries(queryClient);
+ invalidateAllCategoryQueries(queryClient);
} catch (error) {
console.error("Error categorizing group:", error);
alert("Erreur lors de la catégorisation");
}
},
- [refresh],
+ [queryClient]
);
if (
diff --git a/app/transactions/page.tsx b/app/transactions/page.tsx
index bba67a6..7f082eb 100644
--- a/app/transactions/page.tsx
+++ b/app/transactions/page.tsx
@@ -74,7 +74,6 @@ export default function TransactionsPage() {
} = useTransactionMutations({
transactionParams,
transactionsData,
- invalidateTransactions,
});
// Transaction rules
diff --git a/hooks/use-transaction-mutations.ts b/hooks/use-transaction-mutations.ts
index 970a8de..75cafe7 100644
--- a/hooks/use-transaction-mutations.ts
+++ b/hooks/use-transaction-mutations.ts
@@ -5,17 +5,16 @@ import { useQueryClient } from "@tanstack/react-query";
import type { Transaction } from "@/lib/types";
import { getTransactionsQueryKey } from "@/lib/hooks";
import type { TransactionsPaginatedParams } from "@/services/banking.service";
+import { invalidateAllTransactionQueries } from "@/lib/cache-utils";
interface UseTransactionMutationsProps {
transactionParams: TransactionsPaginatedParams;
transactionsData: { transactions: Transaction[]; total: number } | undefined;
- invalidateTransactions: () => void;
}
export function useTransactionMutations({
transactionParams,
transactionsData,
- invalidateTransactions,
}: UseTransactionMutationsProps) {
const queryClient = useQueryClient();
const [updatingTransactionIds, setUpdatingTransactionIds] = useState<
@@ -64,21 +63,19 @@ export function useTransactionMutations({
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
+
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to update transaction:", error);
// Rollback on error
if (previousData) {
queryClient.setQueryData(queryKey, previousData);
}
- invalidateTransactions();
+ invalidateAllTransactionQueries(queryClient);
}
},
- [
- transactionsData,
- transactionParams,
- queryClient,
- invalidateTransactions,
- ]
+ [transactionsData, transactionParams, queryClient]
);
const markReconciled = useCallback(
@@ -120,21 +117,19 @@ export function useTransactionMutations({
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
+
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to update transaction:", error);
// Rollback on error
if (previousData) {
queryClient.setQueryData(queryKey, previousData);
}
- invalidateTransactions();
+ invalidateAllTransactionQueries(queryClient);
}
},
- [
- transactionsData,
- transactionParams,
- queryClient,
- invalidateTransactions,
- ]
+ [transactionsData, transactionParams, queryClient]
);
const setCategory = useCallback(
@@ -148,6 +143,22 @@ export function useTransactionMutations({
setUpdatingTransactionIds((prev) => new Set(prev).add(transactionId));
+ // Optimistic cache update
+ const queryKey = getTransactionsQueryKey(transactionParams);
+ const previousData =
+ queryClient.getQueryData(queryKey);
+
+ queryClient.setQueryData(queryKey, (oldData) => {
+ if (!oldData) return oldData;
+
+ return {
+ ...oldData,
+ transactions: oldData.transactions.map((t) =>
+ t.id === transactionId ? { ...t, categoryId } : t
+ ),
+ };
+ });
+
try {
const response = await fetch("/api/banking/transactions", {
method: "PUT",
@@ -159,21 +170,15 @@ export function useTransactionMutations({
throw new Error(`HTTP error! status: ${response.status}`);
}
- // Optimistic cache update
- const queryKey = getTransactionsQueryKey(transactionParams);
- queryClient.setQueryData(queryKey, (oldData) => {
- if (!oldData) return oldData;
-
- return {
- ...oldData,
- transactions: oldData.transactions.map((t) =>
- t.id === transactionId ? { ...t, categoryId } : t
- ),
- };
- });
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to update transaction:", error);
- invalidateTransactions();
+ // Rollback on error
+ if (previousData) {
+ queryClient.setQueryData(queryKey, previousData);
+ }
+ invalidateAllTransactionQueries(queryClient);
} finally {
setUpdatingTransactionIds((prev) => {
const next = new Set(prev);
@@ -182,7 +187,7 @@ export function useTransactionMutations({
});
}
},
- [transactionsData, transactionParams, queryClient, invalidateTransactions]
+ [transactionsData, transactionParams, queryClient]
);
const deleteTransaction = useCallback(
@@ -217,22 +222,23 @@ export function useTransactionMutations({
if (!response.ok) {
const errorData = await response.json().catch(() => ({}));
throw new Error(
- errorData.error || `Failed to delete transaction: ${response.status}`
+ errorData.error ||
+ `Failed to delete transaction: ${response.status}`
);
}
- // Invalidate related queries
- queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to delete transaction:", error);
// Rollback on error
if (previousData) {
queryClient.setQueryData(queryKey, previousData);
}
- invalidateTransactions();
+ invalidateAllTransactionQueries(queryClient);
}
},
- [transactionsData, transactionParams, queryClient, invalidateTransactions]
+ [transactionsData, transactionParams, queryClient]
);
const bulkReconcile = useCallback(
@@ -272,21 +278,19 @@ export function useTransactionMutations({
})
)
);
+
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to update transactions:", error);
// Rollback on error
if (previousData) {
queryClient.setQueryData(queryKey, previousData);
}
- invalidateTransactions();
+ invalidateAllTransactionQueries(queryClient);
}
},
- [
- transactionsData,
- transactionParams,
- queryClient,
- invalidateTransactions,
- ]
+ [transactionsData, transactionParams, queryClient]
);
const bulkSetCategory = useCallback(
@@ -304,6 +308,21 @@ export function useTransactionMutations({
return next;
});
+ // Optimistic cache update
+ const queryKey = getTransactionsQueryKey(transactionParams);
+ const previousData =
+ queryClient.getQueryData(queryKey);
+
+ queryClient.setQueryData(queryKey, (oldData) => {
+ if (!oldData) return oldData;
+ return {
+ ...oldData,
+ transactions: oldData.transactions.map((t) =>
+ transactionIds.includes(t.id) ? { ...t, categoryId } : t
+ ),
+ };
+ });
+
try {
await Promise.all(
transactionsToUpdate.map((t) =>
@@ -315,20 +334,15 @@ export function useTransactionMutations({
)
);
- // Optimistic cache update
- const queryKey = getTransactionsQueryKey(transactionParams);
- queryClient.setQueryData(queryKey, (oldData) => {
- if (!oldData) return oldData;
- return {
- ...oldData,
- transactions: oldData.transactions.map((t) =>
- transactionIds.includes(t.id) ? { ...t, categoryId } : t
- ),
- };
- });
+ // TOUJOURS revalider après succès pour garantir la cohérence
+ invalidateAllTransactionQueries(queryClient);
} catch (error) {
console.error("Failed to update transactions:", error);
- invalidateTransactions();
+ // Rollback on error
+ if (previousData) {
+ queryClient.setQueryData(queryKey, previousData);
+ }
+ invalidateAllTransactionQueries(queryClient);
} finally {
setUpdatingTransactionIds((prev) => {
const next = new Set(prev);
@@ -337,7 +351,7 @@ export function useTransactionMutations({
});
}
},
- [transactionsData, transactionParams, queryClient, invalidateTransactions]
+ [transactionsData, transactionParams, queryClient]
);
return {
@@ -350,4 +364,3 @@ export function useTransactionMutations({
updatingTransactionIds,
};
}
-
diff --git a/hooks/use-transaction-rules.ts b/hooks/use-transaction-rules.ts
index bec1adb..c2e7c7a 100644
--- a/hooks/use-transaction-rules.ts
+++ b/hooks/use-transaction-rules.ts
@@ -8,6 +8,10 @@ import {
normalizeDescription,
suggestKeyword,
} from "@/components/rules/constants";
+import {
+ invalidateAllTransactionQueries,
+ invalidateAllCategoryQueries,
+} from "@/lib/cache-utils";
interface UseTransactionRulesProps {
transactionsData: { transactions: Transaction[] } | undefined;
@@ -94,9 +98,9 @@ export function useTransactionRules({
);
}
- // Invalidate queries
- queryClient.invalidateQueries({ queryKey: ["transactions"] });
- queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
+ // Invalider toutes les queries liées
+ invalidateAllTransactionQueries(queryClient);
+ invalidateAllCategoryQueries(queryClient);
setRuleDialogOpen(false);
},
[metadata, queryClient]
@@ -110,4 +114,3 @@ export function useTransactionRules({
handleSaveRule,
};
}
-
diff --git a/lib/cache-utils.ts b/lib/cache-utils.ts
new file mode 100644
index 0000000..43d7dde
--- /dev/null
+++ b/lib/cache-utils.ts
@@ -0,0 +1,36 @@
+import { QueryClient } from "@tanstack/react-query";
+
+/**
+ * Invalide toutes les queries liées aux transactions
+ * Utilisé après toute mutation de transaction (création, modification, suppression)
+ */
+export function invalidateAllTransactionQueries(queryClient: QueryClient) {
+ // Invalider toutes les queries de transactions (tous les paramètres)
+ queryClient.invalidateQueries({ queryKey: ["transactions"] });
+
+ // Invalider les queries liées qui peuvent être affectées
+ queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
+ queryClient.invalidateQueries({ queryKey: ["category-stats"] });
+ queryClient.invalidateQueries({ queryKey: ["accounts-with-stats"] });
+ queryClient.invalidateQueries({ queryKey: ["duplicate-ids"] });
+}
+
+/**
+ * Invalide toutes les queries liées aux catégories
+ * Utilisé après toute mutation de catégorie (création, modification, suppression)
+ */
+export function invalidateAllCategoryQueries(queryClient: QueryClient) {
+ queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
+ queryClient.invalidateQueries({ queryKey: ["category-stats"] });
+ queryClient.invalidateQueries({ queryKey: ["transactions"] });
+}
+
+/**
+ * Invalide toutes les queries liées aux comptes
+ * Utilisé après toute mutation de compte ou dossier (création, modification, suppression)
+ */
+export function invalidateAllAccountQueries(queryClient: QueryClient) {
+ queryClient.invalidateQueries({ queryKey: ["banking-metadata"] });
+ queryClient.invalidateQueries({ queryKey: ["accounts-with-stats"] });
+ queryClient.invalidateQueries({ queryKey: ["transactions"] });
+}