thm-p3-configurator 0.0.353 → 0.0.355

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

@@ -480,14 +480,14 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
     initialized
   } = (0, _AuthSessionContext.useAuthSession)();
   const isSessionContextReady = (0, _useSessionContextReady.useSessionContextReady)();
-  const orderQueryKey = (0, _queryKeyFactory.getOrderQueryKey)(normalizedOrderParams);
+  const orderQueryKey = APP_CONFIG.internal ? [...(0, _queryKeyFactory.getOrderQueryKey)(normalizedOrderParams), initialized, authenticated, isSessionContextReady] : (0, _queryKeyFactory.getOrderQueryKey)(normalizedOrderParams);
   const serializedOrderParams = (0, _queryKeyFactory.serializeOrderParams)(normalizedOrderParams);
   const hasOrderInput = (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length);
-  const isWaitingForInternalSessionContext = APP_CONFIG.internal && hasOrderInput && (!initialized || authenticated && !isSessionContextReady);
   const orderQuery = (0, _reactQuery.useQuery)(orderQueryKey, {
-    // Embedded internal routes need the session context synced before order
-    // endpoints can resolve the correct branch/formula combination.
-    enabled: hasOrderInput && (!APP_CONFIG.internal || initialized && isSessionContextReady),
+    // Internal embedded routes may resolve before the session context sync
+    // finishes. Include sync state in the query key so the order refetches
+    // automatically once the session context is ready.
+    enabled: hasOrderInput && (!APP_CONFIG.internal || initialized),
     keepPreviousData: true,
     queryFn: async () => {
       var _response$data;
@@ -497,8 +497,8 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
   });
   return {
     orderData: orderQuery === null || orderQuery === void 0 ? void 0 : orderQuery.data,
-    isLoadingOrder: orderQuery.isLoading || isWaitingForInternalSessionContext,
-    isFetchingOrder: orderQuery.isFetching || isWaitingForInternalSessionContext,
+    isLoadingOrder: orderQuery.isLoading,
+    isFetchingOrder: orderQuery.isFetching,
     isOrderError: orderQuery.isError,
     orderError: orderQuery.error
   };

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

@@ -115,7 +115,7 @@ const BottomNavigationBar = () => {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row justify-content-center')
   }, buttons.map(_ref2 => {
-    var _history$location3;
+    var _history$location3, _history$location4;
     let {
       to,
       label,
@@ -137,7 +137,7 @@ const BottomNavigationBar = () => {
       to = '/configurator/gegevens';
     }
     return /*#__PURE__*/_react.default.createElement("div", {
-      key: 'link-' + label,
+      key: "link-".concat(history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.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, _extends({}, setType && {
       onClick: () => {
@@ -155,7 +155,7 @@ const BottomNavigationBar = () => {
       state: {
         prevPathName: history.location.pathname
       },
-      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location3 = history.location) === null || _history$location3 === void 0 ? void 0 : _history$location3.pathname) === '/configurator/montagelocatie' && !selectedBranch
+      isDisabled: (!selectedCableset || !selectedTowbar) && !selectedCombiset && type === 'next' || type === 'next' && (history === null || history === void 0 || (_history$location4 = history.location) === null || _history$location4 === void 0 ? void 0 : _history$location4.pathname) === '/configurator/montagelocatie' && !selectedBranch
     })));
   })))))));
 };

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

@@ -30,9 +30,11 @@ var _PrimaryButton = _interopRequireDefault(require("../__components__/Buttons/P
 var _RadioInput = _interopRequireDefault(require("../__components__/Form/RadioInput"));
 var _TextSpinner = _interopRequireDefault(require("../__components__/Spinners/TextSpinner"));
 var _constants__ = require("../__constants__");
+var _AuthSessionContext = require("../__context__/AuthSessionContext");
 var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
+var _useSessionContextReady = require("../__hooks__/useSessionContextReady");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -142,6 +144,11 @@ const QuestionsForm = _ref => {
     priceCalculationDate
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
+  const {
+    authenticated,
+    initialized
+  } = (0, _AuthSessionContext.useAuthSession)();
+  const isSessionContextReady = (0, _useSessionContextReady.useSessionContextReady)();
   if (isFilter && singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
   }
@@ -332,6 +339,7 @@ const QuestionsForm = _ref => {
     }
   }, [isLoadingQuestions, durationOptions, execution1Options, execution2Options, execution2AnswerOptions, execution1AnswerOptions, durationQuestion, isFilter, questionsError]);
   const isNotFoundQuestionError = questionsError === _constants__.API_ERROR_CODES.notFound || questionsError === _constants__.API_ERROR_CODES.notFoundAldoc;
+  const isWaitingForInternalSessionContext = APP_CONFIG.internal && initialized && authenticated && !isSessionContextReady;
   const handlePrev = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.CLEAR_ANSWERS
@@ -345,6 +353,13 @@ const QuestionsForm = _ref => {
       title: 'Zoeken naar mogelijke opties'
     }));
   }
