From 3094ae554e57163324478b5423c54ef9e6904460 Mon Sep 17 00:00:00 2001
From: Vladimir Khvan <vladimir.hvan@onlyoffice.com>
Date: Mon, 8 Jul 2024 12:28:55 +0500
Subject: [PATCH] Web: Client: Data Import: fix wrong file uploading behavior

---
 .../data-import/components/SelectFileStep.tsx          |  8 ++------
 .../PortalSettings/categories/data-import/index.tsx    | 10 +++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx
index 43dfbb27cb..9c84322c70 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx
@@ -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,
diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/index.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/index.tsx
index 3bf0061f6d..a688285a24 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/index.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/index.tsx
@@ -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);