thm-p3-configurator 0.0.431 → 0.0.433

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

@@ -171,7 +171,7 @@ const ProductsOverview = () => {
     }
   }, [isLoadingProducts, skipFilters, products, selectedTowbar, selectedCableset, selectedCombiset, dispatch]);
   (0, _react.useEffect)(() => {
-    var _products$Trekhaak2, _products$Trekhaak3, _products$PRODUCT_CAT5;
+    var _products$Trekhaak2, _products$Trekhaak3;
     // When editing an existing dossier, the saved selection from the cart is the
     // source of truth. Skip auto-selection entirely so we never overwrite it with
     // the default recommended towbar.
@@ -231,9 +231,20 @@ const ProductsOverview = () => {
         }
       }
     }
+  }, [isLoadingProducts, products, selectedTowbar, selectedCableset, existingDossierId, dispatch]);
+
+  // Board computer resolution lives outside the existing-dossier early return
+  // above: editing a dossier starts with isBoardComputerSelectionResolved
+  // false, and a dossier whose vehicle has no board computer update would
+  // otherwise never resolve, leaving the step navigation locked (39028).
+  (0, _react.useEffect)(() => {
+    var _products$PRODUCT_CAT5;
+    if (isLoadingProducts) {
+      return;
+    }
 
     // Auto-select boardcomputer if one is available and none is currently selected
-    if (!isLoadingProducts && (products === null || products === void 0 || (_products$PRODUCT_CAT5 = products[_constants__.PRODUCT_CATEGORIES.BOARD_COMPUTER]) === null || _products$PRODUCT_CAT5 === void 0 ? void 0 : _products$PRODUCT_CAT5.length) > 0 && !selectedBoardComputer && !isBoardComputerDeselected) {
+    if ((products === null || products === void 0 || (_products$PRODUCT_CAT5 = products[_constants__.PRODUCT_CATEGORIES.BOARD_COMPUTER]) === null || _products$PRODUCT_CAT5 === void 0 ? void 0 : _products$PRODUCT_CAT5.length) > 0 && !selectedBoardComputer && !isBoardComputerDeselected) {
       const boardComputerId = products[_constants__.PRODUCT_CATEGORIES.BOARD_COMPUTER][0].articleNumber;
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BOARDCOMPUTER,
@@ -242,12 +253,12 @@ const ProductsOverview = () => {
           userModified: false
         }
       });
-    } else if (!isLoadingProducts && !isBoardComputerSelectionResolved) {
+    } else if (!isBoardComputerSelectionResolved) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_BOARDCOMPUTER_SELECTION_RESOLVED
       });
     }
