@shopgate/pwa-common-commerce 7.30.1-beta.4 → 7.30.2-beta.1

package/category/action-creators/receiveCategories.js

@@ -0,0 +1,13 @@
+import { RECEIVE_CATEGORIES } from "../constants";
+
+/**
+ * Action to put multiple categories into the redux store with a single dispatch.
+ * @param {Object[]} categories The received categories.
+ * @return {Object} The RECEIVE_CATEGORIES action.
+ */
+const receiveCategories = categories => ({
+  type: RECEIVE_CATEGORIES,
+  categories,
+  products: []
+});
+export default receiveCategories;

package/category/constants/index.js

@@ -11,6 +11,7 @@ export const RECEIVE_ROOT_CATEGORIES = 'RECEIVE_ROOT_CATEGORIES';
 export const ERROR_ROOT_CATEGORIES = 'ERROR_ROOT_CATEGORIES';
 export const REQUEST_CATEGORY = 'REQUEST_CATEGORY';
 export const RECEIVE_CATEGORY = 'RECEIVE_CATEGORY';
+export const RECEIVE_CATEGORIES = 'RECEIVE_CATEGORIES';
 export const ERROR_CATEGORY = 'ERROR_CATEGORY';
 export const REQUEST_CATEGORY_CHILDREN = 'REQUEST_CATEGORY_CHILDREN';
 export const RECEIVE_CATEGORY_CHILDREN = 'RECEIVE_CATEGORY_CHILDREN';

package/category/reducers/categoriesById.js

@@ -1,69 +1,96 @@
+import { produce } from 'immer';
 import { ENOTFOUND } from '@shopgate/pwa-core/constants/Pipeline';
-import { CATEGORY_LIFETIME, RECEIVE_ROOT_CATEGORIES, REQUEST_CATEGORY, RECEIVE_CATEGORY, RECEIVE_CATEGORY_CHILDREN, ERROR_CATEGORY } from "../constants";
+import { CATEGORY_LIFETIME, RECEIVE_ROOT_CATEGORIES, REQUEST_CATEGORY, RECEIVE_CATEGORY, RECEIVE_CATEGORIES, RECEIVE_CATEGORY_CHILDREN, ERROR_CATEGORY } from "../constants";
 import handleCategoryCollection from "./helpers/handleCategoryCollection";
 
+/**
+ * Inserts a category into the draft state.
+ * @param {Object} draft The draft state to modify.
+ * @param {string} categoryId The ID of the category to insert.
+ * @param {Object} categoryData The data of the category to insert.
+ * @param {Array} categoryChildren The children of the category to insert.
+ */
+const insertCategory = (draft, categoryId, categoryData, categoryChildren) => {
+  const entry = draft[categoryId] ?? (draft[categoryId] = {});
+  Object.assign(entry, categoryData, {
+    expires: Date.now() + CATEGORY_LIFETIME,
+    isFetching: false
+  });
+  const collected = handleCategoryCollection(categoryChildren);
+  if (collected && typeof collected === 'object') {
+    Object.assign(draft, collected);
+  }
+};
+
 /**
  * Stores categories by their ID.
  * @param {Object} [state={}] The current state.
  * @param {Object} action The action object.
  * @return {Object} The new state.
  */
