3220 testing

packages/peregrine/lib/context/cart.js

@@ -7,17 +7,23 @@ import React, {
 } from 'react';
 import { connect } from 'react-redux';
 import { useMutation } from '@apollo/client';
+import { useDispatch } from 'react-redux';
 import gql from 'graphql-tag';
+import { useApolloClient } from '@apollo/client';
 
 import { useAwaitQuery } from '@magento/peregrine/lib/hooks/useAwaitQuery';
 import actions from '../store/actions/cart/actions';
 import * as asyncActions from '../store/actions/cart/asyncActions';
+import { createCart, removeCart } from '../store/actions/cart';
 import bindActionCreators from '../util/bindActionCreators';
 import { useEventListener } from '../hooks/useEventListener';
 import BrowserPersistence from '../util/simplePersistence';
 
 const CartContext = createContext();
 
+console.log(createCart,"From the direct file");
+console.log(asyncActions.createCart,"Type 2 export");
+
 const isCartEmpty = cart =>
     !cart || !cart.details.items || cart.details.items.length === 0;
 
@@ -26,7 +32,12 @@ const getTotalQuantity = items =>
 
 const CartContextProvider = props => {
     const { actions, asyncActions, cartState, children } = props;
+    console.log(cartState,"cartstate");
+    console.log(actions,"actionns");
+    console.log(asyncActions,"Async Actions");
+    const dispatch = useDispatch();
 
+    const apolloClient = useApolloClient();
     // Make deeply nested details easier to retrieve and provide empty defaults
     const derivedDetails = useMemo(() => {
         if (isCartEmpty(cartState)) {
@@ -52,15 +63,66 @@ const CartContextProvider = props => {
         [actions, asyncActions]
     );
 
+
+    // const resetCart = () => {
+
+
+    //     actions.reset();
+    //         // if there isn't a cart, create one then retry this operation
+    //             try {
+    //                  dispatch(
+    //                     createCart({
+    //                         fetchCartId
+    //                     })
+    //                 );
+    //             } catch (error) {
+    //                 console.log(error);
+    //                 // If creating a cart fails, all is not lost. Return so that the
+    //                 // user can continue to at least browse the site.
+    //                 return;
+    //             }
+    //             //return thunk(...arguments);
+
+    //     }
+
+
+    const resetCart = async () => {
+
+        console.log("Resetting cart... in cart.js");
+        // actions.reset();
+
+            // Clear all cart/customer data from cache and redux.
+            await apolloClient.clearCacheData(apolloClient, 'cart');
+            await apolloClient.clearCacheData(apolloClient, 'customer');
+            await removeCart();
+
+
+            //here also creating cart id
+
+            // Create and get the customer's cart id.
+            await createCart({
+                fetchCartId
+            });
+        //await dispatch(cartApi.removeCart());
+
+   };
+
+
+
+
+
+
+
     const contextValue = useMemo(() => {
         const derivedCartState = {
             ...cartState,
             isEmpty: isCartEmpty(cartState),
-            derivedDetails
+            derivedDetails,
+            resetCart
         };
 
         return [derivedCartState, cartApi];
-    }, [cartApi, cartState, derivedDetails]);
+    }, [cartApi, cartState, derivedDetails,resetCart]);
 
     const [fetchCartId] = useMutation(CREATE_CART_MUTATION);
     const fetchCartDetails = useAwaitQuery(CART_DETAILS_QUERY);
@@ -82,7 +144,7 @@ const CartContextProvider = props => {
         cartApi.getCartDetails({
             fetchCartId,
             fetchCartDetails
-        });
+        }); 
     }, [cartApi, fetchCartDetails, fetchCartId]);
 
     return (

packages/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js

@@ -1,8 +1,14 @@
 import { useCallback, useState, useMemo } from 'react';
 import { useIntl } from 'react-intl';
+import gql from 'graphql-tag';
+import { useDispatch } from 'react-redux';
 import { useMutation, useQuery } from '@apollo/client';
 import { useCartContext } from '@magento/peregrine/lib/context/cart';
 import { useUserContext } from '@magento/peregrine/lib/context/user';
+import {createCart} from '../../store/actions/cart/asyncActions'
+//store/actions/cart/asyncActions';
+
+
 
 import { appendOptionsToPayload } from '@magento/peregrine/lib/util/appendOptionsToPayload';
 import { findMatchingVariant } from '@magento/peregrine/lib/util/findMatchingProductVariant';
@@ -245,6 +251,7 @@ export const useProductFullDetail = props => {
         product
     } = props;
 
+
     const [, { dispatch }] = useEventingContext();
 
     const hasDeprecatedOperationProp = !!(
@@ -257,7 +264,7 @@ export const useProductFullDetail = props => {
 
     const isSupportedProductType = isSupported(productType);
 
-    const [{ cartId }] = useCartContext();
+    const [{ cartId,resetCart }] = useCartContext();
     const [{ isSignedIn }] = useUserContext();
     const { formatMessage } = useIntl();
 
@@ -571,11 +578,33 @@ export const useProductFullDetail = props => {
         ]
     );
 
+    // console.log(createCart,"create cart function");
+    // const [fetchCartId] = useMutation(CREATE_CART_MUTATION);
+
+    // const resetCart = async () => {
+
+    //     console.log("Resetting cart...");
+    //     //actions.reset();
+
+    //     await dispatch(createCart(fetchCartId));
+
+    //     //await dispatch(asyncActions.createCart({ fetchCartId }));
+    // }
+
+    console.log(derivedErrorMessage);
+    if (derivedErrorMessage.includes('Could not find a cart with ID')){
+        dispatch(resetCart())
+        console.log("coming to here");
+        //console.log(fetchCartId);
+        //const [{ cartId }] = useCartContext();
+        //console.log(cartId);
+    }
+
     const wishlistItemOptions = useMemo(() => {
         const options = {
             quantity: 1,
             sku: product.sku
-        };
+        };   
 
         if (productType === 'ConfigurableProduct') {
             options.selected_options = selectedOptionsArray;
@@ -626,3 +655,10 @@ export const useProductFullDetail = props => {
         wishlistItemOptions
     };
 };
+
+
+const CREATE_CART_MUTATION = gql`
+    mutation createCart {
+        cartId: createEmptyCart
+    }
+`;

packages/venia-concept/src/store.js

@@ -1,4 +1,5 @@
-import { combineReducers, createStore } from 'redux';
+import { combineReducers, createStore,applyMiddleware,compose } from 'redux';
+import thunk from 'redux-thunk';
 import { enhancer, reducers } from '@magento/peregrine';
 
 // This is the connective layer between the Peregrine store and the
@@ -11,4 +12,10 @@ import { enhancer, reducers } from '@magento/peregrine';
 // export default createStore(rootReducer, rootEnhancer);
 const rootReducer = combineReducers(reducers);
 
+// const composedEnhancers = compose(
+//     applyMiddleware(thunk),
+//     enhancer
+//   );
+
+//applyMiddleware(thunk),
 export default createStore(rootReducer, enhancer);

packages/venia-ui/lib/components/ProductFullDetail/productFullDetail.js

@@ -106,7 +106,7 @@ const ProductFullDetail = props => {
 
         // Handle cases where a cart wasn't created properly.
         if (
-            errorMessage.includes('Variable "$cartId" got invalid value null')
+            errorMessage.includes('Variable "$cartId" got invalid value null')  || errorMessage.includes('Could not find a cart with ID')
         ) {
             errors.set('form', [
                 new Error(