@shopgate/pwa-common-commerce 7.34.0-beta.4 → 7.34.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common-commerce",
-  "version": "7.34.0-beta.4",
+  "version": "7.34.0-beta.6",
   "description": "Commerce library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -23,8 +23,8 @@
     "reselect": "^4.1.8"
   },
   "devDependencies": {
-    "@shopgate/pwa-common": "7.34.0-beta.4",
-    "@shopgate/pwa-core": "7.34.0-beta.4",
+    "@shopgate/pwa-common": "7.34.0-beta.6",
+    "@shopgate/pwa-core": "7.34.0-beta.6",
     "@types/lodash": "^4.17.25",
     "lodash": "^4.18.1",
     "react": "^17.0.2",

package/reviews/streams/index.js

@@ -3,6 +3,8 @@ import { RESET_APP } from '@shopgate/pwa-common/constants/ActionTypes';
 import { RESET_APP_REDUCERS } from '@shopgate/pwa-common/constants/Configuration';
 import configuration from '@shopgate/pwa-common/collections/Configuration';
 import { routeWillEnter$, routeWillLeave$ } from '@shopgate/pwa-common/streams/router';
+import { RECEIVE_APP_SETTINGS } from '@shopgate/engage/settings/constants/appSettings';
+import { getShowReviews } from '@shopgate/engage/settings/selectors/appSettings';
 import { ITEM_PATH, RECEIVE_PRODUCT, RECEIVE_PRODUCT_CACHED } from '@shopgate/pwa-common-commerce/product/constants';
 import { REQUEST_SUBMIT_REVIEW, RECEIVE_SUBMIT_REVIEW, ERROR_SUBMIT_REVIEW, RESET_SUBMIT_REVIEW } from "../constants";
 export const reviewsWillEnter$ = routeWillEnter$.filter(({
@@ -60,4 +62,14 @@ export const reviewsDidReset$ = main$.filter(({
   }
   const resetReducers = action.reducers || configuration.get(RESET_APP_REDUCERS);
   return Array.isArray(resetReducers) && resetReducers.includes('reviews');
-});
+});
+
+/**
+ * Gets triggered when received app settings switch the reviews on.
+ * @type {Observable}
+ */
+export const reviewsDidEnable$ = main$.filter(({
+  action,
+  prevState,
+  getState
+}) => action.type === RECEIVE_APP_SETTINGS && !getShowReviews(prevState) && getShowReviews(getState()));

package/reviews/subscriptions/index.js

@@ -1,32 +1,44 @@
-import appConfig from '@shopgate/pwa-common/helpers/config';
 import { appWillStart$ } from '@shopgate/engage/core/streams';
+import { getShowReviews } from '@shopgate/engage/settings/selectors/appSettings';
 import fetchProductReviews from "../actions/fetchProductReviews";
 import fetchProductReviewSettings from "../actions/fetchProductReviewSettings";
 import { REVIEW_PREVIEW_COUNT } from "../constants";
-import { reviewsDidReset$, shouldFetchReviews$ } from "../streams";
+import { reviewsDidEnable$, reviewsDidReset$, shouldFetchReviews$ } from "../streams";
 
 /**
  * Review subscriptions.
  * @param {Function} subscribe The subscribe function.
  */
 export default function product(subscribe) {
-  if (!appConfig.hasReviews) {
-    return;
-  }
   subscribe(appWillStart$, ({
-    dispatch
+    dispatch,
+    getState
   }) => {
-    dispatch(fetchProductReviewSettings());
+    if (getShowReviews(getState())) {
+      dispatch(fetchProductReviewSettings());
+    }
   });
   subscribe(reviewsDidReset$, ({
+    dispatch,
+    getState
+  }) => {
+    if (getShowReviews(getState())) {
+      dispatch(fetchProductReviewSettings());
+    }
+  });
+  subscribe(reviewsDidEnable$, ({
     dispatch
   }) => {
     dispatch(fetchProductReviewSettings());
   });
   subscribe(shouldFetchReviews$, ({
     action,
-    dispatch
+    dispatch,
+    getState
   }) => {
+    if (!getShowReviews(getState())) {
+      return;
+    }
     dispatch(fetchProductReviewSettings());
     if (action.productData) {
       const {