thm-p3-configurator 0.0.58 → 0.0.60

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

@@ -79,7 +79,7 @@ function _toPrimitive(t, r) {
   return ("string" === r ? String : Number)(t);
 }
 const InternalSingleOrderProductOverview = _ref => {
-  var _articles$articles, _articles$articles2;
+  var _articles$articles, _articles$articles2, _articles$articles3;
   let {
     filters,
     paginationChange,
@@ -103,6 +103,7 @@ const InternalSingleOrderProductOverview = _ref => {
     executionAnswer1,
     executionAnswer2
   });
+  const hasActiveFilters = Boolean(mergedFilters.articleNumber || mergedFilters.licensePlate || mergedFilters.model || mergedFilters.type || mergedFilters.group || mergedFilters.subgroup || mergedFilters.executionAnswer1 || mergedFilters.executionAnswer2 || mergedFilters.durationAnswer);
   const {
     articles,
     areArticlesError,
@@ -112,10 +113,13 @@ const InternalSingleOrderProductOverview = _ref => {
     className: (0, _helpers__.withStyle)('flex-grow-1 h-100')
   }, areArticlesError && /*#__PURE__*/_react.default.createElement(_DangerAlert.default, {
     message: "Er is iets fout gegaan bij het ophalen van de producten. Zorg dat je toegang hebt tot de geselecteerde vestiging. Klik op bestelling herstarten om de vestiging te wijzigen."
-  }), articles && (articles === null || articles === void 0 || (_articles$articles = articles.articles) === null || _articles$articles === void 0 ? void 0 : _articles$articles.length) === 0 ? /*#__PURE__*/_react.default.createElement(_EmptyState.default, {
+  }), !hasActiveFilters && /*#__PURE__*/_react.default.createElement(_EmptyState.default, {
+    message: "Vind het product dat je zoekt",
+    subMessage: "Stel de filters in om de producten op te halen"
+  }), articles && hasActiveFilters && (articles === null || articles === void 0 || (_articles$articles = articles.articles) === null || _articles$articles === void 0 ? void 0 : _articles$articles.length) === 0 && /*#__PURE__*/_react.default.createElement(_EmptyState.default, {
     message: "Geen producten gevonden.",
     subMessage: "Probeer een ander filter toe te passen."
-  }) : articles === null || articles === void 0 || (_articles$articles2 = articles.articles) === null || _articles$articles2 === void 0 ? void 0 : _articles$articles2.map(article => {
+  }), articles && hasActiveFilters && (articles === null || articles === void 0 || (_articles$articles2 = articles.articles) === null || _articles$articles2 === void 0 ? void 0 : _articles$articles2.length) > 0 && (articles === null || articles === void 0 || (_articles$articles3 = articles.articles) === null || _articles$articles3 === void 0 ? void 0 : _articles$articles3.map(article => {
     var _cart$find$quantity, _cart$find, _article$locationPric, _article$locationPric2;
     return /*#__PURE__*/_react.default.createElement(_SingleOrderProductCard.default, {
       key: article.articleNumber,
@@ -132,12 +136,12 @@ const InternalSingleOrderProductOverview = _ref => {
       productTitle: article.name,
       productPrice: Number(article === null || article === void 0 || (_article$locationPric2 = article.locationPrices) === null || _article$locationPric2 === void 0 ? void 0 : _article$locationPric2.priceInclVat).toFixed(2)
     });
-  }), !articles && !areArticlesLoaded && !areArticlesError && /*#__PURE__*/_react.default.createElement("div", {
+  })), !articles && hasActiveFilters && !areArticlesLoaded && !areArticlesError && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('flex-grow-1 h-100')
   }, /*#__PURE__*/_react.default.createElement(_EmptyState.default, {
     message: "We zijn de producten aan het laden...",
     subMessage: "Dit kan enkele seconden duren."
-  })), !licensePlate && !model && /*#__PURE__*/_react.default.createElement(_Pagination.default, {
+  })), !licensePlate && hasActiveFilters && !model && /*#__PURE__*/_react.default.createElement(_Pagination.default, {
     className: (0, _helpers__.withStyle)('mt-4'),
     count: articles === null || articles === void 0 ? void 0 : articles.totalArticles,
     pageSize: 10,

package/dist/src/shared/__helpers__/singleOrderArticles.js

@@ -39,6 +39,7 @@ var _orderApi = require("../__api__/orderApi");
 var _index = require("./index");
 var _logoPrimary = _interopRequireDefault(require("../../../public/assets/images/logo-primary.png"));
 var _image = require("../__helpers__/image");
+var _index2 = require("../__constants__/index");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -184,10 +185,13 @@ const enrichArticlesWithBrandsAndPrices = async (articles, branchId, formula) =>
       brand: (_brandResponse$data$f = brandResponse.data.find(brand => brand.article === article.articleNumber)) === null || _brandResponse$data$f === void 0 ? void 0 : _brandResponse$data$f.articleBrandId
     });
   }).filter(article => article.brand);
-  const parts = articlesWithBrands.map(article => ({
-    partNumber: article.articleNumber,
-    brandNumber: article.brand
-  }));
+  const parts = articlesWithBrands.map(article => {
+    var _article$brand;
+    return {
+      partNumber: article.articleNumber,
+      brandNumber: (_article$brand = article.brand) !== null && _article$brand !== void 0 ? _article$brand : _index2.DEFAULT_ARTICLE_BRAND
+    };
+  });
   const pricesResponse = await _orderApi.orderApi.getArticlePrices(new URLSearchParams({
     branchId,
     formula,

package/dist/src/shared/__hooks__/useIsSingleOrder.js

@@ -11,7 +11,7 @@ require("core-js/modules/es.string.includes.js");
 var _react = require("react");
 const useIsSingleOrder = () => {
   return (0, _react.useMemo)(() => {
-    return typeof window !== 'undefined' && window.location.pathname.includes('configurator/single-order');
+    return typeof window !== 'undefined' && (window.location.pathname.includes('configurator/single-order') || window.location.pathname.includes('configurator/losse-order'));
   }, []);
 };
 exports.useIsSingleOrder = useIsSingleOrder;

package/package.json

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