Merge branch 'develop' into W-17443086-select-store-from-store-locator-ui

hajinsuha1 · web-flow · commit bdf378d6cd61 · 2025-01-17T14:28:52.000-05:00
diff --git a/packages/template-retail-react-app/CHANGELOG.md b/packages/template-retail-react-app/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## v5.1.0-dev (TBD)
 
+- [BUG] Fixed GET /shopper-context API calls being made without the usid [#2206](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2206)
 - Update test data references to 2024, and unify to 01/2040 [#2196](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2197)
 - Fixed failing checkout tests [#2195](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2195)
 - Allow store to be selectable in StoreLocator [#2187](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2187)
diff --git a/packages/template-retail-react-app/app/hooks/use-update-shopper-context.js b/packages/template-retail-react-app/app/hooks/use-update-shopper-context.js
@@ -33,7 +33,7 @@ export const useUpdateShopperContext = () => {
     const updateShopperContext = useShopperContextsMutation('updateShopperContext')
     const {data: shopperContext, isLoading} = useShopperContext(
         {parameters: {usid, siteId: site.id}},
-        {enabled: !isServer}
+        {enabled: !isServer && Boolean(usid)}
     )
     // Handle updating the shopper context based on URL search params
     const shopperContextFromSearchParams = useShopperContextSearchParams()
diff --git a/packages/template-retail-react-app/app/pages/product-list/partials/page-designer-promotional-banner.jsx b/packages/template-retail-react-app/app/pages/product-list/partials/page-designer-promotional-banner.jsx
@@ -32,7 +32,7 @@ const PageDesignerPromotionalBanner = () => {
     const {usid} = useUsid()
     const {data: shopperContext} = useShopperContext(
         {parameters: {usid, siteId: site.id}},
-        {enabled: !isServer}
+        {enabled: !isServer && Boolean(usid)}
     )
 
     const {data: promoBannerDesktop, error: pageErrorDesktop} = usePage(

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const useUpdateShopperContext = () => {`
`33`	`33`	`const updateShopperContext = useShopperContextsMutation('updateShopperContext')`
`34`	`34`	`const {data: shopperContext, isLoading} = useShopperContext(`
`35`	`35`	`{parameters: {usid, siteId: site.id}},`
`36`		`- {enabled: !isServer}`
	`36`	`+ {enabled: !isServer && Boolean(usid)}`
`37`	`37`	`)`
`38`	`38`	`// Handle updating the shopper context based on URL search params`
`39`	`39`	`const shopperContextFromSearchParams = useShopperContextSearchParams()`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const PageDesignerPromotionalBanner = () => {`
`32`	`32`	`const {usid} = useUsid()`
`33`	`33`	`const {data: shopperContext} = useShopperContext(`
`34`	`34`	`{parameters: {usid, siteId: site.id}},`
`35`		`- {enabled: !isServer}`
	`35`	`+ {enabled: !isServer && Boolean(usid)}`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`const {data: promoBannerDesktop, error: pageErrorDesktop} = usePage(`