thm-p3-configurator 0.0.352 → 0.0.354

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

@@ -38,6 +38,7 @@ var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _singleOrderArticles = require("../__helpers__/singleOrderArticles");
+var _useSessionContextReady = require("../__hooks__/useSessionContextReady");
 var _authenticatedProxyApi = require("./authenticatedProxyApi");
 var _orderApi = require("./orderApi");
 var _publicProxyApi = require("./publicProxyApi");
@@ -475,12 +476,17 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
     model
   } = normalizedOrderParams;
   const {
+    authenticated,
     initialized
   } = (0, _AuthSessionContext.useAuthSession)();
-  const orderQueryKey = (0, _queryKeyFactory.getOrderQueryKey)(normalizedOrderParams);
+  const isSessionContextReady = (0, _useSessionContextReady.useSessionContextReady)();
+  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 orderQuery = (0, _reactQuery.useQuery)(orderQueryKey, {
+    // 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 () => {

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

@@ -1,10 +1,14 @@
 "use strict";
 
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.search.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");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.url-search-params.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,7 +17,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.search.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.url-search-params.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouter = require("react-router");
 var _queries = require("../__api__/queries");
@@ -22,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
@@ -134,10 +144,23 @@ 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;
   }
   const history = (0, _reactRouter.useHistory)();
+  const {
+    search
+  } = (0, _reactRouter.useLocation)();
+  const notFoundRedirectTarget = (0, _react.useMemo)(() => {
+    const searchParams = new URLSearchParams(search);
+    searchParams.set('notFound', 'true');
+    return "/configurator".concat(searchParams.size ? "?".concat(searchParams.toString()) : '');
+  }, [search]);
 
   // Create a modified version of execution answers for the query
   // Only include both execution answers if both are provided
@@ -314,17 +337,15 @@ const QuestionsForm = _ref => {
         }
       }
     }
-  }, [isLoadingQuestions, durationOptions, execution1Options, execution2Options, execution2AnswerOptions, execution1AnswerOptions, durationQuestion, isFilter]);
-  if (questionsError === _constants__.API_ERROR_CODES.notFound || questionsError === _constants__.API_ERROR_CODES.notFoundAldoc) {
-    return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
-      to: "/configurator?notFound=true"
-    });
-  }
-  if (questionsError) {
-    return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
-      to: "/configurator?notFound=true"
+  }, [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
     });
-  }
+    onPrev();
+  };
   if (isLoadingQuestions) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _helpers__.withStyle)('card-body__loading')
@@ -332,6 +353,36 @@ 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
+    });
+  }
+  if (questionsError) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('card-body')
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('alert alert-danger mb-3')
+    }, /*#__PURE__*/_react.default.createElement("small", null, "We konden de voertuiggegevens tijdelijk niet ophalen. Probeer het opnieuw.")), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('row align-items-center justify-content-end')
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)("col col-sm-auto mt-1")
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _helpers__.withStyle)('d-grid gap-2')
+    }, /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
+      type: "button",
+      isDisabled: false,
+      onClick: handlePrev,
+      label: 'Ga terug'
+    })))));
+  }
   if (!(durationOptions !== null && durationOptions !== void 0 && durationOptions.length) && !(execution1Options !== null && execution1Options !== void 0 && execution1Options.length) && !(execution2Options !== null && execution2Options !== void 0 && execution2Options.length) && !(execution2AnswerOptions !== null && execution2AnswerOptions !== void 0 && execution2AnswerOptions.length) && !(execution1AnswerOptions !== null && execution1AnswerOptions !== void 0 && execution1AnswerOptions.length) && !(durationQuestion !== null && durationQuestion !== void 0 && durationQuestion.length)) {
     if (!isFilter) {
       return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
@@ -339,12 +390,6 @@ const QuestionsForm = _ref => {
       });
     }
   }
-  const handlePrev = () => {
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.CLEAR_ANSWERS
-    });
-    onPrev();
-  };
   const handleDurationChange = value => {
     if (isFilter) {
       setFilterAnswers(prev => _objectSpread(_objectSpread({}, prev), {}, {

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/__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/package.json

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