@bindu-dashing/dam-solution-v2 5.8.18 → 5.8.20
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.
|
@@ -107,18 +107,16 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
|
|
|
107
107
|
});
|
|
108
108
|
const response = yield api.get(`${FETCH_FOLDER_URL.replace(":folderId", fid)}?isPagination=false&includeFiles=false&includeSubFoldersCount=true&fetchMainFolders=true&globalSearch=${fid == rootFolderId ? globalSearch : ""}`);
|
|
109
109
|
const newFolders = get(response, "data.folders", []);
|
|
110
|
+
const folderInfo = get(response, "data.folder", {});
|
|
110
111
|
console.log('## newFolders', response, newFolders, fid, rootFolderId, globalSearch);
|
|
111
112
|
if (fid === rootFolderId) {
|
|
112
113
|
setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
|
|
113
114
|
}
|
|
114
115
|
else {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
console.log('## sorted', sorted, insertSubfolders(cloned, fid, sorted));
|
|
120
|
-
return insertSubfolders(cloned, fid, sorted);
|
|
121
|
-
});
|
|
116
|
+
// Simply use folder info from API response and newFolders as children
|
|
117
|
+
const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
|
|
118
|
+
console.log('## Folder info:', folderInfo, 'New children:', sorted);
|
|
119
|
+
setFolders([Object.assign(Object.assign({}, folderInfo), { children: sorted })]);
|
|
122
120
|
}
|
|
123
121
|
setState((prevState) => {
|
|
124
122
|
return Object.assign(Object.assign({}, prevState), { parentFolder: get(response, "data.folder", {}), loading: false, globalSearchValue: globalSearch || "" });
|