From 41dfb3595191b549a1ac0008cc2c6b00c1ecc4c2 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Wed, 6 Aug 2025 23:31:13 +0500 Subject: [PATCH 1/5] Fixed transfer page --- src/components/YDBDefinitionList/YDBDefinitionList.tsx | 2 +- .../Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/YDBDefinitionList/YDBDefinitionList.tsx b/src/components/YDBDefinitionList/YDBDefinitionList.tsx index 073b02873b..060d8c1418 100644 --- a/src/components/YDBDefinitionList/YDBDefinitionList.tsx +++ b/src/components/YDBDefinitionList/YDBDefinitionList.tsx @@ -42,7 +42,7 @@ export function YDBDefinitionList({ {...restProps} > {items.map((item) => ( - + ))} ); diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx index 3a6839a33f..f048fdfcbb 100644 --- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx +++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx @@ -19,8 +19,9 @@ export function Credentials({connection}: CredentialsProps) { ); } - if ('OAuthToken' in connection) { - return 'OAuth'; + if (connection.OAuthToken) { + //return connection.OAuthToken.keys().length; + return connection.OAuthToken.Token || connection.OAuthToken.TokenSecretName ? 'OAuth' : ''; } return 'unknown'; From f3d35cde611ba44eab412cdbbdf9990e5c776d74 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Wed, 6 Aug 2025 23:35:43 +0500 Subject: [PATCH 2/5] fix --- .../Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx index f048fdfcbb..be2261dd11 100644 --- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx +++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx @@ -19,8 +19,7 @@ export function Credentials({connection}: CredentialsProps) { ); } - if (connection.OAuthToken) { - //return connection.OAuthToken.keys().length; + if ('OAuthToken' in connection) { return connection.OAuthToken.Token || connection.OAuthToken.TokenSecretName ? 'OAuth' : ''; } From 9480e50114e68b77a964f6a9874d8bd016bc43f4 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Wed, 6 Aug 2025 23:41:39 +0500 Subject: [PATCH 3/5] fix --- .../Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx index be2261dd11..ceff959db1 100644 --- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx +++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx @@ -20,7 +20,9 @@ export function Credentials({connection}: CredentialsProps) { } if ('OAuthToken' in connection) { - return connection.OAuthToken.Token || connection.OAuthToken.TokenSecretName ? 'OAuth' : ''; + return connection.OAuthToken?.Token || connection.OAuthToken?.TokenSecretName + ? 'OAuth' + : ''; } return 'unknown'; From 948d5e207f5bf05557acbee98d159a1232d2a5f4 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Wed, 6 Aug 2025 23:44:42 +0500 Subject: [PATCH 4/5] fix --- .../Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx index ceff959db1..f775f958fc 100644 --- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx +++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx @@ -20,7 +20,7 @@ export function Credentials({connection}: CredentialsProps) { } if ('OAuthToken' in connection) { - return connection.OAuthToken?.Token || connection.OAuthToken?.TokenSecretName + return 'Token' in connection.OAuthToken || 'TokenSecretName' in connection.OAuthToken ? 'OAuth' : ''; } From f49e52761c9f7a9fe7d349dd48500603d6f79841 Mon Sep 17 00:00:00 2001 From: Nikolay Shestakov Date: Wed, 6 Aug 2025 23:47:10 +0500 Subject: [PATCH 5/5] fix --- .../Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx index f775f958fc..31019d4e95 100644 --- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx +++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx @@ -20,7 +20,8 @@ export function Credentials({connection}: CredentialsProps) { } if ('OAuthToken' in connection) { - return 'Token' in connection.OAuthToken || 'TokenSecretName' in connection.OAuthToken + return connection.OAuthToken !== undefined && + ('Token' in connection.OAuthToken || 'TokenSecretName' in connection.OAuthToken) ? 'OAuth' : ''; }