thm-p3-configurator 0.0.387 → 0.0.388

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

@@ -1,5 +1,7 @@
 "use strict";
 
+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");
@@ -13,6 +15,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
@@ -29,9 +33,11 @@ var _constants__ = require("../../__constants__");
 var _FormulaContext = require("../../__context__/FormulaContext");
 var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
+var _singleOrderBranchSelector = require("../../__helpers__/singleOrderBranchSelector");
 var _useIsSingleOrder = _interopRequireDefault(require("../../__hooks__/useIsSingleOrder"));
 var _useIsTmg = require("../../__hooks__/useIsTmg");
 var _OrderTypeSelectorModal = _interopRequireWildcard(require("./OrderTypeSelectorModal"));
+var _reactRouterDom = require("react-router-dom");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -297,6 +303,7 @@ const SingleOrderModalContent = _ref6 => {
   }));
 };
 const InternalBranchSelectorModal = () => {
+  const location = (0, _reactRouterDom.useLocation)();
   const {
     branchTypes,
     isLoadingBranchTypes
@@ -315,8 +322,11 @@ const InternalBranchSelectorModal = () => {
     existingDossierId,
     orderType,
     licensePlate,
-    model
+    model,
+    singleOrderFlowRevision
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const previousSelectedBranchRef = (0, _react.useRef)(selectedBranch);
+  const previousLocationKeyRef = (0, _react.useRef)(location.key);
   const {
     myBranches,
     isLoadingMyBranches
@@ -348,6 +358,31 @@ const InternalBranchSelectorModal = () => {
       branchTypes
     });
   }, [selectedBranch, branchById, isTMGOrganization, branchTypes, dispatch]);
+  (0, _react.useEffect)(() => {
+    if ((0, _singleOrderBranchSelector.shouldResetDismissedBranchSelectorState)({
+      previousSelectedBranch: previousSelectedBranchRef.current,
+      selectedBranch
+    })) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+    previousSelectedBranchRef.current = selectedBranch;
+  }, [selectedBranch]);
+  (0, _react.useEffect)(() => {
+    const isSingleOrderPath = location.pathname.includes('configurator/single-order') || location.pathname.includes('configurator/losse-order');
+    const didLocationEntryChange = previousLocationKeyRef.current !== location.key;
+    if (isSingleOrderPath && didLocationEntryChange) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+    previousLocationKeyRef.current = location.key;
+  }, [location.key, location.pathname]);
+  (0, _react.useEffect)(() => {
+    if (isSingleOrderPage && !selectedBranch) {
+      setIsDismissed(false);
+      _setSelectedBranchId(undefined);
+    }
+  }, [singleOrderFlowRevision, isSingleOrderPage, selectedBranch]);
   const handlePrimaryButtonClicked = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,

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

@@ -204,7 +204,8 @@ const INITIAL_ORDER_SESSION_STATE = {
   isTowCenterBranch: false,
   anderAfleveradres: false,
   afhalenInWinkel: false,
-  hasGoedkeuringsnummerActivity: false
+  hasGoedkeuringsnummerActivity: false,
+  singleOrderFlowRevision: 0
 };
 const orderSessionActions = exports.orderSessionActions = {
   INITIALIZE_NEW_ORDER: 'INITIALIZE_NEW_ORDER',
@@ -334,13 +335,15 @@ const orderSessionReducer = (state, action) => {
             selectedBoardComputer: null,
             isBoardComputerDeselected: false,
             singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart,
-            discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode
+            discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode,
+            singleOrderFlowRevision: state.singleOrderFlowRevision + 1
           });
         }
         return _objectSpread(_objectSpread({}, INITIAL_ORDER_SESSION_STATE), {}, {
           selectedBranch: branchId || INITIAL_ORDER_SESSION_STATE.selectedBranch,
           discountCode: discountCode || INITIAL_ORDER_SESSION_STATE.discountCode,
-          singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart
+          singleOrderCart: singleOrderCart || INITIAL_ORDER_SESSION_STATE.singleOrderCart,
+          singleOrderFlowRevision: state.singleOrderFlowRevision + 1
         });
       }
     case orderSessionActions.INITIALIZE_EXISTING_ORDER:
@@ -376,7 +379,8 @@ const orderSessionReducer = (state, action) => {
         window.sessionStorage.removeItem(_constants__.PRIVATE_SINGLE_ORDER_SESSION_KEY);
         return _objectSpread(_objectSpread({}, INITIAL_ORDER_SESSION_STATE), {}, {
           selectedBranch: null,
-          singleOrderCart: []
+          singleOrderCart: [],
+          singleOrderFlowRevision: state.singleOrderFlowRevision + 1
         });
       }
     case orderSessionActions.EMPTY_SINGLE_ORDER_CART:

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldResetDismissedBranchSelectorState = void 0;
+const shouldResetDismissedBranchSelectorState = _ref => {
+  let {
+    previousSelectedBranch,
+    selectedBranch
+  } = _ref;
+  return Boolean(previousSelectedBranch) && !selectedBranch;
+};
+exports.shouldResetDismissedBranchSelectorState = shouldResetDismissedBranchSelectorState;

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

@@ -8,11 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useIsSingleOrder = exports.default = void 0;
 require("core-js/modules/es.array.includes.js");
 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') || window.location.pathname.includes('configurator/losse-order'));
-  }, []);
+  return typeof window !== 'undefined' && (window.location.pathname.includes('configurator/single-order') || window.location.pathname.includes('configurator/losse-order'));
 };
 exports.useIsSingleOrder = useIsSingleOrder;
 var _default = exports.default = useIsSingleOrder;

package/package.json

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