@crystaldesign/diva-backoffice 25.4.0-beta.26 → 25.4.0-beta.27

package/build/esm/index.js

@@ -125,7 +125,6 @@ import Checkbox$1 from 'antd/es/checkbox/Checkbox';
 import Modal$3 from 'antd/es/modal';
 import Spin$1 from 'antd/es/spin';
 import Flex from 'antd/es/flex';
-import Alert$1 from 'antd/es/alert/Alert';
 import JSZip from 'jszip';
 import Switch$1 from 'antd/es/switch';
 import Layout$1 from 'antd/es/layout';
@@ -30729,7 +30728,7 @@ function PublishCustomCell (_ref) {
     apiConfig = _ref.apiConfig,
     context = _ref.context,
     api = _ref.api,
-    node = _ref.node;
+    modalState = _ref.modalState;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _React$useState = React.useState(false),
@@ -30740,55 +30739,75 @@ function PublishCustomCell (_ref) {
   var disabled = !data.basedCatalogId && !data.basedPackageId || !data.name;
   var _onChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(publish) {
+      var loadingTimeout, response;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             isLoading(true);
-            _context.prev = 1;
+            loadingTimeout = setTimeout(function () {
+              modalState.showLoadingModal(t("backoffice.idmEnricher.packages.label.".concat(publish ? 'publishing' : 'unpublishing')));
+            }, 3000);
+            _context.prev = 2;
             if (!publish) {
-              _context.next = 7;
+              _context.next = 9;
               break;
             }
-            _context.next = 5;
+            _context.next = 6;
             return context === null || context === void 0 ? void 0 : context.updateServerData(data, {
               update: apiConfig.enricherService + '/packages/${_id}/publish',
               usePut: true
-            });
-          case 5:
-            _context.next = 9;
+            }, undefined, true);
+          case 6:
+            response = _context.sent;
+            _context.next = 12;
             break;
-          case 7:
-            _context.next = 9;
+          case 9:
+            _context.next = 11;
             return context === null || context === void 0 ? void 0 : context.updateServerData(data, {
               update: apiConfig.enricherService + '/packages/${_id}/unpublish',
               usePut: true
-            });
-          case 9:
+            }, undefined, true);
+          case 11:
+            response = _context.sent;
+          case 12:
+            clearTimeout(loadingTimeout);
+            if (!(response.status == 202)) {
+              _context.next = 17;
+              break;
+            }
+            modalState.showWarningModal(t("backoffice.idmEnricher.packages.label.warning.".concat(publish ? 'publishing' : 'unpublishing')));
+            _context.next = 22;
+            break;
+          case 17:
+            if (!(response.status == 200)) {
+              _context.next = 21;
+              break;
+            }
+            modalState.closeModal();
+            _context.next = 22;
+            break;
+          case 21:
+            throw new Error("Server errror: ".concat(response.statusText, " (").concat(response.status, ")"));
+          case 22:
             context === null || context === void 0 || context.reset({
               context: context,
               api: api
             });
-            _context.next = 15;
+            _context.next = 28;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
-            context.onError({
-              context: context,
-              api: api,
-              error: _context.t0,
-              errorText: 'Error on publish/unpublish',
-              node: node
-            });
-          case 15:
-            _context.prev = 15;
+          case 25:
+            _context.prev = 25;
+            _context.t0 = _context["catch"](2);
+            modalState.showErrorModal("Error on ".concat(publish ? 'publish' : 'unpublish', ": ").concat(_context.t0 instanceof Error ? _context.t0.message : String(_context.t0)));
+          case 28:
+            _context.prev = 28;
             isLoading(false);
