thm-p3-configurator 0.0.423 → 0.0.426

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

@@ -148,6 +148,9 @@ const AppointmentForm = () => {
     buildYear,
     durationAnswer,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedCableset,
     selectedCombiset,
     selectedTowbar,
@@ -175,6 +178,12 @@ const AppointmentForm = () => {
   } = (0, _mutations.useCreateAppointmentRequestMutation)();
   const formula = (0, _FormulaContext.useFormula)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const boardComputerSelection = {
+    selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved
+  };
   const history = (0, _reactRouter.useHistory)();
   const handleSubmit = async () => {
     (0, _Datalayer.pushToDataLayer)({
@@ -212,7 +221,7 @@ const AppointmentForm = () => {
         })),
         formula,
         branchId: selectedBranch,
-        selectBoardComputerUpdate: selectedBoardComputer != null,
+        selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)(boardComputerSelection),
         skipFilters,
         discount: (() => {
           if (!(discountCode !== null && discountCode !== void 0 && discountCode.length)) return null;
@@ -221,16 +230,16 @@ const AppointmentForm = () => {
             code: discountCode
           };
         })(),
-        cart: (0, _product.buildCartInput)({
+        cart: (0, _product.buildCartInput)(_objectSpread(_objectSpread({
           selectedCableset,
           selectedCombiset,
-          selectedTowbar,
-          selectedBoardComputer,
+          selectedTowbar
+        }, boardComputerSelection), {}, {
           selectedExtras,
           selectedDiscountedProducts,
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage
-        })
+        }))
       });
       await createAppointmentRequest(appointmentRequestPayload);
       (0, _Datalayer.pushToDataLayer)({

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

@@ -100,7 +100,8 @@ const BottomNavigationBar = () => {
     selectedBranch,
     existingDossierType,
     allowLocationChange,
-    currentDossierType
+    currentDossierType,
+    isBoardComputerSelectionResolved
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   if (!existingDossierType && (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 ? void 0 : _history$location2.pathname) == '/configurator/overzicht') {
     dispatch({
@@ -122,7 +123,7 @@ const BottomNavigationBar = () => {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row justify-content-center')
   }, buttons.map(_ref2 => {
-    var _history$location3, _history$location4, _history$location5;
+    var _history$location3, _history$location4, _history$location5, _history$location6;
     let {
       to,
       label,
@@ -144,6 +145,7 @@ const BottomNavigationBar = () => {
       to = '/configurator/gegevens';
     }
     const component = COMPONENT_BY_PATH[history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.pathname];
+    const isWaitingForBoardComputerSelection = existingDossierType && (history === null || history === void 0 || (_history$location4 = history.location) === null || _history$location4 === void 0 ? void 0 : _history$location4.pathname) === '/configurator/trekhaakpakket' && !isBoardComputerSelectionResolved;
     const handleClick = () => {
       if (component) {
         (0, _Datalayer.pushToDataLayer)({
@@ -165,7 +167,7 @@ const BottomNavigationBar = () => {
       }
     };
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: "link-".concat(history === null || history === void 0 || (_history$location4 = history.location) === null || _history$location4 === void 0 ? void 0 : _history$location4.pathname, "-").concat(label, "-").concat(to, "-").concat(type),
+      key: "link-".concat(history === null || history === void 0 || (_history$location5 = history.location) === null || _history$location5 === void 0 ? void 0 : _history$location5.pathname, "-").concat(label, "-").concat(to, "-").concat(type),
       className: (0, _helpers__.withStyle)("col-12 col-sm-auto d-flex order-2 order-sm-0 justify-content-".concat(buttons.length > 1 ? 'center' : 'end', " mt-1"))
     }, /*#__PURE__*/_react.default.createElement(ButtonByType, {
       onClick: handleClick,
@@ -175,7 +177,7 @@ const BottomNavigationBar = () => {
       state: {
         prevPathName: history.location.pathname
       },
-      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location5 = history.location) === null || _history$location5 === void 0 ? void 0 : _history$location5.pathname) === '/configurator/montagelocatie' && !selectedBranch
+      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && isWaitingForBoardComputerSelection || type === 'next' && (history === null || history === void 0 || (_history$location6 = history.location) === null || _history$location6 === void 0 ? void 0 : _history$location6.pathname) === '/configurator/montagelocatie' && !selectedBranch
     }));
   })))))));
 };

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

