From 611579c8860ada3fa97c600cd51874516b643cdd Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Fri, 10 Nov 2023 12:43:16 -0600
Subject: [PATCH] Stop caching blob upload list commands

---
 src/app/(auth-state)/admin/layout.tsx       |  4 ++--
 src/app/(auth-state)/admin/uploads/page.tsx |  4 ++--
 src/cache/index.ts                          | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/app/(auth-state)/admin/layout.tsx b/src/app/(auth-state)/admin/layout.tsx
index 81fb5acb..ff0d75e8 100644
--- a/src/app/(auth-state)/admin/layout.tsx
+++ b/src/app/(auth-state)/admin/layout.tsx
@@ -1,6 +1,6 @@
 import AdminNav from '@/admin/AdminNav';
 import {
-  getBlobUploadUrlsCached,
+  getBlobUploadUrlsNoStore,
   getPhotosCountIncludingHiddenCached,
   getUniqueTagsCached,
 } from '@/cache';
@@ -21,7 +21,7 @@ export default async function AdminLayout({
     countTags,
   ] = await Promise.all([
     getPhotosCountIncludingHiddenCached(),
-    getBlobUploadUrlsCached().then(urls => urls.length),
+    getBlobUploadUrlsNoStore().then(urls => urls.length),
     getUniqueTagsCached().then(tags => tags.length),
   ]);
 
diff --git a/src/app/(auth-state)/admin/uploads/page.tsx b/src/app/(auth-state)/admin/uploads/page.tsx
index ac7fa961..2a481463 100644
--- a/src/app/(auth-state)/admin/uploads/page.tsx
+++ b/src/app/(auth-state)/admin/uploads/page.tsx
@@ -1,9 +1,9 @@
 import BlobUrls from '@/admin/BlobUrls';
-import { getBlobUploadUrlsCached } from '@/cache';
+import { getBlobUploadUrlsNoStore } from '@/cache';
 import SiteGrid from '@/components/SiteGrid';
 
 export default async function UploadsPage() {
-  const blobUrls = await getBlobUploadUrlsCached();
+  const blobUrls = await getBlobUploadUrlsNoStore();
   return (
     <SiteGrid
       contentMain={<BlobUrls urls={blobUrls} />}
diff --git a/src/cache/index.ts b/src/cache/index.ts
index 003efd97..e2a1a170 100644
--- a/src/cache/index.ts
+++ b/src/cache/index.ts
@@ -1,4 +1,9 @@
-import { revalidatePath, revalidateTag, unstable_cache } from 'next/cache';
+import {
+  revalidatePath,
+  revalidateTag,
+  unstable_cache,
+  unstable_noStore,
+} from 'next/cache';
 import {
   GetPhotosOptions,
   getPhoto,
@@ -253,16 +258,21 @@ export const getUniqueFilmSimulationsCached: typeof getUniqueFilmSimulations = (
 export const getBlobUploadUrlsCached: typeof getBlobUploadUrls = (...args) =>
   unstable_cache(
     () => getBlobUploadUrls(...args),
-    [KEY_BLOB], {
-      tags: [KEY_BLOB],
+    [KEY_BLOB, 'uploads'], {
+      tags: [KEY_BLOB, 'uploads'],
     }
   )();
 
+export const getBlobUploadUrlsNoStore: typeof getBlobUploadUrls = (...args) => {
+  unstable_noStore();
+  return getBlobUploadUrls(...args);
+};
+
 export const getBlobPhotoUrlsCached: typeof getBlobPhotoUrls = (...args) =>
   unstable_cache(
     () => getBlobPhotoUrls(...args),
-    [KEY_BLOB], {
-      tags: [KEY_BLOB],
+    [KEY_BLOB, 'photos'], {
+      tags: [KEY_BLOB, 'photos'],
     }
   )();