thm-p3-configurator 0.0.400 → 0.0.403

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

@@ -684,7 +684,7 @@ const useProductsQuery = exports.useProductsQuery = function useProductsQuery()
  * @description Retrieves the order questions based on the provided license plate or brand/build-year/model
  */
 const useQuestionsQuery = exports.useQuestionsQuery = function useQuestionsQuery() {
-  var _orderData$executionA2, _orderData$executionA4, _orderData$answers, _orderData$answers2, _orderData$answers3, _orderError$response;
+  var _orderError$response$, _orderError$response, _orderError$response$2, _orderError$response2, _orderData$executionA2, _orderData$executionA4, _orderData$answers, _orderData$answers2, _orderData$answers3;
   let questionParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const normalizedQuestionParams = (0, _queryKeyFactory.normalizeOrderParams)(questionParams);
   const {
@@ -693,6 +693,8 @@ const useQuestionsQuery = exports.useQuestionsQuery = function useQuestionsQuery
     isOrderError,
     orderError
   } = useOrderDataQuery(normalizedQuestionParams);
+  const questionsErrorCode = (_orderError$response$ = orderError === null || orderError === void 0 || (_orderError$response = orderError.response) === null || _orderError$response === void 0 || (_orderError$response = _orderError$response.data) === null || _orderError$response === void 0 ? void 0 : _orderError$response.code) !== null && _orderError$response$ !== void 0 ? _orderError$response$ : null;
+  const questionsErrorStatus = (_orderError$response$2 = orderError === null || orderError === void 0 || (_orderError$response2 = orderError.response) === null || _orderError$response2 === void 0 ? void 0 : _orderError$response2.status) !== null && _orderError$response$2 !== void 0 ? _orderError$response$2 : null;
   const execution1AnswerOptions = (0, _react.useMemo)(() => {
     var _orderData$executionA;
     return (0, _helpers__.parseArrayToInputOptions)(orderData === null || orderData === void 0 || (_orderData$executionA = orderData.executionAnswerOptions) === null || _orderData$executionA === void 0 ? void 0 : _orderData$executionA.execution1AnswerOptions);
@@ -708,7 +710,9 @@ const useQuestionsQuery = exports.useQuestionsQuery = function useQuestionsQuery
     execution1Answer: orderData === null || orderData === void 0 || (_orderData$answers = orderData.answers) === null || _orderData$answers === void 0 ? void 0 : _orderData$answers.execution1,
     execution2Answer: orderData === null || orderData === void 0 || (_orderData$answers2 = orderData.answers) === null || _orderData$answers2 === void 0 ? void 0 : _orderData$answers2.execution2,
     durationAnswer: orderData === null || orderData === void 0 || (_orderData$answers3 = orderData.answers) === null || _orderData$answers3 === void 0 ? void 0 : _orderData$answers3.duration,
-    questionsError: (orderError === null || orderError === void 0 || (_orderError$response = orderError.response) === null || _orderError$response === void 0 || (_orderError$response = _orderError$response.data) === null || _orderError$response === void 0 ? void 0 : _orderError$response.code) || orderError,
+    questionsError: questionsErrorCode || orderError,
+    questionsErrorCode,
+    questionsErrorStatus,
     execution1AnswerOptions,
     execution2AnswerOptions,
     durationQuestion

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

@@ -58,6 +58,12 @@ function _interopRequireWildcard(e, r) {
   return n.default = e, t && t.set(e, n), n;
 }
 const licensePlateValidator = new _LicensePlateValidator.default();
+const isValidLicensePlate = function isValidLicensePlate() {
+  let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  const normalizedValue = String(value !== null && value !== void 0 ? value : '');
+  const stripped = normalizedValue.replace(/-/g, '').toUpperCase();
+  return stripped.length === 6 && licensePlateValidator.getSideCode(stripped) > 0;
+};
 const LicensePlateForm = _ref => {
   var _ref2;
   let {
@@ -109,8 +115,7 @@ const LicensePlateForm = _ref => {
       action: 'submit',
       action_value: buttonLabel
     });
-    const stripped = (plate !== null && plate !== void 0 ? plate : '').replace(/-/g, '').toUpperCase();
-    const isValid = stripped.length === 6 && licensePlateValidator.getSideCode(stripped) > 0;
+    const isValid = isValidLicensePlate(plate !== null && plate !== void 0 ? plate : '');
     (0, _Datalayer.pushToDataLayer)({
       event: 'configurator',
       component: trackingComponent,
@@ -119,6 +124,9 @@ const LicensePlateForm = _ref => {
       action: 'submit',
       action_value: isValid ? 'valid' : 'invalid - Uw kenteken staat (nog) niet in onze database. Kies uw voertuig via de merk/model selectie.'
     });
+    if (!isValid) {
+      return;
+    }
     onSubmit(isFilter ? overridePlate : undefined);
   };
   const handleLicensePlateChange = value => {
@@ -162,7 +170,7 @@ const LicensePlateForm = _ref => {
     onClick: () => {
       handleSubmitWithTracking(isFilter ? filterLicensePlate : undefined);
     },
-    isDisabled: !isFilter ? !licensePlate || licensePlate.length < 6 : false,
+    isDisabled: !isValidLicensePlate(isFilter ? filterLicensePlate : licensePlate),
     label: isFilter ? 'Filteren' : 'Volgende'
   })))));
 };

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

