@ordergroove/offers 2.34.7-alpha-PR-789-9.10 → 2.34.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.34.7-alpha-PR-789-9.10+9e577f43",
+  "version": "2.34.7",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -35,8 +35,8 @@
     }
   ],
   "dependencies": {
-    "@ordergroove/auth": "^2.3.0",
-    "@ordergroove/offers-live-editor": "^0.6.3-alpha-PR-789-7.14",
+    "@ordergroove/auth": "^2.3.1",
+    "@ordergroove/offers-live-editor": "^0.6.3",
     "lit-element": "^2.1.0",
     "lodash.memoize": "^4.1.2",
     "logical-expression-parser": "1.0.0",
@@ -45,7 +45,7 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.9.1"
+    "@ordergroove/offers-templates": "^0.9.2"
   },
-  "gitHead": "9e577f43f6ce9a0079f7c2d32a4f90458124df88"
+  "gitHead": "1b08ceb2cca573488a040e8645304a446d72cd31"
 }

package/src/components/FrequencyStatus.js

@@ -63,7 +63,6 @@ export class FrequencyStatus extends withProduct(TemplateElement) {
 
   render() {
     const frequency = this.frequency || this.defaultFrequency;
-    // eslint-disable-next-line camelcase
     return html`
       <span>
         ${(this.subscribed &&

package/src/components/PrepaidStatus.js

@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element';
+import { LitElement, html } from 'lit-element';
 import { connect } from '../core/connect';
 import {
   makeProductPrepaidShipmentOptionsSelector,

package/src/components/__tests__/OG.fspec.js

@@ -8,11 +8,11 @@ async function simulateChange(element, value) {
 }
 
 const expectToBeVisible = offer => {
-  const { x, y, width, height } = offer.getClientRects()[0];
+  const { height } = offer.getClientRects()[0];
   expect(height).toBeGreaterThan(30);
 };
 const expectNotToBeVisible = offer => {
-  const { x, y, width, height } = offer.getClientRects()[0];
+  const { height } = offer.getClientRects()[0];
   expect(height).toBeLessThan(30);
 };
 const waitUpdate = async offer => {

package/src/components/__tests__/Offer.spec.js

@@ -1,4 +1,3 @@
-/* eslint-disable jasmine/no-unsafe-spy */
 import { Offer, mapStateToProps } from '../Offer';
 import { appendToBody } from './utils';
 

package/src/components/__tests__/Price.spec.js

@@ -76,7 +76,7 @@ describe('Price', () => {
     const template = html`
       <og-some-price pay-as-you-go product="yum id"> </og-some-price>
     `;
-    const priceDivUndefinedPrepaid = await renderPriceTemplate(template, {
+    await renderPriceTemplate(template, {
       frequency: '1_3',
       productPlans: {
         'yum id': [

package/src/components/__tests__/SelectFrequency.spec.js

@@ -1,4 +1,3 @@
-import { html, render } from 'lit-html';
 import { SelectFrequency, frequencyEquals } from '../SelectFrequency';
 import { simulateChange } from './utils';
 

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

@@ -1,6 +1,3 @@
-/* eslint-disable jasmine/no-unsafe-spy */
-/* eslint-disable object-shorthand */
-/* eslint-disable no-underscore-dangle */
 import { connect, createRecalcProps, resolveStore, setStore, unsetStore } from '../connect';
 
 describe('connect', () => {
@@ -73,7 +70,6 @@ describe('connect', () => {
         });
 
         it('should call mapStateToProps with state and ownProps', () => {
-          // eslint-disable-next-line no-shadow
           const getState = jasmine.createSpy('getState').and.returnValue({ the: 'state' });
           const _enqueueUpdate = jasmine.createSpy('_enqueueUpdate');
           setStore({ subscribe, getState, dispatch });

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

@@ -36,10 +36,9 @@ describe('serializeState', () => {
 });
 
 describe('loadState', () => {
-  let getItemSpy, setItemSpy;
+  let getItemSpy;
   beforeEach(() => {
     getItemSpy = spyOn(Object.getPrototypeOf(localStorage), 'getItem');
-    setItemSpy = spyOn(Object.getPrototypeOf(localStorage), 'setItem');
   });
 
   it('should return undefined on empty state', () => {

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

@@ -169,7 +169,7 @@ describe('middleware', () => {
   });
 
   describe('localStorageMiddleware', () => {
-    let getItemSpy, setItemSpy;
+    let setItemSpy;
     beforeEach(() => {
       // getItemSpy = spyOn(Object.getPrototypeOf(localStorage), 'getItem');
       setItemSpy = spyOn(Object.getPrototypeOf(localStorage), 'setItem');

package/src/core/actions-preview.js

@@ -264,7 +264,7 @@ 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,

package/src/core/actions.js

@@ -89,7 +89,6 @@ export const fetchAuth = (authResolver = resolveAuth) =>
 
     return authResolver(authUrl)
       .then(
-        // eslint-disable-next-line camelcase
         ({ sig_field, ts, sig }) => dispatch(authorize(merchantId, sig_field, ts, sig)),
         err => dispatch(unauthorized(err))
       )
@@ -130,7 +129,6 @@ export const fetchOrders = (status = 1, ordering = 'place') =>
     return api
       .fetchOrders(legoUrl, auth, status, ordering)
       .then(
-        // eslint-disable-next-line camelcase
         response => {
           if (response.results) {
             dispatch(receiveOrders(response));

package/src/core/adapters.js

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 import { parseFrequency } from './api';
 
 /**

package/src/core/api.js

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 import memoize from 'lodash.memoize';
 
 const memoizeKey = (...args) => JSON.stringify(args);

package/src/core/connect.js

@@ -1,12 +1,10 @@
-/* eslint-disable  no-underscore-dangle */
 import { bindActionCreators } from 'redux';
 
 let storeInstance = null;
 
 const defaultMapDispatchToProps = dispatch => ({ dispatch });
 
-// eslint-disable-next-line no-unused-vars
-export const resolveStore = obj => {
+export const resolveStore = _obj => {
   if (!storeInstance) throw new Error('Missing redux store.');
   return storeInstance;
 };

package/src/core/middleware.js

@@ -1,7 +1,5 @@
-/* eslint-disable no-fallthrough */
 import { throttle } from 'throttle-debounce';
 import * as constants from './constants';
-import { isSameProduct, kebabCase } from './selectors';
 import { saveState } from './localStorage';
 
 export const dispatchEvent = (name, detail, el = document) =>
@@ -61,9 +59,9 @@ export const dispatchMiddleware = store => next => action => {
  * @param {*} store
  * @returns
  */
-export const offerEvents = store => next => action => {
+export const offerEvents = _store => next => action => {
   let ev;
-
+  /* eslint-disable no-fallthrough */
   switch (action.type) {
     // event: og-receive-offer
     case constants.RECEIVE_OFFER:

package/src/core/reducer.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-case-declarations  */
 import { combineReducers } from 'redux';
 import * as constants from './constants';
 import { isSameProduct } from './selectors';
@@ -22,7 +21,7 @@ export const optedin = (state = [], action) => {
         frequency: action.payload.frequency
       });
     }
-    case constants.PRODUCT_CHANGE_PREPAID_SHIPMENTS:
+    case constants.PRODUCT_CHANGE_PREPAID_SHIPMENTS: {
       const { payload } = action;
       const [{ prepaidShipments, ...oldone }, rest] = getMatchingProductIfExists(state, payload.product);
       const newState = {
@@ -33,6 +32,7 @@ export const optedin = (state = [], action) => {
         newState.prepaidShipments = payload.prepaidShipments;
       }
       return rest.concat(newState);
+    }
     case constants.OPTOUT_PRODUCT:
       return state.filter(a => !isSameProduct(action.payload.product, a));
     case constants.PRODUCT_HAS_CHANGED:
@@ -57,13 +57,14 @@ export const optedout = (state = [], action) => {
     case constants.OPTIN_PRODUCT:
     case constants.PRODUCT_CHANGE_FREQUENCY:
       return state.filter(a => !isSameProduct(action.payload.product, a));
-    case constants.OPTOUT_PRODUCT:
+    case constants.OPTOUT_PRODUCT: {
       const [oldone, rest] = getMatchingProductIfExists(state, action.payload.product);
       return rest.concat({
         ...oldone,
         ...action.payload.product,
         frequency: action.payload.frequency
       });
+    }
     case constants.PRODUCT_HAS_CHANGED:
       return state.map(product =>
         isSameProduct(action.payload.product, product) ? { ...product, ...action.payload.newProduct } : product
@@ -482,9 +483,10 @@ export const prepaidShipmentsSelected = (state = {}, action) => {
     // a product changes in the cart we need to sync these changes back with the eComm platform, this operation
     // may result in a new cartId that needs to replace the old product's cartId in order to have the
     // prepaidShipmentsSelected object up-to-date
-    case constants.CART_PRODUCT_KEY_HAS_CHANGED:
+    case constants.CART_PRODUCT_KEY_HAS_CHANGED: {
       const { [action.payload.oldCartProductKey]: preservedPrepaidShipments, ...stateWithoutOldCartProductKey } = state;
       return { ...stateWithoutOldCartProductKey, [action.payload.newCartProductKey]: preservedPrepaidShipments };
+    }
     case constants.PRODUCT_CHANGE_PREPAID_SHIPMENTS:
       if (action.payload.prepaidShipments) {
         return { ...state, [action.payload.product.id]: action.payload.prepaidShipments };

package/src/core/resolveProperties.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { LitElement } from 'lit-element';
 
 export const sanitizeFrequencyString = value => {

package/src/core/selectors.js

@@ -16,7 +16,6 @@ function arraysEqual(a, b) {
   // Please note that calling sort on an array will modify that array.
   // you might want to clone your array first.
 
-  // eslint-disable-next-line no-plusplus
   for (let i = 0; i < a.length; ++i) {
     if (a[i] !== b[i]) return false;
   }

package/src/core/store.js

@@ -11,10 +11,8 @@ export function makeStore(reducer, ...extraMiddlewares) {
   const isPreviewMode = window.og && window.og.previewMode;
 
   const composeEnhancers =
-    // eslint-disable-next-line no-underscore-dangle
     typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-      ? // eslint-disable-next-line no-underscore-dangle
-        window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
+      ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
           name: 'Ordergroove Offers'
         })
       : compose;

package/src/make-api.js

@@ -1,6 +1,5 @@
 import { offersLiveEditor } from '@ordergroove/offers-live-editor';
 import { setStore } from './core/connect';
-import { listenLocalStorageChanges } from './core/localStorage';
 import * as adapters from './core/adapters';
 import * as actions from './core/actions';
 import { ConnectedWhen } from './components/When';
@@ -27,8 +26,8 @@ import { ConnectedPrepaidSelect } from './components/PrepaidSelect';
 import { ConnectedSubscriptionButton } from './components/SubscriptionButton';
 import * as testMode from './test-mode';
 import { api } from './core/api';
-import { environment, offer } from './core/reducer';
-import { DEFAULT_OFFER_MODULE, RECEIVE_PRODUCT_PLANS, SETUP_CART, SETUP_PRODUCT } from './core/constants';
+import { environment } from './core/reducer';
+import { DEFAULT_OFFER_MODULE, RECEIVE_PRODUCT_PLANS } from './core/constants';
 import ConnectedPrice from './components/Price';
 import { safeProductId } from './core/utils';
 
@@ -131,7 +130,7 @@ export default function makeApi(store) {
       return this;
     },
 
-    setPublicPath(publicPath) {
+    setPublicPath(_publicPath) {
       return this;
     },
 

package/src/run-tests.js

@@ -1,4 +1,4 @@
-const { TestWizard } = require('./components/TestWizard');
+import { TestWizard } from './components/TestWizard';
 
 export default function() {
   const name = 'og-test-wizard';

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

@@ -152,7 +152,7 @@ describe('synchronizeCartOptin', () => {
 
   it('should dispatch cart updated event', async () => {
     let called;
-    document.addEventListener(CART_UPDATED_EVENT, ev => {
+    document.addEventListener(CART_UPDATED_EVENT, () => {
       called = true;
     });
 

package/src/shopify/reducers/productPlans.ts

@@ -17,7 +17,7 @@ export const getPrepaidShipmentsNumberFromOptions = options => {
 
 export const getAllocationFrequency = (allocation: ShopifySellingPlanAllocationsEntity) => {
   // now frequency every_period will match with selling_plan_id so no need to convert it
-  return (allocation.selling_plan_id || allocation.selling_plan?.id).toString();
+  return (allocation.selling_plan_id || (allocation.selling_plan?.id ?? '')).toString();
 };
 
 export const getAllocationRegularPrice = (allocation: ShopifySellingPlanAllocationsEntity) => {

package/src/shopify/shopifyBootstrap.ts

@@ -7,7 +7,7 @@ const SHOPIFY_OG_AUTH_END = 'og_auth_end';
 
 type ShopifyOGAuth = {
   customerId: string;
-  timestamp: Number;
+  timestamp: number;
   signature: string;
 };
 
@@ -45,7 +45,7 @@ declare global {
       previewMode: boolean;
     };
     ogShopifyConfig: OgShopifyConfig;
-    Shopify: { routes?: { root: String } };
+    Shopify: { routes?: { root: string } };
   }
 }
 

package/src/shopify/shopifyMiddleware.ts

@@ -71,7 +71,7 @@ async function setupPdp(store, offer) {
   if (form) {
     // since syncProductId is debounced not matter which comes first mutation or onchange
     const syncProductId = makeSyncProductId(offer);
-    form.addEventListener('change', ev => syncProductId(form));
+    form.addEventListener('change', () => syncProductId(form));
     const mo = new MutationObserver(() => syncProductId(form));
     mo.observe(form, { subtree: true, childList: true });
   } else {
@@ -85,7 +85,7 @@ const getCart = async () => await (await fetch(CART_JS_URL)).json();
  * Attemps to guess the product handle o
  * @returns
  */
-export function guessProductHandle(offer): String {
+export function guessProductHandle(offer): string {
   return (
     [
       // Allow specify data-shopify-product-handle attribute offer level so it will work on category qv
@@ -98,7 +98,7 @@ export function guessProductHandle(offer): String {
         (document
           .querySelector('[href$=".oembed"]')
           ?.getAttribute('href')
-          ?.match(/\/([^\/]+)\.oembed$/) || [])[1],
+          ?.match(/\/([^/]+)\.oembed$/) || [])[1],
 
       () =>
         // Use the open graph og:type==product and og:url to get the product handle
@@ -106,7 +106,7 @@ export function guessProductHandle(offer): String {
           document
             .querySelector('meta[property="og:url"][content]')
             ?.getAttribute('content')
-            ?.match(/\/([^\/]+)$/)) ||
+            ?.match(/\/([^/]+)$/)) ||
           [])[1],
 
       () =>

package/src/shopify/shopifyReducer.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-case-declarations  */
 import { combineReducers } from 'redux';
 import * as constants from '../core/constants';
 
@@ -262,7 +261,7 @@ export const config = (
 
   if (constants.SETUP_PRODUCT === action.type) {
     const {
-      payload: { offer: offerEl, product }
+      payload: { product }
     } = action;
     let configToAdd = {};
     // pay as you go selling plans
@@ -349,7 +348,7 @@ export const inStock = (state = {}, action) => {
     const {
       payload: { product }
     } = action;
-    return [product, ...product?.variants]?.reduce(productOrVariantInStockReducer, state) || state;
+    return [product, ...(product?.variants ?? [])]?.reduce(productOrVariantInStockReducer, state) || state;
   }
   // force offer to refresh when requesting a new one
   if (constants.REQUEST_OFFER === action.type && action.payload.product === null) {
@@ -358,7 +357,7 @@ export const inStock = (state = {}, action) => {
   return state;
 };
 
-export const offer = (state = {}, action) => state;
+export const offer = (state = {}, _action) => state;
 
 function getFrequencyForPrepaidShipments({ prepaidShipments, offer: offerEl, product }) {
   if (prepaidShipments) {
@@ -436,7 +435,7 @@ export const optedin = (state = [], action) => {
   return coreOptedin(state, action);
 };
 
-export const productOffer = (state = {}, action) => state;
+export const productOffer = (state = {}, _action) => state;
 
 export const productPlans = (state = {}, action) => {
   if (constants.SETUP_PRODUCT === action.type) {
@@ -448,7 +447,7 @@ export const productPlans = (state = {}, action) => {
 
     return (
       // We consider the product here as well for cases where we don't have any variants
-      [product, ...product?.variants]?.reduce(
+      [product, ...(product?.variants ?? [])]?.reduce(
         (acc, cur) => ({
           ...acc,
           [cur.id]: cur.selling_plan_allocations?.reduce(

package/src/shopify/shopifyTrackingMiddleware.ts

@@ -49,7 +49,6 @@ export function addDefaultToSubTracking(action, store) {
   const value = [productId, OPTIN_PRODUCT.toLowerCase(), location, frequency, variation];
   const inputValue = value.join(',');
   updateTrackingInputs(productId, key, inputValue);
-    
 }
 
 export default function shopifyTrackingMiddleware(store) {
@@ -59,7 +58,7 @@ export default function shopifyTrackingMiddleware(store) {
     switch (action.type) {
       case OPTIN_PRODUCT:
       case OPTOUT_PRODUCT:
-      case PRODUCT_CHANGE_FREQUENCY:
+      case PRODUCT_CHANGE_FREQUENCY: {
         const offerElement = action.payload.offer;
         const trackingEvent = getTrackingEvent(action);
 
@@ -67,6 +66,7 @@ export default function shopifyTrackingMiddleware(store) {
           updateTrackingInputs(offerElement.product.id, trackingEvent[0], trackingEvent[1]);
         }
         break;
+      }
       case RECEIVE_OFFER:
         addDefaultToSubTracking(action, store);
         break;