thm-p3-configurator 0.0.54 → 0.0.55

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

@@ -56,6 +56,7 @@ function _interopRequireWildcard(e, r) {
   return n.default = e, t && t.set(e, n), n;
 }
 const LicensePlateForm = _ref => {
+  var _ref2;
   let {
     initialValue,
     onSubmit,
@@ -66,6 +67,7 @@ const LicensePlateForm = _ref => {
     licensePlate,
     discountCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const [filterLicensePlate, setFilterLicensePlate] = (0, _react.useState)(initialValue || '');
   const history = (0, _reactRouter.useHistory)();
   const formula = (0, _FormulaContext.useFormula)();
   if (!isFilter) {
@@ -85,22 +87,25 @@ const LicensePlateForm = _ref => {
   }, [initialValue]);
   const handleManualSwitch = () => {
     if (!isFilter) {
-      history.push("/configurator/manual".concat(searchParams !== null && searchParams !== void 0 && searchParams.size ? "?".concat(searchParams.toString()) : '') // append search params if found
-      );
+      history.push("/configurator/manual".concat(searchParams !== null && searchParams !== void 0 && searchParams.size ? "?".concat(searchParams.toString()) : ''));
     } else {
       filterModalChange(1);
     }
   };
   const handleLicensePlateChange = value => {
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_LICENSE_PLATE,
-      payload: {
-        licensePlate: value
-      }
-    });
+    if (!isFilter) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_LICENSE_PLATE,
+        payload: {
+          licensePlate: value
+        }
+      });
+    } else {
+      setFilterLicensePlate(value);
+    }
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_LicensePlateInput.default, {
-    initialValue: licensePlate,
+    initialValue: isFilter ? (_ref2 = filterLicensePlate !== null && filterLicensePlate !== void 0 ? filterLicensePlate : licensePlate) !== null && _ref2 !== void 0 ? _ref2 : '' : licensePlate !== null && licensePlate !== void 0 ? licensePlate : '',
     isReadOnly: false,
     onChange: handleLicensePlateChange,
     onSubmit: onSubmit
@@ -124,9 +129,12 @@ const LicensePlateForm = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_PrimaryButton.default, {
     className: (0, _helpers__.withStyle)('btn btn-primary'),
     type: "button",
-    onClick: onSubmit,
-    isDisabled: !licensePlate || (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) < 6,
-    label: isFilter ? 'Sluiten' : 'Volgende'
+    onClick: () => onSubmit(isFilter ? {
+      value: filterLicensePlate,
+      type: 'licenseplate'
+    } : undefined),
+    isDisabled: !isFilter ? !licensePlate || licensePlate.length < 6 : false,
+    label: isFilter ? 'Filteren' : 'Volgende'
   })))));
 };
 var _default = exports.default = LicensePlateForm;

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

@@ -56,11 +56,11 @@ function _interopRequireWildcard(e, r) {
   return n.default = e, t && t.set(e, n), n;
 }
 const ManualSelectionForm = _ref => {
+  var _initialValues$model;
   let {
     onSubmit,
     initialValues = null,
     isFilter = false,
-    handleSelectedFilterChange = () => {},
     filterModalChange = () => {}
   } = _ref;
   const [{
@@ -69,6 +69,7 @@ const ManualSelectionForm = _ref => {
     buildYear,
     discountCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const [filterModel, setFilterModel] = (0, _react.useState)((_initialValues$model = initialValues === null || initialValues === void 0 ? void 0 : initialValues.model) !== null && _initialValues$model !== void 0 ? _initialValues$model : model);
   const {
     brands,
     isLoadingBrands
@@ -128,14 +129,15 @@ const ManualSelectionForm = _ref => {
     });
   };
   const handleModelChange = modelOption => {
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.SET_MODEL,
-      payload: {
-        model: modelOption.value
-      }
-    });
-    if (isFilter) {
-      handleSelectedFilterChange('model', modelOption.value);
+    if (!isFilter) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_MODEL,
+        payload: {
+          model: modelOption.value
+        }
+      });
+    } else {
+      setFilterModel(modelOption.value);
     }
   };
   const handleBuildYearChange = buildYearOption => {
@@ -189,7 +191,10 @@ const ManualSelectionForm = _ref => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     onChange: handleModelChange,
-    initialValue: !model ? {
+    initialValue: isFilter ? {
+      value: filterModel,
+      label: filterModel
+    } : !model ? {
       value: initialValues === null || initialValues === void 0 ? void 0 : initialValues.model,
       label: initialValues === null || initialValues === void 0 ? void 0 : initialValues.model
     } : {
@@ -213,8 +218,11 @@ const ManualSelectionForm = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_PrimaryButton.default, {
     className: (0, _helpers__.withStyle)('btn btn-primary'),
     type: "button",
-    onClick: onSubmit,
-    isDisabled: !model,
+    onClick: () => onSubmit(isFilter ? {
+      value: filterModel,
+      type: 'model'
+    } : undefined),
+    isDisabled: !model && !isFilter,
     label: isFilter ? 'Filter' : 'Sluiten'
   })))));
 };

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

