thm-p3-configurator 0.0.95 → 0.0.97

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

@@ -380,7 +380,7 @@ 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.
 
-      if (APP_CONFIG.internal) {
+      try {
         var _data$articles7, _data$articles8, _data$articles9, _data$articles10, _data$articles11;
         // Enrich all products with brands and prices
         const enrichedProducts = await (0, _singleOrderArticles.enrichArticlesWithBrandsAndPrices)(allProducts, branchId, formula);
@@ -398,7 +398,7 @@ const useProductsQuery = orderParameters => {
             extras: ((_data$articles11 = data.articles) === null || _data$articles11 === void 0 || (_data$articles11 = _data$articles11.extras) === null || _data$articles11 === void 0 ? void 0 : _data$articles11.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || []
           })
         });
-      } else {
+      } catch (_unused) {
         return data;
       }
     }

package/dist/src/shared/__components__/LocationsSelector/index.js

@@ -77,7 +77,7 @@ const LocationsSelector = /*#__PURE__*/_react.default.memo(() => {
     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]);
   let locations;
-  if (isTMGOrganization) {
+  if (isTMGOrganization || !APP_CONFIG.internal) {
     const {
       branches
     } = (0, _queries.useBranchesQuery)({

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

@@ -94,7 +94,7 @@ const NormalPageModalContent = _ref => {
     var _branches$;
     if (!(_branches !== null && _branches !== void 0 && _branches.length)) return;
     if (selectedBranch) return;
-    const shouldAutoSelect = !isLocation && !existingDossierId && !isTMGOrganization && _branches.length === 1;
+    const shouldAutoSelect = !existingDossierId && !isTMGOrganization && _branches.length === 1;
     if (!shouldAutoSelect) return;
     const branchToSelect = (_branches$ = _branches[0]) === null || _branches$ === void 0 ? void 0 : _branches$.entityId;
     if (branchToSelect) {
@@ -248,6 +248,14 @@ const InternalBranchSelectorModal = () => {
     selectedBranch,
     existingDossierId
   }, dispatch] = (0, _OrderSessionContext.useOrderSession)();
+  const {
+    myBranches,
+    isLoadingMyBranches
+  } = (0, _queries.useMyBranches)(formula);
+  const shouldAutoSelect = _react.default.useMemo(() => {
+    if (isSingleOrderPage) return false;
+    return !existingDossierId && !isTMGOrganization && !selectedBranch && (myBranches === null || myBranches === void 0 ? void 0 : myBranches.length) === 1;
+  }, [existingDossierId, isTMGOrganization, selectedBranch, myBranches, isSingleOrderPage]);
   const handlePrimaryButtonClicked = () => {
     dispatch({
       type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,
@@ -256,13 +264,13 @@ const InternalBranchSelectorModal = () => {
       }
     });
   };
-  if (isLoadingBranchTypes) {
+  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage;
+  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization && !shouldAutoSelect && !isLoadingMyBranches;
+  if (isLoadingBranchTypes || isLoadingMyBranches) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "thm-configurator-wrapper--offset"
-    }, ' ', /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null), ' ');
+    }, /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null));
   }
-  const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage;
-  const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization;
   return /*#__PURE__*/_react.default.createElement(_Modal.default, {
     isOpen: shouldShowModalForSingleOrder || shouldShowModalForOtherPages,
     title: 'Kies een vestiging:',

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

@@ -8,17 +8,18 @@ var _react = require("react");
 var _queries = require("../__api__/queries");
 var _constants__ = require("../__constants__");
 var _useAuthSession = require("./useAuthSession");
-const useIsTmg = () => {
+const useIsTmg = exports.useIsTmg = function useIsTmg() {
+  let internal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
   const {
     branchTypes
-  } = (0, _queries.useBranchTypes)();
-  const {
-    branch
-  } = (0, _useAuthSession.useAuthSession)();
+  } = (0, _queries.useBranchTypes)() || {};
+  const session = (0, _useAuthSession.useAuthSession)();
+  const branch = session === null || session === void 0 ? void 0 : session.branch;
   return (0, _react.useMemo)(() => {
-    var _branchTypes$byId;
-    const branchType = branchTypes === null || branchTypes === void 0 || (_branchTypes$byId = branchTypes.byId) === null || _branchTypes$byId === void 0 ? void 0 : _branchTypes$byId[branch === null || branch === void 0 ? void 0 : branch.organisatietype];
+    if (!internal || !(branchTypes !== null && branchTypes !== void 0 && branchTypes.byId) || !(branch !== null && branch !== void 0 && branch.organisatietype)) {
+      return false;
+    }
+    const branchType = branchTypes.byId[branch.organisatietype];
     return (branchType === null || branchType === void 0 ? void 0 : branchType.title) === _constants__.TMG_ORGANIZATION_TYPE;
-  }, [branchTypes, branch]);
-};
-exports.useIsTmg = useIsTmg;
+  }, [branchTypes, branch, internal]);
+};

package/package.json

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