thm-p3-configurator 0.0.84 → 0.0.86

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

@@ -93,7 +93,6 @@ const BottomNavigationBar = () => {
     selectedCombiset,
     selectedBranch,
     existingDossierType,
-    existingDossierId,
     allowLocationChange,
     currentDossierType
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
@@ -115,7 +114,7 @@ const BottomNavigationBar = () => {
   }, APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col-12 mt-2 mb-1')
   }, /*#__PURE__*/_react.default.createElement(_InternalPriceCalculationSelector.default, null)), buttons.map(_ref2 => {
-    var _history$location3;
+    var _history$location3, _history$location4;
     let {
       to,
       label,
@@ -147,12 +146,6 @@ const BottomNavigationBar = () => {
             currentDossierType: setType
           }
         });
-        console.log({
-          type: _OrderSessionContext.orderSessionActions.SET_CURRENT_DOSSIER_TYPE,
-          payload: {
-            currentDossierType: setType
-          }
-        });
       }
     }, {
       type: type,
@@ -161,7 +154,7 @@ const BottomNavigationBar = () => {
       state: {
         prevPathName: history.location.pathname
       },
-      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.pathname) === '/configurator/montagelocatie' && !selectedBranch
+      isDisabled: !(existingDossierType === _constants__.DOSSIER_TYPES.Quotation && (history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.pathname) === '/configurator/montagelocatie') && ((!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location4 = history.location) === null || _history$location4 === void 0 ? void 0 : _history$location4.pathname) === '/configurator/montagelocatie' && !selectedBranch)
     })));
   })))));
 };

package/dist/src/shared/__containers__/internal/InternalSingleOrderFilters.js

@@ -7,7 +7,7 @@ require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = InternalSingleOrderFilters;
+exports.default = void 0;
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
@@ -53,7 +53,7 @@ function _interopRequireWildcard(e, r) {
   }
   return n.default = e, t && t.set(e, n), n;
 }
-function InternalSingleOrderFilters(_ref) {
+const InternalSingleOrderFilters = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
     onFilterChange,
     openModal,
@@ -61,8 +61,10 @@ function InternalSingleOrderFilters(_ref) {
   } = _ref;
   const baseFormula = (0, _FormulaContext.useFormula)();
   const [{
-    singleOrderFormulaCode
-  }, _] = (0, _OrderSessionContext.useOrderSession)();
+    singleOrderFormulaCode,
+    licensePlate,
+    model
+  }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = baseFormula;
   if (singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
@@ -90,35 +92,58 @@ function InternalSingleOrderFilters(_ref) {
   const [selectedArticleSubGroup, setSelectedArticleSubGroup] = (0, _react.useState)('');
   const [selectedArticleNumber, setSelectedArticleNumber] = (0, _react.useState)('');
   const [showAllArticles, setShowAllArticles] = (0, _react.useState)(false);
-  const handleResetFilters = () => {
+  const resetLicensePlateFilters = () => {
+    if (licensePlate || model) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.RESET_LICENSEPLATE_FILTERS
+      });
+    }
+  };
+  const handleResetFilters = function handleResetFilters() {
+    let dontReset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     setSelectedArticleType('');
     setSelectedArticleGroup('');
     setSelectedArticleSubGroup('');
     setSelectedArticleNumber('');
     setShowAllArticles(false);
-    resetFilters();
+    if (!dontReset) {
+      resetFilters();
+    }
   };
