thm-p3-configurator 0.0.375 → 0.0.377

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

@@ -44,6 +44,12 @@ const publicProxyApi = exports.publicProxyApi = {
       'Content-Type': 'application/json'
     }
   }),
+  getConfiguratorLocations: locationsParams => client("api/public/v1/configurator/locations?".concat(locationsParams), {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  }),
   getHeadquartersChannels: () => client("api/public/v1/channels?type=Hoofdkantoor", {
     method: 'GET',
     headers: {

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

@@ -16,7 +16,7 @@ require("core-js/modules/web.url-search-params.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleOrderCart = exports.useSingleOrderBranchesQuery = exports.useSingleOrderBranchTypes = exports.useSingleOrderArticles = exports.useQuestionsQuery = exports.useProductsQuery = exports.useProductFieldLabels = exports.usePrivateDossierByTypeAndIdQuery = exports.usePartBrands = exports.useOrderDataQuery = exports.useMyBranches = exports.useModelsQuery = exports.useMarketingChannels = exports.useCountriesQuery = exports.useBusinessBranches = exports.useBuildYearsQuery = exports.useBrandsQuery = exports.useBranchesQuery = exports.useBranchesByType = exports.useBranchTypes = exports.useBranchByIdOrWidgetId = exports.useArticleTypes = exports.useArticleSubGroups = exports.useArticleGroups = exports.useActiveDiscounts = void 0;
+exports.useSingleOrderCart = exports.useSingleOrderBranchesQuery = exports.useSingleOrderBranchTypes = exports.useSingleOrderArticles = exports.useQuestionsQuery = exports.useProductsQuery = exports.useProductFieldLabels = exports.usePrivateDossierByTypeAndIdQuery = exports.usePartBrands = exports.useOrderDataQuery = exports.useMyBranches = exports.useModelsQuery = exports.useMarketingChannels = exports.useCountriesQuery = exports.useConfiguratorLocationsQuery = exports.useBusinessBranches = exports.useBuildYearsQuery = exports.useBrandsQuery = exports.useBranchesQuery = exports.useBranchesByType = exports.useBranchTypes = exports.useBranchByIdOrWidgetId = exports.useArticleTypes = exports.useArticleSubGroups = exports.useArticleGroups = exports.useActiveDiscounts = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.json.stringify.js");
@@ -86,6 +86,7 @@ function _toPrimitive(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
+const ORDER_QUERY_STALE_TIME_MS = 5 * 60 * 1000;
 /**
  * @description Retrieves the car brand options
  */
@@ -490,6 +491,9 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
     // automatically once the session context is ready.
     enabled: hasOrderInput && (!APP_CONFIG.internal || initialized),
     keepPreviousData: true,
+    staleTime: ORDER_QUERY_STALE_TIME_MS,
+    refetchOnMount: false,
+    refetchOnWindowFocus: false,
     queryFn: async () => {
       var _response$data;
       const response = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(serializedOrderParams);
@@ -671,7 +675,10 @@ exports.useSingleOrderBranchesQuery = useSingleOrderBranchesQuery;
 const useBranchesQuery = branchesParams => {
   const branchesParamsString = new URLSearchParams((0, _helpers__.removeNullishProps)(branchesParams)).toString();
   const branchesQuery = (0, _reactQuery.useQuery)(['branches-test', branchesParamsString], {
-    queryFn: () => _publicProxyApi.publicProxyApi.getBranches(branchesParamsString).then(res => res.data)
+    queryFn: () => _publicProxyApi.publicProxyApi.getBranches(branchesParamsString).then(res => res.data),
+    keepPreviousData: true,
+    staleTime: 5 * 60 * 1000,
+    refetchOnWindowFocus: false
   });
   return {
     isBranchesError: branchesQuery.isError,
@@ -680,11 +687,30 @@ const useBranchesQuery = branchesParams => {
   };
 };
 
+/**
+ * @description Retrieves the compact configurator locations view model
+ */
+exports.useBranchesQuery = useBranchesQuery;
+const useConfiguratorLocationsQuery = locationsParams => {
+  const locationsParamsString = new URLSearchParams((0, _helpers__.removeNullishProps)(locationsParams)).toString();
+  const locationsQuery = (0, _reactQuery.useQuery)(['configurator-locations', locationsParamsString], {
+    queryFn: () => _publicProxyApi.publicProxyApi.getConfiguratorLocations(locationsParamsString).then(res => res.data),
+    keepPreviousData: true,
+    staleTime: 5 * 60 * 1000,
+    refetchOnWindowFocus: false
+  });
+  return {
+    isLocationsError: locationsQuery.isError,
+    isLoadingLocations: locationsQuery.isLoading,
+    locations: locationsQuery === null || locationsQuery === void 0 ? void 0 : locationsQuery.data
+  };
+};
+
 /**
  * @description Retrieves available branches by type
  * @param {String} type - The type of branches to retrieve
  */
-exports.useBranchesQuery = useBranchesQuery;
+exports.useConfiguratorLocationsQuery = useConfiguratorLocationsQuery;
 const useBranchesByType = _ref4 => {
   let {
     formula,

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

@@ -98,6 +98,15 @@ const normalizeOrderParams = exports.normalizeOrderParams = function normalizeOr
     normalizedParams.constructionYear = normalizedParams.buildYear;
     delete normalizedParams.buildYear;
   }
+  if (normalizedParams.selectBoardComputerUpdate === false || normalizedParams.selectBoardComputerUpdate === 'false') {
+    delete normalizedParams.selectBoardComputerUpdate;
+  }
+  if (Array.isArray(normalizedParams.cart) && normalizedParams.cart.length === 0) {
+    delete normalizedParams.cart;
+  }
+  if (normalizedParams.cart === '[]') {
+    delete normalizedParams.cart;
+  }
   if (!APP_CONFIG.internal) {
     delete normalizedParams.priceCalculationDate;
   }

package/dist/src/shared/__components__/LocationsSelector/LocationAutoComplete.js

@@ -73,24 +73,32 @@ const LocationAutoComplete = _ref => {
   const [loading, setLoading] = (0, _react.useState)(false);
   const [error, setError] = (0, _react.useState)('');
   const debounceTimer = (0, _react.useRef)(null);
+  const placesServiceContainerRef = (0, _react.useRef)(null);
   const trackInput = (0, _useDebouncedPush.default)();
   const map = (0, _reactGoogleMaps.useMap)();
   const places = (0, _reactGoogleMaps.useMapsLibrary)('places');
   (0, _react.useEffect)(() => {
-    if (!places || !map) return;
+    if (!places) return;
     setAutocompleteService(new places.AutocompleteService());
-    setPlacesService(new places.PlacesService(map));
+    setPlacesService(new places.PlacesService(map || placesServiceContainerRef.current));
     setSessionToken(new places.AutocompleteSessionToken());
-    return () => setAutocompleteService(null);
+    return () => {
+      setAutocompleteService(null);
+      setPlacesService(null);
+    };
   }, [map, places]);
   (0, _react.useEffect)(() => {
     return () => clearTimeout(debounceTimer.current);
   }, []);
   const fetchPredictions = (0, _react.useCallback)(async inputValue => {
+    var _response$predictions;
     if (!autocompleteService || !inputValue) {
       setPredictionResults([]);
+      setLoading(false);
+      setError('');
       return;
     }
+    setError('');
     const request = {
       input: inputValue,
       sessionToken,
@@ -100,11 +108,21 @@ const LocationAutoComplete = _ref => {
       }
     };
     const response = await autocompleteService.getPlacePredictions(request);
-    response.predictions.length > 0 && setLoading(false);
-    if (response.status !== 'OK') {
-      setError(response.status);
+    const predictions = (_response$predictions = response === null || response === void 0 ? void 0 : response.predictions) !== null && _response$predictions !== void 0 ? _response$predictions : [];
+    const status = response === null || response === void 0 ? void 0 : response.status;
+    setLoading(false);
+    if (predictions.length > 0) {
+      setError('');
+      setPredictionResults(predictions);
+      return;
+    }
+    if (status && status !== 'OK') {
+      setPredictionResults([]);
+      setError(status);
+      return;
     }
-    setPredictionResults(response.predictions);
+    setPredictionResults([]);
+    setError('ZERO_RESULTS');
   }, [autocompleteService, sessionToken]);
   const onInputChange = (0, _react.useCallback)(event => {
     var _event$target;
@@ -124,33 +142,36 @@ const LocationAutoComplete = _ref => {
   }, [fetchPredictions, trackInput]);
   const handleSuggestionClick = (0, _react.useCallback)(placeId => {
     var _document$querySelect;
-    if (!places) return;
+    if (!places || !placesService) return;
     const detailRequestOptions = {
       placeId,
       fields: ['geometry', 'name', 'formatted_address'],
       sessionToken
     };
-    const detailsRequestCallback = placeDetails => {
-      var _placeDetails$formatt, _placeDetails$geometr;
+    const detailsRequestCallback = (placeDetails, status) => {
+      var _placeDetails$geometr, _placeDetails$formatt;
+      if (status !== 'OK' || !(placeDetails !== null && placeDetails !== void 0 && (_placeDetails$geometr = placeDetails.geometry) !== null && _placeDetails$geometr !== void 0 && _placeDetails$geometr.location)) {
+        setPredictionResults([]);
+        setDropdownActive(false);
+        return;
+      }
       setPredictionResults([]);
       setInputValue((_placeDetails$formatt = placeDetails === null || placeDetails === void 0 ? void 0 : placeDetails.formatted_address) !== null && _placeDetails$formatt !== void 0 ? _placeDetails$formatt : '');
       setSessionToken(new places.AutocompleteSessionToken());
       setDropdownActive(false);
-      if (placeDetails !== null && placeDetails !== void 0 && (_placeDetails$geometr = placeDetails.geometry) !== null && _placeDetails$geometr !== void 0 && _placeDetails$geometr.location) {
-        const {
-          lat,
-          lng
-        } = placeDetails.geometry.location;
-        const coordinates = {
-          lat: lat(),
-          lng: lng()
-        };
-        onLocationUpdate(coordinates, true);
-      }
+      const {
+        lat,
+        lng
+      } = placeDetails.geometry.location;
+      const coordinates = {
+        lat: lat(),
+        lng: lng()
+      };
+      onLocationUpdate(coordinates, true);
     };
-    placesService === null || placesService === void 0 || placesService.getDetails(detailRequestOptions, detailsRequestCallback);
+    placesService.getDetails(detailRequestOptions, detailsRequestCallback);
     (_document$querySelect = document.querySelector((0, _helpers__.withStyle)("dealer-autocomplete__list"))) === null || _document$querySelect === void 0 || _document$querySelect.scrollTo(0, 0);
-  }, [places, placesService, sessionToken, onLocationUpdate, predictionResults]);
+  }, [places, placesService, sessionToken, onLocationUpdate]);
   const handleSubmit = event => {
     event.preventDefault();
   };
@@ -175,10 +196,10 @@ const LocationAutoComplete = _ref => {
   }), /*#__PURE__*/_react.default.createElement("i", {
     className: "".concat((0, _helpers__.withStyle)('dealer-autocomplete__search-icon'), " far fa-search")
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)("dealer-autocomplete__loader ".concat(dropdownActive ? 'active' : ''))
+    className: (0, _helpers__.withStyle)("dealer-autocomplete__loader ".concat(loading ? 'active' : ''))
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "fas fa-cog fa-spin"
-  })), predictionResults.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  })), dropdownActive && (loading || error || predictionResults.length > 0) && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("dealer-autocomplete__list ".concat(dropdownActive ? 'active' : ''))
   }, loading && /*#__PURE__*/_react.default.createElement(LocationsLoading, null), error && /*#__PURE__*/_react.default.createElement(LocationsNotFound, null), predictionResults.map(_ref2 => {
     let {
@@ -193,6 +214,16 @@ const LocationAutoComplete = _ref => {
       className: className,
       onClick: () => handleSuggestionClick(place_id)
     }, /*#__PURE__*/_react.default.createElement("p", null, description));
-  })));
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    ref: placesServiceContainerRef,
+    style: {
+      height: 0,
+      left: -9999,
+      overflow: 'hidden',
+      position: 'absolute',
+      top: -9999,
+      width: 0
+    }
+  }));
 };
 var _default = exports.default = LocationAutoComplete;

