thm-p3-configurator 0.0.385 → 0.0.387

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/__context__/OrderSessionContext.js

@@ -1372,6 +1372,7 @@ const initializeOrderSession = function initializeOrderSession() {
   return cachedSession;
 };
 const AuthSessionRuntimeSync = _ref => {
+  var _branch$entityId;
   let {
     authMode = 'internal'
   } = _ref;
@@ -1388,25 +1389,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 +1446,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/package.json

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