thm-p3-configurator 0.0.352 → 0.0.353

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,13 +476,18 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
     model
   } = normalizedOrderParams;
   const {
+    authenticated,
     initialized
   } = (0, _AuthSessionContext.useAuthSession)();
+  const isSessionContextReady = (0, _useSessionContextReady.useSessionContextReady)();
   const orderQueryKey = (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, {
-    enabled: hasOrderInput && (!APP_CONFIG.internal || initialized),
+    // 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),
     keepPreviousData: true,
     queryFn: async () => {
       var _response$data;
@@ -491,8 +497,8 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
   });
   return {
     orderData: orderQuery === null || orderQuery === void 0 ? void 0 : orderQuery.data,
-    isLoadingOrder: orderQuery.isLoading,
-    isFetchingOrder: orderQuery.isFetching,
+    isLoadingOrder: orderQuery.isLoading || isWaitingForInternalSessionContext,
+    isFetchingOrder: orderQuery.isFetching || isWaitingForInternalSessionContext,
     isOrderError: orderQuery.isError,
     orderError: orderQuery.error
   };

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");
@@ -138,6 +146,14 @@ const QuestionsForm = _ref => {
     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 +330,14 @@ 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 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 +345,29 @@ const QuestionsForm = _ref => {
       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 +375,6 @@ const QuestionsForm = _ref => {
       });
     }
   }
-  const handlePrev = () => {
-    dispatch({
-      type: _OrderSessionContext.orderSessionActions.CLEAR_ANSWERS
-    });
-    onPrev();
-  };
   const handleDurationChange = value => {
     if (isFilter) {
       setFilterAnswers(prev => _objectSpread(_objectSpread({}, prev), {}, {

package/package.json

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