From 42e2eae284656c69d8944c10e131c8292c3fd244 Mon Sep 17 00:00:00 2001 From: Diego Cohen Date: Tue, 1 Oct 2024 11:43:42 -0400 Subject: [PATCH 01/17] 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 Date: Tue, 1 Oct 2024 11:46:14 -0400 Subject: [PATCH 02/17] 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 Date: Tue, 1 Oct 2024 11:49:53 -0400 Subject: [PATCH 03/17] 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 Date: Tue, 1 Oct 2024 12:23:37 -0400 Subject: [PATCH 04/17] 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 ? ( + + ) : ( + + ) + // 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 }) { - + {viewport} Date: Tue, 1 Oct 2024 12:25:35 -0400 Subject: [PATCH 05/17] 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 Date: Tue, 1 Oct 2024 12:34:06 -0400 Subject: [PATCH 06/17] 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 ? ( - - ) : ( - - ) - // 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 }) { - {viewport} + Date: Tue, 1 Oct 2024 13:21:58 -0400 Subject: [PATCH 07/17] 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 Date: Tue, 1 Oct 2024 13:51:18 -0400 Subject: [PATCH 08/17] 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 ( - + // Display as grid to prevent bug where the outer container stretches to the Table's width on mobile + Date: Tue, 1 Oct 2024 16:26:14 -0400 Subject: [PATCH 09/17] 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 Date: Tue, 1 Oct 2024 16:37:26 -0400 Subject: [PATCH 10/17] 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 Date: Tue, 1 Oct 2024 18:29:23 -0400 Subject: [PATCH 11/17] 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 cd6db973d0adc1c8b62a36b753600006d0e3645a Mon Sep 17 00:00:00 2001 From: Diego Cohen Date: Wed, 2 Oct 2024 13:52:13 -0400 Subject: [PATCH 12/17] 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 Date: Wed, 2 Oct 2024 13:55:11 -0400 Subject: [PATCH 13/17] 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 Date: Wed, 2 Oct 2024 14:17:22 -0400 Subject: [PATCH 14/17] 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 Date: Wed, 2 Oct 2024 14:25:39 -0400 Subject: [PATCH 15/17] 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 Date: Wed, 2 Oct 2024 16:25:05 -0400 Subject: [PATCH 16/17] 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 Date: Thu, 3 Oct 2024 07:42:35 -0400 Subject: [PATCH 17/17] 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)