Merge pull request #119 from sambecker/rsalik/main

Make admin photo queries consistent

src/admin/AdminPhotosTable.tsx

@@ -91,7 +91,7 @@ export default function AdminPhotosTable({
             )}>
               <PhotoDate {...{
                 photo,
-                dateType: showUpdatedAt ? 'updatedAt' : undefined,
+                dateType: showUpdatedAt ? 'updatedAt' : 'createdAt',
               }} />
             </div>
           </div>

src/admin/AdminPhotosTableInfinite.tsx

@@ -21,6 +21,7 @@ export default function AdminPhotosTableInfinite({
       initialOffset={initialOffset}
       itemsPerPage={itemsPerPage}
       useCachedPhotos={false}
+      sortBy="createdAt"
       includeHiddenPhotos
     >
       {({ photos, onLastPhotoVisible, revalidatePhoto }) =>

src/photo/InfinitePhotoScroll.tsx

@@ -15,6 +15,7 @@ import { clsx } from 'clsx/lite';
 import { useAppState } from '@/state/AppState';
 import { Camera } from '@/camera';
 import { FilmSimulation } from '@/simulation';
+import { GetPhotosOptions } from './db';
 
 export type RevalidatePhoto = (
   photoId: string,
@@ -25,6 +26,7 @@ export default function InfinitePhotoScroll({
   cacheKey,
   initialOffset,
   itemsPerPage,
+  sortBy,
   tag,
   camera,
   simulation,
@@ -35,6 +37,7 @@ export default function InfinitePhotoScroll({
 }: {
   initialOffset: number
   itemsPerPage: number
+  sortBy?: GetPhotosOptions['sortBy']
   tag?: string
   camera?: Camera
   simulation?: FilmSimulation
@@ -59,25 +62,18 @@ export default function InfinitePhotoScroll({
     , [key]);
 
   const fetcher = useCallback(([_key, size]: [string, number]) =>
-    useCachedPhotos
+    (useCachedPhotos ? getPhotosCachedAction : getPhotosAction)({
-      ? getPhotosCachedAction({
+      offset: initialOffset + size * itemsPerPage,
-        offset: initialOffset + size * itemsPerPage,
+      sortBy,
-        limit: itemsPerPage,
+      limit: itemsPerPage,
-        hidden: includeHiddenPhotos ? 'include' : 'exclude',
+      hidden: includeHiddenPhotos ? 'include' : 'exclude',
-        tag,
+      tag,
-        camera,
+      camera,
-        simulation,
+      simulation,
-      })
+    })
-      : getPhotosAction({
-        offset: initialOffset + size * itemsPerPage,
-        limit: itemsPerPage,
-        hidden: includeHiddenPhotos ? 'include' : 'exclude',
-        tag,
-        camera,
-        simulation,
-      })
   , [
     useCachedPhotos,
+    sortBy,
     initialOffset,
     itemsPerPage,
     includeHiddenPhotos,