@@ -63,8 +63,8 @@ function InternalLicenseplateModal(_ref) {
     onSubmit: onSubmit,
     isFilter: true
   }), activeModalType === 1 && /*#__PURE__*/_react.default.createElement(_ManualSelectionForm.default, {
-    handleSelectedFilterChange: handleSelectedFilterChange,
     filterModalChange: handleModalTypeChange,
+    handleSelectedFilterChange: handleSelectedFilterChange,
     onSubmit: onSubmit,
     isFilter: true
   })));

package/dist/src/shared/__helpers__/singleOrderArticles.js

@@ -1,6 +1,8 @@
 "use strict";
 
 require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.array.flat-map.js");
+require("core-js/modules/es.array.unscopables.flat-map.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/es.promise.js");
@@ -8,6 +10,7 @@ require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.flat-map.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
@@ -18,6 +21,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.fetchArticlesByLicensePlateAndModel = exports.fetchArticlesByFilters = exports.fetchArticlesByArticleNumbers = exports.enrichArticlesWithBrandsAndPrices = void 0;
 require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.array.flat-map.js");
+require("core-js/modules/es.array.unscopables.flat-map.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.from-entries.js");
 require("core-js/modules/es.promise.js");
@@ -25,6 +30,7 @@ require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.flat-map.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.url-search-params.js");
@@ -108,7 +114,7 @@ const fetchArticlesByFilters = async filters => {
  */
 exports.fetchArticlesByFilters = fetchArticlesByFilters;
 const fetchArticlesByLicensePlateAndModel = async (filters, formula, branchId) => {
-  var _orderData$data, _orderData$data$data$;
+  var _orderData$data;
   const queryString = new URLSearchParams((0, _index.removeNullishProps)({
     formula,
     branchId,
@@ -123,7 +129,8 @@ const fetchArticlesByLicensePlateAndModel = async (filters, formula, branchId) =
       totalCount: 0
     };
   }
-  const modelArticles = (_orderData$data$data$ = orderData.data.data.articles.extras) === null || _orderData$data$data$ === void 0 ? void 0 : _orderData$data$data$.map(formatModelArticle);
+  const articleArrays = Object.values(orderData.data.data.articles).filter(Array.isArray);
+  const modelArticles = articleArrays.flatMap(articles => articles.map(formatModelArticle));
   return {
     articles: modelArticles,
     totalCount: modelArticles.length
@@ -195,10 +202,10 @@ const enrichArticlesWithBrandsAndPrices = async (articles, branchId, formula) =>
 };
 exports.enrichArticlesWithBrandsAndPrices = enrichArticlesWithBrandsAndPrices;
 const formatModelArticle = article => {
-  var _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
+  var _ref, _article$name, _ref2, _article$description$, _article$description, _article$boldDescript, _article$boldDescript2, _article$specificatio, _article$images, _article$images2, _article$articleNumbe;
   return {
-    name: article.name,
-    description: (_article$description$ = article === null || article === void 0 || (_article$description = article.description) === null || _article$description === void 0 || (_article$description = _article$description.ops) === null || _article$description === void 0 || (_article$description = _article$description[0]) === null || _article$description === void 0 ? void 0 : _article$description.insert) !== null && _article$description$ !== void 0 ? _article$description$ : null,
+    name: (_ref = (_article$name = article.name) !== null && _article$name !== void 0 ? _article$name : article === null || article === void 0 ? void 0 : article.title) !== null && _ref !== void 0 ? _ref : null,
+    description: (_ref2 = (_article$description$ = article === null || article === void 0 || (_article$description = article.description) === null || _article$description === void 0 || (_article$description = _article$description.ops) === null || _article$description === void 0 || (_article$description = _article$description[0]) === null || _article$description === void 0 ? void 0 : _article$description.insert) !== null && _article$description$ !== void 0 ? _article$description$ : article === null || article === void 0 ? void 0 : article.remark) !== null && _ref2 !== void 0 ? _ref2 : null,
     subTitle: (_article$boldDescript = article === null || article === void 0 || (_article$boldDescript2 = article.boldDescription) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2.ops) === null || _article$boldDescript2 === void 0 || (_article$boldDescript2 = _article$boldDescript2[0]) === null || _article$boldDescript2 === void 0 ? void 0 : _article$boldDescript2.insert) !== null && _article$boldDescript !== void 0 ? _article$boldDescript : null,
     specifications: Array.isArray(article === null || article === void 0 ? void 0 : article.specifications) ? article === null || article === void 0 ? void 0 : article.specifications.join(' \n ') : (_article$specificatio = article === null || article === void 0 ? void 0 : article.specifications) !== null && _article$specificatio !== void 0 ? _article$specificatio : null,
     image: article !== null && article !== void 0 && (_article$images = article.images) !== null && _article$images !== void 0 && _article$images[0] ? (0, _image.getImageFromHyper)({
@@ -210,11 +217,11 @@ const formatModelArticle = article => {
 const formatGenericArticle = article => {
   var _article$images3, _article$images4, _article$articleNumbe2;
   const specificationPairs = [['C2 module', article === null || article === void 0 ? void 0 : article.c2Module], ['Check control', article === null || article === void 0 ? void 0 : article.checkControl], ['Direct current', article === null || article === void 0 ? void 0 : article.directCurrent], ['Draw weight', article === null || article === void 0 ? void 0 : article.drawWeight], ['D value', article === null || article === void 0 ? void 0 : article.dValue], ['Foglight shutdown', article === null || article === void 0 ? void 0 : article.foglightShutdown], ['PDC shutdown', article === null || article === void 0 ? void 0 : article.pdcShutdown], ['Switched PSU', article === null || article === void 0 ? void 0 : article.switchedPsu], ['LED', article === null || article === void 0 ? void 0 : article.led]];
-  const specification = specificationPairs.filter(_ref => {
-    let [_, value] = _ref;
+  const specification = specificationPairs.filter(_ref3 => {
+    let [_, value] = _ref3;
     return value;
-  }).map(_ref2 => {
-    let [label, value] = _ref2;
+  }).map(_ref4 => {
+    let [label, value] = _ref4;
     return "".concat(label, ": ").concat(value);
   }).join(' \n ');
   return {

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

@@ -191,7 +191,22 @@ const InternalSingleOrderPage = () => {
       });
     }
   };
-  const toggleLicenseplateModal = () => {
+  const filterModelOrLicenseplate = filter => {
+    if (filter.type === 'licenseplate') {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_LICENSE_PLATE,
+        payload: {
+          licensePlate: filter.value
+        }
+      });
+    } else {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_MODEL,
+        payload: {
+          model: filter.value
+        }
+      });
+    }
     setIsLicenseplateModalOpen(!isLicenseplateModalOpen);
   };
   const removeFromCart = (0, _react.useCallback)(articleNumber => {
@@ -230,7 +245,7 @@ const InternalSingleOrderPage = () => {
     className: (0, _helpers__.withStyle)(wrapperClass)
   }, /*#__PURE__*/_react.default.createElement(_InternalLicenseplateModal.default, {
     isOpen: isLicenseplateModalOpen,
-    onSubmit: toggleLicenseplateModal,
+    onSubmit: filterModelOrLicenseplate,
     handleSelectedFilterChange: handleSelectedFilterChange
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('container page-content')

package/package.json

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