@bindu-dashing/dam-solution-v2 5.8.95 → 5.8.97

package/build/MyDrive/FileMenuOptions.js

@@ -392,6 +392,6 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
                         ? "md-lib-cursor-not-allowed md-lib-text-disabledBtnColor dark:md-lib-text-darkBorderColor"
                         : "md-lib-cursor-pointer", onClick: (e) => e.stopPropagation() }) }), displayUpdateName && (!!file || !!folder) && (_jsx(AddFolder, { file: file, open: displayUpdateName, handleCancel: toggleDisplayUpdateName, folder: folder, onCloseSelection: onCloseSelection, fileModal: fileModal })), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: isMultiSelection
                     ? DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(" :entity", "")
-                    : DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(file, "name", "this file")), onOk: actionType === "archive" ? onArchiveFile : onDeleteFile, subHeading: actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION, loading: deleteFileMutation.isLoading || archiveFileMutation.isLoading }), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: toggleShowPreviewModal, file: file, files: getSelectedFiles(queryClient, folderId ? folderId : rootFolderId, generateFoldersQueryKey(type), fileIds), onCloseSelection: onCloseSelection })), showMoveFolder && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, fileIds: [get(file, "_id")], entity: file, onCloseSelection: onCloseSelection })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: file ? [get(file, "_id")] : fileIds, folderIds: folderIds, inviteType: DriveModes.FILE, file: file })), showFileAccess && (file || folder) && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: file ? file : folder })), showLogsModal && (_jsx(FileDownloadHistory, { file: file ? file : folder, open: showLogsModal, onClose: toggleLogsModal }))] }));
+                    : DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(file, "name", "this file")), onOk: actionType === "archive" ? onArchiveFile : onDeleteFile, subHeading: actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION, loading: deleteFileMutation.isLoading || archiveFileMutation.isLoading }), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: toggleShowPreviewModal, file: file || undefined, files: getSelectedFiles(queryClient, folderId ? folderId : rootFolderId, generateFoldersQueryKey(type), file ? [get(file, "_id")] : fileIds), fileIds: file ? [get(file, "_id")] : fileIds, onCloseSelection: onCloseSelection })), showMoveFolder && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, fileIds: [get(file, "_id")], entity: file, onCloseSelection: onCloseSelection })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: file ? [get(file, "_id")] : fileIds, folderIds: folderIds, inviteType: DriveModes.FILE, file: file })), showFileAccess && (file || folder) && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: file ? file : folder })), showLogsModal && (_jsx(FileDownloadHistory, { file: file ? file : folder, open: showLogsModal, onClose: toggleLogsModal }))] }));
 }
 export default FileMenuOptions;

package/build/MyDrive/fileDetails/FileDetails.d.ts

@@ -1,10 +1,11 @@
 import React from "react";
 import { FileEntity } from "../../utilities/constants/interface";
-declare const FileDetails: ({ open, handleClose, file, files, onCloseSelection, }: {
+declare const FileDetails: ({ open, handleClose, file, files, fileIds, onCloseSelection, }: {
     handleClose?: () => void;
     open: boolean;
     file?: FileEntity;
     files?: FileEntity[] | undefined;
+    fileIds?: string[];
     onCloseSelection?: () => void;
 }) => React.ReactPortal | null;
 export default FileDetails;

package/build/MyDrive/fileDetails/FileDetails.js

@@ -9,17 +9,41 @@ import Loader from "../../common/loader/loader";
 import { createApiClient } from "../../hocs/configureAxios";
 import { useDamConfig } from "../../hocs/DamConfigContext";
 import useAppParams from "../../utilities/useAppParams";
-const FileDetails = ({ open, handleClose, file, files, onCloseSelection, }) => {
-    console.log("files", files, "file", file);
+const FileDetails = ({ open, handleClose, file, files, fileIds, onCloseSelection, }) => {
+    // Get the initial file - prefer file prop, fallback to first item in files array
+    const initialFile = useMemo(() => {
+        if (file)
+            return file;
+        if (files && files.length > 0)
+            return nth(files, 0);
+        return undefined;
+    }, [file, files]);
+    // Get the initial file ID - from file, files array, or fileIds prop
+    const initialFileId = useMemo(() => {
+        if (file)
+            return get(file, "_id") || "";
+        if (files && files.length > 0)
+            return get(nth(files, 0), "_id") || "";
+        if (fileIds && fileIds.length > 0)
+            return fileIds[0];
+        return "";
+    }, [file, files, fileIds]);
+    console.log("## FileDetails - files:", files, "file:", file, "initialFile:", initialFile, "fileIds:", fileIds, "initialFileId:", initialFileId);
     const { id } = useAppParams();
     const damConfig = useDamConfig();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({
         visible: false,
         currentIndex: 0,
-        currentFileId: get(file, "_id"),
+        currentFileId: initialFileId,
     });
     const { visible, currentIndex, currentFileId } = state;
+    // Update currentFileId when initialFileId changes (e.g., when props load)
+    useEffect(() => {
+        if (initialFileId && !currentFileId) {
+            setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFileId: initialFileId })));
+        }
+    }, [initialFileId, currentFileId]);
     const { data: fileData, isFetching, refetch } = useFile(api, currentFileId);
     console.log("fileData", fileData, "isFetching", isFetching);
     if (typeof window === "undefined" || typeof document === "undefined") {
@@ -35,14 +59,24 @@ const FileDetails = ({ open, handleClose, file, files, onCloseSelection, }) => {
         prevFileId.current = currentFileId;
     }, [currentFileId]);
     const currentFile = useMemo(() => {
-        console.log("currentFile", currentFile, "file", file, "fileData", fileData, "isFetching", isFetching, "id", id);
-        if (id) {
+        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;
+        }
+        else if (id) {
+            return file || initialFile;
+        }
+        else if (file) {
             return file;
         }
+        else if (files && files.length > 0) {
+            return nth(files, currentIndex);
+        }
         else {
-            return file ? fileData : nth(files, currentIndex);
+            return initialFile;
         }
-    }, [files, currentIndex, file, fileData, isFetching, id]);
+    }, [files, currentIndex, file, initialFile, fileData, isFetching, id]);
     const handlePrevious = () => {
         if (files && currentIndex > 0) {
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentIndex: prevState.currentIndex - 1 })));
@@ -69,6 +103,7 @@ const FileDetails = ({ open, handleClose, file, files, 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.95",
+  "version": "5.8.97",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",