LumeWeb
/
skynet-webportal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1348 from SkynetLabs/undefined-dir-upload-name-and-empty-progress 

fix undefined dir upload name and empty progress
This commit is contained in:
Karol Wypchło 2021-11-04 14:52:54 +01:00 committed by GitHub
parent 2988f9e9ab f7f75ca2f3
commit 905dd7ecb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/items/bugs-fixed/undefined-dir-upload-name-and-empty-progress.md Normal file
View File

@ -0,0 +1,2 @@
- fixed uploaded directory name (was "undefined" before)
- fixed empty directory upload progress (size was not calculated for directories)

3
packages/website/src/components/Uploader/Uploader.js
View File

@ -47,8 +47,9 @@ const Uploader = () => {
const handleDrop = async (files) => { const handleDrop = async (files) => {
if (mode === "directory" && files.length) { if (mode === "directory" && files.length) {
const name = getRootDirectory(files[0]); // get the file path from the first file const name = getRootDirectory(files[0]); // get the file path from the first file
const size = files.reduce((acc, file) => acc + file.size, 0);
files = [{ name, files }]; files = [{ name, size, files }];
} }
setUploads((uploads) => [...files.map((file) => ({ id: nanoid(), file, mode, status: "enqueued" })), ...uploads]); setUploads((uploads) => [...files.map((file) => ({ id: nanoid(), file, mode, status: "enqueued" })), ...uploads]);

2
packages/website/src/components/Uploader/UploaderElement.js
View File

@ -85,7 +85,7 @@ export default function UploaderElement({ onUploadStateChange, upload }) {
if (upload.mode === "directory") { if (upload.mode === "directory") {
const files = upload.file.files; const files = upload.file.files;
const directory = files.reduce((acc, file) => ({ ...acc, [getRelativeFilePath(file)]: file }), {}); const directory = files.reduce((acc, file) => ({ ...acc, [getRelativeFilePath(file)]: file }), {});
const name = encodeURIComponent(upload.name); const name = encodeURIComponent(upload.file.name);
response = await client.uploadDirectory(directory, name, { onUploadProgress }); response = await client.uploadDirectory(directory, name, { onUploadProgress });
} else { } else {