@bindu-dashing/dam-solution-v2 5.8.109 → 5.8.112

package/build/MyDrive/AddDrive.js

@@ -58,8 +58,9 @@ const AddDrive = ({ parentFolderId }) => {
         showGenerateThumbnails: false,
     });
     const { openFolderModal, openMapFile, uploading, filesList, showUploadStatus, uploadStatusList, openBlukUploadModal, showGenerateThumbnails, } = state;
-    const toggleOpenMapFile = (files = []) => {
-        if (openMapFile) {
+    const toggleOpenMapFile = (files = [], shouldDelete = false) => {
+        var _a;
+        if (openMapFile && shouldDelete && ((_a = filesList === null || filesList === void 0 ? void 0 : filesList[0]) === null || _a === void 0 ? void 0 : _a.filePath)) {
             try {
                 api.delete(DELETE_S3_FILE_URL.replace(":path", filesList === null || filesList === void 0 ? void 0 : filesList[0].filePath));
             }
@@ -69,6 +70,9 @@ const AddDrive = ({ parentFolderId }) => {
         }
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { openMapFile: !prevState.openMapFile, filesList: files, showUploadStatus: false })));
     };
+    const handleMapFileCancel = (shouldDelete = false) => {
+        toggleOpenMapFile([], shouldDelete);
+    };
     const toggleFolderModal = () => {
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { openFolderModal: !prevState.openFolderModal })));
     };
@@ -166,6 +170,6 @@ const AddDrive = ({ parentFolderId }) => {
         },
     ];
     const toggleGenerateThumbnails = () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGenerateThumbnails: !prevState.showGenerateThumbnails })));
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal, parentFolderId: currentFolderId })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: toggleOpenMapFile, filesList: filesList, fromUpload: true, parentFolderId: currentFolderId })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: currentFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: currentFolderId }))] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", multiple: true, style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal, parentFolderId: currentFolderId })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: handleMapFileCancel, filesList: filesList, fromUpload: true, parentFolderId: currentFolderId })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: currentFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: currentFolderId }))] }));
 };
 export default AddDrive;

package/build/MyDrive/AddFolder.js

@@ -46,19 +46,11 @@ function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileMod
                         : yield api.post(FETCH_FOLDERS_URL, Object.assign(Object.assign({}, values), { teamIds: [], parentId: currentFolderId }));
                 if (folder || file) {
                     // ✅ update case
-                    const responseData = folder
-                        ? get(response, "data.updatedFolder", get(response, "data.folder", {}))
+                    const updatedFolder = folder
+                        ? get(response, "data.updatedFolder", {})
                         : file
-                            ? get(response, "data.file", get(response, "data", {}))
+                            ? get(response, "data.file", Object.assign(Object.assign({}, file), { name: get(values, "name") }))
                             : {};
-                    // Merge existing file/folder data with response data to preserve all fields
-                    // This ensures we don't lose any properties if the API response is minimal
-                    const existingEntity = folder || file || {};
-                    const updatedFolder = Object.assign(Object.assign(Object.assign({}, existingEntity), responseData), { 
-                        // Ensure name is updated from form values
-                        name: get(values, "name", get(responseData, "name", get(existingEntity, "name"))), 
-                        // Ensure _id is always set
-                        _id: get(responseData, "_id", get(existingEntity, "_id")) });
                     setFolders((prevFolders) => {
                         if (globalSearch) {
                             // Only update the matching folder (flat update)
@@ -82,16 +74,8 @@ function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileMod
                             return updateOrAddRecursively(prevFolders);
                         }
                     });
-                    // Update the cache with the updated folder/file
-                    // Use currentFolderId which matches what DriveContainer uses
-                    updateFoldersCacheOnUpdateFolder(queryClient, currentFolderId, updatedFolder, generateFoldersQueryKey(type));
-                    // Invalidate file query cache
-                    if (file) {
-                        invalidateData(queryClient, QueryKeys.FILE, get(file, "_id"));
-                    }
-                    // Also invalidate the folders query cache to ensure UI updates immediately
-                    // This ensures the list view refreshes with the updated name
-                    invalidateData(queryClient, generateFoldersQueryKey(type), currentFolderId);
+                    updateFoldersCacheOnUpdateFolder(queryClient, folderId ? folderId : rootFolderId, updatedFolder, generateFoldersQueryKey(type));
+                    invalidateData(queryClient, QueryKeys.FILE, get(file, "_id"));
                 }
                 else {
                     // ✅ create case → take folder from response

package/build/MyDrive/FileMenuOptions.js

@@ -187,8 +187,13 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
         },
     });
     const onDuplicateFile = () => {
+        const fileToUse = effectiveFile;
+        if (!fileToUse || !get(fileToUse, "_id")) {
+            onFailure("File not found");
+            return;
+        }
         duplicateFileMutation.mutate({
-            fileIds: [get(file, "_id")],
+            fileIds: [get(fileToUse, "_id")],
             api,
         });
     };
@@ -302,17 +307,13 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
                 onClick: () => toggleDisplayUpdateName(),
                 disabled: isMultiSelection || !isAdmin,
             },
