Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions hooks/useActivityLogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export interface ActivityLogsResponse {
async function fetchActivityLogsApi(
filters: ActivityLogsFilters,
pagination: ActivityLogsPagination,
t: ReturnType<typeof useTranslations>
t: ReturnType<typeof useTranslations>,
): Promise<ActivityLogsResponse> {
const params = new URLSearchParams();

Expand Down Expand Up @@ -90,7 +90,7 @@ async function fetchActivityLogsApi(
* Clear all activity logs via API
*/
async function clearLogsApi(
t: ReturnType<typeof useTranslations>
t: ReturnType<typeof useTranslations>,
): Promise<void> {
const response = await fetch("/api/activity-logs", {
method: "DELETE",
Expand Down Expand Up @@ -120,7 +120,7 @@ async function clearLogsApi(
*/
export function useActivityLogs(
filters: ActivityLogsFilters = {},
pagination: ActivityLogsPagination = { limit: 50, offset: 0 }
pagination: ActivityLogsPagination = { limit: 50, offset: 0 },
) {
const t = useTranslations();
const queryClient = useQueryClient();
Expand All @@ -132,8 +132,7 @@ export function useActivityLogs(
error,
refetch,
} = useQuery({
/* eslint-disable-next-line @tanstack/query/exhaustive-deps */
queryKey: queryKeys.activityLogs({ filters, pagination }),
queryKey: queryKeys.activityLogs({ filters, pagination, t }),
queryFn: () => fetchActivityLogsApi(filters, pagination, t),
refetchInterval: REFETCH_INTERVAL,
refetchIntervalInBackground: true, // Continue polling in background
Expand All @@ -150,7 +149,7 @@ export function useActivityLogs(
toast.error(
err instanceof Error
? err.message
: t("common.deleteError", { item: t("activityLog.title") })
: t("common.deleteError", { item: t("activityLog.title") }),
);
},
});
Expand Down
31 changes: 15 additions & 16 deletions hooks/useAdminAuditLogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async function fetchAuditLogsApi(
filters: AuditLogFilters,
sort: AuditLogSort,
pagination: AuditLogPagination,
t: ReturnType<typeof useTranslations>
t: ReturnType<typeof useTranslations>,
): Promise<AuditLogsResponse> {
const params = new URLSearchParams();

Expand Down Expand Up @@ -114,7 +114,7 @@ async function fetchAuditLogsApi(
*/
async function deleteLogsByIdsApi(
logIds: string[],
t: ReturnType<typeof useTranslations>
t: ReturnType<typeof useTranslations>,
): Promise<{ deletedCount: number }> {
const response = await fetch("/api/admin/audit-logs", {
method: "DELETE",
Expand All @@ -137,13 +137,13 @@ async function deleteLogsByIdsApi(
*/
async function deleteLogsByDateApi(
beforeDate: string,
t: ReturnType<typeof useTranslations>
t: ReturnType<typeof useTranslations>,
): Promise<{ deletedCount: number }> {
const response = await fetch(
`/api/admin/audit-logs?before=${encodeURIComponent(beforeDate)}`,
{
method: "DELETE",
}
},
);

if (!response.ok) {
Expand Down Expand Up @@ -178,7 +178,7 @@ async function deleteLogsByDateApi(
export function useAdminAuditLogs(
filters: AuditLogFilters = {},
sort: AuditLogSort = { field: "timestamp", direction: "desc" },
pagination: AuditLogPagination = { limit: 25, offset: 0 }
pagination: AuditLogPagination = { limit: 25, offset: 0 },
) {
const t = useTranslations();
const queryClient = useQueryClient();
Expand All @@ -190,8 +190,7 @@ export function useAdminAuditLogs(
error,
refetch,
} = useQuery({
// eslint-disable-next-line @tanstack/query/exhaustive-deps
queryKey: queryKeys.admin.auditLogs({ filters, sort, pagination }),
queryKey: queryKeys.admin.auditLogs({ filters, sort, pagination, t }),
queryFn: () => fetchAuditLogsApi(filters, sort, pagination, t),
refetchInterval: REFETCH_INTERVAL,
refetchIntervalInBackground: true, // Continue polling in background
Expand All @@ -205,7 +204,7 @@ export function useAdminAuditLogs(
queryKey: queryKeys.admin.auditLogs({ filters, sort, pagination }),
});
const previous = queryClient.getQueryData(
queryKeys.admin.auditLogs({ filters, sort, pagination })
queryKeys.admin.auditLogs({ filters, sort, pagination }),
);

// Optimistic update
Expand All @@ -218,28 +217,28 @@ export function useAdminAuditLogs(
logs: old.logs.filter((log) => !logIds.includes(log.id)),
total: old.total - logIds.length,
};
}
},
);

return { previous };
},
onError: (err, logIds, context) => {
queryClient.setQueryData(
queryKeys.admin.auditLogs({ filters, sort, pagination }),
context?.previous
context?.previous,
);
toast.error(
err instanceof Error
? err.message
: t("common.deleteError", { item: t("admin.auditLogs") })
: t("common.deleteError", { item: t("admin.auditLogs") }),
);
},
onSuccess: (data) => {
toast.success(t("common.deletedCount", { count: data.deletedCount }));
},
onSettled: () => {
queryClient.invalidateQueries({ queryKey: ["admin", "audit-logs"] });
queryClient.invalidateQueries({ queryKey: queryKeys.admin.stats });
queryClient.invalidateQueries({ queryKey: queryKeys.admin.stats() });
},
});

Expand All @@ -250,15 +249,15 @@ export function useAdminAuditLogs(
toast.error(
err instanceof Error
? err.message
: t("common.deleteError", { item: t("admin.auditLogs") })
: t("common.deleteError", { item: t("admin.auditLogs") }),
);
},
onSuccess: (data) => {
toast.success(t("common.deletedCount", { count: data.deletedCount }));
},
onSettled: () => {
queryClient.invalidateQueries({ queryKey: ["admin", "audit-logs"] });
queryClient.invalidateQueries({ queryKey: queryKeys.admin.stats });
queryClient.invalidateQueries({ queryKey: queryKeys.admin.stats() });
},
});

Expand Down Expand Up @@ -295,14 +294,14 @@ export function useAdminAuditLogs(
fetchAuditLogs: async (
searchFilters: AuditLogFilters,
searchSort: AuditLogSort,
searchPagination: AuditLogPagination
searchPagination: AuditLogPagination,
): Promise<AuditLogsResponse | null> => {
try {
return await fetchAuditLogsApi(
searchFilters,
searchSort,
searchPagination,
t
t,
);
} catch {
return null;
Expand Down
Loading
Loading