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

package/build/MyDrive/ActionBar.js

@@ -6,7 +6,7 @@ import { IoArchiveOutline, IoLinkOutline } from "react-icons/io5";
 import { concat, find, first, get, join, map } from "lodash";
 import MoveToAnotherFolder from "./files/MoveToAnotherFolder";
 import { useMutation, useQueryClient } from "react-query";
-import { deleteFiles, downloadFiles, restoreFiles, } from "../react-query/services/file-services";
+import { deleteFiles, downloadFiles, restoreFiles, useFile, } from "../react-query/services/file-services";
 import { DeleteConfirmationModal } from "../common/CustomElements";
 import { DeleteOutlined, RedoOutlined } from "@ant-design/icons";
 import { generateFoldersQueryKey, invalidateData, } from "../utilities/constants/queryKeys";
@@ -72,6 +72,20 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
             return null;
         }
     }, [fileIds, folders, selectedFilesData]);
+    // Fetch file data from API if selectedFile is null but we have a single fileId
+    const singleFileId = useMemo(() => {
+        if (selectedFile)
+            return ""; // Already have file data
+        if (get(fileIds, "length") === 1) {
+            return first(fileIds) || "";
+        }
+        return "";
+    }, [selectedFile, fileIds, folderIds]);
+    const { data: fetchedFileData } = useFile(api, singleFileId);
+    // Use fetched file data if selectedFile is null
+    const effectiveFile = useMemo(() => {
+        return selectedFile || fetchedFileData || null;
+    }, [selectedFile, fetchedFileData]);
     const toggleConfirmPopup = (actionType = "") => {
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { actionType, showConfirmModal: !prevState.showConfirmModal })));
     };
@@ -137,11 +151,21 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
         },
     });
     const onDownloadFiles = () => {
-        downloadFileMutation.mutate({
-            fileIds,
-            folderIds,
-            api,
-        });
+        const downloadUrl = get(effectiveFile, "downloadUrl") || get(effectiveFile, "s3Url") || get(effectiveFile, "thumbnailUrl");
+        const isSingleFile = get(fileIds, "length") === 1 && get(folderIds, "length") === 0;
+        // If single file with downloadUrl available, open directly in new tab
+        if (isSingleFile && downloadUrl) {
+            window.open(downloadUrl, "_blank");
+            onCloseSelection();
+        }
+        else {
+            // For multiple files/folders or when downloadUrl is not available, use API
+            downloadFileMutation.mutate({
+                fileIds,
+                folderIds,
+                api,
+            });
+        }
     };
     const fileLinks = useMemo(() => {
         return map(fileIds, (id) => `${appType == "reactJs"

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";
@@ -44,6 +44,20 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
     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({
@@ -194,10 +208,11 @@ 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;
         // If single file with downloadUrl available, open directly in new tab
         if (isSingleFile && downloadUrl) {

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.101",
+  "version": "5.8.103",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",