thm-p3-configurator 0.0.448 → 0.0.451

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

@@ -4,7 +4,6 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -18,7 +17,6 @@ exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -258,23 +256,14 @@ const SingleOrderModalContent = _ref6 => {
       branchTypeId: singleOrderBranchType
     };
   }, [dispatch, normalizedFormula, setSelectedBranchId, singleOrderBranchType]);
-  const filteredBranches = _react.default.useMemo(() => {
-    if (normalizedFormula === _constants__.CONFIGURATOR_FORMULAS.TMG || !singleOrderBranches) {
-      return singleOrderBranches;
-    }
-    return singleOrderBranches.filter(branch => {
-      var _ref7, _branch$formulaCode, _branch$formule;
-      const branchFormula = (0, _constants__.getConfiguratorFormulaCode)((_ref7 = (_branch$formulaCode = branch === null || branch === void 0 ? void 0 : branch.formulaCode) !== null && _branch$formulaCode !== void 0 ? _branch$formulaCode : branch === null || branch === void 0 || (_branch$formule = branch.formule) === null || _branch$formule === void 0 ? void 0 : _branch$formule.code) !== null && _ref7 !== void 0 ? _ref7 : branch === null || branch === void 0 ? void 0 : branch.formule);
-      if ((0, _constants__.isThcFamilyFormula)(normalizedFormula)) {
-        return (0, _constants__.isThcFamilyFormula)(branchFormula);
-      }
-      return branchFormula === normalizedFormula;
-    });
-  }, [singleOrderBranches, normalizedFormula]);
+  const filteredBranches = _react.default.useMemo(() => (0, _singleOrderBranchSelector.getVisibleSingleOrderBranches)({
+    branches: singleOrderBranches,
+    formula: normalizedFormula
+  }), [singleOrderBranches, normalizedFormula]);
   const branchIdWithFormulaCode = new Map();
   filteredBranches === null || filteredBranches === void 0 || filteredBranches.forEach(branch => {
-    var _getConfiguratorFormu, _ref8, _branch$formulaCode2, _branch$formule2;
-    branchIdWithFormulaCode.set(branch === null || branch === void 0 ? void 0 : branch.entityId, (_getConfiguratorFormu = (0, _constants__.getConfiguratorFormulaCode)((_ref8 = (_branch$formulaCode2 = branch === null || branch === void 0 ? void 0 : branch.formulaCode) !== null && _branch$formulaCode2 !== void 0 ? _branch$formulaCode2 : branch === null || branch === void 0 || (_branch$formule2 = branch.formule) === null || _branch$formule2 === void 0 ? void 0 : _branch$formule2.code) !== null && _ref8 !== void 0 ? _ref8 : branch === null || branch === void 0 ? void 0 : branch.formule)) !== null && _getConfiguratorFormu !== void 0 ? _getConfiguratorFormu : normalizedFormula);
+    var _getConfiguratorFormu, _ref7, _branch$formulaCode, _branch$formule;
+    branchIdWithFormulaCode.set(branch === null || branch === void 0 ? void 0 : branch.entityId, (_getConfiguratorFormu = (0, _constants__.getConfiguratorFormulaCode)((_ref7 = (_branch$formulaCode = branch === null || branch === void 0 ? void 0 : branch.formulaCode) !== null && _branch$formulaCode !== void 0 ? _branch$formulaCode : branch === null || branch === void 0 || (_branch$formule = branch.formule) === null || _branch$formule === void 0 ? void 0 : _branch$formule.code) !== null && _ref7 !== void 0 ? _ref7 : branch === null || branch === void 0 ? void 0 : branch.formule)) !== null && _getConfiguratorFormu !== void 0 ? _getConfiguratorFormu : normalizedFormula);
   });
   const branchOptions = filteredBranches === null || filteredBranches === void 0 ? void 0 : filteredBranches.map(branch => ({
     label: (0, _singleOrderBranchSelector.getSingleOrderBranchOptionLabel)(branch),
@@ -292,10 +281,10 @@ const SingleOrderModalContent = _ref6 => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     initialValue: singleOrderBranchType,
-    onChange: _ref9 => {
+    onChange: _ref8 => {
       let {
         value
-      } = _ref9;
+      } = _ref8;
       setSingleOrderBranchType(value);
       setSelectedBranchId(undefined);
       setLocalBranchId(undefined);
@@ -309,11 +298,11 @@ const SingleOrderModalContent = _ref6 => {
     noOptionsMessage: "Geen opties beschikbaar",
     placeholder: "Maak een keuze",
     initialValue: selectedBranchId,
-    onChange: _ref10 => {
+    onChange: _ref9 => {
       let {
         label,
         value
-      } = _ref10;
+      } = _ref9;
       setSelectedBranchId(value);
       setLocalBranchId(value);
       const formulaCode = branchIdWithFormulaCode.get(value);

package/dist/src/shared/__helpers__/__tests__/singleOrderBranchSelector.test.js

@@ -61,4 +61,40 @@ describe('single-order branch selector helpers', () => {
       name: 'Voorbeeld B.V.'
     })).toBe('Rotterdam - Voorbeeld B.V.');
   });
+  it('opens the vehicle picker only after a vestiging is chosen', () => {
+    expect((0, _singleOrderBranchSelector.shouldOpenSingleOrderVehicleSelector)({
+      selectedBranch: null,
+      isLoadingBranchById: false,
+      licensePlate: null,
+      model: null,
+      hasActiveFilters: false,
+      hasUserDismissedModal: false,
+      orderJustCompleted: false,
+      showProductOverview: true
+    })).toBe(false);
+    expect((0, _singleOrderBranchSelector.shouldOpenSingleOrderVehicleSelector)({
+      selectedBranch: 'branch-id',
+      isLoadingBranchById: false,
+      licensePlate: null,
+      model: null,
+      hasActiveFilters: false,
+      hasUserDismissedModal: false,
+      orderJustCompleted: false,
+      showProductOverview: true
+    })).toBe(true);
+  });
+  it('keeps webshop organizations even when formule is empty', () => {
+    const webshopBranches = [{
+      entityId: '1',
+      name: 'Van Mossel Opel Terneuzen'
+    }, {
+      entityId: '2',
+      name: 'Andere webshop',
+      formulaCode: 'TOW'
+    }];
+    expect((0, _singleOrderBranchSelector.getVisibleSingleOrderBranches)({
+      branches: webshopBranches,
+      formula: _constants__.CONFIGURATOR_FORMULAS.THL
+    })).toEqual(webshopBranches);
+  });
 });

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

@@ -5,7 +5,7 @@ require("core-js/modules/esnext.iterator.filter.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldShowSingleOrderBranchTypeSelector = exports.shouldResetSingleOrderBranchSelection = exports.shouldResetDismissedBranchSelectorState = exports.shouldOpenSingleOrderCustomerSelector = exports.getSingleOrderBranchTypeId = exports.getSingleOrderBranchOptionLabel = void 0;
+exports.shouldShowSingleOrderBranchTypeSelector = exports.shouldResetSingleOrderBranchSelection = exports.shouldResetDismissedBranchSelectorState = exports.shouldOpenSingleOrderVehicleSelector = exports.shouldOpenSingleOrderCustomerSelector = exports.getVisibleSingleOrderBranches = exports.getSingleOrderBranchTypeId = exports.getSingleOrderBranchOptionLabel = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 var _constants__ = require("../__constants__");
@@ -66,4 +66,40 @@ exports.shouldResetSingleOrderBranchSelection = shouldResetSingleOrderBranchSele
 const getSingleOrderBranchOptionLabel = exports.getSingleOrderBranchOptionLabel = function getSingleOrderBranchOptionLabel() {
   let branch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return [branch.naamVestiging, branch.name].filter(Boolean).join(' - ');
-};
+};
+const shouldOpenSingleOrderVehicleSelector = _ref6 => {
+  let {
+    selectedBranch,
+    isLoadingBranchById,
+    licensePlate,
+    model,
+    hasActiveFilters,
+    hasUserDismissedModal,
+    orderJustCompleted,
+    showProductOverview
+  } = _ref6;
+  return Boolean(showProductOverview && selectedBranch && !isLoadingBranchById && !licensePlate && !model && !hasActiveFilters && !hasUserDismissedModal && !orderJustCompleted);
+};
+exports.shouldOpenSingleOrderVehicleSelector = shouldOpenSingleOrderVehicleSelector;
+const getVisibleSingleOrderBranches = _ref7 => {
+  let {
+    branches,
+    formula
+  } = _ref7;
+  if (!branches || (0, _constants__.isLooseOrderOnlyFormula)(formula)) {
+    return branches;
+  }
+  const normalizedFormula = (0, _constants__.getConfiguratorFormulaCode)(formula);
+  if (normalizedFormula === _constants__.CONFIGURATOR_FORMULAS.TMG) {
+    return branches;
+  }
+  return branches.filter(branch => {
+    var _ref8, _branch$formulaCode, _branch$formule;
+    const branchFormula = (0, _constants__.getConfiguratorFormulaCode)((_ref8 = (_branch$formulaCode = branch === null || branch === void 0 ? void 0 : branch.formulaCode) !== null && _branch$formulaCode !== void 0 ? _branch$formulaCode : branch === null || branch === void 0 || (_branch$formule = branch.formule) === null || _branch$formule === void 0 ? void 0 : _branch$formule.code) !== null && _ref8 !== void 0 ? _ref8 : branch === null || branch === void 0 ? void 0 : branch.formule);
+    if ((0, _constants__.isThcFamilyFormula)(normalizedFormula)) {
+      return (0, _constants__.isThcFamilyFormula)(branchFormula);
+    }
+    return branchFormula === normalizedFormula;
+  });
+};
+exports.getVisibleSingleOrderBranches = getVisibleSingleOrderBranches;

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

@@ -36,6 +36,7 @@ var _VehicleData = _interopRequireDefault(require("../../__containers__/VehicleD
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
+var _singleOrderBranchSelector = require("../../__helpers__/singleOrderBranchSelector");
 var _singleOrderArticles = require("../../__helpers__/singleOrderArticles");
 var _singleOrderWebshop = require("../../__helpers__/singleOrderWebshop");
 var _singleOrderVehicleReceipt = require("../../__helpers__/singleOrderVehicleReceipt");
@@ -207,8 +208,16 @@ const InternalSingleOrderPage = () => {
 
     // Don't open modal if order was just successfully created
     const orderJustCompleted = isCreateSingleOrderSuccess || isCreateShopifyOrderSuccess;
-    const canOpenWithCurrentSession = Boolean(webshop || selectedBranch && !isLoadingBranchById);
-    if (showProductOverview && canOpenWithCurrentSession && !licensePlate && !model && !hasActiveFilters && !hasUserDismissedModal && !orderJustCompleted) {
+    if ((0, _singleOrderBranchSelector.shouldOpenSingleOrderVehicleSelector)({
+      selectedBranch,
+      isLoadingBranchById,
+      licensePlate,
+      model,
+      hasActiveFilters,
+      hasUserDismissedModal,
+      orderJustCompleted,
+      showProductOverview
+    })) {
       setIsDirectSelectorModalOpen(true);
     } else {
       // Close modal if filters become active or we're on details page
@@ -216,7 +225,7 @@ const InternalSingleOrderPage = () => {
         setIsDirectSelectorModalOpen(false);
       }
     }
-  }, [selectedBranch, webshop, licensePlate, model, filters, isLoadingBranchById, isDirectSelectorModalOpen, hasUserDismissedModal, isCreateSingleOrderSuccess, isCreateShopifyOrderSuccess, showProductOverview]);
+  }, [selectedBranch, licensePlate, model, filters, isLoadingBranchById, isDirectSelectorModalOpen, hasUserDismissedModal, isCreateSingleOrderSuccess, isCreateShopifyOrderSuccess, showProductOverview]);
   const resetOrderSession = (0, _react.useCallback)(() => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.RESET_SINGLE_ORDER

package/package.json

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