@bindu-dashing/dam-solution-v2 5.8.60 → 5.8.63

package/build/MyDrive/AddDrive.d.ts

@@ -1,3 +1,5 @@
 import React from "react";
-declare const AddDrive: React.FC;
+declare const AddDrive: React.FC<{
+    parentFolderId?: string;
+}>;
 export default AddDrive;

package/build/MyDrive/AddDrive.js

@@ -39,11 +39,14 @@ const BsUploadIcon = BsUpload;
 const PiFolderPlusLightIcon = PiFolderPlusLight;
 const GoPlusIcon = GoPlus;
 const MdKeyboardArrowDownIconIcon = MdKeyboardArrowDown;
-const AddDrive = () => {
+const AddDrive = ({ parentFolderId }) => {
     const damConfig = useDamConfig();
     const { brand, rootFolderId } = damConfig;
     const brandId = get(brand, "_id");
     const { folderId } = useAppParams();
+    // Use parentFolderId (current folder from selection) > folderId (from URL) > rootFolderId
+    const currentFolderId = parentFolderId || folderId || rootFolderId;
+    console.log('## currentFolderId', currentFolderId, 'parentFolderId', parentFolderId, 'folderId', folderId, 'rootFolderId', rootFolderId);
     const fileInputRef = useRef(null);
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({
@@ -102,7 +105,7 @@ const AddDrive = () => {
         try {
             const response = yield api.post(FILE_UPLOAD_URL, {
                 brandId,
-                folderId: folderId || rootFolderId,
+                folderId: currentFolderId,
                 files: map(files, (file) => ({
                     name: get(file, "name"),
                     size: get(file, "size"),
@@ -165,6 +168,6 @@ const AddDrive = () => {
         },
     ];
     const toggleGenerateThumbnails = () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGenerateThumbnails: !prevState.showGenerateThumbnails })));
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: toggleOpenMapFile, filesList: filesList, fromUpload: true })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: folderId !== null && folderId !== void 0 ? folderId : rootFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: folderId !== null && folderId !== void 0 ? folderId : rootFolderId }))] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal, parentFolderId: currentFolderId })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: toggleOpenMapFile, filesList: filesList, fromUpload: true })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: currentFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: currentFolderId }))] }));
 };
 export default AddDrive;

package/build/MyDrive/AddFolder.d.ts

@@ -1,10 +1,11 @@
 import { FileEntity, FolderEntity } from "../utilities/constants/interface";
-declare function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, }: {
+declare function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, parentFolderId, }: {
     open: boolean;
     handleCancel: () => void;
     folder?: FolderEntity;
     file?: FileEntity;
     onCloseSelection?: () => void;
     fileModal?: boolean;
+    parentFolderId?: string;
 }): JSX.Element;
 export default AddFolder;

package/build/MyDrive/AddFolder.js

@@ -24,11 +24,13 @@ import { createApiClient } from "../hocs/configureAxios";
 import useAppParams from "../utilities/useAppParams";
 import { RenderModalTitle } from "../common/CustomElements";
 import { useFoldersContext } from "../utilities/FoldersContext";