-            return _context.finish(15);
-          case 18:
+            return _context.finish(28);
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12, 15, 18]]);
+      }, _callee, null, [[2, 25, 28, 31]]);
     }));
     return function onChange(_x) {
       return _ref2.apply(this, arguments);
@@ -30833,54 +30852,6 @@ function hasUnpublishedChanges(publishDateString, lastUpdatedDateString) {
   return false;
 }
 
-function LoadingModal (_ref) {
-  var isModalOpen = _ref.isModalOpen,
-    handleOk = _ref.handleOk,
-    error = _ref.error;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var contentStyle = {
-    padding: 50,
-    borderRadius: 4
-  };
-  var content = /*#__PURE__*/jsx("div", {
-    style: contentStyle
-  });
-  return /*#__PURE__*/jsx(Fragment, {
-    children: /*#__PURE__*/jsxs(Modal$3, {
-      open: isModalOpen,
-      onOk: handleOk,
-      cancelButtonProps: {
-        style: {
-          display: 'none'
-        }
-      },
-      closable: false,
-      okButtonProps: {
-        style: {
-          display: !error ? 'none' : undefined
-        }
-      },
-      children: [error && /*#__PURE__*/jsx(Alert$1, {
-        message: error,
-        type: "error",
-        showIcon: true
-      }), !error && /*#__PURE__*/jsx(Flex, {
-        gap: "middle",
-        vertical: true,
-        children: /*#__PURE__*/jsx(Flex, {
-          gap: "middle",
-          children: /*#__PURE__*/jsx(Spin$1, {
-            tip: t('backoffice.idmEnricher.export.modaltext'),
-            size: "large",
-            children: content
-          })
-        })
-      })]
-    })
-  });
-}
-
 var getCurrencyKey = function getCurrencyKey(t) {
   return [{
     name: t('backoffice.idmCatalog.general.label.currencies.EUR'),
@@ -31092,19 +31063,110 @@ var getItemTypeKey = function getItemTypeKey(t) {
   }];
 };
 
+var useLoadingModal = function useLoadingModal() {
+  var _Modal$useModal = Modal$3.useModal(),
+    _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+    modal = _Modal$useModal2[0],
+    contextHolder = _Modal$useModal2[1];
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2);
+    _useState2[0];
+    var setInstance = _useState2[1];
+  var showLoadingModal = useCallback(function (text) {
+    var newInstance = modal.info({
+      content: /*#__PURE__*/jsx(Fragment, {
+        children: /*#__PURE__*/jsx(Flex, {
+          gap: "middle",
+          vertical: true,
+          children: /*#__PURE__*/jsx(Flex, {
+            gap: "middle",
+            children: /*#__PURE__*/jsx(Spin$1, {
+              tip: text,
+              size: "large",
+              children: /*#__PURE__*/jsx("div", {
+                style: {
+                  padding: 50,
+                  borderRadius: 4
+                }
+              })
+            })
+          })
+        })
+      }),
+      icon: null,
+      maskClosable: false,
+      okButtonProps: {
+        style: {
+          display: 'none'
+        }
+      },
+      closable: false,
+      centered: true
+    });
+    setInstance(function (old) {
+      old === null || old === void 0 || old.destroy();
+      return newInstance;
+    });
+  }, []);
+  var showErrorModal = useCallback(function (error) {
+    var newInstance = modal.error({
+      content: error,
+      okButtonProps: {
+        style: {
+          display: 'none'
+        }
+      },
+      centered: true,
+      closable: true,
+      maskClosable: true
+    });
+    setInstance(function (old) {
+      old === null || old === void 0 || old.destroy();
+      return newInstance;
+    });
+  }, []);
+  var showWarningModal = useCallback(function (warning) {
+    var newInstance = modal.warning({
+      content: warning,
+      okButtonProps: {
+        style: {
+          display: 'none'
+        }
+      },
+      centered: true,
+      closable: true,
+      maskClosable: true
+    });
+    setInstance(function (old) {
+      old === null || old === void 0 || old.destroy();
+      return newInstance;
+    });
+  }, []);
+  var closeModal = useCallback(function () {
+    setInstance(function (old) {
+      old === null || old === void 0 || old.destroy();
+      return null;
+    });
+  }, []);
+  return {
+    contextHolder: contextHolder,
+    showLoadingModal: showLoadingModal,
+    showErrorModal: showErrorModal,
+    showWarningModal: showWarningModal,
+    closeModal: closeModal
+  };
+};
+
 var TablePackages = observer(function () {
   var root = useStore();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
-  var _React$useState = React.useState(false),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    fileIsLoading = _React$useState2[0],
-    setFileIsLoading = _React$useState2[1];
-  var _React$useState3 = React.useState(''),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    fileDownloadError = _React$useState4[0],
-    setFileDownloadError = _React$useState4[1];
+  var modalState = useLoadingModal();
+  var showLoadingModal = modalState.showLoadingModal,
+    showErrorModal = modalState.showErrorModal,
+    closeModal = modalState.closeModal,
+    contextHolder = modalState.contextHolder;
   var _useEnricherContext = useEnricherContext([]),
     setSelectedPackage = _useEnricherContext.setSelectedPackage;
   var organizationId = root.dataStore.organizationId;
@@ -31122,9 +31184,6 @@ var TablePackages = observer(function () {
       filter: organizationId
     };
   }, [organizationId]);
-  var handleLoadingModalOk = function handleLoadingModalOk() {
-    setFileIsLoading(false);
-  };
   var rowActions = useMemo(function () {
     return [{
       icon: /*#__PURE__*/jsx(EditOutlined, {}),
@@ -31151,19 +31210,19 @@ var TablePackages = observer(function () {
                 selectedNodes = _ref4.selectedNodes;
                 url = apiConfig.enricherService + '/packages/' + selectedNodes[0].data._id + '/catalog'; // Show modal if download takes more than 3 seconds
                 alertTimeout = setTimeout(function () {
-                  setFileIsLoading(true);
+                  showLoadingModal(t('backoffice.idmEnricher.export.modaltext'));
                 }, 3000);
                 _context.prev = 3;
                 _context.next = 6;
                 return downloadFile(url, root.dataStore.jwt, 'application/xml', selectedNodes[0].data.name + '.xml');
               case 6:
-                setFileIsLoading(false);
+                closeModal();
                 _context.next = 12;
                 break;
               case 9:
                 _context.prev = 9;
                 _context.t0 = _context["catch"](3);
-                setFileDownloadError('File download failed:' + _context.t0);
+                showErrorModal('File download failed:' + _context.t0);
               case 12:
                 _context.prev = 12;
                 // Clear the alert timeout once the download is complete or fails
@@ -31216,7 +31275,8 @@ var TablePackages = observer(function () {
         pinned: 'left',
         lockPinned: true,
         cellRendererParams: {
-          apiConfig: apiConfig
+          apiConfig: apiConfig,
+          modalState: modalState
         }
       }, {
         headerName: 'backoffice.idmEnricher.packages.label.name',
@@ -31348,11 +31408,7 @@ var TablePackages = observer(function () {
       rowActions: rowActions,
       preFilter: preFilter,
       configuration: configuration
-    }), /*#__PURE__*/jsx(LoadingModal, {
-      isModalOpen: fileIsLoading,
-      handleOk: handleLoadingModalOk,
-      error: fileDownloadError
-    })]
+    }), contextHolder]
   });
 });
 
@@ -34761,19 +34817,16 @@ var TableCatalogs = observer(function () {
     i18n = _useTranslation.i18n;
   var _useDivaCore = useDivaCore(),
     userHasPermission = _useDivaCore.actions.userHasPermission;
+  var spreadsheetRef = useRef(null);
+  var _useLoadingModal = useLoadingModal(),
+    showLoadingModal = _useLoadingModal.showLoadingModal,
+    showErrorModal = _useLoadingModal.showErrorModal,
+    closeModal = _useLoadingModal.closeModal,
+    contextHolder = _useLoadingModal.contextHolder;
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    fileIsLoading = _React$useState2[0],
-    setFileIsLoading = _React$useState2[1];
-  var _React$useState3 = React.useState(''),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    fileDownloadError = _React$useState4[0],
-    setFileDownloadError = _React$useState4[1];
-  var spreadsheetRef = useRef(null);
-  var _React$useState5 = React.useState(false),
-    _React$useState6 = _slicedToArray(_React$useState5, 2),
-    showApi2 = _React$useState6[0],
-    setShowApi2 = _React$useState6[1];
+    showApi2 = _React$useState2[0],
+    setShowApi2 = _React$useState2[1];
   var _useCatalogContext = useCatalogContext([]),
     setSelectedCatalog = _useCatalogContext.setSelectedCatalog;
   var organizationId = root.dataStore.organizationId;
@@ -34821,19 +34874,19 @@ var TableCatalogs = observer(function () {
                 selectedNodes = _ref2.selectedNodes;
                 url = apiConfig.idmService + '/v3.0/catalogs/' + selectedNodes[0].data._id + '/complete'; // Show modal if download takes more than 3 seconds
                 alertTimeout = setTimeout(function () {
-                  setFileIsLoading(true);
+                  showLoadingModal(t('backoffice.idmEnricher.export.modaltext'));
                 }, 3000);
                 _context.prev = 3;
                 _context.next = 6;
                 return downloadFile(url, root.dataStore.jwt, 'application/xml', selectedNodes[0].data.name + '.xml');
               case 6:
-                setFileIsLoading(false);
+                closeModal();
                 _context.next = 12;
                 break;
               case 9:
                 _context.prev = 9;
                 _context.t0 = _context["catch"](3);
-                setFileDownloadError('File download failed:' + _context.t0);
+                showErrorModal('File download failed:' + _context.t0);
               case 12:
                 _context.prev = 12;
                 // Clear the alert timeout once the download is complete or fails
@@ -35434,9 +35487,6 @@ var TableCatalogs = observer(function () {
       }])
     };
   }, [i18n.language, showApi2]);
-  var handleLoadingModalOk = useCallback(function () {
-    setFileIsLoading(false);
-  }, []);
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Descriptions$1, {
       title: /*#__PURE__*/jsxs("div", {
@@ -35475,11 +35525,7 @@ var TableCatalogs = observer(function () {
       rowActions: rowActions,
       preFilter: preFilter,
       configuration: configuration
-    }), /*#__PURE__*/jsx(LoadingModal, {
-      isModalOpen: fileIsLoading,
-      handleOk: handleLoadingModalOk,
-      error: fileDownloadError
-    })]
+    }), contextHolder]
   });
 });
 

