@bindu-dashing/dam-solution-v2 5.8.25 → 5.8.27

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, useRef } from "react";
+import { useEffect, useMemo, useState } 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";
@@ -124,10 +124,18 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                 setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
             }
             else {
-                // Simply use folder info from API response and newFolders as children
-                const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
-                console.log('## Folder info:', folderInfo, 'New children:', insertSubfoldersRecursively(sorted));
-                setFolders([Object.assign(Object.assign({}, folderInfo), { children: insertSubfoldersRecursively(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:', insertSubfoldersRecursively(sorted));
+                // setFolders([{
+                //   ...folderInfo,
+                //   children: insertSubfoldersRecursively(sorted),
+                // }]);
+                setFolders((prev) => {
+                    const cloned = cloneDeep(prev);
+                    const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
+                    return insertSubfolders(cloned, fid, sorted);
+                });
             }
             setState((prevState) => {
                 return Object.assign(Object.assign({}, prevState), { parentFolder: get(response, "data.folder", {}), loading: false, globalSearchValue: globalSearch || "" });
@@ -141,17 +149,8 @@ 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 && 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');
+        if (currentRootId) {
             fetchFolders(currentRootId);
         }
     }, [currentRootId, globalSearch]);
@@ -182,7 +181,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
     const toggleEditModal = (folder = {}) => setState((prev) => (Object.assign(Object.assign({}, prev), { selectedFolder: folder, showEditModal: !prev.showEditModal })));
     const toggleDeleteModal = (folder = {}) => setState((prev) => (Object.assign(Object.assign({}, prev), { selectedFolder: folder, showConfirmationModal: !prev.showConfirmationModal })));
     const getFoldersTree = (folders = []) => {
-        console.log('## folders', folders);
         const transform = (tree = []) => map(tree, (folder) => {
             const key = get(folder, "_id", "");
             const name = get(folder, "name", "");
@@ -238,7 +236,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
         if (get(selected, "length") > 0) {
             const selectedId = selected[get(selected, "length", 0) - 1];
             // navigate(SUBFOLDERS_SCREEN.replace(":folderId", selectedId));
-            console.log('## selectedId', selectedId);
         }
     };
     useEffect(() => {
@@ -344,7 +341,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             return Object.assign(Object.assign({}, prevState), { tempFolders: cloneDeep(customSorted), sortMode: "custom", enableDrag: false });
         });
     };
-    console.log('## folders in FolderTree', tempFolders, folders);
     return (_jsxs(_Fragment, { children: [!screens.md && collapse && (_jsxs("div", { className: `md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-p-1 md-lib-rounded md-lib-absolute md-lib-top-16 md-lib-left-1`, children: [" ", _jsx(FaAngleRightbtn, { size: 24, className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", onClick: toggleMenu })] })), _jsxs("div", { className: `md-lib-border-r md-lib-inline-table md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-px-2 md-lib-pt-1 md-lib-max-h-[calc(100%-76px)] md-lib-overflow-x-auto ${!screens.md &&
                     "md-lib-absolute md-lib-left-0 md-lib-z-30 md-lib-h-full"} ${!screens.md && collapse && "!-md-lib-left-full"}`, children: [!screens.md && !collapse && (_jsxs("div", { className: `md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-p-1 md-lib-rounded md-lib-absolute md-lib-top-1 md-lib-right-1 md-lib-z-50`, children: [" ", _jsx(FaAngleLeftbtn, { size: 24, className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", onClick: toggleMenu })] })), _jsx("div", { className: "md-lib-mb-2", children: _jsx(Input, { placeholder: "Search files (min. 2 characters required)", onChange: (e) => setState((prevState) => {
                                 return Object.assign(Object.assign({}, prevState), { globalSearchValue: e.target.value });

package/package.json

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