@bindu-dashing/dam-solution-v2 5.8.19 → 5.8.21

package/build/MyDrive/FolderTree.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Button, Dropdown, Grid, Input, Select, Tooltip, Tree } from "antd";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState, useRef } from "react";
 import { get, map, isArray, isObject, cloneDeep, first, sortBy, } from "lodash";
 import { FaAngleLeft, FaAngleRight } from "react-icons/fa";
 import { deleteFolders, } from "../react-query/services/folder-services";
@@ -42,20 +42,6 @@ const AiOutlineSortDescendingbtn = AiOutlineSortDescending;
 const AiOutlineSortAscendingbtn = AiOutlineSortAscending;
 const GrSortIcon = FaShuffle;
 const IoIosSearchIcon = IoIosSearch;
-// ✅ Helper to find a folder by ID in the tree
-const findFolderById = (tree, folderId) => {
-    for (const node of tree) {
-        if (node._id === folderId) {
-            return node;
-        }
-        if (isArray(node.children)) {
-            const found = findFolderById(node.children, folderId);
-            if (found)
-                return found;
-        }
-    }
-    return null;
-};
 // ✅ Helper to insert children into the correct folder recursively
 const insertSubfolders = (tree, parentId, childrenToInsert) => {
     console.log('## insertSubfolders', tree, parentId, childrenToInsert);
@@ -121,28 +107,16 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             });
             const response = yield api.get(`${FETCH_FOLDER_URL.replace(":folderId", fid)}?isPagination=false&includeFiles=false&includeSubFoldersCount=true&fetchMainFolders=true&globalSearch=${fid == rootFolderId ? globalSearch : ""}`);
             const newFolders = get(response, "data.folders", []);
+            const folderInfo = get(response, "data.folder", {});
             console.log('## newFolders', response, newFolders, fid, rootFolderId, globalSearch);
             if (fid === rootFolderId) {
                 setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
             }
             else {
-                setFolders((prev) => {
-                    // Find the folder with fid in the tree
-                    const foundFolder = findFolderById(prev, fid);
-                    if (foundFolder) {
-                        // Return only the folder with fid and its updated children
-                        const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
-                        console.log('## Found folder:', foundFolder._id, 'New children:', sorted);
-                        return [Object.assign(Object.assign({}, foundFolder), { children: sorted })];
-                    }
-                    else {
-                        // If folder not found, update the entire tree (fallback)
-                        console.log('## Folder not found, updating entire tree');
-                        const cloned = cloneDeep(prev);
-                        const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
-                        return insertSubfolders(cloned, fid, sorted);
-                    }
-                });
+                // Simply use folder info from API response and newFolders as children
+                const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
+                console.log('## Folder info:', folderInfo, 'New children:', sorted);
+                setFolders([Object.assign(Object.assign({}, folderInfo), { children: sorted })]);
             }
             setState((prevState) => {
                 return Object.assign(Object.assign({}, prevState), { parentFolder: get(response, "data.folder", {}), loading: false, globalSearchValue: globalSearch || "" });
@@ -156,8 +130,17 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
         }
     });
     // ✅ Load on mount & when currentRootId changes
+    // Use ref to track previous currentRootId to prevent unnecessary fetches
+    const prevCurrentRootIdRef = useRef(null);
     useEffect(() => {
-        if (currentRootId) {
+        if (currentRootId && currentRootId !== prevCurrentRootIdRef.current) {
+            console.log('## FolderTree useEffect - currentRootId changed from', prevCurrentRootIdRef.current, 'to', currentRootId, 'rootFolderId:', rootFolderId);
+            prevCurrentRootIdRef.current = currentRootId;
+            fetchFolders(currentRootId);
+        }
+        else if (globalSearch !== globalSearchValue && currentRootId === rootFolderId) {
+            // Only refetch on global search change if we're on root folder
+            console.log('## FolderTree useEffect - globalSearch changed, refetching root folder');
             fetchFolders(currentRootId);
         }
     }, [currentRootId, globalSearch]);

package/build/MyDrive/MyDriveMainContainer.js

@@ -17,8 +17,14 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
     useEffect(() => {
         // Priority: URL params > Props from ParamsProvider > rootFolderId from config
         if (params === null || params === void 0 ? void 0 : params.folderId) {
+            console.log('## Setting selectedKeys from params.folderId:', params.folderId);
             setSelectedKeys(params.folderId);
         }
+        else if (!(params === null || params === void 0 ? void 0 : params.folderId) && rootFolderId) {
+            // If no params but we have rootFolderId, use it
+            console.log('## No params.folderId, using rootFolderId:', rootFolderId);
+            setSelectedKeys(rootFolderId);
+        }
     }, [params === null || params === void 0 ? void 0 : params.folderId, params === null || params === void 0 ? void 0 : params.id, params === null || params === void 0 ? void 0 : params.parentId, rootFolderId]);
     const currentRootId = isArray(selectedKeys)
         ? selectedKeys.length
@@ -27,6 +33,7 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
         : selectedKeys
             ? selectedKeys
             : rootFolderId;
+    console.log('## MyDriveMainContainer - selectedKeys:', selectedKeys, 'currentRootId:', currentRootId, 'rootFolderId:', rootFolderId);
     const handleExpand = (keys) => {
         setExpandedKeys(map(keys, (k) => k.toString()));
     };

package/package.json

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