@bindu-dashing/dam-solution-v2 5.8.16 → 5.8.18
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 +9 -39
- package/package.json +1 -1
|
@@ -44,6 +44,7 @@ const GrSortIcon = FaShuffle;
|
|
|
44
44
|
const IoIosSearchIcon = IoIosSearch;
|
|
45
45
|
// ✅ Helper to insert children into the correct folder recursively
|
|
46
46
|
const insertSubfolders = (tree, parentId, childrenToInsert) => {
|
|
47
|
+
console.log('## insertSubfolders', tree, parentId, childrenToInsert);
|
|
47
48
|
const newTree = map(tree, (node) => {
|
|
48
49
|
if (node._id === parentId) {
|
|
49
50
|
return Object.assign(Object.assign({}, node), { children: childrenToInsert });
|
|
@@ -53,6 +54,7 @@ const insertSubfolders = (tree, parentId, childrenToInsert) => {
|
|
|
53
54
|
}
|
|
54
55
|
return node;
|
|
55
56
|
});
|
|
57
|
+
console.log('## newTree', newTree);
|
|
56
58
|
return newTree;
|
|
57
59
|
};
|
|
58
60
|
const sortFoldersRecursively = (folders, sortByField, // ✅ which field to sort
|
|
@@ -105,49 +107,17 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
|
|
|
105
107
|
});
|
|
106
108
|
const response = yield api.get(`${FETCH_FOLDER_URL.replace(":folderId", fid)}?isPagination=false&includeFiles=false&includeSubFoldersCount=true&fetchMainFolders=true&globalSearch=${fid == rootFolderId ? globalSearch : ""}`);
|
|
107
109
|
const newFolders = get(response, "data.folders", []);
|
|
108
|
-
console.log('## newFolders',
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
console.log('## sorted folders (length):', sorted.length, 'folders before update:', folders === null || folders === void 0 ? void 0 : folders.length);
|
|
112
|
-
// If results are empty and we don't have a rootFolderId, or if fid matches rootFolderId,
|
|
113
|
-
// always replace all folders with fresh results (even if empty)
|
|
114
|
-
if (fid === rootFolderId || (!rootFolderId && sorted.length === 0)) {
|
|
115
|
-
// For root folder, always replace with fresh results (even if empty)
|
|
116
|
-
// This ensures when API returns empty, we clear all folders
|
|
117
|
-
console.log('## Setting root folders to (length):', sorted.length);
|
|
118
|
-
setFolders(sorted);
|
|
110
|
+
console.log('## newFolders', response, newFolders, fid, rootFolderId, globalSearch);
|
|
111
|
+
if (fid === rootFolderId) {
|
|
112
|
+
setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
|
|
119
113
|
}
|
|
120
114
|
else {
|
|
121
|
-
// For subfolders, always replace children with fresh data (even if empty array)
|
|
122
|
-
// This ensures we don't keep stale/previous data when API returns empty results
|
|
123
115
|
setFolders((prev) => {
|
|
124
|
-
console.log('## Updating subfolders, prev length:', prev === null || prev === void 0 ? void 0 : prev.length, 'fid:', fid, 'sorted length:', sorted.length);
|
|
125
|
-
// If we're trying to update a subfolder but get empty results,
|
|
126
|
-
// we should still update that folder's children to be empty
|
|
127
|
-
if (!prev || prev.length === 0) {
|
|
128
|
-
// If no previous state, return empty (since we're updating a subfolder, not root)
|
|
129
|
-
return sorted.length > 0 ? sorted : [];
|
|
130
|
-
}
|
|
131
|
-
// Clone previous state to ensure immutability
|
|
132
116
|
const cloned = cloneDeep(prev);
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
// Verify the folder was found and updated
|
|
138
|
-
const folderFound = result.some((node) => {
|
|
139
|
-
const checkNode = (n) => {
|
|
140
|
-
if (n._id === fid)
|
|
141
|
-
return true;
|
|
142
|
-
if (isArray(n.children)) {
|
|
143
|
-
return n.children.some(checkNode);
|
|
144
|
-
}
|
|
145
|
-
return false;
|
|
146
|
-
};
|
|
147
|
-
return checkNode(node);
|
|
148
|
-
});
|
|
149
|
-
console.log('## Folder found in tree:', folderFound);
|
|
150
|
-
return result;
|
|
117
|
+
console.log('## cloned', cloned, fid);
|
|
118
|
+
const sorted = sortFoldersRecursively(newFolders, "name", sortOrder);
|
|
119
|
+
console.log('## sorted', sorted, insertSubfolders(cloned, fid, sorted));
|
|
120
|
+
return insertSubfolders(cloned, fid, sorted);
|
|
151
121
|
});
|
|
152
122
|
}
|
|
153
123
|
setState((prevState) => {
|