@@ -136,6 +136,9 @@ const ExitIntentModal = () => {
     buildYear,
     durationAnswer,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedCableset,
     selectedCombiset,
     selectedTowbar,
@@ -143,7 +146,6 @@ const ExitIntentModal = () => {
     discountCode,
     executionAnswer1,
     executionAnswer2,
-    priceCalculationDate,
     selectedDiscountedProducts = [],
     selectedExtras,
     vehicleCodingDiscountPercentage,
@@ -151,6 +153,12 @@ const ExitIntentModal = () => {
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const formula = (0, _FormulaContext.useFormula)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const boardComputerSelection = {
+    selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved
+  };
   (0, _react.useEffect)(() => {
     (0, _ui.scrollToFirstErrorMessage)();
   }, [errors]);
@@ -229,18 +237,18 @@ const ExitIntentModal = () => {
           lastName: (_customer$lastName = customer === null || customer === void 0 ? void 0 : customer.lastName) !== null && _customer$lastName !== void 0 ? _customer$lastName : undefined
         })),
         branchId: selectedBranch,
-        selectBoardComputerUpdate: selectedBoardComputer != null,
+        selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)(boardComputerSelection),
         skipFilters,
-        cart: (0, _product.buildCartInput)({
+        cart: (0, _product.buildCartInput)(_objectSpread(_objectSpread({
           selectedCableset,
           selectedCombiset,
-          selectedTowbar,
-          selectedBoardComputer,
+          selectedTowbar
+        }, boardComputerSelection), {}, {
           selectedExtras,
           selectedDiscountedProducts,
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage
-        })
+        }))
       }));
       (0, _Datalayer.pushToDataLayer)({
         event: 'form',

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

@@ -93,6 +93,9 @@ const ProductCartSide = () => {
     selectedCableset,
     selectedCombiset,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     allArticleNumbers,
     existingDossierId,
     selectedExtras,
@@ -106,7 +109,8 @@ const ProductCartSide = () => {
     montageRate,
     extraPriceAmount,
     discountCode,
-    priceCalculationDate
+    priceCalculationDate,
+    skipFilters
   } = order;
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
@@ -116,13 +120,18 @@ const ProductCartSide = () => {
     selectedCombiset,
     selectedTowbar,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved,
     selectedExtras,
     isTowmotiveFormula: isTowmotive,
     vehicleCodingDiscountPercentage,
     consumerDiscounts,
     touchedConsumerDiscounts
   });
-  const shouldRequestUnfilteredProducts = (0, _product.shouldRequestUnfilteredProductsForCart)(cartInput) || Boolean(existingDossierId && (allArticleNumbers === null || allArticleNumbers === void 0 ? void 0 : allArticleNumbers.length) > 0);
+  // Use the session skipFilters so this query matches the product page's;
+  // an unfiltered request can return a different catalogue than the page.
+  const shouldRequestUnfilteredProducts = skipFilters || Boolean(existingDossierId && (allArticleNumbers === null || allArticleNumbers === void 0 ? void 0 : allArticleNumbers.length) > 0);
   const {
     cart,
     totals,
@@ -136,7 +145,12 @@ const ProductCartSide = () => {
     executionAnswer2,
     durationAnswer: durationAnswerForQuery,
     buildYear,
-    selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
+    selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)({
+      selectedBoardComputer,
+      initialSelectedBoardComputer,
+      isBoardComputerTouched,
+      isBoardComputerSelectionResolved
+    }) ? 'true' : 'false',
     cart: cartInput ? JSON.stringify(cartInput) : undefined,
     formula,
     branchId: isToggled ? selectedBranch : undefined,

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

@@ -263,6 +263,9 @@ const ProductCartTable = () => {
     selectedCableset,
     selectedCombiset,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedExtras,
     executionAnswer1,
     allArticleNumbers,
@@ -277,7 +280,8 @@ const ProductCartTable = () => {
     touchedConsumerDiscounts,
     montageRate,
     isMontageTariffFixed,
-    extraPriceAmount
+    extraPriceAmount,
+    skipFilters
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
 
   // Determine display mode
@@ -342,16 +346,18 @@ const ProductCartTable = () => {
     selectedCombiset,
     selectedTowbar,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved,
     selectedExtras,
     isTowmotiveFormula: isTowmotive,
     vehicleCodingDiscountPercentage,
     consumerDiscounts,
     touchedConsumerDiscounts
   });
-  // Also request unfiltered products when editing an existing dossier with
-  // article numbers that could not be classified into selectedTowbar etc. during
-  // hydration (e.g. formula-specific articles not in the TM catalogue).
-  const shouldRequestUnfilteredProducts = (0, _product.shouldRequestUnfilteredProductsForCart)(cartInput) || Boolean(existingDossierId && (allArticleNumbers === null || allArticleNumbers === void 0 ? void 0 : allArticleNumbers.length) > 0);
+  // Use the session skipFilters so this query matches the product page's;
+  // an unfiltered request can return a different catalogue than the page.
+  const shouldRequestUnfilteredProducts = skipFilters || Boolean(existingDossierId && (allArticleNumbers === null || allArticleNumbers === void 0 ? void 0 : allArticleNumbers.length) > 0);
   const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const {
     cart,
@@ -366,7 +372,12 @@ const ProductCartTable = () => {
     executionAnswer2,
     durationAnswer: durationAnswerForQuery,
     buildYear,
-    selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
+    selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)({
+      selectedBoardComputer,
+      initialSelectedBoardComputer,
+      isBoardComputerTouched,
+      isBoardComputerSelectionResolved
+    }) ? 'true' : 'false',
     cart: JSON.stringify(cartInput || []),
     branchId: isToggled ? selectedBranch : null,
     discountAmount,

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

@@ -88,6 +88,9 @@ const ProductsOverview = () => {
     selectedCombiset,
     selectedExtras,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     isBoardComputerDeselected,
     discountCode,
     priceCalculationDate,
@@ -108,6 +111,9 @@ const ProductsOverview = () => {
     selectedCombiset,
     selectedTowbar,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved,
     selectedExtras,
     isTowmotiveFormula: isTowmotive,
     vehicleCodingDiscountPercentage,
@@ -126,7 +132,12 @@ const ProductsOverview = () => {
     executionAnswer2,
     durationAnswer: durationAnswerForQuery,
     buildYear,
-    selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
+    selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)({
+      selectedBoardComputer,
+      initialSelectedBoardComputer,
+      isBoardComputerTouched,
+      isBoardComputerSelectionResolved
+    }) ? 'true' : 'false',
     cart: cartInput ? JSON.stringify(cartInput) : undefined,
     formula,
     discountCode,
@@ -227,11 +238,16 @@ const ProductsOverview = () => {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BOARDCOMPUTER,
         payload: {
-          id: boardComputerId
+          id: boardComputerId,
+          userModified: false
         }
       });
+    } else if (!isLoadingProducts && !isBoardComputerSelectionResolved) {
+      dispatch({
+        type: _OrderSessionContext.orderSessionActions.SET_BOARDCOMPUTER_SELECTION_RESOLVED
+      });
     }
-  }, [isLoadingProducts, products, selectedTowbar, selectedCableset, selectedBoardComputer, isBoardComputerDeselected, existingDossierId, dispatch]);
+  }, [isLoadingProducts, products, selectedTowbar, selectedCableset, selectedBoardComputer, initialSelectedBoardComputer, isBoardComputerSelectionResolved, isBoardComputerTouched, isBoardComputerDeselected, existingDossierId, 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"
@@ -342,7 +358,8 @@ const ProductsOverview = () => {
           dispatch({
             type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BOARDCOMPUTER,
             payload: {
-              id: isSelected ? productId : null
+              id: isSelected ? productId : null,
+              userModified: true
             }
           });
           break;

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

@@ -141,6 +141,9 @@ const QuotationForm = () => {
     buildYear,
     durationAnswer,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedCableset,
     selectedCombiset,
     executionAnswer1,
@@ -164,6 +167,12 @@ const QuotationForm = () => {
   } = (0, _mutations.useCreateQuotationMutation)();
   const formula = (0, _FormulaContext.useFormula)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const boardComputerSelection = {
+    selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved
+  };
   (0, _react.useEffect)(() => {
     (0, _ui.scrollToFirstErrorMessage)();
   }, [errors]);
@@ -214,18 +223,18 @@ const QuotationForm = () => {
         formula,
         customer: (0, _helpers__.removeNullishProps)(customer),
         branchId: selectedBranch,
-        selectBoardComputerUpdate: selectedBoardComputer != null,
+        selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)(boardComputerSelection),
         skipFilters,
-        cart: (0, _product.buildCartInput)({
+        cart: (0, _product.buildCartInput)(_objectSpread(_objectSpread({
           selectedCableset,
           selectedCombiset,
-          selectedTowbar,
-          selectedBoardComputer,
+          selectedTowbar
+        }, boardComputerSelection), {}, {
           selectedExtras,
           selectedDiscountedProducts,
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage
-        })
+        }))
       }));
     } catch (ex) {
       (0, _Datalayer.pushToDataLayer)({

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

@@ -249,6 +249,9 @@ const InternalAppointmentForm = _ref => {
     allowLocationChange,
     existingDossierId,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedCableset,
     selectedCombiset,
     selectedTowbar,
@@ -523,6 +526,12 @@ const InternalAppointmentForm = _ref => {
   const formula = (0, _FormulaContext.useFormula)();
   const showBranchAutofillLink = [_constants__.CONFIGURATOR_FORMULAS.TOW, _constants__.CONFIGURATOR_FORMULAS.TMG, _constants__.CONFIGURATOR_FORMULAS.TowMotive].includes(formula);
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const boardComputerSelection = {
+    selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved
+  };
   (0, _react.useEffect)(() => {
     (0, _ui.scrollToFirstErrorMessage)();
   }, [errors]);
@@ -671,20 +680,20 @@ const InternalAppointmentForm = _ref => {
         formula
       }), {}, {
         branchId: selectedBranch,
-        selectBoardComputerUpdate: selectedBoardComputer != null,
+        selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)(boardComputerSelection),
         skipFilters,
-        cart: (0, _product.buildCartInput)({
+        cart: (0, _product.buildCartInput)(_objectSpread(_objectSpread({
           selectedCableset,
           selectedCombiset,
-          selectedTowbar,
-          selectedBoardComputer,
+          selectedTowbar
+        }, boardComputerSelection), {}, {
           selectedExtras,
           selectedDiscountedProducts,
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage,
           consumerDiscounts,
           touchedConsumerDiscounts
-        }),
+        })),
         montageRate: montageRate !== null && montageRate !== void 0 ? montageRate : undefined
       }));
       payload.vehicle = _objectSpread(_objectSpread({}, payload.vehicle), {}, {

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

@@ -227,6 +227,9 @@ const InternalQuotationForm = _ref => {
     existingDossierId,
     buildYear,
     selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerSelectionResolved,
+    isBoardComputerTouched,
     selectedCableset,
     selectedCombiset,
     selectedTowbar,
@@ -399,6 +402,12 @@ const InternalQuotationForm = _ref => {
   }, [isTmg, marketingChannels, channel === null || channel === void 0 ? void 0 : channel.channelId, dispatch]);
   const formula = (0, _FormulaContext.useFormula)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const boardComputerSelection = {
+    selectedBoardComputer,
+    initialSelectedBoardComputer,
+    isBoardComputerTouched,
+    isBoardComputerSelectionResolved
+  };
   const isBusinessOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Zakelijk;
   const isLeaseOwnership = activeOwnershipType === _constants__.VEHICLE_OWNERSHIP_TYPE.Leasemaatschappij;
   const {
@@ -579,20 +588,20 @@ const InternalQuotationForm = _ref => {
         formula
       }), {}, {
         branchId: selectedBranch,
-        selectBoardComputerUpdate: selectedBoardComputer != null,
+        selectBoardComputerUpdate: (0, _product.shouldSelectBoardComputerUpdate)(boardComputerSelection),
         skipFilters,
-        cart: (0, _product.buildCartInput)({
+        cart: (0, _product.buildCartInput)(_objectSpread(_objectSpread({
           selectedCableset,
           selectedCombiset,
-          selectedTowbar,
-          selectedBoardComputer,
+          selectedTowbar
+        }, boardComputerSelection), {}, {
           selectedExtras,
           selectedDiscountedProducts,
           isTowmotiveFormula: isTowmotive,
           vehicleCodingDiscountPercentage,
           consumerDiscounts,
           touchedConsumerDiscounts
-        }),
+        })),
         montageRate: montageRate !== null && montageRate !== void 0 ? montageRate : undefined
       }));
       payload.vehicle = _objectSpread(_objectSpread({}, payload.vehicle), {}, {

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

@@ -156,6 +156,9 @@ const INITIAL_ORDER_SESSION_STATE = {
   touchedConsumerDiscounts: {},
   montageRate: null,
   isMontageTariffFixed: false,
+  initialSelectedBoardComputer: null,
+  isBoardComputerSelectionResolved: true,
+  isBoardComputerTouched: false,
   vehicle: {
     ownershipType: _constants__.VEHICLE_OWNERSHIP_TYPE.Particulier,
     singleOrderOwnershipType: null,
@@ -250,6 +253,7 @@ const orderSessionActions = exports.orderSessionActions = {
   REMOVE_SINGLE_ORDER_PRODUCT: 'REMOVE_SINGLE_ORDER_PRODUCT',
   UPDATE_EXTRA_QUANTITY: 'UPDATE_EXTRA_QUANTITY',
   SET_SELECTED_BOARDCOMPUTER: 'SET_IS_BOARDCOMPUTER_DESELECTED',
+  SET_BOARDCOMPUTER_SELECTION_RESOLVED: 'SET_BOARDCOMPUTER_SELECTION_RESOLVED',
   SET_SELECTED_BRANCH: 'SET_SELECTED_BRANCH',
   SET_CUSTOMER_FIRST_NAME: 'SET_CUSTOMER_FIRST_NAME',
   SET_CUSTOMER_LAST_NAME: 'SET_CUSTOMER_LAST_NAME',
@@ -339,6 +343,9 @@ const orderSessionReducer = (state, action) => {
             skipFilters: false,
             selectedDiscountedProducts: [],
             selectedBoardComputer: null,
+            initialSelectedBoardComputer: null,
+            isBoardComputerSelectionResolved: true,
+            isBoardComputerTouched: false,
             isBoardComputerDeselected: false,
             singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart,
             discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode,
@@ -354,16 +361,24 @@ const orderSessionReducer = (state, action) => {
       }
     case orderSessionActions.INITIALIZE_EXISTING_ORDER:
       {
-        var _existingOrder$vehicl, _existingOrder$consum, _existingOrder$touche;
+        var _ref, _existingOrder$initia, _existingOrder$vehicl, _existingOrder$consum, _existingOrder$touche;
         const {
           existingOrder,
           existingDossierId,
           existingDossierType
         } = action.payload;
+        const initialSelectedBoardComputer = (_ref = (_existingOrder$initia = existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.initialSelectedBoardComputer) !== null && _existingOrder$initia !== void 0 ? _existingOrder$initia : existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.selectedBoardComputer) !== null && _ref !== void 0 ? _ref : null;
         return _objectSpread(_objectSpread({}, existingOrder), {}, {
           isTouched: true,
           existingDossierId,
           existingDossierType,
+          initialSelectedBoardComputer,
+          // Existing dossiers start unresolved: the trekhaakpakket page must
+          // finish loading its products (which resolves the board computer
+          // selection) before the user may continue to the next step.
+          isBoardComputerSelectionResolved: false,
+          isBoardComputerTouched: false,
+          isBoardComputerDeselected: (existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.isBoardComputerDeselected) || initialSelectedBoardComputer == null,
           vehicleCodingDiscountPercentage: (_existingOrder$vehicl = existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.vehicleCodingDiscountPercentage) !== null && _existingOrder$vehicl !== void 0 ? _existingOrder$vehicl : null,
           consumerDiscounts: (_existingOrder$consum = existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.consumerDiscounts) !== null && _existingOrder$consum !== void 0 ? _existingOrder$consum : {},
           touchedConsumerDiscounts: (_existingOrder$touche = existingOrder === null || existingOrder === void 0 ? void 0 : existingOrder.touchedConsumerDiscounts) !== null && _existingOrder$touche !== void 0 ? _existingOrder$touche : {}
@@ -554,6 +569,8 @@ const orderSessionReducer = (state, action) => {
           selectedCombiset: combisetId,
           selectedTowbar: null,
           selectedBoardComputer: null,
+          isBoardComputerSelectionResolved: true,
+          isBoardComputerTouched: true,
           selectedCableset: null
         });
       }
@@ -604,20 +621,32 @@ const orderSessionReducer = (state, action) => {
     case orderSessionActions.SET_SELECTED_BOARDCOMPUTER:
       {
         const {
-          id
+          id,
+          userModified = true
         } = action.payload;
 
         // Show warning first
-        if (!state.isBoardComputerDeselected && id == null) {
+        if (userModified && !state.isBoardComputerDeselected && id == null) {
           return _objectSpread(_objectSpread({}, state), {}, {
+            isBoardComputerSelectionResolved: true,
+            isBoardComputerTouched: true,
             isBoardComputerDeselected: true,
             selectedBoardComputer: null
           });
         }
         return _objectSpread(_objectSpread({}, state), {}, {
+          isBoardComputerSelectionResolved: true,
+          isBoardComputerTouched: userModified ? true : state.isBoardComputerTouched,
+          isBoardComputerDeselected: userModified && id != null ? false : state.isBoardComputerDeselected,
           selectedBoardComputer: id
         });
       }
+    case orderSessionActions.SET_BOARDCOMPUTER_SELECTION_RESOLVED:
+      {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          isBoardComputerSelectionResolved: true
+        });
+      }
     case orderSessionActions.REMOVE_SINGLE_ORDER_PRODUCT:
       {
         const {
@@ -1407,11 +1436,11 @@ const initializeOrderSession = function initializeOrderSession() {
   }
   return cachedSession;
 };
-const AuthSessionRuntimeSync = _ref => {
+const AuthSessionRuntimeSync = _ref2 => {
   var _branch$entityId;
   let {
     authMode = 'internal'
-  } = _ref;
+  } = _ref2;
   const {
     authenticated,
     initialized,
@@ -1485,13 +1514,13 @@ const AuthSessionRuntimeSync = _ref => {
   }, [authRuntime, authenticated, initialized, authHeaderBranchId, formula, module, isExternalAuthMode]);
   return null;
 };
-const OrderSessionController = _ref2 => {
+const OrderSessionController = _ref3 => {
   let {
     children,
     authMode = 'internal',
     externalAuthSession = null,
     externalAuthRuntime = null
-  } = _ref2;
+  } = _ref3;
   const isSingleOrderPage = (0, _useIsSingleOrder.default)();
   const isExternalAuthMode = authMode === 'external' || Boolean(externalAuthSession);
   const runtimeMode = isExternalAuthMode ? 'external' : 'internal';

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

@@ -0,0 +1,68 @@
+"use strict";
+
+var _dossier = require("../dossier");
+describe('dossier helpers', () => {
+  it('extracts the active boardcomputer update from the order article match', () => {
+    const result = (0, _dossier.extractSessionProductsByOrder)({
+      lines: [{
+        articleNumber: 'BC-1',
+        activeArticle: true,
+        quantity: 1,
+        name: 'Voertuigcodering'
+      }],
+      orderProducts: {
+        towbars: [],
+        cablesets: [],
+        combisets: [],
+        extras: [],
+        discountCode: []
+      },
+      boardComputerUpdate: {
+        articleNumber: 'BC-1'
+      }
+    });
+    expect(result.selectedBoardComputer).toBe('BC-1');
+    expect(result.initialSelectedBoardComputer).toBe('BC-1');
+  });
+  it('falls back to an unclassified active vehicle coding line', () => {
+    const result = (0, _dossier.extractSessionProductsByOrder)({
+      lines: [{
+        articleNumber: 'BC-2',
+        activeArticle: true,
+        quantity: 1,
+        name: 'Voertuigcodering trekhaak'
+      }],
+      orderProducts: {
+        towbars: [],
+        cablesets: [],
+        combisets: [],
+        extras: [],
+        discountCode: []
+      }
+    });
+    expect(result.selectedBoardComputer).toBe('BC-2');
+    expect(result.initialSelectedBoardComputer).toBe('BC-2');
+  });
+  it('does not treat a classified boardcomputer cableset as vehicle coding', () => {
+    const result = (0, _dossier.extractSessionProductsByOrder)({
+      lines: [{
+        articleNumber: 'CABLESET-1',
+        activeArticle: true,
+        quantity: 1,
+        boardComputer: true
+      }],
+      orderProducts: {
+        towbars: [],
+        cablesets: [{
+          articleNumber: 'CABLESET-1'
+        }],
+        combisets: [],
+        extras: [],
+        discountCode: []
+      }
+    });
+    expect(result.selectedCableset).toBe('CABLESET-1');
+    expect(result.selectedBoardComputer).toBe(null);
+    expect(result.initialSelectedBoardComputer).toBe(null);
+  });
+});