package/dist/src/shared/__components__/LocationsSelector/LocationDetails.js

@@ -17,7 +17,6 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _react = _interopRequireWildcard(require("react"));
-var _queries = require("../../__api__/queries");
 var _helpers__ = require("../../__helpers__");
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
@@ -157,6 +156,7 @@ const formatDate = dateStr => {
  * Normalises a raw branch object (from GET /branches/:id) into display props.
  */
 const buildDetailProps = branch => {
+  var _branch$haalEnBrengSe, _branch$extraGesloten;
   if (!branch) return null;
   return {
     leenauto: {
@@ -169,11 +169,11 @@ const buildDetailProps = branch => {
       voorwaarden: branch.leenfietsVoorwaarden
     },
     haalEnBrengservice: {
-      status: branch.haalEnBrengServiceJaNee,
+      status: (_branch$haalEnBrengSe = branch.haalEnBrengServiceJaNee) !== null && _branch$haalEnBrengSe !== void 0 ? _branch$haalEnBrengSe : branch.haalEnBrengService,
       voorwaarden: branch.haalEnBrengServiceVoorwaarden
     },
     betaalmethoden: Array.isArray(branch.betaalmethoden) ? branch.betaalmethoden.map(m => m && typeof m === 'object' ? m.title : m).filter(Boolean) : branch.betaalmethoden,
-    extraGeslotenDagen: branch.extraGeslotenDagen
+    extraGeslotenDagen: (_branch$extraGesloten = branch.extraGeslotenDagen) !== null && _branch$extraGesloten !== void 0 ? _branch$extraGesloten : branch.extraGeslotenDagenVestiging
   };
 };
 
@@ -183,39 +183,14 @@ const buildDetailProps = branch => {
  */
 const LocationDetails = _ref4 => {
   let {
-    id
+    initialBranch = null
   } = _ref4;
-  const {
-    branchById,
-    isLoadingBranchById
-  } = (0, _queries.useBranchByIdOrWidgetId)(id || '');
   const today = (0, _react.useMemo)(() => {
     const d = new Date();
     d.setHours(0, 0, 0, 0);
     return d;
   }, []);
-  if (isLoadingBranchById && !branchById) {
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _helpers__.withStyle)('d-flex align-items-center gap-1 mt-2 pt-2'),
-      style: {
-        borderTop: '1px solid #e9ecef'
-      }
-    }, /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _helpers__.withStyle)('spinner-border spinner-border-sm text-primary'),
-      role: "status",
-      style: {
-        width: 12,
-        height: 12,
-        borderWidth: 2
-      }
-    }), /*#__PURE__*/_react.default.createElement("small", {
-      className: (0, _helpers__.withStyle)('text-muted'),
-      style: {
-        fontSize: 11
-      }
-    }, "Vestigingsdetails laden\u2026"));
-  }
-  const props = buildDetailProps(branchById);
+  const props = buildDetailProps(initialBranch);
   if (!props) return null;
   const {
     leenauto,

package/dist/src/shared/__components__/LocationsSelector/LocationList.js

@@ -2,7 +2,6 @@
 
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.number.to-fixed.js");
-require("core-js/modules/es.parse-float.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,12 +16,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.number.to-fixed.js");
-require("core-js/modules/es.parse-float.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
+var _LinkButton = _interopRequireDefault(require("../Buttons/LinkButton"));
+var _InlineSpinner = _interopRequireDefault(require("../Spinners/InlineSpinner"));
 var _ActiveMarkerContext = require("../../__context__/ActiveMarkerContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
@@ -101,15 +101,13 @@ function _toPrimitive(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
+const LOCATION_PAGE_SIZE = 10;
 const LocationsLoading = () => {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('w-100 text-center')
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _helpers__.withStyle)('spinner-border text-primary mx-auto'),
-    role: "status"
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "sr-only"
-  }, "Loading...")));
+  }, /*#__PURE__*/_react.default.createElement(_InlineSpinner.default, {
+    size: "2rem"
+  }));
 };
 const NoLocationFound = () => {
   return /*#__PURE__*/_react.default.createElement("h4", null, "Geen montagelocaties gevonden");
@@ -128,34 +126,33 @@ const LocationList = _ref => {
   const [{
     selectedBranch
   }] = (0, _OrderSessionContext.useOrderSession)();
+  const [visibleCount, setVisibleCount] = (0, _react.useState)(LOCATION_PAGE_SIZE);
   const listRef = (0, _react.useRef)(null);
-  const locationsWithDistance = locationIds.map((locationId, index) => {
-    const location = locationsById[locationId];
-    const coordinates = location.googleMapsLocation;
-    if (!coordinates) return null;
-    const [latStr, lngStr] = coordinates.split(',');
-    const lat = parseFloat(latStr);
-    const lng = parseFloat(lngStr);
-    const distance = userLocation ? (0, _geolocation.calculateDistance)({
-      lat1: userLocation.lat,
-      lng1: userLocation.lng,
-      lat2: lat,
-      lng2: lng
-    }).toFixed(2) : null;
-    return _objectSpread(_objectSpread({}, location), {}, {
-      distance: distance ? parseFloat(distance) : null
+  const sortedLocations = (0, _react.useMemo)(() => {
+    const locationsWithDistance = locationIds.map(locationId => {
+      const location = locationsById[locationId];
+      const coordinates = (0, _geolocation.getCoordinatesByString)(location.googleMapsLocation);
+      if (!coordinates) return null;
+      const distance = userLocation ? (0, _geolocation.calculateDistance)({
+        lat1: Number(userLocation.lat),
+        lng1: Number(userLocation.lng),
+        lat2: coordinates.lat,
+        lng2: coordinates.lng
+      }) : null;
+      return _objectSpread(_objectSpread({}, location), {}, {
+        distance: distance != null ? Number(distance.toFixed(2)) : null
+      });
+    }).filter(location => location !== null);
+    return [...locationsWithDistance].sort((a, b) => {
+      const aIsSelected = a.entityId === activeMarkerId || a.entityId === selectedBranch;
+      const bIsSelected = b.entityId === activeMarkerId || b.entityId === selectedBranch;
+      if (aIsSelected && !bIsSelected) return -1;
+      if (!aIsSelected && bIsSelected) return 1;
+      if (a.distance === null) return 1;
+      if (b.distance === null) return -1;
+      return a.distance - b.distance;
     });
-  }).filter(location => location !== null);
-  const sortedLocations = locationsWithDistance.sort((a, b) => {
-    const aIsSelected = a.entityId === activeMarkerId || a.entityId === selectedBranch;
-    const bIsSelected = b.entityId === activeMarkerId || b.entityId === selectedBranch;
-    if (aIsSelected && !bIsSelected) return -1; // a goes to top
-    if (!aIsSelected && bIsSelected) return 1; // b goes to top
-
-    if (a.distance === null) return 1;
-    if (b.distance === null) return -1;
-    return a.distance - b.distance;
-  });
+  }, [activeMarkerId, locationIds, locationsById, selectedBranch, userLocation]);
 
   // Handle scrolling when location is set via search
   (0, _react.useEffect)(() => {
@@ -163,18 +160,31 @@ const LocationList = _ref => {
       listRef.current.scrollTop = 0;
     }
   }, [isLocationSetViaSearch, userLocation]);
+  (0, _react.useEffect)(() => {
+    setVisibleCount(LOCATION_PAGE_SIZE);
+  }, [locationIds, userLocation]);
+  const visibleLocations = sortedLocations.slice(0, visibleCount);
+  const hasMoreLocations = visibleCount < sortedLocations.length;
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: listRef,
     className: (0, _helpers__.withStyle)('dealer-list')
-  }, /*#__PURE__*/_react.default.createElement("h5", null, userLocation ? 'Dichtsbijzijnde montagelocaties' : 'Montagelocaties'), isLoading && /*#__PURE__*/_react.default.createElement(LocationsLoading, null), !isLoading && !locationIds.length && /*#__PURE__*/_react.default.createElement(NoLocationFound, null), sortedLocations.map(location => /*#__PURE__*/_react.default.createElement(_LocationListItem.default, {
+  }, /*#__PURE__*/_react.default.createElement("h5", null, userLocation ? 'Dichtsbijzijnde montagelocaties' : 'Montagelocaties'), isLoading && /*#__PURE__*/_react.default.createElement(LocationsLoading, null), !isLoading && !locationIds.length && /*#__PURE__*/_react.default.createElement(NoLocationFound, null), visibleLocations.map(location => /*#__PURE__*/_react.default.createElement(_LocationListItem.default, {
     openingHours: location.openingstijden,
     title: location.naamVestiging,
     city: location.city,
     distance: location.distance ? location.distance : null,
     id: location.entityId,
     key: location.entityId,
+    branch: location,
     isSelected: location.entityId === activeMarkerId || location.entityId === selectedBranch,
     userLocation: userLocation
+  })), hasMoreLocations && /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _helpers__.withStyle)('text-center mt-3')
+  }, /*#__PURE__*/_react.default.createElement(_LinkButton.default, {
+    label: "Laad meer",
+    onClick: () => {
+      setVisibleCount(currentCount => Math.min(currentCount + LOCATION_PAGE_SIZE, sortedLocations.length));
+    }
   })));
 };
 var _default = exports.default = LocationList;

