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

package/build/AssetType/EditAssetTemplate.js

@@ -195,7 +195,7 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
                                 onChange: (val) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { name: val }))),
                                 icon: _jsx(FiEdit2Icon, { size: 15, className: "md-lib-ml-2" }),
                             }, children: name })] })),
-                right: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2 md-lib-ml-auto", children: [imagePickerOutputFormatError && (_jsx("p", { className: "md-lib-text-sm md-lib-text-red-500", children: "Please fix the errors in the Image Picker Output format" })), _jsx(CustomButton, { label: "Cancel", onClick: () => {
+                right: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2 md-lib-ml-auto", children: [imagePickerOutputFormatError && (_jsx("p", { className: "md-lib-text-sm md-lib-text-red-500", children: "Please ensure that all required fields (except the last one) have separators configured" })), _jsx(CustomButton, { label: "Cancel", onClick: () => {
                                 if (navigate) {
                                     navigate(ASSETS_SCREEN);
                                 }

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";
@@ -45,7 +45,6 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
         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
@@ -72,6 +71,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,6 +150,7 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
         },
     });
     const onDownloadFiles = () => {
+        // Always use API endpoint to ensure download history is tracked
         downloadFileMutation.mutate({
             fileIds,
             folderIds,

package/build/MyDrive/FileMenuOptions.js

@@ -212,21 +212,12 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
         const fileToUse = effectiveFile;
         // Build fileIds list - use file._id if file exists, otherwise use fileIds prop
         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 - effectiveFile:", fileToUse, "downloadUrl:", downloadUrl, "isSingleFile:", isSingleFile);
-        // If single file with downloadUrl available, open directly in new tab
-        if (isSingleFile && downloadUrl) {
-            window.open(downloadUrl, "_blank");
-        }
-        else {
-            // For multiple files/folders or when downloadUrl is not available, use API
-            downloadFileMutation.mutate({
-                fileIds: fileIdsList,
-                folderIds: folderIds,
-                api,
-            });
-        }
+        // Always use API endpoint to ensure download history is tracked
+        downloadFileMutation.mutate({
+            fileIds: fileIdsList,
+            folderIds: folderIds,
+            api,
+        });
     };
     const onFavSuccess = (message) => {
         invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);

package/build/MyDrive/fileDetails/FileDetails.js

@@ -102,7 +102,6 @@ const FileDetails = ({ open, handleClose, file, files, fileIds, onCloseSelection
     }, [open]);
     if (!open && !visible)
         return null;
-    console.log("currentFile", currentFile);
     const modalContent = (_jsxs("div", { className: `md-lib-fixed md-lib-inset-0 md-lib-z-[1000] md-lib-w-screen md-lib-h-screen md-lib-bg-white dark:md-lib-bg-darkPrimary md-lib-text-black dark:md-lib-text-white md-lib-overflow-auto md-lib-transform md-lib-transition-all md-lib-duration-300 md-lib-ease-in-out ${open && visible
             ? "md-lib-opacity-100 md-lib-translate-y-0"
             : "md-lib-opacity-0 md-lib-translate-y-4"}`, onTransitionEnd: () => {

package/package.json

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