thm-p3-configurator 0.0.385 → 0.0.388

package/dist/src/shared/__api__/__tests__/queryKeyFactory.test.js

@@ -9,7 +9,7 @@ describe('queryKeyFactory', () => {
       internal: true
     };
   });
-  it('normalizes buildYear into constructionYear without mutating input', () => {
+  it('normalizes incoming year fields into buildYear without mutating input', () => {
     const params = {
       buildYear: '2024',
       formula: 'THC',
@@ -19,7 +19,7 @@ describe('queryKeyFactory', () => {
     };
     const normalized = (0, _queryKeyFactory.normalizeOrderParams)(params);
     expect(normalized).toEqual({
-      constructionYear: '2024',
+      buildYear: '2024',
       formula: 'THC',
       skipFilters: false,
       discountAmount: 0,
@@ -33,6 +33,15 @@ describe('queryKeyFactory', () => {
       priceCalculationDate: '2026-03-09'
     });
   });
+  it('maps legacy constructionYear into buildYear', () => {
+    expect((0, _queryKeyFactory.normalizeOrderParams)({
+      formula: 'THC',
+      constructionYear: '02/2020 tot heden'
+    })).toEqual({
+      formula: 'THC',
+      buildYear: '02/2020 tot heden'
+    });
+  });
   it('drops priceCalculationDate for external mode', () => {
     global.APP_CONFIG = {
       internal: false
@@ -61,7 +70,7 @@ describe('queryKeyFactory', () => {
       cart: '[]',
       buildYear: '2024'
     });
-    expect(first).toBe('licensePlate=12AB34&formula=THC&constructionYear=2024&durationAnswer=Lang&extraPriceAmount=10&cart=%5B%5D');
+    expect(first).toBe('licensePlate=12AB34&formula=THC&buildYear=2024&durationAnswer=Lang&extraPriceAmount=10&cart=%5B%5D');
     expect(second).toBe(first);
   });
   it('preserves legacy getOrder request semantics by omitting falsy values', () => {

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

@@ -69,7 +69,7 @@ function _toPrimitive(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
-const ORDER_PARAM_PRIORITY = ['licensePlate', 'model', 'formula', 'constructionYear', 'durationAnswer', 'executionAnswer1', 'executionAnswer2', 'selectBoardComputerUpdate', 'branchId', 'skipFilters', 'discountCode', 'discountAmount', 'discountPercentage', 'montageRate', 'extraPriceAmount', 'priceCalculationDate', 'cart'];
+const ORDER_PARAM_PRIORITY = ['licensePlate', 'model', 'formula', 'buildYear', 'durationAnswer', 'executionAnswer1', 'executionAnswer2', 'selectBoardComputerUpdate', 'branchId', 'skipFilters', 'discountCode', 'discountAmount', 'discountPercentage', 'montageRate', 'extraPriceAmount', 'priceCalculationDate', 'cart'];
 const removeNullishEntries = function removeNullishEntries() {
   let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return Object.fromEntries(Object.entries(value).filter(_ref => {
@@ -94,10 +94,10 @@ const sortObjectKeys = function sortObjectKeys() {
 const normalizeOrderParams = exports.normalizeOrderParams = function normalizeOrderParams() {
   let orderParameters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const normalizedParams = removeNullishEntries(_objectSpread({}, orderParameters));
-  if (normalizedParams.buildYear != null) {
-    normalizedParams.constructionYear = normalizedParams.buildYear;
-    delete normalizedParams.buildYear;
+  if (normalizedParams.buildYear == null && normalizedParams.constructionYear != null) {
+    normalizedParams.buildYear = normalizedParams.constructionYear;
   }
+  delete normalizedParams.constructionYear;
   if (normalizedParams.selectBoardComputerUpdate === false || normalizedParams.selectBoardComputerUpdate === 'false') {
     delete normalizedParams.selectBoardComputerUpdate;
   }

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

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -13,6 +15,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.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");
@@ -29,9 +33,11 @@ var _constants__ = require("../../__constants__");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
+var _singleOrderBranchSelector = require("../../__helpers__/singleOrderBranchSelector");
 var _useIsSingleOrder = _interopRequireDefault(require("../../__hooks__/useIsSingleOrder"));
 var _useIsTmg = require("../../__hooks__/useIsTmg");
 var _OrderTypeSelectorModal = _interopRequireWildcard(require("./OrderTypeSelectorModal"));
+var _reactRouterDom = require("react-router-dom");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -297,6 +303,7 @@ const SingleOrderModalContent = _ref6 => {
   }));
 };
 const InternalBranchSelectorModal = () => {
+  const location = (0, _reactRouterDom.useLocation)();
   const {
     branchTypes,
     isLoadingBranchTypes
@@ -315,8 +322,11 @@ const InternalBranchSelectorModal = () => {
     existingDossierId,
     orderType,
     licensePlate,
-    model
+    model,
+    singleOrderFlowRevision
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const previousSelectedBranchRef = (0, _react.useRef)(selectedBranch);
+  const previousLocationKeyRef = (0, _react.useRef)(location.key);
   const {
     myBranches,
     isLoadingMyBranches
@@ -348,6 +358,31 @@ const InternalBranchSelectorModal = () => {
       branchTypes
     });
   }, [selectedBranch, branchById, isTMGOrganization, branchTypes, dispatch]);
+  (0, _react.useEffect)(() => {
+    if ((0, _singleOrderBranchSelector.shouldResetDismissedBranchSelectorState)({
+      previousSelectedBranch: previousSelectedBranchRef.current,
+      selectedBranch
+    })) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+    previousSelectedBranchRef.current = selectedBranch;
+  }, [selectedBranch]);
+  (0, _react.useEffect)(() => {
+    const isSingleOrderPath = location.pathname.includes('configurator/single-order') || location.pathname.includes('configurator/losse-order');
+    const didLocationEntryChange = previousLocationKeyRef.current !== location.key;
+    if (isSingleOrderPath && didLocationEntryChange) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+    previousLocationKeyRef.current = location.key;
+  }, [location.key, location.pathname]);
+  (0, _react.useEffect)(() => {
+    if (isSingleOrderPage && !selectedBranch) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+  }, [singleOrderFlowRevision, isSingleOrderPage, selectedBranch]);
   const handlePrimaryButtonClicked = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,

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

@@ -204,7 +204,8 @@ const INITIAL_ORDER_SESSION_STATE = {
   isTowCenterBranch: false,
   anderAfleveradres: false,
   afhalenInWinkel: false,
-  hasGoedkeuringsnummerActivity: false
+  hasGoedkeuringsnummerActivity: false,
+  singleOrderFlowRevision: 0
 };
 const orderSessionActions = exports.orderSessionActions = {
   INITIALIZE_NEW_ORDER: 'INITIALIZE_NEW_ORDER',
@@ -334,13 +335,15 @@ const orderSessionReducer = (state, action) => {
             selectedBoardComputer: null,
             isBoardComputerDeselected: false,
             singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart,
-            discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode
+            discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode,
+            singleOrderFlowRevision: state.singleOrderFlowRevision + 1
           });
         }
         return _objectSpread(_objectSpread({}, INITIAL_ORDER_SESSION_STATE), {}, {
           selectedBranch: branchId || INITIAL_ORDER_SESSION_STATE.selectedBranch,
           discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode,
-          singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart
+          singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart,
+          singleOrderFlowRevision: state.singleOrderFlowRevision + 1
         });
       }
     case orderSessionActions.INITIALIZE_EXISTING_ORDER:
@@ -376,7 +379,8 @@ const orderSessionReducer = (state, action) => {
         window.sessionStorage.removeItem(_constants__.PRIVATE_SINGLE_ORDER_SESSION_KEY);
         return _objectSpread(_objectSpread({}, INITIAL_ORDER_SESSION_STATE), {}, {
           selectedBranch: null,
-          singleOrderCart: []
+          singleOrderCart: [],
+          singleOrderFlowRevision: state.singleOrderFlowRevision + 1
         });
       }
     case orderSessionActions.EMPTY_SINGLE_ORDER_CART:
@@ -1372,6 +1376,7 @@ const initializeOrderSession = function initializeOrderSession() {
   return cachedSession;
 };
 const AuthSessionRuntimeSync = _ref => {
+  var _branch$entityId;
   let {
     authMode = 'internal'
   } = _ref;
@@ -1388,25 +1393,25 @@ const AuthSessionRuntimeSync = _ref => {
   const lastSyncedContextRef = (0, _react.useRef)(null);
   const authRuntime = (0, _AuthRuntimeContext.useAuthRuntime)();
   const isExternalAuthMode = authMode === 'external';
+  const sessionBranchId = (_branch$entityId = branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _branch$entityId !== void 0 ? _branch$entityId : null;
+  const authHeaderBranchId = isExternalAuthMode ? sessionBranchId : selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : sessionBranchId;
   (0, _react.useLayoutEffect)(() => {
-    var _ref2;
     if (!APP_CONFIG.internal || !initialized) {
       if (APP_CONFIG.internal) {
         authRuntime.setSessionContextReady(false);
       }
       return;
     }
-    authRuntime.setActiveBranchId((_ref2 = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref2 !== void 0 ? _ref2 : null);
-  }, [authRuntime, initialized, selectedBranch, branch]);
+    authRuntime.setActiveBranchId(authHeaderBranchId);
+  }, [authRuntime, initialized, authHeaderBranchId]);
   (0, _react.useEffect)(() => {
-    var _ref3;
     if (!APP_CONFIG.internal || !initialized) {
       if (APP_CONFIG.internal) {
         authRuntime.setSessionContextReady(false);
       }
       return;
     }
-    const branchId = (_ref3 = selectedBranch !== null && selectedBranch !== void 0 ? selectedBranch : branch === null || branch === void 0 ? void 0 : branch.entityId) !== null && _ref3 !== void 0 ? _ref3 : null;
+    const branchId = authHeaderBranchId;
     if (!authenticated || !branchId || !formula) {
       lastSyncedContextRef.current = null;
       authRuntime.setSessionContextReady(false);
@@ -1445,16 +1450,16 @@ const AuthSessionRuntimeSync = _ref => {
     return () => {
       isCancelled = true;
     };
-  }, [authRuntime, authenticated, initialized, selectedBranch, branch, formula, module, isExternalAuthMode]);
+  }, [authRuntime, authenticated, initialized, authHeaderBranchId, formula, module, isExternalAuthMode]);
   return null;
 };
-const OrderSessionController = _ref4 => {
+const OrderSessionController = _ref2 => {
   let {
     children,
     authMode = 'internal',
     externalAuthSession = null,
     externalAuthRuntime = null
-  } = _ref4;
+  } = _ref2;
   const isSingleOrderPage = (0, _useIsSingleOrder.default)();
   const isExternalAuthMode = authMode === 'external' || Boolean(externalAuthSession);
   const runtimeMode = isExternalAuthMode ? 'external' : 'internal';

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldResetDismissedBranchSelectorState = void 0;
+const shouldResetDismissedBranchSelectorState = _ref => {
+  let {
+    previousSelectedBranch,
+    selectedBranch
+  } = _ref;
+  return Boolean(previousSelectedBranch) && !selectedBranch;
+};
+exports.shouldResetDismissedBranchSelectorState = shouldResetDismissedBranchSelectorState;

package/dist/src/shared/__hooks__/useIsSingleOrder.js

@@ -8,11 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useIsSingleOrder = exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
-var _react = require("react");
 const useIsSingleOrder = () => {
-  return (0, _react.useMemo)(() => {
-    return typeof window !== 'undefined' && (window.location.pathname.includes('configurator/single-order') || window.location.pathname.includes('configurator/losse-order'));
-  }, []);
+  return typeof window !== 'undefined' && (window.location.pathname.includes('configurator/single-order') || window.location.pathname.includes('configurator/losse-order'));
 };
 exports.useIsSingleOrder = useIsSingleOrder;
 var _default = exports.default = useIsSingleOrder;

package/package.json

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