From bdda117ea61d1ae01c4fc972707569f6ce1ba392 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 19 Jul 2024 17:50:27 +0300
Subject: [PATCH] Fix Bug 69299 - Rooms.Public.Storage. Fixed connect dialog

---
 .../src/components/dialogs/ConnectDialog/index.js   | 13 ++++++++-----
 packages/client/src/store/ThirdPartyStore.js        |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/dialogs/ConnectDialog/index.js b/packages/client/src/components/dialogs/ConnectDialog/index.js
index 4a5eff2a91..e6f1814fc8 100644
--- a/packages/client/src/components/dialogs/ConnectDialog/index.js
+++ b/packages/client/src/components/dialogs/ConnectDialog/index.js
@@ -60,9 +60,14 @@ const PureConnectDialogContainer = (props) => {
     saveAfterReconnectOAuth,
     setSaveAfterReconnectOAuth,
     setThirdPartyAccountsInfo,
+    connectingStorages,
   } = props;
   const { title, link, token, provider_id, provider_key, key } = item;
 
+  const connectItem = connectingStorages.find(
+    (el) => el.providerKey === provider_key,
+  );
+
   const provider = providers.find((el) => el.provider_id === item.provider_id);
   const folderTitle = provider ? provider.customer_title : title;
 
@@ -81,11 +86,7 @@ const PureConnectDialogContainer = (props) => {
   const [isLoading, setIsLoading] = useState(false);
 
   const isAccount = !!link;
-  const showUrlField =
-    provider_key === "SharePoint" ||
-    key === "SharePoint" ||
-    (!isConnectDialogReconnect &&
-      (provider_key === "WebDav" || key === "WebDav"));
+  const showUrlField = !!connectItem?.requiredConnectionUrl;
 
   const header = isConnectDialogReconnect
     ? t("Common:ReconnectStorage")
@@ -416,6 +417,7 @@ export default inject(
       saveThirdParty,
       openConnectWindow,
       fetchThirdPartyProviders,
+      connectingStorages,
     } = filesSettingsStore.thirdPartyStore;
     const { folderFormValidation } = settingsStore;
 
@@ -458,6 +460,7 @@ export default inject(
       setSaveAfterReconnectOAuth,
       setIsConnectDialogReconnect,
       setThirdPartyAccountsInfo,
+      connectingStorages,
     };
   },
 )(observer(ConnectDialog));
diff --git a/packages/client/src/store/ThirdPartyStore.js b/packages/client/src/store/ThirdPartyStore.js
index 6d0676fd18..dfc240167c 100644
--- a/packages/client/src/store/ThirdPartyStore.js
+++ b/packages/client/src/store/ThirdPartyStore.js
@@ -83,6 +83,7 @@ class ThirdPartyStore {
       isOauth: storage.oauth,
       oauthHref: storage.redirectUrl,
       category: storage.name,
+      requiredConnectionUrl: storage.requiredConnectionUrl,
     }));
   };