thm-p3-configurator 0.0.35 → 0.0.37

package/dist/src/shared/__api__/queries.js

@@ -171,7 +171,7 @@ const useProductsQuery = orderParameters => {
  */
 exports.useProductsQuery = useProductsQuery;
 const useQuestionsQuery = questionParams => {
-  var _questionsQuery$error, _questionsQuery$data$, _questionsQuery$data, _questionsQuery$data$2, _questionsQuery$data2, _questionsQuery$data$3, _questionsQuery$data3;
+  var _questionsQuery$data, _questionsQuery$data2, _questionsQuery$data3, _questionsQuery$error, _questionsQuery$data$, _questionsQuery$data4, _questionsQuery$data$2, _questionsQuery$data5, _questionsQuery$data$3, _questionsQuery$data6;
   const {
     licensePlate,
     model
@@ -180,21 +180,27 @@ const useQuestionsQuery = questionParams => {
   const questionsQuery = (0, _reactQuery.useQuery)(['questions', questionsParamsString], {
     enabled: (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length),
     queryFn: () => _orderApi.orderApi.getOrder(questionsParamsString).then(res => {
-      var _res$data5, _res$data6, _res$data7;
+      var _res$data5, _res$data6, _res$data7, _res$data8, _res$data9, _res$data10;
       return {
-        durationQuestion: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 || (_res$data5 = _res$data5.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.durationAnswerOptions),
-        execution1AnswerOptions: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 || (_res$data6 = _res$data6.data) === null || _res$data6 === void 0 || (_res$data6 = _res$data6.executionAnswerOptions) === null || _res$data6 === void 0 ? void 0 : _res$data6.execution1AnswerOptions),
-        execution2AnswerOptions: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data7 = res.data) === null || _res$data7 === void 0 || (_res$data7 = _res$data7.data) === null || _res$data7 === void 0 || (_res$data7 = _res$data7.executionAnswerOptions) === null || _res$data7 === void 0 ? void 0 : _res$data7.execution2AnswerOptions)
+        execution1Answer: res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 || (_res$data5 = _res$data5.data) === null || _res$data5 === void 0 || (_res$data5 = _res$data5.answers) === null || _res$data5 === void 0 ? void 0 : _res$data5.execution1,
+        execution2Answer: res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 || (_res$data6 = _res$data6.data) === null || _res$data6 === void 0 || (_res$data6 = _res$data6.answers) === null || _res$data6 === void 0 ? void 0 : _res$data6.execution2,
+        durationAnswer: res === null || res === void 0 || (_res$data7 = res.data) === null || _res$data7 === void 0 || (_res$data7 = _res$data7.data) === null || _res$data7 === void 0 || (_res$data7 = _res$data7.answers) === null || _res$data7 === void 0 ? void 0 : _res$data7.duration,
+        durationQuestion: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data8 = res.data) === null || _res$data8 === void 0 || (_res$data8 = _res$data8.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.durationAnswerOptions),
+        execution1AnswerOptions: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data9 = res.data) === null || _res$data9 === void 0 || (_res$data9 = _res$data9.data) === null || _res$data9 === void 0 || (_res$data9 = _res$data9.executionAnswerOptions) === null || _res$data9 === void 0 ? void 0 : _res$data9.execution1AnswerOptions),
+        execution2AnswerOptions: (0, _helpers__.parseArrayToInputOptions)(res === null || res === void 0 || (_res$data10 = res.data) === null || _res$data10 === void 0 || (_res$data10 = _res$data10.data) === null || _res$data10 === void 0 || (_res$data10 = _res$data10.executionAnswerOptions) === null || _res$data10 === void 0 ? void 0 : _res$data10.execution2AnswerOptions)
       };
     })
   });
   return {
     isLoadingQuestions: questionsQuery.isFetching,
     isQuestionsError: questionsQuery.isError,
+    execution1Answer: questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data = questionsQuery.data) === null || _questionsQuery$data === void 0 ? void 0 : _questionsQuery$data.execution1Answer,
+    execution2Answer: questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data2 = questionsQuery.data) === null || _questionsQuery$data2 === void 0 ? void 0 : _questionsQuery$data2.execution2Answer,
+    durationAnswer: questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data3 = questionsQuery.data) === null || _questionsQuery$data3 === void 0 ? void 0 : _questionsQuery$data3.durationAnswer,
     questionsError: ((_questionsQuery$error = questionsQuery.error) === null || _questionsQuery$error === void 0 || (_questionsQuery$error = _questionsQuery$error.response) === null || _questionsQuery$error === void 0 || (_questionsQuery$error = _questionsQuery$error.data) === null || _questionsQuery$error === void 0 ? void 0 : _questionsQuery$error.code) || questionsQuery.error,