-function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, }) {
+function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, parentFolderId, }) {
     const { setFolders, globalSearch } = useFoldersContext();
     const { folderId, type } = useAppParams();
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
+    // Use parentFolderId (current folder from selection) > folderId (from URL) > rootFolderId
+    const currentFolderId = parentFolderId || folderId || rootFolderId;
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({ loading: false });
     const { loading } = state;
@@ -42,7 +44,7 @@ function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileMod
                     ? yield api.put(FETCH_FOLDER_URL.replace(":folderId", get(folder, "_id")), values)
                     : get(file, "_id")
                         ? yield api.put(FETCH_FILE_URL.replace(":fileId", get(file, "_id")), values)
-                        : yield api.post(FETCH_FOLDERS_URL, Object.assign(Object.assign({}, values), { teamIds: [], parentId: folderId ? folderId : rootFolderId }));
+                        : yield api.post(FETCH_FOLDERS_URL, Object.assign(Object.assign({}, values), { teamIds: [], parentId: currentFolderId }));
                 if (folder || file) {
                     // ✅ update case
                     const updatedFolder = folder

package/build/MyDrive/DriveContainer.js

@@ -235,7 +235,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         setState((prevState) => (Object.assign(Object.assign({}, prevState), filters)));
     };
     // console.log("search", searchKey, searchValue, metadataKey, metadataValue);
-    return (_jsxs("div", { className: "md-lib-h-[inherit]", children: [type !== DriveModes.FILE && (_jsx(_Fragment, { children: _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-px-4 md-lib-h-20 md-lib-justify-between md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-mb-4", children: [imagePicker ? (_jsx(ImagePickerBreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId })) : (_jsx(_Fragment, { children: _jsx(BreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId, globalSearch: globalSearch, setSelectedKeys: setSelectedKeys }) })), isAdmin && _jsx(AddDrive, {}), get(imagePicker, "allowNewFiles") && (_jsx(Upload, { beforeUpload: (file) => {
+    return (_jsxs("div", { className: "md-lib-h-[inherit]", children: [type !== DriveModes.FILE && (_jsx(_Fragment, { children: _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-px-4 md-lib-h-20 md-lib-justify-between md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-mb-4", children: [imagePicker ? (_jsx(ImagePickerBreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId })) : (_jsx(_Fragment, { children: _jsx(BreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId, globalSearch: globalSearch, setSelectedKeys: setSelectedKeys }) })), isAdmin && _jsx(AddDrive, { parentFolderId: parentFolderId }), get(imagePicker, "allowNewFiles") && (_jsx(Upload, { beforeUpload: (file) => {
                                 onSelectNewFile(file);
                             }, showUploadList: false, accept: "image/*", children: _jsx(CustomButton, { loading: loadingType === "NEW_FILE_UPLOAD", label: "Select File", icon: _jsx(BsUploadIcon, {}) }) }))] }) })), _jsxs("div", { className: `md-lib-px-4 md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex ${!includes([DriveModes.FOLDERS, DriveModes.FILE], type)
                     ? "md-lib-justify-between"
@@ -271,7 +271,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
                         }, children: "Clear Filters" }))] })) : (_jsx("div", { className: "md-lib-p-4 md-lib-max-h-[calc(100%-161px)] md-lib-overflow-x-auto", children: state.showGrid ? (_jsx(FolderGridView, { folders: filter(folders, (item) => get(item, "type") !== EntityType.FILE), files: _.filter(folders, (item) => get(item, "type") === EntityType.FILE), foldersFetching: isFetching, hasNextPage: !!hasNextPage, fetchNextPage: fetchNextPage, selectedFolderIds: get(selectedItems, "folderIds", []), selectedFileIds: get(selectedItems, "fileIds", []), setSelectedItems: (updateFnOrValue = {}) => setState((prevState) => {
                         const prevSelected = prevState.selectedItems;
                         return Object.assign(Object.assign({}, prevState), { selectedItems: Object.assign(Object.assign({}, prevSelected), updateFnOrValue) });
-                    }), isImagePicker: !!pickerFolderId, setSelectedFile: setSelectedFile, setParentFolderId: setParentFolderId, selectedPickerFile: selectedPickerFile, sortBy: sortBy, sortOrder: sortOrder, setSortOrders: (newSortBy, newSortOrder) => setState((prev) => (Object.assign(Object.assign({}, prev), { sortBy: newSortBy, sortOrder: newSortOrder }))) })) : (_jsx(FolderListView, { folders: folders, foldersFetching: isFetching, hasNextPage: !!hasNextPage, fetchNextPage: fetchNextPage, selectedFolderIds: get(selectedItems, "folderIds", []), selectedFileIds: get(selectedItems, "fileIds", []), setSelectedItems: (updateFnOrValue = {}) => setState((prevState) => {
+                    }), isImagePicker: !!pickerFolderId, setSelectedFile: setSelectedFile, setParentFolderId: setParentFolderId, selectedPickerFile: selectedPickerFile, sortBy: sortBy, sortOrder: sortOrder, setSortOrders: (newSortBy, newSortOrder) => setState((prev) => (Object.assign(Object.assign({}, prev), { sortBy: newSortBy, sortOrder: newSortOrder }))), setSelectedKeys: setSelectedKeys })) : (_jsx(FolderListView, { folders: folders, foldersFetching: isFetching, hasNextPage: !!hasNextPage, fetchNextPage: fetchNextPage, selectedFolderIds: get(selectedItems, "folderIds", []), selectedFileIds: get(selectedItems, "fileIds", []), setSelectedItems: (updateFnOrValue = {}) => setState((prevState) => {
                         const prevSelected = prevState.selectedItems;
                         return Object.assign(Object.assign({}, prevState), { selectedItems: Object.assign(Object.assign({}, prevSelected), updateFnOrValue) });
                     }), isImagePicker: !!pickerFolderId, setSelectedFile: setSelectedFile, setParentFolderId: setParentFolderId, selectedPickerFile: selectedPickerFile, location: get(parentFolder, "name"), assets: assets, sortByKey: sortBy, sortOrder: sortOrder, setSortOrders: (newSortBy, newSortOrder) => setState((prev) => (Object.assign(Object.assign({}, prev), { sortBy: newSortBy, sortOrder: newSortOrder }))), onSearch: onSearch, searchKey: searchKey, searchValue: searchValue, metadataKey: metadataKey, metadataValue: metadataValue, setSelectedKeys: setSelectedKeys })) }))] }));

package/build/MyDrive/FolderGridView.d.ts

@@ -1,5 +1,5 @@
 import { FileEntity, FolderEntity, SortByKeys, SortOrders } from "../utilities/constants/interface";
-declare const FolderGridView: ({ folders, foldersFetching, hasNextPage, fetchNextPage, files, selectedFileIds, selectedFolderIds, setSelectedItems, isImagePicker, setSelectedFile, setParentFolderId, selectedPickerFile, sortBy, sortOrder, setSortOrders, }: {
+declare const FolderGridView: ({ folders, foldersFetching, hasNextPage, fetchNextPage, files, selectedFileIds, selectedFolderIds, setSelectedItems, isImagePicker, setSelectedFile, setParentFolderId, selectedPickerFile, sortBy, sortOrder, setSortOrders, setSelectedKeys, }: {
     folders: FolderEntity[];
     foldersFetching: boolean;
     hasNextPage: boolean;
@@ -15,5 +15,6 @@ declare const FolderGridView: ({ folders, foldersFetching, hasNextPage, fetchNex
     sortBy: SortByKeys;
     sortOrder: SortOrders;
     setSortOrders: (newSortBy: SortByKeys, newSortOrder: SortOrders) => void;
+    setSelectedKeys?: (keys: string | string[]) => void;
 }) => JSX.Element;
 export default FolderGridView;

package/build/MyDrive/FolderGridView.js

@@ -4,7 +4,7 @@ import _, { filter, get, includes } from "lodash";
 import { FaFolder, FaSort } from "react-icons/fa";
 import LoadMoreItems from "../common/LoadMoreItems";
 import FolderMenuOptions from "./FolderMenuOptions";
-import { FETCH_ENTITY_SCREEN, SUBFOLDERS_SCREEN, } from "../utilities/constants/routes";
+import { FETCH_ENTITY_SCREEN, } from "../utilities/constants/routes";
 import FilesGridView from "./FilesGridView";
 import { useRef, useState } from "react";
 import ActionsBar from "./ActionBar";
@@ -14,7 +14,7 @@ import useAppParams from "../utilities/useAppParams";
 import { ArrowDownOutlined, ArrowUpOutlined } from "@ant-design/icons";
 const FaFolderIcon = FaFolder;
 const FaSortIcon = FaSort;
-const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage, files, selectedFileIds, selectedFolderIds, setSelectedItems, isImagePicker, setSelectedFile, setParentFolderId, selectedPickerFile, sortBy, sortOrder, setSortOrders, }) => {
+const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage, files, selectedFileIds, selectedFolderIds, setSelectedItems, isImagePicker, setSelectedFile, setParentFolderId, selectedPickerFile, sortBy, sortOrder, setSortOrders, setSelectedKeys, }) => {
     const navigate = useAppNavigate();
     const [state, setState] = useState({
         selectedFile: {},
@@ -23,6 +23,7 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
     const { showPreviewModal, selectedFile } = state;
     const { type } = useAppParams();
     const clickTimer = useRef(null);
+    const lastClickedId = useRef(null);
     const handleClick = (folder) => {
         const id = get(folder, "_id");
         const fileType = get(folder, "type", EntityType.FOLDER);
@@ -40,18 +41,36 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
             }
         }
         else {
-            if (clickTimer.current) {
-                clearTimeout(clickTimer.current);
+            // Check if this is a double click (same item clicked within timer window)
+            const isDoubleClick = clickTimer.current !== null && lastClickedId.current === id;
+            if (isDoubleClick) {
+                // Double click detected - clear timer and handle double click action
+                if (clickTimer.current) {
+                    clearTimeout(clickTimer.current);
+                }
                 clickTimer.current = null;
-                if (fileType === EntityType.FOLDER && navigate) {
-                    navigate(SUBFOLDERS_SCREEN.replace(":folderId", id));
+                lastClickedId.current = null;
+                if (fileType === EntityType.FOLDER) {
+                    // Double click on folder: update tree selection (similar to FolderTree's handleSelect)
+                    // This will automatically update the DriveContainer to show the folder's contents
+                    if (setSelectedKeys) {
+                        setSelectedKeys(id);
+                    }
                 }
-                if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {
+                else if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {
+                    // Double click on file: show preview
                     setState((prevState) => (Object.assign(Object.assign({}, prevState), { selectedFile: folder, showPreviewModal: true })));
                 }
                 return;
             }
+            // Single click - set timer for selection
+            if (clickTimer.current) {
+                // Different item clicked, clear previous timer
+                clearTimeout(clickTimer.current);
+            }
+            lastClickedId.current = id;
             clickTimer.current = setTimeout(() => {
+                // Single click action: toggle selection
                 if (fileType === EntityType.FILE) {
                     const alreadySelected = includes(selectedFileIds, id);
                     setSelectedItems({
@@ -69,6 +88,7 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                     });
                 }
                 clickTimer.current = null;
+                lastClickedId.current = null;
             }, 250);
         }
     };

package/package.json

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