@bindu-dashing/dam-solution-v2 5.8.35 → 5.8.37

package/build/MyDrive/BreadCrumbList.d.ts

@@ -1,9 +1,10 @@
 import { FolderEntity } from "../utilities/constants/interface";
-declare function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, globalSearch, }: {
+declare function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, globalSearch, setSelectedKeys, }: {
     folder: FolderEntity;
     parentFolderId?: string;
     setParentFolderId?: (id: string) => void;
     pickerFolderId?: string;
     globalSearch?: string;
+    setSelectedKeys?: (keys: string | string[]) => void;
 }): JSX.Element;
 export default BreadCrumbList;

package/build/MyDrive/BreadCrumbList.js

@@ -1,15 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DriveModes } from "../utilities/constants/interface";
-import { DRIVE_MODES_SCREEN, MY_DRIVE_SCREEN, SUBFOLDERS_SCREEN, } from "../utilities/constants/routes";
+import { DRIVE_MODES_SCREEN, MY_DRIVE_SCREEN, } from "../utilities/constants/routes";
 import { Breadcrumb, Tooltip } from "antd";
 import { findIndex, get, isEmpty, last, map, slice } from "lodash";
 import { useMemo } from "react";
 import { FaChevronRight } from "react-icons/fa";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import useAppNavigate from "../utilities/useAppNavigate";
 import useAppParams from "../utilities/useAppParams";
+import useAppNavigate from "../utilities/useAppNavigate";
 const FaChevronRightIcon = FaChevronRight;
-function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, globalSearch, }) {
+function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, globalSearch, setSelectedKeys, }) {
     const { type, id } = useAppParams();
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
@@ -63,12 +63,16 @@ function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolde
                     if (pickerFolderId && setParentFolderId && !isLast) {
                         setParentFolderId(treeId);
                     }
-                    if (!pickerFolderId && !isLast && navigate) {
+                    if (!pickerFolderId && !isLast) {
                         if (treeId === rootFolderId) {
-                            navigate(MY_DRIVE_SCREEN);
+                            // Navigate to MY_DRIVE_SCREEN only for root folder
+                            if (navigate) {
+                                navigate(MY_DRIVE_SCREEN);
+                            }
                         }
-                        else {
-                            navigate(SUBFOLDERS_SCREEN.replace(":folderId", treeId));
+                        else if (setSelectedKeys) {
+                            // Use state-based navigation for other folders
+                            setSelectedKeys(treeId);
                         }
                     }
                 };

package/build/MyDrive/DriveContainer.d.ts

@@ -1,6 +1,6 @@
 import { SetStateAction } from "react";
 import { FileEntity, ImagePickerEntity } from "../utilities/constants/interface";
-declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, }: {
+declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, }: {
     parentFolderId?: string;
     setSelectedFile?: (file: FileEntity, localFile?: boolean) => void;
     setParentFolderId?: (id: string) => void;
@@ -9,5 +9,6 @@ declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFold
     imagePicker?: ImagePickerEntity | {};
     globalSearch?: string;
     setGlobalSearch?: React.Dispatch<SetStateAction<string>>;
+    setSelectedKeys?: (keys: string | string[]) => void;
 }): JSX.Element;
 export default DriveContainer;

package/build/MyDrive/DriveContainer.js

@@ -36,7 +36,7 @@ import useAppParams from "../utilities/useAppParams";
 import { IoIosSearch } from "react-icons/io";
 const BsUploadIcon = BsUpload;
 const IoIosSearchIcon = IoIosSearch;
-function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, }) {
+function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, }) {
     const damConfig = useDamConfig();
     const { rootFolderId, brand, isAdmin } = damConfig;
     const brandId = get(brand, "_id");
@@ -236,7 +236,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 }) })), _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, {}), 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"

package/build/MyDrive/FolderTree.js

@@ -16,8 +16,6 @@ import { deleteFolders, } from "../react-query/services/folder-services";
 import { generateFoldersQueryKey, invalidateData, } from "../utilities/constants/queryKeys";
 import { createApiClient } from "../hocs/configureAxios";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { MY_DRIVE_SCREEN, } from "../utilities/constants/routes";
-import useAppNavigate from "../utilities/useAppNavigate";
 import { AiOutlineSortDescending } from "react-icons/ai";
 import { AiOutlineSortAscending } from "react-icons/ai";
 import CustomLoader from "../common/loader/CustomLoader";
@@ -91,7 +89,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
     const { folderId, id, type } = useParams();
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
-    const navigate = useAppNavigate();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const { useBreakpoint } = Grid;
     const [collapse, setCollapse] = useState(false);
@@ -346,7 +343,8 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
         });
         invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : id ? id : rootFolderId);
         if (deletedId === folderId || deletedId === id) {
-            navigate(MY_DRIVE_SCREEN);
+            // Navigate to root folder using state instead of URL
+            setSelectedKeys(rootFolderId);
         }
         showNotification(message, NotificationStatus.SUCCESS);
     };
@@ -434,7 +432,8 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                             }), value: globalSearchValue, prefix: _jsx(IoIosSearchIcon, {}), onPressEnter: () => {
                                 if (globalSearchValue.length >= 2 || !globalSearchValue) {
                                     setGlobalSearch(globalSearchValue);
-                                    navigate(MY_DRIVE_SCREEN);
+                                    // Navigate to root folder using state instead of URL
+                                    setSelectedKeys(rootFolderId);
                                 }
                             } }) }), !enableDrag && (_jsx("p", { className: "md-lib-text-xs md-lib-text-secondaryTextColor md-lib-mb-1 md-lib-font-400", children: "Sort By:" })), _jsxs("div", { className: "md-lib-flex md-lib-justify-between md-lib-items-center md-lib-mb-3 md-lib-gap-2", children: [!enableDrag && (_jsxs(Select, { value: sortMode, onChange: handleSortChange, style: { width: 200 }, children: [_jsx(Option, { value: "name", children: "Name" }), _jsx(Option, { value: "createdAt", children: "Created At" }), _jsx(Option, { value: "custom", children: "Custom Order" })] })), sortMode !== "custom" && (_jsx(Tooltip, { title: sortOrder === "desc" ? "Ascending" : "Descending", children: _jsx(Button, { onClick: () => {
                                         if (sortOrder === "desc") {

package/build/MyDrive/MyDriveMainContainer.js

@@ -50,5 +50,14 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
     const handleExpand = (keys) => {
         setExpandedKeys(map(keys, (k) => k.toString()));
     };
-    return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: setSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { parentFolderId: selectedFolderId, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch }) })] }));
+    // Wrapper function to handle both string and string[] for setSelectedKeys
+    const handleSetSelectedKeys = (keys) => {
+        if (typeof keys === 'string') {
+            setSelectedKeys([keys]);
+        }
+        else {
+            setSelectedKeys(keys);
+        }
+    };
+    return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: setSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { parentFolderId: selectedFolderId, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch, setSelectedKeys: handleSetSelectedKeys }) })] }));
 }

package/package.json

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