From 1278f5e722eb9fa0f2a19189007f69ba38c73e86 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Wed, 7 Dec 2022 12:29:28 +0300
Subject: [PATCH] Web:Client: fix double tab at desktop editors

---
 .../components/GlobalEvents/CreateEvent.js    | 24 +++++++++----------
 .../dialogs/ConvertPasswordDialog/index.js    |  4 +++-
 .../client/src/store/ContextOptionsStore.js   |  6 ++++-
 .../client/src/store/FilesActionsStore.js     |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/GlobalEvents/CreateEvent.js b/packages/client/src/components/GlobalEvents/CreateEvent.js
index fa0d436b24..ff972502a1 100644
--- a/packages/client/src/components/GlobalEvents/CreateEvent.js
+++ b/packages/client/src/components/GlobalEvents/CreateEvent.js
@@ -93,13 +93,13 @@ const CreateEvent = ({
       setStartValue(newValue);
     }
 
-    let tab =
-      !isDesktop && extension && open
-        ? window.open(
-            combineUrl(AppServerConfig.proxyURL, config.homepage, "/doceditor"),
-            "_blank"
-          )
-        : null;
+    // let tab =
+    //   !isDesktop && extension && open
+    //     ? window.open(
+    //         combineUrl(AppServerConfig.proxyURL, config.homepage, `/doceditor`),
+    //         "_blank"
+    //       )
+    //     : null;
 
     if (!extension) {
       createFolder(parentId, newValue)
@@ -127,7 +127,7 @@ const CreateEvent = ({
             createdFileId = file.id;
             addActiveItems([file.id]);
 
-            open && openDocEditor(file.id, file.providerKey, tab);
+            open && openDocEditor(file.id, file.providerKey, null);
           })
           .then(() => editCompleteAction(item, type))
           .catch((err) => {
@@ -154,7 +154,7 @@ const CreateEvent = ({
             });
             setConvertPasswordDialogVisible(true);
 
-            open && openDocEditor(null, null, tab);
+            // open && openDocEditor(null, null, null);
           })
           .finally(() => {
             const fileIds = [+id];
@@ -177,7 +177,7 @@ const CreateEvent = ({
             setCreatedItem({ id: createdFileId, type: "file" });
             addActiveItems([file.id]);
 
-            return open && openDocEditor(file.id, file.providerKey, tab);
+            return open && openDocEditor(file.id, file.providerKey, null);
           })
           .then(() => editCompleteAction(item, type))
           .catch((e) => toastr.error(e))
@@ -208,12 +208,12 @@ const CreateEvent = ({
                   true,
                   false
                 ).then(
-                  () => open && openDocEditor(file.id, file.providerKey, tab)
+                  () => open && openDocEditor(file.id, file.providerKey, null)
                 );
               });
             }
 
-            return open && openDocEditor(file.id, file.providerKey, tab);
+            return open && openDocEditor(file.id, file.providerKey, null);
           })
           .then(() => editCompleteAction(item, type))
           .catch((e) => toastr.error(e))
diff --git a/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js b/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
index 30ad712393..63e4ee5fcd 100644
--- a/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
+++ b/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
@@ -111,6 +111,7 @@ const ConvertPasswordDialogComponent = (props) => {
           .then((file) => {
             toastr.success(t("SuccessfullyCreated", { fileTitle: newTitle }));
             onClose();
+
             open && openDocEditor(file.id, file.providerKey, tab);
           })
           .then(() => {
@@ -123,7 +124,8 @@ const ConvertPasswordDialogComponent = (props) => {
             }
 
             toastr.error(t("CreationError"), t("Common:Warning"));
-            open && openDocEditor(null, null, tab);
+
+            // open && openDocEditor(null, null, tab);
             if (_isMounted) {
               setPasswordValid(false);
               focusInput();
diff --git a/packages/client/src/store/ContextOptionsStore.js b/packages/client/src/store/ContextOptionsStore.js
index c1614ea53a..80ff8eb8ea 100644
--- a/packages/client/src/store/ContextOptionsStore.js
+++ b/packages/client/src/store/ContextOptionsStore.js
@@ -266,7 +266,11 @@ class ContextOptionsStore {
     let tab =
       !this.authStore.isDesktopClient && fileExst
         ? window.open(
-            combineUrl(AppServerConfig.proxyURL, config.homepage, "/doceditor"),
+            combineUrl(
+              AppServerConfig.proxyURL,
+              config.homepage,
+              `/doceditor?fileId=${id}`
+            ),
             "_blank"
           )
         : null;
diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js
index 92ff8d3467..14306a7d0d 100644
--- a/packages/client/src/store/FilesActionsStore.js
+++ b/packages/client/src/store/FilesActionsStore.js
@@ -1807,7 +1807,7 @@ class FilesActionStore {
                 combineUrl(
                   AppServerConfig.proxyURL,
                   config.homepage,
-                  "/doceditor"
+                  `/doceditor?fileId=${id}`
                 ),
                 "_blank"
               )