thm-p3-configurator 0.0.376 → 0.0.378

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