Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix S3 upload progress Dialog (#1683)

Stanimire3fdccef45a9
diff --git a/app/components/FileUploadContainer.tsx b/app/components/FileUploadContainer.tsx
index 0bb30b757..381974ca7 100644
--- a/app/components/FileUploadContainer.tsx
+++ b/app/components/FileUploadContainer.tsx
@@ -84,7 +84,7 @@ const FileUploadContainer = forwardRef(
// console.log("Selected File: "+JSON.stringify(selection.currentTarget.files[0]));
// const file = selection.currentTarget.files[0];
props.resetProgress();
-
+ props.toggleUploadDialog();
props
.uploadFilesAPI(
Array.from(selection.currentTarget.files),
@@ -98,7 +98,6 @@ const FileUploadContainer = forwardRef(
.catch(error => {
console.log('uploadFiles', error);
});
- props.toggleUploadDialog();
}
return (
diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsx
index 213d5df46..77e5d5b5a 100644
--- a/app/components/LocationView.tsx
+++ b/app/components/LocationView.tsx
@@ -185,6 +185,7 @@ const LocationView = (props: Props) => {
PlatformIO.enableObjectStoreSupport(targetLocation)
.then(() => {
props.resetProgress();
+ props.toggleUploadDialog();
props
.uploadFiles(arrPath, targetPath, props.onUploadProgress)
.then((fsEntries: Array<TS.FileSystemEntry>) => {
@@ -194,7 +195,6 @@ const LocationView = (props: Props) => {
.catch(error => {
console.log('uploadFiles', error);
});
- props.toggleUploadDialog();
return true;
})
.catch(error => {
diff --git a/app/components/dialogs/CreateDialog.tsx b/app/components/dialogs/CreateDialog.tsx
index 0e2be855b..9fd57bb80 100644
--- a/app/components/dialogs/CreateDialog.tsx
+++ b/app/components/dialogs/CreateDialog.tsx
@@ -178,6 +178,7 @@ const CreateDialog = (props: Props) => {
// console.log("Selected File: "+JSON.stringify(selection.currentTarget.files[0]));
// const file = selection.currentTarget.files[0];
props.resetProgress();
+ props.toggleUploadDialog();
props
.uploadFilesAPI(
Array.from(selection.currentTarget.files),
@@ -191,7 +192,6 @@ const CreateDialog = (props: Props) => {
.catch(error => {
console.log('uploadFiles', error);
});
- props.toggleUploadDialog();
props.onClose();
/* const filePath =
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index 69672a066..ba538d36f 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -463,11 +463,11 @@ function MainPage(props: Props) {
);
}
props.resetProgress();
+ props.toggleUploadDialog();
return props
.uploadFilesAPI(files, props.directoryPath, props.onUploadProgress)
.then(fsEntries => {
props.reflectCreateEntries(fsEntries);
- props.toggleUploadDialog();
return true;
})
.catch(error => {