Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle cart api errors (https://github.com/woocommerce/woocommerce-blocks/pull/1907)

This commit is contained in:
Albert Juhé Lluveras 2020-03-10 16:49:26 +01:00 committed by GitHub
parent 4b4dff1297
commit d0cb38d37d
9 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce-blocks/assets/js/base/hooks/use-shipping-rates.js
View File

@ -6,6 +6,7 @@ import { useReducer, useEffect } from '@wordpress/element';
import isShallowEqual from '@wordpress/is-shallow-equal';
import { useDebounce } from 'use-debounce';
import { CART_STORE_KEY as storeKey } from '@woocommerce/block-data';
/**
* Internal dependencies
*/
@ -26,7 +27,7 @@ import { pluckAddress } from '../utils';
* - {Object} shippingAddress An object containing shipping address.
*/
export const useShippingRates = ( addressFieldsKeys ) => {
const { shippingRates } = useStoreCart();
const { cartErrors, shippingRates } = useStoreCart();
const addressFields = Object.fromEntries(
addressFieldsKeys.map( ( key ) => [ key, '' ] )
);
@ -63,5 +64,6 @@ export const useShippingRates = ( addressFieldsKeys ) => {
shippingAddress,
setShippingAddress,
shippingRatesLoading,
shippingRatesErrors: cartErrors,
};
};

3
plugins/woocommerce-blocks/assets/js/base/hooks/use-store-cart-coupons.js
View File

@ -22,7 +22,7 @@ import { useStoreCart } from './use-store-cart';
* store api /cart/coupons endpoint.
*/
export const useStoreCartCoupons = () => {
const { cartCoupons, cartIsLoading } = useStoreCart();
const { cartCoupons, cartErrors, cartIsLoading } = useStoreCart();
const {
addErrorNotice,
addSuccessNotice,
@ -100,6 +100,7 @@ export const useStoreCartCoupons = () => {
return {
appliedCoupons: cartCoupons,
cartCouponsErrors: cartErrors,
isLoading: cartIsLoading,
...results,
};

7
plugins/woocommerce-blocks/assets/js/base/hooks/use-store-cart-item-quantity.js
View File

@ -6,6 +6,11 @@ import { useState, useEffect } from '@wordpress/element';
import { CART_STORE_KEY as storeKey } from '@woocommerce/block-data';
import { useDebounce } from 'use-debounce';
/**
* Internal dependencies
*/
import { useStoreCart } from './use-store-cart';
/**
* @typedef {import('@woocommerce/type-defs/hooks').StoreCartItemQuantity} StoreCartItemQuantity
* @typedef {import('@woocommerce/type-defs/cart').CartItem} CartItem
@ -23,6 +28,7 @@ import { useDebounce } from 'use-debounce';
* to cart items.
*/
export const useStoreCartItemQuantity = ( cartItem ) => {
const { cartErrors } = useStoreCart();
// Store quantity in hook state. This is used to keep the UI
// updated while server request is updated.
const [ quantity, changeQuantity ] = useState( cartItem.quantity );
@ -53,5 +59,6 @@ export const useStoreCartItemQuantity = ( cartItem ) => {
quantity,
changeQuantity,
removeItem,
cartItemQuantityErrors: cartErrors,
};
};

5
plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/frontend.js
View File

@ -28,6 +28,7 @@ const CartFrontend = ( {
isShippingCostHidden,
} ) => {
const {
cartErrors,
cartItems,
cartTotals,
cartIsLoading,
@ -35,6 +36,10 @@ const CartFrontend = ( {
shippingRates,
} = useStoreCart();
if ( cartErrors && cartErrors.length > 0 ) {
throw new Error( cartErrors[ 0 ].message );
}
return (
<StoreNoticesProvider context="wc/cart">
{ ! cartIsLoading && ! cartItems.length ? (

5
plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/full-cart/cart-line-item-row.js
View File

@ -57,12 +57,17 @@ const CartLineItemRow = ( { lineItem } ) => {
} = lineItem;
const {
cartItemQuantityErrors,
quantity,
changeQuantity,
removeItem,
isPending: itemQuantityDisabled,
} = useStoreCartItemQuantity( lineItem );
if ( cartItemQuantityErrors && cartItemQuantityErrors.length > 0 ) {
throw new Error( cartItemQuantityErrors[ 0 ].message );
}
const currency = getCurrency( prices );
const regularPrice = parseInt( prices.regular_price, 10 ) * quantity;
const purchasePrice = parseInt( prices.price, 10 ) * quantity;

7
plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/full-cart/index.js
View File

@ -95,6 +95,7 @@ const Cart = ( {
const defaultAddressFields = [ 'country', 'state', 'city', 'postcode' ];
const {
shippingAddress,
shippingRatesErrors,
setShippingAddress,
shippingRatesLoading,
} = useShippingRates( defaultAddressFields );
@ -103,8 +104,14 @@ const Cart = ( {
removeCoupon,
isApplyingCoupon,
isRemovingCoupon,
cartCouponsErrors,
} = useStoreCartCoupons();
const errors = [ ...shippingRatesErrors, ...cartCouponsErrors ];
if ( errors.length > 0 ) {
throw new Error( errors[ 0 ].message );
}
const showShippingCosts = Boolean(
SHIPPING_ENABLED &&
isShippingCalculatorEnabled &&

7
plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/frontend.js
View File

@ -21,7 +21,12 @@ import renderFrontend from '../../../utils/render-frontend.js';
* @param {Object} props Props for the block.
*/
const CheckoutFrontend = ( props ) => {
const { shippingRates } = useStoreCart();
const { cartErrors, shippingRates } = useStoreCart();
if ( cartErrors && cartErrors.length > 0 ) {
throw new Error( cartErrors[ 0 ].message );
}
return (
<BlockErrorBoundary
header={ __(

7
plugins/woocommerce-blocks/assets/js/hocs/with-store-cart-api-hydration.js
View File

@ -22,6 +22,7 @@ const useStoreCartApiHydration = () => {
const { isResolving, hasFinishedResolution } = select( CART_STORE_KEY );
const {
receiveCart,
receiveError,
startResolution,
finishResolution,
} = registry.dispatch( CART_STORE_KEY );
@ -31,7 +32,11 @@ const useStoreCartApiHydration = () => {
! hasFinishedResolution( 'getCartData', [] )
) {
startResolution( 'getCartData', [] );
receiveCart( cartData.current );
if ( cartData.current?.code?.includes( 'error' ) ) {
receiveError( cartData.current );
} else {
receiveCart( cartData.current );
}
finishResolution( 'getCartData', [] );
}
}, [] );

30
plugins/woocommerce-blocks/assets/js/type-defs/hooks.js
View File

@ -19,24 +19,28 @@
/**
* @typedef {Object} StoreCartCoupon
*
* @property {Array} appliedCoupons Collection of applied coupons from the
* API.
* @property {boolean} isLoading True when coupon data is being loaded.
* @property {Function} applyCoupon Callback for applying a coupon by code.
* @property {Function} removeCoupon Callback for removing a coupon by code.
* @property {boolean} isApplyingCoupon True when a coupon is being applied.
* @property {boolean} isRemovingCoupon True when a coupon is being removed.
* @property {Array} appliedCoupons Collection of applied coupons from the
* API.
* @property {boolean} isLoading True when coupon data is being loaded.
* @property {Function} applyCoupon Callback for applying a coupon by code.
* @property {Function} removeCoupon Callback for removing a coupon by code.
* @property {boolean} isApplyingCoupon True when a coupon is being applied.
* @property {boolean} isRemovingCoupon True when a coupon is being removed.
* @property {boolean} cartCouponsErrors An array of errors thrown by the cart.
*/
/**
* @typedef {Object} StoreCartItemQuantity
*
* @property {number} quantity The quantity of the item in the cart.
* @property {boolean} isPending Whether the cart item is updating or
* not.
* @property {Function} changeQuantity Callback for changing quantity of
* item in cart.
* @property {Function} removeItem Callback for removing a cart item.
* @property {number} quantity The quantity of the item in the
* cart.
* @property {boolean} isPending Whether the cart item is updating
* or not.
* @property {Function} changeQuantity Callback for changing quantity
* of item in cart.
* @property {Function} removeItem Callback for removing a cart item.
* @property {Object} cartItemQuantityErrors An array of errors thrown by
* the cart.
*/
export {};