@magento/peregrine 13.1.1-beta.2 → 13.2.1-alpha.1

package/lib/talons/CheckoutPage/BillingAddress/useBillingAddress.js

@@ -178,10 +178,13 @@ export const useBillingAddress = props => {
      * shipping address.
      */
     const setShippingAddressAsBillingAddress = useCallback(() => {
-        const shippingAddress = shippingAddressData
+        var shippingAddress = shippingAddressData
             ? mapAddressData(shippingAddressData.cart.shippingAddresses[0])
             : {};
 
+        shippingAddress.region =
+            shippingAddress.region == null ? '' : shippingAddress.region;
+
         updateBillingAddress({
             variables: {
                 cartId,

package/lib/talons/CheckoutPage/PaymentInformation/useCreditCard.js

@@ -234,10 +234,13 @@ export const useCreditCard = props => {
      * shipping address.
      */
     const setShippingAddressAsBillingAddress = useCallback(() => {
-        const shippingAddress = shippingAddressData
+        var shippingAddress = shippingAddressData
             ? mapAddressData(shippingAddressData.cart.shippingAddresses[0])
             : {};
 
+        shippingAddress.region =
+            shippingAddress.region == null ? '' : shippingAddress.region;
+
         updateBillingAddress({
             variables: {
                 cartId,

package/lib/talons/CheckoutPage/ShippingInformation/AddressForm/useGuestForm.js

@@ -70,9 +70,8 @@ export const useGuestForm = props => {
                             ...address,
                             // Cleans up the street array when values are null or undefined
                             street: address.street.filter(e => e),
-                            // region_id is used for field select and region is used for field input
-                            region: region.region_id || region.region,
-                            country_code: country
+                            country_code: country,
+                            region: region.region_id || region.region
                         }
                     }
                 });
@@ -80,7 +79,6 @@ export const useGuestForm = props => {
             } catch {
                 return;
             }
-
             if (afterSubmit) {
                 afterSubmit();
             }

package/lib/talons/Header/cartTriggerFragments.gql.js

@@ -4,5 +4,6 @@ export const CartTriggerFragment = gql`
     fragment CartTriggerFragment on Cart {
         id
         total_quantity
+        total_summary_quantity_including_config
     }
 `;

package/lib/talons/Header/useCartTrigger.js

@@ -52,7 +52,7 @@ export const useCartTrigger = props => {
         errorPolicy: 'all'
     });
 
-    const itemCount = data?.cart?.total_quantity || 0;
+    const itemCount = data?.cart?.total_summary_quantity_including_config || 0;
 
     const handleTriggerClick = useCallback(() => {
         // Open the mini cart.

package/lib/talons/ProductFullDetail/productFullDetail.gql.ce.js

@@ -11,6 +11,10 @@ export const ADD_PRODUCT_TO_CART = gql`
                 ...CartTriggerFragment
                 ...MiniCartFragment
             }
+            user_errors {
+                code
+                message
+            }
         }
     }
     ${CartTriggerFragment}

package/lib/talons/ProductFullDetail/useProductFullDetail.js

@@ -289,7 +289,11 @@ export const useProductFullDetail = props => {
 
     const [
         addProductToCart,
-        { error: errorAddingProductToCart, loading: isAddProductLoading }
+        {
+            data: addToCartResponseData,
+            error: errorAddingProductToCart,
+            loading: isAddProductLoading
+        }
     ] = useMutation(operations.addProductToCartMutation);
 
     const breadcrumbCategoryId = useMemo(
@@ -556,12 +560,14 @@ export const useProductFullDetail = props => {
             deriveErrorMessage([
                 errorAddingSimpleProduct,
                 errorAddingConfigurableProduct,
-                errorAddingProductToCart
+                errorAddingProductToCart,
+                ...(addToCartResponseData?.addProductsToCart?.user_errors || [])
             ]),
         [
             errorAddingConfigurableProduct,
             errorAddingProductToCart,
-            errorAddingSimpleProduct
+            errorAddingSimpleProduct,
+            addToCartResponseData
         ]
     );
 

package/lib/talons/RootComponents/Category/useCategory.js

@@ -100,10 +100,7 @@ export const useCategory = props => {
         called: introspectionCalled,
         data: introspectionData,
         loading: introspectionLoading
-    } = useQuery(getFilterInputsQuery, {
-        fetchPolicy: 'cache-and-network',
-        nextFetchPolicy: 'cache-first'
-    });
+    } = useQuery(getFilterInputsQuery);
 
     // Create a type map we can reference later to ensure we pass valid args
     // to the graphql query.

package/lib/talons/SearchPage/searchPage.gql.js

@@ -27,6 +27,16 @@ export const GET_PRODUCT_FILTERS_BY_SEARCH = gql`
     }
 `;
 
+export const GET_SEARCH_TERM_DATA = gql`
+    query getSearchTermData($search: String) {
+        searchTerm(Search: $search) {
+            query_text
+            redirect
+            popularity
+        }
+    }
+`;
+
 export const PRODUCT_SEARCH = gql`
     query ProductSearch(
         $currentPage: Int = 1
@@ -106,6 +116,7 @@ export const GET_SEARCH_AVAILABLE_SORT_METHODS = gql`
 export default {
     getFilterInputsQuery: GET_FILTER_INPUTS,
     getPageSize: GET_PAGE_SIZE,
+    getSearchTermData: GET_SEARCH_TERM_DATA,
     getProductFiltersBySearchQuery: GET_PRODUCT_FILTERS_BY_SEARCH,
     getSearchAvailableSortMethods: GET_SEARCH_AVAILABLE_SORT_METHODS,
     productSearchQuery: PRODUCT_SEARCH

package/lib/talons/SearchPage/useSearchPage.js

@@ -26,6 +26,7 @@ export const useSearchPage = (props = {}) => {
     const {
         getFilterInputsQuery,
         getPageSize,
+        getSearchTermData,
         getProductFiltersBySearchQuery,
         getSearchAvailableSortMethods,
         productSearchQuery
@@ -36,6 +37,18 @@ export const useSearchPage = (props = {}) => {
         nextFetchPolicy: 'cache-first'
     });
 
+    const [getSearchTermMethod, { data: SearchTermQueryData }] = useLazyQuery(
+        getSearchTermData
+    );
+
+    if (SearchTermQueryData !== undefined) {
+        const [...redirectData] = [SearchTermQueryData];
+        const redirectUrl = redirectData[0].searchTerm?.redirect;
+        if (redirectUrl !== null) {
+            window.location.replace(redirectUrl);
+        }
+    }
+
     const [getSortMethods, { data: sortData }] = useLazyQuery(
         getSearchAvailableSortMethods,
         {
@@ -231,6 +244,16 @@ export const useSearchPage = (props = {}) => {
         };
     }, [data, setTotalPages]);
 
+    useEffect(() => {
+        if (inputText) {
+            getSearchTermMethod({
+                variables: {
+                    search: inputText
+                }
+            });
+        }
+    }, [inputText, getSearchTermMethod]);
+
     useEffect(() => {
         if (inputText) {
             getSortMethods({
@@ -273,7 +296,7 @@ export const useSearchPage = (props = {}) => {
     useScrollTopOnChange(currentPage);
 
     const availableSortMethods = sortData
-        ? sortData.products.sort_fields.options
+        ? sortData.products.sort_fields?.options
         : null;
 
     return {

package/lib/talons/SignIn/useSignIn.js

@@ -13,6 +13,7 @@ import { useEventingContext } from '../../context/eventing';
 
 export const useSignIn = props => {
     const {
+        handleTriggerClick,
         getCartDetailsQuery,
         setDefaultUsername,
         showCreateAccount,
@@ -66,6 +67,7 @@ export const useSignIn = props => {
     const handleSubmit = useCallback(
         async ({ email, password }) => {
             setIsSigningIn(true);
+            handleTriggerClick();
             try {
                 // Get source cart id (guest cart id).
                 const sourceCartId = cartId;
@@ -142,7 +144,8 @@ export const useSignIn = props => {
             fetchUserDetails,
             getCartDetails,
             fetchCartDetails,
-            dispatch
+            dispatch,
+            handleTriggerClick
         ]
     );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/peregrine",
-  "version": "13.1.1-beta.2",
+  "version": "13.2.1-alpha.1",
   "publishConfig": {
     "access": "public"
   },