Merge branch '1.x' into feature/SUP-190--textAreaParagraph

SU-SWS · May 10, 2024 · 89b7f0f · 89b7f0f
2 parents 620d926 + d2113a9
commit 89b7f0f
Show file tree

Hide file tree

Showing 62 changed files with 4,374 additions and 3,653 deletions.
diff --git a/app/@modal/(.)gallery/[...uuid]/page.tsx b/app/@modal/(.)gallery/[...uuid]/page.tsx
@@ -4,14 +4,14 @@ import Link from "@components/elements/link";
 import {ParagraphStanfordGallery} from "@lib/gql/__generated__/drupal.d";
 import {graphqlClient} from "@lib/gql/gql-client";
 import {notFound} from "next/navigation";
-import {useId} from "react";
+import crypto from "crypto";
 
 type Props = {
   params: { uuid: string[] }
 }
 
 const Page = async ({params: {uuid}}: Props) => {
-  const captionId = useId();
+  const captionId = crypto.randomBytes(4).toString("hex")
   const [paragraphId, mediaUuid] = uuid
 
   const paragraphQuery = await graphqlClient().Paragraph({uuid: paragraphId});

diff --git a/app/[...slug]/metadata.tsx b/app/[...slug]/metadata.tsx
@@ -2,7 +2,7 @@ import {Maybe, NodeStanfordEvent, NodeStanfordNews, NodeStanfordPage, NodeStanfo
 import {Metadata} from "next";
 import {decode} from "html-entities";
 
-export const getNodeMetadata = (node: NodeUnion): Metadata => {
+export const getNodeMetadata = (node: NodeUnion, page: "excerpt" | "copy-requests" | "detail" = "detail"): Metadata => {
   const defaultData = {
     title: node.title + " | Stanford University Press",
     other: {}
@@ -40,19 +40,30 @@ export const getNodeMetadata = (node: NodeUnion): Metadata => {
 
     case "NodeSupBook":
       return {
-        ...getBookMetaData(node),
-        ...defaultData
+        ...defaultData,
+        ...getBookMetaData(node, page),
       }
   }
 
   return defaultData;
 }
 
-const getBookMetaData = (node: NodeSupBook) => {
+const getBookMetaData = (node: NodeSupBook, page: "excerpt" | "copy-requests" | "detail") => {
   const image = node.supBookImage?.mediaImage;
-  const description = getCleanDescription(node.supBookDescription?.processed);
+  let description = getCleanDescription(node.supBookDescription?.processed);
+
+  let title = node.title;
+  if (page === "excerpt") {
+    title += ": Excerpt & More"
+    description = getFirstText(node.supBookExcerpts);
+  }
+  if (page === "copy-requests") {
+    title += ": Copy Requests"
+    description = `Instructions to get copy requests of the book "${node.title}"`
+  }
 
   return {
+    title: title,
     description: description,
     openGraph: {
       type: "book",

diff --git a/app/[...slug]/page.tsx b/app/[...slug]/page.tsx
@@ -5,25 +5,39 @@ import {getAllNodes, getEntityFromPath} from "@lib/gql/gql-queries";
 import {getNodeMetadata} from "./metadata";
 import {notFound, redirect} from "next/navigation";
 import {getPathFromContext, PageProps} from "@lib/drupal/utils";
+import SupBookExcerptPage from "@components/nodes/pages/sup-book/sup-book-excerpt-page";
+import SupBookDeskExaminationPage from "@components/nodes/pages/sup-book/sup-book-desk-examination-page";
 
 // https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config
 export const revalidate = false;
 export const dynamic = "force-static";
 
 const Page = async ({params}: PageProps) => {
-  const {redirect: redirectPath, entity, error} = await getEntityFromPath<NodeUnion>(getPathFromContext({params}))
+  const {path, page} = getBookPageRequested(getPathFromContext({params}))
+
+  const {redirect: redirectPath, entity, error} = await getEntityFromPath<NodeUnion>(path)
 
   if (error) throw new Error(error);
   if (redirectPath?.url) redirect(redirectPath.url)
   if (!entity) notFound();
 
+  if (entity.__typename === "NodeSupBook") {
+    if (page === "excerpt") return entity.supBookExcerpts ? <SupBookExcerptPage node={entity}/> : notFound();
+    if (page === "copy-requests") return <SupBookDeskExaminationPage node={entity}/>
+  }
+
   return <NodePage node={entity}/>
 }
 
 export const generateMetadata = async ({params}: PageProps): Promise<Metadata> => {
-  const path = getPathFromContext({params})
+  const {path, page} = getBookPageRequested(getPathFromContext({params}))
   const {entity} = await getEntityFromPath<NodeUnion>(path)
-  return entity ? getNodeMetadata(entity) : {};
+
+  if (entity?.__typename === "NodeSupBook" && (page === "excerpt" || page === "copy-requests")) {
+    return getNodeMetadata(entity, page)
+  }
+
+  return entity ? getNodeMetadata(entity, "detail") : {};
 }
 
 export const generateStaticParams = async (): Promise<PageProps["params"][]> => {
@@ -32,4 +46,18 @@ export const generateStaticParams = async (): Promise<PageProps["params"][]> =>
   return nodePaths.map(node => ({slug: node.path.split("/").filter(part => !!part)}));
 }
 
+
+// Auxiliary pages for the book pages.
+const getBookPageRequested = (path: string): { path: string, page: "excerpt" | "copy-requests" | "detail" } => {
+  if (path.endsWith("/excerpts")) {
+    return {path: path.replace(/\/excerpts$/, ""), page: "excerpt"}
+  }
+
+  if (path.endsWith("/desk-examination-copy-requests")) {
+    return {path: path.replace(/\/desk-examination-copy-requests$/, ""), page: "copy-requests"}
+  }
+
+  return {path, page: "detail"}
+}
+
 export default Page;
diff --git a/app/books/awards/page.tsx b/app/books/awards/page.tsx
@@ -0,0 +1,12 @@
+import {notFound, redirect} from "next/navigation";
+import {getBookFromWorkId} from "../getBookFromWorkId";
+
+const LegacyAwardPage = async ({searchParams}: { searchParams?: { [_key: string]: string } }) => {
+  if (!searchParams || !searchParams.id) notFound();
+  const bookNode = await getBookFromWorkId(parseInt(searchParams.id))
+
+  if (bookNode) redirect(bookNode.path);
+  notFound();
+}
+
+export default LegacyAwardPage;
diff --git a/app/books/comp/page.tsx b/app/books/comp/page.tsx
@@ -0,0 +1,12 @@
+import {notFound, redirect} from "next/navigation";
+import {getBookFromWorkId} from "../getBookFromWorkId";
+
+const LegacyBookPage = async ({searchParams}: { searchParams?: { [_key: string]: string } }) => {
+  if (!searchParams || !searchParams.id) notFound();
+  const bookNode = await getBookFromWorkId(parseInt(searchParams.id))
+
+  if (bookNode) redirect(`${bookNode.path}/desk-examination-copy-requests`);
+  notFound();
+}
+
+export default LegacyBookPage;
diff --git a/app/books/getBookFromWorkId.tsx b/app/books/getBookFromWorkId.tsx
@@ -0,0 +1,18 @@
+import {BooksQuery, NodeSupBook} from "@lib/gql/__generated__/drupal";
+import {graphqlClient} from "@lib/gql/gql-client";
+
+export const getBookFromWorkId = async (workId: number): Promise<NodeSupBook | undefined> => {
+  let fetchMore = true;
+  let query: BooksQuery;
+  let afterCursor = null;
+  let desiredNode: NodeSupBook | undefined;
+  while (fetchMore) {
+    query = await graphqlClient({next: {tags: ["views:sup_books"]}}).Books({after: afterCursor})
+
+    desiredNode = query.nodeSupBooks.nodes.find(node => node.supBookWorkIdNumber === workId) as NodeSupBook | undefined;
+
+    fetchMore = query.nodeSupBooks.pageInfo.hasNextPage && !desiredNode
+    afterCursor = query.nodeSupBooks.pageInfo.endCursor;
+  }
+  return desiredNode;
+}
diff --git a/app/books/title/page.tsx b/app/books/title/page.tsx
@@ -1,26 +1,11 @@
-import {BooksQuery} from "@lib/gql/__generated__/drupal";
-import {graphqlClient} from "@lib/gql/gql-client";
 import {notFound, redirect} from "next/navigation";
+import {getBookFromWorkId} from "../getBookFromWorkId";
 
 const LegacyBookPage = async ({searchParams}: { searchParams?: { [_key: string]: string } }) => {
-  // Fetch all the books, sort by authors, and then build pagination and side alpha selection.
-  let fetchMore = true;
-  let query: BooksQuery;
-  let afterCursor = null;
-  let destinationUrl: string | undefined;
-
   if (!searchParams || !searchParams.id) notFound();
-  const workId = parseInt(searchParams.id);
-
-  while (fetchMore) {
-    query = await graphqlClient({next: {tags: ["views:sup_books"]}}).Books({after: afterCursor})
-
-    destinationUrl = query.nodeSupBooks.nodes.find(node => node.supBookWorkIdNumber && node.supBookWorkIdNumber === workId)?.path;
+  const bookNode = await getBookFromWorkId(parseInt(searchParams.id))
 
-    fetchMore = query.nodeSupBooks.pageInfo.hasNextPage && !destinationUrl
-    afterCursor = query.nodeSupBooks.pageInfo.endCursor;
-  }
-  if (destinationUrl) redirect(destinationUrl);
+  if (bookNode) redirect(bookNode.path);
   notFound();
 }
 

diff --git a/app/search/page.tsx b/app/search/page.tsx
@@ -1,8 +1,8 @@
 import {H1} from "@components/elements/headers";
 import {getConfigPage} from "@lib/gql/gql-queries";
 import {StanfordBasicSiteSetting} from "@lib/gql/__generated__/drupal.d";
-import AlgoliaSearch from "./algolia-search";
 import {IndexUiState} from "instantsearch.js/es/types/ui-state";
+import AlgoliaSearchForm from "@components/algolia-search/algolia-search-form";
 
 // https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config
 export const revalidate = false;
@@ -20,26 +20,26 @@ const Page = async ({searchParams}: { searchParams?: { [_key: string]: string }
 
   const siteSettingsConfig = await getConfigPage<StanfordBasicSiteSetting>("StanfordBasicSiteSetting")
 
-  const initialState: IndexUiState = {}
+  const initialState: IndexUiState = {refinementList: {}}
   if (searchParams?.q) initialState.query = searchParams.q as string
-  if (searchParams?.subjects) {
-    initialState.refinementList = {book_subject: searchParams.subjects.split(",")}
+  if (searchParams?.subjects && initialState.refinementList) {
+    initialState.refinementList.book_subject = searchParams.subjects.split(",")
   }
-  if (!!searchParams?.books) {
-    initialState.refinementList = {book_type: ["book"]}
+  if (!!searchParams?.books && initialState.refinementList) {
+    initialState.refinementList.book_type = ["book"]
   }
   if (searchParams?.["published-min"] || searchParams?.["published-max"]) {
     initialState.range = {book_published: (searchParams["published-min"] || "0") + ":" + (searchParams["published-max"] || "3000")}
   }
 
   return (
     <div className="centered mt-32">
-      <div className="lg:w-4/5 mx-auto">
+      <div className="lg:w-9/12 mx-auto">
         <H1 className="mb-44" id="page-title">Search</H1>
 
         {(siteSettingsConfig?.suSiteAlgoliaId && siteSettingsConfig?.suSiteAlgoliaIndex && siteSettingsConfig?.suSiteAlgoliaSearch) &&
           <>
-            <AlgoliaSearch
+            <AlgoliaSearchForm
               appId={siteSettingsConfig.suSiteAlgoliaId}
               searchIndex={siteSettingsConfig.suSiteAlgoliaIndex}
               searchApiKey={siteSettingsConfig.suSiteAlgoliaSearch}

diff --git a/app/sitemap.tsx b/app/sitemap.tsx
@@ -10,12 +10,24 @@ const Sitemap = async (): Promise<MetadataRoute.Sitemap> => {
 
   const sitemap: MetadataRoute.Sitemap = [];
 
-  nodes.map(node => sitemap.push({
-    url: `https://sup.org${node.path}`,
-    lastModified: new Date(node.changed.time),
-    priority: node.__typename === "NodeStanfordPage" ? 1 : .8,
-    changeFrequency: node.__typename === "NodeStanfordPage" ? "weekly": "monthly"
-  }));
+  nodes.map(node => {
+    sitemap.push({
+      url: `https://sup.org${node.path}`,
+      lastModified: new Date(node.changed.time),
+      priority: node.__typename === "NodeStanfordPage" ? 1 : .8,
+      changeFrequency: node.__typename === "NodeStanfordPage" ? "weekly" : "monthly"
+    })
+
+    // Add excerpts page for each book as appropriate.
+    if (node.__typename === "NodeSupBook" && node.supBookExcerpts) {
+      sitemap.push({
+        url: `https://sup.org${node.path}/excerpts`,
+        lastModified: new Date(node.changed.time),
+        priority: .8,
+        changeFrequency: "monthly"
+      })
+    }
+  });
 
   return sitemap;
 }

diff --git a/package.json b/package.json
@@ -16,10 +16,10 @@
     "@formkit/auto-animate": "^0.8.2",
     "@heroicons/react": "^2.1.3",
     "@js-temporal/polyfill": "^0.4.4",
-    "@mui/base": "^5.0.0-beta.42",
+    "@mui/base": "^5.0.0-beta.44",
     "@next/third-parties": "^14.2.3",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.12.11",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "algoliasearch": "^4.23.3",
@@ -37,13 +37,14 @@
     "html-react-parser": "^5.1.10",
     "next": "^14.2.3",
     "next-drupal": "^1.6.0",
+    "plaiceholder": "^3.0.0",
     "postcss": "^8.4.38",
     "qs": "^6.12.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-focus-lock": "^2.12.1",
-    "react-instantsearch": "^7.7.3",
-    "react-instantsearch-nextjs": "^0.2.2",
+    "react-instantsearch": "^7.8.0",
+    "react-instantsearch-nextjs": "^0.2.3",
     "react-slick": "^0.30.2",
     "react-tiny-oembed": "^1.1.0",
     "sharp": "^0.33.3",
@@ -59,13 +60,13 @@
     "@graphql-codegen/typescript-graphql-request": "^6.2.0",
     "@graphql-codegen/typescript-operations": "^4.2.0",
     "@next/bundle-analyzer": "^14.2.3",
-    "@storybook/addon-essentials": "^8.0.9",
-    "@storybook/addon-interactions": "^8.0.9",
-    "@storybook/addon-links": "^8.0.9",
+    "@storybook/addon-essentials": "^8.0.10",
+    "@storybook/addon-interactions": "^8.0.10",
+    "@storybook/addon-links": "^8.0.10",
     "@storybook/addon-styling": "^1.3.7",
-    "@storybook/blocks": "^8.0.9",
-    "@storybook/nextjs": "^8.0.9",
-    "@storybook/react": "^8.0.9",
+    "@storybook/blocks": "^8.0.10",
+    "@storybook/nextjs": "^8.0.10",
+    "@storybook/react": "^8.0.10",
     "@storybook/testing-library": "^0.2.2",
     "@types/react-slick": "^0.23.13",
     "concurrently": "^8.2.2",
@@ -74,7 +75,7 @@
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "react-docgen": "^7.0.3",
-    "storybook": "^8.0.9",
+    "storybook": "^8.0.10",
     "tsconfig-paths-webpack-plugin": "^4.1.0"
   },
   "packageManager": "yarn@4.1.1"