Merge pull request #192 from penumbra-zone/landing-caching-fix

FIX: landing page caching stale fetch data
penumbra-zone · Sep 12, 2024 · 1268001 · 1268001
2 parents 06e7e6c + 5687443
commit 1268001
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/apps/web/src/app/(index)/page.tsx b/apps/web/src/app/(index)/page.tsx
@@ -55,15 +55,15 @@ export default function Home() {
 
   Promise.all([
     queryClient.prefetchQuery({
-      queryFn: () => getTransactions({ endpoint: transactionEndpoint, pageIndex: 0 }),
+      queryFn: () => getTransactions({ endpoint: transactionEndpoint, pageIndex: 0, cached: false }),
       queryKey: [transactionsQuery, 0],
       staleTime: 0,
       meta: {
         errorMessage,
       },
     }),
     queryClient.prefetchQuery({
-      queryFn: () => getBlocks({ endpoint: blocksEndpoint, pageIndex: 0 }),
+      queryFn: () => getBlocks({ endpoint: blocksEndpoint, pageIndex: 0, cached: false }),
       queryKey: [blocksQuery, 0],
       staleTime: 0,
       meta: {

diff --git a/apps/web/src/components/BlocksTable/getBlocks.ts b/apps/web/src/components/BlocksTable/getBlocks.ts
@@ -1,10 +1,11 @@
 import { getBaseURL } from "@/lib/utils";
 import { BlocksTableQuery } from "@/lib/validators/table";
 
-export async function getBlocks ({ endpoint, pageIndex } : ({ endpoint: string, pageIndex: number })) {
+export async function getBlocks ({ endpoint, pageIndex, cached = true } : ({ endpoint: string, pageIndex: number, cached?: boolean })) {
   const baseUrl = getBaseURL();
   console.log(`Fetching: GET ${baseUrl}/${endpoint}/?page=${pageIndex}`);
-  const res = await fetch(`${baseUrl}/${endpoint}?page=${pageIndex}`, { method: "GET" });
+
+  const res = await fetch(`${baseUrl}/${endpoint}?page=${pageIndex}`, { method: "GET", cache: ( cached ? "default" : "no-store") });
   const json = await res.json();
 
   console.log("Fetched result:", json);

diff --git a/apps/web/src/components/PreviewTable/index.tsx b/apps/web/src/components/PreviewTable/index.tsx
@@ -52,9 +52,10 @@ export function PreviewTable ({
     }
   } = useSuspenseQuery({
     queryKey: [queryName, pageIndex],
-    queryFn: () => getFn({ endpoint, pageIndex }),
+    queryFn: () => getFn({ endpoint, pageIndex, cached: false }),
+    // staleTime: 0,
     // refresh preview data every 15 seconds
-    refetchInterval: 15 * 1000,
+    refetchInterval: 10 * 1000,
     meta: {
       errorMessage,
     },

diff --git a/apps/web/src/components/TransactionsTable/getTransactions.ts b/apps/web/src/components/TransactionsTable/getTransactions.ts
@@ -1,10 +1,10 @@
 import { getBaseURL } from "@/lib/utils";
 import { TransactionsTableData } from "@/lib/validators/table";
 
-export async function getTransactions({ endpoint, pageIndex } : { endpoint: string, pageIndex: number}) {
+export async function getTransactions({ endpoint, pageIndex, cached = true } : { endpoint: string, pageIndex: number, cached?: boolean}) {
   const baseUrl = getBaseURL();
   console.log(`Fetching: POST ${baseUrl}/${endpoint}?page=${pageIndex}`);
-  const res = await fetch(`${baseUrl}/${endpoint}?page=${pageIndex}`, { method: "GET" });
+  const res = await fetch(`${baseUrl}/${endpoint}?page=${pageIndex}`, { method: "GET", cache: ( cached ? "default" : "no-store") });
   const json = await res.json();
   console.log("Fetched Result:", json);
   const result = TransactionsTableData.safeParse(json);