@ordergroove/offers 2.35.3 → 2.35.5-alpha-PR-802-3.1

package/src/core/__tests__/actions.spec.js

@@ -24,7 +24,7 @@ import {
 import * as constants from '../constants';
 import { api } from '../api';
 
-describe('redux actions', function() {
+describe('redux actions', function () {
   it('setEnvironment should return dev payload given dev env', () => {
     expect(setEnvironment('dev')).toEqual({
       type: 'SET_ENVIRONMENT_DEV',

package/src/core/__tests__/localStorage.spec.js

@@ -74,20 +74,20 @@ describe('saveState', () => {
     setItemSpy = spyOn(Object.getPrototypeOf(localStorage), 'setItem');
   });
 
-  it('should not save empty state', function() {
+  it('should not save empty state', function () {
     ['', false, {}, null, undefined].forEach(saveState);
     expect(getItemSpy).not.toHaveBeenCalled();
     expect(setItemSpy).not.toHaveBeenCalled();
   });
 
-  it('should not save if same state', function() {
+  it('should not save if same state', function () {
     getItemSpy.and.returnValue(JSON.stringify({ sessionId: 'yum' }));
     saveState({ sessionId: 'yum' });
     expect(getItemSpy).toHaveBeenCalledWith(STORE_ROOT);
     expect(setItemSpy).not.toHaveBeenCalled();
   });
 
-  it('should save if different state', function() {
+  it('should save if different state', function () {
     const payload = { sessionId: 'yum' };
     saveState(payload);
     expect(getItemSpy).toHaveBeenCalledWith(STORE_ROOT);

package/src/core/__tests__/middleware.spec.js

@@ -45,29 +45,29 @@ describe('middleware', () => {
 
   describe('conditionals', () => {
     describe('expression a', () => {
-      beforeEach(function() {
+      beforeEach(function () {
         this.underTest = conditionals[0].expressions[0];
       });
 
-      it('should return true given type is constants.OPTIN_PRODUCT', function() {
+      it('should return true given type is constants.OPTIN_PRODUCT', function () {
         expect(this.underTest({ type: constants.OPTIN_PRODUCT })).toBe(true);
       });
 
-      it('should return false given type is not constants.OPTIN_PRODUCT', function() {
+      it('should return false given type is not constants.OPTIN_PRODUCT', function () {
         expect(this.underTest({ type: 'not constants.OPTIN_PRODUCT' })).toBe(false);
       });
 
-      it('should return false given type is not defined', function() {
+      it('should return false given type is not defined', function () {
         expect(this.underTest()).toBe(false);
       });
     });
 
     describe('expression b', () => {
-      beforeEach(function() {
+      beforeEach(function () {
         this.underTest = conditionals[0].expressions[1];
       });
 
-      it('should return false given type is not constants.PRODUCT_CHANGE_FREQUENCY and optedin does not contain same product', function() {
+      it('should return false given type is not constants.PRODUCT_CHANGE_FREQUENCY and optedin does not contain same product', function () {
         const action = {
           type: 'not constants.PRODUCT_CHANGE_FREQUENCY',
           payload: {
@@ -83,7 +83,7 @@ describe('middleware', () => {
         expect(this.underTest(action, state)).toBe(false);
       });
 
-      it('should return false given type is not constants.PRODUCT_CHANGE_FREQUENCY and optedin contains same product', function() {
+      it('should return false given type is not constants.PRODUCT_CHANGE_FREQUENCY and optedin contains same product', function () {
         const action = {
           type: 'not constants.PRODUCT_CHANGE_FREQUENCY',
           payload: {
@@ -103,7 +103,7 @@ describe('middleware', () => {
         expect(this.underTest(action, state)).toBe(false);
       });
 
-      it('should return true given type is constants.PRODUCT_CHANGE_FREQUENCY', function() {
+      it('should return true given type is constants.PRODUCT_CHANGE_FREQUENCY', function () {
         const action = {
           type: constants.PRODUCT_CHANGE_FREQUENCY,
           payload: {
@@ -125,19 +125,19 @@ describe('middleware', () => {
     });
 
     describe('expression c', () => {
-      beforeEach(function() {
+      beforeEach(function () {
         this.underTest = conditionals[1].expressions[0];
       });
 
-      it('should return true given type is constants.OPTOUT_PRODUCT', function() {
+      it('should return true given type is constants.OPTOUT_PRODUCT', function () {
         expect(this.underTest({ type: constants.OPTOUT_PRODUCT })).toBe(true);
       });
 
-      it('should return false given type is not constants.OPTOUT_PRODUCT', function() {
+      it('should return false given type is not constants.OPTOUT_PRODUCT', function () {
         expect(this.underTest({ type: 'not constants.OPTOUT_PRODUCT' })).toBe(false);
       });
 
-      it('should return false given type is not defined', function() {
+      it('should return false given type is not defined', function () {
         expect(this.underTest()).toBe(false);
       });
     });

package/src/core/actions-preview.js

@@ -6,7 +6,7 @@ export const setPreviewStandardOffer = (isPreview, productId, offer) =>
   async function setPreviewStandardOfferThunk(dispatch) {
     await dispatch({
       type: constants.SET_PREVIEW_STANDARD_OFFER,
-      payload: isPreview
+      payload: { isPreview, productId }
     });
     await dispatch({
       type: constants.UNAUTHORIZED
@@ -78,7 +78,7 @@ export const mergeProductPlansToState = (state, newProductPlans) => {
 
 export const setPreviewUpsellOffer = (isPreview, productId, offer) =>
   async function setPreviewUpsellOfferThunk(dispatch, getState) {
-    await dispatch({ type: constants.SET_PREVIEW_UPSELL_OFFER, payload: isPreview });
+    await dispatch({ type: constants.SET_PREVIEW_UPSELL_OFFER, payload: { isPreview, productId } });
 
     const { merchantId } = getState();
     if (isPreview) {
@@ -142,7 +142,7 @@ export const setPreviewPrepaid = (isPreview, productId, offer) =>
 
     await dispatch({
       type: constants.SET_PREVIEW_PREPAID_OFFER,
-      payload: isPreview
+      payload: { isPreview, productId }
     });
     await dispatch({
       type: constants.UNAUTHORIZED
@@ -264,15 +264,15 @@ export const setPreviewPrepaid = (isPreview, productId, offer) =>
   };
 
 export const setPreview = (value, oldValue, offer) =>
-  async function(dispatch, _getState) {
+  async function (dispatch, _getState) {
     await dispatch({ type: constants.LOCAL_STORAGE_CLEAR });
     await dispatch({
       type: constants.SET_PREVIEW_STANDARD_OFFER,
-      payload: false
+      payload: { isPreview: false, productId: offer.product.id }
     });
     await dispatch({
       type: constants.SET_PREVIEW_UPSELL_OFFER,
-      payload: false
+      payload: { isPreview: false, productId: offer.product.id }
     });
 
     switch (value) {

package/src/core/actions.js

@@ -256,18 +256,20 @@ export const createIu = (product, order, quantity, subscribed = false, initialFr
 
     dispatch(requestAction);
 
-    return (previewUpsellOffer
-      ? Promise.resolve({ legoUrl, product, order, quantity, offer })
-      : api.createOneTime(legoUrl, auth, product.id, order, quantity, offer)
+    return (
+      previewUpsellOffer
+        ? Promise.resolve({ legoUrl, product, order, quantity, offer })
+        : api.createOneTime(legoUrl, auth, product.id, order, quantity, offer)
     )
       .then(
         item => {
           dispatch(receiveCreateOneTime(item));
           if (subscribed) {
             dispatch(requestConvertOneTimeToSubscription(item, frequency));
-            return (previewUpsellOffer
-              ? Promise.resolve({ item, frequency })
-              : api.convertOneTimeToSubscription(legoUrl, auth, item, frequency, offer)
+            return (
+              previewUpsellOffer
+                ? Promise.resolve({ item, frequency })
+                : api.convertOneTimeToSubscription(legoUrl, auth, item, frequency, offer)
             ).then(
               response => dispatch(receiveConvertOneTime(response, product)),
               err => dispatch(fetchResponseError(err))

package/src/core/api.js

@@ -2,7 +2,10 @@ import memoize from 'lodash.memoize';
 
 const memoizeKey = (...args) => JSON.stringify(args);
 
-export const withFetchJson = cb => (...args) => fetch(...cb(...args)).then(res => res.json());
+export const withFetchJson =
+  cb =>
+  (...args) =>
+    fetch(...cb(...args)).then(res => res.json());
 
 export const withHost = cb => {
   return (host, ...extra) => {
@@ -134,18 +137,7 @@ export const parseFrequency = raw => {
 
 export const isFrequencyValid = it => it.match(/^\d+_\d$/);
 export const compareFrequencies = (a, b) =>
-  String.prototype.localeCompare.call(
-    a &&
-      a
-        .split('_')
-        .reverse()
-        .join('_'),
-    b &&
-      b
-        .split('_')
-        .reverse()
-        .join('_')
-  );
+  String.prototype.localeCompare.call(a && a.split('_').reverse().join('_'), b && b.split('_').reverse().join('_'));
 
 export const parseFrequenciesList = value =>
   [...new Set(value && value.split(/\s+/))].filter(isFrequencyValid).sort(compareFrequencies);

package/src/core/connect.js

@@ -21,41 +21,43 @@ export const createRecalcProps = (mapStateToProps, mapDispatchToProps) => obj =>
  * TODO this component can be coded as regular connect function. Instead of making the component
  * tied to stateChanged connect can accept mapStateToProps?, mapDispatchToProps?
  */
-export const connect = (mapStateToProps, mapDispatchToProps = defaultMapDispatchToProps) => baseElement => {
-  const preparedDispatch =
-    typeof mapDispatchToProps === 'function'
-      ? mapDispatchToProps
-      : dispatch => bindActionCreators(mapDispatchToProps, dispatch);
+export const connect =
+  (mapStateToProps, mapDispatchToProps = defaultMapDispatchToProps) =>
+  baseElement => {
+    const preparedDispatch =
+      typeof mapDispatchToProps === 'function'
+        ? mapDispatchToProps
+        : dispatch => bindActionCreators(mapDispatchToProps, dispatch);
 
-  const recalcProps = createRecalcProps(mapStateToProps, preparedDispatch);
+    const recalcProps = createRecalcProps(mapStateToProps, preparedDispatch);
 
-  return class extends baseElement {
-    get store() {
-      return storeInstance;
-    }
-
-    connectedCallback() {
-      if (super.connectedCallback) {
-        super.connectedCallback();
+    return class extends baseElement {
+      get store() {
+        return storeInstance;
       }
 
-      this._storeUnsubscribe = resolveStore(this).subscribe(() => recalcProps(this));
-      recalcProps(this);
-    }
+      connectedCallback() {
+        if (super.connectedCallback) {
+          super.connectedCallback();
+        }
 
-    attributeChangedCallback(name, old, value) {
-      if (super.attributeChangedCallback) super.attributeChangedCallback(name, old, value);
-      if (this._storeUnsubscribe && old !== value) recalcProps(this);
-    }
+        this._storeUnsubscribe = resolveStore(this).subscribe(() => recalcProps(this));
+        recalcProps(this);
+      }
 
-    disconnectedCallback() {
-      this._storeUnsubscribe();
-      if (super.disconnectedCallback) {
-        super.disconnectedCallback();
+      attributeChangedCallback(name, old, value) {
+        if (super.attributeChangedCallback) super.attributeChangedCallback(name, old, value);
+        if (this._storeUnsubscribe && old !== value) recalcProps(this);
       }
-    }
+
+      disconnectedCallback() {
+        this._storeUnsubscribe();
+        if (super.disconnectedCallback) {
+          super.disconnectedCallback();
+        }
+      }
+    };
   };
-};
 /**
  * This api will change asap
  * @deprecated

package/src/core/middleware.js

@@ -9,18 +9,18 @@ export const dispatchEvent = (name, detail, el = document) =>
     })
   );
 
-export const dispatchOptinChangedEvent = optedIn => ({
-  payload: { product: { id: productId, components } = {} } = {}
-} = {}) =>
-  setTimeout(
-    () =>
-      dispatchEvent('optin-changed', {
-        productId,
-        components,
-        optedIn
-      }),
-    0
-  );
+export const dispatchOptinChangedEvent =
+  optedIn =>
+  ({ payload: { product: { id: productId, components } = {} } = {} } = {}) =>
+    setTimeout(
+      () =>
+        dispatchEvent('optin-changed', {
+          productId,
+          components,
+          optedIn
+        }),
+      0
+    );
 
 export const conditionals = [
   {

package/src/core/reducer.js

@@ -366,9 +366,9 @@ export const locale = (
     upsellModalCancelLabel: 'Cancel',
     defaultFrequencyCopy: '(Most Popular)',
     frequencyPeriods: {
-      '1': 'day',
-      '2': 'week',
-      '3': 'month'
+      1: 'day',
+      2: 'week',
+      3: 'month'
     },
     prepaidOptInLabel: 'Prepaid Subscription',
     prepaidShipmentsLabel: 'Number of prepaid shipments'
@@ -408,7 +408,7 @@ export const config = (
 export const previewStandardOffer = (state = false, action) => {
   switch (action.type) {
     case constants.SET_PREVIEW_STANDARD_OFFER:
-      return action.payload;
+      return action.payload.isPreview;
     default:
       return state;
   }
@@ -417,7 +417,7 @@ export const previewStandardOffer = (state = false, action) => {
 export const previewUpsellOffer = (state = false, action) => {
   switch (action.type) {
     case constants.SET_PREVIEW_UPSELL_OFFER:
-      return action.payload;
+      return action.payload.isPreview;
     default:
       return state;
   }
@@ -426,7 +426,7 @@ export const previewUpsellOffer = (state = false, action) => {
 export const previewPrepaidOffer = (state = false, action) => {
   switch (action.type) {
     case constants.SET_PREVIEW_PREPAID_OFFER:
-      return action.payload;
+      return action.payload.isPreview;
     default:
       return state;
   }

package/src/core/utils.ts

@@ -149,10 +149,10 @@ export function getOrCreateHidden(parent, name, value) {
  * @returns {[any, any[]]} - a two item array where the first item is the matching product and the second is the remaining items from the original state.
  */
 export function getMatchingProductIfExists(state, product) {
-  const [[oldone], rest] = state.reduce((acc, val) => acc[isSameProduct(product, val) ? 0 : 1].push(val) && acc, [
-    [],
-    []
-  ]);
+  const [[oldone], rest] = state.reduce(
+    (acc, val) => acc[isSameProduct(product, val) ? 0 : 1].push(val) && acc,
+    [[], []]
+  );
 
   return [oldone || {}, rest || []];
 }

package/src/run-tests.js

@@ -1,6 +1,6 @@
 import { TestWizard } from './components/TestWizard';
 
-export default function() {
+export default function () {
   const name = 'og-test-wizard';
   if (!customElements.get(name)) {
     customElements.define(name, TestWizard);

package/src/shopify/__tests__/shopifyReducer.spec.js

@@ -437,7 +437,7 @@ describe('config', () => {
     );
     expect(actual).toEqual({
       prepaidSellingPlans: {
-        '43017264201944': [
+        43017264201944: [
           {
             numberShipments: 4,
             sellingPlan: '2146042072'
@@ -479,13 +479,13 @@ describe('config', () => {
     const actual = config(
       {
         prepaidSellingPlans: {
-          '43017264201946': [
+          43017264201946: [
             {
               numberShipments: 1,
               sellingPlan: '2146042072'
             }
           ],
-          '43017264201944': [
+          43017264201944: [
             {
               numberShipments: 4,
               sellingPlan: '2146042071'
@@ -504,19 +504,19 @@ describe('config', () => {
     );
     expect(actual).toEqual({
       prepaidSellingPlans: {
-        '43017264201944': [
+        43017264201944: [
           {
             numberShipments: 4,
             sellingPlan: '2146042071'
           }
         ],
-        '43017264201946': [
+        43017264201946: [
           {
             numberShipments: 3,
             sellingPlan: '2146042072'
           }
         ],
-        '43017264201945': [
+        43017264201945: [
           {
             numberShipments: 5,
             sellingPlan: '2146042073'

package/src/shopify/shopifyMiddleware.ts

@@ -39,7 +39,7 @@ type SetupCartPayload = ShopifyCart;
 const DEFAULT_SHOPIFY_CART_AJAX_SECTIONS =
   '[id^="shopify-section-"][id$=__cart-items], [id^="shopify-section-"][id$="__cart-footer"],#cart-live-region-text,#cart-icon-bubble';
 const makeSyncProductId = offer =>
-  debounce(100, false, function(form) {
+  debounce(100, false, function (form) {
     const { id } = Object.fromEntries([...new FormData(form).entries()]);
     if (id) {
       offer.setAttribute('product', id);
@@ -142,7 +142,7 @@ export function guessProductHandle(offer): string {
   );
 }
 
-const getProduct = memoize(async function(handle: string): Promise<ShopifyProductEntity> {
+const getProduct = memoize(async function (handle: string): Promise<ShopifyProductEntity> {
   return (await fetch(`${PRODUCTS_URL}${handle}.js`)).json();
 });
 

package/src/shopify/shopifyReducer.js

@@ -190,6 +190,10 @@ export const autoshipEligible = (state = {}, action) => {
       };
     }, state);
   }
+  if (constants.SET_PREVIEW_STANDARD_OFFER === action.type) {
+    if (action.payload.isPreview !== true) return state;
+    return { ...state, ...{ [action.payload.productId]: true } };
+  }
   return state;
 };
 
@@ -246,13 +250,7 @@ export const config = (
   action
 ) => {
   if (constants.RECEIVE_PRODUCT_PLANS === action.type) {
-    const frequencies = [
-      ...new Set(
-        Object.values(action.payload)
-          .map(Object.keys)
-          .flat()
-      )
-    ];
+    const frequencies = [...new Set(Object.values(action.payload).map(Object.keys).flat())];
     return {
       ...state,
       frequencies
@@ -354,6 +352,10 @@ export const inStock = (state = {}, action) => {
   if (constants.REQUEST_OFFER === action.type && action.payload.product === null) {
     return { ...state };
   }
+  if (constants.SET_PREVIEW_STANDARD_OFFER === action.type) {
+    if (action.payload.isPreview !== true) return state;
+    return { ...state, ...{ [action.payload.productId]: true } };
+  }
   return state;
 };
 

package/src/test-mode.js

@@ -14,11 +14,11 @@ export const enable = () => {
   let keysCounter = 0;
   document.addEventListener(
     'keyup',
-    async function(e) {
+    async function (e) {
       const key = e.which;
       if (key === keys[keysCounter]) {
         const currentkeys = keys[keysCounter];
-        setTimeout(function() {
+        setTimeout(function () {
           if (keysCounter <= currentkeys) keysCounter = 0;
         }, 5000);
         keysCounter += 1;

package/tsconfig.json

@@ -21,10 +21,7 @@
   ],
   "typedocOptions": {
     "name": "SMI",
-    "entryPoints": [
-      "./src/index.ts",
-      "./src/shopify.ts",
-    ],
+    "entryPoints": ["./src/index.ts", "./src/shopify.ts"],
     "out": "docs/",
     "readme": "none",
     "disableSources": true,