package/dist/src/shared/__components__/LocationsSelector/LocationListItem.js

@@ -51,7 +51,8 @@ const LocationListItem = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     distance,
     id,
     isSelected,
-    userLocation
+    userLocation,
+    branch
   } = _ref;
   const [{
     selectedBranch
@@ -109,7 +110,7 @@ const LocationListItem = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     className: (0, _helpers__.withStyle)('form-check-label'),
     htmlFor: "dealer-item-check-".concat(id)
   }, isSelected ? 'Geselecteerd' : 'Selecteren')))), isSelected && APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_LocationDetails.default, {
-    id: id
+    initialBranch: branch
   }));
 });
 var _default = exports.default = LocationListItem;

package/dist/src/shared/__components__/LocationsSelector/index.js

@@ -11,9 +11,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _reactGoogleMaps = require("@vis.gl/react-google-maps");
 var _react = _interopRequireWildcard(require("react"));
 var _queries = require("../../__api__/queries");
-var _constants__ = require("../../__constants__");
 var _ActiveMarkerContext = require("../../__context__/ActiveMarkerContext");
-var _AuthSessionContext = require("../../__context__/AuthSessionContext");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
@@ -73,26 +71,14 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
   const [{
     franchiseName
   }] = (0, _OrderSessionContext.useOrderSession)();
