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

Fix Bug 67170 - Settings: Data Import. The Upload to server button is missing when uploading an inappropriate archive.

Browse Source
This commit is contained in:
Elyor Djalilov 2024-04-04 17:41:01 +05:00
parent 76810d6932
commit 5fff880164
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
View File

@ -188,14 +188,6 @@ const GoogleWorkspace = ({
);
}
if (res.parseResult.operation === "migration" && !res.isCompleted) {
setCurrentStep(5);
}
if (res.parseResult.operation === "migration" && res.isCompleted) {
setCurrentStep(6);
}
if (
res.parseResult.operation === "parse" &&
res.isCompleted &&
@ -204,6 +196,15 @@ const GoogleWorkspace = ({
setUsers(res.parseResult);
setCurrentStep(2);
}
if (res.parseResult.operation === "migration" && !res.isCompleted) {
setCurrentStep(5);
}
if (res.parseResult.operation === "migration" && res.isCompleted) {
setCurrentStep(6);
}
setShouldRender(true);
});
} catch (error) {

5
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
View File

@ -144,8 +144,9 @@ const SelectFileStep = ({
}
if (!res || res.parseResult.failedArchives.length > 0 || res.error) {
toastr.error(res.error || t("Common:SomethingWentWrong"));
setIsFileError(true);
setIsFileError(false);
setShowReminder(false);
setFileName(null);
clearInterval(uploadInterval.current);
} else if (res.isCompleted || res.progress === 100) {
setUsers(res.parseResult);

6
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
View File

@ -186,7 +186,11 @@ const OnlyofficeWorkspace = ({
);
}
if (res.parseResult.operation === "parse" && res.isCompleted) {
if (
res.parseResult.operation === "parse" &&
res.isCompleted &&
res.error
) {
setUsers(res.parseResult);
setCurrentStep(2);
}