@bindu-dashing/dam-solution-v2 5.8.99 → 5.8.101

package/build/MyDrive/ActionBar.d.ts

@@ -1,6 +1,8 @@
-declare const ActionsBar: ({ fileIds, folderIds, onCloseSelection, }: {
+import { FileEntity, FolderEntity } from "../utilities/constants/interface";
+declare const ActionsBar: ({ fileIds, folderIds, onCloseSelection, selectedFilesData, }: {
     fileIds: string[];
     folderIds: string[];
     onCloseSelection: () => void;
+    selectedFilesData?: (FileEntity | FolderEntity)[];
 }) => JSX.Element;
 export default ActionsBar;

package/build/MyDrive/ActionBar.js

@@ -27,7 +27,7 @@ const IoLinkOutlineIcon = IoLinkOutline;
 const FiTrash2Icon = FiTrash2;
 const FiXIcon = FiX;
 const IoArchiveOutlineIcon = IoArchiveOutline;
-const ActionsBar = ({ fileIds, folderIds, onCloseSelection, }) => {
+const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData = [], }) => {
     const { appType } = useDamConfig();
     const { folderId, type } = useAppParams();
     const queryClient = useQueryClient();
@@ -45,22 +45,33 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, }) => {
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { showShareModal: !prevState.showShareModal })));
     };
     const folders = getFolderData(queryClient, folderId ? folderId : rootFolderId, generateFoldersQueryKey(type));
+    // Use selectedFilesData if provided, otherwise fall back to cache lookup
     const selectedFolder = useMemo(() => {
         if (get(folderIds, "length") === 1) {
+            // First try from selectedFilesData
+            const fromData = find(selectedFilesData, (item) => get(item, "_id") === first(folderIds));
+            if (fromData)
+                return fromData;
+            // Fall back to cache lookup
             return find(folders, (folder) => get(folder, "_id") === first(folderIds));
         }
         else {
             return null;
         }
-    }, [folderIds, folders]);
+    }, [folderIds, folders, selectedFilesData]);
     const selectedFile = useMemo(() => {
         if (get(fileIds, "length") === 1) {
+            // First try from selectedFilesData
+            const fromData = find(selectedFilesData, (item) => get(item, "_id") === first(fileIds));
+            if (fromData)
+                return fromData;
+            // Fall back to cache lookup
             return find(folders, (folder) => get(folder, "_id") === first(fileIds));
         }
         else {
             return null;
         }
-    }, [fileIds, folders]);
+    }, [fileIds, folders, selectedFilesData]);
     const toggleConfirmPopup = (actionType = "") => {
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { actionType, showConfirmModal: !prevState.showConfirmModal })));
     };

package/build/MyDrive/FileMenuOptions.js

