@bindu-dashing/dam-solution-v2 5.8.100 → 5.8.102

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

@@ -12,7 +12,7 @@ import CustomLoader from "../common/loader/CustomLoader";
 import { DownloadOutlined, } from "@ant-design/icons";
 import AddFolder from "./AddFolder";
 import { useMutation, useQueryClient } from "react-query";
-import { archiveFiles, deleteFiles, downloadFiles, duplicateFiles, restoreFiles, unarchiveFiles, } from "../react-query/services/file-services";
+import { archiveFiles, deleteFiles, downloadFiles, duplicateFiles, restoreFiles, unarchiveFiles, useFile, } from "../react-query/services/file-services";
 import { ADDED_TO_FAV_MSG, ARCHIVE_OK_TEXT, ARCHIVE_SUCCESS, CREATE_SUCCESS, DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, INVALID_URL, REMOVED_FROM_FAV_MSG, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { getSelectedFiles, } from "../react-query/hooks/folder-hooks";
 import { generateFoldersQueryKey, invalidateData, QueryKeys, } from "../utilities/constants/queryKeys";
@@ -39,13 +39,25 @@ const TbStarIcon = TbStar;
 const BsThreeDotsVerticalIcon = BsThreeDotsVertical;
 const AiOutlineHistoryIcon = AiOutlineHistory;
 function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSelection, readOnly = false, fileModal = false, }) {
-    // Debug: log props to trace where file becomes undefined
-    console.log("## FileMenuOptions render - file:", file, "fileIds:", fileIds, "folderIds:", folderIds);
     const damConfig = useDamConfig();
     const { rootFolderId, appType, isAdmin } = damConfig;
     const { folderId, type } = useAppParams();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const queryClient = useQueryClient();
+    // Fetch file data from API if file is null but we have a single fileId (no folders)
+    const singleFileId = useMemo(() => {
+        if (file)
+            return ""; // Already have file data, no need to fetch
+        if (get(fileIds, "length") === 1 && get(folderIds, "length") === 0) {
+            return first(fileIds) || "";
+        }
+        return "";
+    }, [file, fileIds, folderIds]);
+    const { data: fetchedFileData } = useFile(api, singleFileId);
+    // Use fetched file data if file prop is null
+    const effectiveFile = useMemo(() => {
+        return file || fetchedFileData || null;
+    }, [file, fetchedFileData]);
     const isBulkAction = useMemo(() => !!get(folderIds, "length", 0) || !!get(fileIds, "length", 0), [folderIds, fileIds]);
     const isMultiSelection = useMemo(() => get(folderIds, "length", 0) + get(fileIds, "length", 0) > DEFAULT_PAGE, [folderIds, fileIds]);
     const [state, setState] = useState({
@@ -196,12 +208,13 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
         },
     });
     const onDownloadFile = () => {
-        // Debug logging
+        // Use effectiveFile which includes fetched data from API
+        const fileToUse = effectiveFile;
         // 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 fileIdsList = fileToUse && get(fileToUse, "_id") ? [get(fileToUse, "_id")] : fileIds;
+        const downloadUrl = get(fileToUse, "downloadUrl") || get(fileToUse, "s3Url") || get(fileToUse, "thumbnailUrl");
         const isSingleFile = get(fileIdsList, "length", 0) === 1 && get(folderIds, "length", 0) === 0;
-        console.log("## onDownloadFile - downloadUrl:", downloadUrl, "isSingleFile:", isSingleFile, "fileIdsList:", fileIdsList);
+        console.log("## onDownloadFile - effectiveFile:", fileToUse, "downloadUrl:", downloadUrl, "isSingleFile:", isSingleFile);
         // If single file with downloadUrl available, open directly in new tab
         if (isSingleFile && downloadUrl) {
             window.open(downloadUrl, "_blank");

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/FileDetails.js

@@ -59,7 +59,6 @@ const FileDetails = ({ open, handleClose, file, files, fileIds, onCloseSelection
         prevFileId.current = currentFileId;
     }, [currentFileId]);
     const currentFile = useMemo(() => {
-        console.log("## currentFile calc - file:", file, "initialFile:", initialFile, "fileData:", fileData, "isFetching:", isFetching, "id:", id, "currentIndex:", currentIndex);
         // Priority: fileData (from API) > file prop > files array item > initialFile
         if (fileData) {
             return fileData;

package/package.json

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