-            // {
-            //   key: FileActionsList.DUPLICATE,
-            //   label: "Duplicate",
-            //   icon: duplicateFileMutation.isLoading ? (
-            //     <CustomLoader />
-            //   ) : (
-            //     <IoDuplicateOutlineIcon />
-            //   ),
-            //   onClick: () => onDuplicateFile(),
-            //   disabled: isMultiSelection || !isAdmin,
-            // },
+            {
+                key: FileActionsList.DUPLICATE,
+                label: "Duplicate",
+                icon: duplicateFileMutation.isLoading ? (_jsx(CustomLoader, {})) : (_jsx(IoDuplicateOutlineIcon, {})),
+                onClick: () => onDuplicateFile(),
+                disabled: isMultiSelection || !isAdmin,
+            },
             {
                 key: FileActionsList.DELETE,
                 label: "Delete",

package/build/MyDrive/fileDetails/FileViewer.js

@@ -26,6 +26,6 @@ const FileViewer = ({ file, onNext, onPrev, hasNext, hasPrev, handleClose, }) =>
     //   children: <Compliance />,
     // },
     ];
-    return (_jsx(Layout, { children: _jsxs(Content, { className: "md-lib-grid md-lib-grid-cols-3 md-lib-gap-2", children: [_jsx("div", { className: "md-lib-col-span-1 md:md-lib-col-span-2 md-lib-imageBg md-lib-bg-cover md-lib-bg-center md-lib-min-h-full md-lib-flex md-lib-items-center md-lib-justify-center md-lib-relative md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor", children: _jsx(PreviewDetails, { file: file, hasNext: hasNext, hasPrev: hasPrev, onNext: onNext, onPrev: onPrev }) }), _jsx(MapFile, { fromUpload: false, filesList: file ? [file] : [], handleCancel: handleClose })] }) }));
+    return (_jsx(Layout, { children: _jsxs(Content, { className: "md-lib-grid md-lib-grid-cols-3 md-lib-gap-2", children: [_jsx("div", { className: "md-lib-col-span-1 md:md-lib-col-span-2 md-lib-imageBg md-lib-bg-cover md-lib-bg-center md-lib-min-h-full md-lib-flex md-lib-items-center md-lib-justify-center md-lib-relative md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor", children: _jsx(PreviewDetails, { file: file, hasNext: hasNext, hasPrev: hasPrev, onNext: onNext, onPrev: onPrev }) }), _jsx(MapFile, { fromUpload: false, filesList: file ? [file] : [], handleCancel: handleClose ? () => handleClose() : undefined })] }) }));
 };
 export default FileViewer;

package/build/MyDrive/files/MapFile.d.ts

@@ -1,7 +1,7 @@
 import { FileEntity, ResponseFile } from "../../utilities/constants/interface";
 declare function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, }: {
     open?: boolean;
-    handleCancel?: () => void;
+    handleCancel?: (shouldDelete?: boolean) => void;
     filesList: ResponseFile[] | FileEntity[];
     fromUpload?: boolean;
     parentFolderId?: string;

package/build/MyDrive/files/MapFile.js

@@ -131,7 +131,7 @@ function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, })
                         return fileData;
                     }) }));
                 showNotification(get(response, "data.message", CREATE_SUCCESS), NotificationStatus.SUCCESS);
-                handleCancel && handleCancel();
+                handleCancel && handleCancel(false);
             }
             catch (error) {
                 showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
@@ -205,7 +205,7 @@ function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, })
     };
     const getMetadataForm = (_jsxs(Form, { layout: "vertical", form: form, scrollToFirstError: true, onFinish: fromUpload ? handleSubmit : handleUpdate, className: "md-lib-m-2", children: [_jsx(AssetSelectionFormItem, { handleAssetTemplateChange: handleAssetTemplateChange, assetOptions: assetOptions, assetsLoading: assetsLoading }), selectedAssetTemplate && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { name: "teamIds", label: "Teams", children: _jsx(Select, { options: teamOptions, placeholder: "Select teams", mode: "multiple", onChange: (val) => onChangeTeams(val), style: { width: "100%" }, showSearch: true, optionFilterProp: "key" }) }), _jsx(Form.Item, { name: "expiryDate", label: "Expiry Date", children: _jsx(DatePicker, { placeholder: "Expiry Date", style: { width: "100%" } }) }), _jsx(Metadata, { asset: selectedAssetTemplate, form: form, file: (filesList === null || filesList === void 0 ? void 0 : filesList[0]) || null })] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-justify-end md-lib-gap-3", children: [_jsx(Button, { onClick: () => {
                             if (handleCancel) {
-                                handleCancel();
+                                handleCancel(true);
                             }
                             else if (navigate) {
                                 // Navigate back if navigate function is available
@@ -214,6 +214,6 @@ function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, })
                         }, children: "Cancel" }), _jsx(Button, { disabled: !selectedAssetTemplate, type: "primary", 
                         // onClick={handleSubmit}
                         loading: loading || updateFileMutation.isLoading, htmlType: "submit", children: "Save" })] })] }));
-    return (_jsx(_Fragment, { children: fromUpload ? (_jsx(Drawer, { title: "Metadata", open: open, onClose: handleCancel, maskClosable: false, children: getMetadataForm })) : (_jsxs("div", { className: "md-lib-p-2 md-lib-overflow-y-scroll md-lib-max-h-[calc(100vh-65px)]", children: [_jsx("p", { className: "md-lib-text-lg md-lib-font-semibold", children: "Metadata" }), getMetadataForm] })) }));
+    return (_jsx(_Fragment, { children: fromUpload ? (_jsx(Drawer, { title: "Metadata", open: open, onClose: () => handleCancel && handleCancel(true), maskClosable: false, children: getMetadataForm })) : (_jsxs("div", { className: "md-lib-p-2 md-lib-overflow-y-scroll md-lib-max-h-[calc(100vh-65px)]", children: [_jsx("p", { className: "md-lib-text-lg md-lib-font-semibold", children: "Metadata" }), getMetadataForm] })) }));
 }
 export default MapFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.109",
+  "version": "5.8.112",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",