@crystaldesign/diva-backoffice 25.2.0-beta.14 → 25.2.0-beta.16

package/build/esm/index.js

@@ -33632,30 +33632,77 @@ function UploadButton (_ref) {
     title = _ref.title,
     disabled = _ref.disabled,
     contentType = _ref.contentType,
-    setProgress = _ref.setProgress;
+    setProgress = _ref.setProgress,
+    setFileList = _ref.setFileList,
+    fileList = _ref.fileList,
+    progress = _ref.progress;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var root = useStore();
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    fileList = _useState2[0],
-    setFileList = _useState2[1];
+  var ref = useRef();
   var handleUploadChange = function handleUploadChange(info) {
     var status = info.file.status;
     if (status === 'done') {
-      message.success("".concat(info.file.name, " file uploaded successfully."));
-      setFileList([]); // Clear the file list
-      setProgress('SUCCESS'); // Mark upload as successful
+      setFileList([]);
+      setProgress('SUCCESS');
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
+      if (info.fileList[0]) {
+        info.fileList[0].percent = 100;
+      }
     } else if (status === 'error') {
-      message.error("".concat(info.file.name, " file upload failed."));
-      setProgress('ERROR'); // Mark upload as failed
+      setProgress('ERROR');
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
+      if (info.fileList[0]) {
+        info.fileList[0].percent = 100;
+      }
     } else if (status === 'removed') {
-      setFileList([]); // Clear the file list
-      setProgress(undefined); // Reset the progress state
+      setFileList([]);
+      setProgress(undefined);
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
     } else {
-      setProgress('INPROGRESS'); // Mark upload as in progress
-      setFileList(info.fileList); // Update the file list during the upload
+      setProgress('INPROGRESS');
+      if (info.fileList[0]) {
+        var file = info.fileList[0];
+        if (status === 'uploading') {
+          // First 50%, the file is still uploading to browser
+          file.percent = (file.percent || 0) / 2;
+          if (file.percent === 50) {
+            // Calculate size-based progress for the second 50%
+            if (file.size) {
+              var _ref$current$startTim, _ref$current, _ref$current$interval, _ref$current2;
+              var fileSize = file.size;
+              var startTime = (_ref$current$startTim = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.startTime) !== null && _ref$current$startTim !== void 0 ? _ref$current$startTim : Date.now();
+              var interval = (_ref$current$interval = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.interval) !== null && _ref$current$interval !== void 0 ? _ref$current$interval : setInterval(function () {
+                // Assume 1MB takes about 4 seconds to upload
+                var estimatedTimeInSeconds = fileSize / (1024 * 1024) * 4;
+                var elapsedTime = (Date.now() - startTime) / 1000;
+                // Calculate progress for the second 50%
+                var sizeBasedProgress = Math.min(50 * (elapsedTime / estimatedTimeInSeconds), 49);
+                // Combine both progress values, ensuring we don't exceed 99
+                file.percent = Math.min(50 + sizeBasedProgress, 99);
+                setFileList(_toConsumableArray(info.fileList));
+              }, 10);
+              ref.current = {
+                startTime: startTime,
+                interval: interval
+              };
+            }
+          }
+        } else {
+          file.percent = 100; // Set to 100 if not uploading
+        }
+      }
     }
+    setFileList(info.fileList);
   };
   var props = {
     name: 'file',
@@ -33670,7 +33717,7 @@ function UploadButton (_ref) {
   };
   return /*#__PURE__*/jsx(Fragment, {
     children: /*#__PURE__*/jsx(Upload$2, _objectSpread$9(_objectSpread$9({}, props), {}, {
-      children: /*#__PURE__*/jsx(Button$1, {
+      children: progress !== 'SUCCESS' && /*#__PURE__*/jsx(Button$1, {
         icon: /*#__PURE__*/jsx(UploadOutlined$1, {}),
         disabled: disabled,
         children: title !== null && title !== void 0 ? title : t('backoffice.idmEnricher.import.upload')
@@ -33683,19 +33730,18 @@ function IDMImportForm (_ref) {
   var idmService = _ref.idmService,
     organizationId = _ref.organizationId,
     setProgress = _ref.setProgress,
-    progress = _ref.progress;
+    progress = _ref.progress,
+    name = _ref.name,
+    setName = _ref.setName,
+    setFileList = _ref.setFileList,
+    fileList = _ref.fileList;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useState = useState(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    name = _useState2[0],
-    setName = _useState2[1];
   var uploadAction = "".concat(idmService, "/v3.0/catalogs/upload?organizationId=").concat(organizationId, "&name=").concat(encodeURIComponent(name));
   return /*#__PURE__*/jsxs(Form$1, {
     name: "basic",
     children: [/*#__PURE__*/jsx(Form$1.Item, {
       label: "Name",
-      name: "name",
       rules: [{
         required: true,
         message: t('backoffice.idmEnricher.import.namerequired')
@@ -33704,14 +33750,18 @@ function IDMImportForm (_ref) {
         onChange: function onChange(e) {
           return setName(e.target.value);
         },
-        value: name
+        value: name,
+        disabled: progress === 'INPROGRESS' || progress === 'SUCCESS'
       })
     }), /*#__PURE__*/jsx(Form$1.Item, {
       children: /*#__PURE__*/jsx(UploadButton, {
         action: uploadAction,
         contentType: "multipart/form-data",
         setProgress: setProgress,
-        disabled: !name.trim()
+        progress: progress,
+        disabled: !name.trim() || progress === 'INPROGRESS',
+        setFileList: setFileList,
+        fileList: fileList
       })
     }), /*#__PURE__*/jsxs(Form$1.Item, {
       style: {
@@ -33746,17 +33796,28 @@ function OpenModalButton (_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     progress = _useState4[0],
     setProgress = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    name = _useState6[0],
+    setName = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fileList = _useState8[0],
+    setFileList = _useState8[1];
   var showModal = function showModal() {
     setIsModalOpen(true);
   };
-  var handleOk = function handleOk() {
-    setIsModalOpen(false);
-    onClose();
+  var resetProgress = function resetProgress() {
+    setProgress(undefined);
+    setName('');
+    setFileList([]);
   };
-  var handleCancel = function handleCancel() {
+  var handleOk = function handleOk() {
     setIsModalOpen(false);
+    resetProgress();
     onClose();
   };
+  var buttonText = progress == undefined || progress == 'ERROR' ? t('backoffice.idmEnricher.import.cancel') : progress === 'INPROGRESS' ? t('backoffice.idmEnricher.import.inprogress') : t('backoffice.idmEnricher.import.finish');
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Button$1, {
       type: "primary",
@@ -33766,15 +33827,30 @@ function OpenModalButton (_ref) {
       title: title,
       open: isModalOpen,
       onOk: handleOk,
-      onCancel: handleCancel,
-      okText: progress === 'INPROGRESS' ? t('backoffice.idmEnricher.import.inprogress') : 'OK',
+      onCancel: handleOk,
+      cancelButtonProps: progress !== 'SUCCESS' ? {
+        style: {
+          display: 'none'
+        }
+      } : {
+        onClick: resetProgress
+      },
+      closable: progress !== 'INPROGRESS',
+      maskClosable: progress !== 'INPROGRESS',
+      okText: buttonText,
+      cancelText: progress === 'SUCCESS' ? t('backoffice.idmEnricher.import.new') : undefined,
       okButtonProps: {
         disabled: progress === 'INPROGRESS'
       } // Disable the button if progress is 'INPROGRESS'
       ,
+      destroyOnClose: true,
       children: type === 'IDM_IMPORT' && /*#__PURE__*/jsx(IDMImportForm, {
         setProgress: setProgress,
         progress: progress,
+        name: name,
+        setName: setName,
+        setFileList: setFileList,
+        fileList: fileList,
         idmService: idmService,
         organizationId: organizationId
       })

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.d.ts

@@ -1,11 +1,16 @@
 import React from 'react';
+import { UploadFile } from 'antd';
 import { IDMIMportProgressState } from '../../types';
 interface Props {
     idmService: string;
     organizationId: string;
     setProgress: (state: IDMIMportProgressState) => void;
+    name: string;
+    setName: (name: string) => void;
     progress: IDMIMportProgressState;
+    setFileList: (fileList: UploadFile<any>[]) => void;
+    fileList: UploadFile<any>[];
 }
-export default function ({ idmService, organizationId, setProgress, progress }: Props): React.JSX.Element;
+export default function ({ idmService, organizationId, setProgress, progress, name, setName, setFileList, fileList }: Props): React.JSX.Element;
 export {};
 //# sourceMappingURL=IDMImportForm.d.ts.map

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IDMImportForm.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAIxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IACrD,QAAQ,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,KAAK,qBAmBpF"}
+{"version":3,"file":"IDMImportForm.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/Forms/IDMImportForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAsB,UAAU,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,KAAK,qBA0B1H"}

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/OpenModalButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,KAAK,qBAsCnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/OpenModalButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,KAAK,qBA+DnF"}

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/UploadButton/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { UploadFile } from 'antd';
 import { IDMIMportProgressState } from '../types';
 interface Props {
     action: string;
@@ -6,7 +7,10 @@ interface Props {
     title?: string;
     disabled?: boolean;
     setProgress: (state: IDMIMportProgressState) => void;
+    progress: IDMIMportProgressState;
+    setFileList: (fileList: UploadFile<any>[]) => void;
+    fileList: UploadFile<any>[];
 }
-export default function ({ action, title, disabled, contentType, setProgress }: Props): React.JSX.Element;
+export default function ({ action, title, disabled, contentType, setProgress, setFileList, fileList, progress }: Props): React.JSX.Element;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/build/types/backoffice/src/ui/IDMCatalogEditor/components/UploadButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/UploadButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAOxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,qBAAqB,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,KAAK,qBA2CpF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMCatalogEditor/components/UploadButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAItC,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,MAAM,CAAC;AAGpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGlD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,qBAAqB,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAC;IACrD,QAAQ,EAAE,sBAAsB,CAAC;IACjC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,qBA+FrH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "25.2.0-beta.14",
+  "version": "25.2.0-beta.16",
   "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.2.0-beta.14",
-    "@crystaldesign/content-item": "25.2.0-beta.14",
-    "@crystaldesign/diva-core": "25.2.0-beta.14",
-    "@crystaldesign/diva-utils": "25.2.0-beta.14",
-    "@crystaldesign/media-upload": "25.2.0-beta.14",
-    "@crystaldesign/rtf-editor": "25.2.0-beta.14",
-    "@crystaldesign/spreadsheet": "25.2.0-beta.14",
+    "@crystaldesign/content-box": "25.2.0-beta.16",
+    "@crystaldesign/content-item": "25.2.0-beta.16",
+    "@crystaldesign/diva-core": "25.2.0-beta.16",
+    "@crystaldesign/diva-utils": "25.2.0-beta.16",
+    "@crystaldesign/media-upload": "25.2.0-beta.16",
+    "@crystaldesign/rtf-editor": "25.2.0-beta.16",
+    "@crystaldesign/spreadsheet": "25.2.0-beta.16",
     "@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": "195c4f01745e99bc89940f859ba16b95f08c1747"
+  "gitHead": "dd3753d9cfabd03b196e161232ac2fe1920500bd"
 }