-const categoriesById = (state = {}, action = {}) => {
+const categoriesById = (state = {}, action = {}) => produce(state, draft => {
   switch (action.type) {
     case REQUEST_CATEGORY:
-      return {
-        ...state,
-        [action.categoryId]: {
-          ...state[action.categoryId],
-          expires: 0,
-          isFetching: true
-        }
-      };
+      {
+        const entry = draft[action.categoryId] ?? (draft[action.categoryId] = {});
+        entry.expires = 0;
+        entry.isFetching = true;
+        break;
+      }
     case RECEIVE_CATEGORY:
       {
+        // Strip children from category data. They are handled by the childrenByCategoryId reducer.
         const {
           children: ignore,
           ...categoryData
-        } = action.categoryData;
-        return {
-          ...state,
-          [action.categoryId]: {
-            ...state[action.categoryId],
-            ...categoryData,
-            expires: Date.now() + CATEGORY_LIFETIME,
-            isFetching: false
-          },
-          ...handleCategoryCollection(action.categoryChildren)
-        };
+        } = action.categoryData || {};
+        insertCategory(draft, action.categoryId, categoryData, action.categoryChildren);
+        break;
+      }
+    case RECEIVE_CATEGORIES:
+      {
+        const categories = action.categories || [];
+        categories.forEach(category => {
+          const {
+            children: ignore,
+            ...categoryData
+          } = category || {};
+          insertCategory(draft, category.id, categoryData, category.children);
+        });
+        break;
       }
     case RECEIVE_ROOT_CATEGORIES:
-      return {
-        ...state,
-        ...handleCategoryCollection(action.categories)
-      };
+      {
+        const collected = handleCategoryCollection(action.categories);
+        if (collected && typeof collected === 'object') {
+          Object.assign(draft, collected);
+        }
+        break;
+      }
     case RECEIVE_CATEGORY_CHILDREN:
-      return {
-        ...state,
-        ...handleCategoryCollection(action.categoryChildren)
-      };
-    case ERROR_CATEGORY:
-      if (action.errorCode === ENOTFOUND) {
-        // Remove the temporary entry from the state when noting was found for the categoryId.
-        const {
-          [action.categoryId]: ignore,
-          ...rest
-        } = state;
-        return rest;
+      {
+        const collected = handleCategoryCollection(action.categoryChildren);
+        if (collected && typeof collected === 'object') {
+          Object.assign(draft, collected);
+        }
+        break;
       }
-      return {
-        ...state,
-        [action.categoryId]: {
-          ...state[action.categoryId],
-          isFetching: false
+    case ERROR_CATEGORY:
+      {
+        if (action.errorCode === ENOTFOUND) {
+          // Remove the temporary entry from the state when nothing was found for the categoryId.
+          delete draft[action.categoryId];
+          break;
+        }
+        const entry = draft[action.categoryId];
+        if (!entry) {
+          break;
         }
-      };
+        entry.isFetching = false;
+        break;
+      }
     default:
-      return state;
+      break;
   }
-};
+});
 export default categoriesById;

package/category/reducers/childrenByCategoryId.js

@@ -1,5 +1,19 @@
+import { produce } from 'immer';
 import { ENOTFOUND } from '@shopgate/pwa-core/constants/Pipeline';
-import { CATEGORY_LIFETIME, REQUEST_CATEGORY, RECEIVE_CATEGORY, REQUEST_CATEGORY_CHILDREN, RECEIVE_CATEGORY_CHILDREN, ERROR_CATEGORY, ERROR_CATEGORY_CHILDREN } from "../constants";
+import { CATEGORY_LIFETIME, REQUEST_CATEGORY, RECEIVE_CATEGORY, RECEIVE_CATEGORIES, REQUEST_CATEGORY_CHILDREN, RECEIVE_CATEGORY_CHILDREN, ERROR_CATEGORY, ERROR_CATEGORY_CHILDREN } from "../constants";
+
+/**
+ * Inserts the given category children into the draft state for the given category ID.
+ * @param {Object} draft The draft state to modify.
+ * @param {string} categoryId The ID of the category to insert children for.
+ * @param {Array} categoryChildren The children to insert.
+ */
+const insertChildren = (draft, categoryId, categoryChildren) => {
+  const entry = draft[categoryId] ?? (draft[categoryId] = {});
+  entry.children = categoryChildren ? categoryChildren.map(child => child.id) : null;
+  entry.isFetching = false;
+  entry.expires = Date.now() + CATEGORY_LIFETIME;
+};
 
 /**
  * Stores a collection of child category IDs by their parent's category ID.
@@ -7,53 +21,48 @@ import { CATEGORY_LIFETIME, REQUEST_CATEGORY, RECEIVE_CATEGORY, REQUEST_CATEGORY
  * @param {Object} action The action object.
  * @returns {Object} The new state.
  */
-const childrenByCategoryId = (state = {}, action = {}) => {
+const childrenByCategoryId = (state = {}, action = {}) => produce(state, draft => {
   switch (action.type) {
     case REQUEST_CATEGORY:
     case REQUEST_CATEGORY_CHILDREN:
-      return {
-        ...state,
-        [action.categoryId]: {
-          ...state[action.categoryId],
-          children: null,
-          isFetching: true,
-          expires: 0
-        }
-      };
+      {
+        const entry = draft[action.categoryId] ?? (draft[action.categoryId] = {});
+        entry.children = null;
+        entry.isFetching = true;
+        entry.expires = 0;
+        break;
+      }
     case RECEIVE_CATEGORY:
     case RECEIVE_CATEGORY_CHILDREN:
       {
-        const actionChildren = action.categoryChildren;
-        return {
-          ...state,
-          [action.categoryId]: {
-            ...state[action.categoryId],
-            // If it has children, append them.
-            children: actionChildren ? action.categoryChildren.map(child => child.id) : null,
-            isFetching: false,
-            expires: Date.now() + CATEGORY_LIFETIME
-          }
-        };
+        insertChildren(draft, action.categoryId, action.categoryChildren);
+        break;
+      }
+    case RECEIVE_CATEGORIES:
+      {
+        const categories = action.categories || [];
+        categories.forEach(category => {
+          insertChildren(draft, category.id, category.children);
+        });
+        break;
       }
     case ERROR_CATEGORY:
     case ERROR_CATEGORY_CHILDREN:
-      if (action.errorCode === ENOTFOUND) {
-        // Remove the temporary entry from the state when noting was found for the categoryId.
-        const {
-          [action.categoryId]: ignore,
-          ...rest
-        } = state;
-        return rest;
-      }
-      return {
-        ...state,
-        [action.categoryId]: {
-          ...state[action.categoryId],
-          isFetching: false
+      {
+        if (action.errorCode === ENOTFOUND) {
+          // Remove the temporary entry from the state when nothing was found for the categoryId.
+          delete draft[action.categoryId];
+          break;
         }
-      };
+        const entry = draft[action.categoryId];
+        if (!entry) {
+          break;
+        }
+        entry.isFetching = false;
+        break;
+      }
     default:
-      return state;
+      break;
   }
-};
+});
 export default childrenByCategoryId;

package/category/reducers/rootCategories.js

@@ -1,3 +1,4 @@
+import { produce } from 'immer';
 import { CATEGORY_LIFETIME, REQUEST_ROOT_CATEGORIES, RECEIVE_ROOT_CATEGORIES, ERROR_ROOT_CATEGORIES } from "../constants";
 import handleReceivedCategories from "./helpers/handleReceivedCategories";
 
@@ -5,32 +6,26 @@ import handleReceivedCategories from "./helpers/handleReceivedCategories";
  * Stores a collection of category IDs that represent the
  * highest level of categories with no parent.
  * @param {Object} [state={}] The current application state.
- * @param {Object} action The action object.
+ * @param {Object} [action={}] The action object.
  * @return {Object} The store data.
  */
-const rootCategories = (state = {}, action = {}) => {
+const rootCategories = (state = {}, action = {}) => produce(state, draft => {
   switch (action.type) {
     case REQUEST_ROOT_CATEGORIES:
-      return {
-        ...state,
-        categories: null,
-        expires: 0,
-        isFetching: true
-      };
+      draft.categories = null;
+      draft.expires = 0;
+      draft.isFetching = true;
+      break;
     case RECEIVE_ROOT_CATEGORIES:
-      return {
-        ...state,
-        categories: handleReceivedCategories(action.categories),
-        expires: Date.now() + CATEGORY_LIFETIME,
-        isFetching: false
-      };
+      draft.categories = handleReceivedCategories(action.categories);
+      draft.expires = Date.now() + CATEGORY_LIFETIME;
+      draft.isFetching = false;
+      break;
     case ERROR_ROOT_CATEGORIES:
-      return {
-        ...state,
-        isFetching: false
-      };
+      draft.isFetching = false;
+      break;
     default:
-      return state;
+      break;
   }
-};
+});
 export default rootCategories;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common-commerce",
-  "version": "7.30.1-beta.4",
+  "version": "7.30.2-beta.1",
   "description": "Commerce library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -15,12 +15,13 @@
     "connect"
   ],
   "dependencies": {
+    "immer": "^11.1.3",
     "react-cookie": "^4.0.3",
     "reselect": "^4.1.8"
   },
   "devDependencies": {
-    "@shopgate/pwa-common": "7.30.1-beta.4",
-    "@shopgate/pwa-core": "7.30.1-beta.4",
+    "@shopgate/pwa-common": "7.30.2-beta.1",
+    "@shopgate/pwa-core": "7.30.2-beta.1",
     "lodash": "^4.17.23",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"