@salesforce/retail-react-app 2.3.1 → 2.4.0-dev.1

package/app/pages/checkout/index.test.js

@@ -65,7 +65,19 @@ beforeEach(() => {
     global.server.use(
         // mock product details
         rest.get('*/products', (req, res, ctx) => {
-            return res(ctx.json({data: [{id: '701642811398M'}]}))
+            return res(
+                ctx.json({
+                    data: [
+                        {
+                            id: '701643070725M',
+                            currency: 'GBP',
+                            name: 'Long Sleeve Crew Neck',
+                            pricePerUnit: 19.18,
+                            price: 19.18
+                        }
+                    ]
+                })
+            )
         }),
         // mock the available shipping methods
         rest.get('*/shipments/me/shipping-methods', (req, res, ctx) => {
@@ -162,11 +174,13 @@ beforeEach(() => {
 
         // mock place order
         rest.post('*/orders', (req, res, ctx) => {
-            currentBasket = {
+            const response = {
+                ...currentBasket,
                 ...scapiOrderResponse,
-                customerInfo: {...scapiOrderResponse.customerInfo, email: 'customer@test.com'}
+                customerInfo: {...scapiOrderResponse.customerInfo, email: 'customer@test.com'},
+                status: 'created'
             }
-            return res(ctx.json(currentBasket))
+            return res(ctx.json(response))
         }),
 
         rest.get('*/baskets', (req, res, ctx) => {
@@ -272,11 +286,13 @@ test('Can proceed through checkout steps as guest', async () => {
 
         // mock place order
         rest.post('*/orders', (req, res, ctx) => {
-            currentBasket = {
+            const response = {
+                ...currentBasket,
                 ...scapiOrderResponse,
-                customerInfo: {...scapiOrderResponse.customerInfo, email: 'test@test.com'}
+                customerInfo: {...scapiOrderResponse.customerInfo, email: 'customer@test.com'},
+                status: 'created'
             }
-            return res(ctx.json(currentBasket))
+            return res(ctx.json(response))
         }),
 
         rest.get('*/baskets', (req, res, ctx) => {

package/app/pages/checkout/partials/payment.jsx

@@ -109,9 +109,9 @@ const Payment = () => {
         // Using destructuring to remove properties from the object...
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const {addressId, creationDate, lastModified, preferred, ...address} = billingAddress
-        return updateBillingAddressForBasket({
+        return await updateBillingAddressForBasket({
             body: address,
-            parameters: {basketId: basket.basketId, shipmentId: 'me'}
+            parameters: {basketId: basket.basketId}
         })
     }
     const onPaymentRemoval = async () => {

package/app/pages/checkout/partials/shipping-options.jsx

@@ -45,7 +45,7 @@ export default function ShippingOptions() {
             }
         },
         {
-            enabled: Boolean(basket?.basketId) && step === STEPS.ShippingOptions
+            enabled: Boolean(basket?.basketId) && step === STEPS.SHIPPING_OPTIONS
         }
     )
 

package/app/pages/product-detail/index.jsx

@@ -99,7 +99,7 @@ const ProductDetail = () => {
     } = useCategory({
         parameters: {
             id: product?.primaryCategoryId,
-            level: 1
+            levels: 1
         }
     })
 

package/app/pages/product-list/index.jsx

@@ -137,6 +137,9 @@ const ProductList = (props) => {
     )
 
     /**************** Query Actions ****************/
+    // _refine is an invalid param for useProductSearch, we don't want to pass it to API call
+    const {_refine, ...restOfParams} = searchParams
+
     const {
         isLoading,
         isRefetching,
@@ -144,8 +147,8 @@ const ProductList = (props) => {
     } = useProductSearch(
         {
             parameters: {
-                ...searchParams,
-                refine: searchParams._refine
+                ...restOfParams,
+                refine: _refine
             }
         },
         {

package/app/ssr.js

@@ -5,6 +5,15 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
+/*
+ * Developer note! When updating this file, make sure to also update the
+ * ssr.js template files in pwa-kit-create-app.
+ *
+ * In the pwa-kit-create-app, the templates are found under:
+ * - assets/bootstrap/js/overrides/app/ssr.js.hbs
+ * - assets/templates/@salesforce/retail-react-app/app/ssr.js.hbs
+ */
+
 'use strict'
 
 import path from 'path'
@@ -29,7 +38,14 @@ const options = {
     // The protocol on which the development Express app listens.
     // Note that http://localhost is treated as a secure context for development,
     // except by Safari.
-    protocol: 'http'
+    protocol: 'http',
+
+    // Option for whether to set up a special endpoint for handling
+    // private SLAS clients
+    // Set this to false if using a SLAS public client
+    // When setting this to true, make sure to also set the PWA_KIT_SLAS_CLIENT_SECRET
+    // environment variable as this endpoint will return HTTP 501 if it is not set
+    useSLASPrivateClient: false
 }
 
 const runtime = getRuntime()
@@ -67,6 +83,7 @@ const {handler} = runtime.createHandler(options, (app) => {
         res.set('Cache-Control', `max-age=31536000`)
         res.send()
     })
+
     app.get('/robots.txt', runtime.serveStaticFile('static/robots.txt'))
     app.get('/favicon.ico', runtime.serveStaticFile('static/ico/favicon.ico'))
 

package/app/static/translations/compiled/en-GB.json

@@ -879,12 +879,24 @@
       "value": "No, keep item"
     }
   ],
+  "confirmation_modal.remove_cart_item.action.remove": [
+    {
+      "type": 0,
+      "value": "Remove"
+    }
+  ],
   "confirmation_modal.remove_cart_item.action.yes": [
     {
       "type": 0,
       "value": "Yes, remove item"
     }
   ],
+  "confirmation_modal.remove_cart_item.message.need_to_remove_due_to_unavailability": [
+    {
+      "type": 0,
+      "value": "Some items are no longer available online and will be removed from your cart."
+    }
+  ],
   "confirmation_modal.remove_cart_item.message.sure_to_remove": [
     {
       "type": 0,
@@ -897,6 +909,12 @@
       "value": "Confirm Remove Item"
     }
   ],
+  "confirmation_modal.remove_cart_item.title.items_unavailable": [
+    {
+      "type": 0,
+      "value": "Items Unavailable"
+    }
+  ],
   "confirmation_modal.remove_wishlist_item.action.no": [
     {
       "type": 0,
@@ -1637,6 +1655,12 @@
       "value": "Sale"
     }
   ],
+  "item_image.label.unavailable": [
+    {
+      "type": 0,
+      "value": "Unavailable"
+    }
+  ],
   "item_price.label.starting_at": [
     {
       "type": 0,

package/app/static/translations/compiled/en-US.json

@@ -879,12 +879,24 @@
       "value": "No, keep item"
     }
   ],
+  "confirmation_modal.remove_cart_item.action.remove": [
+    {
+      "type": 0,
+      "value": "Remove"
+    }
+  ],
   "confirmation_modal.remove_cart_item.action.yes": [
     {
       "type": 0,
       "value": "Yes, remove item"
     }
   ],
+  "confirmation_modal.remove_cart_item.message.need_to_remove_due_to_unavailability": [
+    {
+      "type": 0,
+      "value": "Some items are no longer available online and will be removed from your cart."
+    }
+  ],
   "confirmation_modal.remove_cart_item.message.sure_to_remove": [
     {
       "type": 0,
@@ -897,6 +909,12 @@
       "value": "Confirm Remove Item"
     }
   ],
+  "confirmation_modal.remove_cart_item.title.items_unavailable": [
+    {
+      "type": 0,
+      "value": "Items Unavailable"
+    }
+  ],
   "confirmation_modal.remove_wishlist_item.action.no": [
     {
       "type": 0,
@@ -1637,6 +1655,12 @@
       "value": "Sale"
     }
   ],
+  "item_image.label.unavailable": [
+    {
+      "type": 0,
+      "value": "Unavailable"
+    }
+  ],
   "item_price.label.starting_at": [
     {
       "type": 0,

package/app/static/translations/compiled/en-XA.json

@@ -1791,6 +1791,20 @@
       "value": "]"
     }
   ],
+  "confirmation_modal.remove_cart_item.action.remove": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Řḗḗḿǿǿṽḗḗ"
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "confirmation_modal.remove_cart_item.action.yes": [
     {
       "type": 0,
@@ -1805,6 +1819,20 @@
       "value": "]"
     }
   ],
+  "confirmation_modal.remove_cart_item.message.need_to_remove_due_to_unavailability": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Şǿǿḿḗḗ īŧḗḗḿş ȧȧřḗḗ ƞǿǿ ŀǿǿƞɠḗḗř ȧȧṽȧȧīŀȧȧƀŀḗḗ ǿǿƞŀīƞḗḗ ȧȧƞḓ ẇīŀŀ ƀḗḗ řḗḗḿǿǿṽḗḗḓ ƒřǿǿḿ ẏǿǿŭŭř ƈȧȧřŧ."
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "confirmation_modal.remove_cart_item.message.sure_to_remove": [
     {
       "type": 0,
@@ -1833,6 +1861,20 @@
       "value": "]"
     }
   ],
+  "confirmation_modal.remove_cart_item.title.items_unavailable": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Īŧḗḗḿş Ŭƞȧȧṽȧȧīŀȧȧƀŀḗḗ"
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "confirmation_modal.remove_wishlist_item.action.no": [
     {
       "type": 0,
@@ -3453,6 +3495,20 @@
       "value": "]"
     }
   ],
+  "item_image.label.unavailable": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Ŭƞȧȧṽȧȧīŀȧȧƀŀḗḗ"
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "item_price.label.starting_at": [
     {
       "type": 0,

package/app/utils/test-utils.js

@@ -130,6 +130,7 @@ export const TestProviders = ({
                         organizationId={commerceApiConfig.parameters.organizationId}
                         siteId={site?.id}
                         locale={locale.id}
+                        proxy={`${window.location.origin}/${commerceApiConfig.proxyPath}`}
                         redirectURI={`${window.location.origin}/testcallback`}
                         fetchedToken={bypassAuth ? (isGuest ? guestToken : registerUserToken) : ''}
                     >

package/app/utils/url.js

@@ -147,8 +147,6 @@ export const getPathWithLocale = (shortCode, buildUrl, opts = {}) => {
     // remove ending any &
     search = search.replace(/&$/, '')
 
-    const defaultSite = getDefaultSite()
-
     // Remove query parameters
     const {disallowParams = []} = opts
 
@@ -161,7 +159,6 @@ export const getPathWithLocale = (shortCode, buildUrl, opts = {}) => {
     }
 
     const site = getSiteByReference(siteRef)
-
     const locale = getLocaleByReference(site, shortCode)
 
     // rebuild the url with new locale,
@@ -169,7 +166,7 @@ export const getPathWithLocale = (shortCode, buildUrl, opts = {}) => {
         `${pathname}${Array.from(queryString).length !== 0 ? `?${queryString}` : ''}`,
         // By default, as for home page, when the values of site and locale belongs to the default site,
         // they will be not shown in the url just
-        defaultSite.alias || defaultSite.id,
+        site.alias || site.id,
         locale?.alias || locale?.id
     )
     return newUrl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/retail-react-app",
-  "version": "2.3.1",
+  "version": "2.4.0-dev.1",
   "license": "See license in LICENSE",
   "author": "cc-pwa-kit@salesforce.com",
   "ccExtensibility": {
@@ -45,10 +45,10 @@
     "@lhci/cli": "^0.11.0",
     "@loadable/component": "^5.15.3",
     "@peculiar/webcrypto": "^1.4.2",
-    "@salesforce/commerce-sdk-react": "1.3.0",
-    "@salesforce/pwa-kit-dev": "3.4.0",
-    "@salesforce/pwa-kit-react-sdk": "3.4.0",
-    "@salesforce/pwa-kit-runtime": "3.4.0",
+    "@salesforce/commerce-sdk-react": "1.4.0-dev.1",
+    "@salesforce/pwa-kit-dev": "3.5.0-alpha.1",
+    "@salesforce/pwa-kit-react-sdk": "3.5.0-alpha.1",
+    "@salesforce/pwa-kit-runtime": "3.5.0-alpha.1",
     "@tanstack/react-query": "^4.28.0",
     "@tanstack/react-query-devtools": "^4.29.1",
     "@testing-library/dom": "^9.0.1",
@@ -100,5 +100,5 @@
       "maxSize": "320 kB"
     }
   ],
-  "gitHead": "41c7e7d585508f5b0f259e7d80dce8aff5df24f9"
+  "gitHead": "2df9f520e6de6585926743fb72bf8e77d515dcf1"
 }

package/translations/en-GB.json

@@ -343,15 +343,24 @@
   "confirmation_modal.remove_cart_item.action.no": {
     "defaultMessage": "No, keep item"
   },
+  "confirmation_modal.remove_cart_item.action.remove": {
+    "defaultMessage": "Remove"
+  },
   "confirmation_modal.remove_cart_item.action.yes": {
     "defaultMessage": "Yes, remove item"
   },
+  "confirmation_modal.remove_cart_item.message.need_to_remove_due_to_unavailability": {
+    "defaultMessage": "Some items are no longer available online and will be removed from your cart."
+  },
   "confirmation_modal.remove_cart_item.message.sure_to_remove": {
     "defaultMessage": "Are you sure you want to remove this item from your cart?"
   },
   "confirmation_modal.remove_cart_item.title.confirm_remove": {
     "defaultMessage": "Confirm Remove Item"
   },
+  "confirmation_modal.remove_cart_item.title.items_unavailable": {
+    "defaultMessage": "Items Unavailable"
+  },
   "confirmation_modal.remove_wishlist_item.action.no": {
     "defaultMessage": "No, keep item"
   },
@@ -686,6 +695,10 @@
     "defaultMessage": "Sale",
     "description": "A sale badge placed on top of a product image"
   },
+  "item_image.label.unavailable": {
+    "defaultMessage": "Unavailable",
+    "description": "A unavailable badge placed on top of a product image"
+  },
   "item_price.label.starting_at": {
     "defaultMessage": "Starting at"
   },

package/translations/en-US.json

@@ -343,15 +343,24 @@
   "confirmation_modal.remove_cart_item.action.no": {
     "defaultMessage": "No, keep item"
   },
+  "confirmation_modal.remove_cart_item.action.remove": {
+    "defaultMessage": "Remove"
+  },
   "confirmation_modal.remove_cart_item.action.yes": {
     "defaultMessage": "Yes, remove item"
   },
+  "confirmation_modal.remove_cart_item.message.need_to_remove_due_to_unavailability": {
+    "defaultMessage": "Some items are no longer available online and will be removed from your cart."
+  },
   "confirmation_modal.remove_cart_item.message.sure_to_remove": {
     "defaultMessage": "Are you sure you want to remove this item from your cart?"
   },
   "confirmation_modal.remove_cart_item.title.confirm_remove": {
     "defaultMessage": "Confirm Remove Item"
   },
+  "confirmation_modal.remove_cart_item.title.items_unavailable": {
+    "defaultMessage": "Items Unavailable"
+  },
   "confirmation_modal.remove_wishlist_item.action.no": {
     "defaultMessage": "No, keep item"
   },
@@ -686,6 +695,10 @@
     "defaultMessage": "Sale",
     "description": "A sale badge placed on top of a product image"
   },
+  "item_image.label.unavailable": {
+    "defaultMessage": "Unavailable",
+    "description": "A unavailable badge placed on top of a product image"
+  },
   "item_price.label.starting_at": {
     "defaultMessage": "Starting at"
   },