@crystaldesign/diva-archive 26.3.0-rc.8 → 26.3.0

package/build/esm/index.js

@@ -225,6 +225,7 @@ function useActions(_ref) {
     openModal = _useDivaCore$actions.openModal,
     userHasPermission = _useDivaCore$actions.userHasPermission,
     openSnackBar = _useDivaCore$actions.openSnackBar,
+    canAccessOrganization = _useDivaCore$actions.canAccessOrganization,
     _useDivaCore$handler = _useDivaCore.handler,
     reportHandler = _useDivaCore$handler.reportHandler,
     organizationHandler = _useDivaCore$handler.organizationHandler;
@@ -253,6 +254,9 @@ function useActions(_ref) {
         trashed: trashed
       }),
       hide: function hide(item, rowId) {
+        if (item.OrganizationId && !canAccessOrganization(item.OrganizationId)) {
+          return true;
+        }
         //irreverseble delete is visible if the user owns that basket
         if (item.SalespersonID === (user === null || user === void 0 ? void 0 : user._id)) {
           return false;
@@ -299,7 +303,8 @@ function useActions(_ref) {
         jwt: jwt,
         reportHandler: reportHandler,
         user: user,
-        organizationHandler: organizationHandler
+        organizationHandler: organizationHandler,
+        canAccessOrganization: canAccessOrganization
       })
     };
   });
@@ -313,7 +318,10 @@ function useActions(_ref) {
       t: t,
       trashed: trashed
     }),
-    disabled: false
+    disabled: false,
+    hide: function hide(item) {
+      return !!item.OrganizationId && !canAccessOrganization(item.OrganizationId);
+    }
   });
   return gridActions;
 }
@@ -332,10 +340,11 @@ function getAction(_ref2) {
     jwt = _ref2.jwt,
     reportHandler = _ref2.reportHandler,
     user = _ref2.user,
-    organizationHandler = _ref2.organizationHandler;
+    organizationHandler = _ref2.organizationHandler,
+    canAccessOrganization = _ref2.canAccessOrganization;
   switch (action.type) {
     case 'basket':
-      return openBasketAction(openComponent, organizationHandler, openModal, organization, t);
+      return openBasketAction(openComponent, organizationHandler, openModal, organization, canAccessOrganization, t);
     case 'pdf':
       return openPdfAction(openComponent, openSnackBar, toggleLoading, openModal, t, action, reportHandler);
     case 'planner':
@@ -359,7 +368,7 @@ function getAction(_ref2) {
       throw Error("".concat(action.type, " is not a valid action type"));
   }
 }
-function openBasketAction(openComponent, organizationHandler, openModal, organization, t) {
+function openBasketAction(openComponent, organizationHandler, openModal, organization, canAccessOrganization, t) {
   var openInCurrentOrg = function openInCurrentOrg(item) {
     var params = {
       module: 'Basket',
@@ -380,25 +389,42 @@ function openBasketAction(openComponent, organizationHandler, openModal, organiz
     });
   };
   var openInTargetOrg = function openInTargetOrg(item) {
-    var url = window.location.origin + '/seller?lang=de' + '&organizationId=' + item.OrganizationId + '&module=Basket&divaNr=' + item.DivaNr + '&check=1';
-    openComponent({
-      url: url,
-      openInNewTab: true
-    });
+    if (item.OrderStatus === 'SEND') {
+      var url = window.location.origin + '/seller?lang=de' + '&organizationId=' + item.OrganizationId + '&module=Basket&divaNr=' + item.DivaNr + '&assignNewDivaNr=true';
+      openComponent({
+        url: url,
+        openInNewTab: true
+      });
+    } else {
+      var _url = window.location.origin + '/seller?lang=de' + '&organizationId=' + item.OrganizationId + '&module=Basket&divaNr=' + item.DivaNr + '&check=1';
+      openComponent({
+        url: _url,
+        openInNewTab: true
+      });
+    }
   };
   return /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
-      var modaltitle;
+      var _organization$type, _organization$type$to, modaltitle, hasAccessToTargetOrg, organizationType, isWrapperLikeOrganization;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(item.OrganizationId && item.OrganizationId !== organization._id)) {
-              _context.next = 5;
+              _context.next = 10;
               break;
             }
             modaltitle = t('action.archive.edit.cannotopen');
-            if (!(!(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType))) {
-              _context.next = 4;
+            hasAccessToTargetOrg = canAccessOrganization(item.OrganizationId);
+            if (hasAccessToTargetOrg) {
+              _context.next = 5;
+              break;
+            }
+            return _context.abrupt("return", openInCurrentOrg(item));
+          case 5:
+            organizationType = organization === null || organization === void 0 || (_organization$type = organization.type) === null || _organization$type === void 0 || (_organization$type$to = _organization$type.toUpperCase) === null || _organization$type$to === void 0 ? void 0 : _organization$type$to.call(_organization$type);
+            isWrapperLikeOrganization = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType) || organizationType === 'SUPPLIER' || organizationType === 'SUPLIER';
+            if (!isWrapperLikeOrganization) {
+              _context.next = 9;
               break;
             }
             return _context.abrupt("return", openModal({
@@ -414,7 +440,7 @@ function openBasketAction(openComponent, organizationHandler, openModal, organiz
                 }
               }
             }));
-          case 4:
+          case 9:
             return _context.abrupt("return", openModal({
               title: modaltitle,
               rejectByIcon: true,
@@ -441,9 +467,9 @@ function openBasketAction(openComponent, organizationHandler, openModal, organiz
                 }
               }
             }));
-          case 5:
+          case 10:
             return _context.abrupt("return", openInCurrentOrg(item));
-          case 6:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -799,9 +825,9 @@ function deleteAction(_ref9) {
 function triggerSendEmail(_ref11) {
   var sendEmail = _ref11.sendEmail;
     _ref11.t;
-    var action = _ref11.action,
-    organization = _ref11.organization,
-    user = _ref11.user,
+    var action = _ref11.action;
+    _ref11.organization;
+    var user = _ref11.user,
     item = _ref11.item,
     callback = _ref11.callback;
   var to;
@@ -817,8 +843,6 @@ function triggerSendEmail(_ref11) {
         return getMailAddress(item.ClientEmail, required);
       } else if (mail == 'SELLER') {
         return getMailAddress(item.SalespersonEmail, required);
-      } else if (mail == 'ORGANIZATION') {
-        return getMailAddress(organization === null || organization === void 0 ? void 0 : organization.email, required);
       } else if (mail == 'USER') {
         return getMailAddress(user === null || user === void 0 ? void 0 : user.mainEmail, required);
       } else {

package/build/types/archive/src/useActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAI5F,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,KAAK,iEA4E3E"}
+{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAI5F,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,KAAK,iEAiF3E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-archive",
-  "version": "26.3.0-rc.8",
+  "version": "26.3.0",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,10 +15,10 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/grid": "26.3.0-rc.8",
+    "@crystaldesign/grid": "26.3.0",
     "flat": "^5.0.2"
   },
   "module": "build/esm/index.js",
   "types": "./build/types/archive/src/index.d.ts",
-  "gitHead": "5a095195961416012032f298a9ed6841702d4a68"
+  "gitHead": "cf3302995a149aa3f95fd31b254e270a30507941"
 }