+  if (isWaitingForInternalSessionContext && isNotFoundQuestionError) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('card-body__loading')
+    }, /*#__PURE__*/_react.default.createElement(_TextSpinner.default, {
+      title: 'Zoeken naar mogelijke opties'
+    }));
+  }
   if (isNotFoundQuestionError) {
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
       to: notFoundRedirectTarget

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

@@ -844,7 +844,7 @@ const InternalAppointmentForm = _ref => {
     form: "quotation",
     label: "Leasemaatschappij:",
     errorMessage: errors === null || errors === void 0 ? void 0 : errors['companyName']
-  }), isCompanyInputFocused && companySearchTerm && companySearchTerm.length >= 3 && businessBranches && businessBranches.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  }), isCompanyInputFocused && companySearchTerm && companySearchTerm.length >= 3 && branchesByType && branchesByType.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('dropdown-results position-absolute w-100 border rounded bg-white shadow'),
     style: {
       maxHeight: '200px',
@@ -857,9 +857,9 @@ const InternalAppointmentForm = _ref => {
     onMouseDown: e => {
       e.preventDefault();
     }
-  }, isLoadingBusinessBranches && /*#__PURE__*/_react.default.createElement("div", {
+  }, isLoadingBranchesByType && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('p-2 text-center')
-  }, /*#__PURE__*/_react.default.createElement("span", null, "Zoeken...")), businessBranches.map(branch => /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("span", null, "Zoeken...")), branchesByType.map(branch => /*#__PURE__*/_react.default.createElement("div", {
     key: branch.entityId,
     className: (0, _helpers__.withStyle)('dropdown-item p-2 border-bottom'),
     style: {

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

@@ -345,12 +345,14 @@ const InternalBranchSelectorModal = () => {
     isLoadingBranchTypes
   } = (0, _queries.useBranchTypes)();
   const [_selectedBranchId, _setSelectedBranchId] = (0, _react.useState)();
+  const [isDismissed, setIsDismissed] = (0, _react.useState)(false);
   const authSession = (0, _AuthSessionContext.useAuthSession)();
   const isSingleOrderPage = (0, _useIsSingleOrder.default)();
   const formula = (0, _FormulaContext.useFormula)();
   const isTMGOrganization = (0, _useIsTmg.useIsTmg)();
   (0, _react.useEffect)(() => {
     _setSelectedBranchId(undefined);
+    setIsDismissed(false);
   }, [isSingleOrderPage]);
   const isLocation = _react.default.useMemo(() => {
     var _authSession$branch2;
@@ -431,8 +433,8 @@ const InternalBranchSelectorModal = () => {
       }
     });
   };
-  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage;
-  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization;
+  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage && !isDismissed;
+  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization && !isDismissed;
 
   // Show loading state only when we actually need to show the modal
   const shouldShowModal = shouldShowModalForSingleOrder || shouldShowModalForOtherPages;
@@ -460,7 +462,8 @@ const InternalBranchSelectorModal = () => {
     hasSecondaryButton: false,
     isPrimaryButtonDisabled: !_selectedBranchId,
     primaryButtonText: 'Ga door',
-    onPrimaryButtonClicked: handlePrimaryButtonClicked
+    onPrimaryButtonClicked: handlePrimaryButtonClicked,
+    onClose: () => setIsDismissed(true)
   }, isSingleOrderPage ? /*#__PURE__*/_react.default.createElement(SingleOrderModalContent, {
     setSelectedBranchId: _setSelectedBranchId,
     isLocation: isLocation,

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

@@ -10,6 +10,7 @@ exports.useFormulaDispatch = exports.useFormula = exports.FormulaController = vo
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _constants__ = require("../__constants__");
+var _AuthSessionContext = require("./AuthSessionContext");
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -58,8 +59,15 @@ const FormulaController = _ref => {
 };
 exports.FormulaController = FormulaController;
 const useFormula = () => {
+  var _ref2, _ref3, _branch$formule$code, _branch$formule, _branch$formule2;
   const formulaContext = (0, _react.useContext)(FormulaContext);
-  return formulaContext;
+  const {
+    branch
+  } = (0, _AuthSessionContext.useAuthSession)();
+  if (formulaContext) {
+    return formulaContext;
+  }
+  return (0, _constants__.mapBranchFormulaToConfiguratorFormula)((_ref2 = (_ref3 = (_branch$formule$code = branch === null || branch === void 0 || (_branch$formule = branch.formule) === null || _branch$formule === void 0 ? void 0 : _branch$formule.code) !== null && _branch$formule$code !== void 0 ? _branch$formule$code : branch === null || branch === void 0 || (_branch$formule2 = branch.formule) === null || _branch$formule2 === void 0 ? void 0 : _branch$formule2.title) !== null && _ref3 !== void 0 ? _ref3 : branch === null || branch === void 0 ? void 0 : branch.formule) !== null && _ref2 !== void 0 ? _ref2 : branch === null || branch === void 0 ? void 0 : branch.formulaCode);
 };
 exports.useFormula = useFormula;
 const useFormulaDispatch = () => {

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

@@ -156,10 +156,12 @@ const InternalSingleOrderPage = () => {
     anderAfleveradres,
     afhalenInWinkel
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
-  let formula = (0, _FormulaContext.useFormula)();
+  const sessionFormula = (0, _FormulaContext.useFormula)();
+  let formula = sessionFormula;
   if (singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
   }
+  const singleOrderCreationFormula = sessionFormula === _constants__.CONFIGURATOR_FORMULAS.TMG ? _constants__.CONFIGURATOR_FORMULAS.TMG : formula === _constants__.CONFIGURATOR_FORMULAS.THM ? _constants__.CONFIGURATOR_FORMULAS.TM : formula;
   const themeClass = (0, _helpers__.getConfiguratorThemeClassByFormula)(formula);
   const wrapperClass = "thm-configurator-wrapper thm-configurator-wrapper--offset ".concat(themeClass);
   const {
@@ -364,7 +366,7 @@ const InternalSingleOrderPage = () => {
         var _response$data2;
         // Regular flow for offline orders
         const preferredDateTime = appointment !== null && appointment !== void 0 && appointment.date && appointment !== null && appointment !== void 0 && appointment.time ? (0, _helpers__.parseDateAndTimeToTimestamp)(appointment === null || appointment === void 0 ? void 0 : appointment.date, appointment === null || appointment === void 0 ? void 0 : appointment.time) : null;
-        const response = await createSingleOrder(_objectSpread(_objectSpread({
+        const response = await createSingleOrder({
           licensePlate: filters.licensePlate,
           model: filters.model,
           cart: singleOrderCart,
@@ -372,12 +374,8 @@ const InternalSingleOrderPage = () => {
           customer: _objectSpread(_objectSpread({}, customer), {}, {
             anderAfleveradres,
             afhalenInWinkel
-          })
-        }, formula === _constants__.CONFIGURATOR_FORMULAS.THM ? {
-          formula: _constants__.CONFIGURATOR_FORMULAS.TM
-        } : {
-          formula
-        }), {}, {
+          }),
+          formula: singleOrderCreationFormula,
           branchId: selectedBranch,
           channel,
           preferredDateTime,
@@ -387,7 +385,7 @@ const InternalSingleOrderPage = () => {
           zakelijkContactTelefoonnummer: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakelijkContactTelefoonnummer) || undefined : undefined,
           zakeiljkContactFactuuradres: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakeiljkContactFactuuradres) || undefined : undefined,
           zakelijkContactEMailadres: vehiclePayload.ownershipType === _constants__.VEHICLE_SINGLE_ORDER_OWNERSHIP_TYPE.Zakelijk ? (customer === null || customer === void 0 ? void 0 : customer.zakelijkContactEMailadres) || undefined : undefined
-        }));
+        });
         if (response !== null && response !== void 0 && (_response$data2 = response.data) !== null && _response$data2 !== void 0 && (_response$data2 = _response$data2.data) !== null && _response$data2 !== void 0 && _response$data2.entityId) {
           setCreatedEntityId(response.data.data.entityId);
         }

package/package.json

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