IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Client: Data Import: fix wrong file uploading behavior

Browse Source
This commit is contained in:
Vladimir Khvan 2024-07-08 12:28:55 +05:00
parent 3448a774f6
commit 3094ae554e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx
View File

@ -184,7 +184,6 @@ const SelectFileStep = (props: SelectFileStepProps) => {
}
if (res.parseResult.failedArchives.length > 0 || res.error) {
cancelMigration();
toastr.error(res.error);
setIsFileError(true);
setLoadingStatus("none");
@ -203,15 +202,14 @@ const SelectFileStep = (props: SelectFileStepProps) => {
setUsers(res.parseResult);
setIsBackupEmpty(false);
setLoadingStatus("done");
setUsers(res.parseResult);
setIsSaveDisabled(false);
} else {
setLoadingStatus("none");
setIsBackupEmpty(true);
cancelMigration();
}
setUsers(res.parseResult);
setIsInfiniteProgress(false);
setIsSaveDisabled(false);
}
setProgress(res.progress);
@ -224,7 +222,6 @@ const SelectFileStep = (props: SelectFileStepProps) => {
if (error.message === "Network Error") {
setIsNetworkError(true);
}
cancelMigration();
toastr.error(error || t("Common:SomethingWentWrong"));
setIsFileError(true);
setLoadingStatus("none");
@ -232,7 +229,6 @@ const SelectFileStep = (props: SelectFileStepProps) => {
}
}
}, [
cancelMigration,
failTries,
getMigrationStatus,
isInfiniteProgress,

10
packages/client/src/pages/PortalSettings/categories/data-import/index.tsx
View File

@ -75,7 +75,15 @@ const DataImport = (props: DataImportProps) => {
const { parseResult, error, isCompleted } = response;
if (error || parseResult.failedArchives.length > 0) return;
if (
error ||
parseResult.failedArchives.length > 0 ||
parseResult.users.length +
parseResult.existUsers.length +
parseResult.withoutEmailUsers.length ===
0
)
return;
if (parseResult.operation === "parse") {
setWorkspace(parseResult.migratorName);