thm-p3-configurator 0.0.140 → 0.0.142

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

@@ -421,7 +421,6 @@ const useProductsQuery = orderParameters => {
     queryFn: async () => {
       var _response$data, _JSON$parse, _data$articles, _data$articles2, _data$articles3, _data$articles4, _data$articles5, _data$articles6;
       const response = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(productsSearchParams);
-      console.log(response.data, productsSearchParams);
       const data = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data;
       if (!data) return data;
       const authSession = _LocalStorageWorker.lsw.get(_constants__.AUTH_SESSION_KEY);
@@ -436,7 +435,6 @@ const useProductsQuery = orderParameters => {
       // NOTE: the API to enrich the products with extra data is only available when the configurator has an authenticated user, so on in the PP.
       // If we need this also for the public version than Hyper needs to implement this.
 
-      console.log('alle producten', allProducts);
       if (!allProducts.length) {
         return data;
       }

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

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
@@ -16,6 +17,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.parse-float.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.includes.js");
@@ -27,6 +29,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _logoPrimary = _interopRequireDefault(require("../../../public/assets/images/logo-primary.png"));
 var _montagePlaceholder = _interopRequireDefault(require("../../../public/assets/images/montage-placeholder.png"));
+var _queries = require("../__api__/queries");
 var _TogglableCard = _interopRequireDefault(require("../__components__/Cards/TogglableCard"));
 var _ProductTableEditableRow = _interopRequireDefault(require("../__components__/ProductTable/ProductTableEditableRow"));
 var _ProductTableHead = _interopRequireDefault(require("../__components__/ProductTable/ProductTableHead"));
@@ -39,6 +42,7 @@ var _FormulaContext = require("../__context__/FormulaContext");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
+var _product = require("../__helpers__/product");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -69,16 +73,15 @@ function _interopRequireWildcard(e, r) {
   }
   return n.default = e, t && t.set(e, n), n;
 }
-const ProductCartSide = _ref => {
-  let {
-    products,
-    cart,
-    totals,
-    isLoadingProducts
-  } = _ref;
+const ProductCartSide = () => {
   const formula = (0, _FormulaContext.useFormula)();
   const [isToggled, setIsToggled] = (0, _react.useState)(false);
   const [{
+    licensePlate,
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer,
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
@@ -86,6 +89,39 @@ const ProductCartSide = _ref => {
     selectedExtras,
     selectedBranch
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const cartInput = (0, _product.validateCartInput)([{
+    articleNumber: selectedCableset,
+    quantity: 1
+  }, {
+    articleNumber: selectedCombiset,
+    quantity: 1
+  }, {
+    articleNumber: selectedTowbar,
+    quantity: 1
+  }, ...Object.entries(selectedExtras).map(_ref => {
+    let [extraArticleNumber, extraQuantity] = _ref;
+    return {
+      articleNumber: extraArticleNumber,
+      quantity: extraQuantity
+    };
+  })]);
+  const {
+    cart,
+    totals,
+    products,
+    isLoadingProducts
+  } = (0, _queries.useProductsQuery)({
+    licensePlate,
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer,
+    selectBoardComputerUpdate: selectedBoardComputer != null,
+    cart: cartInput ? JSON.stringify(cartInput) : undefined,
+    formula,
+    branchId: isToggled ? selectedBranch : undefined
+  });
+  const marketCorrection = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === 'MC');
   let mainProducts = [];
   let accessoireProducts = [];
   if (products) {
@@ -135,7 +171,6 @@ const ProductCartSide = _ref => {
    * Montage price including VAT
    */
   const montageInclVat = parseFloat(totals === null || totals === void 0 ? void 0 : totals.montagePricePlusMarketCorrectionInclVat) || 0;
-  const marketCorrection = cart === null || cart === void 0 ? void 0 : cart.find(item => item.articleNumber === 'MC');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("col-lg mt-3")
   }, /*#__PURE__*/_react.default.createElement(_TogglableCard.default, {

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

@@ -3,6 +3,7 @@
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.json.stringify.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");
@@ -17,6 +18,7 @@ exports.default = void 0;
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -25,17 +27,18 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouter = require("react-router");
 var _logoPrimary = _interopRequireDefault(require("../../../public/assets/images/logo-primary.png"));
-var _CheckboxInput = _interopRequireDefault(require("../__components__/Form/CheckboxInput"));
+var _queries = require("../__api__/queries");
 var _ProductCard = _interopRequireDefault(require("../__components__/ProductCard"));
 var _FullPageSpinner = _interopRequireDefault(require("../__components__/Spinners/FullPageSpinner"));
 var _constants__ = require("../__constants__");
 var _FormulaContext = require("../__context__/FormulaContext");
+var _useIsTmg = require("../__hooks__/useIsTmg");
 var _OrderSessionContext = require("../__context__/OrderSessionContext");
 var _helpers__ = require("../__helpers__");
 var _image = require("../__helpers__/image");
 var _product = require("../__helpers__/product");
-var _useIsTmg = require("../__hooks__/useIsTmg");
 var _BoardComputerCard = _interopRequireDefault(require("./BoardComputerCard"));
+var _CheckboxInput = _interopRequireDefault(require("../__components__/Form/CheckboxInput"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -66,28 +69,65 @@ function _interopRequireWildcard(e, r) {
   }
   return n.default = e, t && t.set(e, n), n;
 }
-const ProductsOverview = _ref => {
+const ProductsOverview = () => {
   var _products$Trekhaak, _products$Kabelset, _products$Combiset;
-  let {
-    products,
-    isLoadingProducts
-  } = _ref;
   const isProductsInitialLoad = (0, _react.useRef)(true);
   const formula = (0, _FormulaContext.useFormula)();
   const isTmg = (0, _useIsTmg.useIsTmg)();
   const [skipFilters, setSkipFilters] = (0, _react.useState)(false);
   const [{
+    licensePlate,
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer,
     selectedTowbar,
     selectedCableset,
     selectedCombiset,
+    selectedExtras,
     selectedBoardComputer,
-    isBoardComputerDeselected
+    isBoardComputerDeselected,
+    discountCode,
+    priceCalculationDate
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const cartInput = (0, _product.validateCartInput)([{
+    articleNumber: selectedCableset,
+    quantity: 1
+  }, {
+    articleNumber: selectedCombiset,
+    quantity: 1
+  }, {
+    articleNumber: selectedTowbar,
+    quantity: 1
+  }, ...Object.entries(selectedExtras).map(_ref => {
+    let [extraArticleNumber, extraQuantity] = _ref;
+    return {
+      articleNumber: extraArticleNumber,
+      quantity: extraQuantity
+    };
+  })]);
+  const {
+    products,
+    isLoadingProducts,
+    isProductsError
+  } = (0, _queries.useProductsQuery)({
+    licensePlate,
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer: durationAnswer,
+    selectBoardComputerUpdate: selectedBoardComputer != null,
+    cart: cartInput ? JSON.stringify(cartInput) : undefined,
+    formula,
+    discountCode,
+    priceCalculationDate,
+    skipFilters
+  });
   if (isLoadingProducts && isProductsInitialLoad.current === true) {
     isProductsInitialLoad.current = false;
     return /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null);
   }
-  if (!isLoadingProducts && !(products !== null && products !== void 0 && (_products$Trekhaak = products.Trekhaak) !== null && _products$Trekhaak !== void 0 && _products$Trekhaak.length) && !(products !== null && products !== void 0 && (_products$Kabelset = products.Kabelset) !== null && _products$Kabelset !== void 0 && _products$Kabelset.length) && !(products !== null && products !== void 0 && (_products$Combiset = products.Combiset) !== null && _products$Combiset !== void 0 && _products$Combiset.length)) {
+  if (isProductsError || !isLoadingProducts && (!(products !== null && products !== void 0 && (_products$Trekhaak = products.Trekhaak) !== null && _products$Trekhaak !== void 0 && _products$Trekhaak.length) || !(products !== null && products !== void 0 && (_products$Kabelset = products.Kabelset) !== null && _products$Kabelset !== void 0 && _products$Kabelset.length)) && !(products !== null && products !== void 0 && (_products$Combiset = products.Combiset) !== null && _products$Combiset !== void 0 && _products$Combiset.length)) {
     return /*#__PURE__*/_react.default.createElement(_reactRouter.Redirect, {
       to: "/configurator/geen-producten"
     });

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

@@ -11,6 +11,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _reactRouter = require("react-router");
+var _queries = require("../__api__/queries");
 var _LinkButton = _interopRequireDefault(require("../__components__/Buttons/LinkButton"));
 var _ExpandableCard = _interopRequireDefault(require("../__components__/Cards/ExpandableCard"));
 var _LicensePlateInput = _interopRequireDefault(require("../__components__/Form/LicensePlateInput"));
@@ -25,18 +26,36 @@ function _interopRequireDefault(e) {
 }
 const VehicleData = _ref => {
   let {
-    isFilter = false,
-    vehicleDetails,
-    vehicleLogo
+    isFilter = false
   } = _ref;
   const [{
     licensePlate,
-    singleOrderFormulaCode
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer,
+    discountCode,
+    priceCalculationDate,
+    singleOrderFormulaCode,
+    existingDossierId
   }] = (0, _OrderSessionContext.useOrderSession)();
   let formula = (0, _FormulaContext.useFormula)();
   if (isFilter && singleOrderFormulaCode) {
     formula = singleOrderFormulaCode;
   }
+  const {
+    vehicleDetails,
+    vehicleLogo
+  } = (0, _queries.useProductsQuery)({
+    licensePlate,
+    model,
+    executionAnswer1,
+    executionAnswer2,
+    durationAnswer: durationAnswer,
+    formula,
+    discountCode,
+    priceCalculationDate
+  });
   const history = (0, _reactRouter.useHistory)();
   return /*#__PURE__*/_react.default.createElement(_ExpandableCard.default, {
     title: isFilter ? 'Voertuig' : 'Uw voertuig',

package/dist/src/shared/__pages__/internal/InternalProductsPage.js

@@ -1,30 +1,21 @@
 "use strict";
 
-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");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-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 = _interopRequireDefault(require("react"));
-var _queries = require("../../__api__/queries");
 var _Header = _interopRequireDefault(require("../../__components__/Header"));
 var _NavigationSteps = _interopRequireDefault(require("../../__components__/NavigationSteps"));
 var _constants__ = require("../../__constants__");
 var _BottomNavigationBar = _interopRequireDefault(require("../../__containers__/BottomNavigationBar"));
 var _internal = require("../../__containers__/internal");
-var _InternalPriceCalculationSelector = _interopRequireDefault(require("../../__containers__/internal/InternalPriceCalculationSelector"));
 var _ProductCartSide = _interopRequireDefault(require("../../__containers__/ProductCartSide"));
 var _ProductsOverview = _interopRequireDefault(require("../../__containers__/ProductsOverview"));
 var _VehicleData = _interopRequireDefault(require("../../__containers__/VehicleData"));
 var _FormulaContext = require("../../__context__/FormulaContext");
-var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
-var _product = require("../../__helpers__/product");
+var _InternalPriceCalculationSelector = _interopRequireDefault(require("../../__containers__/internal/InternalPriceCalculationSelector"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -32,55 +23,6 @@ function _interopRequireDefault(e) {
 }
 const InternalProductsPage = () => {
   const formula = (0, _FormulaContext.useFormula)();
-  const [{
-    licensePlate,
-    model,
-    executionAnswer1,
-    executionAnswer2,
-    durationAnswer,
-    selectedTowbar,
-    selectedCableset,
-    selectedCombiset,
-    selectedBoardComputer,
-    selectedExtras,
-    discountCode,
-    priceCalculationDate
-  }] = (0, _OrderSessionContext.useOrderSession)();
-  const cartInput = (0, _product.validateCartInput)([{
-    articleNumber: selectedCableset,
-    quantity: 1
-  }, {
-    articleNumber: selectedCombiset,
-    quantity: 1
-  }, {
-    articleNumber: selectedTowbar,
-    quantity: 1
-  }, ...Object.entries(selectedExtras).map(_ref => {
-    let [extraArticleNumber, extraQuantity] = _ref;
-    return {
-      articleNumber: extraArticleNumber,
-      quantity: extraQuantity
-    };
-  })]);
-  const {
-    products,
-    cart,
-    totals,
-    vehicleDetails,
-    vehicleLogo,
-    isLoadingProducts
-  } = (0, _queries.useProductsQuery)({
-    licensePlate,
-    model,
-    executionAnswer1,
-    executionAnswer2,
-    durationAnswer,
-    selectBoardComputerUpdate: selectedBoardComputer != null,
-    cart: cartInput ? JSON.stringify(cartInput) : undefined,
-    formula,
-    discountCode,
-    priceCalculationDate
-  });
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('vh-100')
   }, /*#__PURE__*/_react.default.createElement(_internal.InternalCancelDossierEdit, null), /*#__PURE__*/_react.default.createElement(_Header.default, {
@@ -98,20 +40,8 @@ const InternalProductsPage = () => {
     className: (0, _helpers__.withStyle)('row gx-5 mt-3 mt-lg-5')
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("col-xxl")
-  }, /*#__PURE__*/_react.default.createElement(_ProductsOverview.default, {
-    products: products,
-    isLoadingProducts: isLoadingProducts
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_ProductsOverview.default, null)), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)("sidebar col-xxl-auto col-lg-12 pt-5")
-  }, APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalPriceCalculationSelector.default, null), /*#__PURE__*/_react.default.createElement(_VehicleData.default, {
-    vehicleDetails: vehicleDetails,
-    vehicleLogo: vehicleLogo,
-    isFilter: false
-  }), /*#__PURE__*/_react.default.createElement(_ProductCartSide.default, {
-    products: products,
-    cart: cart,
-    totals: totals,
-    isLoadingProducts: isLoadingProducts
-  })))), /*#__PURE__*/_react.default.createElement(_BottomNavigationBar.default, null)));
+  }, APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalPriceCalculationSelector.default, null), /*#__PURE__*/_react.default.createElement(_VehicleData.default, null), /*#__PURE__*/_react.default.createElement(_ProductCartSide.default, null)))), /*#__PURE__*/_react.default.createElement(_BottomNavigationBar.default, null)));
 };
 var _default = exports.default = InternalProductsPage;

package/package.json

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