From 5f3e417663d8b69df0528b2e4ae4b1c0880b18af Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 20 Aug 2024 15:46:24 -0400
Subject: [PATCH 001/141] Initialize sentence case conversion

---
 __test__/pages/bib/bibPage.test.tsx           | 11 ++++----
 discoveryApiResearchNowMapping.md             |  2 +-
 .../BibPage/ElectronicResources.test.tsx      |  8 +++---
 .../BibPage/ElectronicResources.tsx           |  4 +--
 .../ItemFilters/ItemFilters.test.tsx          |  4 +--
 src/components/ItemFilters/ItemFilters.tsx    |  4 +--
 .../ItemTable/ItemTableControls.tsx           |  2 +-
 .../ElectronicResourcesLink.test.tsx          |  2 +-
 .../SearchResults/ElectronicResourcesLink.tsx |  2 +-
 .../SearchResults/SearchResult.test.tsx       |  6 ++--
 src/components/SearchResults/SearchResult.tsx |  2 +-
 src/models/Bib.ts                             |  6 ++--
 src/models/BibDetails.ts                      | 28 +++++++++----------
 src/models/ItemTableData.ts                   |  4 +--
 src/models/modelTests/BibDetails.test.ts      |  6 ++--
 .../modelTests/SearchResultsBib.test.ts       |  6 ++--
 styles/components/ItemTable.module.scss       |  2 +-
 17 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/__test__/pages/bib/bibPage.test.tsx b/__test__/pages/bib/bibPage.test.tsx
index c8f8b2d48..340f1f3cf 100644
--- a/__test__/pages/bib/bibPage.test.tsx
+++ b/__test__/pages/bib/bibPage.test.tsx
@@ -44,8 +44,9 @@ describe("Bib Page with items", () => {
     expect(screen.getByTestId("bib-details-item-table")).toBeInTheDocument()
   })
 
+  // TODO: Determine if this should be rendering twice
   it("renders the bottom bib details", () => {
-    expect(screen.getByTestId("publication-date")).toHaveTextContent(
+    expect(screen.getAllByTestId("publication-date")[0]).toHaveTextContent(
       "Vol. 1, issue 1-"
     )
     expect(screen.getByTestId("description")).toHaveTextContent(
@@ -246,7 +247,7 @@ describe("Bib Page Item Table", () => {
   })
 
   it("renders a view all button when there are more than 20 items and updates the url to /all when clicked", async () => {
-    const viewAllLink = screen.getByText("View All 26 Items").closest("a")
+    const viewAllLink = screen.getByText("View all 26 items").closest("a")
     expect(viewAllLink).toHaveAttribute(
       "href",
       "/research/research-catalog/bib/pb5579193/all"
@@ -269,7 +270,7 @@ describe("Bib Page Item Table", () => {
           }),
       })
     )
-    await userEvent.click(screen.getByText("View All 26 Items").closest("a"))
+    await userEvent.click(screen.getByText("View all 26 items").closest("a"))
     expect(screen.getByText("View fewer items")).toBeInTheDocument()
     expect(screen.getByTestId("bib-details-item-table")).toBeInTheDocument()
   })
@@ -281,7 +282,7 @@ describe("Bib Page Item Table", () => {
           setTimeout(resolve, 50)
         })
     )
-    await userEvent.click(screen.getByText("View All 26 Items").closest("a"))
+    await userEvent.click(screen.getByText("View all 26 items").closest("a"))
     expect(
       screen.getByText("Loading all 26 items. This may take a few moments...")
     ).toBeInTheDocument()
@@ -294,7 +295,7 @@ describe("Bib Page Item Table", () => {
         ok: false,
       })
     )
