Web: Files: removed secondary loader if only files are uploaded
This commit is contained in:
parent
7ed3b060e1
commit
5b415b588b
@ -251,7 +251,12 @@ class FilesActionStore {
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
createFolderTree = async (treeList, parentFolderId, filesList) => {
|
createFolderTree = async (
|
||||||
|
treeList,
|
||||||
|
parentFolderId,
|
||||||
|
filesList,
|
||||||
|
operationId,
|
||||||
|
) => {
|
||||||
if (!treeList || !treeList.length) return;
|
if (!treeList || !treeList.length) return;
|
||||||
|
|
||||||
for (let i = 0; i < treeList.length; i++) {
|
for (let i = 0; i < treeList.length; i++) {
|
||||||
@ -269,12 +274,28 @@ class FilesActionStore {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.uploadDataStore.secondaryProgressDataStore.setSecondaryProgressBarData(
|
||||||
|
{
|
||||||
|
icon: "file",
|
||||||
|
visible: true,
|
||||||
|
percent: 0,
|
||||||
|
label: "",
|
||||||
|
alert: false,
|
||||||
|
operationId,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const folder = await createFolder(parentFolderId, treeNode.name);
|
const folder = await createFolder(parentFolderId, treeNode.name);
|
||||||
const parentId = folder.id;
|
const parentId = folder.id;
|
||||||
|
|
||||||
if (treeNode.children.length == 0) continue;
|
if (treeNode.children.length == 0) continue;
|
||||||
|
|
||||||
await this.createFolderTree(treeNode.children, parentId, filesList);
|
await this.createFolderTree(
|
||||||
|
treeNode.children,
|
||||||
|
parentId,
|
||||||
|
filesList,
|
||||||
|
operationId,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return treeList;
|
return treeList;
|
||||||
@ -284,26 +305,16 @@ class FilesActionStore {
|
|||||||
//console.log("createFoldersTree", files, folderId);
|
//console.log("createFoldersTree", files, folderId);
|
||||||
|
|
||||||
const { secondaryProgressDataStore } = this.uploadDataStore;
|
const { secondaryProgressDataStore } = this.uploadDataStore;
|
||||||
const { setSecondaryProgressBarData, clearSecondaryProgressData } =
|
const { clearSecondaryProgressData } = secondaryProgressDataStore;
|
||||||
secondaryProgressDataStore;
|
|
||||||
|
|
||||||
const operationId = uniqueid("operation_");
|
const operationId = uniqueid("operation_");
|
||||||
|
|
||||||
const toFolderId = folderId ? folderId : this.selectedFolderStore.id;
|
const toFolderId = folderId ? folderId : this.selectedFolderStore.id;
|
||||||
|
|
||||||
setSecondaryProgressBarData({
|
|
||||||
icon: "file",
|
|
||||||
visible: true,
|
|
||||||
percent: 0,
|
|
||||||
label: "",
|
|
||||||
alert: false,
|
|
||||||
operationId,
|
|
||||||
});
|
|
||||||
|
|
||||||
const tree = this.convertToTree(files);
|
const tree = this.convertToTree(files);
|
||||||
|
|
||||||
const filesList = [];
|
const filesList = [];
|
||||||
await this.createFolderTree(tree, toFolderId, filesList);
|
await this.createFolderTree(tree, toFolderId, filesList, operationId);
|
||||||
|
|
||||||
this.updateCurrentFolder(null, [folderId], null, operationId);
|
this.updateCurrentFolder(null, [folderId], null, operationId);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user