@shopgate/pwa-common-commerce 7.32.0-beta.1 → 7.32.0-beta.10

package/cart/helpers/tax.js

@@ -1,6 +1,6 @@
 /**
- * Check if shipping line should be shown
- * @param {Object} cartConfig shippingConfig
+ * Check if tax line should be shown
+ * @param {Object} cartConfig cartConfig
  * @param {Object} tax tax
  * @returns {Object|null}
  */

package/cart/subscriptions/index.js

@@ -153,10 +153,10 @@ export default function cart(subscribe) {
         message,
         handled,
         code,
-        additionalParams,
-        translated,
-        context
+        translated
       } = errors[0];
+      const context = errors[0].context || errors[0].pipeline;
+      const additionalParams = errors[0].additionalParams || errors[0].messageParams || {};
 
       // Some errors are already handled automatically before
       if (handled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common-commerce",
-  "version": "7.32.0-beta.1",
+  "version": "7.32.0-beta.10",
   "description": "Commerce library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -15,13 +15,13 @@
     "connect"
   ],
   "dependencies": {
-    "immer": "^11.1.3",
+    "immer": "^11.1.11",
     "react-cookie": "^4.0.3",
     "reselect": "^4.1.8"
   },
   "devDependencies": {
-    "@shopgate/pwa-common": "7.32.0-beta.1",
-    "@shopgate/pwa-core": "7.32.0-beta.1",
+    "@shopgate/pwa-common": "7.32.0-beta.10",
+    "@shopgate/pwa-core": "7.32.0-beta.10",
     "@types/lodash": "^4.17.24",
     "lodash": "^4.17.23",
     "react": "^17.0.2",

package/product/index.js

@@ -15,7 +15,6 @@ export { default as fetchProductShipping } from "./actions/fetchProductShipping"
 export { default as fetchProductVariants } from "./actions/fetchProductVariants";
 
 // COLLECTIONS
-export { default as productImageFormats } from "./collections/ProductImageFormats";
 
 // CONSTANTS
 export * from "./constants/index";

package/cart/selectors/spec.js

@@ -1,189 +0,0 @@
-/* eslint-disable extra-rules/no-single-line-objects */
-import { mockedState as mockedProductState, mockedProductMetadata, mockedVariantProductMetadata, mockedVariantMetadata } from "../../product/selectors/product.mock";
-import { getFlags, getAddToCartMetadata, hasCouponSupport, getIsFetching, getSubTotal, getDiscounts, getDiscountsAmount, getTax, getGrandTotal } from "./index";
-import { CART_TOTALS_TYPE_DISCOUNT, CART_TOTALS_TYPE_GRAND, CART_TOTALS_TYPE_SUB, CART_TOTALS_TYPE_TAX } from "../constants";
-describe('Cart selectors', () => {
-  describe('getFlags()', () => {
-    it('should return an empty object if no flags are available', () => {
-      const result = getFlags({
-        cart: {
-          data: {}
-        }
-      });
-      expect(result).toEqual({});
-    });
-    it('should return the flags if available', () => {
-      const flags = {
-        coupons: true,
-        orderable: true
-      };
-      const result = getFlags({
-        cart: {
-          data: {
-            flags
-          }
-        }
-      });
-      expect(result).toEqual(flags);
-    });
-  });
-  describe('getAddToCartMetadata()', () => {
-    let mockedState;
-    beforeEach(() => {
-      // Create a deep copy of the state to avoid unintended selector caching.
-      mockedState = JSON.parse(JSON.stringify(mockedProductState));
-    });
-    it('should return the metadata of the variant product', () => {
-      const productId = 'product_1';
-      const variantId = 'product_2';
-      const result = getAddToCartMetadata(mockedState, {
-        productId,
-        variantId
-      });
-      expect(result).toEqual(mockedVariantProductMetadata);
-    });
-    it('should return the metadata of the base product', () => {
-      const productId = 'product_1';
-      const variantId = 'product_2';
-      delete mockedState.product.productsById[variantId].productData.metadata;
-      const result = getAddToCartMetadata(mockedState, {
-        productId,
-        variantId
-      });
-      expect(result).toEqual(mockedProductMetadata);
-    });
-    it('should return the metadata of the variant data assigned to the variant product', () => {
-      const productId = 'product_1';
-      const variantId = 'product_3';
-      const result = getAddToCartMetadata(mockedState, {
-        productId,
-        variantId
-      });
-      expect(result).toEqual(mockedVariantMetadata);
-    });
-    it('should return null when no metadata can be determined', () => {
-      const productId = 'product_10';
-      const variantId = 'product_11';
-      const result = getAddToCartMetadata(mockedState, {
-        productId,
-        variantId
-      });
-      expect(result).toBeNull();
-    });
-  });
-  describe('hasCouponSupport()', () => {
-    it('should return true if no flags are available', () => {
-      const result = hasCouponSupport({
-        cart: {
-          data: {}
-        }
-      });
-      expect(result).toEqual(true);
-    });
-    it('should return true if the coupons flag is not available', () => {
-      const result = hasCouponSupport({
-        cart: {
-          data: {
-            flags: {}
-          }
-        }
-      });
-      expect(result).toEqual(true);
-    });
-    it('should return true if the flag is true', () => {
-      const result = hasCouponSupport({
-        cart: {
-          data: {
-            flags: {
-              coupons: true
-            }
-          }
-        }
-      });
-      expect(result).toEqual(true);
-    });
-    it('should return false if the flag is false', () => {
-      const result = hasCouponSupport({
-        cart: {
-          data: {
-            flags: {
-              coupons: false
-            }
-          }
-        }
-      });
-      expect(result).toEqual(false);
-    });
-  });
-  describe('isFetching()', () => {
-    it('should return true if cart is fetching', () => {
-      const result = getIsFetching({
-        cart: {
-          data: {
-            isFetching: true
-          }
-        }
-      });
-      expect(result).toEqual(true);
-    });
-    it('should return false when no store information is given', () => {
-      const result = getIsFetching({
-        cart: {
-          data: {}
-        }
-      });
-      expect(result).toEqual(false);
-    });
-    it('should return false if cart is not fetching', () => {
-      const result = getIsFetching({
-        cart: {
-          data: {
-            isFetching: false
-          }
-        }
-      });
-      expect(result).toEqual(false);
-    });
-  });
-  describe('getTotals', () => {
-    const mockedState = {
-      cart: {
-        data: {
-          totals: [{
-            type: CART_TOTALS_TYPE_SUB,
-            amount: 100
-          }, {
-            type: CART_TOTALS_TYPE_DISCOUNT,
-            amount: 5
-          }, {
-            type: CART_TOTALS_TYPE_DISCOUNT,
-            amount: 2
-          }, {
-            type: CART_TOTALS_TYPE_TAX,
-            label: 'inkl. 26%  MwSt.',
-            amount: 5
-          }, {
-            type: CART_TOTALS_TYPE_GRAND,
-            amount: 105
-          }]
-        }
-      }
-    };
-    it('should return subtotal', () => {
-      expect(getSubTotal(mockedState)).toEqual(100);
-    });
-    it('should return discount', () => {
-      expect(getDiscounts(mockedState)).toEqual([mockedState.cart.data.totals[1], mockedState.cart.data.totals[2]]);
-    });
-    it('should return discount amount', () => {
-      expect(getDiscountsAmount(mockedState)).toEqual(7);
-    });
-    it('should return tax', () => {
-      expect(getTax(mockedState)).toEqual(mockedState.cart.data.totals[3]);
-    });
-    it('should return grand total', () => {
-      expect(getGrandTotal(mockedState)).toEqual(105);
-    });
-  });
-});
-/* eslint-enable extra-rules/no-single-line-objects */