package/build/types/backoffice/src/ui/IDMCatalogEditor/modules/TableCatalogs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/modules/TableCatalogs/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAmB5D,eAAO,MAAM,aAAa;;CA2wBxB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/modules/TableCatalogs/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAkB5D,eAAO,MAAM,aAAa;;CAswBxB,CAAC"}

package/build/types/backoffice/src/ui/IDMCommonComponents/useLoadingModal.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+export interface LoadingModalState {
+    showLoadingModal: (text: string) => void;
+    showErrorModal: (error: string) => void;
+    showWarningModal: (warning: string) => void;
+    closeModal: () => void;
+    contextHolder: React.ReactElement;
+}
+export declare const useLoadingModal: () => LoadingModalState;
+//# sourceMappingURL=useLoadingModal.d.ts.map

package/build/types/backoffice/src/ui/IDMCommonComponents/useLoadingModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useLoadingModal.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/IDMCommonComponents/useLoadingModal.tsx"],"names":[],"mappings":"AACA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAIrD,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,aAAa,EAAE,KAAK,CAAC,YAAY,CAAC;CACnC;AAED,eAAO,MAAM,eAAe,QAAO,iBAuElC,CAAC"}

package/build/types/backoffice/src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.d.ts

@@ -1,7 +1,9 @@
 import React from 'react';
 import { DivaCustomCellRendererProps } from '@crystaldesign/spreadsheet';
 import { ApiConfig } from '@crystaldesign/diva-core';
