thm-p3-configurator 0.0.147 → 0.0.149

package/dist/src/shared/__components__/NavigationSteps.js

@@ -12,6 +12,8 @@ require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
+var _constants__ = require("../__constants__");
+var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
@@ -47,6 +49,14 @@ const NavigationSteps = _ref => {
     onClick = () => {}
   } = _ref;
   const [stepNumber, setStepNumber] = (0, _react.useState)(defaultActiveStep);
+  const [{
+    selectedCableset,
+    selectedTowbar,
+    selectedCombiset,
+    currentDossierType,
+    existingDossierType,
+    selectedBranch
+  }] = (0, _OrderSessionContext.useOrderSession)();
   const handleClick = _ref2 => {
     let {
       to,
@@ -60,6 +70,16 @@ const NavigationSteps = _ref => {
       stepNumber
     });
   };
+  const currentType = currentDossierType || existingDossierType || _constants__.DOSSIER_TYPES.PlannedAppointment;
+  const hasCableSetAndTowbar = selectedCableset && selectedTowbar || selectedCombiset;
+  const isStepDisabled = index => {
+    if (index >= 0 && index <= 2) return !hasCableSetAndTowbar;
+    if (index === 3) {
+      const needsBranch = currentType === _constants__.DOSSIER_TYPES.PlannedAppointment || currentType === _constants__.DOSSIER_TYPES.AppointmentRequest;
+      return !hasCableSetAndTowbar || needsBranch && !selectedBranch;
+    }
+    return false;
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12')
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -74,7 +94,7 @@ const NavigationSteps = _ref => {
     } = _ref3;
     return /*#__PURE__*/_react.default.createElement(_reactRouterDom.NavLink, {
       key: title,
-      className: "".concat((0, _helpers__.withStyle)('btn'), " ").concat(isEveryStepActive || stepNumber >= index ? (0, _helpers__.withStyle)('active') : '', "  ").concat(index > 0 && isNavigationDisabled ? (0, _helpers__.withStyle)('disabled') : '', " "),
+      className: "".concat((0, _helpers__.withStyle)('btn'), " ").concat(isEveryStepActive || stepNumber >= index ? (0, _helpers__.withStyle)('active') : '', " ").concat(index > stepNumber && isStepDisabled(index) || index > 0 && isNavigationDisabled ? (0, _helpers__.withStyle)('disabled') : ''),
       onClick: () => handleClick({
         to,
         title,

package/dist/src/shared/__components__/ProductCard/index.js

@@ -12,7 +12,6 @@ require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _queries = require("../../__api__/queries");
-var _constants__ = require("../../__constants__");
 var _helpers__ = require("../../__helpers__");
 var _ProductCardCheckbox = _interopRequireDefault(require("./ProductCardCheckbox"));
 var _ProductCardDescription = _interopRequireDefault(require("./ProductCardDescription"));
@@ -22,6 +21,7 @@ var _ProductCardPrice = _interopRequireDefault(require("./ProductCardPrice"));
 var _ProductCardRibbon = _interopRequireDefault(require("./ProductCardRibbon"));
 var _ProductCardSpecifications = _interopRequireDefault(require("./ProductCardSpecifications"));
 var _ProductCardUsps = _interopRequireDefault(require("./ProductCardUsps"));
+var _constants__ = require("../../__constants__");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -98,12 +98,10 @@ const ProductCard = _ref => {
     setIsSelected(defaultSelected);
   }, [defaultSelected]);
   (0, _react.useEffect)(() => {
-    // Only auto-select if it's the only product in the category
-    // Remove auto-selection of recommended products when there are multiple products
-    if (isOnlyProductInCategory) {
+    if (isOnlyProductInCategory || !isAnotherProductSelected && isRecommended) {
       handleSelected(true);
     }
-  }, [isOnlyProductInCategory]);
+  }, [isOnlyProductInCategory, isRecommended]);
   return /*#__PURE__*/_react.default.createElement("div", {
     key: productId,
     className: (0, _helpers__.withStyle)("card card__horizontal card__link ".concat(isSelected ? 'active' : '', " container-fluid g-0")),

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

@@ -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,
@@ -217,7 +255,7 @@ const ProductsOverview = () => {
       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,
@@ -236,9 +274,6 @@ const ProductsOverview = () => {
           price: product === null || product === void 0 ? void 0 : product.price
         });
       }
-
-      // Only preselect when it's the only product in its category
-      const shouldPreselect = productsPerCategory.length === 1;
       return /*#__PURE__*/_react.default.createElement(_ProductCard.default, {
         isTmg: isTmg,
         stock: product === null || product === void 0 || (_product$locationPric = product.locationPrices) === null || _product$locationPric === void 0 ? void 0 : _product$locationPric.stock,
@@ -262,9 +297,9 @@ 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),
+        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,
         isAnotherProductSelected: isAnotherProductSelected,
-        isOnlyProductInCategory: shouldPreselect,
+        isOnlyProductInCategory: false,
         onSelect: _ref5 => {
           let {
             productId,

package/package.json

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