-    execution1AnswerOptions: (_questionsQuery$data$ = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data = questionsQuery.data) === null || _questionsQuery$data === void 0 ? void 0 : _questionsQuery$data.execution1AnswerOptions) !== null && _questionsQuery$data$ !== void 0 ? _questionsQuery$data$ : [],
-    execution2AnswerOptions: (_questionsQuery$data$2 = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data2 = questionsQuery.data) === null || _questionsQuery$data2 === void 0 ? void 0 : _questionsQuery$data2.execution2AnswerOptions) !== null && _questionsQuery$data$2 !== void 0 ? _questionsQuery$data$2 : [],
-    durationQuestion: (_questionsQuery$data$3 = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data3 = questionsQuery.data) === null || _questionsQuery$data3 === void 0 ? void 0 : _questionsQuery$data3.durationQuestion) !== null && _questionsQuery$data$3 !== void 0 ? _questionsQuery$data$3 : []
+    execution1AnswerOptions: (_questionsQuery$data$ = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data4 = questionsQuery.data) === null || _questionsQuery$data4 === void 0 ? void 0 : _questionsQuery$data4.execution1AnswerOptions) !== null && _questionsQuery$data$ !== void 0 ? _questionsQuery$data$ : [],
+    execution2AnswerOptions: (_questionsQuery$data$2 = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data5 = questionsQuery.data) === null || _questionsQuery$data5 === void 0 ? void 0 : _questionsQuery$data5.execution2AnswerOptions) !== null && _questionsQuery$data$2 !== void 0 ? _questionsQuery$data$2 : [],
+    durationQuestion: (_questionsQuery$data$3 = questionsQuery === null || questionsQuery === void 0 || (_questionsQuery$data6 = questionsQuery.data) === null || _questionsQuery$data6 === void 0 ? void 0 : _questionsQuery$data6.durationQuestion) !== null && _questionsQuery$data$3 !== void 0 ? _questionsQuery$data$3 : []
   };
 };
 

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

@@ -171,14 +171,14 @@ const AppointmentForm = () => {
         licensePlate: licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.replace(/-/g, ''),
         model,
         answers: (0, _helpers__.removeNullishProps)({
-          duration: durationAnswer || (vehicleDetails === null || vehicleDetails === void 0 ? void 0 : vehicleDetails.duration),
+          duration: durationAnswer,
           execution1: executionAnswer1,
           execution2: executionAnswer2
         }),
-        customer: _objectSpread(_objectSpread({}, customer), {}, {
+        customer: (0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, customer), {}, {
           firstName: (customer === null || customer === void 0 ? void 0 : customer.firstName) || '(Onbekend)',
           lastName: (customer === null || customer === void 0 ? void 0 : customer.lastName) || '(Onbekend)'
-        }),
+        })),
         formula,
         branchId: selectedBranch,
         selectBoardComputerUpdate: selectedBoardComputer != null,

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

@@ -183,7 +183,7 @@ const ExitIntentModal = () => {
         licensePlate,
         model,
         answers: (0, _helpers__.removeNullishProps)({
-          duration: durationAnswer || vehicleDetails.duration,
+          duration: durationAnswer,
           execution1: executionAnswer1,
           execution2: executionAnswer2
         }),

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

@@ -3,8 +3,10 @@
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.search.js");
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.url-search-params.js");
+require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,7 +16,7 @@ require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.search.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.url-search-params.js");
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactRouter = require("react-router");
 var _queries = require("../__api__/queries");
 var _LinkButton = _interopRequireDefault(require("../__components__/Buttons/LinkButton"));
@@ -28,9 +30,39 @@ function _interopRequireDefault(e) {
     default: e
   };
 }