-  }, [isLoadingProducts, products, selectedTowbar, selectedCableset, selectedBoardComputer, initialSelectedBoardComputer, isBoardComputerSelectionResolved, isBoardComputerTouched, isBoardComputerDeselected, existingDossierId, dispatch]);
+  }, [isLoadingProducts, products, selectedBoardComputer, isBoardComputerSelectionResolved, isBoardComputerDeselected, dispatch]);
   if (isProductsError || !isLoadingProducts && (!(products !== null && products !== void 0 && (_products$Trekhaak4 = products.Trekhaak) !== null && _products$Trekhaak4 !== void 0 && _products$Trekhaak4.length) || !(products !== null && products !== void 0 && (_products$Kabelset = products.Kabelset) !== null && _products$Kabelset !== void 0 && _products$Kabelset.length)) && !(products !== null && products !== void 0 && (_products$Combiset = products.Combiset) !== null && _products$Combiset !== void 0 && _products$Combiset.length)) {
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
       to: "/configurator/geen-producten"

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

@@ -114,7 +114,7 @@ const getDossierCountryId = function getDossierCountryId() {
  * @description Covnerts an existing hyper dossier object into a local order session
  */
 const parseDossierToOrderSession = exports.parseDossierToOrderSession = function parseDossierToOrderSession() {
-  var _ref2, _ref3, _ref4, _dossier$construction, _dossier$typeEigendom, _dossier$bedrijf, _dossier$bedrijf2, _dossier$bedrijf3, _dossier$lines, _dossier$statusBeoord, _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$kanaalWebsit, _dossier$kanaal2, _dossier$statusDossie, _dossier$statusDossie2, _dossier$merk, _dossier$vestiging, _getConfiguratorFormu, _dossier$chassisnumme, _dossier$typeEigendom2, _getDossierValue, _getDossierValue2, _getDossierValue3, _getDossierValue4, _getDossierValue5, _dossier$anwbId, _dossier$leasemaatsch, _dossier$leasemaatsch2, _dossier$placeholderB, _dossier$kvkNummer, _dossier$btwNummer, _ref5, _ref6, _dossier$leasemaatsch3, _dossier$leasemaatsch4, _dossier$bedrijf4, _ref7, _ref8, _ref9, _dossier$leasemaatsch5, _dossier$leasemaatsch6, _dossier$leasemaatsch7, _dossier$leasemaatsch8, _dossier$leasemaatsch9, _dossier$leasemaatsch10, _dossier$zakelijkCont, _dossier$zakelijkCont2, _ref10, _dossier$zakeiljkCont, _dossier$zakelijkCont3, _dossier$hasGoedkeuri, _meerprijsLine$consum, _meerprijsLine$extraN;
+  var _ref2, _ref3, _ref4, _dossier$construction, _dossier$typeEigendom, _dossier$bedrijf, _dossier$bedrijf2, _dossier$bedrijf3, _dossier$lines, _dossier$statusBeoord, _dossier$modelcode, _dossier$kanaal, _dossier$kanaalPartne, _dossier$kanaalHoofka, _dossier$kanaalWebsit, _dossier$kanaal2, _dossier$statusDossie, _dossier$statusDossie2, _dossier$merk, _dossier$vestiging, _getConfiguratorFormu, _dossier$chassisnumme, _dossier$typeEigendom2, _getDossierValue, _getDossierValue2, _getDossierValue3, _getDossierValue4, _getDossierValue5, _dossier$anwbId, _dossier$leasemaatsch, _dossier$leasemaatsch2, _dossier$placeholderB, _dossier$kvkNummer, _dossier$btwNummer, _ref5, _ref6, _dossier$leasemaatsch3, _dossier$leasemaatsch4, _dossier$bedrijf4, _ref7, _ref8, _ref9, _dossier$leasemaatsch5, _dossier$leasemaatsch6, _dossier$leasemaatsch7, _dossier$leasemaatsch8, _dossier$leasemaatsch9, _dossier$leasemaatsch10, _dossier$zakelijkCont, _dossier$zakelijkCont2, _ref10, _dossier$zakeiljkCont, _dossier$zakelijkCont3, _dossier$hasGoedkeuri, _meerprijsLine$consum, _meerprijsLine$extraN;
   let dossier = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const resolvedBuildYear = (_ref2 = (_ref3 = (_ref4 = (_dossier$construction = dossier === null || dossier === void 0 ? void 0 : dossier.constructionYear) !== null && _dossier$construction !== void 0 ? _dossier$construction : dossier === null || dossier === void 0 ? void 0 : dossier.bouwjaar) !== null && _ref4 !== void 0 ? _ref4 : dossier === null || dossier === void 0 ? void 0 : dossier.bouwjaar2) !== null && _ref3 !== void 0 ? _ref3 : dossier === null || dossier === void 0 ? void 0 : dossier.modeljaar) !== null && _ref2 !== void 0 ? _ref2 : null;
   const isLeaseOwnership = (dossier === null || dossier === void 0 || (_dossier$typeEigendom = dossier.typeEigendomAuto) === null || _dossier$typeEigendom === void 0 ? void 0 : _dossier$typeEigendom.title) === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij;
@@ -130,6 +130,9 @@ const parseDossierToOrderSession = exports.parseDossierToOrderSession = function
     licensePlateBrandModel: dossier === null || dossier === void 0 ? void 0 : dossier.kentekenMerkmodel,
     model: dossier !== null && dossier !== void 0 && dossier.kenteken ? null : dossier === null || dossier === void 0 ? void 0 : dossier.model,
     // Note: only fill in when license plate is empty
+    // Note: the model code survives model renames in Hyper; the middleware uses
+    // it to recover when the stored model title no longer resolves.
+    modelCode: dossier !== null && dossier !== void 0 && dossier.kenteken ? null : (_dossier$modelcode = dossier === null || dossier === void 0 ? void 0 : dossier.modelcode) !== null && _dossier$modelcode !== void 0 ? _dossier$modelcode : null,
     channel: {
       channelType: dossier === null || dossier === void 0 || (_dossier$kanaal = dossier.kanaal) === null || _dossier$kanaal === void 0 ? void 0 : _dossier$kanaal.entityId,
       channelId: (dossier === null || dossier === void 0 || (_dossier$kanaalPartne = dossier.kanaalPartner) === null || _dossier$kanaalPartne === void 0 ? void 0 : _dossier$kanaalPartne.entityId) || (dossier === null || dossier === void 0 || (_dossier$kanaalHoofka = dossier.kanaalHoofkantoor) === null || _dossier$kanaalHoofka === void 0 ? void 0 : _dossier$kanaalHoofka.entityId) || (dossier === null || dossier === void 0 || (_dossier$kanaalWebsit = dossier.kanaalWebsite) === null || _dossier$kanaalWebsit === void 0 ? void 0 : _dossier$kanaalWebsit.entityId),

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

@@ -14,6 +14,7 @@ var _CardWide = _interopRequireDefault(require("../../__components__/Cards/CardW
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
 var _useBranchTheme = require("../../__hooks__/useBranchTheme");
+var _useSearchParam = _interopRequireDefault(require("../../__hooks__/useSearchParam"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -44,9 +45,22 @@ function _interopRequireWildcard(e, r) {
   }
   return n.default = e, t && t.set(e, n), n;
 }
+const NO_DOSSIER_MESSAGES = {
+  default: {
+    title: 'We kunnen geen dossier vinden met de opgegeven specificaties',
+    body: 'Controleer uw vestiging of dossiergegevens en probeer het opnieuw. '
+  },
+  'model-niet-beschikbaar': {
+    title: 'Dit dossier kan momenteel niet bewerkt worden',
+    body: 'De voertuiggegevens in dit dossier zijn verouderd en konden niet ' + 'automatisch worden bijgewerkt. Neem contact op met TowMotive, ' + 'dan zorgen zij dat het dossier weer bewerkbaar wordt.'
+  }
+};
 const InternalNoDossierPage = () => {
+  var _NO_DOSSIER_MESSAGES$;
   const themeClass = (0, _helpers__.getConfiguratorThemeClass)((0, _useBranchTheme.useBranchTheme)());
   const [_, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const [reden] = (0, _useSearchParam.default)(['reden']);
+  const message = (_NO_DOSSIER_MESSAGES$ = NO_DOSSIER_MESSAGES[reden]) !== null && _NO_DOSSIER_MESSAGES$ !== void 0 ? _NO_DOSSIER_MESSAGES$ : NO_DOSSIER_MESSAGES.default;
   (0, _react.useEffect)(() => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.INITIALIZE_NEW_ORDER,
@@ -68,9 +82,9 @@ const InternalNoDossierPage = () => {
     title: ''
   }, /*#__PURE__*/_react.default.createElement("h5", {
     className: (0, _helpers__.withStyle)('text-center mb-2')
-  }, "We kunnen geen dossier vinden met de opgegeven specificaties"), /*#__PURE__*/_react.default.createElement("p", {
+  }, message.title), /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _helpers__.withStyle)('mb-4 text-center')
-  }, "Controleer uw vestiging of dossiergegevens en probeer het opnieuw.", ' '), /*#__PURE__*/_react.default.createElement("div", {
+  }, message.body), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("d-flex  justify-content-center gap-2 flex-md-nowrap flex-wrap")
   }, /*#__PURE__*/_react.default.createElement(_NavigationButton.default, {
     to: '/configurator',

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

@@ -126,7 +126,7 @@ const InternalSessionEditPage = props => {
   const history = (0, _reactRouter.useHistory)();
   const hydrateOrderSessionByDossier = (0, _react.useCallback)(async dossierById => {
     try {
-      var _dossierById$akkoordO, _getConfiguratorFormu, _orderRes$data, _orderRes$data2, _session$discountCode, _session$customer, _sessionProducts$sele;
+      var _dossierById$akkoordO, _getConfiguratorFormu, _orderRes$data, _orderRes$data2, _orderRes$data3, _session$discountCode, _session$customer, _sessionProducts$sele;
       window.sessionStorage.removeItem(_constants__.ORDER_SESSION_KEY);
       const session = (0, _dossier.parseDossierToOrderSession)(dossierById);
       session.customerAgreed = (_dossierById$akkoordO = dossierById === null || dossierById === void 0 ? void 0 : dossierById.akkoordOpmerkingen) !== null && _dossierById$akkoordO !== void 0 ? _dossierById$akkoordO : false;
@@ -137,6 +137,7 @@ const InternalSessionEditPage = props => {
       const orderRes = await _authenticatedProxyApi.authenticatedProxyApi.getOrder((0, _queryKeyFactory.serializeOrderParams)({
         licensePlate: session.licensePlate,
         model: session.model,
+        modelCode: session.modelCode,
         executionAnswer1: session.executionAnswer1,
         executionAnswer2: session.executionAnswer2,
         durationAnswer: session.durationAnswer,
@@ -153,12 +154,21 @@ const InternalSessionEditPage = props => {
         skipFilters: true
       }));
 
+      // Note: adopt the model title the order API resolved to. The dossier may
+      // still carry an old (renamed) model title; using the current one keeps
+      // later order calls and the final save working, and repairs the dossier
+      // model field once the user saves.
+      const resolvedModelTitle = orderRes === null || orderRes === void 0 || (_orderRes$data = orderRes.data) === null || _orderRes$data === void 0 || (_orderRes$data = _orderRes$data.data) === null || _orderRes$data === void 0 || (_orderRes$data = _orderRes$data.vehicleInfo) === null || _orderRes$data === void 0 || (_orderRes$data = _orderRes$data.model) === null || _orderRes$data === void 0 ? void 0 : _orderRes$data.name;
+      if (!session.licensePlate && resolvedModelTitle) {
+        session.model = resolvedModelTitle;
+      }
+
       // Note: we need to use this function to classify the products found in the dossier orderlines
       // Since the orderlines don't give us an indication of the type of the product
       const sessionProducts = (0, _dossier.extractSessionProductsByOrder)({
         lines: dossierById === null || dossierById === void 0 ? void 0 : dossierById.lines,
-        orderProducts: orderRes === null || orderRes === void 0 || (_orderRes$data = orderRes.data) === null || _orderRes$data === void 0 || (_orderRes$data = _orderRes$data.data) === null || _orderRes$data === void 0 ? void 0 : _orderRes$data.articles,
-        boardComputerUpdate: orderRes === null || orderRes === void 0 || (_orderRes$data2 = orderRes.data) === null || _orderRes$data2 === void 0 || (_orderRes$data2 = _orderRes$data2.data) === null || _orderRes$data2 === void 0 || (_orderRes$data2 = _orderRes$data2.articles) === null || _orderRes$data2 === void 0 ? void 0 : _orderRes$data2.boardComputerUpdate
+        orderProducts: orderRes === null || orderRes === void 0 || (_orderRes$data2 = orderRes.data) === null || _orderRes$data2 === void 0 || (_orderRes$data2 = _orderRes$data2.data) === null || _orderRes$data2 === void 0 ? void 0 : _orderRes$data2.articles,
+        boardComputerUpdate: orderRes === null || orderRes === void 0 || (_orderRes$data3 = orderRes.data) === null || _orderRes$data3 === void 0 || (_orderRes$data3 = _orderRes$data3.data) === null || _orderRes$data3 === void 0 || (_orderRes$data3 = _orderRes$data3.articles) === null || _orderRes$data3 === void 0 ? void 0 : _orderRes$data3.boardComputerUpdate
       });
       const isAnwbCode = session === null || session === void 0 || (_session$discountCode = session.discountCode) === null || _session$discountCode === void 0 ? void 0 : _session$discountCode.toLocaleLowerCase().includes('anwb');
       const shouldKeepAnwbValidated = isAnwbCode && Boolean((session === null || session === void 0 || (_session$customer = session.customer) === null || _session$customer === void 0 ? void 0 : _session$customer.anwbId) || (sessionProducts === null || sessionProducts === void 0 || (_sessionProducts$sele = sessionProducts.selectedDiscountedProducts) === null || _sessionProducts$sele === void 0 ? void 0 : _sessionProducts$sele.length));
@@ -174,8 +184,10 @@ const InternalSessionEditPage = props => {
       });
       history.push('/configurator/trekhaakpakket');
     } catch (ex) {
+      var _ex$response;
       console.error('hydrateOrderSessionByDossier(): ', ex);
-      history.push('/configurator/geen-dossiers');
+      const isModelNotFound = (ex === null || ex === void 0 || (_ex$response = ex.response) === null || _ex$response === void 0 || (_ex$response = _ex$response.data) === null || _ex$response === void 0 ? void 0 : _ex$response.code) === 'MODEL_NOT_FOUND';
+      history.push(isModelNotFound ? '/configurator/geen-dossiers?reden=model-niet-beschikbaar' : '/configurator/geen-dossiers');
     }
   }, [dossierType, dispatch, history, setFormula]);
   (0, _react.useEffect)(() => {

package/package.json

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