second round of feedback

NYPL · Dec 11, 2024 · 6981a26 · 6981a26
1 parent f7adce1
commit 6981a26
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git a/app/collections/page.tsx b/app/collections/page.tsx
@@ -6,7 +6,7 @@ import { redirect } from "next/navigation";
 
 export type CollectionsProps = {
   params: { slug: string };
-  searchParams: { page: string; sort: string; collection_keyword: string };
+  searchParams: { page: string; sort: string; collection_keywords: string };
 };
 
 export const metadata: Metadata = {
@@ -18,10 +18,10 @@ export const metadata: Metadata = {
 
 export default async function Collections({ searchParams }: CollectionsProps) {
   const data = await getCollectionsData({
-    keyword: searchParams.collection_keyword,
+    keyword: searchParams.collection_keywords,
     sortID: searchParams.sort,
     pageNum: searchParams.page,
-  }); // TODO: create model for APICollectionsData from API to clean up the data before it's sent down to the components.
+  });
 
   // Repo API returns 404s within the data.
   if (
@@ -33,7 +33,6 @@ export default async function Collections({ searchParams }: CollectionsProps) {
 
   return (
     <Suspense>
-      {/* pass entire Repo API Response */}
       <CollectionsPage data={data} params={searchParams} />
     </Suspense>
   );

diff --git a/app/src/components/pages/collectionsPage/collectionsPage.tsx b/app/src/components/pages/collectionsPage/collectionsPage.tsx
@@ -62,17 +62,19 @@ export function CollectionsPage({ data, params }) {
     setTimeout(() => {
       setIsLoaded(true);
       headingRef.current?.focus();
-    }, 2000);
+    }, 1000);
   };
 
   const handleSearchSubmit = async (e: SyntheticEvent) => {
     e.preventDefault();
+    // something is so weird about state here.
+    // change the values in the object passed down to createCollectionsQueryStringFromObject to be currentPage and currentSort and tell me if it works for you....
     setCurrentPage(Number(DEFAULT_PAGE_NUM));
     setCurrentSort(DEFAULT_COLLECTION_SORT);
     const queryString = createCollectionsQueryStringFromObject({
       collection_keywords: currentCollectionKeywords,
-      sort: currentSort,
-      page: currentPage,
+      sort: DEFAULT_COLLECTION_SORT,
+      page: DEFAULT_PAGE_NUM,
     });
     updateURL(queryString);
   };
@@ -82,7 +84,6 @@ export function CollectionsPage({ data, params }) {
     setcurrentCollectionKeywords(target.value);
   };
 
-  // pagination
   const onPageChange = async (pageNumber: number) => {
     setCurrentPage(pageNumber);
     const queryString = createCollectionsQueryStringFromObject({
@@ -93,7 +94,6 @@ export function CollectionsPage({ data, params }) {
     updateURL(queryString);
   };
 
-  // sort
   const onMenuClick = async (id) => {
     setCurrentSort(id);
     const queryString = createCollectionsQueryStringFromObject({

diff --git a/app/src/components/results/noResultsFound.tsx b/app/src/components/results/noResultsFound.tsx
@@ -2,15 +2,10 @@ import {
   Flex,
   Heading,
   Text,
-  Link,
   List,
 } from "@nypl/design-system-react-components";
-import Image from "next/image";
-import useBreakpoints from "@/src/hooks/useBreakpoints";
-import { useFeedbackContext } from "@/src/context/FeedbackProvider";
 
 export default function NoResultsFound({ searchTerm }) {
-  console.log("searchTerm is: ", searchTerm);
   const headingText = `No Results for "${searchTerm}"`;
   return (
     <Flex

diff --git a/app/src/utils/utils.ts b/app/src/utils/utils.ts
@@ -131,28 +131,25 @@ export function displayResults(
 
 export const createQueryStringFromObject = (paramObj) => {
   const params = new URLSearchParams();
-  Object.keys(paramObj).map((name, value) => {
-    params.set(
-      name.toString(),
-      name === "page" ? paramObj[name].toString() : paramObj[name]
-    );
+  Object.keys(paramObj).forEach((name) => {
+    params.set(name.toString(), paramObj[name]);
   });
   return params.toString();
 };
 
 export const createCollectionsQueryStringFromObject = (paramObj) => {
   const newParams = {};
-  Object.keys(paramObj).map((key) => {
-    if (
-      !(
-        paramObj[key] === DEFAULT_SEARCH_TERM ||
-        paramObj[key] === DEFAULT_PAGE_NUM ||
-        paramObj[key] === DEFAULT_PAGE_NUM.toString() ||
-        paramObj[key] === DEFAULT_COLLECTION_SORT
-      )
-    ) {
+  const defaultValues = [
+    DEFAULT_SEARCH_TERM,
+    DEFAULT_PAGE_NUM,
+    DEFAULT_PAGE_NUM.toString(),
+    DEFAULT_COLLECTION_SORT,
+  ];
+  Object.keys(paramObj).forEach((key) => {
+    if (!defaultValues.includes(paramObj[key])) {
       newParams[key] = paramObj[key];
     }
   });
+
   return createQueryStringFromObject(newParams);
 };