From c33ff20e42bf06f96f9bb40390c7966f2f05f38f Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Wed, 24 Feb 2021 13:56:54 +0300
Subject: [PATCH 1/2] feat(core-connections): CB-732 add ssh icon to connection
 details

---
 .../public/icons/template_connection.svg      |   2 +-
 .../core-connections/public/icons/tunnel.png  | Bin 0 -> 504 bytes
 .../ConnectionsAdministrationService.ts       |   2 +
 .../ConnectionDetailsInfo/SSH.tsx             |  35 ++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 webapp/packages/core-connections/public/icons/tunnel.png
 create mode 100644 webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx

diff --git a/webapp/packages/core-connections/public/icons/template_connection.svg b/webapp/packages/core-connections/public/icons/template_connection.svg
index b4046b1e81..ea62ee1e5b 100644
--- a/webapp/packages/core-connections/public/icons/template_connection.svg
+++ b/webapp/packages/core-connections/public/icons/template_connection.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32">
-    <path fill="#338ECC" fill-rule="evenodd" d="M16 32c8.837 0 16-7.163 16-16S24.837 0 16 0 0 7.163 0 16s7.163 16 16 16zm-4-9h10V12l-4-4h-6v15zM10 9h1v15h10v1H10V9zm4 4h6v1h-6v-1zm6 2h-6v1h6v-1zm-6 2h4v1h-4v-1z" clip-rule="evenodd"/>
+    <path fill="#69AAD7" fill-rule="evenodd" d="M16 32c8.837 0 16-7.163 16-16S24.837 0 16 0 0 7.163 0 16s7.163 16 16 16zm-4-9h10V12l-4-4h-6v15zM10 9h1v15h10v1H10V9zm4 4h6v1h-6v-1zm6 2h-6v1h6v-1zm-6 2h4v1h-4v-1z" clip-rule="evenodd"/>
 </svg>
diff --git a/webapp/packages/core-connections/public/icons/tunnel.png b/webapp/packages/core-connections/public/icons/tunnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..32191cd55326191bf5ff844fb4442bb42cc79d62
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0gXvSK~#7F)l|_@
z!axvxdjSVNL^?41fg^|=gbJ_&NC#2@Qh|05!2+}c>;MKB!=H2@e|$LHx(5Lvfxz&k
zZzeOz=Iy(;w|fWtb<n;a*WS<}D_JGxJNdK&dY_5=-*dFaZeenipzZat87tic^L;>>
zf-zz6l!(dzXHAreo~-$-)pu{Fdj%I_D%}-&*|^b~8zZ;yzU|z1l!CW(O?{<jl}*va
zCOL2>VrUO)`8swWSRhwye>{tu+T7#-jflg%=i6rrpYl2x)CxHqKv}BMK{Z;VvZ_R_
z2uTag#okDnI0B|j9dMOeG!9#W#Ad^3I&`nz!pUZD%@d9<T}jhG)rg?6Zbl-Ubkp&@
zj7oi(r}W}C5yb@SvDy-hqUeq4%&4ye8V{z+n;bE*H8!z=1hT_11?|M;#0s8*SV6X|
zi)c(;;uOJBXZ%R(<M#`aJ>Aos1rp(a8IN--^(rUE*_ULRQ|$PTToP`qpsa4oc=Y5l
uuyFvwb>w7qrOnc1-Yp0m7K-v2{|i45VwRd&#CnMU0000<MNUMnLSTZyq1V;`

literal 0
HcmV?d00001

diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
index 3690122da4..3a7ac1a532 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
@@ -18,6 +18,7 @@ import { DatabaseConnection, ConnectionsResource } from '../ConnectionsResource'
 import { ConnectionsAdministration } from './ConnectionsAdministration';
 import { ConnectionsDrawerItem } from './ConnectionsDrawerItem';
 import { Origin } from './ConnectionsTable/ConnectionDetailsInfo/Origin';
+import { SSH } from './ConnectionsTable/ConnectionDetailsInfo/SSH';
 import { Template } from './ConnectionsTable/ConnectionDetailsInfo/Template';
 import { CreateConnectionService } from './CreateConnectionService';
 
@@ -65,6 +66,7 @@ export class ConnectionsAdministrationService extends Bootstrap {
     });
     this.connectionDetailsPlaceholder.add(Origin, 0);
     this.connectionDetailsPlaceholder.add(Template, 1);
+    this.connectionDetailsPlaceholder.add(SSH, 2);
   }
 
   load(): void | Promise<void> { }
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
new file mode 100644
index 0000000000..7049aa957c
--- /dev/null
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
@@ -0,0 +1,35 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2021 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+import { observer } from 'mobx-react-lite';
+import styled from 'reshadow';
+
+import { StaticImage, useMapResource } from '@cloudbeaver/core-blocks';
+import { useTranslate } from '@cloudbeaver/core-localization';
+
+import { NetworkHandlerResource, SSH_TUNNEL_ID } from '../../../../NetworkHandlerResource';
+import type { DatabaseConnection } from '../../../ConnectionsResource';
+import { CONNECTION_DETAILS_STYLES } from './ConnectionDetailsStyles';
+
+interface Props {
+  context: DatabaseConnection;
+}
+
+export const SSH: React.FC<Props> = observer(function SSH({ context }) {
+  const translate = useTranslate();
+  const handler = useMapResource(NetworkHandlerResource, SSH_TUNNEL_ID);
+  const sshConfig = context.networkHandlersConfig.find(state => state.id === SSH_TUNNEL_ID);
+
+  if (!sshConfig || !sshConfig.enabled) {
+    return null;
+  }
+
+  return styled(CONNECTION_DETAILS_STYLES)(
+    <StaticImage icon='/icons/tunnel.png' title={translate(handler.data?.label || 'connections_network_handler_ssh_tunnel_title')} />
+  );
+});

From 99e4897d96241dc7ccb6c46716bf269c83f86f99 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Wed, 24 Feb 2021 15:22:26 +0300
Subject: [PATCH 2/2] feat(core-connections): CB-732 fix ssh icon name

---
 .../public/icons/{tunnel.png => ssh_tunnel.png}     | Bin
 .../ConnectionsTable/ConnectionDetailsInfo/SSH.tsx  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename webapp/packages/core-connections/public/icons/{tunnel.png => ssh_tunnel.png} (100%)

diff --git a/webapp/packages/core-connections/public/icons/tunnel.png b/webapp/packages/core-connections/public/icons/ssh_tunnel.png
similarity index 100%
rename from webapp/packages/core-connections/public/icons/tunnel.png
rename to webapp/packages/core-connections/public/icons/ssh_tunnel.png
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
index 7049aa957c..381f0654d4 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
@@ -30,6 +30,6 @@ export const SSH: React.FC<Props> = observer(function SSH({ context }) {
   }
 
   return styled(CONNECTION_DETAILS_STYLES)(
-    <StaticImage icon='/icons/tunnel.png' title={translate(handler.data?.label || 'connections_network_handler_ssh_tunnel_title')} />
+    <StaticImage icon='/icons/ssh_tunnel.png' title={translate(handler.data?.label || 'connections_network_handler_ssh_tunnel_title')} />
   );
 });