@@ -1,14 +1,12 @@
 "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.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");
 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");
@@ -17,11 +15,9 @@ 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/es.array.includes.js");
+require("core-js/modules/es.string.includes.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");
@@ -163,14 +159,6 @@ 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
@@ -209,6 +197,8 @@ const QuestionsForm = _ref => {
     execution2AnswerOptions,
     durationAnswer: durationAnswerPrefilled,
     questionsError,
+    questionsErrorCode,
+    questionsErrorStatus,
     durationQuestion
   } = questionsObject;
 
@@ -278,6 +268,9 @@ const QuestionsForm = _ref => {
           type: _OrderSessionContext.orderSessionActions.CLEAR_ANSWERS
         });
         if (isFilter) {
+          if (questionsError) {
+            return;
+          }
           if (!initialModel) {
             onSubmit({
               type: 'licensePlate',
@@ -293,16 +286,14 @@ const QuestionsForm = _ref => {
           }
           return;
         } else {
-          if (questionsError) {
-            onPrev(1);
-          } else {
+          if (!questionsError) {
             history.push('/configurator/trekhaakpakket');
           }
         }
       }
     }
   }, [isLoadingQuestions, durationOptions, execution1Options, execution2Options, execution2AnswerOptions, execution1AnswerOptions, durationQuestion, isFilter, questionsError]);
-  const isNotFoundQuestionError = questionsError === _constants__.API_ERROR_CODES.notFound || questionsError === _constants__.API_ERROR_CODES.notFoundAldoc;
+  const isNotFoundQuestionError = questionsErrorCode === _constants__.API_ERROR_CODES.notFound || questionsErrorCode === _constants__.API_ERROR_CODES.notFoundAldoc || questionsErrorStatus === 404 || typeof questionsErrorCode === 'string' && questionsErrorCode.includes('NOT_FOUND');
   const isWaitingForInternalSessionContext = APP_CONFIG.internal && initialized && authenticated && !isSessionContextReady;
   const handlePrev = () => {
     (0, _Datalayer.pushToDataLayer)({
@@ -333,8 +324,26 @@ const QuestionsForm = _ref => {
     }));
   }
   if (isNotFoundQuestionError) {
+    if (isFilter) {
+      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, "Het opgegeven kenteken kon niet worden gevonden. Probeer een ander kenteken of zoek via merk.")), /*#__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'
+      })))));
+    }
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
-      to: notFoundRedirectTarget
+      to: "/configurator/geen-producten"
     });
   }
   if (questionsError) {

package/dist/src/shared/__pages__/LicensePlatePage.js

@@ -77,7 +77,7 @@ const LicensePlatePage = () => {
   const [activeStep, setActiveStep] = (0, _react.useState)(0);
   const [, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const themeClass = (0, _helpers__.getConfiguratorThemeClass)((0, _useBranchTheme.useBranchTheme)());
-  const [licensePlateURL, widgetOrEntityId, discountCode, franchiseName, notFound, vestigingRecId] = (0, _useSearchParam.default)(['licensePlate', 'branch', 'discountCode', 'naamKeten', 'notFound', 'vestigingRecId']);
+  const [licensePlateURL, widgetOrEntityId, discountCode, franchiseName, vestigingRecId] = (0, _useSearchParam.default)(['licensePlate', 'branch', 'discountCode', 'naamKeten', 'vestigingRecId']);
   const branchIdOrVestigingRecId = widgetOrEntityId || vestigingRecId;
   const {
     branchById,
@@ -173,9 +173,7 @@ const LicensePlatePage = () => {
     isCentered: true,
     isScrollable: true,
     title: 'Wij zoeken naar de beste oplossing'
-  }, branchIdOrVestigingRecId && isLoadingBranchById && /*#__PURE__*/_react.default.createElement(_TextSpinner.default, null), notFound === 'true' && /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('alert alert-danger mb-3')
-  }, /*#__PURE__*/_react.default.createElement("small", null, "Het opgegeven kenteken kon niet worden gevonden. Probeer een ander kenteken of zoek via merk.")), Steps[activeStep], /*#__PURE__*/_react.default.createElement("div", {
+  }, branchIdOrVestigingRecId && isLoadingBranchById && /*#__PURE__*/_react.default.createElement(_TextSpinner.default, null), Steps[activeStep], /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('align-items-center justify-content-center text-center mt-2')
   }, /*#__PURE__*/_react.default.createElement(_FormSteps.default, {
     count: Steps.length,

package/package.json

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