-export default function ({ data, apiConfig, context, api, node }: DivaCustomCellRendererProps<any, any, {
+import { LoadingModalState } from '../../../IDMCommonComponents/useLoadingModal';
+export default function ({ data, apiConfig, context, api, modalState, }: DivaCustomCellRendererProps<any, any, {
     apiConfig: ApiConfig;
+    modalState: LoadingModalState;
 }>): "" | React.JSX.Element;
 //# sourceMappingURL=PublishCustomCell.d.ts.map

package/build/types/backoffice/src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PublishCustomCell.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAOzE,OAAO,EAAE,SAAS,EAAkB,MAAM,0BAA0B,CAAC;AAErE,MAAM,CAAC,OAAO,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC,0BAkDhI"}
+{"version":3,"file":"PublishCustomCell.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAOzE,OAAO,EAAE,SAAS,EAAkB,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,MAAM,CAAC,OAAO,WAAW,EACvB,IAAI,EACJ,SAAS,EACT,OAAO,EACP,GAAG,EACH,UAAU,GACX,EAAE,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAE,CAAC,0BAyEhG"}

package/build/types/backoffice/src/ui/IDMEnricherEditor/modules/TablePackages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAevC,eAAO,MAAM,aAAa;;CA2PxB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAcvC,eAAO,MAAM,aAAa;;CAwPxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "25.4.0-beta.26",
+  "version": "25.4.0-beta.27",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "5.4.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "25.4.0-beta.26",
-    "@crystaldesign/content-item": "25.4.0-beta.26",
-    "@crystaldesign/diva-core": "25.4.0-beta.26",
-    "@crystaldesign/diva-utils": "25.4.0-beta.26",
-    "@crystaldesign/media-upload": "25.4.0-beta.26",
-    "@crystaldesign/rtf-editor": "25.4.0-beta.26",
-    "@crystaldesign/spreadsheet": "25.4.0-beta.26",
+    "@crystaldesign/content-box": "25.4.0-beta.27",
+    "@crystaldesign/content-item": "25.4.0-beta.27",
+    "@crystaldesign/diva-core": "25.4.0-beta.27",
+    "@crystaldesign/diva-utils": "25.4.0-beta.27",
+    "@crystaldesign/media-upload": "25.4.0-beta.27",
+    "@crystaldesign/rtf-editor": "25.4.0-beta.27",
+    "@crystaldesign/spreadsheet": "25.4.0-beta.27",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "496103b33bb8b322a3faf69a8fc7ec692fd96c7e"
+  "gitHead": "a152298e8931b09cce959d305ff652f7148d0f23"
 }

package/build/types/backoffice/src/ui/LoadingModal/index.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-interface Props {
-    isModalOpen: boolean;
-    handleOk: () => void;
-    error?: string;
-}
-export default function ({ isModalOpen, handleOk, error }: Props): React.JSX.Element;
-export {};
-//# sourceMappingURL=index.d.ts.map

package/build/types/backoffice/src/ui/LoadingModal/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/LoadingModal/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,UAAU,KAAK;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,KAAK,qBAgC/D"}