Checkpoint: Persistance "marquer comme lu" entre sessions :

- Ajout de veille.getReadIds et aap.getReadIds dans routers.ts (procédures protectedProcedure)
- VeilleDashboard.tsx : chargement des IDs lus depuis la DB au montage (useEffect sur readIdsQuery), invalidation getReadIds dans markAsRead et markAllAsRead
- AAPDashboard.tsx : même pattern
- 0 erreur TypeScript
This commit is contained in:
Manus
2026-07-10 21:08:26 -04:00
parent 465e33c3b8
commit 8782883bea
4 changed files with 42 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
{
"version": "f8f8affc",
"timestamp": 1783434543359
"version": "bb8a78b4",
"timestamp": 1783732106605
}

View File

@@ -1,4 +1,4 @@
import { useState, useMemo } from "react";
import { useState, useMemo, useEffect } from "react";
import { useLocalAuth } from "@/contexts/LocalAuthContext";
import { toast } from "sonner";
import { trpc } from "@/lib/trpc";
@@ -117,13 +117,23 @@ export default function AAPDashboard() {
// Marquage lu/non lu
const [readIds, setReadIds] = useState<Set<number>>(new Set());
const readIdsQuery = trpc.aap.getReadIds.useQuery(undefined, { enabled: !!user });
useEffect(() => {
if (readIdsQuery.data?.ids) {
setReadIds(new Set(readIdsQuery.data.ids));
}
}, [readIdsQuery.data]);
const markAsReadMutation = trpc.aap.markAsRead.useMutation({
onSuccess: (_, vars) => {
setReadIds((prev) => { const next = new Set(prev); next.add(vars.articleId); return next; });
utils.aap.getReadIds.invalidate();
},
});
const markAllAsReadMutation = trpc.aap.markAllAsRead.useMutation({
onSuccess: () => { utils.aap.unreadCount.invalidate(); },
onSuccess: () => {
utils.aap.unreadCount.invalidate();
utils.aap.getReadIds.invalidate();
},
});
const unreadCountQuery = trpc.aap.unreadCount.useQuery();
const unreadCount = unreadCountQuery.data?.count ?? 0;

View File

@@ -1,4 +1,4 @@
import { useState, useMemo } from "react";
import { useState, useMemo, useEffect } from "react";
import { useLocalAuth } from "@/contexts/LocalAuthContext";
import { toast } from "sonner";
import { trpc } from "@/lib/trpc";
@@ -234,14 +234,22 @@ export default function VeilleDashboard() {
// Marquage lu/non lu
const [readIds, setReadIds] = useState<Set<number>>(new Set());
const readIdsQuery = trpc.veille.getReadIds.useQuery(undefined, { enabled: !!user });
useEffect(() => {
if (readIdsQuery.data?.ids) {
setReadIds(new Set(readIdsQuery.data.ids));
}
}, [readIdsQuery.data]);
const markAsReadMutation = trpc.veille.markAsRead.useMutation({
onSuccess: (_, vars) => {
setReadIds((prev) => { const next = new Set(prev); next.add(vars.articleId); return next; });
utils.veille.getReadIds.invalidate();
},
});
const markAllAsReadMutation = trpc.veille.markAllAsRead.useMutation({
onSuccess: () => {
utils.veille.unreadCount.invalidate();
utils.veille.getReadIds.invalidate();
},
});
const unreadCountQuery = trpc.veille.unreadCount.useQuery();

View File

@@ -226,6 +226,15 @@ export const appRouter = router({
const read = readRows[0]?.cnt ?? 0;
return { count: Math.max(0, total - read) };
}),
getReadIds: protectedProcedure.query(async ({ ctx }) => {
const db = await getDb();
if (!db) return { ids: [] as number[] };
const rows = await db
.select({ articleId: articleReads.articleId })
.from(articleReads)
.where(and(eqDrizzle(articleReads.userId, ctx.user.id), eqDrizzle(articleReads.articleType, "veille")));
return { ids: rows.map((r: { articleId: number }) => r.articleId) };
}),
}),
// ─── AAPP ────────────────────────────────────────────────────────────────────
aap: router({
@@ -353,8 +362,17 @@ export const appRouter = router({
const read = readRows[0]?.cnt ?? 0;
return { count: Math.max(0, total - read) };
}),
getReadIds: protectedProcedure.query(async ({ ctx }) => {
const db = await getDb();
if (!db) return { ids: [] as number[] };
const rows = await db
.select({ articleId: articleReads.articleId })
.from(articleReads)
.where(and(eqDrizzle(articleReads.userId, ctx.user.id), eqDrizzle(articleReads.articleType, "aap")));
return { ids: rows.map((r: { articleId: number }) => r.articleId) };
}),
// ─── Importt ─────────────────────────────────────────────────────────────────
}),
// ─── Import ─────────────────────────────────────────────────────────────────
import: router({
run: adminProcedure
.input(z.object({ type: z.enum(["veille", "aap", "all"]).default("all") }))