thm-p3-configurator 0.0.148 → 0.0.150

package/dist/src/shared/__containers__/ProductsOverview.js

@@ -28,17 +28,17 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactRouter = require("react-router");
 var _logoPrimary = _interopRequireDefault(require("../../../public/assets/images/logo-primary.png"));
 var _queries = require("../__api__/queries");
+var _CheckboxInput = _interopRequireDefault(require("../__components__/Form/CheckboxInput"));
 var _ProductCard = _interopRequireDefault(require("../__components__/ProductCard"));
 var _FullPageSpinner = _interopRequireDefault(require("../__components__/Spinners/FullPageSpinner"));
 var _constants__ = require("../__constants__");
 var _FormulaContext = require("../__context__/FormulaContext");
-var _useIsTmg = require("../__hooks__/useIsTmg");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
 var _product = require("../__helpers__/product");
+var _useIsTmg = require("../__hooks__/useIsTmg");
 var _BoardComputerCard = _interopRequireDefault(require("./BoardComputerCard"));
-var _CheckboxInput = _interopRequireDefault(require("../__components__/Form/CheckboxInput"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -141,6 +141,15 @@ const ProductsOverview = () => {
     switch (productCategory) {
       case _constants__.PRODUCT_CATEGORIES.TOWBAR:
         {
+          // When selecting a towbar, deselect any combiset
+          if (isSelected && selectedCombiset) {
+            dispatch({
+              type: _OrderSessionContext.orderSessionActions.SET_SELECTED_COMBISET,
+              payload: {
+                combisetId: null
+              }
+            });
+          }
           dispatch({
             type: _OrderSessionContext.orderSessionActions.SET_SELECTED_TOWBAR,
             payload: {
@@ -151,6 +160,15 @@ const ProductsOverview = () => {
         }
       case _constants__.PRODUCT_CATEGORIES.CABLESET:
         {
+          // When selecting a cableset, deselect any combiset
+          if (isSelected && selectedCombiset) {
+            dispatch({
+              type: _OrderSessionContext.orderSessionActions.SET_SELECTED_COMBISET,
+              payload: {
+                combisetId: null
+              }
+            });
+          }
           dispatch({
             type: _OrderSessionContext.orderSessionActions.SET_SELECTED_CABLESET,
             payload: {
@@ -161,6 +179,25 @@ const ProductsOverview = () => {
         }
       case _constants__.PRODUCT_CATEGORIES.COMBISET:
         {
+          // When selecting a combiset, deselect any towbar and cableset
+          if (isSelected) {
+            if (selectedTowbar) {
+              dispatch({
+                type: _OrderSessionContext.orderSessionActions.SET_SELECTED_TOWBAR,
+                payload: {
+                  towbarId: null
+                }
+              });
+            }
+            if (selectedCableset) {
+              dispatch({
+                type: _OrderSessionContext.orderSessionActions.SET_SELECTED_CABLESET,
+                payload: {
+                  cabelsetId: null
+                }
+              });
+            }
+          }
           dispatch({
             type: _OrderSessionContext.orderSessionActions.SET_SELECTED_COMBISET,
             payload: {
@@ -188,6 +225,7 @@ const ProductsOverview = () => {
 
   // Filter out Extras category from products object
   delete products[_constants__.PRODUCT_CATEGORIES.EXTRAS];
+  console.log(selectedBoardComputer, selectedCableset, selectedCombiset, selectedTowbar);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isTmg && /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: 'skipFilters',
     initialValue: skipFilters,
@@ -213,11 +251,11 @@ const ProductsOverview = () => {
         category: productCategory
       });
 
-      // Check if another product within the same category has already been selected -> Used to prevent auto-selection of recommended product when the user already choose a different product
+      // Check if another product within the same category has already been selected
       const isAnotherProductSelected = productsPerCategory.some(otherProduct => [selectedCableset, selectedCombiset, selectedTowbar].includes(otherProduct.articleNumber) && otherProduct.articleNumber !== product.articleNumber);
       if (productCategory === _constants__.PRODUCT_CATEGORIES.BOARD_COMPUTER && selectedCableset) {
         return /*#__PURE__*/_react.default.createElement(_BoardComputerCard.default, {
-          defaultSelected: !isBoardComputerDeselected || selectedBoardComputer === product.articleNumber,
+          defaultSelected: selectedBoardComputer === product.articleNumber,
           onSelect: _ref4 => {
             let {
               productId,
@@ -259,9 +297,12 @@ const ProductsOverview = () => {
           imageId: product === null || product === void 0 || (_product$images2 = product.images) === null || _product$images2 === void 0 ? void 0 : _product$images2[0]
         }) : _logoPrimary.default,
         isDisabled: false,
-        defaultSelected: [selectedCableset, selectedCombiset, selectedTowbar].includes(product.articleNumber),
-        isAnotherProductSelected: isAnotherProductSelected,
-        isOnlyProductInCategory: productsPerCategory.length === 1,
+        defaultSelected: productCategory === _constants__.PRODUCT_CATEGORIES.TOWBAR && selectedTowbar === product.articleNumber || productCategory === _constants__.PRODUCT_CATEGORIES.CABLESET && selectedCableset === product.articleNumber || productCategory === _constants__.PRODUCT_CATEGORIES.COMBISET && selectedCombiset === product.articleNumber
+        // Set both to false to prevent auto-selection when navigating back
+        ,
+
+        isAnotherProductSelected: true,
+        isOnlyProductInCategory: false,
         onSelect: _ref5 => {
           let {
             productId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.148",
+  "version": "0.0.150",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",