-    await userEvent.click(screen.getByText("View All 26 Items").closest("a"))
+    await userEvent.click(screen.getByText("View all 26 items").closest("a"))
     expect(
       screen.getByText(
         "There was an error fetching items. Please try again with a different query."
diff --git a/discoveryApiResearchNowMapping.md b/discoveryApiResearchNowMapping.md
index 0ba4f1cbe..6bb2b868f 100644
--- a/discoveryApiResearchNowMapping.md
+++ b/discoveryApiResearchNowMapping.md
@@ -131,7 +131,7 @@ e.g. `filters`) is used for the parameters the respective APIs except.
 | <ul>'Language'                                | <ul>`filters[language]`                               | <ul>`filters` `language`                        |
 | _Filters linked to from a bib page_           |
 | <ul>'Author'                                  | <ul>`filters[creatorLiteral]`                         | <ul>`queries` `"field":"author"`                |
-| <ul>'Additional Authors'                      | <ul>`filters[creatorLiteral]`                         | <ul>`queries` `"field":"author"`                |
+| <ul>'Additional authors'                      | <ul>`filters[creatorLiteral]`                         | <ul>`queries` `"field":"author"`                |
 | <ul>'Subject'                                 | <ul>`filters[subjectLiteral]`                         | <ul>`queries` `"field":"subject"`               |
 | _Pagination_                                  | `page`                                                | `page`                                          |
 |                                               | `per_page`                                            | `per_page`                                      |
diff --git a/src/components/BibPage/ElectronicResources.test.tsx b/src/components/BibPage/ElectronicResources.test.tsx
index 4070a662b..a500ac7cf 100644
--- a/src/components/BibPage/ElectronicResources.test.tsx
+++ b/src/components/BibPage/ElectronicResources.test.tsx
@@ -19,7 +19,7 @@ describe("ElectronicResources component", () => {
     })
 
     it("renders the correct heading", () => {
-      expect(screen.queryByText("Available Online")).toBeInTheDocument()
+      expect(screen.queryByText("Available online")).toBeInTheDocument()
     })
 
     it("renders 3 links and a View All button when there are more than 3 eResources", () => {
@@ -32,7 +32,7 @@ describe("ElectronicResources component", () => {
       const moreLink = screen.queryByTestId("see-more-eresources-button")
       expect(moreLink).toBeInTheDocument()
       expect(moreLink).toHaveTextContent(
-        "View all 368 Available Online resources"
+        "View all 368 available online resources"
       )
     })
 
@@ -46,7 +46,7 @@ describe("ElectronicResources component", () => {
 
       expect(eResourcesList.children).toHaveLength(368)
       expect(moreLink).toHaveTextContent(
-        "View fewer Available Online resources"
+        "View fewer available online resources"
       )
     })
   })
@@ -60,7 +60,7 @@ describe("ElectronicResources component", () => {
     })
 
     it("renders the correct heading", () => {
-      expect(screen.queryByText("Available Online")).toBeInTheDocument()
+      expect(screen.queryByText("Available online")).toBeInTheDocument()
     })
 
     it("renders all eResources and does not display a View All button", () => {
diff --git a/src/components/BibPage/ElectronicResources.tsx b/src/components/BibPage/ElectronicResources.tsx
index 06fa94799..17420bf76 100644
--- a/src/components/BibPage/ElectronicResources.tsx
+++ b/src/components/BibPage/ElectronicResources.tsx
@@ -54,7 +54,7 @@ const ElectronicResources = ({
       mt="l"
       data-testid="electronic-resources"
     >
-      <CardHeading level="three">Available Online</CardHeading>
+      <CardHeading level="three">Available online</CardHeading>
       <CardContent aria-expanded={!showMore}>
         <List
           type="ul"
@@ -83,7 +83,7 @@ const ElectronicResources = ({
             fontWeight="bold"
           >
             View {showMore ? `all ${electronicResources.length}` : "fewer"}{" "}
-            Available Online resources
+            available online resources
             <Icon
               ml="xs"
               iconRotation={`rotate${showMore ? 0 : 180}`}
diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index 1a8c3d8a8..0a72df805 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -37,11 +37,11 @@ describe("ItemFilters", () => {
   })
 
   it("renders the year search form", async () => {
-    expect(screen.getByLabelText("Search by Year")).toBeInTheDocument()
+    expect(screen.getByLabelText("Search by year")).toBeInTheDocument()
   })
 
   it("closes open filters when user clicks outside of the filter", async () => {
-    const outsideOfTheFilter = screen.getByLabelText("Search by Year")
+    const outsideOfTheFilter = screen.getByLabelText("Search by year")
 
     const locationFilterButton = screen
       .getByTestId("location-multi-select")
diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index f08acacc9..8250f4b9e 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -111,7 +111,7 @@ const ItemFilters = ({
         />
         <Box minWidth="440">
           <Label id="year-filter-label" htmlFor="searchbar-form-year-filter">
-            Search by Year
+            Search by year
           </Label>
           <SearchBar
             id="year-filter"
@@ -121,7 +121,7 @@ const ItemFilters = ({
             textInputProps={{
               placeholder: "YYYY",
               isClearable: true,
-              labelText: "Search by year",
+              labelText: "Search by year form input",
               name: "year-filter",
               value: year,
               onChange: ({ target }) => setYear(target.value),
diff --git a/src/components/ItemTable/ItemTableControls.tsx b/src/components/ItemTable/ItemTableControls.tsx
index 2031c1d18..dd053e96e 100644
--- a/src/components/ItemTable/ItemTableControls.tsx
+++ b/src/components/ItemTable/ItemTableControls.tsx
@@ -105,7 +105,7 @@ const ItemTableControls = ({
               <Box as="span" mr="xxs">
                 {viewAllExpanded
                   ? "View fewer items"
-                  : `View All ${bib.getNumItemsMessage(filtersAreApplied)}`}
+                  : `View all ${bib.getNumItemsMessage(filtersAreApplied)}`}
               </Box>
               <Icon
                 iconRotation={viewAllExpanded ? "rotate180" : "rotate0"}
diff --git a/src/components/SearchResults/ElectronicResourcesLink.test.tsx b/src/components/SearchResults/ElectronicResourcesLink.test.tsx
index 3f69a5141..4f29ebda9 100644
--- a/src/components/SearchResults/ElectronicResourcesLink.test.tsx
+++ b/src/components/SearchResults/ElectronicResourcesLink.test.tsx
@@ -20,7 +20,7 @@ describe("Electronic Resources Link with a single resource", () => {
   })
 
   it("renders the correct heading", async () => {
-    expect(screen.getByText("Available Online")).toBeInTheDocument()
+    expect(screen.getByText("Available online")).toBeInTheDocument()
   })
   it("renders the correct link with the label as the text when only one electronic resource is available", async () => {
     const link = screen.getByRole("link", {
diff --git a/src/components/SearchResults/ElectronicResourcesLink.tsx b/src/components/SearchResults/ElectronicResourcesLink.tsx
index 2370378b3..e99714455 100644
--- a/src/components/SearchResults/ElectronicResourcesLink.tsx
+++ b/src/components/SearchResults/ElectronicResourcesLink.tsx
@@ -30,7 +30,7 @@ const ElectronicResourcesLink = ({
         fontSize={{ base: "mobile.body.body1", md: "desktop.body.body1" }}
         fontWeight="bold"
       >
-        Available Online
+        Available online
       </Text>
       {electronicResources.length === 1 ? (
         <ExternalLink
diff --git a/src/components/SearchResults/SearchResult.test.tsx b/src/components/SearchResults/SearchResult.test.tsx
index a23bd82ea..0841379c2 100644
--- a/src/components/SearchResults/SearchResult.test.tsx
+++ b/src/components/SearchResults/SearchResult.test.tsx
@@ -27,7 +27,7 @@ describe("SearchResult with Physical Items", () => {
     screen.getByText("Material")
     screen.getByText("New York, Abelard-Schuman [1955]")
     screen.getByText("1955")
-    screen.getByText("2 Items")
+    screen.getByText("2 items")
   })
 })
 
@@ -41,7 +41,7 @@ describe("SearchResult with Many Physical Items", () => {
 
   it("renders a link to the bib page with the correct text when there are more than the set limit of items per search result", async () => {
     const resultTitleLink = screen.getByRole("link", {
-      name: "View All 4 Items",
+      name: "View all 4 items",
     })
     expect(resultTitleLink).toHaveAttribute(
       "href",
@@ -54,6 +54,6 @@ describe("SearchResult with Electronic Resources", () => {
   it("renders the correct item message for bib with electronic resources", async () => {
     const bib = new SearchResultsBib(searchResultElectronicResources)
     render(<SearchResult bib={bib} />)
-    screen.getByText("1 Resource")
+    screen.getByText("1 resource")
   })
 })
diff --git a/src/components/SearchResults/SearchResult.tsx b/src/components/SearchResults/SearchResult.tsx
index 03cfd23c4..770088c74 100644
--- a/src/components/SearchResults/SearchResult.tsx
+++ b/src/components/SearchResults/SearchResult.tsx
@@ -72,7 +72,7 @@ const SearchResult = ({ bib }: SearchResultProps) => {
                     fontWeight="medium"
                     type="standalone"
                   >
-                    {`View All ${bib.getNumItemsMessage()} `}
+                    {`View all ${bib.getNumItemsMessage()} `}
                   </RCLink>
                 </CardActions>
               )}
diff --git a/src/models/Bib.ts b/src/models/Bib.ts
index fe91142eb..accc0f398 100644
--- a/src/models/Bib.ts
+++ b/src/models/Bib.ts
@@ -94,9 +94,9 @@ export default class Bib {
 
   getNumItemsMessage(filtersAreApplied = false) {
     const totalItems = filtersAreApplied ? this.numItemsMatched : this.numItems
-    return `${totalItems} ${filtersAreApplied ? "matching " : ""}${
-      this.resourceType
-    }${totalItems !== 1 ? "s" : ""}`
+    return `${totalItems} ${
+      filtersAreApplied ? "matching " : ""
+    }${this.resourceType.toLowerCase()}${totalItems !== 1 ? "s" : ""}`
   }
 
   getItemsViewAllLoadingMessage(filtersAreApplied = false) {
diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index a5c6e5226..e43d53cfc 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -65,8 +65,8 @@ export default class BibDetails {
         return [
           { label: "Location", field: "location" },
           { label: "Format", field: "format" },
-          { label: "Call Number", field: "shelfMark" },
-          { label: "Library Has", field: "holdingStatement" },
+          { label: "Call number", field: "shelfMark" },
+          { label: "Library has", field: "holdingStatement" },
           { label: "Notes", field: "notes" },
         ]
           .map((fieldMapping) => this.buildHoldingDetail(holding, fieldMapping))
@@ -78,9 +78,9 @@ export default class BibDetails {
   buildTopDetails(): AnyBibDetail[] {
     return [
       { field: "titleDisplay", label: "Title" },
-      { field: "publicationStatement", label: "Published By" },
+      { field: "publicationStatement", label: "Published by" },
       // external link
-      { field: "supplementaryContent", label: "Supplementary Content" },
+      { field: "supplementaryContent", label: "Supplementary content" },
       // internal link
       { field: "creatorLiteral", label: "Author" },
     ]
@@ -95,25 +95,25 @@ export default class BibDetails {
   }
   buildBottomDetails(): AnyBibDetail[] {
     const resourceFields = [
-      { field: "contributorLiteral", label: "Additional Authors" },
-      { field: "partOf", label: "Found In" },
-      { field: "serialPublicationDates", label: "Publication Date" },
+      { field: "contributorLiteral", label: "Additional authors" },
+      { field: "partOf", label: "Found in" },
+      { field: "serialPublicationDates", label: "Publication date" },
       { field: "extent", label: "Description" },
       { field: "description", label: "Summary" },
       { field: "donor", label: "Donor/Sponsor" },
-      { field: "seriesStatement", label: "Series Statement" },
-      { field: "uniformTitle", label: "Uniform Title" },
-      { field: "titleAlt", label: "Alternative Title" },
-      { field: "formerTitle", label: "Former Title" },
+      { field: "seriesStatement", label: "Series statement" },
+      { field: "uniformTitle", label: "Uniform title" },
+      { field: "titleAlt", label: "Alternative title" },
+      { field: "formerTitle", label: "Former title" },
       { field: "subjectLiteral", label: "Subject" },
       { field: "genreForm", label: "Genre/Form" },
       { field: "tableOfContents", label: "Contents" },
-      { field: "shelfMark", label: "Call Number" },
+      { field: "shelfMark", label: "Call number" },
       { field: "isbn", label: "ISBN" },
       { field: "issn", label: "ISSN" },
       { field: "oclc", label: "OCLC" },
       { field: "lccn", label: "LCCN" },
-      { field: "owner", label: "Owning Institution" },
+      { field: "owner", label: "Owning institution" },
     ]
       .map((fieldMapping: FieldMapping): AnyBibDetail => {
         let detail: AnyBibDetail
@@ -333,7 +333,7 @@ export default class BibDetails {
     ) {
       return null
     }
-    const label = "Supplementary Content"
+    const label = "Supplementary content"
     const values = this.bib.supplementaryContent.map((sc) => {
       return {
         url: sc.url,
diff --git a/src/models/ItemTableData.ts b/src/models/ItemTableData.ts
index 112363110..6409bdf66 100644
--- a/src/models/ItemTableData.ts
+++ b/src/models/ItemTableData.ts
@@ -35,8 +35,8 @@ export default class ItemTableData {
       ...(this.showVolumeColumn() ? [this.volumeColumnHeading()] : []),
       "Format",
       ...(this.showAccessColumn() ? ["Access"] : []),
-      "Call Number",
-      "Item Location",
+      "Call number",
+      "Item location",
     ]
   }
 
diff --git a/src/models/modelTests/BibDetails.test.ts b/src/models/modelTests/BibDetails.test.ts
index 89ebdf595..1c46b1653 100644
--- a/src/models/modelTests/BibDetails.test.ts
+++ b/src/models/modelTests/BibDetails.test.ts
@@ -158,7 +158,7 @@ describe("Bib model", () => {
     it("can handle missing field", () => {
       expect(
         bibWithSupContentModel.bottomDetails.find(
-          (detail) => detail.label === "Call Number"
+          (detail) => detail.label === "Call number"
         )
       ).not.toBeDefined()
     })
@@ -189,7 +189,7 @@ describe("Bib model", () => {
     it("includes url in the field", () => {
       expect(bibWithSupContentModel.supplementaryContent).toStrictEqual({
         link: "external",
-        label: "Supplementary Content",
+        label: "Supplementary content",
         value: [
           {
             urlLabel: "Image",
@@ -207,7 +207,7 @@ describe("Bib model", () => {
       })
       expect(
         bogusBib.topDetails.find(
-          (detail) => detail.label === "Additional Author"
+          (detail) => detail.label === "Additional author"
         )
       ).not.toBeDefined()
     })
diff --git a/src/models/modelTests/SearchResultsBib.test.ts b/src/models/modelTests/SearchResultsBib.test.ts
index 9f9e0cdc5..16290a5fa 100644
--- a/src/models/modelTests/SearchResultsBib.test.ts
+++ b/src/models/modelTests/SearchResultsBib.test.ts
@@ -44,17 +44,17 @@ describe("SearchResultsBib model", () => {
 
   describe("getNumItemsMessage", () => {
     it("returns a message populated with the correct resource type and pluralization", () => {
-      expect(searchResultsBib.getNumItemsMessage()).toBe("4 Items")
+      expect(searchResultsBib.getNumItemsMessage()).toBe("4 items")
     })
     it("works for single eResource", () => {
       const bibOneElectronicResource = new SearchResultsBib(
         bibWithOneElectronicResource.resource
       )
-      expect(bibOneElectronicResource.getNumItemsMessage()).toBe("1 Resource")
+      expect(bibOneElectronicResource.getNumItemsMessage()).toBe("1 resource")
     })
     it("works for a bib with no items", () => {
       const bibWithNoItems = new SearchResultsBib(bibNoItems.resource)
-      expect(bibWithNoItems.getNumItemsMessage()).toBe("0 Resources")
+      expect(bibWithNoItems.getNumItemsMessage()).toBe("0 resources")
     })
   })
 
diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index 544ce5afe..0fb5aa85d 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -14,7 +14,7 @@
     th:first-of-type {
       padding: var(--nypl-space-s) 0;
 
-      // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call Number columns to appear to narrow
+      // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call number columns to appear to narrow
       // TODO: These can be removed if the issue is addressed in the DS or during VQA.
       @media screen and (min-width: 600px) {
         min-width: 80px;

From fddaf44e199badcc09b7540250b7ed14770dbfc3 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 20 Aug 2024 15:47:25 -0400
Subject: [PATCH 002/141] Change Filters Applied to Active filters

---
 src/components/ItemFilters/ItemFilters.test.tsx | 2 +-
 src/components/ItemFilters/ItemFilters.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index 0a72df805..29bb98ee7 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -67,7 +67,7 @@ describe("ItemFilters", () => {
   })
 
   it("renders TagSet data when filters are applied and removes the filter when tag is clicked", async () => {
-    expect(screen.queryByText("Filters Applied")).toBeInTheDocument()
+    expect(screen.queryByText("Active filters")).toBeInTheDocument()
     await userEvent.click(
       screen.getByLabelText("Location > Offsite, click to remove filter")
     )
diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 8250f4b9e..9cb41344c 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -181,7 +181,7 @@ const ItemFilters = ({
             lineHeight={2}
             display="table-cell"
           >
-            Filters Applied
+            Active filters
           </Text>
           <TagSet
             id="bib-details-applied-filters"

From 3b4e6d24fde2c0bc6de78391507d03a73b6cccf0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 20 Aug 2024 15:48:17 -0400
Subject: [PATCH 003/141] More sentence case

---
 src/components/ItemTable/RequestButtons.test.tsx | 2 +-
 src/components/ItemTable/RequestButtons.tsx      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ItemTable/RequestButtons.test.tsx b/src/components/ItemTable/RequestButtons.test.tsx
index e3e383bc6..9b9faf3be 100644
--- a/src/components/ItemTable/RequestButtons.test.tsx
+++ b/src/components/ItemTable/RequestButtons.test.tsx
@@ -30,7 +30,7 @@ describe("RequestButtons", () => {
     render(<RequestButtons item={item} />)
     expect(
       screen.getByRole("link", {
-        name: "Request for On-site Use, A history of spaghetti eating and cooking for: spaghetti dinner.",
+        name: "Request for on-site use, A history of spaghetti eating and cooking for: spaghetti dinner.",
       })
     ).toHaveAttribute(
       "href",
diff --git a/src/components/ItemTable/RequestButtons.tsx b/src/components/ItemTable/RequestButtons.tsx
index f87737aeb..fa01886c8 100644
--- a/src/components/ItemTable/RequestButtons.tsx
+++ b/src/components/ItemTable/RequestButtons.tsx
@@ -33,12 +33,12 @@ const RequestButtons = ({ item }: RequestButtonsProps) => {
             <RCLink
               href={`/hold/request/${item.bibId}-${item.id}`}
               type={!item.isAvailable ? "buttonDisabled" : "buttonSecondary"}
-              aria-label={`Request for On-site Use, ${item.bibTitle}`}
+              aria-label={`Request for on-site use, ${item.bibTitle}`}
               disabled={!item.isAvailable}
               mb="s"
               target="_self"
             >
-              Request for On-site Use
+              Request for on-site use
             </RCLink>
           )}
           {item.isEDDRequestable && (

From 8af948bb603c3dfb88c93666723c649d2f143ea1 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 20 Aug 2024 15:48:51 -0400
Subject: [PATCH 004/141] Sentence case request scan

---
 src/components/ItemTable/RequestButtons.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ItemTable/RequestButtons.tsx b/src/components/ItemTable/RequestButtons.tsx
index fa01886c8..6a91c1fc4 100644
--- a/src/components/ItemTable/RequestButtons.tsx
+++ b/src/components/ItemTable/RequestButtons.tsx
@@ -45,12 +45,12 @@ const RequestButtons = ({ item }: RequestButtonsProps) => {
             <RCLink
               href={`/hold/request/${item.bibId}-${item.id}/edd`}
               type={!item.isAvailable ? "buttonDisabled" : "buttonSecondary"}
-              aria-label={`Request Scan, ${item.bibTitle}`}
+              aria-label={`Request scan, ${item.bibTitle}`}
               disabled={!item.isAvailable}
               mb="s"
               target="_self"
             >
-              Request Scan
+              Request scan
             </RCLink>
           )}
         </>

From 298f1925a2560079a31b644451ee9d8189a1da81 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 20 Aug 2024 15:49:52 -0400
Subject: [PATCH 005/141] More sentence case

---
 src/components/ItemTable/RequestButtons.test.tsx | 4 ++--
 src/components/ItemTable/RequestButtons.tsx      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemTable/RequestButtons.test.tsx b/src/components/ItemTable/RequestButtons.test.tsx
index 9b9faf3be..1ef5b5601 100644
--- a/src/components/ItemTable/RequestButtons.test.tsx
+++ b/src/components/ItemTable/RequestButtons.test.tsx
@@ -18,7 +18,7 @@ describe("RequestButtons", () => {
     render(<RequestButtons item={item} />)
     expect(
       screen.getByRole("link", {
-        name: "Request Appointment, A history of spaghetti eating and cooking for: spaghetti dinner.",
+        name: "Request appointment, A history of spaghetti eating and cooking for: spaghetti dinner.",
       })
     ).toHaveAttribute(
       "href",
@@ -42,7 +42,7 @@ describe("RequestButtons", () => {
     render(<RequestButtons item={item} />)
     expect(
       screen.getByRole("link", {
-        name: "Request Scan, A history of spaghetti eating and cooking for: spaghetti dinner.",
+        name: "Request scan, A history of spaghetti eating and cooking for: spaghetti dinner.",
       })
     ).toHaveAttribute(
       "href",
diff --git a/src/components/ItemTable/RequestButtons.tsx b/src/components/ItemTable/RequestButtons.tsx
index 6a91c1fc4..5db168f48 100644
--- a/src/components/ItemTable/RequestButtons.tsx
+++ b/src/components/ItemTable/RequestButtons.tsx
@@ -20,12 +20,12 @@ const RequestButtons = ({ item }: RequestButtonsProps) => {
         <ExternalLink
           href={item.aeonUrl}
           type={!item.isAvailable ? "buttonDisabled" : "buttonSecondary"}
-          aria-label={`Request Appointment, ${item.bibTitle}`}
+          aria-label={`Request appointment, ${item.bibTitle}`}
           disabled={!item.isAvailable}
           mb="s"
           target="_self"
         >
-          Request Appointment
+          Request appointment
         </ExternalLink>
       ) : (
         <>

From e7a3ca513a3a9d5c0c2bc12ddd18b1ad1e72a11d Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 22 Aug 2024 15:23:56 -0400
Subject: [PATCH 006/141] Clear year state on tagset click

---
 src/components/ItemFilters/ItemFilters.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 9cb41344c..2cee35b3f 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -75,6 +75,7 @@ const ItemFilters = ({
     if (id === "clear-filters") {
       await clearAllFilters()
     } else {
+      setYear("")
       const [newValues, field] = removeValueFromFilters(id, appliedFilters)
       await submitFilters(newValues, field)
     }

From ca83122b729aa95eac864599c9b494fe49b98e8c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 23 Aug 2024 11:30:00 -0400
Subject: [PATCH 007/141] Adjust styles on ElectronicResources

---
 .../BibPage/ElectronicResources.tsx           | 23 ++++++++++++-------
 styles/components/BibDetails.module.scss      |  1 +
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/BibPage/ElectronicResources.tsx b/src/components/BibPage/ElectronicResources.tsx
index 17420bf76..35504ee61 100644
--- a/src/components/BibPage/ElectronicResources.tsx
+++ b/src/components/BibPage/ElectronicResources.tsx
@@ -8,6 +8,7 @@ import {
   Icon,
   List,
   Box,
+  Text,
 } from "@nypl/design-system-react-components"
 
 import { ELECTRONIC_RESOURCES_PER_BIB_PAGE } from "../../config/constants"
@@ -54,19 +55,24 @@ const ElectronicResources = ({
       mt="l"
       data-testid="electronic-resources"
     >
-      <CardHeading level="three">Available online</CardHeading>
+      <CardHeading level="three" size="body1" mb="s">
+        Available online
+      </CardHeading>
       <CardContent aria-expanded={!showMore}>
         <List
           type="ul"
           noStyling
-          m={0}
+          mb="s"
           listItems={electronicResourcesToDisplay.map((resource) => (
-            <ExternalLink
-              href={resource.url}
-              py="x"
-              key={kebabCase(resource.title)}
-            >
-              <Box as="span" display="inline-block" my="xxs">
+            <ExternalLink href={resource.url} key={kebabCase(resource.title)}>
+              <Box
+                as="span"
+                display="inline-block"
+                fontSize={{
+                  base: "mobile.body.body2",
+                  md: "desktop.body.body2",
+                }}
+              >
                 {resource.title || resource.prefLabel || resource.url}
               </Box>
             </ExternalLink>
@@ -81,6 +87,7 @@ const ElectronicResources = ({
             buttonType="link"
             aria-expanded={!showMore}
             fontWeight="bold"
+            sx={{ textDecoration: "none", height: "auto" }}
           >
             View {showMore ? `all ${electronicResources.length}` : "fewer"}{" "}
             available online resources
diff --git a/styles/components/BibDetails.module.scss b/styles/components/BibDetails.module.scss
index 7223c6126..29917d161 100644
--- a/styles/components/BibDetails.module.scss
+++ b/styles/components/BibDetails.module.scss
@@ -1,5 +1,6 @@
 .bibDetails {
   margin-top: var(--nypl-space-xl) !important;
+  font-size: var(--nypl-fontSizes-desktop-body-body2);
 
   h3 {
     border: none;

From 68c84c41a716b0ab42c5447b2ad8d24e2193e4cb Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 23 Aug 2024 11:45:02 -0400
Subject: [PATCH 008/141] Restore ItemTableCell component and add styles

---
 src/components/ItemTable/ItemAvailability.tsx | 24 ++++++++++++++++---
 src/components/ItemTable/ItemTableCell.tsx    | 23 ++++++++++++++++++
 src/models/ItemTableData.ts                   | 17 ++++++++-----
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 src/components/ItemTable/ItemTableCell.tsx

diff --git a/src/components/ItemTable/ItemAvailability.tsx b/src/components/ItemTable/ItemAvailability.tsx
index b445bfdf3..5074abbd1 100644
--- a/src/components/ItemTable/ItemAvailability.tsx
+++ b/src/components/ItemTable/ItemAvailability.tsx
@@ -36,7 +36,13 @@ const ItemAvailability = ({ item }: ItemAvailabilityProps) => {
       )
     } else if (item.aeonUrl && item.location?.endpoint) {
       return (
-        <Text mb="0">
+        <Text
+          mb="0"
+          fontSize={{
+            base: "mobile.body.body2",
+            md: "desktop.body.body2",
+          }}
+        >
           <Box as="span" color="ui.success.primary">
             Available by appointment
           </Box>
@@ -56,7 +62,13 @@ const ItemAvailability = ({ item }: ItemAvailabilityProps) => {
       // Available Onsite item
       const locationShort = item.location.prefLabel.split("-")[0]
       return (
-        <Text mb="0">
+        <Text
+          mb="0"
+          fontSize={{
+            base: "mobile.body.body2",
+            md: "desktop.body.body2",
+          }}
+        >
           <Box as="span" color="ui.success.primary">
             Available
           </Box>
@@ -73,7 +85,13 @@ const ItemAvailability = ({ item }: ItemAvailabilityProps) => {
   } else {
     // Not available
     return (
-      <Text mb="0">
+      <Text
+        mb="0"
+        fontSize={{
+          base: "mobile.body.body2",
+          md: "desktop.body.body2",
+        }}
+      >
         <Box as="span" color="ui.warning.tertiary">
           Not available
         </Box>
diff --git a/src/components/ItemTable/ItemTableCell.tsx b/src/components/ItemTable/ItemTableCell.tsx
new file mode 100644
index 000000000..777a166d9
--- /dev/null
+++ b/src/components/ItemTable/ItemTableCell.tsx
@@ -0,0 +1,23 @@
+import { Text } from "@nypl/design-system-react-components"
+
+/**
+ * The ItemTableCell component renders a table cell for the ItemTable
+ *
+ * Its extraction into a separate component allows for styling and other overrides on plain text cells
+ * when rendered programatically in the ItemTableData class
+ */
+const ItemTableCell = ({ children }) => {
+  return (
+    <Text
+      fontSize={{
+        base: "mobile.body.body2",
+        md: "desktop.body.body2",
+      }}
+      noSpace
+    >
+      {children}
+    </Text>
+  )
+}
+
+export default ItemTableCell
diff --git a/src/models/ItemTableData.ts b/src/models/ItemTableData.ts
index 6409bdf66..c6b17ebda 100644
--- a/src/models/ItemTableData.ts
+++ b/src/models/ItemTableData.ts
@@ -3,6 +3,7 @@ import type { ReactElement } from "react"
 import type Item from "./Item"
 import type { ItemTableParams } from "../types/itemTypes"
 import StatusLinks from "../components/ItemTable/StatusLinks"
+import ItemTableCell from "../components/ItemTable/ItemTableCell"
 
 /**
  * The ItemTable class converts a Bib's item data to the format
@@ -40,15 +41,19 @@ export default class ItemTableData {
     ]
   }
 
-  get tableData(): (string | ReactElement)[][] {
+  get tableData(): ReactElement[][] {
     return this.items?.map((item) => {
       return [
         ...(this.showStatusColumn() ? [StatusLinks({ item })] : []),
-        ...(this.showVolumeColumn() ? [item.volume] : []),
-        item.format,
-        ...(this.showAccessColumn() ? [item.accessMessage] : []),
-        item.callNumber,
-        item.location.prefLabel,
+        ...(this.showVolumeColumn()
+          ? [ItemTableCell({ children: item.volume })]
+          : []),
+        ItemTableCell({ children: item.format }),
+        ...(this.showAccessColumn()
+          ? [ItemTableCell({ children: item.accessMessage })]
+          : []),
+        ItemTableCell({ children: item.callNumber }),
+        ItemTableCell({ children: item.location.prefLabel }),
       ]
     })
   }

From 7f9235c13ca98cfd1d88f7edaafb13c3022e278a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 23 Aug 2024 13:33:24 -0400
Subject: [PATCH 009/141] Update changelog

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cb2e5575c..2fd5abace 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added ElectronicResources component (SCC-4227)
 - Added check for hasElectronicResources in Bib Page before rendering ElectronicResources (SCC-4227).
 
+### Fixed
+
+- Fixed visual and copy issues found in VQA (SCC-4235)
+
 ## [1.2.2] 2024-08-14
 
 ### Updated

From dba53b4f50f1760f889807634c1623ecdf766a24 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 27 Aug 2024 16:13:51 -0400
Subject: [PATCH 010/141] Render table cell as span

---
 src/components/ItemTable/ItemTableCell.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemTable/ItemTableCell.tsx b/src/components/ItemTable/ItemTableCell.tsx
index 777a166d9..1a48ed3f7 100644
--- a/src/components/ItemTable/ItemTableCell.tsx
+++ b/src/components/ItemTable/ItemTableCell.tsx
@@ -1,4 +1,4 @@
-import { Text } from "@nypl/design-system-react-components"
+import { Box } from "@nypl/design-system-react-components"
 
 /**
  * The ItemTableCell component renders a table cell for the ItemTable
@@ -8,15 +8,15 @@ import { Text } from "@nypl/design-system-react-components"
  */
 const ItemTableCell = ({ children }) => {
   return (
-    <Text
+    <Box
+      as="span"
       fontSize={{
         base: "mobile.body.body2",
         md: "desktop.body.body2",
       }}
-      noSpace
     >
       {children}
-    </Text>
+    </Box>
   )
 }
 

From dcf4aedd2d0b70a253c8362e1b6343d1802e7abb Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Wed, 28 Aug 2024 16:17:47 -0400
Subject: [PATCH 011/141] Convert all bib details labels to sentence case

---
 src/models/BibDetails.ts | 32 +++++++++++++++++++++++++-------
 src/utils/appUtils.ts    |  9 +++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index e43d53cfc..505afe74f 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -9,6 +9,7 @@ import type {
   AnnotatedMarc,
   AnyBibDetail,
 } from "../types/bibDetailsTypes"
+import { convertToSentenceCase } from "../utils/appUtils"
 
 export default class BibDetails {
   bib: DiscoveryBibResult
@@ -163,17 +164,27 @@ export default class BibDetails {
           // Getting the first object in the array.
           [holding[fieldMapping.field][0].label]
         : holding[fieldMapping.field]
-    return this.buildDetail(fieldMapping.label, bibFieldValue)
+    return this.buildDetail(
+      convertToSentenceCase(fieldMapping.label),
+      bibFieldValue
+    )
   }
 
   buildStandardDetail(fieldMapping: FieldMapping) {
     const bibFieldValue = this.bib[fieldMapping.field]
-    return this.buildDetail(fieldMapping.label, bibFieldValue)
+    return this.buildDetail(
+      convertToSentenceCase(fieldMapping.label),
+      bibFieldValue
+    )
   }
 
   buildDetail(label: string, value: string[]): BibDetail {
     if (!value?.length) return null
-    return { label, value }
+
+    return {
+      label: convertToSentenceCase(label),
+      value,
+    }
   }
 
   buildInternalLinkedDetail(fieldMapping: {
@@ -184,7 +195,7 @@ export default class BibDetails {
     if (!value?.length) return null
     return {
       link: "internal",
-      label: fieldMapping.label,
+      label: convertToSentenceCase(fieldMapping.label),
       value: value.map((v: string) => {
         const internalUrl = `/search?filters[${
           fieldMapping.field
@@ -196,7 +207,11 @@ export default class BibDetails {
 
   buildExternalLinkedDetail(label: string, values: Url[]): LinkedBibDetail {
     if (!values.length) return null
-    return { link: "external", value: values, label }
+    return {
+      link: "external",
+      value: values,
+      label: convertToSentenceCase(label),
+    }
   }
 
   addNotes(details: AnyBibDetail[]) {
@@ -221,7 +236,10 @@ export default class BibDetails {
         }, {})
       const notesAsDetails = []
       Object.keys(notesGroupedByNoteType).forEach((key: string) => {
-        notesAsDetails.push({ label: key, value: notesGroupedByNoteType[key] })
+        notesAsDetails.push({
+          label: convertToSentenceCase(key),
+          value: notesGroupedByNoteType[key],
+        })
       })
       return notesAsDetails
     }
@@ -340,7 +358,7 @@ export default class BibDetails {
         urlLabel: sc.label,
       }
     })
-    return this.buildExternalLinkedDetail(label, values)
+    return this.buildExternalLinkedDetail(convertToSentenceCase(label), values)
   }
 
   buildSubjectHeadings(): SubjectHeadingDetail {
diff --git a/src/utils/appUtils.ts b/src/utils/appUtils.ts
index c51703ef9..67a1f8dbb 100644
--- a/src/utils/appUtils.ts
+++ b/src/utils/appUtils.ts
@@ -131,3 +131,12 @@ export function getPaginationOffsetStrings(
  */
 export const encodeHTML = (str: string) =>
   str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/"/g, "&quot;")
+
+/**
+ * convertToSentenceCase
+ * Return a sentence-cased version of the string if it's more than 2 words (to avoid sentence-casing acronyms).
+ */
+export const convertToSentenceCase = (str: string) =>
+  str.split(" ").length > 1
+    ? str.charAt(0).toUpperCase() + str.slice(1).toLowerCase()
+    : str

From e7cbe8dfffcc884643670cb3aca42d8203f716aa Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Wed, 28 Aug 2024 16:32:52 -0400
Subject: [PATCH 012/141] Fix tests

---
 src/models/BibDetails.ts                 | 2 +-
 src/models/modelTests/BibDetails.test.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index 505afe74f..aca839674 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -125,7 +125,7 @@ export default class BibDetails {
         else if (fieldMapping.field === "extent") detail = this.extent
         else if (fieldMapping.field === "owner")
           detail = this.bib.owner && {
-            label: fieldMapping.label,
+            label: convertToSentenceCase(fieldMapping.label),
             value: [this.bib.owner?.prefLabel],
           }
         else detail = this.buildStandardDetail(fieldMapping)
diff --git a/src/models/modelTests/BibDetails.test.ts b/src/models/modelTests/BibDetails.test.ts
index 1c46b1653..43d00ad49 100644
--- a/src/models/modelTests/BibDetails.test.ts
+++ b/src/models/modelTests/BibDetails.test.ts
@@ -35,18 +35,18 @@ describe("Bib model", () => {
         },
         { label: "Language (note)", value: ["Serbian;"] },
         {
-          label: "Issued By (note)",
+          label: "Issued by (note)",
           value: ["Issued by: Narodna biblioteka Kraljevo."],
         },
         {
-          label: "Linking Entry (note)",
+          label: "Linking entry (note)",
           value: [
             "Has supplement, <2005-> : Preporučeno, ISSN 1452-3531",
             "Has supplement, <2006-> : Види чуда, ISSN 1452-7316",
             "Has supplement, <2006-> : Vidi čuda, ISSN 1452-7316",
           ],
         },
-        { label: "Source of Description (note)", value: ["G. 46, 3 (2016)."] },
+        { label: "Source of description (note)", value: ["G. 46, 3 (2016)."] },
       ])
     })
   })

From 6e76e6069400eb8fef45bae7b6f72be89dda1c7f Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 3 Sep 2024 12:15:32 -0400
Subject: [PATCH 013/141] Add tests for convertToSentenceCase

---
 src/utils/utilsTests/appUtils.test.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/utils/utilsTests/appUtils.test.ts b/src/utils/utilsTests/appUtils.test.ts
index d1fdedfde..e9e56524a 100644
--- a/src/utils/utilsTests/appUtils.test.ts
+++ b/src/utils/utilsTests/appUtils.test.ts
@@ -2,6 +2,7 @@ import {
   adobeAnalyticsRouteToPageName,
   encodeHTML,
   getPaginationOffsetStrings,
+  convertToSentenceCase,
 } from "../appUtils"
 import {
   ADOBE_ANALYTICS_RC_PREFIX,
@@ -92,4 +93,19 @@ describe("appUtils", () => {
       expect(end).toEqual("1,195")
     })
   })
+  describe("convertToSentenceCase", () => {
+    it("converts a capitalized string to sentence case", () => {
+      expect(convertToSentenceCase("Convert This Sentence.")).toEqual(
+        "Convert this sentence."
+      )
+    })
+    it("converts a fully uppercase string to sentence case", () => {
+      expect(convertToSentenceCase("CONVERT THIS SENTENCE.")).toEqual(
+        "Convert this sentence."
+      )
+    })
+    it("returns the string that is passed in if it's a single word, to avoid sentence-casing acronyms", () => {
+      expect(convertToSentenceCase("ISSN")).toEqual("ISSN")
+    })
+  })
 })

From 6e784791e6f6f26e56ff877ee63b33bad1ecc887 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 10:08:02 -0400
Subject: [PATCH 014/141] Add margin to dt on mobile

---
 pages/test-pickup-times/index.tsx        | 6 +++---
 src/components/ItemTable/ItemTable.tsx   | 1 +
 src/models/ItemTableData.ts              | 2 +-
 src/utils/itemFilterUtils.ts             | 3 +--
 styles/components/BibDetails.module.scss | 7 +++++++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pages/test-pickup-times/index.tsx b/pages/test-pickup-times/index.tsx
index 50b9fcfa3..26d41469d 100644
--- a/pages/test-pickup-times/index.tsx
+++ b/pages/test-pickup-times/index.tsx
@@ -120,7 +120,7 @@ const TestPickupTimes = (params) => {
               <Select
                 id="scenario"
                 name="scenario"
-                labelText="Preloaded Scenarios"
+                labelText="Preloaded scenarios"
                 value={scenario}
                 onChange={(e) =>
                   setScenario((e.target as HTMLInputElement).value)
@@ -138,7 +138,7 @@ const TestPickupTimes = (params) => {
 
               <TextInput
                 id="holdingLocation"
-                labelText="Item Location"
+                labelText="Item location"
                 name="holdingLocation"
                 value={holdingLocation}
                 onChange={(e) => setHoldingLocation(e.target.value)}
@@ -163,7 +163,7 @@ const TestPickupTimes = (params) => {
               </Select>
               <TextInput
                 id="deliveryLocation"
-                labelText="Delivery Location (opt)"
+                labelText="Delivery location (opt)"
                 name="deliveryLocation"
                 value={deliveryLocation}
                 onChange={(e) => setDeliveryLocation(e.target.value)}
diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index c1930dd86..49c434e1d 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -13,6 +13,7 @@ interface ItemTableProps {
  */
 const ItemTable = ({ itemTableData }: ItemTableProps) => {
   const { tableHeadings, tableData, items, inSearchResult } = itemTableData
+  console.log(tableHeadings)
   return (
     <Box>
       <Table
diff --git a/src/models/ItemTableData.ts b/src/models/ItemTableData.ts
index c6b17ebda..2c6f5cc71 100644
--- a/src/models/ItemTableData.ts
+++ b/src/models/ItemTableData.ts
@@ -71,6 +71,6 @@ export default class ItemTableData {
   }
 
   volumeColumnHeading(): string {
-    return this.isArchiveCollection ? "Container" : "Vol/Date"
+    return this.isArchiveCollection ? "Container" : "Vol/date"
   }
 }
diff --git a/src/utils/itemFilterUtils.ts b/src/utils/itemFilterUtils.ts
index 0f6cde2f7..dbcde0c8d 100644
--- a/src/utils/itemFilterUtils.ts
+++ b/src/utils/itemFilterUtils.ts
@@ -1,5 +1,4 @@
 import type { TagSetFilterDataProps } from "@nypl/design-system-react-components"
-import { capitalize } from "lodash"
 
 import type { ItemFilterData } from "../models/ItemFilterData"
 import type {
@@ -55,7 +54,7 @@ export const buildAppliedFiltersTagSetData = (
           : fieldAggregations?.labelForValue(filterValue)
       if (valueLabel) {
         filters.push({
-          label: `${capitalize(field)} > ${valueLabel}`,
+          label: `${field} > ${valueLabel}`,
           // This ID needs to be the filters value to allow for proper clearing of the individual filters
           id: filterValue,
         })
diff --git a/styles/components/BibDetails.module.scss b/styles/components/BibDetails.module.scss
index 29917d161..f423c7689 100644
--- a/styles/components/BibDetails.module.scss
+++ b/styles/components/BibDetails.module.scss
@@ -6,6 +6,13 @@
     border: none;
     margin-bottom: var(--nypl-space-m);
   }
+
+  dt {
+    @media (max-width: 600px) {
+      margin-bottom: var(--nypl-space-xxs);
+    }
+  }
+
   dl dt,
   dl dd {
     padding-top: 0;

From fd1e3d249a93652474831826d28bc9ac0fb8fe47 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 10:09:56 -0400
Subject: [PATCH 015/141] Bump ds version

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5905e8ae1..27361213d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,14 +1,14 @@
 {
   "name": "research-catalog",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "research-catalog",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.2.0",
+        "@nypl/design-system-react-components": "3.3.1",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.0.9",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,9 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.2.0.tgz",
-      "integrity": "sha512-ya/WpyPM6lOLlH3E9AKbLsfqy7dwlZLBRQXWGOvQ42X00q6Z6AzJGVlFxK5Ggj2UyLg0EFs5HDkhDJ1hW51fKg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.3.1.tgz",
+      "integrity": "sha512-fu8ASaQwlsiv0l+5mmb8rT3fxLRz1xv8yEvPskruh95FwEJ3dYzBo5litl7uFzKGWj6+Y0hnvT/cZl+Innm6ww==",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",
diff --git a/package.json b/package.json
index 913a8b964..cd7283596 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.2.0",
+    "@nypl/design-system-react-components": "3.3.1",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.0.9",
     "@nypl/sierra-wrapper": "1.1.0",

From 2e3ad2239010fe82b7c27f48c00de3d23efd4a3a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 10:22:03 -0400
Subject: [PATCH 016/141] Fix filter styles on mobile

---
 src/components/ItemFilters/ItemFilters.tsx | 14 +++++++++-----
 src/components/ItemTable/ItemTable.tsx     |  1 -
 src/utils/itemFilterUtils.ts               |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 96fb8a6c6..a72038969 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -173,14 +173,18 @@ const ItemFilters = ({
         />
       </Box>
       {filtersAreApplied ? (
-        <Box display="flex" mr="s" mb="m">
+        <Box
+          display="flex"
+          flexDirection={{ base: "column", md: "row" }}
+          mb="m"
+        >
           <Text
-            fontSize="body2"
+            display="block"
+            fontSize="desktop.body.body2"
             fontWeight="bold"
-            mr="s"
-            mb={0}
+            mr={{ base: "0", md: "s" }}
+            mb={{ base: "xxs", md: 0 }}
             lineHeight={2}
-            display="table-cell"
           >
             Active filters
           </Text>
diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 49c434e1d..c1930dd86 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -13,7 +13,6 @@ interface ItemTableProps {
  */
 const ItemTable = ({ itemTableData }: ItemTableProps) => {
   const { tableHeadings, tableData, items, inSearchResult } = itemTableData
-  console.log(tableHeadings)
   return (
     <Box>
       <Table
diff --git a/src/utils/itemFilterUtils.ts b/src/utils/itemFilterUtils.ts
index dbcde0c8d..0f6cde2f7 100644
--- a/src/utils/itemFilterUtils.ts
+++ b/src/utils/itemFilterUtils.ts
@@ -1,4 +1,5 @@
 import type { TagSetFilterDataProps } from "@nypl/design-system-react-components"
+import { capitalize } from "lodash"
 
 import type { ItemFilterData } from "../models/ItemFilterData"
 import type {
@@ -54,7 +55,7 @@ export const buildAppliedFiltersTagSetData = (
           : fieldAggregations?.labelForValue(filterValue)
       if (valueLabel) {
         filters.push({
-          label: `${field} > ${valueLabel}`,
+          label: `${capitalize(field)} > ${valueLabel}`,
           // This ID needs to be the filters value to allow for proper clearing of the individual filters
           id: filterValue,
         })

From a2684963b8c8c856b381c8b1673084ca617c68b0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 12:55:00 -0400
Subject: [PATCH 017/141] Fix failing tests after DS update

---
 __test__/pages/Home.test.tsx                  | 4 ++--
 src/components/SearchForm/SearchForm.test.tsx | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/__test__/pages/Home.test.tsx b/__test__/pages/Home.test.tsx
index 74b6a0401..197b779b2 100644
--- a/__test__/pages/Home.test.tsx
+++ b/__test__/pages/Home.test.tsx
@@ -9,8 +9,8 @@ jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 describe("Home", () => {
   it("should render the search form", () => {
     render(<Home isAuthenticated={true} />)
-    const searchButton = screen.getByRole("button", { name: "Search" })
-    expect(searchButton).toBeInTheDocument()
+    const searchForm = screen.getByLabelText("Search Bar Label")
+    expect(searchForm).toBeInTheDocument()
   })
   it("should render an H2", () => {
     render(<Home isAuthenticated={true} />)
diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index 032bf4072..2e551ef6f 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -12,7 +12,10 @@ describe("SearchForm", () => {
   const searchLabel =
     "Search by keyword, title, journal title, or author/contributor"
   const submit = () =>
-    fireEvent(screen.getByText("Search"), new MouseEvent("click"))
+    fireEvent(
+      screen.getByText("Search").closest("button"),
+      new MouseEvent("click")
+    )
   beforeEach(() => {
     mockRouter.query.q = ""
   })

From c8005957732cdb83a3c215ae8906558915887ca1 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 12:58:16 -0400
Subject: [PATCH 018/141] Update changelog

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b351af61b..93b7d6a4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Prerelease
+
+### Fixed
+
+- VQA second pass miscellaneous fixes (SCC-4264)
+
 ## [1.2.4] 2024-08-29
 
 ### Fixed

From 94e502870f470c4817a0803951746e9ed65cd42d Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 6 Sep 2024 14:44:46 -0400
Subject: [PATCH 019/141] Add attribute to determine if filters were changed
 via multiselect

---
 CHANGELOG                                     |  6 +++++
 pages/bib/[id]/index.tsx                      | 19 +++++++++++-----
 .../ItemFilters/ItemFilters.test.tsx          | 11 ++++++----
 src/components/ItemFilters/ItemFilters.tsx    | 22 +++++++++++++------
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b351af61b..75f56eac0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Prerelease
+
+### Fixed
+
+- Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
+
 ## [1.2.4] 2024-08-29
 
 ### Fixed
diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index c55392799..abaf83d5d 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -69,6 +69,7 @@ export default function BibPage({
   const [bib, setBib] = useState(new Bib(discoveryBibResult))
   const [itemsLoading, setItemsLoading] = useState(false)
   const [itemFetchError, setItemFetchError] = useState(false)
+
   const [viewAllExpanded, setViewAllExpanded] = useState(viewAllItems)
   const [appliedFilters, setAppliedFilters] = useState(
     parseItemFilterQueryParams(query)
@@ -95,7 +96,8 @@ export default function BibPage({
 
   const refreshItemTable = async (
     newQuery: BibQueryParams,
-    viewAllItems = false
+    viewAllItems = false,
+    refreshedViaCheckbox = false
   ) => {
     setItemsLoading(true)
     setItemFetchError(false)
@@ -142,9 +144,13 @@ export default function BibPage({
         setBib(new Bib(discoveryBibResult))
 
         setItemsLoading(false)
-        setTimeout(() => {
-          itemTableHeadingRef.current?.focus()
-        }, FOCUS_TIMEOUT)
+
+        // TODO: This is a workaround to prevent the Displaying text from receiving focus when filters are controlled via a checkbox
+        // This is an accessibility issue that should be addressed when the dynamic refresh is replaced with a form and apply button
+        if (!refreshedViaCheckbox)
+          setTimeout(() => {
+            itemTableHeadingRef.current?.focus()
+          }, FOCUS_TIMEOUT)
       } else {
         console.log(response)
         handleItemFetchError()
@@ -162,7 +168,8 @@ export default function BibPage({
   }
 
   const handleFiltersChange = async (
-    newAppliedFilterQuery: ItemFilterQueryParams
+    newAppliedFilterQuery: ItemFilterQueryParams,
+    refreshedViaCheckbox = false
   ) => {
     const newQuery = {
       ...newAppliedFilterQuery,
@@ -170,7 +177,7 @@ export default function BibPage({
     if (newQuery.item_page) delete newQuery.item_page
     setItemTablePage(1)
     setAppliedFilters(parseItemFilterQueryParams(newAppliedFilterQuery))
-    await refreshItemTable(newQuery, viewAllExpanded)
+    await refreshItemTable(newQuery, viewAllExpanded, refreshedViaCheckbox)
   }
 
   const handlePageChange = async (page: number) => {
diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index 29bb98ee7..184516233 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -71,9 +71,12 @@ describe("ItemFilters", () => {
     await userEvent.click(
       screen.getByLabelText("Location > Offsite, click to remove filter")
     )
-    expect(filtersChangeMock).toHaveBeenCalledWith({
-      item_format: "Text",
-      item_status: "Available",
-    })
+    expect(filtersChangeMock).toHaveBeenCalledWith(
+      {
+        item_format: "Text",
+        item_status: "Available",
+      },
+      false
+    )
   })
 })
diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 96fb8a6c6..06d9d4e84 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -26,7 +26,8 @@ import {
 interface ItemFilterContainerProps {
   itemAggregations: Aggregation[]
   handleFiltersChange?: (
-    newAppliedFilterQuery: ItemFilterQueryParams
+    newAppliedFilterQuery: ItemFilterQueryParams,
+    refreshedViaCheckbox?: boolean
   ) => Promise<void>
   appliedFilters?: AppliedItemFilters
   filtersAreApplied?: boolean
@@ -54,7 +55,11 @@ const ItemFilters = ({
     filterData
   )
 
-  const submitFilters = async (selectedFilters: string[], field: string) => {
+  const submitFilters = async (
+    selectedFilters: string[],
+    field: string,
+    refreshedViaCheckbox = false
+  ) => {
     const newFilters = { ...appliedFilters, [field]: selectedFilters }
     const locationFilterData = filterData.find(
       (filter) => filter.field === "location"
@@ -63,7 +68,7 @@ const ItemFilters = ({
       newFilters,
       locationFilterData.recapLocations
     )
-    await handleFiltersChange(itemFilterQuery)
+    await handleFiltersChange(itemFilterQuery, refreshedViaCheckbox)
   }
 
   const clearAllFilters = async () => {
@@ -71,13 +76,16 @@ const ItemFilters = ({
     await handleFiltersChange({})
   }
 
-  const handleRemoveFilter = async (id: string) => {
+  const handleRemoveFilter = async (
+    id: string,
+    refreshedViaCheckbox = false
+  ) => {
     if (id === "clear-filters") {
       await clearAllFilters()
     } else {
       setYear("")
       const [newValues, field] = removeValueFromFilters(id, appliedFilters)
-      await submitFilters(newValues, field)
+      await submitFilters(newValues, field, refreshedViaCheckbox)
     }
   }
 
@@ -86,9 +94,9 @@ const ItemFilters = ({
 
     // If the filter value is already in the array of selected values, remove it. Otherwise, add it.
     if (selectedFieldCheckboxes.indexOf(filterId) >= 0) {
-      await handleRemoveFilter(filterId)
+      await handleRemoveFilter(filterId, true)
     } else {
-      await submitFilters([filterId, ...selectedFieldCheckboxes], field)
+      await submitFilters([filterId, ...selectedFieldCheckboxes], field, true)
     }
   }
 

From 1950e8fa9ede820205cf0394499c6c5069cf4781 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 9 Sep 2024 10:54:30 -0400
Subject: [PATCH 020/141] Upgrade node verision to 20 in dockerfiles

---
 Dockerfile             | 2 +-
 Dockerfile.development | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 94151590a..04267d537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine AS production
+FROM node:20-alpine AS production
 
 #RUN apt-get update
 #RUN apt-get upgrade -y
diff --git a/Dockerfile.development b/Dockerfile.development
index 1f3a1d068..b74e61a9f 100644
--- a/Dockerfile.development
+++ b/Dockerfile.development
@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:20-alpine
 
 WORKDIR /app
 

From dd24d356add063a679bd2dc7851d332658d706da Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 9 Sep 2024 11:01:00 -0400
Subject: [PATCH 021/141] Initialize ci config file

---
 .github/workflows/ci.yml | 42 ++++++++++++++++++++++++++++++++++++++++
 package.json             |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..943a55bc8
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,42 @@
+# For all pushes, this workflow will
+#     - Install deps
+#     - Lint
+#     - Test
+name: CI
+
+on: push
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    env:
+      CI: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - name: Cache and install node modules
+        uses: bahmutov/npm-install@v1
+        with:
+          useLockFile: false
+      - name: Lint
+        run: npm run lint
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    env:
+      CI: true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - name: Cache and install node modules
+        uses: bahmutov/npm-install@v1
+      - name: Test
+        run: npm run test:ci
diff --git a/package.json b/package.json
index 913a8b964..f16fe375d 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "test": "jest",
     "test-watch": "jest --watch",
     "test-watch-quiet": "DEBUG_PRINT_LIMIT=0 npm run test-watch",
+    "test:ci": "jest --ci --config=jest.config.js",
     "coverage": "jest --coverage"
   },
   "dependencies": {

From 286c33bdcb9946606e04d969441bd6d5ef70e6f0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 9 Sep 2024 11:24:47 -0400
Subject: [PATCH 022/141] Initialize deploy_production.yml

---
 .github/workflows/ci.yml                |  4 +--
 .github/workflows/deploy_production.yml | 46 +++++++++++++++++++++++++
 .github/workflows/testing.yml           |  6 ++--
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/deploy_production.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 943a55bc8..e123d90a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Cache and install node modules
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Cache and install node modules
diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
new file mode 100644
index 000000000..1106cbcac
--- /dev/null
+++ b/.github/workflows/deploy_production.yml
@@ -0,0 +1,46 @@
+# Deploys to research-catalog-production
+name: deploy production
+
+on:
+  push:
+    branches:
+      - production
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  AWS_DEFAULT_REGION: us-east-1
+  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
+          aws-region: us-east-1
+
+      - name: Log in to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build and push Docker image to Amazon ECR
+        env:
+          APP_ENV: production
+          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog
+        run: |
+          docker build --build-arg APP_ENV=$APP_ENV --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY --tag $LOCAL_TAG_NAME .
+          docker tag $LOCAL_TAG_NAME $ECR_URL
+          docker push $ECR_URL
+
+      - name: Update ECS service
+        run: |
+          aws ecs update-service --cluster research-catalog-production --service research-catalog-production --force-new-deployment
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index b706a49df..baea7a1eb 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -8,12 +8,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: npm install

From f096d74248522f925c3220a4933b32637d1cf884 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 9 Sep 2024 11:35:37 -0400
Subject: [PATCH 023/141] Initialize deploy_qa.yml

---
 .github/workflows/deploy_production.yml |  2 +-
 .github/workflows/deploy_qa.yml         | 46 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/deploy_qa.yml

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index 1106cbcac..354e07f56 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -35,7 +35,7 @@ jobs:
         env:
           APP_ENV: production
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
         run: |
           docker build --build-arg APP_ENV=$APP_ENV --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
new file mode 100644
index 000000000..fa0ec86aa
--- /dev/null
+++ b/.github/workflows/deploy_qa.yml
@@ -0,0 +1,46 @@
+# Deploys to research-catalog-qa
+name: deploy qa
+
+on:
+  push:
+    branches:
+      - qa
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  AWS_DEFAULT_REGION: us-east-1
+  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
+          aws-region: us-east-1
+
+      - name: Log in to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build and push Docker image to Amazon ECR
+        env:
+          APP_ENV: qa
+          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
+        run: |
+          docker build --build-arg APP_ENV=$APP_ENV --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY --tag $LOCAL_TAG_NAME .
+          docker tag $LOCAL_TAG_NAME $ECR_URL
+          docker push $ECR_URL
+
+      - name: Update ECS service
+        run: |
+          aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment

From 159eb5b658a9973f5be7e87f131a818d28bed18b Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 09:10:14 -0400
Subject: [PATCH 024/141] Remove new relic env var

---
 .github/workflows/deploy_production.yml |  5 ++---
 .github/workflows/deploy_qa.yml         | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index 354e07f56..b8c5debce 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -33,11 +33,10 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          APP_ENV: production
-          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
+          NEXT_PUBLIC_APP_ENV: production
           ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
         run: |
-          docker build --build-arg APP_ENV=$APP_ENV --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=$NEXT_PUBLIC_APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
           docker push $ECR_URL
 
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index fa0ec86aa..63e43c067 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - qa
+      - SCC-4218/move-rc-from-travis-to-github-actions
 
 permissions:
   id-token: write
@@ -33,14 +34,13 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          APP_ENV: qa
-          NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
+          NEXT_PUBLIC_APP_ENV: qa
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$NEXT_PUBLIC_APP_ENV-latest
         run: |
-          docker build --build-arg APP_ENV=$APP_ENV --build-arg NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=$NEXT_PUBLIC_APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
-          docker push $ECR_URL
+          # docker push $ECR_URL
 
-      - name: Update ECS service
-        run: |
-          aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
+      # - name: Update ECS service
+      #   run: |
+      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment

From dbebd90c458934241ce9d13063065bda90df1e19 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 09:27:43 -0400
Subject: [PATCH 025/141] Add APP_ENV variable

---
 .github/workflows/deploy_production.yml | 11 +++++++----
 .github/workflows/deploy_qa.yml         | 12 ++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index b8c5debce..b7f58eb99 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -13,6 +13,7 @@ permissions:
 env:
   AWS_DEFAULT_REGION: us-east-1
   LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  APP_ENV: production
 
 jobs:
   deploy:
@@ -33,13 +34,15 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          NEXT_PUBLIC_APP_ENV: production
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
         run: |
-          docker build --build-arg NEXT_PUBLIC_APP_ENV=$NEXT_PUBLIC_APP_ENV --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-previous" || true
+          aws ecr put-image --repository-name research-catalog --image-tag "$APP_ENV-previous" --image-manifest "$MANIFEST" || true
           docker push $ECR_URL
 
       - name: Update ECS service
         run: |
-          aws ecs update-service --cluster research-catalog-production --service research-catalog-production --force-new-deployment
+          aws ecs update-service --cluster research-catalog-$APP_ENV --service research-catalog-$APP_ENV --force-new-deployment
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 63e43c067..92f815924 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -14,6 +14,7 @@ permissions:
 env:
   AWS_DEFAULT_REGION: us-east-1
   LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  APP_ENV: qa
 
 jobs:
   deploy:
@@ -34,13 +35,16 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          NEXT_PUBLIC_APP_ENV: qa
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$NEXT_PUBLIC_APP_ENV-latest
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
+
         run: |
-          docker build --build-arg NEXT_PUBLIC_APP_ENV=$NEXT_PUBLIC_APP_ENV --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-previous" || true
+          aws ecr put-image --repository-name research-catalog --image-tag "$APP_ENV-previous" --image-manifest "$MANIFEST" || true
           # docker push $ECR_URL
 
       # - name: Update ECS service
       #   run: |
-      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
+      #     aws ecs update-service --cluster research-catalog-$APP_ENV --service research-catalog-$APP_ENV --force-new-deployment

From 677562e3403254c18fb11f1ac6d0482a26776253 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 09:30:12 -0400
Subject: [PATCH 026/141] Replace parentheses with brackets

---
 .github/workflows/deploy_production.yml | 2 +-
 .github/workflows/deploy_qa.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index b7f58eb99..7f2a90390 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Build and push Docker image to Amazon ECR
         env:
           ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
+          MANIFEST: ${aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest'}
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 92f815924..f5ece1d1c 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build and push Docker image to Amazon ECR
         env:
           ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
+          MANIFEST: ${aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest'}
 
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .

From 6bdb83a3bff2c16e25ef3abd38e58a7a68dbc3de Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 09:34:08 -0400
Subject: [PATCH 027/141] Replace ref name and restore parentheses

---
 .github/workflows/deploy_production.yml | 2 +-
 .github/workflows/deploy_qa.yml         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index 7f2a90390..b7f58eb99 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Build and push Docker image to Amazon ECR
         env:
           ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: ${aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest'}
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index f5ece1d1c..2e85ce6b8 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -13,7 +13,8 @@ permissions:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
-  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  # LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  LOCAL_TAG_NAME: research-catalog:test-${{ github.run_number }}
   APP_ENV: qa
 
 jobs:
@@ -36,7 +37,7 @@ jobs:
       - name: Build and push Docker image to Amazon ECR
         env:
           ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: ${aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest'}
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
 
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .

From 49418ae270d2db07b86f9d52fbf9d4f87e60bad0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 10:09:42 -0400
Subject: [PATCH 028/141] Remove APP_ENV

---
 .github/workflows/deploy_production.yml | 13 ++++++-------
 .github/workflows/deploy_qa.yml         | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index b7f58eb99..f1dd4e366 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -13,7 +13,6 @@ permissions:
 env:
   AWS_DEFAULT_REGION: us-east-1
   LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
-  APP_ENV: production
 
 jobs:
   deploy:
@@ -34,15 +33,15 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="production-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
         run: |
-          docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=production --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
-          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-previous" || true
-          aws ecr put-image --repository-name research-catalog --image-tag "$APP_ENV-previous" --image-manifest "$MANIFEST" || true
+          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="production-previous" || true
+          aws ecr put-image --repository-name research-catalog --image-tag "production-previous" --image-manifest "$MANIFEST" || true
           docker push $ECR_URL
 
       - name: Update ECS service
         run: |
-          aws ecs update-service --cluster research-catalog-$APP_ENV --service research-catalog-$APP_ENV --force-new-deployment
+          aws ecs update-service --cluster research-catalog-production --service research-catalog-production --force-new-deployment
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 2e85ce6b8..0250ba016 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -15,7 +15,6 @@ env:
   AWS_DEFAULT_REGION: us-east-1
   # LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
   LOCAL_TAG_NAME: research-catalog:test-${{ github.run_number }}
-  APP_ENV: qa
 
 jobs:
   deploy:
@@ -36,16 +35,16 @@ jobs:
 
       - name: Build and push Docker image to Amazon ECR
         env:
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:$APP_ENV-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
+          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
+          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
 
         run: |
-          docker build --build-arg NEXT_PUBLIC_APP_ENV=$APP_ENV --tag $LOCAL_TAG_NAME .
+          docker build --build-arg NEXT_PUBLIC_APP_ENV=qa --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
-          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="$APP_ENV-previous" || true
-          aws ecr put-image --repository-name research-catalog --image-tag "$APP_ENV-previous" --image-manifest "$MANIFEST" || true
+          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
+          aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
           # docker push $ECR_URL
 
       # - name: Update ECS service
       #   run: |
-      #     aws ecs update-service --cluster research-catalog-$APP_ENV --service research-catalog-$APP_ENV --force-new-deployment
+      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment

From e9bb6ba5a4724735e72847ec1ba410295166f724 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 10:17:03 -0400
Subject: [PATCH 029/141] Change ecr login to v2

---
 .github/workflows/deploy_production.yml | 2 +-
 .github/workflows/deploy_qa.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index f1dd4e366..b9022b9be 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Log in to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build and push Docker image to Amazon ECR
         env:
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 0250ba016..07d0ad13d 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Log in to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build and push Docker image to Amazon ECR
         env:

From 966d50e98555c9d71e288992fff189793f4f0037 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 10:22:51 -0400
Subject: [PATCH 030/141] Remove travis yml

---
 .github/workflows/deploy_qa.yml | 12 +++----
 .travis.yml                     | 63 ---------------------------------
 2 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 07d0ad13d..7a5d5ad45 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - qa
-      - SCC-4218/move-rc-from-travis-to-github-actions
 
 permissions:
   id-token: write
@@ -13,8 +12,7 @@ permissions:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
-  # LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
-  LOCAL_TAG_NAME: research-catalog:test-${{ github.run_number }}
+  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
 
 jobs:
   deploy:
@@ -43,8 +41,8 @@ jobs:
           docker tag $LOCAL_TAG_NAME $ECR_URL
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
-          # docker push $ECR_URL
+          docker push $ECR_URL
 
-      # - name: Update ECS service
-      #   run: |
-      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
+      - name: Update ECS service
+        run: |
+          aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a4f042c26..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-dist: xenial
-language: ruby
-
-services:
-  - docker
-
-branches:
-  only:
-    - qa
-    - production
-
-jobs:
-  include:
-    - stage: docker build
-      if: (branch = qa or branch = production)
-      before_install:
-        - if [[ $TRAVIS_BRANCH == "qa" ]];
-          then
-          export NEXT_PUBLIC_APP_ENV="qa";
-          fi
-        - if [[ "$TRAVIS_BRANCH" == "production" ]];
-          then
-          export NEXT_PUBLIC_APP_ENV="production";
-          fi
-      env:
-        - ECR_URL=946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog
-        - AWS_DEFAULT_REGION=us-east-1
-        - AWS_REGION=us-east-1
-      install:
-        - pip install --user awscli
-        - export LOCAL_TAG_NAME="${NEXT_PUBLIC_APP_ENV}-latest"
-      script:
-        - eval $(aws ecr get-login --no-include-email --region us-east-1)
-        - docker build -t "$LOCAL_TAG_NAME" --build-arg NEXT_PUBLIC_APP_ENV="${NEXT_PUBLIC_APP_ENV}" .
-        - docker tag "$LOCAL_TAG_NAME" "$ECR_URL:$LOCAL_TAG_NAME"
-        # Re-tag last latest image just in case
-        - |
-          MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="$NEXT_PUBLIC_APP_ENV-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
-          aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="$NEXT_PUBLIC_APP_ENV-previous" || true
-          aws ecr put-image --repository-name research-catalog --image-tag "$NEXT_PUBLIC_APP_ENV-previous" --image-manifest "$MANIFEST" || true
-        - docker push "$ECR_URL:$LOCAL_TAG_NAME"
-
-    - stage: deploy qa
-      if: branch IN (qa) AND type != pull_request
-      env:
-        - AWS_DEFAULT_REGION=us-east-1
-        - AWS_REGION=us-east-1
-        - CLUSTER_NAME=research-catalog-qa
-      install:
-        - pip install --user awscli
-      script:
-        - aws ecs update-service --cluster $CLUSTER_NAME --service $CLUSTER_NAME --force-new-deployment
-
-    - stage: deploy production
-      if: branch IN (production) AND type != pull_request
-      env:
-        - AWS_DEFAULT_REGION=us-east-1
-        - AWS_REGION=us-east-1
-        - CLUSTER_NAME=research-catalog-production
-      install:
-        - pip install --user awscli
-      script:
-        - aws ecs update-service --cluster $CLUSTER_NAME --service $CLUSTER_NAME --force-new-deployment

From f6ddb498aaae4a2b19e1e85933e288a0de417096 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 10:27:52 -0400
Subject: [PATCH 031/141] Update changelog

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b351af61b..78fa7fb48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Prerelease
+
+### Updated
+
+- Replaced travis with github actions (SCC-4218)
+
 ## [1.2.4] 2024-08-29
 
 ### Fixed

From b81a960241d44982fa57c625935ec7d3743fedaf Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 10:32:32 -0400
Subject: [PATCH 032/141] Remove ci.yml

---
 .github/workflows/ci.yml | 42 ----------------------------------------
 package.json             |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index e123d90a6..000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# For all pushes, this workflow will
-#     - Install deps
-#     - Lint
-#     - Test
-name: CI
-
-on: push
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    env:
-      CI: true
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Cache and install node modules
-        uses: bahmutov/npm-install@v1
-        with:
-          useLockFile: false
-      - name: Lint
-        run: npm run lint
-
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    env:
-      CI: true
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Cache and install node modules
-        uses: bahmutov/npm-install@v1
-      - name: Test
-        run: npm run test:ci
diff --git a/package.json b/package.json
index f16fe375d..913a8b964 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "test": "jest",
     "test-watch": "jest --watch",
     "test-watch-quiet": "DEBUG_PRINT_LIMIT=0 npm run test-watch",
-    "test:ci": "jest --ci --config=jest.config.js",
     "coverage": "jest --coverage"
   },
   "dependencies": {

From 1de46c6cc764459e963bc46c5fc783bc82999d43 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 11:50:09 -0400
Subject: [PATCH 033/141] Move MANIFEST to run step and move ECR_URL to top env
 attribute

---
 .github/workflows/deploy_production.yml | 5 ++---
 .github/workflows/deploy_qa.yml         | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index b9022b9be..d35c5329c 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -13,6 +13,7 @@ permissions:
 env:
   AWS_DEFAULT_REGION: us-east-1
   LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
 
 jobs:
   deploy:
@@ -32,12 +33,10 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build and push Docker image to Amazon ECR
-        env:
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="production-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=production --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="production-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="production-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "production-previous" --image-manifest "$MANIFEST" || true
           docker push $ECR_URL
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 7a5d5ad45..4acd627fd 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -13,6 +13,7 @@ permissions:
 env:
   AWS_DEFAULT_REGION: us-east-1
   LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
 
 jobs:
   deploy:
@@ -32,13 +33,10 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build and push Docker image to Amazon ECR
-        env:
-          ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
-          MANIFEST: $(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
-
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=qa --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
           docker push $ECR_URL

From 48cb82e8d19961d1ffc58b661953a5a0021e49ec Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 14:25:50 -0400
Subject: [PATCH 034/141] Add test branch to deploy_qa.yml

---
 .github/workflows/deploy_production.yml |  1 +
 .github/workflows/deploy_qa.yml         | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index d35c5329c..96dc31adb 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -36,6 +36,7 @@ jobs:
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=production --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          # Re-tag last latest image just in case
           MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="production-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="production-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "production-previous" --image-manifest "$MANIFEST" || true
diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index 4acd627fd..c300ba88e 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - qa
+      - SCC-4218/move-rc-from-travis-to-github-actions
 
 permissions:
   id-token: write
@@ -12,7 +13,8 @@ permissions:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
-  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  # LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
+  LOCAL_TAG_NAME: research-catalog:test-${{ github.run_number }}
   ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
 
 jobs:
@@ -36,11 +38,12 @@ jobs:
         run: |
           docker build --build-arg NEXT_PUBLIC_APP_ENV=qa --tag $LOCAL_TAG_NAME .
           docker tag $LOCAL_TAG_NAME $ECR_URL
+          # Re-tag last latest image just in case
           MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
-          docker push $ECR_URL
+          # docker push $ECR_URL
 
-      - name: Update ECS service
-        run: |
-          aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
+      # - name: Update ECS service
+      #   run: |
+      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment

From 00127014148a3ec916902c83fe07937833f9691b Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 10 Sep 2024 15:12:54 -0400
Subject: [PATCH 035/141] Rename refreshedViaCheckbox to
 updateFocusOnItemTableHeading

---
 pages/bib/[id]/index.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index 68d66f9b1..8da0213fb 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -97,7 +97,7 @@ export default function BibPage({
   const refreshItemTable = async (
     newQuery: BibQueryParams,
     viewAllItems = false,
-    refreshedViaCheckbox = false
+    updateFocusOnItemTableHeading = false
   ) => {
     setItemsLoading(true)
     setItemFetchError(false)
@@ -147,7 +147,7 @@ export default function BibPage({
 
         // TODO: This is a workaround to prevent the Displaying text from receiving focus when filters are controlled via a checkbox
         // This is an accessibility issue that should be addressed when the dynamic refresh is replaced with a form and apply button
-        if (!refreshedViaCheckbox)
+        if (!updateFocusOnItemTableHeading)
           setTimeout(() => {
             itemTableHeadingRef.current?.focus()
           }, FOCUS_TIMEOUT)
@@ -168,7 +168,7 @@ export default function BibPage({
 
   const handleFiltersChange = async (
     newAppliedFilterQuery: ItemFilterQueryParams,
-    refreshedViaCheckbox = false
+    updateFocusOnItemTableHeading = false
   ) => {
     const newQuery = {
       ...newAppliedFilterQuery,
@@ -176,7 +176,11 @@ export default function BibPage({
     if (newQuery.item_page) delete newQuery.item_page
     setItemTablePage(1)
     setAppliedFilters(parseItemFilterQueryParams(newAppliedFilterQuery))
-    await refreshItemTable(newQuery, viewAllExpanded, refreshedViaCheckbox)
+    await refreshItemTable(
+      newQuery,
+      viewAllExpanded,
+      updateFocusOnItemTableHeading
+    )
   }
 
   const handlePageChange = async (page: number) => {

From 1d4df5b7c1113553987f675e8e10438122166e32 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 15:27:43 -0400
Subject: [PATCH 036/141] Initialize invalid year state

---
 src/components/ItemFilters/ItemFilters.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index a52a3827f..19fcb237c 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -42,6 +42,9 @@ const ItemFilters = ({
   // We have to set the year value in state to be able to test form control in jest.
   // TODO: Remove this if we can find a better way to test form submissions in jest.
   const [year, setYear] = useState(appliedFilters.year[0] || "")
+
+  const [invalidYear, setInvalidYear] = useState(false)
+
   const filterData = useRef<ItemFilterData[]>(
     itemAggregations.map((aggregation: Aggregation) => {
       if (aggregation.field === "location")
@@ -106,6 +109,8 @@ const ItemFilters = ({
 
   const handleYearSubmit = async (e: SyntheticEvent) => {
     e.preventDefault()
+
+    setInvalidYear(year.length !== 4)
     await submitFilters(year.length ? [year] : [], "year")
   }
 

From 5c7c3859a2a7839574c476dae7341f6199bbbaf2 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 16:00:14 -0400
Subject: [PATCH 037/141] Show error when year length is not 4

---
 src/components/ItemFilters/ItemFilters.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 19fcb237c..942adb4a8 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -110,8 +110,13 @@ const ItemFilters = ({
   const handleYearSubmit = async (e: SyntheticEvent) => {
     e.preventDefault()
 
-    setInvalidYear(year.length !== 4)
-    await submitFilters(year.length ? [year] : [], "year")
+    if (year.length !== 4) {
+      setInvalidYear(true)
+    } else {
+      setInvalidYear(false)
+      await submitFilters(year.length ? [year] : [], "year")
+    }
+    
   }
 
   // function for renderChildren prop of FilterBarInline
@@ -123,7 +128,7 @@ const ItemFilters = ({
           labelText="Filter by"
           renderMultiSelect={renderMultiSelect}
         />
-        <Box minWidth={{ md: 440 }}>
+        <Box minWidth={{ md: 440 }} >
           <Label id="year-filter-label" htmlFor="searchbar-form-year-filter">
             Search by year
           </Label>
@@ -132,6 +137,8 @@ const ItemFilters = ({
             labelText="Apply year filter"
             aria-labelledby="year-filter-label"
             data-testid="year-filter"
+            isInvalid={invalidYear}
+            invalidText='Error: Please enter a valid year.'
             textInputProps={{
               placeholder: "YYYY",
               isClearable: true,
@@ -181,7 +188,7 @@ const ItemFilters = ({
           data-testid="item-filters-container"
           width="full"
           layout="row"
-          sx={{ fieldset: { lg: { width: "45%" } } }}
+          sx={{ fieldset: { lg: { width: "45%" } }, "div": {alignItems: "flex-start"} }}
           renderChildren={filterBarContent}
         />
       </Box>

From 17fce2449334f977274d384ff26df1bed04f3f3c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 16:05:41 -0400
Subject: [PATCH 038/141] Adjust filter styles

---
 src/components/ItemFilters/ItemFilters.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 942adb4a8..b1e3ee3aa 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -116,7 +116,6 @@ const ItemFilters = ({
       setInvalidYear(false)
       await submitFilters(year.length ? [year] : [], "year")
     }
-    
   }
 
   // function for renderChildren prop of FilterBarInline
@@ -128,7 +127,7 @@ const ItemFilters = ({
           labelText="Filter by"
           renderMultiSelect={renderMultiSelect}
         />
-        <Box minWidth={{ md: 440 }} >
+        <Box width={{ sm: "100%", md: 440 }}>
           <Label id="year-filter-label" htmlFor="searchbar-form-year-filter">
             Search by year
           </Label>
@@ -138,7 +137,7 @@ const ItemFilters = ({
             aria-labelledby="year-filter-label"
             data-testid="year-filter"
             isInvalid={invalidYear}
-            invalidText='Error: Please enter a valid year.'
+            invalidText="Error: Please enter a valid year."
             textInputProps={{
               placeholder: "YYYY",
               isClearable: true,
@@ -188,7 +187,10 @@ const ItemFilters = ({
           data-testid="item-filters-container"
           width="full"
           layout="row"
-          sx={{ fieldset: { lg: { width: "45%" } }, "div": {alignItems: "flex-start"} }}
+          sx={{
+            fieldset: { width: {sm: "100%", md: "45%"} },
+            "> div": { alignItems: "flex-start" },
+          }}
           renderChildren={filterBarContent}
         />
       </Box>

From ee1ee8faf8ad522a8d226e254c873a5ca0a3409b Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 16:13:51 -0400
Subject: [PATCH 039/141] Added numeric validation

---
 src/components/ItemFilters/ItemFilters.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index b1e3ee3aa..7097f20bb 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -109,12 +109,13 @@ const ItemFilters = ({
 
   const handleYearSubmit = async (e: SyntheticEvent) => {
     e.preventDefault()
+    const isNumeric: boolean= /^[0-9]*$/.test(year)
 
-    if (year.length !== 4) {
+    if (year.length !== 4 || !isNumeric) {
       setInvalidYear(true)
     } else {
       setInvalidYear(false)
-      await submitFilters(year.length ? [year] : [], "year")
+      await submitFilters([year], "year")
     }
   }
 
@@ -145,7 +146,7 @@ const ItemFilters = ({
               name: "year-filter",
               value: year,
               onChange: ({ target }) => setYear(target.value),
-              isClearableCallback: () => setYear(""),
+              isClearableCallback: () => setYear("")
             }}
             onSubmit={handleYearSubmit}
           />
@@ -188,7 +189,7 @@ const ItemFilters = ({
           width="full"
           layout="row"
           sx={{
-            fieldset: { width: {sm: "100%", md: "45%"} },
+            fieldset: { width: { sm: "100%", md: "45%" } },
             "> div": { alignItems: "flex-start" },
           }}
           renderChildren={filterBarContent}

From 3fa7309c88b4d7487afb2c20c213b99cf61a7210 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 16:16:13 -0400
Subject: [PATCH 040/141] Prettier formatting

---
 src/components/ItemFilters/ItemFilters.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 7097f20bb..3bdf1c565 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -109,7 +109,7 @@ const ItemFilters = ({
 
   const handleYearSubmit = async (e: SyntheticEvent) => {
     e.preventDefault()
-    const isNumeric: boolean= /^[0-9]*$/.test(year)
+    const isNumeric: boolean = /^[0-9]*$/.test(year)
 
     if (year.length !== 4 || !isNumeric) {
       setInvalidYear(true)
@@ -146,7 +146,7 @@ const ItemFilters = ({
               name: "year-filter",
               value: year,
               onChange: ({ target }) => setYear(target.value),
-              isClearableCallback: () => setYear("")
+              isClearableCallback: () => setYear(""),
             }}
             onSubmit={handleYearSubmit}
           />

From 7c599b45ff01b695cf46de1662da93afcef296a7 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 11 Sep 2024 17:03:03 -0400
Subject: [PATCH 041/141] Render title and start adding tests

---
 __test__/pages/bib/bibPage.test.tsx           | 41 ++++++++++++++++++-
 src/components/SearchResults/SearchResult.tsx |  2 +-
 src/models/Bib.ts                             |  6 ++-
 src/models/Item.ts                            |  2 +-
 src/models/modelTests/Bib.test.ts             |  6 ++-
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/__test__/pages/bib/bibPage.test.tsx b/__test__/pages/bib/bibPage.test.tsx
index 340f1f3cf..33479b9f9 100644
--- a/__test__/pages/bib/bibPage.test.tsx
+++ b/__test__/pages/bib/bibPage.test.tsx
@@ -168,11 +168,48 @@ describe("Bib Page Item Table", () => {
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
 
     expect(mockRouter.asPath).toBe("/bib/pb5579193?item_date=2005")
+  })
+
+  it("shows an error and doesn't update router when an invalid year is submitted", async () => {
+    const yearFilter = screen.queryByTestId("year-filter")
+    const yearField = screen.queryByPlaceholderText("YYYY")
+
+    // blank year
+    await userEvent.click(yearFilter.querySelector("button[type='submit']"))
+    expect(mockRouter.asPath).toBe("/bib/pb5579193")
+    expect(
+      screen.queryByText("Error: Please enter a valid year.")
+    ).toBeInTheDocument()
+
+    // non-numeric
+    await userEvent.type(yearField, "ABCD")
+    await userEvent.click(yearFilter.querySelector("button[type='submit']"))
+    expect(mockRouter.asPath).toBe("/bib/pb5579193")
+    expect(
+      screen.queryByText("Error: Please enter a valid year.")
+    ).toBeInTheDocument()
 
-    // Clear the year field
-    await userEvent.click(yearFilter.querySelector("button[type='button']"))
+    // not of length 3
+    await userEvent.type(yearField, "1")
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
     expect(mockRouter.asPath).toBe("/bib/pb5579193")
+    expect(
+      screen.queryByText("Error: Please enter a valid year.")
+    ).toBeInTheDocument()
+  })
+
+  it("shows an error and doesn't update router when a blank year us submitted", async () => {
+    const yearFilter = screen.queryByTestId("year-filter")
+    const yearField = screen.queryByPlaceholderText("YYYY")
+
+    await userEvent.click(yearFilter.querySelector("button[type='submit']"))
+
+    expect(mockRouter.asPath).toBe("/bib/pb5579193")
+    expect(
+      screen.queryByText("Error: Please enter a valid year.")
+    ).toBeInTheDocument()
+
+    await userEvent.type(yearField, "")
   })
 
   it("clears a filter group when the MultiSelect clear button is clicked", async () => {
diff --git a/src/components/SearchResults/SearchResult.tsx b/src/components/SearchResults/SearchResult.tsx
index 770088c74..d132c2d6a 100644
--- a/src/components/SearchResults/SearchResult.tsx
+++ b/src/components/SearchResults/SearchResult.tsx
@@ -34,7 +34,7 @@ const SearchResult = ({ bib }: SearchResultProps) => {
         size="heading5"
         sx={{ a: { textDecoration: "none" } }}
       >
-        <RCLink href={`${PATHS.BIB}/${bib.id}`}>{bib.title}</RCLink>
+        <RCLink href={`${PATHS.BIB}/${bib.id}`}>{bib.titleDisplay}</RCLink>
       </CardHeading>
       <CardContent>
         <Box
diff --git a/src/models/Bib.ts b/src/models/Bib.ts
index accc0f398..4ea34aa51 100644
--- a/src/models/Bib.ts
+++ b/src/models/Bib.ts
@@ -16,6 +16,7 @@ import ItemTableData from "./ItemTableData"
 export default class Bib {
   id: string
   title: string
+  titleDisplay: string
   electronicResources?: ElectronicResource[]
   numPhysicalItems: number
   numItemsMatched: number
@@ -26,7 +27,8 @@ export default class Bib {
 
   constructor(result: DiscoveryBibResult) {
     this.id = result["@id"] ? result["@id"].substring(4) : ""
-    this.title = this.getTitleFromResult(result)
+    this.title = result.title[0] || ""
+    this.titleDisplay = this.getTitleDisplayFromResult(result)
     this.electronicResources = result.electronicResources || null
     this.numPhysicalItems = result.numItemsTotal || 0
     this.numItemsMatched = result.numItemsMatched || 0
@@ -106,7 +108,7 @@ export default class Bib {
     } items. This may take a few moments...`
   }
 
-  getTitleFromResult(result: DiscoveryBibResult) {
+  getTitleDisplayFromResult(result: DiscoveryBibResult) {
     if (!result.titleDisplay || !result.titleDisplay.length) {
       const author =
         result.creatorLiteral && result.creatorLiteral.length
diff --git a/src/models/Item.ts b/src/models/Item.ts
index 9d2021c5f..436ee500a 100644
--- a/src/models/Item.ts
+++ b/src/models/Item.ts
@@ -56,7 +56,7 @@ export default class Item {
     this.dueDate = item.dueDate?.length ? item.dueDate[0] : null
     this.isPhysicallyRequestable = item.physRequestable
     this.isEDDRequestable = item.eddRequestable
-    this.bibTitle = bib.title
+    this.bibTitle = bib.titleDisplay
   }
 
   // Item availability is determined by the existence of status id in the availability ids list
diff --git a/src/models/modelTests/Bib.test.ts b/src/models/modelTests/Bib.test.ts
index cad03380d..3ee397591 100644
--- a/src/models/modelTests/Bib.test.ts
+++ b/src/models/modelTests/Bib.test.ts
@@ -14,10 +14,14 @@ describe("Bib model", () => {
       expect(bib.id).toBe("b15080796")
     })
 
-    it("initializes the title as titleDisplay field when present", () => {
+    it("initializes the title when present", () => {
       expect(bib.title).toBe("Urban spaghetti.")
     })
 
+    it("initializes the titleDisplay field when present", () => {
+      expect(bib.titleDisplay).toBe("Urban spaghetti.")
+    })
+
     it("initializes the electronicResources as empty array when missing from bib result", () => {
       expect(bib.electronicResources).toStrictEqual([])
     })

From de378a739a0c34afbf5f254fc148880ea587931e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 13 Sep 2024 13:15:20 -0400
Subject: [PATCH 042/141] Add base url to bib detail links

---
 src/components/BibPage/BibDetail.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/BibPage/BibDetail.tsx b/src/components/BibPage/BibDetail.tsx
index c36598ef7..c331eacba 100644
--- a/src/components/BibPage/BibDetail.tsx
+++ b/src/components/BibPage/BibDetail.tsx
@@ -14,6 +14,7 @@ import type {
 } from "../../types/bibDetailsTypes"
 import { rtlOrLtr, isItTheLastElement } from "../../utils/bibUtils"
 import type { ReactNode } from "react"
+import { BASE_URL } from "../../config/constants"
 
 interface BibDetailsProps {
   details: AnyBibDetail[]
@@ -126,7 +127,7 @@ const LinkElement = (url: Url, linkType: string) => {
   return (
     <Link
       dir={stringDirection}
-      href={url.url}
+      href={BASE_URL + url.url}
       key={url.url}
       includeBaseUrl={false}
       textDecoration="none"

From 025060ae85f868488379707fe4617b6a33e82215 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 13 Sep 2024 14:42:00 -0400
Subject: [PATCH 043/141] Conditionally show date filter

---
 pages/bib/[id]/index.tsx                   |  1 +
 src/components/ItemFilters/ItemFilters.tsx | 50 ++++++++++++----------
 src/models/Bib.ts                          |  2 +
 src/types/bibTypes.ts                      |  1 +
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index 8da0213fb..2f223eb2f 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -247,6 +247,7 @@ export default function BibPage({
               handleFiltersChange={handleFiltersChange}
               appliedFilters={appliedFilters}
               filtersAreApplied={filtersAreApplied}
+              showDateFilter={bib.hasItemDates}
             />
             <Box id="item-table">
               {itemsLoading ? (
diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 3bdf1c565..512a69cd0 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -31,6 +31,7 @@ interface ItemFilterContainerProps {
   ) => Promise<void>
   appliedFilters?: AppliedItemFilters
   filtersAreApplied?: boolean
+  showDateFilter?: boolean
 }
 
 const ItemFilters = ({
@@ -38,6 +39,7 @@ const ItemFilters = ({
   handleFiltersChange,
   appliedFilters = { location: [], format: [], status: [], year: [] },
   filtersAreApplied = false,
+  showDateFilter = false,
 }: ItemFilterContainerProps) => {
   // We have to set the year value in state to be able to test form control in jest.
   // TODO: Remove this if we can find a better way to test form submissions in jest.
@@ -128,29 +130,31 @@ const ItemFilters = ({
           labelText="Filter by"
           renderMultiSelect={renderMultiSelect}
         />
-        <Box width={{ sm: "100%", md: 440 }}>
-          <Label id="year-filter-label" htmlFor="searchbar-form-year-filter">
-            Search by year
-          </Label>
-          <SearchBar
-            id="year-filter"
-            labelText="Apply year filter"
-            aria-labelledby="year-filter-label"
-            data-testid="year-filter"
-            isInvalid={invalidYear}
-            invalidText="Error: Please enter a valid year."
-            textInputProps={{
-              placeholder: "YYYY",
-              isClearable: true,
-              labelText: "Search by year form input",
-              name: "year-filter",
-              value: year,
-              onChange: ({ target }) => setYear(target.value),
-              isClearableCallback: () => setYear(""),
-            }}
-            onSubmit={handleYearSubmit}
-          />
-        </Box>
+        {showDateFilter ? (
+          <Box width={{ sm: "100%", md: 440 }}>
+            <Label id="year-filter-label" htmlFor="searchbar-form-year-filter">
+              Search by year
+            </Label>
+            <SearchBar
+              id="year-filter"
+              labelText="Apply year filter"
+              aria-labelledby="year-filter-label"
+              data-testid="year-filter"
+              isInvalid={invalidYear}
+              invalidText="Error: Please enter a valid year."
+              textInputProps={{
+                placeholder: "YYYY",
+                isClearable: true,
+                labelText: "Search by year form input",
+                name: "year-filter",
+                value: year,
+                onChange: ({ target }) => setYear(target.value),
+                isClearableCallback: () => setYear(""),
+              }}
+              onSubmit={handleYearSubmit}
+            />
+          </Box>
+        ) : null}
       </>
     )
   }
diff --git a/src/models/Bib.ts b/src/models/Bib.ts
index 4ea34aa51..6b35b64ed 100644
--- a/src/models/Bib.ts
+++ b/src/models/Bib.ts
@@ -24,6 +24,7 @@ export default class Bib {
   issuance?: JSONLDValue[]
   items?: Item[]
   itemAggregations?: Aggregation[]
+  hasItemDates?: boolean
 
   constructor(result: DiscoveryBibResult) {
     this.id = result["@id"] ? result["@id"].substring(4) : ""
@@ -37,6 +38,7 @@ export default class Bib {
     this.issuance = (result.issuance?.length && result.issuance) || null
     this.items = this.getItemsFromResult(result)
     this.itemAggregations = result.itemAggregations || null
+    this.hasItemDates = result.hasItemDates || false
   }
 
   get url() {
diff --git a/src/types/bibTypes.ts b/src/types/bibTypes.ts
index 9e527f245..a3608168f 100644
--- a/src/types/bibTypes.ts
+++ b/src/types/bibTypes.ts
@@ -31,6 +31,7 @@ export interface DiscoveryBibResult {
   holdings?: object
   owner?: { "@id": string; prefLabel: string }
   subjectHeadings?: SubjectHeading[]
+  hasItemDates?: boolean
 }
 
 // export interface Holding {

From 38907a8bf150f39c79dd5307847030b592c16aff Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 13 Sep 2024 15:06:36 -0400
Subject: [PATCH 044/141] Add tests for year validation

---
 __test__/pages/bib/bibPage.test.tsx           |  21 +--
 pages/bib/[id]/index.tsx                      |   2 +-
 .../ItemFilters/ItemFilters.test.tsx          | 142 +++++++++++-------
 src/models/modelTests/Bib.test.ts             |   4 +
 4 files changed, 96 insertions(+), 73 deletions(-)

diff --git a/__test__/pages/bib/bibPage.test.tsx b/__test__/pages/bib/bibPage.test.tsx
index 33479b9f9..5aff07423 100644
--- a/__test__/pages/bib/bibPage.test.tsx
+++ b/__test__/pages/bib/bibPage.test.tsx
@@ -170,6 +170,13 @@ describe("Bib Page Item Table", () => {
     expect(mockRouter.asPath).toBe("/bib/pb5579193?item_date=2005")
   })
 
+  it("clears the year filter when the year tag is clicked", async () => {
+    const yearTag = screen.queryByText("Year > 2005").closest("button")
+    await userEvent.click(yearTag)
+
+    expect(mockRouter.asPath).toBe("/bib/pb5579193")
+  })
+
   it("shows an error and doesn't update router when an invalid year is submitted", async () => {
     const yearFilter = screen.queryByTestId("year-filter")
     const yearField = screen.queryByPlaceholderText("YYYY")
@@ -198,20 +205,6 @@ describe("Bib Page Item Table", () => {
     ).toBeInTheDocument()
   })
 
-  it("shows an error and doesn't update router when a blank year us submitted", async () => {
-    const yearFilter = screen.queryByTestId("year-filter")
-    const yearField = screen.queryByPlaceholderText("YYYY")
-
-    await userEvent.click(yearFilter.querySelector("button[type='submit']"))
-
-    expect(mockRouter.asPath).toBe("/bib/pb5579193")
-    expect(
-      screen.queryByText("Error: Please enter a valid year.")
-    ).toBeInTheDocument()
-
-    await userEvent.type(yearField, "")
-  })
-
   it("clears a filter group when the MultiSelect clear button is clicked", async () => {
     const checkboxGroups = screen.getAllByTestId("checkbox-group")
 
diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index 2f223eb2f..eecee5f6c 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -1,6 +1,6 @@
 import Head from "next/head"
 import type { SyntheticEvent } from "react"
-import { useState, useRef, useEffect } from "react"
+import { useState, useRef } from "react"
 import { useRouter } from "next/router"
 import {
   Heading,
diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index 184516233..d4183c3e2 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -8,75 +8,101 @@ import Bib from "../../models/Bib"
 
 describe("ItemFilters", () => {
   let filtersChangeMock: jest.Mock
-  beforeEach(() => {
-    const bib = new Bib(bibWithItems.resource)
-    filtersChangeMock = jest.fn()
-    render(
-      <ItemFilters
-        itemAggregations={bib.itemAggregations}
-        handleFiltersChange={filtersChangeMock}
-        appliedFilters={{
-          location: ["Offsite"],
-          format: ["Text"],
-          status: ["Available"],
-          year: [],
-        }}
-        filtersAreApplied={true}
-      />
-    )
-  })
 
-  it("renders the Filter bar container", () => {
-    expect(screen.getByTestId("item-filters-container")).toBeInTheDocument()
-  })
+  describe("ItemFilters with year filter", () => {
+    let filtersChangeMock: jest.Mock
+    beforeEach(() => {
+      const bib = new Bib(bibWithItems.resource)
+      filtersChangeMock = jest.fn()
+      render(
+        <ItemFilters
+          itemAggregations={bib.itemAggregations}
+          handleFiltersChange={filtersChangeMock}
+          appliedFilters={{
+            location: ["Offsite"],
+            format: ["Text"],
+            status: ["Available"],
+            year: [],
+          }}
+          filtersAreApplied={true}
+          showDateFilter={true}
+        />
+      )
+    })
 
-  it("renders filters container with one MultiSelect per populated checkbox group", async () => {
-    expect(screen.getByTestId("item-filters-container")).toBeInTheDocument()
-    expect(screen.getByTestId("format-multi-select")).toBeInTheDocument()
-    expect(screen.getByTestId("status-multi-select")).toBeInTheDocument()
-  })
+    it("renders the Filter bar container", () => {
+      expect(screen.getByTestId("item-filters-container")).toBeInTheDocument()
+    })
 
-  it("renders the year search form", async () => {
-    expect(screen.getByLabelText("Search by year")).toBeInTheDocument()
-  })
+    it("renders filters container with one MultiSelect per populated checkbox group", async () => {
+      expect(screen.getByTestId("item-filters-container")).toBeInTheDocument()
+      expect(screen.getByTestId("format-multi-select")).toBeInTheDocument()
+      expect(screen.getByTestId("status-multi-select")).toBeInTheDocument()
+    })
 
-  it("closes open filters when user clicks outside of the filter", async () => {
-    const outsideOfTheFilter = screen.getByLabelText("Search by year")
+    it("renders the year search form when showDateFilter is true", async () => {
+      expect(screen.getByLabelText("Search by year")).toBeInTheDocument()
+    })
 
-    const locationFilterButton = screen
-      .getByTestId("location-multi-select")
-      .querySelector("button")
-    await userEvent.click(locationFilterButton)
+    it("closes open filters when user clicks outside of the filter", async () => {
+      const outsideOfTheFilter = screen.getByLabelText("Search by year")
 
-    expect(locationFilterButton).toHaveAttribute("aria-expanded", "true")
+      const locationFilterButton = screen
+        .getByTestId("location-multi-select")
+        .querySelector("button")
+      await userEvent.click(locationFilterButton)
 
-    await userEvent.click(outsideOfTheFilter)
-    expect(locationFilterButton).toHaveAttribute("aria-expanded", "false")
-  })
+      expect(locationFilterButton).toHaveAttribute("aria-expanded", "true")
 
-  it("calls the change handler when filter values are changed", async () => {
-    await userEvent.click(screen.getByTestId("location-multi-select"))
-    const offsiteCheckbox = screen.getByLabelText("Offsite")
+      await userEvent.click(outsideOfTheFilter)
+      expect(locationFilterButton).toHaveAttribute("aria-expanded", "false")
+    })
 
-    await userEvent.click(offsiteCheckbox)
+    it("calls the change handler when filter values are changed", async () => {
+      await userEvent.click(screen.getByTestId("location-multi-select"))
+      const offsiteCheckbox = screen.getByLabelText("Offsite")
 
-    expect(filtersChangeMock).toHaveBeenCalledTimes(1)
+      await userEvent.click(offsiteCheckbox)
 
-    await userEvent.click(offsiteCheckbox)
-    expect(filtersChangeMock).toHaveBeenCalledTimes(2)
-  })
+      expect(filtersChangeMock).toHaveBeenCalledTimes(1)
 
-  it("renders TagSet data when filters are applied and removes the filter when tag is clicked", async () => {
-    expect(screen.queryByText("Active filters")).toBeInTheDocument()
-    await userEvent.click(
-      screen.getByLabelText("Location > Offsite, click to remove filter")
-    )
-    expect(filtersChangeMock).toHaveBeenCalledWith(
-      {
-        item_format: "Text",
-        item_status: "Available",
-      },
-      false
-    )
+      await userEvent.click(offsiteCheckbox)
+      expect(filtersChangeMock).toHaveBeenCalledTimes(2)
+    })
+
+    it("renders TagSet data when filters are applied and removes the filter when tag is clicked", async () => {
+      expect(screen.queryByText("Active filters")).toBeInTheDocument()
+      await userEvent.click(
+        screen.getByLabelText("Location > Offsite, click to remove filter")
+      )
+      expect(filtersChangeMock).toHaveBeenCalledWith(
+        {
+          item_format: "Text",
+          item_status: "Available",
+        },
+        false
+      )
+    })
+  })
+  describe("ItemFilters no year filter", () => {
+    it("does not render the year search form when showDateFilter is false", async () => {
+      const bib = new Bib(bibWithItems.resource)
+      filtersChangeMock = jest.fn()
+      render(
+        <ItemFilters
+          itemAggregations={bib.itemAggregations}
+          handleFiltersChange={filtersChangeMock}
+          appliedFilters={{
+            location: ["Offsite"],
+            format: ["Text"],
+            status: ["Available"],
+            year: [],
+          }}
+          filtersAreApplied={true}
+          showDateFilter={false}
+        />
+      )
+      expect(screen.queryByLabelText("Search by year")).not.toBeInTheDocument()
+    })
   })
 })
diff --git a/src/models/modelTests/Bib.test.ts b/src/models/modelTests/Bib.test.ts
index 3ee397591..592572f40 100644
--- a/src/models/modelTests/Bib.test.ts
+++ b/src/models/modelTests/Bib.test.ts
@@ -45,5 +45,9 @@ describe("Bib model", () => {
       expect(typeof bib.items[0]).toBe("object")
       expect(bib.items[0] instanceof Item).toBe(true)
     })
+
+    it("initializes the hasItemDates field when present", () => {
+      expect(bib.hasItemDates).toBe(true)
+    })
   })
 })

From 5e2b8d699ff4aa92d23e56c13cf1e039dbcf2fa9 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 13 Sep 2024 15:57:38 -0400
Subject: [PATCH 045/141] update field names

---
 src/components/SearchForm/SearchForm.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index ffc6d07d7..170cd01b1 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -84,11 +84,11 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
             labelText: "Select a category",
             name: "search_scope",
             optionsData: [
-              { text: "All fields", value: "all" },
+              { text: "Keyword", value: "all" },
               { text: "Title", value: "title" },
-              { text: "Journal Title", value: "journal_title" },
-              { text: "Author/Contributor", value: "contributor" },
-              { text: "Standard Numbers", value: "standard_number" },
+              { text: "Author/contributor", value: "contributor" },
+              { text: "Journal title", value: "journal_title" },
+              { text: "Control numbers/identifiers", value: "standard_number" },
               { text: "Subject", value: "subject" },
             ],
           }}

From 707f1a373248d37e8d8ec5ef1194246b233aaff7 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 13 Sep 2024 16:06:57 -0400
Subject: [PATCH 046/141] add separate call number field

---
 src/components/SearchForm/SearchForm.tsx | 1 +
 src/utils/searchUtils.ts                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index 170cd01b1..d82ab6b3b 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -88,6 +88,7 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
               { text: "Title", value: "title" },
               { text: "Author/contributor", value: "contributor" },
               { text: "Journal title", value: "journal_title" },
+              { text: "Call number", value: "callnumber" },
               { text: "Control numbers/identifiers", value: "standard_number" },
               { text: "Subject", value: "subject" },
             ],
diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index d3c6431d6..3bf701d1d 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -70,6 +70,7 @@ function buildQueryDisplayString(searchParams: SearchParams): string {
       { name: "isbn", label: "ISBN" },
       { name: "issn", label: "ISSN" },
       { name: "lccn", label: "LCCN" },
+      { name: "callnumber", label: "call number" },
     ])
   const paramsStringCollection = {}
   const searchParamsObject = {

From 202fda794e48192eb38bbe088dc154104e57afad Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 13 Sep 2024 16:10:42 -0400
Subject: [PATCH 047/141] update changelog

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c0dd559d2..cc17f0328 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Prerelease
 
+### Added
+
+- Call number search scope to search dropdown options
+
 ### Fixed
 
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
@@ -14,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Updated
 
 - Replaced travis with github actions (SCC-4218)
+- Sentence case and rearrange search options (SCC-4260)
 
 ## [1.2.4] 2024-08-29
 

From 9d3ae3d3a5d2bd298d17fd822deaa4a1084b2348 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Tue, 17 Sep 2024 14:59:23 -0400
Subject: [PATCH 048/141] add search tip

---
 src/components/SearchForm/SearchForm.tsx | 31 +++++++++------
 src/utils/searchUtils.ts                 | 49 ++++++++++++++++++++++++
 styles/components/Search.module.scss     | 13 +++++++
 3 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index d82ab6b3b..5754b6f9b 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -1,11 +1,20 @@
-import { Box, SearchBar } from "@nypl/design-system-react-components"
+import {
+  Box,
+  Icon,
+  SearchBar,
+  Text,
+} from "@nypl/design-system-react-components"
 import { useRouter } from "next/router"
 import type { SyntheticEvent, Dispatch, SetStateAction } from "react"
 import { useState, useEffect } from "react"
 
 import styles from "../../../styles/components/Search.module.scss"
 import RCLink from "../Links/RCLink/RCLink"
-import { getSearchQuery } from "../../utils/searchUtils"
+import {
+  getSearchQuery,
+  searchFormDropDownOptions,
+  searchTipForDropDownOption,
+} from "../../utils/searchUtils"
 import { BASE_URL, PATHS } from "../../config/constants"
 import EDSLink from "../EDSLink"
 import useLoading from "../../hooks/useLoading"
@@ -28,6 +37,7 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   const [appliedFilters, setAppliedFilters] = useState(
     collapseMultiValueQueryParams(router.query)
   )
+  const searchTip = searchTipForDropDownOption(searchScope)
 
   const isLoading = useLoading()
 
@@ -71,6 +81,13 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   return (
     <div className={styles.searchContainer}>
       <div className={styles.searchContainerInner}>
+        <Text size="body2" className={styles.searchTip}>
+          <Icon size="medium" name="errorOutline" />
+          <Box className={styles.searchTipText}>
+            <span>{"Search tip: "}</span>
+            {searchTip}
+          </Box>
+        </Text>
         <SearchBar
           id="mainContent"
           action={`${BASE_URL}/search`}
@@ -83,15 +100,7 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
             onChange: (e) => handleChange(e, setSearchScope),
             labelText: "Select a category",
             name: "search_scope",
-            optionsData: [
-              { text: "Keyword", value: "all" },
-              { text: "Title", value: "title" },
-              { text: "Author/contributor", value: "contributor" },
-              { text: "Journal title", value: "journal_title" },
-              { text: "Call number", value: "callnumber" },
-              { text: "Control numbers/identifiers", value: "standard_number" },
-              { text: "Subject", value: "subject" },
-            ],
+            optionsData: searchFormDropDownOptions,
           }}
           textInputProps={{
             isClearable: true,
diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index 3bf701d1d..3c89d3d0e 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -14,6 +14,55 @@ import { RESULTS_PER_PAGE } from "../config/constants"
 import { collapseMultiValueQueryParams } from "./refineSearchUtils"
 import { getPaginationOffsetStrings } from "./appUtils"
 
+export const searchFormDropDownOptionsWithSearchTip = [
+  {
+    text: "Keyword",
+    value: "all",
+    searchTip: "Enter a title, or use quotes to search for an exact phrase.",
+  },
+  { text: "Title", value: "title", searchTip: "title tip" },
+  {
+    text: "Author/contributor",
+    value: "contributor",
+    searchTip:
+      "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
+  },
+  {
+    text: "Journal title",
+    value: "journal_title",
+    searchTip:
+      "Enter a journal or serial title, or use quotes to search for an exact phrase.",
+  },
+  {
+    text: "Call number",
+    value: "callnumber",
+    searchTip:
+      "Enter a call number, or the first few letters and numbers of a call number. ",
+  },
+  {
+    text: "Control numbers/identifiers",
+    value: "standard_number",
+    searchTip:
+      "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
+  },
+  {
+    text: "Subject",
+    value: "subject",
+    searchTip: "Enter a subject name or phrase. Learn more about searching.",
+  },
+]
+
+export const searchFormDropDownOptions =
+  searchFormDropDownOptionsWithSearchTip.map(({ text, value }) => ({
+    text,
+    value,
+  }))
+
+export const searchTipForDropDownOption = (optionValue: string) => {
+  return searchFormDropDownOptionsWithSearchTip.find(
+    (option) => option.value == optionValue
+  ).searchTip
+}
 /**
  * determineFreshSortByQuery
  * Returns true only if the last update to the query was a sort by change.
diff --git a/styles/components/Search.module.scss b/styles/components/Search.module.scss
index 37b80128f..48ac87eaf 100644
--- a/styles/components/Search.module.scss
+++ b/styles/components/Search.module.scss
@@ -21,6 +21,19 @@
   @include maxWidth;
 }
 
+.searchTip {
+  display: flex;
+  align-items: flex-start;
+  span {
+    font-weight: bold;
+    text-wrap: nowrap;
+  }
+  gap: var(--nypl-space-xxs);
+  svg {
+    margin-top: var(--nypl-space-xxxs);
+  }
+}
+
 .auxSearchContainer {
   display: flex;
   flex-direction: column;

From 41bb0ca646aada3e561416b4266a53fd0180444a Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Wed, 18 Sep 2024 12:50:21 -0400
Subject: [PATCH 049/141] skip pickup times test

---
 __test__/pages/test-pickup-times/index.test.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/__test__/pages/test-pickup-times/index.test.tsx b/__test__/pages/test-pickup-times/index.test.tsx
index f1ba23e49..08b75bf1a 100644
--- a/__test__/pages/test-pickup-times/index.test.tsx
+++ b/__test__/pages/test-pickup-times/index.test.tsx
@@ -1,14 +1,14 @@
 import React from "react"
 import { screen, render } from "../../../src/utils/testUtils"
 
-import TestPickupTimes from "../../../pages/test-pickup-times/index"
+// import TestPickupTimes from "../../../pages/test-pickup-times/index"
 
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
-describe("Test Pickup Times", () => {
+xdescribe("Test Pickup Times", () => {
   describe("Displays testing form", () => {
     it("displays testing form", () => {
-      render(<TestPickupTimes />)
+      // render(<TestPickupTimes />)
 
       const forms = screen.getAllByRole("form")
       expect(forms).toHaveLength(1)

From 9e7a528696c46a90bb83865543e1cd22d657a0e8 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Wed, 18 Sep 2024 12:57:52 -0400
Subject: [PATCH 050/141] add test

---
 src/components/SearchForm/SearchForm.test.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index 032bf4072..b51153961 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -46,4 +46,19 @@ describe("SearchForm", () => {
     const input = screen.getByDisplayValue("spaghetti")
     expect(input).toBeTruthy()
   })
+  describe("search scope options", () => {
+    it("updates the search tip when search scope is updated", async () => {
+      render(<SearchForm aggregations={normalAggs} />)
+      const searchScopeSelect = screen.getByLabelText("Select a category")
+      await userEvent.selectOptions(searchScopeSelect, "journal_title")
+      let searchTip = screen.getByText(
+        "Enter a journal or serial title, or use quotes to search for an exact phrase."
+      )
+      await userEvent.selectOptions(searchScopeSelect, "all")
+      searchTip = screen.getByText(
+        "Enter a title, or use quotes to search for an exact phrase."
+      )
+      expect(searchTip).toBeInTheDocument()
+    })
+  })
 })

From 5cf5d659ebd150eedb37bc831e310f2aa540c130 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Wed, 18 Sep 2024 12:59:31 -0400
Subject: [PATCH 051/141] update changelog

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index cc17f0328..d50af9dc0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Call number search scope to search dropdown options
+- Call number search scope to search dropdown options [(SCC-4260)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4260)
+- Search tip per search scope [(SCC-4263)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4263)
 
 ### Fixed
 

From 36e87bccc9f281f6dde05d44963d94b4a477b636 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 19 Sep 2024 12:15:35 -0500
Subject: [PATCH 052/141] Fix typo and change to pickuptime estimator

---
 __test__/pages/bib/bibPage.test.tsx | 2 +-
 pages/test-pickup-times/index.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/__test__/pages/bib/bibPage.test.tsx b/__test__/pages/bib/bibPage.test.tsx
index 5aff07423..2e5a80bc7 100644
--- a/__test__/pages/bib/bibPage.test.tsx
+++ b/__test__/pages/bib/bibPage.test.tsx
@@ -196,7 +196,7 @@ describe("Bib Page Item Table", () => {
       screen.queryByText("Error: Please enter a valid year.")
     ).toBeInTheDocument()
 
-    // not of length 3
+    // not of length 4
     await userEvent.type(yearField, "1")
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
     expect(mockRouter.asPath).toBe("/bib/pb5579193")
diff --git a/pages/test-pickup-times/index.tsx b/pages/test-pickup-times/index.tsx
index 26d41469d..519c551d2 100644
--- a/pages/test-pickup-times/index.tsx
+++ b/pages/test-pickup-times/index.tsx
@@ -120,7 +120,7 @@ const TestPickupTimes = (params) => {
               <Select
                 id="scenario"
                 name="scenario"
-                labelText="Preloaded scenarios"
+                labelText="Preloaded Scenarios"
                 value={scenario}
                 onChange={(e) =>
                   setScenario((e.target as HTMLInputElement).value)

From 9c2b0c9820b0f77c66f5a6387fd1e50f1f89ba4a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 19 Sep 2024 12:19:52 -0500
Subject: [PATCH 053/141] Change dt margin-bottom to xs

---
 styles/components/BibDetails.module.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/components/BibDetails.module.scss b/styles/components/BibDetails.module.scss
index f423c7689..9c850f441 100644
--- a/styles/components/BibDetails.module.scss
+++ b/styles/components/BibDetails.module.scss
@@ -9,7 +9,7 @@
 
   dt {
     @media (max-width: 600px) {
-      margin-bottom: var(--nypl-space-xxs);
+      margin-bottom: var(--nypl-space-xs);
     }
   }
 

From dee20e990249a5aec71bac9c6c2323c9d3e07cd1 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 09:16:42 -0500
Subject: [PATCH 054/141] Bump DS version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cd7283596..e2202a4e1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.3.1",
+    "@nypl/design-system-react-components": "3.3.2",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.0.9",
     "@nypl/sierra-wrapper": "1.1.0",

From e3f8b373802ac24a9fc874e1f762e727676c6829 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 09:18:35 -0500
Subject: [PATCH 055/141] Package lock changes

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27361213d..73d6af60f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "research-catalog",
       "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.3.1",
+        "@nypl/design-system-react-components": "3.3.2",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.0.9",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,9 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.3.1.tgz",
-      "integrity": "sha512-fu8ASaQwlsiv0l+5mmb8rT3fxLRz1xv8yEvPskruh95FwEJ3dYzBo5litl7uFzKGWj6+Y0hnvT/cZl+Innm6ww==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.3.2.tgz",
+      "integrity": "sha512-PvLCLQ/xUPoYFGC05ZYk5EPK6KcbDZsrW1x/mYPtWLA5TCnQd0VqUBE7vB9EcjIvq4Nu6j8VvOuvsV/53TxjMQ==",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",

From 44d7a2e974304f99683dea5a262b76809073836a Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 20 Sep 2024 10:40:04 -0400
Subject: [PATCH 056/141] update pickup time estimator

---
 .../pages/test-pickup-times/index.test.tsx    |  6 +-
 package-lock.json                             | 65 +++----------------
 package.json                                  |  2 +-
 3 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/__test__/pages/test-pickup-times/index.test.tsx b/__test__/pages/test-pickup-times/index.test.tsx
index 08b75bf1a..f1ba23e49 100644
--- a/__test__/pages/test-pickup-times/index.test.tsx
+++ b/__test__/pages/test-pickup-times/index.test.tsx
@@ -1,14 +1,14 @@
 import React from "react"
 import { screen, render } from "../../../src/utils/testUtils"
 
-// import TestPickupTimes from "../../../pages/test-pickup-times/index"
+import TestPickupTimes from "../../../pages/test-pickup-times/index"
 
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
-xdescribe("Test Pickup Times", () => {
+describe("Test Pickup Times", () => {
   describe("Displays testing form", () => {
     it("displays testing form", () => {
-      // render(<TestPickupTimes />)
+      render(<TestPickupTimes />)
 
       const forms = screen.getAllByRole("form")
       expect(forms).toHaveLength(1)
diff --git a/package-lock.json b/package-lock.json
index 5905e8ae1..d4ec5232f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "research-catalog",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "research-catalog",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "dependencies": {
         "@nypl/design-system-react-components": "3.2.0",
         "@nypl/nypl-data-api-client": "1.0.5",
-        "@nypl/pickup-time-estimator": "^1.0.9",
+        "@nypl/pickup-time-estimator": "^1.5.2",
         "@nypl/sierra-wrapper": "1.1.0",
         "@types/node": "20.3.1",
         "@types/react": "18.2.13",
@@ -2983,9 +2983,9 @@
       }
     },
     "node_modules/@nypl/nypl-core-objects/node_modules/axios": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
-      "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -3014,68 +3014,21 @@
       }
     },
     "node_modules/@nypl/pickup-time-estimator": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@nypl/pickup-time-estimator/-/pickup-time-estimator-1.0.9.tgz",
-      "integrity": "sha512-RcR8DNiXxWe7Vq6yjRJ8jTnUiZYTPaJQiAIgENlUjutvmIMwldKeoCyuLkXszCW+QGjStreDvUtyPzu76we5Lw==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@nypl/pickup-time-estimator/-/pickup-time-estimator-1.5.2.tgz",
+      "integrity": "sha512-aDfmSAr+xP7qqWZxwNGPN3y3byxeheu6VBhN1wjMwpULhMML3cy0qdI5/oaLp15G2geRABpigumWndWecTwMBg==",
       "dependencies": {
         "@nypl/nypl-core-objects": "^3.0.0",
-        "@nypl/nypl-data-api-client": "^2.0.0",
         "iso8601-duration": "^2.1.2",
         "querystring": "^0.2.1",
         "ts-node": "^10.9.2"
       }
     },
-    "node_modules/@nypl/pickup-time-estimator/node_modules/@nypl/nypl-data-api-client": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@nypl/nypl-data-api-client/-/nypl-data-api-client-2.0.0.tgz",
-      "integrity": "sha512-bvo96Gx4BbtcTCyJFXnL5K5n9Qvm3qpVBHz+XcNyBZs04M5UK1mhoQ8my1a9Fu7ZgJqCWYjEtM8KdneqmsdxUg==",
-      "dependencies": {
-        "@nypl/nypl-core-objects": "^3.0.0",
-        "avsc": "^5.7.7",
-        "diff": "^3.5.0",
-        "dotenv": "^16.4.5",
-        "loglevel": "^1.9.1",
-        "loglevel-plugin-prefix": "^0.5.3",
-        "minimist": "^1.2.8",
-        "node-cache": "^5.1.2",
-        "oauth": "^0.10.0"
-      },
-      "bin": {
-        "nypl-data-api": "bin/nypl-data-api.js"
-      }
-    },
-    "node_modules/@nypl/pickup-time-estimator/node_modules/dotenv": {
-      "version": "16.4.5",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
     "node_modules/@nypl/pickup-time-estimator/node_modules/iso8601-duration": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-2.1.2.tgz",
       "integrity": "sha512-yXteYUiKv6x8seaDzyBwnZtPpmx766KfvQuaVNyPifYOjmPdOo3ajd4phDNa7Y5mTQGnXsNEcXFtVun1FjYXxQ=="
     },
-    "node_modules/@nypl/pickup-time-estimator/node_modules/node-cache": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
-      "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==",
-      "dependencies": {
-        "clone": "2.x"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/@nypl/pickup-time-estimator/node_modules/oauth": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.10.0.tgz",
-      "integrity": "sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q=="
-    },
     "node_modules/@nypl/pickup-time-estimator/node_modules/querystring": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
diff --git a/package.json b/package.json
index 913a8b964..7c72124c0 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@nypl/design-system-react-components": "3.2.0",
     "@nypl/nypl-data-api-client": "1.0.5",
-    "@nypl/pickup-time-estimator": "^1.0.9",
+    "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",
     "@types/node": "20.3.1",
     "@types/react": "18.2.13",

From e6bd76f63a279f93414378a3404be0a60898902c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 09:51:40 -0500
Subject: [PATCH 057/141] Break view all link onto new line on mobile

---
 src/components/ItemTable/ItemTableControls.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ItemTable/ItemTableControls.tsx b/src/components/ItemTable/ItemTableControls.tsx
index dd053e96e..25d2725a9 100644
--- a/src/components/ItemTable/ItemTableControls.tsx
+++ b/src/components/ItemTable/ItemTableControls.tsx
@@ -42,7 +42,7 @@ const ItemTableControls = ({
     bib.getItemsViewAllLoadingMessage(filtersAreApplied)
 
   return (
-    <Box display="flex" my="xl" justifyContent="space-between">
+    <Box display={{ md: "flex" }} my="xl" justifyContent="space-between">
       {!viewAllExpanded ? (
         <Pagination
           id="bib-items-pagination"
@@ -51,6 +51,7 @@ const ItemTableControls = ({
           pageCount={Math.ceil(numItemsTotal / ITEM_PAGINATION_BATCH_SIZE)}
           onPageChange={handlePageChange}
           width="auto"
+          mb={{ base: "xs", md: 0 }}
         />
       ) : null}
       {bib.showViewAllItemsLink &&

From c906e8cacc0610e1f6dc0fc670519f85a1a56bbe Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 10:20:59 -0500
Subject: [PATCH 058/141] Remove outside click tests

---
 src/components/ItemFilters/ItemFilters.test.tsx | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index d4183c3e2..ec824331c 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -44,20 +44,6 @@ describe("ItemFilters", () => {
       expect(screen.getByLabelText("Search by year")).toBeInTheDocument()
     })
 
-    it("closes open filters when user clicks outside of the filter", async () => {
-      const outsideOfTheFilter = screen.getByLabelText("Search by year")
-
-      const locationFilterButton = screen
-        .getByTestId("location-multi-select")
-        .querySelector("button")
-      await userEvent.click(locationFilterButton)
-
-      expect(locationFilterButton).toHaveAttribute("aria-expanded", "true")
-
-      await userEvent.click(outsideOfTheFilter)
-      expect(locationFilterButton).toHaveAttribute("aria-expanded", "false")
-    })
-
     it("calls the change handler when filter values are changed", async () => {
       await userEvent.click(screen.getByTestId("location-multi-select"))
       const offsiteCheckbox = screen.getByLabelText("Offsite")

From a00b1f8522947e2355bafd1c2c085000f190334e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 10:38:45 -0500
Subject: [PATCH 059/141] Change field label to sentence case in test

---
 src/components/FeedbackForm/FeedbackForm.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FeedbackForm/FeedbackForm.test.tsx b/src/components/FeedbackForm/FeedbackForm.test.tsx
index aa8a9df0a..5f7def5a4 100644
--- a/src/components/FeedbackForm/FeedbackForm.test.tsx
+++ b/src/components/FeedbackForm/FeedbackForm.test.tsx
@@ -14,7 +14,7 @@ describe("FeedbackForm", () => {
 
     const titleText = screen.getByText("We are here to help!")
     expect(titleText).toBeInTheDocument()
-    expect(screen.getByLabelText("Comment (Required)")).toBeInTheDocument()
+    expect(screen.getByLabelText("Comment (required)")).toBeInTheDocument()
     expect(screen.getByLabelText("Email")).toBeInTheDocument()
 
     const cancelButton = screen.getByText("Cancel")

From 70c8de8b78b71b317655d0985be7f8e537f3657b Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 13:26:49 -0500
Subject: [PATCH 060/141] Test commit to retrigger qa build

---
 src/components/ItemFilters/ItemFilters.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ItemFilters/ItemFilters.test.tsx b/src/components/ItemFilters/ItemFilters.test.tsx
index ec824331c..a4bebe7c2 100644
--- a/src/components/ItemFilters/ItemFilters.test.tsx
+++ b/src/components/ItemFilters/ItemFilters.test.tsx
@@ -49,7 +49,6 @@ describe("ItemFilters", () => {
       const offsiteCheckbox = screen.getByLabelText("Offsite")
 
       await userEvent.click(offsiteCheckbox)
-
       expect(filtersChangeMock).toHaveBeenCalledTimes(1)
 
       await userEvent.click(offsiteCheckbox)

From 4a2496a33a2e9a989071bdc3526753c3a8892049 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 20 Sep 2024 14:37:25 -0400
Subject: [PATCH 061/141] add placeholder text for searchform options

---
 src/components/SearchForm/SearchForm.tsx | 15 ++++-----
 src/utils/searchUtils.ts                 | 40 ++++++++++++++++++------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index 5754b6f9b..e4def26ed 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -12,8 +12,9 @@ import styles from "../../../styles/components/Search.module.scss"
 import RCLink from "../Links/RCLink/RCLink"
 import {
   getSearchQuery,
-  searchFormDropDownOptions,
-  searchTipForDropDownOption,
+  searchFormSelectOptions,
+  getSearchTipForSearchFormOption,
+  getPlaceholderForSearchFormOption,
 } from "../../utils/searchUtils"
 import { BASE_URL, PATHS } from "../../config/constants"
 import EDSLink from "../EDSLink"
@@ -37,7 +38,8 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   const [appliedFilters, setAppliedFilters] = useState(
     collapseMultiValueQueryParams(router.query)
   )
-  const searchTip = searchTipForDropDownOption(searchScope)
+  const searchTip = getSearchTipForSearchFormOption(searchScope)
+  const placeholder = getPlaceholderForSearchFormOption(searchScope)
 
   const isLoading = useLoading()
 
@@ -100,17 +102,16 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
             onChange: (e) => handleChange(e, setSearchScope),
             labelText: "Select a category",
             name: "search_scope",
-            optionsData: searchFormDropDownOptions,
+            optionsData: searchFormSelectOptions,
           }}
           textInputProps={{
             isClearable: true,
             onChange: (e) => handleChange(e, setSearchTerm),
             isClearableCallback: () => setSearchTerm(""),
             value: searchTerm,
-            labelText:
-              "Search by keyword, title, journal title, or author/contributor",
+            labelText: searchTip,
             name: "q",
-            placeholder: "Keyword, title, journal title, or author/contributor",
+            placeholder,
           }}
           sx={{
             ".chakra-select__icon-wrapper": { "z-index": "999 !important" },
diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index 3c89d3d0e..2782ac243 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -14,55 +14,77 @@ import { RESULTS_PER_PAGE } from "../config/constants"
 import { collapseMultiValueQueryParams } from "./refineSearchUtils"
 import { getPaginationOffsetStrings } from "./appUtils"
 
-export const searchFormDropDownOptionsWithSearchTip = [
+export const searchFormOptions = [
   {
     text: "Keyword",
     value: "all",
+    searchTip:
+      "Enter one or more keywords, or use quotes to search for an exact phrase.",
+    placeholder: 'ex. climate change or "The New York Times"',
+  },
+  {
+    text: "Title",
+    value: "title",
     searchTip: "Enter a title, or use quotes to search for an exact phrase.",
+    placeholder: 'ex. David Copperfield or "The Jewish Press That Was"',
   },
-  { text: "Title", value: "title", searchTip: "title tip" },
   {
     text: "Author/contributor",
     value: "contributor",
     searchTip:
       "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
+    placeholder: "ex. Dickens, Charles or American Law Association",
   },
   {
     text: "Journal title",
     value: "journal_title",
     searchTip:
       "Enter a journal or serial title, or use quotes to search for an exact phrase.",
+    placeholder:
+      'ex. The New York Times or "The Journal of Clinical Investigation"',
   },
   {
     text: "Call number",
     value: "callnumber",
     searchTip:
       "Enter a call number, or the first few letters and numbers of a call number. ",
+    placeholder: "ex. JFD 99-6057 or *ZAN-3174",
   },
   {
     text: "Control numbers/identifiers",
     value: "standard_number",
     searchTip:
       "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
+    placeholder: "ex. 1558584536 or 95008433",
   },
   {
     text: "Subject",
     value: "subject",
     searchTip: "Enter a subject name or phrase. Learn more about searching.",
+    placeholder: "ex. ornithology or Greek architecture",
   },
 ]
 
-export const searchFormDropDownOptions =
-  searchFormDropDownOptionsWithSearchTip.map(({ text, value }) => ({
+export const searchFormSelectOptions = searchFormOptions.map(
+  ({ text, value }) => ({
     text,
     value,
-  }))
+  })
+)
 
-export const searchTipForDropDownOption = (optionValue: string) => {
-  return searchFormDropDownOptionsWithSearchTip.find(
-    (option) => option.value == optionValue
-  ).searchTip
+const propForObjectInArray = (property, arrayOfObjects) => {
+  return (optionValue) =>
+    arrayOfObjects.find((option) => option.value == optionValue)[property]
 }
+
+export const getSearchTipForSearchFormOption = propForObjectInArray(
+  "searchTip",
+  searchFormOptions
+)
+export const getPlaceholderForSearchFormOption = propForObjectInArray(
+  "placeholder",
+  searchFormOptions
+)
 /**
  * determineFreshSortByQuery
  * Returns true only if the last update to the query was a sort by change.

From b6bcc84403e9a415a90502ea7dd6309bbea4570f Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 13:45:44 -0500
Subject: [PATCH 062/141] Uncomment build and push lines in qa workflow

---
 .github/workflows/deploy_qa.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
index c300ba88e..943dbcdd9 100644
--- a/.github/workflows/deploy_qa.yml
+++ b/.github/workflows/deploy_qa.yml
@@ -13,8 +13,7 @@ permissions:
 
 env:
   AWS_DEFAULT_REGION: us-east-1
-  # LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
-  LOCAL_TAG_NAME: research-catalog:test-${{ github.run_number }}
+  LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
   ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest
 
 jobs:
@@ -42,8 +41,8 @@ jobs:
           MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
           aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
           aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
-          # docker push $ECR_URL
+          docker push $ECR_URL
 
-      # - name: Update ECS service
-      #   run: |
-      #     aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
+      - name: Update ECS service
+        run: |
+          aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment

From b6bc213f5e01116984aae88cb6d278cb4279de39 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 20 Sep 2024 14:46:08 -0400
Subject: [PATCH 063/141] fix search form tests

---
 src/components/SearchForm/SearchForm.test.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index b51153961..40354a0b8 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -5,33 +5,35 @@ import userEvent from "@testing-library/user-event"
 
 import SearchForm from "./SearchForm"
 import { normalAggs } from "../../../__test__/fixtures/testAggregations"
+import { getSearchTipForSearchFormOption } from "../../utils/searchUtils"
 
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
 describe("SearchForm", () => {
-  const searchLabel =
-    "Search by keyword, title, journal title, or author/contributor"
+  // const searchLabel = getSearchTipForSearchFormOption("all")
   const submit = () =>
     fireEvent(screen.getByText("Search"), new MouseEvent("click"))
   beforeEach(() => {
     mockRouter.query.q = ""
   })
   afterEach(async () => {
-    const input = screen.getByLabelText(searchLabel)
+    const input = screen.getByRole("textbox")
     await userEvent.clear(input)
   })
   it.todo("searches on an empty keyword after clearing the form")
   it.todo("searches for {TBD} on an empty query")
   it("submits a keyword query by default", async () => {
     render(<SearchForm aggregations={normalAggs} />)
-    const input = screen.getByLabelText(searchLabel)
+    const input = screen.getByRole("textbox")
+
     await userEvent.type(input, "spaghetti")
     submit()
     expect(mockRouter.asPath).toBe("/search?q=spaghetti")
   })
   it("submits a journal_title query", async () => {
     render(<SearchForm aggregations={normalAggs} />)
-    const input = screen.getByLabelText(searchLabel)
+    const input = screen.getByRole("textbox")
+
     const searchScopeSelect = screen.getByLabelText("Select a category")
     await userEvent.type(input, "spaghetti")
     await userEvent.selectOptions(searchScopeSelect, "journal_title")
@@ -52,12 +54,10 @@ describe("SearchForm", () => {
       const searchScopeSelect = screen.getByLabelText("Select a category")
       await userEvent.selectOptions(searchScopeSelect, "journal_title")
       let searchTip = screen.getByText(
-        "Enter a journal or serial title, or use quotes to search for an exact phrase."
+        getSearchTipForSearchFormOption("journal_title")
       )
       await userEvent.selectOptions(searchScopeSelect, "all")
-      searchTip = screen.getByText(
-        "Enter a title, or use quotes to search for an exact phrase."
-      )
+      searchTip = screen.getByText(getSearchTipForSearchFormOption("all"))
       expect(searchTip).toBeInTheDocument()
     })
   })

From 31b3204a1259a4755fff4af9229a3f30712884e6 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 20 Sep 2024 14:49:44 -0400
Subject: [PATCH 064/141] update layout tests

---
 src/components/Layout/Layout.test.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Layout/Layout.test.tsx b/src/components/Layout/Layout.test.tsx
index 2c4446cdb..f7d024b68 100644
--- a/src/components/Layout/Layout.test.tsx
+++ b/src/components/Layout/Layout.test.tsx
@@ -2,13 +2,11 @@ import React from "react"
 import { render, screen, within } from "../../utils/testUtils"
 
 import Layout from "./Layout"
-
 // Mock next router
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
 describe("Layout", () => {
-  const searchLabel =
-    "Search by keyword, title, journal title, or author/contributor"
+  const searchLabel = "Search Bar Label"
 
   it("should render an H1", () => {
     render(<Layout></Layout>)

From 6b2472caec6cb81821b0fd3e4ea0da47dbff7618 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 20 Sep 2024 14:52:03 -0400
Subject: [PATCH 065/141] rm commmented code

---
 src/components/SearchForm/SearchForm.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index 40354a0b8..7c381d9b5 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -10,7 +10,6 @@ import { getSearchTipForSearchFormOption } from "../../utils/searchUtils"
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
 describe("SearchForm", () => {
-  // const searchLabel = getSearchTipForSearchFormOption("all")
   const submit = () =>
     fireEvent(screen.getByText("Search"), new MouseEvent("click"))
   beforeEach(() => {

From 48f20343712b3f13f54cebd7e07ca199e015e643 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 14:20:29 -0500
Subject: [PATCH 066/141] Add bottom margin to pagination

---
 src/components/ItemTable/ItemTableControls.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ItemTable/ItemTableControls.tsx b/src/components/ItemTable/ItemTableControls.tsx
index 25d2725a9..7e7e38de7 100644
--- a/src/components/ItemTable/ItemTableControls.tsx
+++ b/src/components/ItemTable/ItemTableControls.tsx
@@ -51,7 +51,7 @@ const ItemTableControls = ({
           pageCount={Math.ceil(numItemsTotal / ITEM_PAGINATION_BATCH_SIZE)}
           onPageChange={handlePageChange}
           width="auto"
-          mb={{ base: "xs", md: 0 }}
+          mb={{ base: "m", md: 0 }}
         />
       ) : null}
       {bib.showViewAllItemsLink &&

From e552274ced0f0fe319853f09c241b807cdf83aca Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 20 Sep 2024 14:22:38 -0500
Subject: [PATCH 067/141] Add text transform none to item table css

---
 styles/components/ItemTable.module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index 0fb5aa85d..c8a80830e 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -12,6 +12,7 @@
     td,
     td:first-of-type,
     th:first-of-type {
+      text-transform: none;
       padding: var(--nypl-space-s) 0;
 
       // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call number columns to appear to narrow

From e5e8e6862c62e4f0439816f0f5ad3b99ff99004b Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Mon, 23 Sep 2024 14:17:24 -0400
Subject: [PATCH 068/141] use map instead of array

---
 src/components/SearchForm/SearchForm.test.tsx |  6 +-
 src/components/SearchForm/SearchForm.tsx      |  8 +-
 src/config/constants.ts                       | 45 +++++++++++
 src/utils/searchUtils.ts                      | 75 ++-----------------
 4 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index 7c381d9b5..61515b3cc 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -5,7 +5,7 @@ import userEvent from "@testing-library/user-event"
 
 import SearchForm from "./SearchForm"
 import { normalAggs } from "../../../__test__/fixtures/testAggregations"
-import { getSearchTipForSearchFormOption } from "../../utils/searchUtils"
+import { SEARCH_FORM_OPTIONS } from "../../config/constants"
 
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
@@ -53,10 +53,10 @@ describe("SearchForm", () => {
       const searchScopeSelect = screen.getByLabelText("Select a category")
       await userEvent.selectOptions(searchScopeSelect, "journal_title")
       let searchTip = screen.getByText(
-        getSearchTipForSearchFormOption("journal_title")
+        SEARCH_FORM_OPTIONS.journal_title.searchTip
       )
       await userEvent.selectOptions(searchScopeSelect, "all")
-      searchTip = screen.getByText(getSearchTipForSearchFormOption("all"))
+      searchTip = screen.getByText(SEARCH_FORM_OPTIONS.all.searchTip)
       expect(searchTip).toBeInTheDocument()
     })
   })
diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index e4def26ed..d16180d5e 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -13,10 +13,8 @@ import RCLink from "../Links/RCLink/RCLink"
 import {
   getSearchQuery,
   searchFormSelectOptions,
-  getSearchTipForSearchFormOption,
-  getPlaceholderForSearchFormOption,
 } from "../../utils/searchUtils"
-import { BASE_URL, PATHS } from "../../config/constants"
+import { BASE_URL, PATHS, SEARCH_FORM_OPTIONS } from "../../config/constants"
 import EDSLink from "../EDSLink"
 import useLoading from "../../hooks/useLoading"
 import RefineSearch from "../RefineSearch/RefineSearch"
@@ -38,8 +36,8 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   const [appliedFilters, setAppliedFilters] = useState(
     collapseMultiValueQueryParams(router.query)
   )
-  const searchTip = getSearchTipForSearchFormOption(searchScope)
-  const placeholder = getPlaceholderForSearchFormOption(searchScope)
+  const searchTip = SEARCH_FORM_OPTIONS[searchScope].searchTip
+  const placeholder = SEARCH_FORM_OPTIONS[searchScope].placeholder
 
   const isLoading = useLoading()
 
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 2c82115e0..d5e4c6dd2 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -68,3 +68,48 @@ export const DAYS = {
 export const ERROR_MESSAGES = {
   ITEM_REFETCH_ABORT_REASON: "New Bib item fetch initiated",
 }
+
+export const SEARCH_FORM_OPTIONS = {
+  all: {
+    text: "Keyword",
+    searchTip:
+      "Enter one or more keywords, or use quotes to search for an exact phrase.",
+    placeholder: 'ex. climate change or "The New York Times"',
+  },
+  title: {
+    text: "Title",
+    value: "title",
+    searchTip: "Enter a title, or use quotes to search for an exact phrase.",
+    placeholder: 'ex. David Copperfield or "The Jewish Press That Was"',
+  },
+  contributor: {
+    text: "Author/contributor",
+    searchTip:
+      "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
+    placeholder: "ex. Dickens, Charles or American Law Association",
+  },
+  journal_title: {
+    text: "Journal title",
+    searchTip:
+      "Enter a journal or serial title, or use quotes to search for an exact phrase.",
+    placeholder:
+      'ex. The New York Times or "The Journal of Clinical Investigation"',
+  },
+  callnumber: {
+    text: "Call number",
+    searchTip:
+      "Enter a call number, or the first few letters and numbers of a call number. ",
+    placeholder: "ex. JFD 99-6057 or *ZAN-3174",
+  },
+  standard_number: {
+    text: "Control numbers/identifiers",
+    searchTip:
+      "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
+    placeholder: "ex. 1558584536 or 95008433",
+  },
+  subject: {
+    text: "Subject",
+    searchTip: "Enter a subject name or phrase. Learn more about searching.",
+    placeholder: "ex. ornithology or Greek architecture",
+  },
+}
diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index 2782ac243..77bab9c9f 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -10,81 +10,16 @@ import type {
   SearchResultsResponse,
 } from "../types/searchTypes"
 import SearchResultsBib from "../models/SearchResultsBib"
-import { RESULTS_PER_PAGE } from "../config/constants"
+import { RESULTS_PER_PAGE, SEARCH_FORM_OPTIONS } from "../config/constants"
 import { collapseMultiValueQueryParams } from "./refineSearchUtils"
 import { getPaginationOffsetStrings } from "./appUtils"
 
-export const searchFormOptions = [
-  {
-    text: "Keyword",
-    value: "all",
-    searchTip:
-      "Enter one or more keywords, or use quotes to search for an exact phrase.",
-    placeholder: 'ex. climate change or "The New York Times"',
-  },
-  {
-    text: "Title",
-    value: "title",
-    searchTip: "Enter a title, or use quotes to search for an exact phrase.",
-    placeholder: 'ex. David Copperfield or "The Jewish Press That Was"',
-  },
-  {
-    text: "Author/contributor",
-    value: "contributor",
-    searchTip:
-      "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
-    placeholder: "ex. Dickens, Charles or American Law Association",
-  },
-  {
-    text: "Journal title",
-    value: "journal_title",
-    searchTip:
-      "Enter a journal or serial title, or use quotes to search for an exact phrase.",
-    placeholder:
-      'ex. The New York Times or "The Journal of Clinical Investigation"',
-  },
-  {
-    text: "Call number",
-    value: "callnumber",
-    searchTip:
-      "Enter a call number, or the first few letters and numbers of a call number. ",
-    placeholder: "ex. JFD 99-6057 or *ZAN-3174",
-  },
-  {
-    text: "Control numbers/identifiers",
-    value: "standard_number",
-    searchTip:
-      "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
-    placeholder: "ex. 1558584536 or 95008433",
-  },
-  {
-    text: "Subject",
-    value: "subject",
-    searchTip: "Enter a subject name or phrase. Learn more about searching.",
-    placeholder: "ex. ornithology or Greek architecture",
-  },
-]
-
-export const searchFormSelectOptions = searchFormOptions.map(
-  ({ text, value }) => ({
-    text,
-    value,
+export const searchFormSelectOptions = Object.keys(SEARCH_FORM_OPTIONS).map(
+  (key) => ({
+    text: SEARCH_FORM_OPTIONS[key].text,
+    value: key,
   })
 )
-
-const propForObjectInArray = (property, arrayOfObjects) => {
-  return (optionValue) =>
-    arrayOfObjects.find((option) => option.value == optionValue)[property]
-}
-
-export const getSearchTipForSearchFormOption = propForObjectInArray(
-  "searchTip",
-  searchFormOptions
-)
-export const getPlaceholderForSearchFormOption = propForObjectInArray(
-  "placeholder",
-  searchFormOptions
-)
 /**
  * determineFreshSortByQuery
  * Returns true only if the last update to the query was a sort by change.

From 211dea2b935119743fdd4b021b6e85f04243982e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 23 Sep 2024 17:11:13 -0400
Subject: [PATCH 069/141] Integrate view_all query

---
 pages/bib/[id]/index.tsx         |  6 ++++-
 src/config/constants.ts          |  1 -
 src/server/api/bib.ts            | 44 +-------------------------------
 src/server/api/tests/bib.test.ts |  8 ------
 src/types/bibTypes.ts            |  2 +-
 src/utils/bibUtils.ts            | 21 ++++++++-------
 6 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index eecee5f6c..e9b007880 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -124,7 +124,11 @@ export default function BibPage({
         scroll: false,
       }
     )
-    const bibQueryString = getBibQueryString(newQuery, false, viewAllItems)
+    const bibQueryString = getBibQueryString(
+      { ...newQuery, all_items: viewAllItems },
+      false
+    )
+
     try {
       // Cancel any active fetches on new ItemTable refreshes
       if (controllerRef.current) {
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 2c82115e0..38d02b8d8 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -6,7 +6,6 @@ export const RESULTS_PER_PAGE = 50
 export const DRB_RESULTS_PER_PAGE = 3
 export const ITEMS_PER_SEARCH_RESULT = 3
 export const ITEM_PAGINATION_BATCH_SIZE = 20
-export const ITEM_VIEW_ALL_BATCH_SIZE = 150
 export const ELECTRONIC_RESOURCES_PER_BIB_PAGE = 3
 export const SHEP_HTTP_TIMEOUT = 4000
 export const FOCUS_TIMEOUT = 50
diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 3e9e9a9a7..2ca4ea7b1 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -8,12 +8,10 @@ import nyplApiClient from "../nyplApiClient"
 import {
   DISCOVERY_API_NAME,
   DISCOVERY_API_SEARCH_ROUTE,
-  ITEM_VIEW_ALL_BATCH_SIZE,
   SHEP_HTTP_TIMEOUT,
 } from "../../config/constants"
 import { appConfig } from "../../config/config"
 import logger from "../../../logger"
-import type { DiscoveryItemResult } from "../../types/itemTypes"
 
 export async function fetchBib(
   id: string,
@@ -27,6 +25,7 @@ export async function fetchBib(
       redirectUrl: `/bib/${standardizedId}`,
     }
   }
+
   const client = await nyplApiClient({ apiName: DISCOVERY_API_NAME })
   const [bibResponse, annotatedMarcResponse] = await Promise.allSettled([
     await client.get(
@@ -91,15 +90,6 @@ export async function fetchBib(
         status: 404,
       }
     }
-    // Populate bib's items with all the items if View All is enabled
-    if (bibQuery?.view_all_items) {
-      discoveryBibResult.items = await fetchAllBibItems(
-        bibQuery,
-        discoveryBibResult.numItemsMatched,
-        // allow control of batch size in query param for testing
-        bibQuery?.batch_size || ITEM_VIEW_ALL_BATCH_SIZE
-      )
-    }
 
     return {
       discoveryBibResult,
@@ -136,35 +126,3 @@ async function fetchBibSubjectHeadings(bibId: string) {
     clearTimeout(timeoutId)
   }
 }
-
-async function fetchAllBibItems(
-  bibQuery: BibQueryParams,
-  numItems: number,
-  batchSize: number
-): Promise<DiscoveryItemResult[]> {
-  const items: DiscoveryItemResult[] = []
-  const client = await nyplApiClient({ apiName: DISCOVERY_API_NAME })
-  for (
-    let batchNum = 1;
-    batchNum <= Math.ceil(numItems / batchSize);
-    batchNum++
-  ) {
-    const pageQueryString = getBibQueryString(
-      {
-        ...bibQuery,
-        item_page: batchNum,
-      },
-      false,
-      true
-    )
-    const bibPage = await client.get(
-      `${DISCOVERY_API_SEARCH_ROUTE}/${bibQuery.id}${pageQueryString}`
-    )
-    if (bibPage?.items?.length) {
-      items.push(...bibPage.items)
-    } else {
-      throw new Error("There was en error fetching items in one of the batches")
-    }
-  }
-  return items
-}
diff --git a/src/server/api/tests/bib.test.ts b/src/server/api/tests/bib.test.ts
index d459f9e43..a91d03688 100644
--- a/src/server/api/tests/bib.test.ts
+++ b/src/server/api/tests/bib.test.ts
@@ -201,12 +201,4 @@ describe("fetchBib", () => {
     expect(bibResponse.status).toEqual(200)
     expect(bibResponse.discoveryBibResult.items.length).toEqual(25)
   })
-
-  it("should throw an error on view all if one of the batched fetches fails", async () => {
-    const bibResponse = (await fetchBib("b17418167", {
-      view_all_items: true,
-      batch_size: 20,
-    })) as BibResponse
-    expect(bibResponse.status).toEqual(404)
-  })
 })
diff --git a/src/types/bibTypes.ts b/src/types/bibTypes.ts
index a3608168f..7778261ed 100644
--- a/src/types/bibTypes.ts
+++ b/src/types/bibTypes.ts
@@ -88,7 +88,7 @@ export interface BibQueryParams extends ItemFilterQueryParams {
   item_page?: number
   items_size?: number
   items_from?: number
-  view_all_items?: boolean
+  all_items?: boolean
   batch_size?: number
 }
 
diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index 1ea10edd4..fbf2cc783 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -1,7 +1,4 @@
-import {
-  ITEM_PAGINATION_BATCH_SIZE,
-  ITEM_VIEW_ALL_BATCH_SIZE,
-} from "../config/constants"
+import { ITEM_PAGINATION_BATCH_SIZE } from "../config/constants"
 import type { BibQueryParams } from "../types/bibTypes"
 import { getPaginationOffsetStrings } from "./appUtils"
 
@@ -81,12 +78,11 @@ export function isNyplBibID(id: string) {
  */
 export function getBibQueryString(
   bibQuery: BibQueryParams,
-  includeAnnotatedMarc = false,
-  viewAllItems = false
+  includeAnnotatedMarc = false
 ): string {
-  const batchSize = viewAllItems
-    ? ITEM_VIEW_ALL_BATCH_SIZE
-    : ITEM_PAGINATION_BATCH_SIZE
+  const viewAllItems = bibQuery?.all_items || false
+  const batchSize = ITEM_PAGINATION_BATCH_SIZE
+
   const itemPage = bibQuery?.item_page || 1
   const itemsFrom = (itemPage - 1) * batchSize || 0
 
@@ -104,12 +100,15 @@ export function getBibQueryString(
         .join("")
     : ""
 
-  const paginationQuery = `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
+  const paginationQuery = !viewAllItems
+    ? `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
+    : ""
 
   const mergeCheckinQuery = !includeAnnotatedMarc
     ? "&merge_checkin_card_items=true"
     : ""
 
-  const viewAllQuery = viewAllItems ? "&view_all_items=true" : ""
+  const viewAllQuery = viewAllItems ? "&all_items=true" : ""
+
   return `?${paginationQuery}${itemFilterQuery}${viewAllQuery}${mergeCheckinQuery}`
 }

From e6fa4021c7fe4d6ab13fa6ca979fafd572c72163 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 23 Sep 2024 17:11:57 -0400
Subject: [PATCH 070/141] Fix query name in tests

---
 pages/bib/[id]/all.tsx           | 2 +-
 src/server/api/tests/bib.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/bib/[id]/all.tsx b/pages/bib/[id]/all.tsx
index 072c842a2..8d3019811 100644
--- a/pages/bib/[id]/all.tsx
+++ b/pages/bib/[id]/all.tsx
@@ -8,7 +8,7 @@ export default BibPage
 export async function getServerSideProps({ params, query, req }) {
   const { id } = params
   const { discoveryBibResult, annotatedMarc, status, redirectUrl } =
-    await fetchBib(id, { ...query, view_all_items: true })
+    await fetchBib(id, { ...query, all_items: true })
   const patronTokenResponse = await initializePatronTokenAuth(req.cookies)
   const isAuthenticated = patronTokenResponse.isTokenValid
 
diff --git a/src/server/api/tests/bib.test.ts b/src/server/api/tests/bib.test.ts
index a91d03688..6a305ba22 100644
--- a/src/server/api/tests/bib.test.ts
+++ b/src/server/api/tests/bib.test.ts
@@ -195,7 +195,7 @@ describe("fetchBib", () => {
 
   it("should load all the items in batches if view_all_items query param is true", async () => {
     const bibResponse = (await fetchBib("b17418167", {
-      view_all_items: true,
+      all_items: true,
       batch_size: 20,
     })) as BibResponse
     expect(bibResponse.status).toEqual(200)

From b3fbdcbdfb8b5575c68bd6cb70d24041a637ef84 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 24 Sep 2024 08:55:56 -0400
Subject: [PATCH 071/141] Remove batch tests

---
 src/server/api/tests/bib.test.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/server/api/tests/bib.test.ts b/src/server/api/tests/bib.test.ts
index 6a305ba22..52b502cc4 100644
--- a/src/server/api/tests/bib.test.ts
+++ b/src/server/api/tests/bib.test.ts
@@ -192,13 +192,4 @@ describe("fetchBib", () => {
       async () => (await fetchBib("b17418167")) as BibResponse
     ).rejects.toThrow("Bad API URL")
   })
-
-  it("should load all the items in batches if view_all_items query param is true", async () => {
-    const bibResponse = (await fetchBib("b17418167", {
-      all_items: true,
-      batch_size: 20,
-    })) as BibResponse
-    expect(bibResponse.status).toEqual(200)
-    expect(bibResponse.discoveryBibResult.items.length).toEqual(25)
-  })
 })

From 6364bfe60c80b847e067d187dec0ec533e60654f Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 24 Sep 2024 09:05:58 -0400
Subject: [PATCH 072/141] Refactor bibUtils query string setting

---
 src/utils/bibUtils.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index fbf2cc783..5d8a31479 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -80,7 +80,6 @@ export function getBibQueryString(
   bibQuery: BibQueryParams,
   includeAnnotatedMarc = false
 ): string {
-  const viewAllItems = bibQuery?.all_items || false
   const batchSize = ITEM_PAGINATION_BATCH_SIZE
 
   const itemPage = bibQuery?.item_page || 1
@@ -100,15 +99,13 @@ export function getBibQueryString(
         .join("")
     : ""
 
-  const paginationQuery = !viewAllItems
-    ? `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
-    : ""
+  const paginationQuery = bibQuery?.all_items
+    ? "all_items=true"
+    : `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
 
   const mergeCheckinQuery = !includeAnnotatedMarc
     ? "&merge_checkin_card_items=true"
     : ""
 
-  const viewAllQuery = viewAllItems ? "&all_items=true" : ""
-
-  return `?${paginationQuery}${itemFilterQuery}${viewAllQuery}${mergeCheckinQuery}`
+  return `?${paginationQuery}${itemFilterQuery}${mergeCheckinQuery}`
 }

From 430d168b834db68e31b8f06b963f933edbfb63a3 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 24 Sep 2024 13:12:33 -0400
Subject: [PATCH 073/141] Improve query string tests

---
 src/utils/utilsTests/bibUtils.test.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/utils/utilsTests/bibUtils.test.ts b/src/utils/utilsTests/bibUtils.test.ts
index fe21a2605..b1cdcb1a9 100644
--- a/src/utils/utilsTests/bibUtils.test.ts
+++ b/src/utils/utilsTests/bibUtils.test.ts
@@ -52,6 +52,22 @@ describe("bibUtils", () => {
         "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
       )
     })
+    it("replaces pagination query params with all_items when all_items is true", () => {
+      expect(
+        getBibQueryString({ id: "b12082323", item_page: 5, all_items: true })
+      ).toBe("?all_items=true&merge_checkin_card_items=true")
+    })
+    it("does not replace pagination query params when all_items is present and false", () => {
+      expect(
+        getBibQueryString({
+          id: "b12082323",
+          item_page: 5,
+          all_items: false,
+        })
+      ).toBe(
+        "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
+      )
+    })
   })
   describe("buildItemTableDisplayingString", () => {
     it("returns the correct item table heading when there is one item", () => {

From 604637ede5a0e256429c443fe17d0d7ae35834fc Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 24 Sep 2024 13:39:08 -0400
Subject: [PATCH 074/141] Update changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 09713ef1b..53357c00a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Updated
 
+- Integrate view_all query param on client side and remove batched fetch (SCC-4287)
 - Replaced travis with github actions (SCC-4218)
 
 ## [1.2.4] 2024-08-29

From c6122156660c4566d1344e31dc10d167a19c6b6c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 24 Sep 2024 18:12:01 -0400
Subject: [PATCH 075/141] Add subjectheadings to bib model

---
 src/models/Bib.ts        | 8 +++++++-
 src/models/BibDetails.ts | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/models/Bib.ts b/src/models/Bib.ts
index 6b35b64ed..169d00f14 100644
--- a/src/models/Bib.ts
+++ b/src/models/Bib.ts
@@ -1,4 +1,8 @@
-import type { DiscoveryBibResult, ElectronicResource } from "../types/bibTypes"
+import type {
+  DiscoveryBibResult,
+  ElectronicResource,
+  SubjectHeading,
+} from "../types/bibTypes"
 import type { JSONLDValue } from "../types/itemTypes"
 import type { Aggregation } from "../types/filterTypes"
 import Item from "../models/Item"
@@ -25,6 +29,7 @@ export default class Bib {
   items?: Item[]
   itemAggregations?: Aggregation[]
   hasItemDates?: boolean
+  subjectHeadings?: SubjectHeading[]
 
   constructor(result: DiscoveryBibResult) {
     this.id = result["@id"] ? result["@id"].substring(4) : ""
@@ -39,6 +44,7 @@ export default class Bib {
     this.items = this.getItemsFromResult(result)
     this.itemAggregations = result.itemAggregations || null
     this.hasItemDates = result.hasItemDates || false
+    this.subjectHeadings = result.subjectHeadings || null
   }
 
   get url() {
diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index aca839674..1b0cbf0c0 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -362,6 +362,8 @@ export default class BibDetails {
   }
 
   buildSubjectHeadings(): SubjectHeadingDetail {
+    console.log("bib", this.bib)
+    console.log("subjectLiteral", this.bib?.subjectLiteral)
     if (!this.bib.subjectLiteral) return
     const subjectLiteralUrls = this.bib.subjectLiteral.map(
       (subject: string) => {

From c97432a1e96a65c5d149c1d9f3c7e10ad38a8938 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Wed, 25 Sep 2024 09:47:31 -0400
Subject: [PATCH 076/141] Export subject heading type

---
 src/types/bibTypes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/bibTypes.ts b/src/types/bibTypes.ts
index a3608168f..d5fffeee5 100644
--- a/src/types/bibTypes.ts
+++ b/src/types/bibTypes.ts
@@ -92,7 +92,7 @@ export interface BibQueryParams extends ItemFilterQueryParams {
   batch_size?: number
 }
 
-type SubjectHeading = {
+export type SubjectHeading = {
   label?: string
   uuid?: string
   bib_count?: 10

From 6447dd2d6a902dd07ffa44a8b12fd6f49a33af72 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 25 Sep 2024 15:48:34 -0400
Subject: [PATCH 077/141] Rename paginationQuery to paginationOrAllQuery

---
 src/utils/bibUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index 5d8a31479..5104bd314 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -99,7 +99,7 @@ export function getBibQueryString(
         .join("")
     : ""
 
-  const paginationQuery = bibQuery?.all_items
+  const paginationOrAllQuery = bibQuery?.all_items
     ? "all_items=true"
     : `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
 
@@ -107,5 +107,5 @@ export function getBibQueryString(
     ? "&merge_checkin_card_items=true"
     : ""
 
-  return `?${paginationQuery}${itemFilterQuery}${mergeCheckinQuery}`
+  return `?${paginationOrAllQuery}${itemFilterQuery}${mergeCheckinQuery}`
 }

From 1538fe0410febe4c9adac72f53a0f13fe5f22dde Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 25 Sep 2024 16:23:41 -0400
Subject: [PATCH 078/141] Restore batched fetch when filter query params are
 present

---
 src/config/constants.ts |  2 ++
 src/server/api/bib.ts   | 55 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/config/constants.ts b/src/config/constants.ts
index 38d02b8d8..6e87ba6dc 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -6,6 +6,8 @@ export const RESULTS_PER_PAGE = 50
 export const DRB_RESULTS_PER_PAGE = 3
 export const ITEMS_PER_SEARCH_RESULT = 3
 export const ITEM_PAGINATION_BATCH_SIZE = 20
+// TODO: Remove this when view_all endpoint in discovery supports query params
+export const ITEM_VIEW_ALL_BATCH_SIZE = 150
 export const ELECTRONIC_RESOURCES_PER_BIB_PAGE = 3
 export const SHEP_HTTP_TIMEOUT = 4000
 export const FOCUS_TIMEOUT = 50
diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 2ca4ea7b1..269c8cb26 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -8,10 +8,12 @@ import nyplApiClient from "../nyplApiClient"
 import {
   DISCOVERY_API_NAME,
   DISCOVERY_API_SEARCH_ROUTE,
+  ITEM_VIEW_ALL_BATCH_SIZE,
   SHEP_HTTP_TIMEOUT,
 } from "../../config/constants"
 import { appConfig } from "../../config/config"
 import logger from "../../../logger"
+import type { DiscoveryItemResult } from "../../types/itemTypes"
 
 export async function fetchBib(
   id: string,
@@ -91,6 +93,27 @@ export async function fetchBib(
       }
     }
 
+    // Populate bib's items with all the items if View All is enabled
+    // TODO: Remove this when view_all endpoint in discovery supports query params
+    const itemFilterParams = [
+      "item_location",
+      "item_format",
+      "item_status",
+      "item_date",
+    ]
+    // Only call the batched fetch when some of the filters are active
+    if (
+      bibQuery?.all_items &&
+      itemFilterParams.some((param) => param in Object.keys(bibQuery))
+    ) {
+      discoveryBibResult.items = await fetchAllBibItemsWithQuery(
+        bibQuery,
+        discoveryBibResult.numItemsMatched,
+        // allow control of batch size in query param for testing
+        bibQuery?.batch_size || ITEM_VIEW_ALL_BATCH_SIZE
+      )
+    }
+
     return {
       discoveryBibResult,
       annotatedMarc: annotatedMarc?.bib || null,
@@ -126,3 +149,35 @@ async function fetchBibSubjectHeadings(bibId: string) {
     clearTimeout(timeoutId)
   }
 }
+
+// TODO: Remove this when view_all endpoint in discovery supports query params
+async function fetchAllBibItemsWithQuery(
+  bibQuery: BibQueryParams,
+  numItems: number,
+  batchSize: number
+): Promise<DiscoveryItemResult[]> {
+  const items: DiscoveryItemResult[] = []
+  const client = await nyplApiClient({ apiName: DISCOVERY_API_NAME })
+  for (
+    let batchNum = 1;
+    batchNum <= Math.ceil(numItems / batchSize);
+    batchNum++
+  ) {
+    const pageQueryString = getBibQueryString(
+      {
+        ...bibQuery,
+        item_page: batchNum,
+      },
+      false
+    )
+    const bibPage = await client.get(
+      `${DISCOVERY_API_SEARCH_ROUTE}/${bibQuery.id}${pageQueryString}`
+    )
+    if (bibPage?.items?.length) {
+      items.push(...bibPage.items)
+    } else {
+      throw new Error("There was en error fetching items in one of the batches")
+    }
+  }
+  return items
+}

From 23caf85dbcdd6d02bc9b7ff6083b3c1f655c018d Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 25 Sep 2024 16:52:43 -0400
Subject: [PATCH 079/141] Restore batched call for all items with filters

---
 pages/bib/[id]/index.tsx | 3 +++
 src/server/api/bib.ts    | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index e9b007880..8a6f932d1 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -94,6 +94,9 @@ export default function BibPage({
     ? bib.numItemsMatched
     : bib.numPhysicalItems
 
+  console.log("numItems", numItems)
+  console.log("bib.items.length", bib.items.length)
+
   const refreshItemTable = async (
     newQuery: BibQueryParams,
     viewAllItems = false,
diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 269c8cb26..3dc67ab55 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -101,11 +101,12 @@ export async function fetchBib(
       "item_status",
       "item_date",
     ]
-    // Only call the batched fetch when some of the filters are active
-    if (
+    const allItemsAndFiltersActive =
       bibQuery?.all_items &&
-      itemFilterParams.some((param) => param in Object.keys(bibQuery))
-    ) {
+      itemFilterParams.some((param) => bibQuery[param]?.length)
+
+    // Only call the batched fetch when some of the filters are active
+    if (allItemsAndFiltersActive) {
       discoveryBibResult.items = await fetchAllBibItemsWithQuery(
         bibQuery,
         discoveryBibResult.numItemsMatched,

From 8f8d90f342c52b66ada1ef17ea025ef098f95415 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 10:58:18 -0400
Subject: [PATCH 080/141] Move ITEM_FILTER_PARAMS to constant

---
 src/config/constants.ts |  7 +++++++
 src/server/api/bib.ts   |  9 ++-------
 src/utils/bibUtils.ts   | 14 +++++---------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/config/constants.ts b/src/config/constants.ts
index 7a57af87a..b077d82f9 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -33,6 +33,13 @@ export const DRB_API_SEARCH_ROUTE = "/api/drb"
 // Query params
 export const SOURCE_PARAM = "?source=catalog"
 
+export const ITEM_FILTER_PARAMS = [
+  "item_location",
+  "item_format",
+  "item_status",
+  "item_date",
+]
+
 // External URLs
 export const DRB_BASE_URL =
   appConfig.apiEndpoints.drbFrontEnd[appConfig.environment]
diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 3dc67ab55..521e0e1b8 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -10,6 +10,7 @@ import {
   DISCOVERY_API_SEARCH_ROUTE,
   ITEM_VIEW_ALL_BATCH_SIZE,
   SHEP_HTTP_TIMEOUT,
+  ITEM_FILTER_PARAMS,
 } from "../../config/constants"
 import { appConfig } from "../../config/config"
 import logger from "../../../logger"
@@ -95,15 +96,9 @@ export async function fetchBib(
 
     // Populate bib's items with all the items if View All is enabled
     // TODO: Remove this when view_all endpoint in discovery supports query params
-    const itemFilterParams = [
-      "item_location",
-      "item_format",
-      "item_status",
-      "item_date",
-    ]
     const allItemsAndFiltersActive =
       bibQuery?.all_items &&
-      itemFilterParams.some((param) => bibQuery[param]?.length)
+      ITEM_FILTER_PARAMS.some((param) => bibQuery[param]?.length)
 
     // Only call the batched fetch when some of the filters are active
     if (allItemsAndFiltersActive) {
diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index 5104bd314..6ab26f698 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -1,4 +1,7 @@
-import { ITEM_PAGINATION_BATCH_SIZE } from "../config/constants"
+import {
+  ITEM_PAGINATION_BATCH_SIZE,
+  ITEM_FILTER_PARAMS,
+} from "../config/constants"
 import type { BibQueryParams } from "../types/bibTypes"
 import { getPaginationOffsetStrings } from "./appUtils"
 
@@ -85,16 +88,9 @@ export function getBibQueryString(
   const itemPage = bibQuery?.item_page || 1
   const itemsFrom = (itemPage - 1) * batchSize || 0
 
-  const FILTER_QUERIES = [
-    "item_location",
-    "item_format",
-    "item_status",
-    "item_date",
-  ]
-
   const itemFilterQuery = bibQuery
     ? Object.keys(bibQuery)
-        .filter((key) => FILTER_QUERIES.includes(key))
+        .filter((key) => ITEM_FILTER_PARAMS.includes(key))
         .map((key) => `&${key}=${bibQuery[key]}`)
         .join("")
     : ""

From c8f956fff5df720a574e8ac35104b1240096ca5d Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 11:49:44 -0400
Subject: [PATCH 081/141] Add all items logic to bib query util

---
 pages/bib/[id]/index.tsx |  3 ---
 src/server/api/bib.ts    | 15 +++++----------
 src/utils/bibUtils.ts    | 24 ++++++++++++++++++++----
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index 8a6f932d1..e9b007880 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -94,9 +94,6 @@ export default function BibPage({
     ? bib.numItemsMatched
     : bib.numPhysicalItems
 
-  console.log("numItems", numItems)
-  console.log("bib.items.length", bib.items.length)
-
   const refreshItemTable = async (
     newQuery: BibQueryParams,
     viewAllItems = false,
diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 521e0e1b8..ac98658d3 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -3,6 +3,7 @@ import {
   isNyplBibID,
   getBibQueryString,
   standardizeBibId,
+  itemFiltersActive,
 } from "../../utils/bibUtils"
 import nyplApiClient from "../nyplApiClient"
 import {
@@ -10,7 +11,6 @@ import {
   DISCOVERY_API_SEARCH_ROUTE,
   ITEM_VIEW_ALL_BATCH_SIZE,
   SHEP_HTTP_TIMEOUT,
-  ITEM_FILTER_PARAMS,
 } from "../../config/constants"
 import { appConfig } from "../../config/config"
 import logger from "../../../logger"
@@ -96,12 +96,9 @@ export async function fetchBib(
 
     // Populate bib's items with all the items if View All is enabled
     // TODO: Remove this when view_all endpoint in discovery supports query params
-    const allItemsAndFiltersActive =
-      bibQuery?.all_items &&
-      ITEM_FILTER_PARAMS.some((param) => bibQuery[param]?.length)
 
     // Only call the batched fetch when some of the filters are active
-    if (allItemsAndFiltersActive) {
+    if (bibQuery?.all_items && itemFiltersActive(bibQuery)) {
       discoveryBibResult.items = await fetchAllBibItemsWithQuery(
         bibQuery,
         discoveryBibResult.numItemsMatched,
@@ -154,11 +151,9 @@ async function fetchAllBibItemsWithQuery(
 ): Promise<DiscoveryItemResult[]> {
   const items: DiscoveryItemResult[] = []
   const client = await nyplApiClient({ apiName: DISCOVERY_API_NAME })
-  for (
-    let batchNum = 1;
-    batchNum <= Math.ceil(numItems / batchSize);
-    batchNum++
-  ) {
+  const totalBatchNum = Math.ceil(numItems / batchSize)
+
+  for (let batchNum = 1; batchNum <= totalBatchNum; batchNum++) {
     const pageQueryString = getBibQueryString(
       {
         ...bibQuery,
diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index 6ab26f698..fd9979c6f 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -1,5 +1,6 @@
 import {
   ITEM_PAGINATION_BATCH_SIZE,
+  ITEM_VIEW_ALL_BATCH_SIZE,
   ITEM_FILTER_PARAMS,
 } from "../config/constants"
 import type { BibQueryParams } from "../types/bibTypes"
@@ -76,6 +77,11 @@ export function isNyplBibID(id: string) {
   return /^b/.test(id)
 }
 
+// Temp function to determine if view all and filters are active
+// TODO: Remove this when view_all endpoint in discovery supports query params
+export const itemFiltersActive = (bibQuery: BibQueryParams) =>
+  ITEM_FILTER_PARAMS.some((param) => bibQuery[param]?.length)
+
 /**
  * Given a BibQueryParams object and an includeAnnotatedMarc boolean, return a query string for the Bib fetch API call.
  */
@@ -83,7 +89,12 @@ export function getBibQueryString(
   bibQuery: BibQueryParams,
   includeAnnotatedMarc = false
 ): string {
-  const batchSize = ITEM_PAGINATION_BATCH_SIZE
+  const allItems = bibQuery?.all_items
+
+  // TODO: Remove this and set batch size to ITEM_PAGINATION_BATCH_SIZE when view_all endpoint in discovery supports query params
+  const batchSize = allItems
+    ? ITEM_VIEW_ALL_BATCH_SIZE
+    : ITEM_PAGINATION_BATCH_SIZE
 
   const itemPage = bibQuery?.item_page || 1
   const itemsFrom = (itemPage - 1) * batchSize || 0
@@ -95,9 +106,14 @@ export function getBibQueryString(
         .join("")
     : ""
 
-  const paginationOrAllQuery = bibQuery?.all_items
-    ? "all_items=true"
-    : `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}`
+  // TODO: Remove the filtersActive check and the bibQuery?.all_items check in the second part of the ternary
+  // when view_all endpoint in discovery supports query params
+  const paginationOrAllQuery =
+    allItems && !itemFiltersActive(bibQuery)
+      ? "all_items=true"
+      : `items_size=${batchSize}&items_from=${itemsFrom}&item_page=${itemPage}${
+          allItems ? "&all_items=true" : ""
+        }`
 
   const mergeCheckinQuery = !includeAnnotatedMarc
     ? "&merge_checkin_card_items=true"

From 174cdd345b78a162e938339e7944eefcaea4fd14 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 12:01:55 -0400
Subject: [PATCH 082/141] Add tests for itemFiltersActive

---
 src/utils/bibUtils.ts                 |  3 +--
 src/utils/utilsTests/bibUtils.test.ts | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/utils/bibUtils.ts b/src/utils/bibUtils.ts
index fd9979c6f..17174cd5a 100644
--- a/src/utils/bibUtils.ts
+++ b/src/utils/bibUtils.ts
@@ -77,8 +77,7 @@ export function isNyplBibID(id: string) {
   return /^b/.test(id)
 }
 
-// Temp function to determine if view all and filters are active
-// TODO: Remove this when view_all endpoint in discovery supports query params
+// Check if any of the item filters in the bib query params are active
 export const itemFiltersActive = (bibQuery: BibQueryParams) =>
   ITEM_FILTER_PARAMS.some((param) => bibQuery[param]?.length)
 
diff --git a/src/utils/utilsTests/bibUtils.test.ts b/src/utils/utilsTests/bibUtils.test.ts
index b1cdcb1a9..67e2ef0bc 100644
--- a/src/utils/utilsTests/bibUtils.test.ts
+++ b/src/utils/utilsTests/bibUtils.test.ts
@@ -3,6 +3,7 @@ import {
   isNyplBibID,
   getBibQueryString,
   buildItemTableDisplayingString,
+  itemFiltersActive,
 } from "../bibUtils"
 
 describe("bibUtils", () => {
@@ -41,6 +42,30 @@ describe("bibUtils", () => {
       expect(isNyplBibID("hb10000202040400")).toBe(false)
     })
   })
+  describe("itemFiltersActive", () => {
+    it("returns true when any of the filter params are populated in the bib query string", () => {
+      expect(itemFiltersActive({ item_location: "location" })).toBe(true)
+      expect(itemFiltersActive({ item_format: "format" })).toBe(true)
+      expect(itemFiltersActive({ item_status: "status" })).toBe(true)
+      expect(itemFiltersActive({ item_date: "date" })).toBe(true)
+    })
+    it("returns false when item filter params are absent in the bib query or if they defined as empty strings", () => {
+      expect(
+        itemFiltersActive({
+          id: "b12082323",
+          item_page: 5,
+        })
+      ).toBe(false)
+      expect(
+        itemFiltersActive({
+          item_location: "",
+          item_status: "",
+          item_format: "",
+          item_date: "",
+        })
+      ).toBe(false)
+    })
+  })
   describe("getBibQueryString", () => {
     it("returns the correct query string with a bib ID and no bib params", () => {
       expect(getBibQueryString({ id: "b12082323" })).toBe(

From f9c47d3348dfe1988405f9c3e670459d691a1301 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 14:48:07 -0400
Subject: [PATCH 083/141] Add test for filters applied and all_items case

---
 src/utils/utilsTests/bibUtils.test.ts | 33 ++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/utils/utilsTests/bibUtils.test.ts b/src/utils/utilsTests/bibUtils.test.ts
index 67e2ef0bc..ebe9f0f11 100644
--- a/src/utils/utilsTests/bibUtils.test.ts
+++ b/src/utils/utilsTests/bibUtils.test.ts
@@ -77,7 +77,26 @@ describe("bibUtils", () => {
         "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
       )
     })
-    it("replaces pagination query params with all_items when all_items is true", () => {
+    // TODO: Uncomment when view_all endpoint in discovery supports query params
+    // it("replaces pagination query params with all_items when all_items is true", () => {
+    //   expect(
+    //     getBibQueryString({ id: "b12082323", item_page: 5, all_items: true })
+    //   ).toBe("?all_items=true&merge_checkin_card_items=true")
+    // })
+    // it("does not replace pagination query params when all_items is present and false", () => {
+    //   expect(
+    //     getBibQueryString({
+    //       id: "b12082323",
+    //       item_page: 5,
+    //       all_items: false,
+    //     })
+    //   ).toBe(
+    //     "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
+    //   )
+    // })
+
+    // TODO: Remove this test when view_all endpoint in discovery supports query params
+    it("replaces pagination query params with all_items when all_items is true unless filters are applied", () => {
       expect(
         getBibQueryString({ id: "b12082323", item_page: 5, all_items: true })
       ).toBe("?all_items=true&merge_checkin_card_items=true")
@@ -93,6 +112,18 @@ describe("bibUtils", () => {
         "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
       )
     })
+    it("preserves pagination when filters are applied and all_items is true", () => {
+      expect(
+        getBibQueryString({
+          id: "b12082323",
+          item_page: 5,
+          all_items: true,
+          item_location: "location",
+        })
+      ).toBe(
+        "?items_size=150&items_from=600&item_page=5&all_items=true&item_location=location&merge_checkin_card_items=true"
+      )
+    })
   })
   describe("buildItemTableDisplayingString", () => {
     it("returns the correct item table heading when there is one item", () => {

From f9ed30c8a077736d1ce56907e4e8533f20a58094 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 14:55:38 -0400
Subject: [PATCH 084/141] Catch batch fetch error

---
 src/server/api/bib.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index ac98658d3..1f065a88a 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -164,10 +164,16 @@ async function fetchAllBibItemsWithQuery(
     const bibPage = await client.get(
       `${DISCOVERY_API_SEARCH_ROUTE}/${bibQuery.id}${pageQueryString}`
     )
-    if (bibPage?.items?.length) {
-      items.push(...bibPage.items)
-    } else {
-      throw new Error("There was en error fetching items in one of the batches")
+    try {
+      if (bibPage?.items?.length) {
+        items.push(...bibPage.items)
+      } else {
+        throw new Error(
+          "There was en error fetching items in one of the batches"
+        )
+      }
+    } catch (error) {
+      logger.error(error.message)
     }
   }
   return items

From 37afb8b1b801eb3830131a36067e502e200d29e9 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 15:00:07 -0400
Subject: [PATCH 085/141] Add TODOs

---
 src/utils/utilsTests/bibUtils.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/utils/utilsTests/bibUtils.test.ts b/src/utils/utilsTests/bibUtils.test.ts
index ebe9f0f11..decfd561e 100644
--- a/src/utils/utilsTests/bibUtils.test.ts
+++ b/src/utils/utilsTests/bibUtils.test.ts
@@ -101,6 +101,7 @@ describe("bibUtils", () => {
         getBibQueryString({ id: "b12082323", item_page: 5, all_items: true })
       ).toBe("?all_items=true&merge_checkin_card_items=true")
     })
+    // TODO: Remove this test when view_all endpoint in discovery supports query params
     it("does not replace pagination query params when all_items is present and false", () => {
       expect(
         getBibQueryString({
@@ -112,6 +113,7 @@ describe("bibUtils", () => {
         "?items_size=20&items_from=80&item_page=5&merge_checkin_card_items=true"
       )
     })
+    // TODO: Remove this test when view_all endpoint in discovery supports query params
     it("preserves pagination when filters are applied and all_items is true", () => {
       expect(
         getBibQueryString({

From 515df1c196fdea1dab7a0d725357f72c2b483b6a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 16:42:38 -0400
Subject: [PATCH 086/141] Add subject heading constructor function to bib
 details model

---
 .nvmrc                   |  2 +-
 src/models/BibDetails.ts | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index 25bf17fc5..2edeafb09 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18
\ No newline at end of file
+20
\ No newline at end of file
diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index 1b0cbf0c0..7d1e04a0e 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -31,7 +31,9 @@ export default class BibDetails {
     this.supplementaryContent = this.buildSupplementaryContent()
     this.groupedNotes = this.buildGroupedNotes()
     this.extent = this.buildExtent()
-    this.subjectHeadings = this.buildSubjectHeadings()
+    // If we can't retreive subject headings from the SHEP API, we'll use the subjectLiteral
+    this.subjectHeadings =
+      this.buildSubjectHeadings() || this.buildSubjectLiterals()
     // these are the actual arrays of details that will be displayed
     this.annotatedMarcDetails = this.buildAnnotatedMarcDetails(
       annotatedMarc?.fields
@@ -362,8 +364,35 @@ export default class BibDetails {
   }
 
   buildSubjectHeadings(): SubjectHeadingDetail {
-    console.log("bib", this.bib)
-    console.log("subjectLiteral", this.bib?.subjectLiteral)
+    const subjectHeadingsUrls = this.bib.subjectHeadings.map(
+      ({ label, uuid }) => {
+        if (!label || !uuid) return
+        const subject = label.replace(/\.$/, "")
+        // stackedSubjectHeadings: ["a", "a -- b", "a -- b -- c"]
+        const stackedSubjectHeadings =
+          this.constructSubjectHeadingsArray(subject)
+        const shepUrl = `/subject_headings/${uuid}`
+        // splitSubjectHeadings: ["a", "b", "c"]
+        const splitSubjectHeadings = subject.split(" -- ")
+
+        return splitSubjectHeadings.map((heading, index) => {
+          const urlWithLabelParam = `${shepUrl}?label=${encodeURI(
+            stackedSubjectHeadings[index]
+          )}`
+          return {
+            url: urlWithLabelParam,
+            urlLabel: heading,
+          }
+        })
+      }
+    )
+    return {
+      label: "Subject",
+      value: subjectHeadingsUrls,
+    }
+  }
+
+  buildSubjectLiterals(): SubjectHeadingDetail {
     if (!this.bib.subjectLiteral) return
     const subjectLiteralUrls = this.bib.subjectLiteral.map(
       (subject: string) => {

From 7f22bf6876b54a6d98a795fd0556cacd5464ed7c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 16:43:29 -0400
Subject: [PATCH 087/141] Bump DS and nvmrc versions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27c9ce079..1e7270ab6 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.3.2",
+    "@nypl/design-system-react-components": "3.4.0-rc",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",

From 6c347ed9a13f322281f5c935a601794421285de0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 26 Sep 2024 16:49:47 -0400
Subject: [PATCH 088/141] Return early when subject headings are absent from
 bib

---
 src/models/BibDetails.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/models/BibDetails.ts b/src/models/BibDetails.ts
index 7d1e04a0e..8c4975d9c 100644
--- a/src/models/BibDetails.ts
+++ b/src/models/BibDetails.ts
@@ -364,6 +364,7 @@ export default class BibDetails {
   }
 
   buildSubjectHeadings(): SubjectHeadingDetail {
+    if (!this.bib.subjectHeadings) return
     const subjectHeadingsUrls = this.bib.subjectHeadings.map(
       ({ label, uuid }) => {
         if (!label || !uuid) return

From 3ad9cfc711dd952cbe06060826190c64856b5de2 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 09:55:27 -0400
Subject: [PATCH 089/141] Wrap fetch in try catch

---
 src/server/api/bib.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 1f065a88a..5a14894d3 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -154,17 +154,17 @@ async function fetchAllBibItemsWithQuery(
   const totalBatchNum = Math.ceil(numItems / batchSize)
 
   for (let batchNum = 1; batchNum <= totalBatchNum; batchNum++) {
-    const pageQueryString = getBibQueryString(
-      {
-        ...bibQuery,
-        item_page: batchNum,
-      },
-      false
-    )
-    const bibPage = await client.get(
-      `${DISCOVERY_API_SEARCH_ROUTE}/${bibQuery.id}${pageQueryString}`
-    )
     try {
+      const pageQueryString = getBibQueryString(
+        {
+          ...bibQuery,
+          item_page: batchNum,
+        },
+        false
+      )
+      const bibPage = await client.get(
+        `${DISCOVERY_API_SEARCH_ROUTE}/${bibQuery.id}${pageQueryString}`
+      )
       if (bibPage?.items?.length) {
         items.push(...bibPage.items)
       } else {

From 60b87d6762f891219e8ecc9acbd965336b319801 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 09:57:45 -0400
Subject: [PATCH 090/141] Adjust comments

---
 src/server/api/bib.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/server/api/bib.ts b/src/server/api/bib.ts
index 5a14894d3..0a0e67fa0 100644
--- a/src/server/api/bib.ts
+++ b/src/server/api/bib.ts
@@ -94,10 +94,8 @@ export async function fetchBib(
       }
     }
 
-    // Populate bib's items with all the items if View All is enabled
-    // TODO: Remove this when view_all endpoint in discovery supports query params
-
     // Only call the batched fetch when some of the filters are active
+    // TODO: Remove this when view_all endpoint in discovery supports query params
     if (bibQuery?.all_items && itemFiltersActive(bibQuery)) {
       discoveryBibResult.items = await fetchAllBibItemsWithQuery(
         bibQuery,

From 633476f08e39fd1b834e7457a6e24860627cbcd8 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:02:06 -0400
Subject: [PATCH 091/141] Temporarily revert nvmrc to 18 to move to a separate
 branch

---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 2edeafb09..25bf17fc5 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20
\ No newline at end of file
+18
\ No newline at end of file

From 7808fde14013250945ca44cf66eba016b87bfbdf Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:02:34 -0400
Subject: [PATCH 092/141] Temporarily revert DS to 3.3.2 to move to a separate
 branch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e7270ab6..27c9ce079 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.4.0-rc",
+    "@nypl/design-system-react-components": "3.3.2",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",

From 33008d0e20060eea995d5ba98517a95184b2ed5a Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 27 Sep 2024 10:20:46 -0400
Subject: [PATCH 093/141] update identifier dropdown option

---
 src/config/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/constants.ts b/src/config/constants.ts
index d5e4c6dd2..ee34f403d 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -102,7 +102,7 @@ export const SEARCH_FORM_OPTIONS = {
     placeholder: "ex. JFD 99-6057 or *ZAN-3174",
   },
   standard_number: {
-    text: "Control numbers/identifiers",
+    text: "Indentifier",
     searchTip:
       "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
     placeholder: "ex. 1558584536 or 95008433",

From aaa702977cc65aa01783717c181dd2e0a6ff3934 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 27 Sep 2024 10:21:15 -0400
Subject: [PATCH 094/141] rm value

---
 src/config/constants.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/config/constants.ts b/src/config/constants.ts
index ee34f403d..81137f4c8 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -78,7 +78,6 @@ export const SEARCH_FORM_OPTIONS = {
   },
   title: {
     text: "Title",
-    value: "title",
     searchTip: "Enter a title, or use quotes to search for an exact phrase.",
     placeholder: 'ex. David Copperfield or "The Jewish Press That Was"',
   },

From 613c0fbb037f444078de38dd32ef4706457b98ab Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Fri, 27 Sep 2024 10:33:57 -0400
Subject: [PATCH 095/141] fix hydration error

---
 src/components/SearchForm/SearchForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index d16180d5e..97b224e42 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -83,7 +83,7 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
       <div className={styles.searchContainerInner}>
         <Text size="body2" className={styles.searchTip}>
           <Icon size="medium" name="errorOutline" />
-          <Box className={styles.searchTipText}>
+          <Box as="span" className={styles.searchTipText}>
             <span>{"Search tip: "}</span>
             {searchTip}
           </Box>

From 8fd005bb101df0f59f3bf81a149516f26be011da Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:36:58 -0400
Subject: [PATCH 096/141] Add test for subject headings

---
 __test__/fixtures/bibFixtures.ts         | 253 +++++++++++++++++++++++
 src/models/modelTests/BibDetails.test.ts |  62 +++++-
 2 files changed, 307 insertions(+), 8 deletions(-)

diff --git a/__test__/fixtures/bibFixtures.ts b/__test__/fixtures/bibFixtures.ts
index dd25a78ce..7ce522f9b 100644
--- a/__test__/fixtures/bibFixtures.ts
+++ b/__test__/fixtures/bibFixtures.ts
@@ -11273,3 +11273,256 @@ export const bibManyEResources = {
     subjectHeadings: null,
   },
 }
+
+export const bibWithSubjectHeadings = {
+  resource: {
+    "@context":
+      "http://discovery-api-qa.nypl.org/api/v0.1/discovery/context_all.jsonld",
+    "@type": ["nypl:Item", "nypl:Resource"],
+    "@id": "res:b16145054",
+    buildingLocationIds: ["rc"],
+    carrierType: [
+      {
+        "@id": "carriertypes:nc",
+        prefLabel: "volume",
+      },
+    ],
+    createdString: ["2005"],
+    createdYear: 2005,
+    creatorLiteral: ["Cortanze, Gérard de."],
+    creatorLiteralNormalized: ["Gérard Cortanze", "Gérard de Cortanze"],
+    creatorLiteralWithoutDates: ["Cortanze, Gérard de."],
+    dateStartYear: 2005,
+    dateString: ["2005"],
+    dimensions: ["19 cm."],
+    electronicResources: [],
+    extent: ["193 p. : ill. ;"],
+    idIsbn: ["2070775178"],
+    idLccn: ["2005483039"],
+    idOclc: ["61868265"],
+    identifier: [
+      {
+        "@type": "bf:ShelfMark",
+        "@value": "JFC 06-438",
+      },
+      {
+        "@type": "nypl:Bnumber",
+        "@value": "16145054",
+      },
+      {
+        "@type": "bf:Isbn",
+        "@value": "2070775178",
+      },
+      {
+        "@type": "nypl:Oclc",
+        "@value": "61868265",
+      },
+      {
+        "@type": "bf:Lccn",
+        "@value": "2005483039",
+      },
+      {
+        "@type": "bf:Identifier",
+        "@value": "(WaOLN)M040000221",
+      },
+    ],
+    issuance: [
+      {
+        "@id": "urn:biblevel:m",
+        prefLabel: "monograph/item",
+      },
+    ],
+    itemAggregations: [
+      {
+        "@type": "nypl:Aggregation",
+        "@id": "res:location",
+        id: "location",
+        field: "location",
+        values: [
+          {
+            value: "loc:rc2ma",
+            count: 1,
+            label: "Offsite",
+          },
+        ],
+      },
+      {
+        "@type": "nypl:Aggregation",
+        "@id": "res:format",
+        id: "format",
+        field: "format",
+        values: [
+          {
+            value: "Text",
+            count: 1,
+            label: "Text",
+          },
+        ],
+      },
+      {
+        "@type": "nypl:Aggregation",
+        "@id": "res:status",
+        id: "status",
+        field: "status",
+        values: [
+          {
+            value: "status:a",
+            count: 1,
+            label: "Available",
+          },
+        ],
+      },
+    ],
+    items: [
+      {
+        "@id": "res:i15550040",
+        "@type": ["bf:Item"],
+        accessMessage: [
+          {
+            "@id": "accessMessage:2",
+            prefLabel: "Request in advance",
+          },
+        ],
+        catalogItemType: [
+          {
+            "@id": "catalogItemType:55",
+            prefLabel: "book, limited circ, MaRLI",
+          },
+        ],
+        eddFulfillment: {
+          "@id": "fulfillment:recap-edd",
+        },
+        eddRequestable: true,
+        formatLiteral: ["Text"],
+        holdingLocation: [
+          {
+            "@id": "loc:rc2ma",
+            prefLabel: "Offsite",
+          },
+        ],
+        idBarcode: ["33433073236758"],
+        identifier: [
+          {
+            "@type": "bf:ShelfMark",
+            "@value": "JFC 06-438",
+          },
+          {
+            "@type": "bf:Barcode",
+            "@value": "33433073236758",
+          },
+        ],
+        owner: [
+          {
+            "@id": "orgs:1000",
+            prefLabel: "Stephen A. Schwarzman Building",
+          },
+        ],
+        physFulfillment: {
+          "@id": "fulfillment:recap-offsite",
+        },
+        physRequestable: true,
+        physicalLocation: ["JFC 06-438"],
+        recapCustomerCode: ["NA"],
+        requestable: [true],
+        shelfMark: ["JFC 06-438"],
+        specRequestable: false,
+        status: [
+          {
+            "@id": "status:a",
+            prefLabel: "Available",
+          },
+        ],
+        uri: "i15550040",
+        idNyplSourceId: {
+          "@type": "SierraNypl",
+          "@value": "15550040",
+        },
+      },
+    ],
+    language: [
+      {
+        "@id": "lang:fre",
+        prefLabel: "French",
+      },
+    ],
+    lccClassification: ["PQ2663.O7223 Z46 2005"],
+    materialType: [
+      {
+        "@id": "resourcetypes:txt",
+        prefLabel: "Text",
+      },
+    ],
+    mediaType: [
+      {
+        "@id": "mediatypes:n",
+        prefLabel: "unmediated",
+      },
+    ],
+    numCheckinCardItems: 0,
+    numElectronicResources: 0,
+    numItemDatesParsed: 0,
+    numItemVolumesParsed: 0,
+    numItemsMatched: 1,
+    numItemsTotal: 1,
+    nyplSource: ["sierra-nypl"],
+    placeOfPublication: ["[Paris, France]"],
+    popularity: 1,
+    publicationStatement: ["[Paris, France] : Gallimard, c2005."],
+    publisherLiteral: ["Gallimard"],
+    seriesStatement: ["Haute enfance"],
+    shelfMark: ["JFC 06-438"],
+    subjectLiteral: [
+      "Cortanze, Gérard de -- Childhood and youth.",
+      "Authors, French -- 20th century -- Biography.",
+      "Autobiographical Narrative",
+    ],
+    title: ["Spaghetti!"],
+    titleDisplay: ["Spaghetti! / Gérard de Cortanze."],
+    type: ["nypl:Item"],
+    uniformTitle: ["Haute enfance (Gallimard (Firm))"],
+    updatedAt: 1723133852918,
+    uri: "b16145054",
+    suppressed: false,
+    hasItemVolumes: false,
+    hasItemDates: false,
+    subjectHeadings: [
+      {
+        label: "Cortanze, Gérard de -- Childhood and youth",
+        uuid: "74746d11-638b-4cfb-a72a-9a2bd296e6fd",
+        bib_count: 1,
+        desc_count: 0,
+        parent: {
+          label: "Cortanze, Gérard de",
+          uuid: "cf347108-e1f2-4c0f-808a-ac4ace2f0765",
+          bib_count: 5,
+          desc_count: 4,
+        },
+      },
+      {
+        label: "Authors, French -- 20th century -- Biography",
+        uuid: "9391bc26-e44c-44ac-98cc-e3800da51926",
+        bib_count: 5319,
+        desc_count: 22,
+        parent: {
+          label: "Authors, French -- 20th century",
+          uuid: "e43674a7-5f02-44f1-95cd-dbcc776331b7",
+          bib_count: 8405,
+          desc_count: 197,
+          parent: {
+            label: "Authors, French",
+            uuid: "5fd065df-b4e9-48cb-b13c-ea15f36b96b4",
+            bib_count: 14275,
+            desc_count: 1012,
+          },
+        },
+      },
+      {
+        label: "Autobiographical Narrative",
+        uuid: "3a779ed6-8a07-4d27-80ef-e0c2b10fe78e",
+        bib_count: 505,
+        desc_count: 343,
+      },
+    ],
+  },
+  annotatedMarc: {},
+}
diff --git a/src/models/modelTests/BibDetails.test.ts b/src/models/modelTests/BibDetails.test.ts
index 43d00ad49..69fe697cb 100644
--- a/src/models/modelTests/BibDetails.test.ts
+++ b/src/models/modelTests/BibDetails.test.ts
@@ -3,6 +3,7 @@ import {
   noParallels,
   parallelsBib,
   yiddishBib,
+  bibWithSubjectHeadings,
 } from "../../../__test__/fixtures/bibFixtures"
 import type { LinkedBibDetail } from "../../types/bibDetailsTypes"
 import BibDetailsModel from "../BibDetails"
@@ -25,6 +26,11 @@ describe("Bib model", () => {
     yiddishBib.resource,
     yiddishBib.annotatedMarc
   )
+
+  const bibWithSubjectHeadingsModel = new BibDetailsModel(
+    bibWithSubjectHeadings.resource,
+    bibWithSubjectHeadings.annotatedMarc
+  )
   describe("note", () => {
     it("groups notes into an array of {label, value} details", () => {
       const model = bibWithParallelsModel
@@ -51,26 +57,66 @@ describe("Bib model", () => {
     })
   })
   describe("subjectHeadings", () => {
-    it("maps single subjects to compound heading url", () => {
-      const filterQueryForSubjectHeading = "/search?filters[subjectLiteral]="
+    it("correctly formats the subjectHeading urls when the subjectHeadings are present in the bib result", () => {
+      const subjectHeadingsObject = {
+        label: "Subject",
+        value: [
+          [
+            {
+              url: "/subject_headings/74746d11-638b-4cfb-a72a-9a2bd296e6fd?label=Cortanze,%20G%C3%A9rard%20de",
+              urlLabel: "Cortanze, Gérard de",
+            },
+            {
+              url: "/subject_headings/74746d11-638b-4cfb-a72a-9a2bd296e6fd?label=Cortanze,%20G%C3%A9rard%20de%20--%20Childhood%20and%20youth",
+              urlLabel: "Childhood and youth",
+            },
+          ],
+          [
+            {
+              url: "/subject_headings/9391bc26-e44c-44ac-98cc-e3800da51926?label=Authors,%20French",
+              urlLabel: "Authors, French",
+            },
+            {
+              url: "/subject_headings/9391bc26-e44c-44ac-98cc-e3800da51926?label=Authors,%20French%20--%2020th%20century",
+              urlLabel: "20th century",
+            },
+            {
+              url: "/subject_headings/9391bc26-e44c-44ac-98cc-e3800da51926?label=Authors,%20French%20--%2020th%20century%20--%20Biography",
+              urlLabel: "Biography",
+            },
+          ],
+          [
+            {
+              url: "/subject_headings/3a779ed6-8a07-4d27-80ef-e0c2b10fe78e?label=Autobiographical%20Narrative",
+              urlLabel: "Autobiographical Narrative",
+            },
+          ],
+        ],
+      }
+      expect(bibWithSubjectHeadingsModel.subjectHeadings).toMatchObject(
+        subjectHeadingsObject
+      )
+    })
+    it("falls back to subject literals when subject headings are absent in the bib and correctly formats the urls", () => {
+      const filterQueryForSubjectLiteral = "/search?filters[subjectLiteral]="
       const subjectHeadingsObject = {
         label: "Subject",
         value: [
           [
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Authors, French"
               )}`,
               urlLabel: "Authors, French",
             },
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Authors, French -- 20th century"
               )}`,
               urlLabel: "20th century",
             },
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Authors, French -- 20th century -- Biography"
               )}`,
               urlLabel: "Biography",
@@ -78,7 +124,7 @@ describe("Bib model", () => {
           ],
           [
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Autobiographical Narrative"
               )}`,
               urlLabel: "Autobiographical Narrative",
@@ -86,13 +132,13 @@ describe("Bib model", () => {
           ],
           [
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Cortanze, Gérard de"
               )}`,
               urlLabel: "Cortanze, Gérard de",
             },
             {
-              url: `${filterQueryForSubjectHeading}${encodeURI(
+              url: `${filterQueryForSubjectLiteral}${encodeURI(
                 "Cortanze, Gérard de -- Childhood and youth"
               )}`,
               urlLabel: "Childhood and youth",

From 268fed9b1610cb5aadcb05f11cd61992d8fac267 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:39:43 -0400
Subject: [PATCH 097/141] Remove quotes from numbers in fixture

---
 __test__/fixtures/bibFixtures.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/__test__/fixtures/bibFixtures.ts b/__test__/fixtures/bibFixtures.ts
index 7ce522f9b..3dacd8a6b 100644
--- a/__test__/fixtures/bibFixtures.ts
+++ b/__test__/fixtures/bibFixtures.ts
@@ -11287,19 +11287,19 @@ export const bibWithSubjectHeadings = {
         prefLabel: "volume",
       },
     ],
-    createdString: ["2005"],
+    createdString: [2005],
     createdYear: 2005,
     creatorLiteral: ["Cortanze, Gérard de."],
     creatorLiteralNormalized: ["Gérard Cortanze", "Gérard de Cortanze"],
     creatorLiteralWithoutDates: ["Cortanze, Gérard de."],
     dateStartYear: 2005,
-    dateString: ["2005"],
+    dateString: [2005],
     dimensions: ["19 cm."],
     electronicResources: [],
     extent: ["193 p. : ill. ;"],
-    idIsbn: ["2070775178"],
-    idLccn: ["2005483039"],
-    idOclc: ["61868265"],
+    idIsbn: [2070775178],
+    idLccn: [2005483039],
+    idOclc: [61868265],
     identifier: [
       {
         "@type": "bf:ShelfMark",
@@ -11307,19 +11307,19 @@ export const bibWithSubjectHeadings = {
       },
       {
         "@type": "nypl:Bnumber",
-        "@value": "16145054",
+        "@value": 16145054,
       },
       {
         "@type": "bf:Isbn",
-        "@value": "2070775178",
+        "@value": 2070775178,
       },
       {
         "@type": "nypl:Oclc",
-        "@value": "61868265",
+        "@value": 61868265,
       },
       {
         "@type": "bf:Lccn",
-        "@value": "2005483039",
+        "@value": 2005483039,
       },
       {
         "@type": "bf:Identifier",
@@ -11400,7 +11400,7 @@ export const bibWithSubjectHeadings = {
             prefLabel: "Offsite",
           },
         ],
-        idBarcode: ["33433073236758"],
+        idBarcode: [33433073236758],
         identifier: [
           {
             "@type": "bf:ShelfMark",
@@ -11408,7 +11408,7 @@ export const bibWithSubjectHeadings = {
           },
           {
             "@type": "bf:Barcode",
-            "@value": "33433073236758",
+            "@value": 33433073236758,
           },
         ],
         owner: [
@@ -11435,7 +11435,7 @@ export const bibWithSubjectHeadings = {
         uri: "i15550040",
         idNyplSourceId: {
           "@type": "SierraNypl",
-          "@value": "15550040",
+          "@value": 15550040,
         },
       },
     ],

From 84fd368265e69bfe89cc77533ec96474f3aa3b4a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:41:04 -0400
Subject: [PATCH 098/141] Restore quotes on sourceid

---
 __test__/fixtures/bibFixtures.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__test__/fixtures/bibFixtures.ts b/__test__/fixtures/bibFixtures.ts
index 3dacd8a6b..95274c35d 100644
--- a/__test__/fixtures/bibFixtures.ts
+++ b/__test__/fixtures/bibFixtures.ts
@@ -11435,7 +11435,7 @@ export const bibWithSubjectHeadings = {
         uri: "i15550040",
         idNyplSourceId: {
           "@type": "SierraNypl",
-          "@value": 15550040,
+          "@value": "15550040",
         },
       },
     ],

From 74cb091179b44111bba6a009e8d3b486024efe32 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:42:00 -0400
Subject: [PATCH 099/141] Restore quotes on barcode

---
 __test__/fixtures/bibFixtures.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/__test__/fixtures/bibFixtures.ts b/__test__/fixtures/bibFixtures.ts
index 95274c35d..e1bd4b018 100644
--- a/__test__/fixtures/bibFixtures.ts
+++ b/__test__/fixtures/bibFixtures.ts
@@ -11400,7 +11400,7 @@ export const bibWithSubjectHeadings = {
             prefLabel: "Offsite",
           },
         ],
-        idBarcode: [33433073236758],
+        idBarcode: ["33433073236758"],
         identifier: [
           {
             "@type": "bf:ShelfMark",
@@ -11408,7 +11408,7 @@ export const bibWithSubjectHeadings = {
           },
           {
             "@type": "bf:Barcode",
-            "@value": 33433073236758,
+            "@value": "33433073236758",
           },
         ],
         owner: [

From 885cab99cc8108453aea0bbecb8a48e17866aef1 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 10:48:31 -0400
Subject: [PATCH 100/141] Change types to number in SubjectHeading type

---
 src/types/bibTypes.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/bibTypes.ts b/src/types/bibTypes.ts
index d5fffeee5..f3514aa0f 100644
--- a/src/types/bibTypes.ts
+++ b/src/types/bibTypes.ts
@@ -95,6 +95,6 @@ export interface BibQueryParams extends ItemFilterQueryParams {
 export type SubjectHeading = {
   label?: string
   uuid?: string
-  bib_count?: 10
-  desc_count?: 0
+  bib_count?: number
+  desc_count?: number
 }

From 059de36aa38be6362867014d574096183b73a9b9 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 11:00:52 -0400
Subject: [PATCH 101/141] Add annotated marc

---
 __test__/fixtures/bibFixtures.ts | 281 ++++++++++++++++++++++++++++++-
 1 file changed, 280 insertions(+), 1 deletion(-)

diff --git a/__test__/fixtures/bibFixtures.ts b/__test__/fixtures/bibFixtures.ts
index e1bd4b018..294842e95 100644
--- a/__test__/fixtures/bibFixtures.ts
+++ b/__test__/fixtures/bibFixtures.ts
@@ -11524,5 +11524,284 @@ export const bibWithSubjectHeadings = {
       },
     ],
   },
-  annotatedMarc: {},
+  annotatedMarc: {
+    id: "16145054",
+    nyplSource: "sierra-nypl",
+    fields: [
+      {
+        label: "Author",
+        values: [
+          {
+            content: "Cortanze, Gérard de.",
+            source: {
+              fieldTag: "a",
+              marcTag: "100",
+              ind1: "1",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Cortanze, Gérard de.",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Title",
+        values: [
+          {
+            content: "Spaghetti! / Gérard de Cortanze.",
+            source: {
+              fieldTag: "t",
+              marcTag: "245",
+              ind1: "1",
+              ind2: "0",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Spaghetti! /",
+                },
+                {
+                  tag: "c",
+                  content: "Gérard de Cortanze.",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Imprint",
+        values: [
+          {
+            content: "[Paris, France] : Gallimard, c2005.",
+            source: {
+              fieldTag: "p",
+              marcTag: "260",
+              ind1: " ",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "[Paris, France] :",
+                },
+                {
+                  tag: "b",
+                  content: "Gallimard,",
+                },
+                {
+                  tag: "c",
+                  content: "c2005.",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Description",
+        values: [
+          {
+            content: "193 p. : ill. ; 19 cm.",
+            source: {
+              fieldTag: "r",
+              marcTag: "300",
+              ind1: " ",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "193 p. :",
+                },
+                {
+                  tag: "b",
+                  content: "ill. ;",
+                },
+                {
+                  tag: "c",
+                  content: "19 cm.",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Series",
+        values: [
+          {
+            content: "Haute enfance",
+            source: {
+              fieldTag: "s",
+              marcTag: "490",
+              ind1: "1",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Haute enfance",
+                },
+              ],
+            },
+          },
+          {
+            content: "Haute enfance (Gallimard (Firm))",
+            source: {
+              fieldTag: "s",
+              marcTag: "830",
+              ind1: " ",
+              ind2: "0",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Haute enfance (Gallimard (Firm))",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Indexed Term",
+        values: [
+          {
+            content: "Autobiographical Narrative",
+            source: {
+              fieldTag: "d",
+              marcTag: "653",
+              ind1: " ",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Autobiographical Narrative",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Subject",
+        values: [
+          {
+            content: "Cortanze, Gérard de -- Childhood and youth.",
+            source: {
+              fieldTag: "d",
+              marcTag: "600",
+              ind1: "1",
+              ind2: "0",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Cortanze, Gérard de",
+                },
+                {
+                  tag: "x",
+                  content: "Childhood and youth.",
+                },
+              ],
+            },
+          },
+          {
+            content: "Authors, French -- 20th century -- Biography.",
+            source: {
+              fieldTag: "d",
+              marcTag: "650",
+              ind1: " ",
+              ind2: "0",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "Authors, French",
+                },
+                {
+                  tag: "y",
+                  content: "20th century",
+                },
+                {
+                  tag: "v",
+                  content: "Biography.",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "LCCN",
+        values: [
+          {
+            content: "2005483039",
+            source: {
+              fieldTag: "l",
+              marcTag: "010",
+              ind1: " ",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "2005483039",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "ISBN",
+        values: [
+          {
+            content: "2070775178",
+            source: {
+              fieldTag: "i",
+              marcTag: "020",
+              ind1: " ",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "a",
+                  content: "2070775178",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        label: "Research Call Number",
+        values: [
+          {
+            content: "JFC 06-438",
+            source: {
+              fieldTag: "q",
+              marcTag: "852",
+              ind1: "8",
+              ind2: " ",
+              content: null,
+              subfields: [
+                {
+                  tag: "h",
+                  content: "JFC 06-438",
+                },
+              ],
+            },
+          },
+        ],
+      },
+    ],
+  },
 }

From d4c9b1d72181445d4a2bc949f4d5130a6f2425d1 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 13:09:51 -0400
Subject: [PATCH 102/141] Bump DS to 3.4.0-rc and nvmrc to node 20

---
 .nvmrc       | 2 +-
 CHANGELOG    | 1 +
 package.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index 25bf17fc5..2edeafb09 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18
\ No newline at end of file
+20
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index e823a9687..a642dc465 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Updated
 
+- Bump nvmrc version to Node 20
 - Integrate view_all query param on client side and remove batched fetch (SCC-4287)
 - Replaced travis with github actions (SCC-4218)
 - Sentence case and rearrange search options (SCC-4260)
diff --git a/package.json b/package.json
index 27c9ce079..1e7270ab6 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.3.2",
+    "@nypl/design-system-react-components": "3.4.0-rc",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",

From e04bb67770db2834b0600b6af86e0ae0a4504e3a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 13:27:31 -0400
Subject: [PATCH 103/141] Update package lock

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cfc0d57a3..1cbb889f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "research-catalog",
       "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.3.2",
+        "@nypl/design-system-react-components": "3.4.0-rc",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.5.2",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,9 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.3.2.tgz",
-      "integrity": "sha512-PvLCLQ/xUPoYFGC05ZYk5EPK6KcbDZsrW1x/mYPtWLA5TCnQd0VqUBE7vB9EcjIvq4Nu6j8VvOuvsV/53TxjMQ==",
+      "version": "3.4.0-rc",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc.tgz",
+      "integrity": "sha512-huehmy89fMtVtfZredRuE46l3KLRFoaGdqcmC+9GP/k/hAh2hAeLcIHqZ4QLY0hvQiDkEnYqYsf6OCkxuvOioA==",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",

From c410acc9949c9a896d84dee59c847c834f3b902c Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 16:05:02 -0400
Subject: [PATCH 104/141] Update year error text

---
 __test__/pages/bib/bibPage.test.tsx        | 6 +++---
 src/components/ItemFilters/ItemFilters.tsx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/__test__/pages/bib/bibPage.test.tsx b/__test__/pages/bib/bibPage.test.tsx
index 2e5a80bc7..a18ae2b37 100644
--- a/__test__/pages/bib/bibPage.test.tsx
+++ b/__test__/pages/bib/bibPage.test.tsx
@@ -185,7 +185,7 @@ describe("Bib Page Item Table", () => {
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
     expect(mockRouter.asPath).toBe("/bib/pb5579193")
     expect(
-      screen.queryByText("Error: Please enter a valid year.")
+      screen.queryByText("There was a problem. Please enter a valid year.")
     ).toBeInTheDocument()
 
     // non-numeric
@@ -193,7 +193,7 @@ describe("Bib Page Item Table", () => {
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
     expect(mockRouter.asPath).toBe("/bib/pb5579193")
     expect(
-      screen.queryByText("Error: Please enter a valid year.")
+      screen.queryByText("There was a problem. Please enter a valid year.")
     ).toBeInTheDocument()
 
     // not of length 4
@@ -201,7 +201,7 @@ describe("Bib Page Item Table", () => {
     await userEvent.click(yearFilter.querySelector("button[type='submit']"))
     expect(mockRouter.asPath).toBe("/bib/pb5579193")
     expect(
-      screen.queryByText("Error: Please enter a valid year.")
+      screen.queryByText("There was a problem. Please enter a valid year.")
     ).toBeInTheDocument()
   })
 
diff --git a/src/components/ItemFilters/ItemFilters.tsx b/src/components/ItemFilters/ItemFilters.tsx
index 512a69cd0..6b935e8d3 100644
--- a/src/components/ItemFilters/ItemFilters.tsx
+++ b/src/components/ItemFilters/ItemFilters.tsx
@@ -141,7 +141,7 @@ const ItemFilters = ({
               aria-labelledby="year-filter-label"
               data-testid="year-filter"
               isInvalid={invalidYear}
-              invalidText="Error: Please enter a valid year."
+              invalidText="Please enter a valid year."
               textInputProps={{
                 placeholder: "YYYY",
                 isClearable: true,

From ccd8282ed23d06d6feabb4608f20494e668bd1ea Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 16:29:40 -0400
Subject: [PATCH 105/141] Update changelog

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a642dc465..63cab2804 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,7 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Updated
 
-- Bump nvmrc version to Node 20
+- Bump nvmrc version to Node 20 and DS package to release candidate 3.4.0-rc.
+- Updated error message in Item Filter Year to include new error message prefix from the DS.
 - Integrate view_all query param on client side and remove batched fetch (SCC-4287)
 - Replaced travis with github actions (SCC-4218)
 - Sentence case and rearrange search options (SCC-4260)

From 721d372e827e0328ef90aeba7590a1ffd521213d Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 16:34:19 -0400
Subject: [PATCH 106/141] Change tense in changelog entry

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63cab2804..af5a42d1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Updated
 
 - Bump nvmrc version to Node 20 and DS package to release candidate 3.4.0-rc.
-- Updated error message in Item Filter Year to include new error message prefix from the DS.
+- Update error message in Item Filter Year to include new error message prefix from the DS.
 - Integrate view_all query param on client side and remove batched fetch (SCC-4287)
 - Replaced travis with github actions (SCC-4218)
 - Sentence case and rearrange search options (SCC-4260)

From 76f163b490bd79e1cb0e7d7a9bf10860e8965315 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 17:09:26 -0400
Subject: [PATCH 107/141] Return empty string as result of
 buildQueryDisplayString when displayStringArray is empty

---
 src/utils/searchUtils.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index 77bab9c9f..d5b3696e9 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -64,6 +64,7 @@ export function getSearchResultsHeading(
   } of ${totalResults.toLocaleString()} results ${queryDisplayString}`
 }
 
+// Shows the final part of the search query string (e.g. "for keyword 'cats'")
 function buildQueryDisplayString(searchParams: SearchParams): string {
   const searchFields = advSearchFields
     // Lowercase the adv search field labels:
@@ -110,11 +111,9 @@ function buildQueryDisplayString(searchParams: SearchParams): string {
 
   const displayStringArray = Object.values(paramsStringCollection)
 
-  return `for ${
-    displayStringArray.length > 1
-      ? displayStringArray.join(" and ")
-      : displayStringArray[0]
-  }`
+  return displayStringArray.length
+    ? `for ${displayStringArray.join(" and ")}`
+    : ""
 }
 
 /**

From f51993f0ec12112cb2f2fc05675e7e9f662d43bc Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 17:11:17 -0400
Subject: [PATCH 108/141] Update changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index e823a9687..3cafa70b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix bug where "undefined" appears in the search results heading (SCC-4277)
 - VQA second pass miscellaneous fixes (SCC-4264)
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
 

From 0c9bc21491a206030dbabb705d7a15613814f651 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Fri, 27 Sep 2024 17:20:35 -0400
Subject: [PATCH 109/141] Add test for empty q scenario

---
 src/utils/searchUtils.ts                 | 4 ++--
 src/utils/utilsTests/searchUtils.test.ts | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/utils/searchUtils.ts b/src/utils/searchUtils.ts
index d5b3696e9..1f2605b98 100644
--- a/src/utils/searchUtils.ts
+++ b/src/utils/searchUtils.ts
@@ -61,7 +61,7 @@ export function getSearchResultsHeading(
     totalResults > RESULTS_PER_PAGE
       ? `${resultsStart}-${resultsEnd}`
       : totalResults.toLocaleString()
-  } of ${totalResults.toLocaleString()} results ${queryDisplayString}`
+  } of ${totalResults.toLocaleString()} results${queryDisplayString}`
 }
 
 // Shows the final part of the search query string (e.g. "for keyword 'cats'")
@@ -112,7 +112,7 @@ function buildQueryDisplayString(searchParams: SearchParams): string {
   const displayStringArray = Object.values(paramsStringCollection)
 
   return displayStringArray.length
-    ? `for ${displayStringArray.join(" and ")}`
+    ? ` for ${displayStringArray.join(" and ")}`
     : ""
 }
 
diff --git a/src/utils/utilsTests/searchUtils.test.ts b/src/utils/utilsTests/searchUtils.test.ts
index 79723ef2d..f185499b9 100644
--- a/src/utils/utilsTests/searchUtils.test.ts
+++ b/src/utils/utilsTests/searchUtils.test.ts
@@ -239,6 +239,10 @@ describe("searchUtils", () => {
         'Displaying 201-250 of 1,200 results for keyword "cats"'
       )
     })
+    it("doesn't display the 'for' part of the display text when the q param is absent", () => {
+      const heading = getSearchResultsHeading({ page: 5 }, 1200)
+      expect(heading).toEqual("Displaying 201-250 of 1,200 results")
+    })
 
     describe("identifier searches", () => {
       it("returns the correct heading string for OCLC searches", () => {

From 97817eb2bf47be043168cd3fd803763fe2da6bb7 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Mon, 30 Sep 2024 12:17:15 -0400
Subject: [PATCH 110/141] rm search form changes for bib page deployment

---
 src/components/SearchForm/SearchForm.tsx | 15 ++++++++++-----
 src/config/constants.ts                  | 15 ++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.tsx b/src/components/SearchForm/SearchForm.tsx
index 97b224e42..fffe25c30 100644
--- a/src/components/SearchForm/SearchForm.tsx
+++ b/src/components/SearchForm/SearchForm.tsx
@@ -36,8 +36,9 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   const [appliedFilters, setAppliedFilters] = useState(
     collapseMultiValueQueryParams(router.query)
   )
-  const searchTip = SEARCH_FORM_OPTIONS[searchScope].searchTip
-  const placeholder = SEARCH_FORM_OPTIONS[searchScope].placeholder
+  // SEARCH TIP CODE
+  // const searchTip = SEARCH_FORM_OPTIONS[searchScope].searchTip
+  // const placeholder = SEARCH_FORM_OPTIONS[searchScope].placeholder
 
   const isLoading = useLoading()
 
@@ -81,13 +82,14 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
   return (
     <div className={styles.searchContainer}>
       <div className={styles.searchContainerInner}>
+        {/* SEARCH TIP CODE
         <Text size="body2" className={styles.searchTip}>
           <Icon size="medium" name="errorOutline" />
           <Box as="span" className={styles.searchTipText}>
             <span>{"Search tip: "}</span>
             {searchTip}
           </Box>
-        </Text>
+        </Text> */}
         <SearchBar
           id="mainContent"
           action={`${BASE_URL}/search`}
@@ -107,9 +109,12 @@ const SearchForm = ({ aggregations }: { aggregations?: Aggregation[] }) => {
             onChange: (e) => handleChange(e, setSearchTerm),
             isClearableCallback: () => setSearchTerm(""),
             value: searchTerm,
-            labelText: searchTip,
             name: "q",
-            placeholder,
+            // SEARCH TIP CODE
+            //labelText: searchTip,
+            //placeholder
+            labelText: "Keyword, title, journal title, or author/contributor",
+            placeholder: "Keyword, title, journal title, or author/contributor",
           }}
           sx={{
             ".chakra-select__icon-wrapper": { "z-index": "999 !important" },
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 81137f4c8..f48a71cf5 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -94,14 +94,15 @@ export const SEARCH_FORM_OPTIONS = {
     placeholder:
       'ex. The New York Times or "The Journal of Clinical Investigation"',
   },
-  callnumber: {
-    text: "Call number",
-    searchTip:
-      "Enter a call number, or the first few letters and numbers of a call number. ",
-    placeholder: "ex. JFD 99-6057 or *ZAN-3174",
-  },
+  // SEARCH TIP CODE
+  // callnumber: {
+  //   text: "Call number",
+  //   searchTip:
+  //     "Enter a call number, or the first few letters and numbers of a call number. ",
+  //   placeholder: "ex. JFD 99-6057 or *ZAN-3174",
+  // },
   standard_number: {
-    text: "Indentifier",
+    text: "Standard number",
     searchTip:
       "Enter a control number or identifier. Examples include ISSN / ISBN / OCLC / LCCN numbers, barcodes, etc.",
     placeholder: "ex. 1558584536 or 95008433",

From 9c24bdb526f2b9c6f5a19e7d968b66fdf0088c9e Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Mon, 30 Sep 2024 12:29:18 -0400
Subject: [PATCH 111/141] comment out search form test

---
 src/components/SearchForm/SearchForm.test.tsx | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/SearchForm/SearchForm.test.tsx b/src/components/SearchForm/SearchForm.test.tsx
index 61515b3cc..83639322d 100644
--- a/src/components/SearchForm/SearchForm.test.tsx
+++ b/src/components/SearchForm/SearchForm.test.tsx
@@ -47,17 +47,18 @@ describe("SearchForm", () => {
     const input = screen.getByDisplayValue("spaghetti")
     expect(input).toBeTruthy()
   })
-  describe("search scope options", () => {
-    it("updates the search tip when search scope is updated", async () => {
-      render(<SearchForm aggregations={normalAggs} />)
-      const searchScopeSelect = screen.getByLabelText("Select a category")
-      await userEvent.selectOptions(searchScopeSelect, "journal_title")
-      let searchTip = screen.getByText(
-        SEARCH_FORM_OPTIONS.journal_title.searchTip
-      )
-      await userEvent.selectOptions(searchScopeSelect, "all")
-      searchTip = screen.getByText(SEARCH_FORM_OPTIONS.all.searchTip)
-      expect(searchTip).toBeInTheDocument()
-    })
-  })
+  // SEARCH TIP CODE
+  // describe("search scope options", () => {
+  //   it("updates the search tip when search scope is updated", async () => {
+  //     render(<SearchForm aggregations={normalAggs} />)
+  //     const searchScopeSelect = screen.getByLabelText("Select a category")
+  //     await userEvent.selectOptions(searchScopeSelect, "journal_title")
+  //     let searchTip = screen.getByText(
+  //       SEARCH_FORM_OPTIONS.journal_title.searchTip
+  //     )
+  //     await userEvent.selectOptions(searchScopeSelect, "all")
+  //     searchTip = screen.getByText(SEARCH_FORM_OPTIONS.all.searchTip)
+  //     expect(searchTip).toBeInTheDocument()
+  //   })
+  // })
 })

From a3fcbbd782796cf90c1f0e91eb15d44a40328ed4 Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Mon, 30 Sep 2024 12:30:35 -0400
Subject: [PATCH 112/141] update changelog

---
 CHANGELOG | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d50af9dc0..84e0530f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,9 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Call number search scope to search dropdown options [(SCC-4260)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4260)
-- Search tip per search scope [(SCC-4263)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4263)
-
 ### Fixed
 
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
@@ -21,6 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced travis with github actions (SCC-4218)
 - Sentence case and rearrange search options (SCC-4260)
 
+Added the following, but commented out for later release:
+
+- Call number search scope to search dropdown options [(SCC-4260)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4260)
+- Search tip per search scope [(SCC-4263)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4263)
+
 ## [1.2.4] 2024-08-29
 
 ### Fixed

From 928b6256a631c257be99266dbc06c813f196a40e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 15:31:43 -0400
Subject: [PATCH 113/141] Change numItems to function and pass
 filtersAreApplied

---
 pages/bib/[id]/index.tsx                      |  9 ++-------
 .../ItemTable/ItemTableControls.tsx           |  2 +-
 src/components/SearchResults/SearchResult.tsx |  2 +-
 src/models/Bib.ts                             | 20 +++++++++----------
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pages/bib/[id]/index.tsx b/pages/bib/[id]/index.tsx
index e9b007880..26074b8ec 100644
--- a/pages/bib/[id]/index.tsx
+++ b/pages/bib/[id]/index.tsx
@@ -89,11 +89,6 @@ export default function BibPage({
 
   const filtersAreApplied = areFiltersApplied(appliedFilters)
 
-  // If filters are applied, show the matching number of items, otherwise show the total number of items
-  const numItems = filtersAreApplied
-    ? bib.numItemsMatched
-    : bib.numPhysicalItems
-
   const refreshItemTable = async (
     newQuery: BibQueryParams,
     viewAllItems = false,
@@ -273,7 +268,7 @@ export default function BibPage({
                   >
                     {buildItemTableDisplayingString(
                       itemTablePage,
-                      numItems,
+                      bib.numItems(filtersAreApplied),
                       viewAllExpanded,
                       filtersAreApplied
                     )}
@@ -292,7 +287,7 @@ export default function BibPage({
                   handlePageChange={handlePageChange}
                   handleViewAllClick={handleViewAllClick}
                   viewAllLoadingTextRef={viewAllLoadingTextRef}
-                  numItemsTotal={numItems}
+                  numItemsTotal={bib.numItems(filtersAreApplied)}
                   filtersAreApplied={filtersAreApplied}
                 />
               ) : null}
diff --git a/src/components/ItemTable/ItemTableControls.tsx b/src/components/ItemTable/ItemTableControls.tsx
index 7e7e38de7..7d866bbff 100644
--- a/src/components/ItemTable/ItemTableControls.tsx
+++ b/src/components/ItemTable/ItemTableControls.tsx
@@ -54,7 +54,7 @@ const ItemTableControls = ({
           mb={{ base: "m", md: 0 }}
         />
       ) : null}
-      {bib.showViewAllItemsLink &&
+      {bib.showViewAllItemsLink(filtersAreApplied) &&
         (itemsLoading && viewAllExpanded ? (
           <Box
             ml="auto"
diff --git a/src/components/SearchResults/SearchResult.tsx b/src/components/SearchResults/SearchResult.tsx
index d132c2d6a..e90da6387 100644
--- a/src/components/SearchResults/SearchResult.tsx
+++ b/src/components/SearchResults/SearchResult.tsx
@@ -61,7 +61,7 @@ const SearchResult = ({ bib }: SearchResultProps) => {
                   key={`search-results-item-${itemTableData.items[0].id}`}
                 />
               ))}
-              {bib.showViewAllItemsLink && (
+              {bib.showViewAllItemsLink() && (
                 <CardActions>
                   <RCLink
                     href={`${bib.url}#item-table`}
diff --git a/src/models/Bib.ts b/src/models/Bib.ts
index 169d00f14..82bae98d8 100644
--- a/src/models/Bib.ts
+++ b/src/models/Bib.ts
@@ -55,12 +55,6 @@ export default class Bib {
     return this.electronicResources?.length || 0
   }
 
-  get numItems() {
-    return this.hasPhysicalItems
-      ? this.numPhysicalItems
-      : this.numElectronicResources
-  }
-
   get hasPhysicalItems() {
     return this.numPhysicalItems > 0
   }
@@ -86,10 +80,6 @@ export default class Bib {
     )
   }
 
-  get showViewAllItemsLink() {
-    return this.numItemsMatched > ITEM_PAGINATION_BATCH_SIZE
-  }
-
   get resourceType() {
     return this.hasPhysicalItems ? "Item" : "Resource"
   }
@@ -102,8 +92,16 @@ export default class Bib {
     )
   }
 
+  numItems(filtersAreApplied = false) {
+    return filtersAreApplied ? this.numItemsMatched : this.numPhysicalItems
+  }
+
+  showViewAllItemsLink(filtersAreApplied = false) {
+    return this.numItems(filtersAreApplied) > ITEM_PAGINATION_BATCH_SIZE
+  }
+
   getNumItemsMessage(filtersAreApplied = false) {
-    const totalItems = filtersAreApplied ? this.numItemsMatched : this.numItems
+    const totalItems = this.numItems(filtersAreApplied)
     return `${totalItems} ${
       filtersAreApplied ? "matching " : ""
     }${this.resourceType.toLowerCase()}${totalItems !== 1 ? "s" : ""}`

From 6916f10aef6d11d4caca9d4a25117cdfd445be98 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 15:32:57 -0400
Subject: [PATCH 114/141] Change overridden showViewAllItemsLink to a function

---
 src/models/SearchResultsBib.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/SearchResultsBib.ts b/src/models/SearchResultsBib.ts
index 0b7d61bfc..6b678bd28 100644
--- a/src/models/SearchResultsBib.ts
+++ b/src/models/SearchResultsBib.ts
@@ -26,7 +26,7 @@ export default class SearchResultsBib extends Bib {
       : null
   }
 
-  get showViewAllItemsLink() {
+  showViewAllItemsLink() {
     return this.numPhysicalItems > ITEMS_PER_SEARCH_RESULT
   }
 

From 61f3740f296c86f2f0293e6c47f06421bf61153e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 15:33:46 -0400
Subject: [PATCH 115/141] Change getter to function in test

---
 src/models/modelTests/SearchResultsBib.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/modelTests/SearchResultsBib.test.ts b/src/models/modelTests/SearchResultsBib.test.ts
index 16290a5fa..ee21222f5 100644
--- a/src/models/modelTests/SearchResultsBib.test.ts
+++ b/src/models/modelTests/SearchResultsBib.test.ts
@@ -38,7 +38,7 @@ describe("SearchResultsBib model", () => {
 
   describe("showViewAllItemsLink", () => {
     it("returns true if the number of physical items is greater than ITEMS_PER_SEARCH_RESULT", () => {
-      expect(searchResultsBib.showViewAllItemsLink).toBe(true)
+      expect(searchResultsBib.showViewAllItemsLink()).toBe(true)
     })
   })
 

From 3824ea640c39f3b27ef34adb5b035add18bbcf6e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 15:37:58 -0400
Subject: [PATCH 116/141] Move old numItems to SearchResultsBib model

---
 src/models/SearchResultsBib.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/models/SearchResultsBib.ts b/src/models/SearchResultsBib.ts
index 6b678bd28..9863e09e1 100644
--- a/src/models/SearchResultsBib.ts
+++ b/src/models/SearchResultsBib.ts
@@ -43,6 +43,12 @@ export default class SearchResultsBib extends Bib {
       : null
   }
 
+  numItems() {
+    return this.hasPhysicalItems
+      ? this.numPhysicalItems
+      : this.numElectronicResources
+  }
+
   getYearFromResult(result: DiscoveryBibResult) {
     const { dateStartYear, dateEndYear } = result
 

From 0326df621265419d021b58e31da23dabb8de6f36 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 15:41:29 -0400
Subject: [PATCH 117/141] Add item to changelog

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1090f193d..65755be15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## Hotfix
+
+- Fix bug where the "View fewer" button was not appearing when filters weren't applied
+
 ### Fixed
 
 - Fix bug where "undefined" appears in the search results heading (SCC-4277)

From 2400525ade79b9f5e014af73150832bff85ba1a0 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 16:20:54 -0400
Subject: [PATCH 118/141] Add isScrollable to ItemTable and small css tweaks

---
 CHANGELOG                               | 1 +
 src/components/ItemTable/ItemTable.tsx  | 9 ++++++++-
 styles/components/ItemTable.module.scss | 7 +++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1090f193d..69fdaee57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Small styling fixes after DS version bump (SCC-4264)
 - Fix bug where "undefined" appears in the search results heading (SCC-4277)
 - VQA second pass miscellaneous fixes (SCC-4264)
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index c1930dd86..9566f3a85 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -1,4 +1,8 @@
-import { Box, Table } from "@nypl/design-system-react-components"
+import {
+  Box,
+  Table,
+  useNYPLBreakpoints,
+} from "@nypl/design-system-react-components"
 
 import type ItemTableData from "../../models/ItemTableData"
 import StatusLinks from "./StatusLinks"
@@ -13,6 +17,8 @@ interface ItemTableProps {
  */
 const ItemTable = ({ itemTableData }: ItemTableProps) => {
   const { tableHeadings, tableData, items, inSearchResult } = itemTableData
+  const { isLargerThanSmall } = useNYPLBreakpoints()
+
   return (
     <Box>
       <Table
@@ -22,6 +28,7 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
         columnHeaders={tableHeadings}
         tableData={tableData}
         showRowDividers={!inSearchResult}
+        isScrollable={!isLargerThanSmall}
         my={{ base: 0, md: "s" }}
         data-testid={
           !inSearchResult
diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index c8a80830e..ddeb424b4 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -7,13 +7,16 @@
     margin-bottom: var(--nypl-space-xs);
   }
 
+  th {
+    text-transform: uppercase;
+  }
+
   tr {
     th,
     td,
     td:first-of-type,
     th:first-of-type {
-      text-transform: none;
-      padding: var(--nypl-space-s) 0;
+      padding: var(--nypl-space-s) var(--nypl-space-xs);
 
       // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call number columns to appear to narrow
       // TODO: These can be removed if the issue is addressed in the DS or during VQA.

From 901d8a4e8c549d649349986ac17f77dbf65cba8a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 16:22:48 -0400
Subject: [PATCH 119/141] Change to isLargerThanMobile

---
 src/components/ItemTable/ItemTable.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 9566f3a85..917f8ed61 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -17,7 +17,7 @@ interface ItemTableProps {
  */
 const ItemTable = ({ itemTableData }: ItemTableProps) => {
   const { tableHeadings, tableData, items, inSearchResult } = itemTableData
-  const { isLargerThanSmall } = useNYPLBreakpoints()
+  const { isLargerThanMobile } = useNYPLBreakpoints()
 
   return (
     <Box>
@@ -28,7 +28,7 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
         columnHeaders={tableHeadings}
         tableData={tableData}
         showRowDividers={!inSearchResult}
-        isScrollable={!isLargerThanSmall}
+        isScrollable={!isLargerThanMobile}
         my={{ base: 0, md: "s" }}
         data-testid={
           !inSearchResult

From 8b88817231d6dceee91069c1e15d7e683c7184e3 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 16:23:48 -0400
Subject: [PATCH 120/141] Align contact a librarian button to the left

---
 src/components/ItemTable/ItemAvailability.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ItemTable/ItemAvailability.tsx b/src/components/ItemTable/ItemAvailability.tsx
index 5074abbd1..b2722487c 100644
--- a/src/components/ItemTable/ItemAvailability.tsx
+++ b/src/components/ItemTable/ItemAvailability.tsx
@@ -106,6 +106,7 @@ const ItemAvailability = ({ item }: ItemAvailabilityProps) => {
             fontSize: "inherit",
             p: 0,
             height: "auto",
+            textAlign: "left",
           }}
           onClick={() =>
             onContact({

From 7c6cdd0a38439bc5eb856d2f345e7730e34fdf20 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 16:32:23 -0400
Subject: [PATCH 121/141] Adjust table min widths

---
 styles/components/ItemTable.module.scss | 29 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index ddeb424b4..e9170025d 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -7,17 +7,30 @@
     margin-bottom: var(--nypl-space-xs);
   }
 
-  th {
-    text-transform: uppercase;
-  }
-
   tr {
     th,
-    td,
+    td {
+      padding: null var(--nypl-space-xs);
+    }
+
+    th {
+      text-transform: uppercase;
+    }
+
     td:first-of-type,
     th:first-of-type {
-      padding: var(--nypl-space-s) var(--nypl-space-xs);
+      padding: var(--nypl-space-s) var(--nypl-space-xs) var(--nypl-space-s) 0;
+    }
+
+    td:last-of-type,
+    th:last-of-type {
+      padding: var(--nypl-space-s) 0 var(--nypl-space-s) var(--nypl-space-xs);
+    }
 
+    th,
+    td,
+    td:first-of-type,
+    th:first-of-type {
       // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call number columns to appear to narrow
       // TODO: These can be removed if the issue is addressed in the DS or during VQA.
       @media screen and (min-width: 600px) {
@@ -25,10 +38,10 @@
       }
 
       @media screen and (min-width: 900px) {
-        min-width: 130px;
+        min-width: 100px;
 
         &:first-child {
-          min-width: 370px;
+          min-width: 340px;
         }
       }
 

From 8af078bc411b34a00efed60be2e0c48425d5d0ea Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Mon, 30 Sep 2024 16:44:02 -0400
Subject: [PATCH 122/141] Add ds version number to changelog

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 69fdaee57..7264488be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Small styling fixes after DS version bump (SCC-4264)
+- Small styling fixes after DS version bump to 3.4.0-rc (SCC-4264)
 - Fix bug where "undefined" appears in the search results heading (SCC-4277)
 - VQA second pass miscellaneous fixes (SCC-4264)
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)

From 37f43131fc89cecf8e12b0eee82d998387268676 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 08:32:33 -0400
Subject: [PATCH 123/141] Remove styles fixed by the DS update

---
 styles/components/ItemTable.module.scss | 45 ++-----------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index e9170025d..4ca4e5dc2 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -1,57 +1,16 @@
 .itemTable {
   margin-top: var(--nypl-space-m);
   margin-bottom: var(--nypl-space-s);
-  width: unset !important;
-
-  thead {
-    margin-bottom: var(--nypl-space-xs);
-  }
 
   tr {
-    th,
-    td {
-      padding: null var(--nypl-space-xs);
-    }
-
-    th {
-      text-transform: uppercase;
-    }
-
     td:first-of-type,
     th:first-of-type {
-      padding: var(--nypl-space-s) var(--nypl-space-xs) var(--nypl-space-s) 0;
+      padding-left: 0;
     }
 
     td:last-of-type,
     th:last-of-type {
-      padding: var(--nypl-space-s) 0 var(--nypl-space-s) var(--nypl-space-xs);
-    }
-
-    th,
-    td,
-    td:first-of-type,
-    th:first-of-type {
-      // These min-widths are here temporarily to fix an issue with the table that causes the Format and Call number columns to appear to narrow
-      // TODO: These can be removed if the issue is addressed in the DS or during VQA.
-      @media screen and (min-width: 600px) {
-        min-width: 80px;
-      }
-
-      @media screen and (min-width: 900px) {
-        min-width: 100px;
-
-        &:first-child {
-          min-width: 340px;
-        }
-      }
-
-      // Fix for extra whitespace added by non-table cell styling on span coming from DS
-      // TODO: Bring this issue up with DS team and potentially fix there
-      > span + span {
-        @media screen and (min-width: 600px) {
-          display: table-cell;
-        }
-      }
+      padding-right: 0;
     }
   }
 

From 42e2eae284656c69d8944c10e131c8292c3fd244 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 11:43:42 -0400
Subject: [PATCH 124/141] Bump package version and add defaults for column
 widths

---
 package.json                           | 2 +-
 src/components/ItemTable/ItemTable.tsx | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e7270ab6..d53fe19a6 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.4.0-rc",
+    "@nypl/design-system-react-components": "3.4.0-rc3",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",
diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 917f8ed61..66d63b0a5 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -26,6 +26,13 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
           inSearchResult ? " " + styles.inSearchResult : ""
         }`}
         columnHeaders={tableHeadings}
+        columnStyles={[
+          { minWidth: 350, width: "35%" },
+          {},
+          {},
+          {},
+          { maxWidth: 200 },
+        ]}
         tableData={tableData}
         showRowDividers={!inSearchResult}
         isScrollable={!isLargerThanMobile}

From 69e76a1ff12ec05a47156aaa57bf158a43463750 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 11:46:14 -0400
Subject: [PATCH 125/141] Add comment above column styles

---
 src/components/ItemTable/ItemTable.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 66d63b0a5..c3296cef6 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -26,6 +26,7 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
           inSearchResult ? " " + styles.inSearchResult : ""
         }`}
         columnHeaders={tableHeadings}
+        // TODO: Review these values with the design team
         columnStyles={[
           { minWidth: 350, width: "35%" },
           {},

From 45dea204118de87bba62259fef21a6ff5ec2eb2a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 11:49:53 -0400
Subject: [PATCH 126/141] Update package lock

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1cbb889f1..ca9a3c7fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "research-catalog",
       "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.4.0-rc",
+        "@nypl/design-system-react-components": "3.4.0-rc3",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.5.2",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,9 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.4.0-rc",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc.tgz",
-      "integrity": "sha512-huehmy89fMtVtfZredRuE46l3KLRFoaGdqcmC+9GP/k/hAh2hAeLcIHqZ4QLY0hvQiDkEnYqYsf6OCkxuvOioA==",
+      "version": "3.4.0-rc3",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc3.tgz",
+      "integrity": "sha512-ubSGkWdpK6zuXQ26j1m6uhzqZ3YyponSOoyeZz/rjPRpv/lwzf5ad/D2OljmeRJjCwqjmSrhfiBnH6bpeHObLQ==",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",

From 575e7604412058e1573a7bfce01093d62a99d1f9 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 12:23:37 -0400
Subject: [PATCH 127/141] Add viewport fix

---
 package-lock.json | 25 +++++++++++++++++++++++++
 package.json      |  1 +
 pages/_app.tsx    | 21 ++++++++++++++++++++-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index ca9a3c7fe..4810f16ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
         "react": "18.2.0",
         "react-barcode": "1.4.6",
         "react-dom": "18.2.0",
+        "react-helmet": "^6.1.0",
         "swr": "2.2.1",
         "ts-jest": "29.1.1",
         "underscore": "1.13.6",
@@ -11450,6 +11451,21 @@
         }
       }
     },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intersection-observer": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-9.2.2.tgz",
@@ -11536,6 +11552,15 @@
         }
       }
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-style-singleton": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
diff --git a/package.json b/package.json
index d53fe19a6..f8d3de1f6 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "react": "18.2.0",
     "react-barcode": "1.4.6",
     "react-dom": "18.2.0",
+    "react-helmet": "^6.1.0",
     "swr": "2.2.1",
     "ts-jest": "29.1.1",
     "underscore": "1.13.6",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index f9ae4b707..82a384d54 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,4 +1,5 @@
 import Head from "next/head"
+import { Helmet } from "react-helmet"
 import { useEffect } from "react"
 import { useRouter } from "next/router"
 import Script from "next/script"
@@ -14,6 +15,24 @@ import { FeedbackProvider } from "../src/context/FeedbackContext"
 function App({ Component, pageProps }) {
   const router = useRouter()
 
+  const [isIOS, setIsIOS] = useState(false)
+
+  useEffect(() => {
+    const userAgent = typeof window !== "undefined" && navigator.userAgent
+    if (userAgent && /iPad|iPhone|iPod/.test(userAgent)) {
+      setIsIOS(true)
+    }
+  }, [])
+
+  const viewport = isIOS ? (
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1"
+    />
+  ) : (
+    <meta name="viewport" content="width=device-width" />
+  )
+
   // TODO: The code below is a verbose solution for page view tracking
   // in Adobe Analytics that guarantees that page views will only be sent
   // on the first app render or on Next route changes.
@@ -83,7 +102,7 @@ function App({ Component, pageProps }) {
 
       <Head>
         <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Helmet>{viewport}</Helmet>
         <meta httpEquiv="x-ua-compatible" content="ie=edge" />
         <link
           rel="icon"

From c350251b08438ab2e06b4b7e4cb996510e946a4a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 12:25:35 -0400
Subject: [PATCH 128/141] Import useState

---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index 82a384d54..9c62ca7ab 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,6 +1,6 @@
 import Head from "next/head"
 import { Helmet } from "react-helmet"
-import { useEffect } from "react"
+import { useEffect, useState } from "react"
 import { useRouter } from "next/router"
 import Script from "next/script"
 import "@nypl/design-system-react-components/dist/styles.css"

From 3b03277e7cfb9a59210f2a3fa805ab8b1f0a14db Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 12:34:06 -0400
Subject: [PATCH 129/141] Revert layout fix

---
 package-lock.json | 25 -------------------------
 package.json      |  1 -
 pages/_app.tsx    | 23 ++---------------------
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4810f16ba..ca9a3c7fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,6 @@
         "react": "18.2.0",
         "react-barcode": "1.4.6",
         "react-dom": "18.2.0",
-        "react-helmet": "^6.1.0",
         "swr": "2.2.1",
         "ts-jest": "29.1.1",
         "underscore": "1.13.6",
@@ -11451,21 +11450,6 @@
         }
       }
     },
-    "node_modules/react-helmet": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
-      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
-      "license": "MIT",
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.1.1",
-        "react-side-effect": "^2.1.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0"
-      }
-    },
     "node_modules/react-intersection-observer": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-9.2.2.tgz",
@@ -11552,15 +11536,6 @@
         }
       }
     },
-    "node_modules/react-side-effect": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
-      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/react-style-singleton": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
diff --git a/package.json b/package.json
index f8d3de1f6..d53fe19a6 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
     "react": "18.2.0",
     "react-barcode": "1.4.6",
     "react-dom": "18.2.0",
-    "react-helmet": "^6.1.0",
     "swr": "2.2.1",
     "ts-jest": "29.1.1",
     "underscore": "1.13.6",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 9c62ca7ab..f9ae4b707 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,6 +1,5 @@
 import Head from "next/head"
-import { Helmet } from "react-helmet"
-import { useEffect, useState } from "react"
+import { useEffect } from "react"
 import { useRouter } from "next/router"
 import Script from "next/script"
 import "@nypl/design-system-react-components/dist/styles.css"
@@ -15,24 +14,6 @@ import { FeedbackProvider } from "../src/context/FeedbackContext"
 function App({ Component, pageProps }) {
   const router = useRouter()
 
-  const [isIOS, setIsIOS] = useState(false)
-
-  useEffect(() => {
-    const userAgent = typeof window !== "undefined" && navigator.userAgent
-    if (userAgent && /iPad|iPhone|iPod/.test(userAgent)) {
-      setIsIOS(true)
-    }
-  }, [])
-
-  const viewport = isIOS ? (
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1"
-    />
-  ) : (
-    <meta name="viewport" content="width=device-width" />
-  )
-
   // TODO: The code below is a verbose solution for page view tracking
   // in Adobe Analytics that guarantees that page views will only be sent
   // on the first app render or on Next route changes.
@@ -102,7 +83,7 @@ function App({ Component, pageProps }) {
 
       <Head>
         <meta charSet="utf-8" />
-        <Helmet>{viewport}</Helmet>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta httpEquiv="x-ua-compatible" content="ie=edge" />
         <link
           rel="icon"

From 8006e01cd715e09e067a92f31b76ec11222fb799 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 13:21:58 -0400
Subject: [PATCH 130/141] Bump design system version

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ca9a3c7fe..7b0c4520b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "research-catalog",
       "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.4.0-rc3",
+        "@nypl/design-system-react-components": "3.4.0-rc4",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.5.2",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,9 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.4.0-rc3",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc3.tgz",
-      "integrity": "sha512-ubSGkWdpK6zuXQ26j1m6uhzqZ3YyponSOoyeZz/rjPRpv/lwzf5ad/D2OljmeRJjCwqjmSrhfiBnH6bpeHObLQ==",
+      "version": "3.4.0-rc4",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc4.tgz",
+      "integrity": "sha512-oF2iDyYzG6x74lL/dTsyLBE8mL/3qqVXVorUUt+1URQ8UBjSxkG5OobWRpVYtJSJW42tK3JkXRYT5nDe8W3y4A==",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",
diff --git a/package.json b/package.json
index d53fe19a6..9d32e0920 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.4.0-rc3",
+    "@nypl/design-system-react-components": "3.4.0-rc4",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",

From 87e0293bd69dc2a2790d6eddaf01c18ffec0fe3a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 13:51:18 -0400
Subject: [PATCH 131/141] Add grid styling to item table container

---
 src/components/ItemTable/ItemTable.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index c3296cef6..dc7e918c1 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -20,7 +20,8 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
   const { isLargerThanMobile } = useNYPLBreakpoints()
 
   return (
-    <Box>
+    // Display as grid to prevent bug where the outer container stretches to the Table's width on mobile
+    <Box display="grid">
       <Table
         className={`${styles.itemTable}${
           inSearchResult ? " " + styles.inSearchResult : ""

From 00b51f5b857fb1262be40efe4921e341700f94b2 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 16:26:14 -0400
Subject: [PATCH 132/141] Add styles to all columns

---
 src/components/ItemTable/ItemTable.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index dc7e918c1..9c5ea1c9d 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -29,11 +29,12 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
         columnHeaders={tableHeadings}
         // TODO: Review these values with the design team
         columnStyles={[
-          { minWidth: 350, width: "35%" },
-          {},
-          {},
-          {},
-          { maxWidth: 200 },
+          { width: "35%", minWidth: 250, maxwidth: 300 },
+          { minwidth: 200, maxWidth: 250 },
+          { minwidth: 150, maxWidth: 200 },
+          { minwidth: 150, maxWidth: 200 },
+          { minwidth: 150, maxWidth: 200 },
+          { minwidth: 150, maxWidth: 200 },
         ]}
         tableData={tableData}
         showRowDividers={!inSearchResult}

From 0247d456dc67651b562b2cc7e5759478fe388a96 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 16:37:26 -0400
Subject: [PATCH 133/141] Adjust column width values

---
 src/components/ItemTable/ItemTable.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 9c5ea1c9d..78fc1026a 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -29,11 +29,11 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
         columnHeaders={tableHeadings}
         // TODO: Review these values with the design team
         columnStyles={[
-          { width: "35%", minWidth: 250, maxwidth: 300 },
-          { minwidth: 200, maxWidth: 250 },
-          { minwidth: 150, maxWidth: 200 },
-          { minwidth: 150, maxWidth: 200 },
+          { width: "35%", minWidth: 300, maxwidth: 350 },
           { minwidth: 150, maxWidth: 200 },
+          { minwidth: 150, maxWidth: 150 },
+          { minwidth: 150, maxWidth: 150 },
+          { minwidth: 150, maxWidth: 150 },
           { minwidth: 150, maxWidth: 200 },
         ]}
         tableData={tableData}

From eb0b331a908d1c77eca124cb0323b21cd3435a71 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Tue, 1 Oct 2024 18:29:23 -0400
Subject: [PATCH 134/141] Adjust column values

---
 src/components/ItemTable/ItemTable.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ItemTable/ItemTable.tsx b/src/components/ItemTable/ItemTable.tsx
index 78fc1026a..feaeece4f 100644
--- a/src/components/ItemTable/ItemTable.tsx
+++ b/src/components/ItemTable/ItemTable.tsx
@@ -29,11 +29,11 @@ const ItemTable = ({ itemTableData }: ItemTableProps) => {
         columnHeaders={tableHeadings}
         // TODO: Review these values with the design team
         columnStyles={[
-          { width: "35%", minWidth: 300, maxwidth: 350 },
+          { minWidth: 350, maxwidth: 350 },
           { minwidth: 150, maxWidth: 200 },
           { minwidth: 150, maxWidth: 150 },
           { minwidth: 150, maxWidth: 150 },
-          { minwidth: 150, maxWidth: 150 },
+          { minwidth: 200, maxWidth: 250 },
           { minwidth: 150, maxWidth: 200 },
         ]}
         tableData={tableData}

From fec62e9bb9639ba513b17c023ca19bd2cb69f1da Mon Sep 17 00:00:00 2001
From: Vera Kahn <verakahn@nypl.org>
Date: Wed, 2 Oct 2024 12:15:49 -0400
Subject: [PATCH 135/141] revert dropdown order and label

---
 src/config/constants.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/config/constants.ts b/src/config/constants.ts
index f48a71cf5..0d7591cee 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -71,7 +71,7 @@ export const ERROR_MESSAGES = {
 
 export const SEARCH_FORM_OPTIONS = {
   all: {
-    text: "Keyword",
+    text: "All fields",
     searchTip:
       "Enter one or more keywords, or use quotes to search for an exact phrase.",
     placeholder: 'ex. climate change or "The New York Times"',
@@ -81,12 +81,6 @@ export const SEARCH_FORM_OPTIONS = {
     searchTip: "Enter a title, or use quotes to search for an exact phrase.",
     placeholder: 'ex. David Copperfield or "The Jewish Press That Was"',
   },
-  contributor: {
-    text: "Author/contributor",
-    searchTip:
-      "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
-    placeholder: "ex. Dickens, Charles or American Law Association",
-  },
   journal_title: {
     text: "Journal title",
     searchTip:
@@ -94,6 +88,12 @@ export const SEARCH_FORM_OPTIONS = {
     placeholder:
       'ex. The New York Times or "The Journal of Clinical Investigation"',
   },
+  contributor: {
+    text: "Author/contributor",
+    searchTip:
+      "Enter the name of an author, contributor, or organization. Use Last Name, First Name for more accurate results.",
+    placeholder: "ex. Dickens, Charles or American Law Association",
+  },
   // SEARCH TIP CODE
   // callnumber: {
   //   text: "Call number",

From cd6db973d0adc1c8b62a36b753600006d0e3645a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 2 Oct 2024 13:52:13 -0400
Subject: [PATCH 136/141] Add font size to table to fix styling inconsistency

---
 src/components/ItemTable/ItemAvailability.tsx | 1 +
 styles/components/ItemTable.module.scss       | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/components/ItemTable/ItemAvailability.tsx b/src/components/ItemTable/ItemAvailability.tsx
index b2722487c..646ba63c7 100644
--- a/src/components/ItemTable/ItemAvailability.tsx
+++ b/src/components/ItemTable/ItemAvailability.tsx
@@ -107,6 +107,7 @@ const ItemAvailability = ({ item }: ItemAvailabilityProps) => {
             p: 0,
             height: "auto",
             textAlign: "left",
+            minHeight: "auto",
           }}
           onClick={() =>
             onContact({
diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index 4ca4e5dc2..fb686e573 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -12,6 +12,11 @@
     th:last-of-type {
       padding-right: 0;
     }
+
+    td {
+      font-size: var(--nypl-fontSizes-desktop-body-body2);
+      line-height: var(--nypl-lineHeights-desktop-body-body2);
+    }
   }
 
   &.inSearchResult {

From 469121da4281f527bfbeb006258aed743b2495d5 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 2 Oct 2024 13:55:11 -0400
Subject: [PATCH 137/141] Remove font sizes from table styles

---
 styles/components/ItemTable.module.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index fb686e573..4ca4e5dc2 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -12,11 +12,6 @@
     th:last-of-type {
       padding-right: 0;
     }
-
-    td {
-      font-size: var(--nypl-fontSizes-desktop-body-body2);
-      line-height: var(--nypl-lineHeights-desktop-body-body2);
-    }
   }
 
   &.inSearchResult {

From 72df16de7d816cb7a3a3ebdb7a08cccad2ecd55a Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 2 Oct 2024 14:17:22 -0400
Subject: [PATCH 138/141] Add styling overrides for line height misalignment

---
 styles/components/ItemTable.module.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/styles/components/ItemTable.module.scss b/styles/components/ItemTable.module.scss
index 4ca4e5dc2..acf9a7663 100644
--- a/styles/components/ItemTable.module.scss
+++ b/styles/components/ItemTable.module.scss
@@ -12,6 +12,15 @@
     th:last-of-type {
       padding-right: 0;
     }
+
+    td {
+      font-size: var(--nypl-fontSizes-desktop-body-body2);
+      line-height: var(--nypl-lineHeights-body-body2);
+    }
+
+    span {
+      vertical-align: top;
+    }
   }
 
   &.inSearchResult {

From c77b9869ab42753dbedf7460be838ad39cc97cad Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 2 Oct 2024 14:25:39 -0400
Subject: [PATCH 139/141] Bump version in changelog

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 079be43e1..4dbb96956 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Prerelease
+## [1.3.0] 2024-10-3
 
 ### Added
 

From 19115b735db9dbd0e6c64ba1739afca0d6cf9297 Mon Sep 17 00:00:00 2001
From: Diego Cohen <diegocohen@nypl.org>
Date: Wed, 2 Oct 2024 16:25:05 -0400
Subject: [PATCH 140/141] Bump DS version to 3.4.0

---
 CHANGELOG         | 1 +
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4dbb96956..97fa74cfe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Updated
 
+- Bump DS version to 3.4.0
 - Bump nvmrc version to Node 20 and DS package to release candidate 3.4.0-rc.
 - Update error message in Item Filter Year to include new error message prefix from the DS.
 - Integrate view_all query param on client side and remove batched fetch (SCC-4287)
diff --git a/package-lock.json b/package-lock.json
index 7b0c4520b..27bf0b5ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "research-catalog",
       "version": "1.2.1",
       "dependencies": {
-        "@nypl/design-system-react-components": "3.4.0-rc4",
+        "@nypl/design-system-react-components": "3.4.0",
         "@nypl/nypl-data-api-client": "1.0.5",
         "@nypl/pickup-time-estimator": "^1.5.2",
         "@nypl/sierra-wrapper": "1.1.0",
@@ -2933,9 +2933,10 @@
       }
     },
     "node_modules/@nypl/design-system-react-components": {
-      "version": "3.4.0-rc4",
-      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0-rc4.tgz",
-      "integrity": "sha512-oF2iDyYzG6x74lL/dTsyLBE8mL/3qqVXVorUUt+1URQ8UBjSxkG5OobWRpVYtJSJW42tK3JkXRYT5nDe8W3y4A==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@nypl/design-system-react-components/-/design-system-react-components-3.4.0.tgz",
+      "integrity": "sha512-mYQv+p2WGUfja6mIcgIcGKHmPyrZevPG9BtaS+qdlCeqxR9ewPcFnR4x94wsMJ15nNy3efNuf3uoEworF2Qjig==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@chakra-ui/react": "2.8.2",
         "@chakra-ui/system": "2.6.2",
diff --git a/package.json b/package.json
index 9d32e0920..549a11cf2 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "coverage": "jest --coverage"
   },
   "dependencies": {
-    "@nypl/design-system-react-components": "3.4.0-rc4",
+    "@nypl/design-system-react-components": "3.4.0",
     "@nypl/nypl-data-api-client": "1.0.5",
     "@nypl/pickup-time-estimator": "^1.5.2",
     "@nypl/sierra-wrapper": "1.1.0",

From 825540936295a46aac903919cc25d2f1a975b37e Mon Sep 17 00:00:00 2001
From: Diego Cohen <diego.cohen3@gmail.com>
Date: Thu, 3 Oct 2024 07:42:35 -0400
Subject: [PATCH 141/141] Remove rc changelog notes

---
 CHANGELOG | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 97fa74cfe..4353e6f4b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Small styling fixes after DS version bump to 3.4.0-rc (SCC-4264)
+- Small styling fixes after DS version bump to 3.4.0 (SCC-4264)
 - Fix bug where "undefined" appears in the search results heading (SCC-4277)
 - VQA second pass miscellaneous fixes (SCC-4264)
 - Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Updated
 
 - Bump DS version to 3.4.0
-- Bump nvmrc version to Node 20 and DS package to release candidate 3.4.0-rc.
+- Bump nvmrc version to Node 20.
 - Update error message in Item Filter Year to include new error message prefix from the DS.
 - Integrate view_all query param on client side and remove batched fetch (SCC-4287)
 - Replaced travis with github actions (SCC-4218)