@mcurros2/microm 1.1.331-0 → 1.1.332-0

package/dist/index.js

@@ -98,8 +98,9 @@ var $bW9pc = parcelRequire("bW9pc");
 
 var $adBvK = parcelRequire("adBvK");
 function $6bcc21fcfcabd5ad$export$2dc5b0d03dd97d36(props) {
-    const { entity: entity, getDataOnInit: getDataOnInit, initialFormMode: initialFormMode = 'view', onSaved: onSaved, onCancel: onCancel } = props;
+    const { entity: entity, getDataOnInit: getDataOnInit, initialFormMode: initialFormMode = 'view', onSaved: onSaved, onCancel: onCancel, ...rest } = props;
     const entityForm = (0, $bW9pc.useEntityForm)({
+        ...rest,
         entity: entity,
         initialFormMode: initialFormMode,
         validateInputOnBlur: true,
@@ -8278,26 +8279,31 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
                 fileStore.def.columns.c_fileprocess_id.value = fileProcessColumn.value;
                 const data = await fileStore.API.executeView(fileStore.def.views.fst_brwFiles);
                 setLoadingNotification(false);
-                if (data && data.length > 0) setUploadProgress((prev)=>{
-                    const updatedState = {
-                        ...prev
-                    };
-                    const file_records = (0, $7T941.mapDataResultToType)(data[0], "enforceObject", null, null);
-                    file_records.forEach((file)=>{
-                        updatedState[file.c_file_id] = {
-                            file_id: file.c_file_id,
-                            status_id: file.c_file_id,
-                            file_name: file.vc_filename,
-                            file_size: file.bi_filesize,
-                            progress: 100,
-                            done: true,
-                            documentURL: client.getDocumentURL(file.vc_fileguid),
-                            thumbnailURL: client.getThumbnailURL(file.vc_fileguid, thumbnailMaxSize, thumbnailQuality),
-                            vc_fileguid: file.vc_fileguid
+                if (data && data.length > 0) {
+                    let totalSize = 0;
+                    setUploadProgress((prev)=>{
+                        const updatedState = {
+                            ...prev
                         };
+                        const file_records = (0, $7T941.mapDataResultToType)(data[0], "enforceObject", null, null);
+                        file_records.forEach((file)=>{
+                            updatedState[file.c_file_id] = {
+                                file_id: file.c_file_id,
+                                status_id: file.c_file_id,
+                                file_name: file.vc_filename,
+                                file_size: file.bi_filesize,
+                                progress: 100,
+                                done: true,
+                                documentURL: client.getDocumentURL(file.vc_fileguid),
+                                thumbnailURL: client.getThumbnailURL(file.vc_fileguid, thumbnailMaxSize, thumbnailQuality),
+                                vc_fileguid: file.vc_fileguid
+                            };
+                            totalSize += file.bi_filesize;
+                        });
+                        return updatedState;
                     });
-                    return updatedState;
-                });
+                    uploadedSize.current = totalSize;
+                }
             } catch (e) {
                 setLoadingNotification(false);
                 if (e instanceof Error) {
@@ -8387,8 +8393,6 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
                 setCancelledNotification(true);
                 break;
             }
-            // MMC: update total uploaded size
-            uploadedSize.current += file.size;
         }
         setUploadingNotification(false);
     };
@@ -8488,13 +8492,17 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
             fileStore.def.columns.vc_fileguid.value = fileGUID;
             const result = await fileStore.API.deleteData(undefined, abort_signal);
             setLoadingNotification(false);
-            if (!result.Failed) setUploadProgress((prev)=>{
-                const updatedState = {
-                    ...prev
-                };
-                delete updatedState[file_id];
-                return updatedState;
-            });
+            if (!result.Failed) {
+                const deletedFileSize = uploadProgress[file_id]?.file_size || 0;
+                setUploadProgress((prev)=>{
+                    const updatedState = {
+                        ...prev
+                    };
+                    delete updatedState[file_id];
+                    return updatedState;
+                });
+                uploadedSize.current = Math.max(0, uploadedSize.current - deletedFileSize);
+            }
             return result;
         } catch (e) {
             setLoadingNotification(false);
@@ -37991,13 +37999,13 @@ $parcel$export(module.exports, "AvatarUploader", function () { return $bf851542c
 
 function $bf851542c46e0f0d$export$d90a5eec5b09d8ed(props) {
     const theme = (0, $b4te3$mantinecore.useMantineTheme)();
-    const { API: API, PlaceHolderIcon: PlaceHolderIcon, readOnlyMode: readOnlyMode, ...others } = props;
-    const { imageURL: imageURL, fileID: fileID, fileGUID: fileGUID, handleOpenFileUpload: handleOpenFileUpload, handleDeleteFile: handleDeleteFile, parentFormAPI: parentFormAPI } = API;
+    const { API: API, PlaceHolderIcon: PlaceHolderIcon, readOnlyMode: readOnlyMode, showFullImage: showFullImage, ...others } = props;
+    const { imageURL: imageURL, thumbnailURL: thumbnailURL, fileID: fileID, fileGUID: fileGUID, handleOpenFileUpload: handleOpenFileUpload, handleDeleteFile: handleDeleteFile, parentFormAPI: parentFormAPI } = API;
     return /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsxs)((0, $b4te3$mantinecore.Stack), {
         children: [
             /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Avatar), {
                 ...others,
-                src: imageURL ?? undefined,
+                src: showFullImage ? imageURL ?? undefined : thumbnailURL ?? undefined,
                 onClick: async ()=>{
                     if (!readOnlyMode && parentFormAPI?.formMode !== 'view') await handleOpenFileUpload();
                 },
@@ -38058,6 +38066,7 @@ function $8cba51256aebea2d$export$a2bc9feb52ac7227(props) {
         fileProcessColumn: fileProcessColumn
     });
     const [imageURL, setImageURL] = (0, $b4te3$react.useState)(initialImageURL);
+    const [thumbnailURL, setThumbnailURL] = (0, $b4te3$react.useState)(undefined);
     const [fileID, setFileID] = (0, $b4te3$react.useState)(undefined);
     const [fileProcessID, setFileProcessID] = (0, $b4te3$react.useState)(undefined);
     const [fileGUID, setFileGUID] = (0, $b4te3$react.useState)(undefined);
@@ -38073,12 +38082,14 @@ function $8cba51256aebea2d$export$a2bc9feb52ac7227(props) {
                     fileGUIDColumn.value = uploadProgress[keys[0]].vc_fileguid;
                     setFileGUID(fileGUIDColumn.value);
                     setImageURL(client.getDocumentURL(fileGUIDColumn.value));
+                    setThumbnailURL(client.getThumbnailURL(fileGUIDColumn.value));
                     setFileID(uploadProgress[keys[0]].file_id);
                     setFileProcessID(fileprocess_id);
                 } else {
                     // MMC: if no file was uploaded, clear the file column
                     fileGUIDColumn.value = '';
                     setFileGUID(undefined);
+                    setThumbnailURL(undefined);
                     setImageURL(undefined);
                     setFileID(undefined);
                 }
@@ -38113,6 +38124,7 @@ function $8cba51256aebea2d$export$a2bc9feb52ac7227(props) {
         fileProcessColumn.value = '';
         setFileID(undefined);
         setImageURL(undefined);
+        setThumbnailURL(undefined);
         setFileGUID(undefined);
     };
     // MMC: set the loaded URL when finishing the entity get
@@ -38122,6 +38134,7 @@ function $8cba51256aebea2d$export$a2bc9feb52ac7227(props) {
                 if (fileProcessColumn.value) {
                     setFileProcessID(fileProcessColumn.value);
                     setImageURL(client.getDocumentURL(fileGUIDColumn.value));
+                    setThumbnailURL(client.getThumbnailURL(fileGUIDColumn.value));
                     setFileGUID(fileGUIDColumn.value);
                 }
             }
@@ -38132,6 +38145,7 @@ function $8cba51256aebea2d$export$a2bc9feb52ac7227(props) {
     ]);
     return {
         imageURL: imageURL,
+        thumbnailURL: thumbnailURL,
         fileID: fileID,
         fileProcessID: fileProcessID,
         fileGUID: fileGUID,