From de5f49261be96ebd88cd4ce95ed13dd1b8955571 Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Wed, 12 Mar 2025 17:29:53 -0500 Subject: [PATCH] Always fetch fresh data for admin menu --- src/admin/actions.ts | 8 ++++---- src/state/AppStateProvider.tsx | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/admin/actions.ts b/src/admin/actions.ts index 59ad75d0..c234788d 100644 --- a/src/admin/actions.ts +++ b/src/admin/actions.ts @@ -7,8 +7,8 @@ import { testDatabaseConnection } from '@/platforms/postgres'; import { testStorageConnection } from '@/platforms/storage'; import { APP_CONFIGURATION } from '@/app/config'; import { getStorageUploadUrlsNoStore } from '@/platforms/storage/cache'; -import { getPhotosMetaCached, getUniqueTagsCached } from '@/photo/cache'; import { getInsightsIndicatorStatus } from '@/admin/insights/server'; +import { getPhotosMeta, getUniqueTags } from '@/photo/db/query'; export type AdminData = Awaited>; @@ -21,13 +21,13 @@ export const getAdminDataAction = async () => uploadsCount, insightsIndicatorStatus, ] = await Promise.all([ - getPhotosMetaCached() + getPhotosMeta() .then(({ count }) => count) .catch(() => 0), - getPhotosMetaCached({ hidden: 'only' }) + getPhotosMeta({ hidden: 'only' }) .then(({ count }) => count) .catch(() => 0), - getUniqueTagsCached() + getUniqueTags() .then(tags => tags.length) .catch(() => 0), getStorageUploadUrlsNoStore() diff --git a/src/state/AppStateProvider.tsx b/src/state/AppStateProvider.tsx index 5dae4a2f..95a66d2a 100644 --- a/src/state/AppStateProvider.tsx +++ b/src/state/AppStateProvider.tsx @@ -106,9 +106,7 @@ export default function AppStateProvider({ const { data: adminData, mutate: refreshAdminData } = useSWR( isUserSignedIn ? 'getAdminData' : null, - getAdminDataAction, { - refreshInterval: 1000 * 60, - }, + getAdminDataAction, ); const updateAdminData = useCallback( (updatedData: Partial) => { @@ -124,7 +122,7 @@ export default function AppStateProvider({ if (userEmail) { storeAuthEmailCookie(userEmail); } - }, [userEmail, refreshAdminData, adminData]); + }, [userEmail, adminData]); const registerAdminUpdate = useCallback(() => setAdminUpdateTimes(updates => [...updates, new Date()])