@shopgate/pwa-common 7.5.0-beta.6 → 7.5.0

package/actions/page/fetchPageConfig.js

@@ -1,5 +1,5 @@
-import{PipelineRequest}from'@shopgate/pwa-core';import{getDeviceType}from'@shopgate/engage/core';import{SHOPGATE_CMS_GET_PAGE_CONFIG}from"../../constants/Pipelines";import{requestPageConfig,receivePageConfig,errorPageConfig}from"../../action-creators/page";import{shouldFetchData,mutable}from"../../helpers/redux";import{getPageConfigById}from"../../selectors/page";/**
+import{PipelineRequest}from'@shopgate/pwa-core';import{getDeviceTypeForCms}from'@shopgate/engage/core';import{SHOPGATE_CMS_GET_PAGE_CONFIG}from"../../constants/Pipelines";import{requestPageConfig,receivePageConfig,errorPageConfig}from"../../action-creators/page";import{shouldFetchData,mutable}from"../../helpers/redux";import{getPageConfigById}from"../../selectors/page";/**
  * Retrieves the config for a page.
  * @param {string} pageId The ID of the page to request.
  * @return {Function} The dispatched action.
- */function fetchPageConfig(pageId){return function(dispatch,getState){var state=getState();var pageConfig=getPageConfigById(state,{pageId:pageId});if(!shouldFetchData(pageConfig)){return Promise.resolve(null);}var deviceType=getDeviceType();dispatch(requestPageConfig(pageId));var request=new PipelineRequest(SHOPGATE_CMS_GET_PAGE_CONFIG).setInput({pageId:pageId,deviceType:deviceType}).dispatch();request.then(function(result){dispatch(receivePageConfig(pageId,result));})["catch"](function(error){dispatch(errorPageConfig(pageId,error.code));});return request;};}/** @mixes {MutableFunction} */export default mutable(fetchPageConfig);
+ */function fetchPageConfig(pageId){return function(dispatch,getState){var state=getState();var pageConfig=getPageConfigById(state,{pageId:pageId});if(!shouldFetchData(pageConfig)){return Promise.resolve(null);}var deviceTypeOfCmsPage=getDeviceTypeForCms();dispatch(requestPageConfig(pageId));var request=new PipelineRequest(SHOPGATE_CMS_GET_PAGE_CONFIG).setInput({pageId:pageId,deviceType:deviceTypeOfCmsPage}).dispatch();request.then(function(result){dispatch(receivePageConfig(pageId,result));})["catch"](function(error){dispatch(errorPageConfig(pageId,error.code));});return request;};}/** @mixes {MutableFunction} */export default mutable(fetchPageConfig);

package/helpers/redux/mutable.js

@@ -1,4 +1,4 @@
-import{isObject}from"../validation";/**
+import noop from'lodash/noop';import{isObject}from"../validation";/**
  * @typedef {Object} MutableFunction
  * @property {Function} replace Replaces the original functionality with a custom function.
  * @property {Function} restore Restores the original function.
@@ -38,7 +38,8 @@ if(res.action===BEFORE_ACTION_NEXT){if(res.args&&res.args.length>0){res=res.args
 if(res.action===BEFORE_ACTION_SKIP_REST){arr.splice(-(arr.length-i));if(res.args&&res.args.length>0){res=res.args;}else{res=args;}}// Check if the step requested to stop any further processing including the action itself
 if(res.action===BEFORE_ACTION_STOP){// Cut off all following step functions including the mutable func
 arr.splice(-(arr.length-i));runAction=false;res=res.args;}// Replace arguments for the next step to get.
-return res;},args);}if(!runAction){return mutatedArgs;}// Call the actual mutable
+return res;},args);}if(!runAction){// the return value here gets passed to the dispatch() so it must be a function or action obj
+return noop;}// Call the actual mutable
 return current.apply(void 0,mutatedArgs);}/**
    * Replaces the original functionality with a custom function.
    * @param {Function} customFunc The function to execute instead of the original one.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "7.5.0-beta.6",
+  "version": "7.5.0",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@sentry/browser": "6.0.1",
-    "@shopgate/pwa-benchmark": "7.5.0-beta.6",
+    "@shopgate/pwa-benchmark": "7.5.0",
     "@virtuous/conductor": "~2.5.0",
     "@virtuous/react-conductor": "~2.5.0",
     "@virtuous/redux-persister": "1.1.0-beta.7",
@@ -44,7 +44,7 @@
     "url-search-params": "^0.10.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "7.5.0-beta.6",
+    "@shopgate/pwa-core": "7.5.0",
     "lodash": "^4.17.4",
     "prop-types": "~15.7.2",
     "react": "~16.12.0",