+function _getRequireWildcardCache(e) {
+  if ("function" != typeof WeakMap) return null;
+  var r = new WeakMap(),
+    t = new WeakMap();
+  return (_getRequireWildcardCache = function _getRequireWildcardCache(e) {
+    return e ? t : r;
+  })(e);
+}
+function _interopRequireWildcard(e, r) {
+  if (!r && e && e.__esModule) return e;
+  if (null === e || "object" != typeof e && "function" != typeof e) return {
+    default: e
+  };
+  var t = _getRequireWildcardCache(r);
+  if (t && t.has(e)) return t.get(e);
+  var n = {
+      __proto__: null
+    },
+    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
+    var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
+    i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];
+  }
+  return n.default = e, t && t.set(e, n), n;
+}
 const ManualSelectionForm = _ref => {
   let {
-    onSubmit
+    onSubmit,
+    initialValues = {
+      brand: null,
+      model: null,
+      buildYear: null
+    }
   } = _ref;
   const [{
     brand,
@@ -71,6 +103,17 @@ const ManualSelectionForm = _ref => {
     history.push("/configurator".concat(searchParams !== null && searchParams !== void 0 && searchParams.size ? "?".concat(searchParams.toString()) : '') // append search params if found
     );
   };
+  (0, _react.useEffect)(() => {
+    handleBrandChange({
+      value: initialValues.brand
+    });
+    handleBuildYearChange({
+      value: initialValues.buildYear
+    });
+    handleModelChange({
+      value: initialValues.model
+    });
+  }, [initialValues]);
   const handleBrandChange = brandOption => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_BRAND,
@@ -106,7 +149,10 @@ const ManualSelectionForm = _ref => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     onChange: handleBrandChange,
-    initialValue: !brand ? null : {
+    initialValue: !brand ? {
+      value: initialValues === null || initialValues === void 0 ? void 0 : initialValues.brand,
+      label: initialValues === null || initialValues === void 0 ? void 0 : initialValues.brand
+    } : {
       value: brand,
       label: brand
     }
@@ -119,7 +165,10 @@ const ManualSelectionForm = _ref => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     onChange: handleBuildYearChange,
-    initialValue: !buildYear ? null : {
+    initialValue: !buildYear ? {
+      value: initialValues === null || initialValues === void 0 ? void 0 : initialValues.buildYear,
+      label: initialValues === null || initialValues === void 0 ? void 0 : initialValues.buildYear
+    } : {
       value: buildYear,
       label: buildYear
     }
@@ -132,7 +181,10 @@ const ManualSelectionForm = _ref => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     onChange: handleModelChange,
-    initialValue: !model ? null : {
+    initialValue: !model ? {
+      value: initialValues === null || initialValues === void 0 ? void 0 : initialValues.model,
+      label: initialValues === null || initialValues === void 0 ? void 0 : initialValues.model
+    } : {
       value: model,
       label: model
     }

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

@@ -71,6 +71,7 @@ const QuestionsForm = _ref => {
     isLoadingQuestions,
     execution1AnswerOptions,
     execution2AnswerOptions,
+    durationAnswer: durationAnswerPrefilled,
     questionsError,
     durationQuestion
   } = (0, _queries.useQuestionsQuery)({
@@ -93,6 +94,19 @@ const QuestionsForm = _ref => {
     priceCalculationDate
   }); // Prefetch
 
+  /**
+   * @description This hook pre-fills the duration answer, only if it comes pre-filled from the API, and it's not set manually by the user.
+   */
+  (0, _react.useEffect)(() => {
+    if (!durationAnswer && durationAnswerPrefilled && !(durationOptions !== null && durationOptions !== void 0 && durationOptions.length) && !(durationQuestion !== null && durationQuestion !== void 0 && durationQuestion.length)) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_DURATION_ANSWER,
+        payload: {
+          answer: durationAnswerPrefilled
+        }
+      });
+    }
+  }, [durationOptions, durationAnswerPrefilled, durationQuestion, durationAnswer]);
   (0, _react.useEffect)(() => {
     if (durationQuestion !== null && durationQuestion !== void 0 && durationQuestion.length) {
       dispatch({

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

@@ -164,7 +164,7 @@ const QuotationForm = () => {
         licensePlate,
         model,
         answers: (0, _helpers__.removeNullishProps)({
-          duration: durationAnswer || (vehicleDetails === null || vehicleDetails === void 0 ? void 0 : vehicleDetails.duration),
+          duration: durationAnswer,
           execution1: executionAnswer1,
           execution2: executionAnswer2
         }),
@@ -172,7 +172,7 @@ const QuotationForm = () => {
           code: discountCode
         } : null,
         formula,
-        customer,
+        customer: (0, _helpers__.removeNullishProps)(customer),
         branchId: selectedBranch,
         selectBoardComputerUpdate: selectedBoardComputer != null,
         cart: (0, _product.validateCartInput)([{

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

@@ -32,7 +32,8 @@ const VehicleData = () => {
     executionAnswer2,
     durationAnswer,
     discountCode,
-    priceCalculationDate
+    priceCalculationDate,
+    existingDossierId
   }] = (0, _OrderSessionContext.useOrderSession)();
   const formula = (0, _FormulaContext.useFormula)();
   const {
@@ -71,7 +72,7 @@ const VehicleData = () => {
       isDisabled: false,
       label: 'Wijzig voertuig',
       onClick: () => {
-        history.push("/configurator".concat(licensePlate ? '' : '/manual'));
+        history.push("/configurator".concat(licensePlate ? '' : '/manual', "?persistSession=true"));
       },
       className: (0, _helpers__.withStyle)('license-plate__edit link-primary col-12'),
       type: "button"

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

@@ -250,7 +250,7 @@ const InternalAppointmentForm = _ref => {
         model,
         priceCalculationDate,
         answers: (0, _helpers__.removeNullishProps)({
-          duration: durationAnswer || (vehicleDetails === null || vehicleDetails === void 0 ? void 0 : vehicleDetails.duration),
+          duration: durationAnswer,
           execution1: executionAnswer1,
           execution2: executionAnswer2
         }),

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

@@ -235,7 +235,7 @@ const InternalQuotationForm = _ref => {
         licensePlate: (_ref2 = licensePlate || _licensePlate) === null || _ref2 === void 0 ? void 0 : _ref2.replace(/-/g, ''),
         model,
         answers: (0, _helpers__.removeNullishProps)({
-          duration: durationAnswer || (vehicleDetails === null || vehicleDetails === void 0 ? void 0 : vehicleDetails.duration),
+          duration: durationAnswer,
           execution1: executionAnswer1,
           execution2: executionAnswer2
         }),

package/dist/src/shared/__context__/OrderSessionContext.js

@@ -102,7 +102,7 @@ const INITIAL_ORDER_SESSION_STATE = {
   model: null,
   brand: null,
   channel: null,
-  durationAnswer: null,
+  durationAnswer: undefined,
   executionAnswer1: null,
   executionAnswer2: null,
   priceCalculationDate: new Date().getTime(),
@@ -211,7 +211,7 @@ const orderSessionReducer = (state, action) => {
             buildYear: null,
             model: null,
             brand: null,
-            durationAnswer: null,
+            durationAnswer: undefined,
             executionAnswer1: null,
             executionAnswer2: null,
             durationOptions: [],
@@ -765,7 +765,7 @@ const orderSessionReducer = (state, action) => {
       {
         return _objectSpread(_objectSpread({}, state), {}, {
           answers: {},
-          durationAnswer: null
+          durationAnswer: undefined
         });
       }
     case orderSessionActions.SET_PRICE_CALCULATION_DATE:

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

@@ -202,7 +202,7 @@ const removeNullishProps = exports.removeNullishProps = function removeNullishPr
   let object = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return Object.fromEntries(Object.entries(object).filter(_ref3 => {
     let [key, value] = _ref3;
-    return value != null;
+    return !!value;
   }));
 };
 

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

@@ -70,9 +70,10 @@ const getSteps = _ref => {
 const licensePlateValidator = new _LicensePlateValidator.default();
 const InternalLicensePlatePage = () => {
   const [activeStep, setActiveStep] = (0, _react.useState)(0);
-  const [_, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const [session, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const originalLicensePlate = (0, _react.useRef)();
   const formula = (0, _FormulaContext.useFormula)();
-  const [licensePlateURL, discountCode] = (0, _useSearchParam.default)(['licensePlate', 'discountCode']);
+  const [licensePlateURL, discountCode, persistSession] = (0, _useSearchParam.default)(['licensePlate', 'discountCode', 'persistSession']);
   const history = (0, _reactRouter.useHistory)();
   (0, _queries.useProductFieldLabels)(); // Prefetch
 
@@ -85,6 +86,11 @@ const InternalLicensePlatePage = () => {
   const handleSubmit = () => {
     history.push('/configurator/trekhaakpakket');
   };
+  (0, _react.useEffect)(() => {
+    if (!originalLicensePlate.current && session !== null && session !== void 0 && session.licensePlate) {
+      originalLicensePlate.current = session.licensePlate;
+    }
+  }, [session]);
   (0, _react.useEffect)(() => {
     // If no license plate was found: initialize a new order
     if (!licensePlateURL) {
@@ -109,11 +115,11 @@ const InternalLicensePlatePage = () => {
     }
   }, [discountCode]);
   const Steps = (0, _react.useMemo)(() => getSteps({
-    initialLicensePlate: licensePlateValidator.init(licensePlateURL),
+    initialLicensePlate: persistSession === 'true' ? originalLicensePlate.current : licensePlateValidator.init(licensePlateURL),
     onNext: handleNext,
     onPrev: handlePrev,
     onSubmit: handleSubmit
-  }), []);
+  }), [persistSession, originalLicensePlate.current]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('vh-100')
   }, /*#__PURE__*/_react.default.createElement(_internal.InternalCancelDossierEdit, null), /*#__PURE__*/_react.default.createElement("section", {

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

@@ -55,23 +55,39 @@ const getSteps = _ref => {
   let {
     onNext,
     onPrev,
-    onSubmit
+    onSubmit,
+    initialValues
   } = _ref;
   return [/*#__PURE__*/_react.default.createElement(_ManualSelectionForm.default, {
-    onSubmit: onNext
+    onSubmit: onNext,
+    initialValues: initialValues
   }), /*#__PURE__*/_react.default.createElement(_QuestionsForm.default, {
     onPrev: onPrev,
     onSubmit: onSubmit
   })];
 };
 const InternalManualSelectionPage = () => {
-  const [_, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const [{
+    brand,
+    model,
+    buildYear
+  }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const [activeStep, setActiveStep] = (0, _react.useState)(0);
+  const originalVehicle = (0, _react.useRef)();
   const history = (0, _reactRouter.useHistory)();
   const formula = (0, _FormulaContext.useFormula)();
-  const [discountCode] = (0, _useSearchParam.default)(['discountCode']);
+  const [discountCode, persistSession] = (0, _useSearchParam.default)(['discountCode', 'persistSession']);
   (0, _queries.useProductFieldLabels)(); // Prefetch
 
+  (0, _react.useEffect)(() => {
+    if (!(originalVehicle !== null && originalVehicle !== void 0 && originalVehicle.current)) {
+      originalVehicle.current = {
+        brand,
+        model,
+        buildYear
+      };
+    }
+  }, [brand, model, buildYear]);
   (0, _react.useEffect)(() => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.INITIALIZE_NEW_ORDER,
@@ -100,10 +116,15 @@ const InternalManualSelectionPage = () => {
     history.push('/configurator/trekhaakpakket');
   };
   const Steps = (0, _react.useMemo)(() => getSteps({
+    initialValues: persistSession ? originalVehicle.current : {
+      brand: null,
+      model: null,
+      buildYear: null
+    },
     onNext: handleNext,
     onPrev: handlePrev,
     onSubmit: handleSubmit
-  }), []);
+  }), [persistSession, originalVehicle.current]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('vh-100')
   }, /*#__PURE__*/_react.default.createElement(_internal.InternalCancelDossierEdit, null), /*#__PURE__*/_react.default.createElement("section", {

package/package.json

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