-  const authSession = (0, _AuthSessionContext.useAuthSession)();
   const {
-    branchTypes
-  } = (0, _queries.useBranchTypes)();
-  const isTMGOrganization = _react.default.useMemo(() => {
-    var _branchTypes$byId$aut, _authSession$branch;
-    return (branchTypes === null || branchTypes === void 0 || (_branchTypes$byId$aut = branchTypes.byId[authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 || (_authSession$branch = _authSession$branch.organisatietype) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch[0]]) === null || _branchTypes$byId$aut === void 0 ? void 0 : _branchTypes$byId$aut.title) === _constants__.TMG_ORGANIZATION_TYPE;
-  }, [branchTypes, authSession]);
-  const {
-    branches
-  } = (0, _queries.useBranchesQuery)({
-    offset: 0,
-    limit: 400,
+    locations: locationsData,
+    isLoadingLocations
+  } = (0, _queries.useConfiguratorLocationsQuery)({
     formula,
     franchiseName
   });
-  const {
-    myBranches
-  } = (0, _queries.useMyBranches)(formula);
-  const locations = isTMGOrganization || !APP_CONFIG.internal ? (branches === null || branches === void 0 ? void 0 : branches.results) || [] : myBranches || [];
+  const locations = (locationsData === null || locationsData === void 0 ? void 0 : locationsData.results) || [];
   const {
     byId,
     allIds
@@ -135,7 +121,7 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
     userLocation: userLocation
   }))), /*#__PURE__*/_react.default.createElement("aside", {
     className: (0, _helpers__.withStyle)('dealer-sidebar col-xl-4 mt-3 mt-xl-0')
-  }, isDesktop && /*#__PURE__*/_react.default.createElement(_LocationAutoComplete.default, {
+  }, /*#__PURE__*/_react.default.createElement(_LocationAutoComplete.default, {
     onLocationUpdate: handleLocationUpdate
   }), franchiseName && /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('my-2')
@@ -143,12 +129,13 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
     locationIds: allIds,
     locationsById: byId,
     userLocation: userLocation,
-    isLocationSetViaSearch: isLocationSetViaSearch
+    isLocationSetViaSearch: isLocationSetViaSearch,
+    isLoading: isLoadingLocations
   }))) : /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-xl-5 justify-content-center')
   }, /*#__PURE__*/_react.default.createElement("aside", {
     className: (0, _helpers__.withStyle)('dealer-sidebar col-xl-4 mt-3 mt-xl-0')
-  }, isDesktop && /*#__PURE__*/_react.default.createElement(_LocationAutoComplete.default, {
+  }, /*#__PURE__*/_react.default.createElement(_LocationAutoComplete.default, {
     onLocationUpdate: handleLocationUpdate
   }), franchiseName && /*#__PURE__*/_react.default.createElement("h6", {
     className: (0, _helpers__.withStyle)('my-2')
@@ -156,7 +143,8 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
     locationIds: allIds,
     locationsById: byId,
     userLocation: userLocation,
-    isLocationSetViaSearch: isLocationSetViaSearch
+    isLocationSetViaSearch: isLocationSetViaSearch,
+    isLoading: isLoadingLocations
   })))));
 });
 var _default = exports.default = LocationsSelector;

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