+  (0, _react.useImperativeHandle)(ref, () => ({
+    resetFilters: dontReset => handleResetFilters(dontReset)
+  }));
   (0, _react.useEffect)(() => {
-    onFilterChange('type', selectedArticleType);
+    if (!licensePlate && !model) {
+      onFilterChange('type', selectedArticleType);
+    }
     if (!selectedArticleType) {
       setSelectedArticleGroup('');
       setSelectedArticleSubGroup('');
     }
   }, [selectedArticleType]);
   (0, _react.useEffect)(() => {
-    onFilterChange('group', selectedArticleGroup);
+    if (!licensePlate && !model) {
+      onFilterChange('group', selectedArticleGroup);
+    }
     if (!selectedArticleGroup) {
       setSelectedArticleSubGroup('');
     }
   }, [selectedArticleGroup]);
   (0, _react.useEffect)(() => {
-    onFilterChange('showAllArticles', showAllArticles);
+    if (!licensePlate && !model) {
+      onFilterChange('showAllArticles', showAllArticles);
+    }
   }, [showAllArticles]);
   (0, _react.useEffect)(() => {
-    onFilterChange('subgroup', selectedArticleSubGroup);
+    if (!licensePlate && !model) {
+      onFilterChange('subgroup', selectedArticleSubGroup);
+    }
   }, [selectedArticleSubGroup]);
   (0, _react.useEffect)(() => {
-    onFilterChange('articleNumber', selectedArticleNumber);
+    if (!licensePlate && !model) {
+      onFilterChange('articleNumber', selectedArticleNumber);
+    }
   }, [selectedArticleNumber]);
   const {
     articleGroups,
@@ -136,7 +161,7 @@ function InternalSingleOrderFilters(_ref) {
     className: (0, _helpers__.withStyle)('card-body d-flex justify-content-between align-items-center')
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, "Filters"), /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
     label: "Reset filters",
-    onClick: handleResetFilters
+    onClick: () => handleResetFilters(false)
   })), /*#__PURE__*/_react.default.createElement(_OutlinedButton.default, {
     label: "Filter op auto",
     icon: "fa fa-car",
@@ -162,7 +187,10 @@ function InternalSingleOrderFilters(_ref) {
     initialValue: selectedArticleType,
     label: "Artikel soort",
     placeholder: "Maak een keuze",
-    onChange: option => setSelectedArticleType(option.value),
+    onChange: option => {
+      resetLicensePlateFilters();
+      setSelectedArticleType(option.value);
+    },
     className: "w-100"
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('col')
@@ -178,6 +206,7 @@ function InternalSingleOrderFilters(_ref) {
     label: "Artikel groep",
     placeholder: "Maak een keuze",
     onChange: option => {
+      resetLicensePlateFilters();
       setSelectedArticleGroup(option.value);
       setSelectedArticleSubGroup('');
     },
@@ -196,6 +225,7 @@ function InternalSingleOrderFilters(_ref) {
     label: "Artikel subgroep",
     placeholder: "Maak een keuze",
     onChange: option => {
+      resetLicensePlateFilters();
       setSelectedArticleSubGroup(option.value);
     },
     className: "w-100"
@@ -206,12 +236,19 @@ function InternalSingleOrderFilters(_ref) {
     value: selectedArticleNumber,
     label: "Artikel nummer",
     placeholder: "Zoeken",
-    onChange: value => setSelectedArticleNumber(value),
+    onChange: value => {
+      resetLicensePlateFilters();
+      setSelectedArticleNumber(value);
+    },
     className: "w-100"
   })), isTmg && /*#__PURE__*/_react.default.createElement(_CheckboxInput.default, {
     name: 'showAllArticles',
     initialValue: showAllArticles,
-    onChange: value => setShowAllArticles(value),
+    onChange: value => {
+      resetLicensePlateFilters();
+      setShowAllArticles(value);
+    },
     label: "Toon alle artikelen"
   }))));
-}
+});
+var _default = exports.default = InternalSingleOrderFilters;

package/dist/src/shared/__pages__/internal/InternalSingleOrderPage.js

@@ -123,6 +123,7 @@ const InternalSingleOrderPage = () => {
     page: 0
   });
   const customerFormRef = (0, _react.useRef)();
+  const filtersRef = (0, _react.useRef)();
   const {
     createSingleOrder,
     isCreatingSingleOrder,
@@ -212,7 +213,11 @@ const InternalSingleOrderPage = () => {
       });
     }
   };
+  const [filtersResetTrigger, setFiltersResetTrigger] = (0, _react.useState)(false);
   const filterModelOrLicenseplate = filter => {
+    var _filtersRef$current;
+    (_filtersRef$current = filtersRef.current) === null || _filtersRef$current === void 0 || _filtersRef$current.resetFilters(true);
+    resetFilters();
     if (filter.type === 'model') {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MODEL,
@@ -280,6 +285,7 @@ const InternalSingleOrderPage = () => {
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('container page-content')
   }, showProductOverview && /*#__PURE__*/_react.default.createElement(_InternalSingleOrderFilters.default, {
+    ref: filtersRef,
     resetFilters: resetFilters,
     onFilterChange: handleSelectedFilterChange,
     openModal: () => setIsLicenseplateModalOpen(true)

package/package.json

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