@@ -194,8 +194,11 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
         },
     });
     const onDownloadFile = () => {
-        const downloadUrl = get(file, "thumbnailUrl") || get(file, "downloadUrl");
-        const isSingleFile = file && get(fileIds, "length", 0) <= 1;
+        // Debug logging
+        // Build fileIds list - use file._id if file exists, otherwise use fileIds prop
+        const fileIdsList = file && get(file, "_id") ? [get(file, "_id")] : fileIds;
+        const downloadUrl = get(file, "downloadUrl") || get(file, "s3Url") || get(file, "thumbnailUrl");
+        const isSingleFile = get(fileIdsList, "length", 0) === 1 && get(folderIds, "length", 0) === 0;
         // If single file with downloadUrl available, open directly in new tab
         if (isSingleFile && downloadUrl) {
             window.open(downloadUrl, "_blank");
@@ -203,7 +206,7 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
         else {
             // For multiple files/folders or when downloadUrl is not available, use API
             downloadFileMutation.mutate({
-                fileIds: file ? [get(file, "_id")] : fileIds,
+                fileIds: fileIdsList,
                 folderIds: folderIds,
                 api,
             });

package/build/MyDrive/FolderGridView.js

@@ -98,7 +98,8 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                         get(selectedPickerFile, "_id") === get(folder, "_id");
                     return (_jsxs("div", { className: `md-lib-border md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-rounded-lg md-lib-px-5 md-lib-h-16 md-lib-flex md-lib-items-center md-lib-justify-between md-lib-cursor-pointer ${isSelected ? "md-lib-bg-borderColor dark:md-lib-bg-darkSecondaryBg" : ""}`, onClick: () => handleClick(folder), children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2 md-lib-w-[calc(100%-20px)]", children: [_jsxs("div", { children: [" ", _jsx(FaFolderIcon, { className: "md-lib-text-primaryColor", size: 32 })] }), _jsx("p", { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-truncate", title: get(folder, "name", "N/A"), children: get(folder, "name") })] }), !isImagePicker && type !== DriveModes.FOLDERS && (_jsx("div", { onClick: (e) => e.stopPropagation(), children: _jsx(FolderMenuOptions, { folder: folder }) }))] }, get(folder, "_id")));
                 }) }), _jsx(FilesGridView, { files: files, handleClick: handleClick, selectedFileIds: selectedFileIds, isImagePicker: isImagePicker, selectedPickerFile: selectedPickerFile }), _jsx(LoadMoreItems, { hasNextPage: hasNextPage, isItemsFetching: foldersFetching, fetchNextPage: fetchNextPage }), (!!get(selectedFileIds, "length") ||
-                !!get(selectedFolderIds, "length")) && (_jsx(ActionsBar, { fileIds: selectedFileIds, folderIds: selectedFolderIds, onCloseSelection: () => setSelectedItems({ fileIds: [], folderIds: [] }) })), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: () => {
+                !!get(selectedFolderIds, "length")) && (_jsx(ActionsBar, { fileIds: selectedFileIds, folderIds: selectedFolderIds, onCloseSelection: () => setSelectedItems({ fileIds: [], folderIds: [] }), selectedFilesData: filter([...folders, ...files], (item) => includes(selectedFileIds, get(item, "_id")) ||
+                    includes(selectedFolderIds, get(item, "_id"))) })), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: () => {
                     setState((prevState) => (Object.assign(Object.assign({}, prevState), { showPreviewModal: false, selectedFile: {} })));
                 }, file: selectedFile }))] }));
 };

package/build/MyDrive/FolderListView.js

@@ -197,7 +197,8 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                                         return (_jsx("div", { title: value || "-", className: "md-lib-text-secondaryTextColor dark:md-lib-text-darkTextColor md-lib-block md-lib-truncate md-lib-text-sm md-lib-w-[120px] md-lib-gap-2", children: value || "-" }));
                                     })] }, get(folder, "_id", name)));
                         }) })] }, dateLabel))), _jsx(LoadMoreItems, { hasNextPage: hasNextPage, isItemsFetching: foldersFetching, fetchNextPage: fetchNextPage }), (!!get(selectedFileIds, "length") ||
-                !!get(selectedFolderIds, "length")) && (_jsx(ActionsBar, { fileIds: selectedFileIds, folderIds: selectedFolderIds, onCloseSelection: () => setSelectedItems({ fileIds: [], folderIds: [] }) })), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: () => {
+                !!get(selectedFolderIds, "length")) && (_jsx(ActionsBar, { fileIds: selectedFileIds, folderIds: selectedFolderIds, onCloseSelection: () => setSelectedItems({ fileIds: [], folderIds: [] }), selectedFilesData: filter(sortedFolders, (item) => includes(selectedFileIds, get(item, "_id")) ||
+                    includes(selectedFolderIds, get(item, "_id"))) })), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: () => {
                     setState((prevState) => (Object.assign(Object.assign({}, prevState), { showPreviewModal: false, selectedFile: {} })));
                 }, file: selectedFile }))] }));
 };

package/build/MyDrive/fileDetails/FileHeader.js

@@ -15,10 +15,12 @@ const FileDetailsHeader = ({ handleClose, file, onCloseSelection, }) => {
     const damConfig = useDamConfig();
     const { isAdmin } = damConfig;
     const { id, type } = useAppParams();
-    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [!id && type !== DriveModes.FILE && (_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: handleClose })), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: () => {
-                            const url = get(file, "downloadUrl");
-                            if (!url)
+    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [!id && type !== DriveModes.FILE && (_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: handleClose })), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, fileIds: get(file, "_id") ? [get(file, "_id")] : [], onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: () => {
+                            const url = get(file, "downloadUrl") || get(file, "s3Url") || get(file, "thumbnailUrl");
+                            if (!url) {
                                 showNotification(INVALID_URL, NotificationStatus.ERROR);
+                                return;
+                            }
                             window.open(url, "_blank");
                         }, children: _jsx(BsDownloadIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", size: 24 }) })] }))] }));
 };

package/package.json

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