@@ -64,6 +64,7 @@ const DiscountProductsSelector = _ref => {
     licensePlate,
     model,
     durationAnswer,
+    durationAnswerIsPrefilled,
     executionAnswer1,
     executionAnswer2,
     priceCalculationDate,
@@ -73,6 +74,7 @@ const DiscountProductsSelector = _ref => {
     discountsInitialized
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const formula = (0, _FormulaContext.useFormula)();
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const {
     discountProducts
   } = (0, _queries.useProductsQuery)({
@@ -80,7 +82,7 @@ const DiscountProductsSelector = _ref => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer: durationAnswer,
+    durationAnswer: durationAnswerForQuery,
     formula,
     priceCalculationDate,
     discountCode

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

@@ -1,20 +1,16 @@
 "use strict";
 
 require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _reactRouter = require("react-router");
 var _thLogoBlack = _interopRequireDefault(require("../../../public/assets/images/th-logo-black.png"));
 var _queries = require("../__api__/queries");
@@ -29,74 +25,32 @@ var _image = require("../__helpers__/image");
 var _montageRate = require("../__helpers__/montageRate");
 var _product = require("../__helpers__/product");
 var _useIsTmg = require("../__hooks__/useIsTmg");
-var _useIsTowmotive = require("../__hooks__/useIsTowmotive");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
   };
 }
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function _getRequireWildcardCache(e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || "object" != typeof e && "function" != typeof e) return {
-    default: e
-  };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = {
-      __proto__: null
-    },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-    var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-    i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];
-  }
-  return n.default = e, t && t.set(e, n), n;
-}
 const ExtraProductsOverview = () => {
   var _products$Extras;
   const formula = (0, _FormulaContext.useFormula)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
-  const [skipFilters, setSkipFilters] = (0, _react.useState)(false);
+  const skipFilters = false;
   const [{
     licensePlate,
     model,
-    selectedBoardComputer,
     selectedExtras,
-    selectedCableset,
-    selectedCombiset,
-    selectedTowbar,
     discountCode,
     executionAnswer1,
     executionAnswer2,
     durationAnswer,
-    vehicleCodingDiscountPercentage,
-    consumerDiscounts,
-    touchedConsumerDiscounts,
+    durationAnswerIsPrefilled,
+    buildYear,
     discountAmount,
     discountPercentage,
     montageRate,
     extraPriceAmount
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
-  const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
-  const cartInput = (0, _product.buildCartInput)({
-    selectedCableset,
-    selectedCombiset,
-    selectedTowbar,
-    selectedBoardComputer,
-    selectedExtras,
-    isTowmotiveFormula: isTowmotive,
-    vehicleCodingDiscountPercentage,
-    consumerDiscounts,
-    touchedConsumerDiscounts
-  });
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const {
     products,
     isLoadingProducts,
@@ -106,9 +60,8 @@ const ExtraProductsOverview = () => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer: durationAnswer,
-    selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
-    cart: cartInput ? JSON.stringify(cartInput) : undefined,
+    durationAnswer: durationAnswerForQuery,
+    buildYear,
     formula,
     discountCode,
     skipFilters,
@@ -193,8 +146,6 @@ const ExtraProductsOverview = () => {
         key: "category-".concat(item.categoryName)
       }, /*#__PURE__*/_react.default.createElement("h2", null, item.categoryName), item.products.map((product, index) => {
         var _product$price, _product$consumerPric, _product$consumerPric2, _product$locationPric, _product$images, _product$images2, _product$boldDescript;
-        const isSelectedExtra = selectedExtras.hasOwnProperty(product.articleNumber);
-
         // GetOrder is the single source of truth for prices
         const resolvedProductPrice = (_product$price = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price !== void 0 ? _product$price : null;
 

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

@@ -20,11 +20,9 @@ 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");
 var _LinkButton = _interopRequireDefault(require("../__components__/Buttons/LinkButton"));
 var _PrimaryButton = _interopRequireDefault(require("../__components__/Buttons/PrimaryButton"));
 var _LicensePlateInput = _interopRequireDefault(require("../__components__/Form/LicensePlateInput"));
-var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _Datalayer = require("../__services__/Datalayer");
@@ -70,26 +68,10 @@ const LicensePlateForm = _ref => {
     trackingComponent = 'license_plate_form'
   } = _ref;
   const [{
-    licensePlate,
-    discountCode,
-    singleOrderFormulaCode,
-    buildYear
+    licensePlate
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const [filterLicensePlate, setFilterLicensePlate] = (0, _react.useState)(initialValue || '');
   const history = (0, _reactRouter.useHistory)();
-  let formula = (0, _FormulaContext.useFormula)();
-  if (isFilter && singleOrderFormulaCode) {
-    formula = singleOrderFormulaCode;
-  }
-  if (!isFilter) {
-    (0, _queries.useQuestionsQuery)({
-      licensePlate,
-      formula,
-      discountCode,
-      buildYear
-    }); // Prefetch
-    (0, _queries.useBrandsQuery)(formula); // Prefetch
-  }
   const {
     search
   } = (0, _reactRouter.useLocation)();

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

@@ -77,7 +77,6 @@ const ManualSelectionForm = _ref => {
     brand,
     model,
     buildYear,
-    discountCode,
     singleOrderFormulaCode
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
@@ -108,7 +107,7 @@ const ManualSelectionForm = _ref => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_DURATION_ANSWER,
       payload: {
-        durationAnswer: null
+        answer: null
       }
     });
     onSubmit(isFilter ? {
@@ -116,13 +115,6 @@ const ManualSelectionForm = _ref => {
       type: 'model'
     } : undefined);
   };
-  (0, _queries.useQuestionsQuery)({
-    model,
-    formula,
-    discountCode,
-    buildYear
-  }); // Prefetch
-
   const {
     search
   } = (0, _reactRouter.useLocation)();

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

@@ -87,6 +87,8 @@ const ProductCartSide = () => {
     executionAnswer1,
     executionAnswer2,
     durationAnswer,
+    durationAnswerIsPrefilled,
+    buildYear,
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
@@ -107,6 +109,7 @@ const ProductCartSide = () => {
   } = order;
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const cartInput = (0, _product.buildCartInput)({
     selectedCableset,
     selectedCombiset,
@@ -129,7 +132,8 @@ const ProductCartSide = () => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer,
+    durationAnswer: durationAnswerForQuery,
+    buildYear,
     selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
     cart: cartInput ? JSON.stringify(cartInput) : undefined,
     formula,

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

@@ -60,6 +60,7 @@ const ProductDiscountCard = () => {
     licensePlate,
     model,
     durationAnswer,
+    durationAnswerIsPrefilled,
     executionAnswer1,
     executionAnswer2,
     discountCode,
@@ -67,6 +68,7 @@ const ProductDiscountCard = () => {
     priceCalculationDate
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const formula = (0, _FormulaContext.useFormula)();
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
 
   // Always hold the latest values so the unmount cleanup reads fresh state.
   const anwbStateRef = (0, _react.useRef)({
@@ -105,7 +107,7 @@ const ProductDiscountCard = () => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer: durationAnswer,
+    durationAnswer: durationAnswerForQuery,
     formula,
     discountCode,
     priceCalculationDate

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

@@ -257,6 +257,8 @@ const ProductCartTable = () => {
     licensePlate,
     model,
     durationAnswer,
+    durationAnswerIsPrefilled,
+    buildYear,
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
@@ -345,6 +347,7 @@ const ProductCartTable = () => {
     consumerDiscounts,
     touchedConsumerDiscounts
   });
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const {
     cart,
     totals,
@@ -356,7 +359,8 @@ const ProductCartTable = () => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer,
+    durationAnswer: durationAnswerForQuery,
+    buildYear,
     selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
     cart: JSON.stringify(cartInput || []),
     branchId: isToggled ? selectedBranch : null,

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

@@ -80,6 +80,8 @@ const ProductsOverview = () => {
     executionAnswer1,
     executionAnswer2,
     durationAnswer,
+    durationAnswerIsPrefilled,
+    buildYear,
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
@@ -97,6 +99,7 @@ const ProductsOverview = () => {
     extraPriceAmount
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   const isTowmotive = (0, _useIsTowmotive.useIsTowmotive)();
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const cartInput = (0, _product.buildCartInput)({
     selectedCableset,
     selectedCombiset,
@@ -118,7 +121,8 @@ const ProductsOverview = () => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer: durationAnswer,
+    durationAnswer: durationAnswerForQuery,
+    buildYear,
     selectBoardComputerUpdate: selectedBoardComputer != null ? 'true' : 'false',
     cart: cartInput ? JSON.stringify(cartInput) : undefined,
     formula,

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

@@ -143,6 +143,7 @@ const QuestionsForm = _ref => {
     licensePlate,
     model,
     durationAnswer,
+    durationAnswerIsPrefilled,
     executionAnswer1,
     buildYear,
     executionAnswer2,
@@ -150,8 +151,7 @@ const QuestionsForm = _ref => {
     execution1Options,
     singleOrderFormulaCode,
     execution2Options,
-    durationOptions,
-    priceCalculationDate
+    durationOptions
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
   const {
@@ -176,6 +176,7 @@ const QuestionsForm = _ref => {
   // Only include both execution answers if both are provided
   const createQueryParams = () => {
     const hasMultipleExecutionQuestions = initialOptions.execution1.length > 0 && initialOptions.execution2.length > 0;
+    const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
 
     // If we have multiple execution questions, only include answers if both are provided
     if (hasMultipleExecutionQuestions && (!executionAnswer1 || !executionAnswer2)) {
@@ -183,8 +184,9 @@ const QuestionsForm = _ref => {
         licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
         model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
         formula,
+        buildYear: initialBuildYear !== null && initialBuildYear !== void 0 ? initialBuildYear : buildYear,
         discountCode,
-        durationAnswer: durationAnswer
+        durationAnswer: durationAnswerForQuery
       };
     }
 
@@ -197,7 +199,7 @@ const QuestionsForm = _ref => {
       discountCode,
       executionAnswer1,
       executionAnswer2,
-      durationAnswer: durationAnswer
+      durationAnswer: durationAnswerForQuery
     };
   };
   const questionsObject = (0, _queries.useQuestionsQuery)(createQueryParams());
@@ -252,26 +254,7 @@ const QuestionsForm = _ref => {
       });
     }
   }, [durationQuestion]);
-
-  // Only prefetch products when all required answers are provided
   const hasMultipleExecutionQuestions = initialOptions.execution1.length > 0 && initialOptions.execution2.length > 0;
-  const shouldPrefetchProducts = !hasMultipleExecutionQuestions || executionAnswer1 && executionAnswer2;
-  (0, _queries.useProductsQuery)(shouldPrefetchProducts ? {
-    licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-    model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
-    executionAnswer1,
-    executionAnswer2,
-    durationAnswer,
-    formula,
-    discountCode,
-    priceCalculationDate
-  } : {
-    licensePlate: initialLicensePlate !== null && initialLicensePlate !== void 0 ? initialLicensePlate : licensePlate,
-    model: initialModel !== null && initialModel !== void 0 ? initialModel : model,
-    formula,
-    discountCode,
-    priceCalculationDate
-  });
 
   /**
    * @description This hook pre-fills the duration answer, only if it comes pre-filled from the API, and it's not set manually by the user.
@@ -281,41 +264,12 @@ const QuestionsForm = _ref => {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_DURATION_ANSWER,
         payload: {
-          answer: durationAnswerPrefilled
-        }
-      });
-    }
-  }, [durationOptions, durationAnswerPrefilled, durationQuestion, durationAnswer]);
-  (0, _react.useEffect)(() => {
-    if (durationQuestion !== null && durationQuestion !== void 0 && durationQuestion.length) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_DURATION_OPTIONS,
-        payload: {
-          options: durationQuestion
-        }
-      });
-    }
-  }, [durationQuestion]);
-  (0, _react.useEffect)(() => {
-    if (execution1AnswerOptions !== null && execution1AnswerOptions !== void 0 && execution1AnswerOptions.length) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_EXECUTION1_OPTIONS,
-        payload: {
-          options: execution1AnswerOptions
+          answer: durationAnswerPrefilled,
+          isPrefilled: true
         }
       });
     }
-  }, [execution1AnswerOptions]);
-  (0, _react.useEffect)(() => {
-    if (execution2AnswerOptions !== null && execution2AnswerOptions !== void 0 && execution2AnswerOptions.length) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_EXECUTION2_OPTIONS,
-        payload: {
-          options: execution2AnswerOptions
-        }
-      });
-    }
-  }, [execution2AnswerOptions]);
+  }, [durationOptions, durationAnswerPrefilled, durationQuestion, durationAnswer, durationAnswerIsPrefilled]);
   (0, _react.useEffect)(() => {
     if (!isLoadingQuestions) {
       const hasNoQuestions = !(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);

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

@@ -89,6 +89,8 @@ const VehicleData = _ref => {
     executionAnswer1,
     executionAnswer2,
     durationAnswer,
+    durationAnswerIsPrefilled,
+    buildYear: orderBuildYear,
     discountCode,
     priceCalculationDate,
     singleOrderFormulaCode,
@@ -99,6 +101,7 @@ const VehicleData = _ref => {
   if (isFilter && singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
   }
+  const durationAnswerForQuery = durationAnswerIsPrefilled ? undefined : durationAnswer;
   const {
     orderData,
     isLoadingOrder
@@ -107,7 +110,8 @@ const VehicleData = _ref => {
     model,
     executionAnswer1,
     executionAnswer2,
-    durationAnswer: durationAnswer,
+    durationAnswer: durationAnswerForQuery,
+    buildYear: orderBuildYear,
     formula,
     discountCode,
     priceCalculationDate

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

@@ -212,6 +212,10 @@ const buildLeaseCompanyOption = function buildLeaseCompanyOption() {
     }
   };
 };
+const getBranchCity = function getBranchCity() {
+  let branch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (branch === null || branch === void 0 ? void 0 : branch.city) || (branch === null || branch === void 0 ? void 0 : branch.gemeente) || '';
+};
 const InternalAppointmentForm = _ref => {
   var _branchTypes$byId$aut, _authSession$branch, _authSession$branch2, _contextCustomer$note2;
   let {
@@ -1108,8 +1112,9 @@ const InternalAppointmentForm = _ref => {
       if (branch.street) {
         updateCustomerField('streetName', branch.street);
       }
-      if (branch.city) {
-        updateCustomerField('city', branch.city);
+      const branchCity = getBranchCity(branch);
+      if (branchCity) {
+        updateCustomerField('city', branchCity);
       }
       if (branch.street2) {
         updateCustomerField('houseNumber', branch.street2);

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

@@ -169,6 +169,10 @@ const buildLeaseCompanyOption = function buildLeaseCompanyOption() {
     }
   };
 };
+const getBranchCity = function getBranchCity() {
+  let branch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (branch === null || branch === void 0 ? void 0 : branch.city) || (branch === null || branch === void 0 ? void 0 : branch.gemeente) || '';
+};
 const internalQuotationFormSchema = (0, _yup.object)({
   ownershipType: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   leaseNumber: (0, _yup.string)().nullable(),
@@ -780,8 +784,9 @@ const InternalQuotationForm = _ref => {
       if (branch.street) {
         updateCustomerField('streetName', branch.street);
       }
-      if (branch.city) {
-        updateCustomerField('city', branch.city);
+      const branchCity = getBranchCity(branch);
+      if (branchCity) {
+        updateCustomerField('city', branchCity);
       }
       if (branch.street2) {
         updateCustomerField('houseNumber', branch.street2);

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

@@ -2,6 +2,8 @@
 
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.regexp.exec.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");
@@ -9,6 +11,7 @@ require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.some.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.for-each.js");
 Object.defineProperty(exports, "__esModule", {
@@ -17,11 +20,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.useOrderSession = exports.orderSessionActions = exports.OrderSessionController = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.search.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.some.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 _constants__ = require("../__constants__");
 var _authenticatedProxyApi = require("../__api__/authenticatedProxyApi");
@@ -117,6 +123,7 @@ const INITIAL_ORDER_SESSION_STATE = {
   brand: null,
   channel: null,
   durationAnswer: undefined,
+  durationAnswerIsPrefilled: false,
   executionAnswer1: null,
   executionAnswer2: null,
   priceCalculationDate: new Date().getTime(),
@@ -713,10 +720,12 @@ const orderSessionReducer = (state, action) => {
     case orderSessionActions.SET_DURATION_ANSWER:
       {
         const {
-          answer
+          answer,
+          isPrefilled = false
         } = action.payload;
         return _objectSpread(_objectSpread({}, state), {}, {
           durationAnswer: answer,
+          durationAnswerIsPrefilled: isPrefilled,
           // Remove subsequent questions and answers
           executionAnswer1: null,
           executionAnswer2: null,
@@ -1351,8 +1360,13 @@ const initializeOrderSession = function initializeOrderSession() {
   let isPrivateSingleOrder = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   // Check if we're on a single-order page by examining window.location
   const storageKey = isPrivateSingleOrder ? _constants__.PRIVATE_SINGLE_ORDER_SESSION_KEY : _constants__.ORDER_SESSION_KEY;
+  const searchParams = new URLSearchParams(window.location.search);
+  const shouldRestorePublicSession = APP_CONFIG.internal || searchParams.get('persistSession') === 'true';
   const cachedSession = (0, _helpers__.parseJson)(window.sessionStorage.getItem(storageKey));
-  if (!cachedSession) {
+  if (!cachedSession || !shouldRestorePublicSession) {
+    if (!isPrivateSingleOrder && !APP_CONFIG.internal) {
+      window.sessionStorage.removeItem(storageKey);
+    }
     return INITIAL_ORDER_SESSION_STATE;
   }
   return cachedSession;

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

@@ -1,5 +1,12 @@
 "use strict";
 
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.object.assign.js");
+require("core-js/modules/es.string.includes.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.object.assign.js");
+require("core-js/modules/es.string.includes.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -76,8 +83,10 @@ Object.defineProperty(exports, "QuotationThanksPage", {
   }
 });
 exports.default = void 0;
+require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireDefault(require("react"));
 var _reactRouterDom = require("react-router-dom");
+var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _AppointmentPage = _interopRequireDefault(require("./AppointmentPage"));
 var _AppointmentThanksPage = _interopRequireDefault(require("./AppointmentThanksPage"));
 var _ExtraProductsPage = _interopRequireDefault(require("./ExtraProductsPage"));
@@ -90,13 +99,57 @@ var _OverviewPage = _interopRequireDefault(require("./OverviewPage"));
 var _ProductsPage = _interopRequireDefault(require("./ProductsPage"));
 var _QuotationPage = _interopRequireDefault(require("./QuotationPage"));
 var _QuotationThanksPage = _interopRequireDefault(require("./QuotationThanksPage"));
+const _excluded = ["render"]; // Pages
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
   };
 }
-// Pages
-
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    return n;
+  }, _extends.apply(null, arguments);
+}
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    r,
+    i = _objectWithoutPropertiesLoose(e, t);
+  if (Object.getOwnPropertySymbols) {
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+  }
+  return i;
+}
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
+const ProtectedConfiguratorRoute = _ref => {
+  let {
+      render: _render
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  const [{
+    licensePlate,
+    model
+  }] = (0, _OrderSessionContext.useOrderSession)();
+  const hasVehicleInput = Boolean(licensePlate || model);
+  return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, _extends({}, props, {
+    render: routeProps => hasVehicleInput ? _render(routeProps) : /*#__PURE__*/_react.default.createElement(_reactRouterDom.Redirect, {
+      to: "/configurator"
+    })
+  }));
+};
 const Routes = () => {
   return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Switch, null, /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
     exact: true,
@@ -106,7 +159,7 @@ const Routes = () => {
     exact: true,
     path: "/configurator/geen-producten",
     render: props => /*#__PURE__*/_react.default.createElement(_NoProductsPage.default, props)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     exact: true,
     path: "/configurator/montagelocatie",
     render: props => /*#__PURE__*/_react.default.createElement(_LocationsPage.default, props)
@@ -118,25 +171,25 @@ const Routes = () => {
     exact: true,
     path: "/configurator/offerte/bedankt",
     render: props => /*#__PURE__*/_react.default.createElement(_QuotationThanksPage.default, props)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     path: "/configurator/trekhaakpakket",
     render: props => /*#__PURE__*/_react.default.createElement(_ProductsPage.default, null)
   }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
     path: "/configurator/manual",
     render: props => /*#__PURE__*/_react.default.createElement(_ManualSelectionPage.default, props)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     exact: true,
     path: "/configurator/overzicht",
     render: props => /*#__PURE__*/_react.default.createElement(_OverviewPage.default, null)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     exact: true,
     path: "/configurator/offerte",
     render: props => /*#__PURE__*/_react.default.createElement(_QuotationPage.default, null)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     exact: true,
     path: "/configurator/gegevens",
     render: props => /*#__PURE__*/_react.default.createElement(_AppointmentPage.default, null)
-  }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+  }), /*#__PURE__*/_react.default.createElement(ProtectedConfiguratorRoute, {
     exact: true,
     path: "/configurator/toebehoren",
     render: props => /*#__PURE__*/_react.default.createElement(_ExtraProductsPage.default, null)

package/package.json

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