@bindu-dashing/dam-solution-v2 5.8.24 → 5.8.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/MyDrive/FolderTree.js +15 -6
- package/package.json +1 -1
|
@@ -16,7 +16,7 @@ import { deleteFolders, } from "../react-query/services/folder-services";
|
|
|
16
16
|
import { generateFoldersQueryKey, invalidateData, } from "../utilities/constants/queryKeys";
|
|
17
17
|
import { createApiClient } from "../hocs/configureAxios";
|
|
18
18
|
import { useDamConfig } from "../hocs/DamConfigContext";
|
|
19
|
-
import { MY_DRIVE_SCREEN,
|
|
19
|
+
import { MY_DRIVE_SCREEN, } from "../utilities/constants/routes";
|
|
20
20
|
import useAppNavigate from "../utilities/useAppNavigate";
|
|
21
21
|
import { AiOutlineSortDescending } from "react-icons/ai";
|
|
22
22
|
import { AiOutlineSortAscending } from "react-icons/ai";
|
|
@@ -124,10 +124,18 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
|
|
|
124
124
|
setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
|
|
125
125
|
}
|
|
126
126
|
else {
|
|
127
|
-
// Simply use folder info from API response and newFolders as children
|
|
128
|
-
const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
|
|
129
|
-
console.log('## Folder info:', folderInfo, 'New children:', insertSubfoldersRecursively(sorted));
|
|
130
|
-
setFolders([
|
|
127
|
+
// // Simply use folder info from API response and newFolders as children
|
|
128
|
+
// const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
|
|
129
|
+
// console.log('## Folder info:', folderInfo, 'New children:', insertSubfoldersRecursively(sorted));
|
|
130
|
+
// setFolders([{
|
|
131
|
+
// ...folderInfo,
|
|
132
|
+
// children: insertSubfoldersRecursively(sorted),
|
|
133
|
+
// }]);
|
|
134
|
+
setFolders((prev) => {
|
|
135
|
+
const cloned = cloneDeep(prev);
|
|
136
|
+
const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
|
|
137
|
+
return insertSubfolders(cloned, fid, sorted);
|
|
138
|
+
});
|
|
131
139
|
}
|
|
132
140
|
setState((prevState) => {
|
|
133
141
|
return Object.assign(Object.assign({}, prevState), { parentFolder: get(response, "data.folder", {}), loading: false, globalSearchValue: globalSearch || "" });
|
|
@@ -237,7 +245,8 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
|
|
|
237
245
|
setSelectedKeys(selected);
|
|
238
246
|
if (get(selected, "length") > 0) {
|
|
239
247
|
const selectedId = selected[get(selected, "length", 0) - 1];
|
|
240
|
-
navigate(SUBFOLDERS_SCREEN.replace(":folderId", selectedId));
|
|
248
|
+
// navigate(SUBFOLDERS_SCREEN.replace(":folderId", selectedId));
|
|
249
|
+
console.log('## selectedId', selectedId);
|
|
241
250
|
}
|
|
242
251
|
};
|
|
243
252
|
useEffect(() => {
|