Merge pull request #908 from MuckRock/cache-typo

Header is cache-control, not max-age
MuckRock · Dec 1, 2024 · 2eae3bc · 2eae3bc
2 parents ac7226a + 111acfc
commit 2eae3bc
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/src/lib/components/documents/stories/ResultsList.stories.svelte b/src/lib/components/documents/stories/ResultsList.stories.svelte
@@ -48,9 +48,11 @@
   </ResultsList>
 </Story>
 
-<Story name="Highlighted">
-  <ResultsList results={highlighted} {count} {next} />
-</Story>
+<!-- too big to render
+  <Story name="Highlighted">
+    <ResultsList results={highlighted} {count} {next} />
+  </Story>
+-->
 
 <Story name="Unverified user">
   <ResultsList {results} {count} {next}>

diff --git a/src/routes/(app)/add-ons/+layout.ts b/src/routes/(app)/add-ons/+layout.ts
@@ -9,7 +9,7 @@ export async function load({ parent, setHeaders }) {
 
   if (!me) {
     setHeaders({
-      "max-age": `public, max-age=${VIEWER_MAX_AGE}`,
+      "cache-control": `public, max-age=${VIEWER_MAX_AGE}`,
     });
   }
 

diff --git a/src/routes/(app)/documents/+layout.ts b/src/routes/(app)/documents/+layout.ts
@@ -1,19 +1,10 @@
 import { breadcrumbTrail } from "$lib/utils/navigation";
 
-import { VIEWER_MAX_AGE } from "@/config/config.js";
-
-export async function load({ parent, setHeaders }) {
-  const { me } = await parent();
+export async function load({ parent }) {
   const breadcrumbs = await breadcrumbTrail(parent, [
     { href: "/documents/", title: "Documents" },
   ]);
 
-  if (!me) {
-    setHeaders({
-      "max-age": `public, max-age=${VIEWER_MAX_AGE}`,
-    });
-  }
-
   return {
     breadcrumbs,
   };

diff --git a/src/routes/(app)/documents/+page.ts b/src/routes/(app)/documents/+page.ts
@@ -1,9 +1,9 @@
 import type { SearchOptions } from "$lib/api/types";
 
-import { DEFAULT_PER_PAGE } from "@/config/config.js";
+import { DEFAULT_PER_PAGE, VIEWER_MAX_AGE } from "@/config/config.js";
 import { search } from "$lib/api/documents";
 
-export async function load({ url, fetch, data }) {
+export async function load({ url, fetch, data, parent, setHeaders }) {
   const query = url.searchParams.get("q") || "";
   const per_page = +(url.searchParams.get("per_page") ?? DEFAULT_PER_PAGE);
   const cursor = url.searchParams.get("cursor") || "";
@@ -23,6 +23,14 @@ export async function load({ url, fetch, data }) {
 
   const searchResults = search(query, options, fetch);
 
+  const { me } = await parent();
+
+  if (!me) {
+    setHeaders({
+      "cache-control": `public, max-age=${VIEWER_MAX_AGE}`,
+    });
+  }
+
   return {
     ...data,
     query,

diff --git a/src/routes/(app)/documents/[id]-[slug]/+page.ts b/src/routes/(app)/documents/[id]-[slug]/+page.ts
@@ -7,14 +7,20 @@ import type { ReadMode } from "@/lib/api/types";
 
 import { redirect } from "@sveltejs/kit";
 
+import { VIEWER_MAX_AGE } from "@/config/config.js";
 import * as documents from "$lib/api/documents";
 import { breadcrumbTrail } from "$lib/utils/index";
-
 import loadDocument from "$lib/load/document";
-import { getQuery } from "$lib/utils/search";
 
 /** @type {import('./$types').PageLoad} */
-export async function load({ fetch, params, parent, depends, url }) {
+export async function load({
+  fetch,
+  params,
+  parent,
+  depends,
+  url,
+  setHeaders,
+}) {
   const { document, asset_url, mode } = await loadDocument({
     fetch,
     params,
@@ -34,18 +40,25 @@ export async function load({ fetch, params, parent, depends, url }) {
 
   let action = url.searchParams.get("action");
 
-  const breadcrumbs = await breadcrumbTrail(parent, [
-    { href: canonical.pathname, title: document.title },
+  const [breadcrumbs, { me }] = await Promise.all([
+    breadcrumbTrail(parent, [
+      { href: canonical.pathname, title: document.title },
+    ]),
+    parent(),
   ]);
 
-  const query = getQuery(url);
+  if (!me) {
+    setHeaders({
+      "cache-control": `public, max-age=${VIEWER_MAX_AGE}`,
+      "last-modified": new Date(document.updated_at).toUTCString(),
+    });
+  }
 
   return {
     document,
     mode,
     asset_url,
     action,
     breadcrumbs,
-    query,
   };
 }