@shopgate/pwa-tracking 7.29.0-alpha.2 → 7.29.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-tracking",
-  "version": "7.29.0-alpha.2",
+  "version": "7.29.0-alpha.4",
   "description": "Tracking library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -15,10 +15,10 @@
     "connect"
   ],
   "devDependencies": {
-    "@shopgate/pwa-common": "7.29.0-alpha.2",
-    "@shopgate/pwa-common-commerce": "7.29.0-alpha.2",
-    "@shopgate/pwa-core": "7.29.0-alpha.2",
-    "@shopgate/tracking-core": "7.29.0-alpha.2",
+    "@shopgate/pwa-common": "7.29.0-alpha.4",
+    "@shopgate/pwa-common-commerce": "7.29.0-alpha.4",
+    "@shopgate/pwa-core": "7.29.0-alpha.4",
+    "@shopgate/tracking-core": "7.29.0-alpha.4",
     "reselect": "^4.1.8",
     "rxjs": "~5.5.12"
   }

package/selectors/page.js

@@ -1,4 +1,4 @@
-import{createSelector}from'reselect';import{getCurrentPathname,makeGetRouteParam}from'@shopgate/engage/core/selectors';import{isDev}from'@shopgate/engage/core/helpers';import{getPageConfigById}from'@shopgate/engage/page/selectors';import{shopNumber}from'@shopgate/pwa-common/helpers/config';/**
+import{createSelector}from'reselect';import{getCurrentPathname,makeGetRouteParam}from'@shopgate/engage/core/selectors';import{isDev}from'@shopgate/engage/core/helpers';import{makeGetUnifiedCMSPageData}from'@shopgate/engage/page/selectors';import{shopNumber}from'@shopgate/pwa-common/helpers/config';/**
  * The tracking base URL.
  * @type {string}
  */var baseUrl="https://rapid.shopgate.com".concat(isDev?'/php/shopgate':'',"/sg_app_resources");/**
@@ -20,7 +20,7 @@ import{createSelector}from'reselect';import{getCurrentPathname,makeGetRouteParam
  * Creates a selector that retrieves a page config for the current route from the store.
  * @param {string} name The name of the desired parameter.
  * @returns {Function}
- */export var makeGetRoutePageConfig=function makeGetRoutePageConfig(){var getPageIdRouteParam=makeGetRouteParam('pageId');return createSelector(function(state){return state;},getPageIdRouteParam,function(state,pageId){return pageId?getPageConfigById(state,{pageId:pageId}):null;});};/**
+ */export var makeGetRoutePageConfig=function makeGetRoutePageConfig(){var getPageIdRouteParam=makeGetRouteParam('pageId');return createSelector(function(state){return state;},getPageIdRouteParam,function(state,pageId){return pageId?makeGetUnifiedCMSPageData({slug:pageId})(state):null;});};/**
  * Selects the page information.
  * @param {Object} state The current state.
  * @returns {Object} The page information.

package/streams/page.js

@@ -1,10 +1,10 @@
-import'rxjs/add/operator/switchMap';import'rxjs/add/observable/of';import{Observable}from'rxjs/Observable';import{RECEIVE_PAGE_CONFIG}from'@shopgate/engage/core/constants';import{main$,routeDidEnter$,pwaDidAppear$}from'@shopgate/engage/core/streams';import{getIsAppWebViewVisible}from'@shopgate/engage/core/selectors';import{PAGE_PATTERN}from'@shopgate/engage/page/constants';import{getPageConfigById}from'@shopgate/engage/page/selectors';/**
+import'rxjs/add/operator/switchMap';import'rxjs/add/observable/of';import{Observable}from'rxjs/Observable';import{RECEIVE_PAGE_CONFIG}from'@shopgate/engage/core/constants';import{main$,routeDidEnter$,pwaDidAppear$}from'@shopgate/engage/core/streams';import{getIsAppWebViewVisible}from'@shopgate/engage/core/selectors';import{PAGE_PATTERN,RECEIVE_PAGE_CONFIG_V2}from'@shopgate/engage/page/constants';import{makeGetUnifiedCMSPageData}from'@shopgate/engage/page/selectors';/**
  * Emits when a "page" was entered.
  */var pageDidEnter$=routeDidEnter$.filter(function(_ref){var action=_ref.action;return action.route.pattern===PAGE_PATTERN;});/**
  * Emits when the page route comes active again after a legacy page was active.
- */var pageRouteReappeared$=pwaDidAppear$.filter(function(_ref2){var action=_ref2.action;return action.route.pattern===PAGE_PATTERN;});var pageConfigReceived$=main$.filter(function(_ref3){var action=_ref3.action;return action.type===RECEIVE_PAGE_CONFIG;});/**
+ */var pageRouteReappeared$=pwaDidAppear$.filter(function(_ref2){var action=_ref2.action;return action.route.pattern===PAGE_PATTERN;});var pageConfigReceived$=main$.filter(function(_ref3){var action=_ref3.action;return[RECEIVE_PAGE_CONFIG,RECEIVE_PAGE_CONFIG_V2].includes(action.type);});/**
  * Emits when a "page" was opened, and its config is available.
  */export var pageIsReady$=pageDidEnter$// Do not track while PWA webview is in the background
 .filter(function(_ref4){var getState=_ref4.getState;return getIsAppWebViewVisible(getState());}).switchMap(function(data){var action=data.action,getState=data.getState;var pageId=action.route.params.pageId;// Check if the page config for the current route is already available within Redux.
-var pageConfig=getPageConfigById(getState(),{pageId:pageId});if(!pageConfig||pageConfig.isFetching){// Wait for incoming page data if it's not available yet.
+var pageConfig=makeGetUnifiedCMSPageData({slug:pageId})(getState());if(!pageConfig||pageConfig.isFetching){// Wait for incoming page data if it's not available yet.
 return pageConfigReceived$.first().switchMap(function(){return Observable.of(data);});}return Observable.of(data);}).merge(pageRouteReappeared$);