From cd8a285e67f606802f474b24a1dd5160f94fa8c3 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 10 Jun 2026 00:28:59 +0200
Subject: [PATCH 01/12] dbeaver/pro#9526 adds profile form base functionality

---
 webapp/packages/plugin-project-info/package.json               | 1 -
 .../src/ProjectInfoForm/ProjectInfoFormPanel.tsx               | 2 +-
 webapp/packages/plugin-project-info/tsconfig.json              | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/plugin-project-info/package.json b/webapp/packages/plugin-project-info/package.json
index 81fb76968d..695966b3e5 100644
--- a/webapp/packages/plugin-project-info/package.json
+++ b/webapp/packages/plugin-project-info/package.json
@@ -5,7 +5,6 @@
     "./lib/module.js",
     "./lib/index.js",
     "src/**/*.css",
-    "src/**/*.scss",
     "public/**/*"
   ],
   "version": "0.1.0",
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
index 278333bf92..fe03e9c9f2 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
@@ -20,7 +20,7 @@ export const ProjectInfoFormPanel = observer<IProjectInfoFormProps>(function Pro
     <TabsState container={service.parts} localState={formState.parts} formState={formState}>
       <div className="tw:flex tw:flex-col tw:flex-1 tw:h-full tw:overflow-auto theme-background-secondary theme-text-on-secondary">
         <div className="tw:relative tw:flex tw:items-end tw:border-b-2 theme-border-color-background theme-background-secondary theme-text-on-secondary">
-          <div className="tw:flex-1 tw:overflow-hidden tw:pt-2">
+          <div className="tw:flex-1 tw:overflow-hidden">
             <TabList disabled={formState.isDisabled} underline big />
           </div>
         </div>
diff --git a/webapp/packages/plugin-project-info/tsconfig.json b/webapp/packages/plugin-project-info/tsconfig.json
index df01b57d39..667cb149f8 100644
--- a/webapp/packages/plugin-project-info/tsconfig.json
+++ b/webapp/packages/plugin-project-info/tsconfig.json
@@ -54,8 +54,7 @@
     "__custom_mocks__/**/*",
     "src/**/*",
     "src/**/*.json",
-    "src/**/*.css",
-    "src/**/*.scss"
+    "src/**/*.css"
   ],
   "exclude": [
     "**/node_modules",

From 3277a78ac1d9a34532178ff19b9e80d497c5ef46 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 12 Jun 2026 14:38:13 +0200
Subject: [PATCH 02/12] dbeaver/pro#9526 adds profiles form

---
 .../src/getNetworkHandlerDefaultProperties.ts |  18 ++
 webapp/packages/core-connections/src/index.ts |   2 +
 .../core-connections/src/validateSSHConfig.ts |  40 +++++
 .../SSH/ConnectionFormSSHPart.ts              |  44 ++---
 .../src/ConnectionForm/SSH/SSH.tsx            | 158 +++---------------
 .../src/ConnectionForm/SSH/SSHForm.tsx        | 151 +++++++++++++++++
 .../packages/plugin-connections/src/index.ts  |   4 +
 7 files changed, 245 insertions(+), 172 deletions(-)
 create mode 100644 webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts
 create mode 100644 webapp/packages/core-connections/src/validateSSHConfig.ts
 create mode 100644 webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx

diff --git a/webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts b/webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts
new file mode 100644
index 0000000000..a5e74b7907
--- /dev/null
+++ b/webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts
@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 type { NetworkHandlerDescriptor } from '@cloudbeaver/core-sdk';
+
+export function getNetworkHandlerDefaultProperties(handler: NetworkHandlerDescriptor): Record<string, any> {
+  const properties: Record<string, any> = {};
+  for (const property of handler.properties) {
+    if (!property.features.includes('password')) {
+      properties[property.id!] = property.value;
+    }
+  }
+  return properties;
+}
diff --git a/webapp/packages/core-connections/src/index.ts b/webapp/packages/core-connections/src/index.ts
index 537beabf84..c270a6436b 100644
--- a/webapp/packages/core-connections/src/index.ts
+++ b/webapp/packages/core-connections/src/index.ts
@@ -59,6 +59,8 @@ export * from './DBDriverResource.js';
 export * from './CONNECTION_INFO_PARAM_SCHEMA.js';
 export * from './isJDBCConnection.js';
 export * from './NetworkHandlerResource.js';
+export * from './getNetworkHandlerDefaultProperties.js';
+export * from './validateSSHConfig.js';
 export * from './useConnectionInfo.js';
 export * from './useDBDriver.js';
 export * from './USER_NAME_PROPERTY_ID.js';
diff --git a/webapp/packages/core-connections/src/validateSSHConfig.ts b/webapp/packages/core-connections/src/validateSSHConfig.ts
new file mode 100644
index 0000000000..31ea3fccfd
--- /dev/null
+++ b/webapp/packages/core-connections/src/validateSSHConfig.ts
@@ -0,0 +1,40 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+
+export function validateSSHConfig(state: NetworkHandlerConfigInput, initialState?: NetworkHandlerConfigInput | null): string[] {
+  const errors: string[] = [];
+
+  if (!state.properties?.['host']?.length) {
+    errors.push("Field SSH 'Host' can't be empty");
+  }
+
+  const port = Number(state.properties?.['port']);
+  if (Number.isNaN(port) || port < 1) {
+    errors.push("Field SSH 'Port' can't be empty");
+  }
+
+  if (state.savePassword && !state.userName?.length) {
+    errors.push("Field SSH 'User' can't be empty");
+  }
+
+  const keyAuth = state.authType === NetworkHandlerAuthType.PublicKey;
+  const keySaved = initialState?.key === '';
+
+  if (keyAuth && state.savePassword && !keySaved && !state.key?.length) {
+    errors.push("Field SSH 'Private key' can't be empty");
+  }
+
+  const passwordSaved = initialState?.password === '' && initialState?.authType === state.authType;
+
+  if (!keyAuth && state.savePassword && !passwordSaved && !state.password?.length) {
+    errors.push("Field SSH 'Password' can't be empty");
+  }
+
+  return errors;
+}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
index 324f310686..fe390b3cd8 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
@@ -14,7 +14,13 @@ import {
   type NetworkHandlerConfigInput,
   type NetworkHandlerDescriptor,
 } from '@cloudbeaver/core-sdk';
-import { ConnectionInfoNetworkHandlersResource, NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
+import {
+  ConnectionInfoNetworkHandlersResource,
+  getNetworkHandlerDefaultProperties,
+  NetworkHandlerResource,
+  SSH_TUNNEL_ID,
+  validateSSHConfig,
+} from '@cloudbeaver/core-connections';
 import { toJS } from 'mobx';
 import type { IConnectionFormState } from '../IConnectionFormState.js';
 import type { INetworkHandlerConfig } from '../Options/IConnectionNetworkHanler.js';
@@ -94,17 +100,8 @@ export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConn
   }
 
   private copyInitialHandlerProperties(handlerDescriptor: NetworkHandlerDescriptor, state: INetworkHandlerConfig): void {
-    const properties: Record<string, any> = {};
-    if (handlerDescriptor) {
-      for (const property of handlerDescriptor.properties) {
-        if (!property.features.includes('password')) {
-          properties[property.id!] = property.value;
-        }
-      }
-    }
-
     state.properties = {
-      ...properties,
+      ...getNetworkHandlerDefaultProperties(handlerDescriptor),
       ...state.properties,
     };
   }
@@ -145,29 +142,8 @@ export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConn
       return;
     }
 
-    if (this.state.savePassword && !this.state.userName?.length) {
-      validation.error("Field SSH 'User' can't be empty");
-    }
-
-    if (!this.state.properties?.['host']?.length) {
-      validation.error("Field SSH 'Host' can't be empty");
-    }
-
-    const port = Number(this.state.properties?.['port']);
-    if (Number.isNaN(port) || port < 1) {
-      validation.error("Field SSH 'Port' can't be empty");
-    }
-
-    const keyAuth = this.state.authType === NetworkHandlerAuthType.PublicKey;
-    const keySaved = this.initialState?.key === '';
-    if (keyAuth && this.state.savePassword && !keySaved && !this.state.key?.length) {
-      validation.error("Field SSH 'Private key' can't be empty");
-    }
-
-    const passwordSaved = this.initialState?.password === '' && this.initialState?.authType === this.state.authType;
-
-    if (!keyAuth && this.state.savePassword && !passwordSaved && !this.state.password?.length) {
-      validation.error("Field SSH 'Password' can't be empty");
+    for (const error of validateSSHConfig(this.state, this.initialState)) {
+      validation.error(error);
     }
   }
 }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index fa52d2ce0b..664b7b215d 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -1,45 +1,24 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 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 { useCallback, useState } from 'react';
+import { useState } from 'react';
 
-import {
-  Button,
-  ColoredContainer,
-  Select,
-  Container,
-  Expandable,
-  FieldCheckbox,
-  Form,
-  Group,
-  GroupItem,
-  InputField,
-  s,
-  Switch,
-  useAdministrationSettings,
-  useAutoLoad,
-  useResource,
-  useS,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
-import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
-import { useService } from '@cloudbeaver/core-di';
-import { ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { ServerConfigResource } from '@cloudbeaver/core-root';
+import { Button, ColoredContainer, Form, Group, GroupItem, s, Switch, useAutoLoad, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+import { NetworkHandlerResource } from '@cloudbeaver/core-connections';
+import { useService } from '@cloudbeaver/core-di';
 import { useTab, type IFormState, type TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 
-import { authTypes } from './authTypes.js';
 import styles from './SSH.module.css';
-import { SSHKeyUploader } from './SSHKeyUploader.js';
-import type { IConnectionFormState } from '../IConnectionFormState.js';
 import { getConnectionFormSSHPart } from './getConnectionFormSSHPart.js';
 import { getConnectionFormOptionsPart } from '../Options/getConnectionFormOptionsPart.js';
+import { SSHForm } from './SSHForm.js';
+import type { IConnectionFormState } from '../IConnectionFormState.js';
 
 interface Props {
   handlerState: NetworkHandlerConfigInput;
@@ -49,18 +28,19 @@ interface Props {
 export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ formState, handlerState, tabId }) {
   const { selected } = useTab(tabId);
   const [loading, setLoading] = useState(false);
-  const { credentialsSavingEnabled } = useAdministrationSettings();
   const networkHandlerResource = useService(NetworkHandlerResource);
-  const serverConfigResource = useResource(SSH, ServerConfigResource, undefined, {
-    active: selected,
-  });
+
   const SSHPart = getConnectionFormSSHPart(formState);
+  const optionsPart = getConnectionFormOptionsPart(formState);
 
   async function testConnection() {
     setLoading(true);
     const config = SSHPart.getConfig();
-    await networkHandlerResource.test(config, formState.state.projectId, formState.state.connectionId);
-    setLoading(false);
+    try {
+      await networkHandlerResource.test(config, formState.state.projectId, formState.state.connectionId);
+    } finally {
+      setLoading(false);
+    }
   }
 
   const style = useS(styles);
@@ -70,19 +50,6 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
   const keyAuth = handlerState.authType === NetworkHandlerAuthType.PublicKey;
   const passwordFilled = (SSHPart.initialState?.password === null && handlerState.password !== '') || !!handlerState.password?.length;
   const testAvailable = keyAuth ? !!handlerState.key?.length : passwordFilled;
-  const passwordLabel = keyAuth ? 'Passphrase' : translate('connections_network_handler_ssh_tunnel_password');
-  const passwordSaved = SSHPart.initialState?.password === '' && SSHPart.initialState.authType === handlerState.authType;
-  const keySaved = SSHPart.initialState?.key === '';
-  const projectInfoResource = useService(ProjectInfoResource);
-  const isSharedProject = projectInfoResource.isProjectShared(formState.state.projectId);
-  const optionsPart = getConnectionFormOptionsPart(formState);
-
-  const aliveIntervalLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_alive_interval');
-  const connectTimeoutLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout');
-
-  const authTypeChangeHandler = useCallback(() => {
-    handlerState.password = '';
-  }, []);
 
   useAutoLoad(SSH, [SSHPart, optionsPart], selected);
 
@@ -93,99 +60,14 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
           <Switch id="ssh-enable-switch" name="enabled" state={handlerState} mod={['primary']} disabled={disabled}>
             {translate('connections_network_handler_ssh_tunnel_enable')}
           </Switch>
-          <Select
-            name="authType"
+          <SSHForm
             state={handlerState}
-            items={authTypes}
-            keySelector={value => value.key}
-            valueSelector={value => value.label}
+            initialState={SSHPart.initialState}
             disabled={disabled || !enabled}
-            tiny
-            onSelect={authTypeChangeHandler}
-          >
-            {translate('connections_network_handler_ssh_tunnel_auth_type')}
-          </Select>
-          <Container wrap gap>
-            <InputField type="text" name="host" state={handlerState.properties} autoComplete="on" readOnly={disabled || !enabled} required small>
-              {translate('connections_network_handler_ssh_tunnel_host')}
-            </InputField>
-            <InputField type="number" name="port" state={handlerState.properties} autoComplete="on" readOnly={disabled || !enabled} required tiny>
-              {translate('connections_network_handler_ssh_tunnel_port')}
-            </InputField>
-          </Container>
-          <Container wrap gap>
-            <InputField
-              type="text"
-              name="userName"
-              state={handlerState}
-              readOnly={disabled || !enabled}
-              required={handlerState.savePassword}
-              autoComplete="section-ssh-authentication username"
-              tiny
-              fill
-            >
-              {translate('connections_network_handler_ssh_tunnel_user')}
-            </InputField>
-            <InputField
-              type="password"
-              name="password"
-              autoComplete="section-ssh-authentication new-password"
-              state={handlerState}
-              readOnly={disabled || !enabled}
-              required={!passwordSaved && !keyAuth && handlerState.savePassword}
-              description={passwordSaved ? translate('ui_processing_saved') : undefined}
-              tiny
-              fill
-            >
-              {passwordLabel}
-            </InputField>
-            {keyAuth && <SSHKeyUploader state={handlerState} saved={keySaved} disabled={disabled || !enabled} readonly={formState.isReadOnly} />}
-          </Container>
-          {credentialsSavingEnabled && !optionsPart.state.sharedCredentials && (
-            <FieldCheckbox
-              id={SSH_TUNNEL_ID + '_savePassword'}
-              title={translate(
-                !isSharedProject || serverConfigResource.data?.distributed
-                  ? 'connections_connection_authentication_save_credentials_for_user_tooltip'
-                  : 'connections_connection_edit_save_credentials_shared_tooltip',
-              )}
-              name="savePassword"
-              state={handlerState}
-              disabled={disabled || !enabled}
-            >
-              {translate(
-                !isSharedProject || serverConfigResource.data?.distributed
-                  ? 'connections_connection_authentication_save_credentials_for_user'
-                  : 'connections_connection_edit_save_credentials_shared',
-              )}
-            </FieldCheckbox>
-          )}
-          <Container gap>
-            <Expandable label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}>
-              <Container gap>
-                <InputField
-                  type="number"
-                  name="aliveInterval"
-                  state={handlerState.properties}
-                  readOnly={disabled || !enabled}
-                  labelTooltip={aliveIntervalLabel}
-                  tiny
-                >
-                  {aliveIntervalLabel}
-                </InputField>
-                <InputField
-                  type="number"
-                  name="sshConnectTimeout"
-                  state={handlerState.properties}
-                  readOnly={disabled || !enabled}
-                  labelTooltip={connectTimeoutLabel}
-                  tiny
-                >
-                  {connectTimeoutLabel}
-                </InputField>
-              </Container>
-            </Expandable>
-          </Container>
+            readonly={formState.isReadOnly}
+            sharedCredentials={optionsPart.state.sharedCredentials}
+            projectId={formState.state.projectId}
+          />
           <GroupItem>
             <Button type="button" disabled={disabled || !enabled || !testAvailable} loader onClick={testConnection}>
               {translate('connections_network_handler_test')}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx
new file mode 100644
index 0000000000..0923b82aeb
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx
@@ -0,0 +1,151 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { useCallback } from 'react';
+
+import {
+  Container,
+  Expandable,
+  FieldCheckbox,
+  InputField,
+  Select,
+  useAdministrationSettings,
+  useResource,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
+import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+
+import { authTypes } from './authTypes.js';
+import { SSHKeyUploader } from './SSHKeyUploader.js';
+import { SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
+import { useService } from '@cloudbeaver/core-di';
+import { ProjectInfoResource } from '@cloudbeaver/core-projects';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
+
+export interface ISSHCredentialsSavingConfig {
+  enabled: boolean;
+  isSharedProject: boolean;
+  isDistributed: boolean;
+  checkboxId?: string;
+}
+
+export interface ISSHFormProps {
+  state: NetworkHandlerConfigInput;
+  initialState?: NetworkHandlerConfigInput | null;
+  disabled?: boolean;
+  readonly?: boolean;
+  sharedCredentials?: boolean;
+  projectId: string;
+}
+
+// TODO move it to a separate plugin so we can reuse it in admin part in the future without pulling with it extra dependencies
+export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initialState, disabled, readonly, sharedCredentials, projectId }) {
+  const translate = useTranslate();
+
+  const isDisabled = disabled || readonly;
+  const keyAuth = state.authType === NetworkHandlerAuthType.PublicKey;
+  const serverConfigResource = useResource(SSHForm, ServerConfigResource, undefined);
+
+  const passwordLabel = keyAuth ? 'Passphrase' : translate('connections_network_handler_ssh_tunnel_password');
+  const passwordSaved = initialState?.password === '' && initialState?.authType === state.authType;
+  const keySaved = initialState?.key === '';
+
+  const aliveIntervalLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_alive_interval');
+  const connectTimeoutLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout');
+  const { credentialsSavingEnabled } = useAdministrationSettings();
+  const projectInfoResource = useService(ProjectInfoResource);
+  const isSharedProject = projectInfoResource.isProjectShared(projectId);
+
+  const handleAuthTypeChange = useCallback(() => {
+    state.password = '';
+  }, [state]);
+
+  return (
+    <>
+      <Select
+        name="authType"
+        state={state}
+        items={authTypes}
+        keySelector={value => value.key}
+        valueSelector={value => value.label}
+        disabled={isDisabled}
+        tiny
+        onSelect={handleAuthTypeChange}
+      >
+        {translate('connections_network_handler_ssh_tunnel_auth_type')}
+      </Select>
+      <Container wrap gap>
+        <InputField type="text" name="host" state={state.properties} autoComplete="on" readOnly={isDisabled} required small>
+          {translate('connections_network_handler_ssh_tunnel_host')}
+        </InputField>
+        <InputField type="number" name="port" state={state.properties} autoComplete="on" readOnly={isDisabled} required tiny>
+          {translate('connections_network_handler_ssh_tunnel_port')}
+        </InputField>
+      </Container>
+      <Container wrap gap>
+        <InputField
+          type="text"
+          name="userName"
+          state={state}
+          readOnly={isDisabled}
+          required={state.savePassword}
+          autoComplete="section-ssh-authentication username"
+          tiny
+          fill
+        >
+          {translate('connections_network_handler_ssh_tunnel_user')}
+        </InputField>
+        <InputField
+          type="password"
+          name="password"
+          autoComplete="section-ssh-authentication new-password"
+          state={state}
+          readOnly={isDisabled}
+          required={!passwordSaved && !keyAuth && state.savePassword}
+          description={passwordSaved ? translate('ui_processing_saved') : undefined}
+          tiny
+          fill
+        >
+          {passwordLabel}
+        </InputField>
+        {keyAuth && <SSHKeyUploader state={state} saved={keySaved} disabled={isDisabled} readonly={readonly} />}
+      </Container>
+      {credentialsSavingEnabled && !sharedCredentials && (
+        <FieldCheckbox
+          id={SSH_TUNNEL_ID + '_savePassword'}
+          title={translate(
+            !isSharedProject || serverConfigResource.data?.distributed
+              ? 'connections_connection_authentication_save_credentials_for_user_tooltip'
+              : 'connections_connection_edit_save_credentials_shared_tooltip',
+          )}
+          name="savePassword"
+          state={state}
+          disabled={isDisabled}
+        >
+          {translate(
+            !isSharedProject || serverConfigResource.data?.distributed
+              ? 'connections_connection_authentication_save_credentials_for_user'
+              : 'connections_connection_edit_save_credentials_shared',
+          )}
+        </FieldCheckbox>
+      )}
+      <Container gap>
+        <Expandable label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}>
+          <Container gap>
+            <InputField type="number" name="aliveInterval" state={state.properties} readOnly={isDisabled} labelTooltip={aliveIntervalLabel} tiny>
+              {aliveIntervalLabel}
+            </InputField>
+            <InputField type="number" name="sshConnectTimeout" state={state.properties} readOnly={isDisabled} labelTooltip={connectTimeoutLabel} tiny>
+              {connectTimeoutLabel}
+            </InputField>
+          </Container>
+        </Expandable>
+      </Container>
+    </>
+  );
+});
diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts
index 141f1fc4d3..7fbda0524d 100644
--- a/webapp/packages/plugin-connections/src/index.ts
+++ b/webapp/packages/plugin-connections/src/index.ts
@@ -13,6 +13,10 @@ export * from './ConnectionAuthentication/ConnectionAuthenticationFormLoader.js'
 export * from './ConnectionForm/Options/ConnectionOptionsTabService.js';
 export * from './ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.js';
 export * from './ConnectionForm/SSH/ConnectionSSHTabService.js';
+export * from './ConnectionForm/Options/IConnectionNetworkHanler.js';
+export * from './ConnectionForm/SSH/SSHForm.js';
+export * from './ConnectionForm/SSH/SSHKeyUploader.js';
+export * from './ConnectionForm/SSH/authTypes.js';
 export * from './ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.js';
 export * from './ConnectionForm/ConnectionFormBaseActionsLoader.js';
 export * from './ConnectionForm/ConnectionFormLoader.js';

From 2257341aacabecd2d593f690806b3880323755c9 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 12 Jun 2026 17:39:56 +0200
Subject: [PATCH 03/12] dbeaver/pro#9526 moves SSHForm to
 connection-network-handlers to reuse it for admin settings in future without
 extra deps

---
 .../core-connections/src/locales/de.ts        |  4 --
 .../core-connections/src/locales/en.ts        |  9 ----
 .../core-connections/src/locales/fr.ts        |  9 ----
 .../core-connections/src/locales/it.ts        |  9 ----
 .../core-connections/src/locales/ru.ts        |  9 ----
 .../core-connections/src/locales/vi.ts        |  9 ----
 .../core-connections/src/locales/zh.ts        |  9 ----
 .../package.json                              | 47 ++++++++++++++++
 .../src/LocaleService.ts                      | 39 ++++++++++++++
 ...luginConnectionNetworkHandlersBootstrap.ts | 18 +++++++
 .../src}/SSHForm.tsx                          | 25 +++++----
 .../src}/SSHKeyUploader.tsx                   |  2 +-
 .../src}/authTypes.ts                         |  0
 .../src/index.ts                              | 13 +++++
 .../src/locales/de.ts                         | 23 ++++++++
 .../src/locales/en.ts                         | 26 +++++++++
 .../src/locales/fr.ts                         | 23 ++++++++
 .../src/locales/it.ts                         | 23 ++++++++
 .../src/locales/ru.ts                         | 23 ++++++++
 .../src/locales/vi.ts                         | 23 ++++++++
 .../src/locales/zh.ts                         | 23 ++++++++
 .../src/module.ts                             | 13 +++++
 .../tsconfig.json                             | 54 +++++++++++++++++++
 .../packages/plugin-connections/package.json  |  1 +
 .../NetworkHandlerAuthForm.tsx                |  2 +-
 .../src/ConnectionForm/SSH/SSH.tsx            |  2 +-
 .../packages/plugin-connections/src/index.ts  |  3 --
 .../packages/plugin-connections/tsconfig.json |  3 ++
 .../packages/plugin-set-common/package.json   |  1 +
 .../packages/plugin-set-common/src/index.ts   |  2 +
 .../packages/plugin-set-common/tsconfig.json  |  3 ++
 webapp/yarn.lock                              | 28 ++++++++++
 32 files changed, 401 insertions(+), 77 deletions(-)
 create mode 100644 webapp/packages/plugin-connection-network-handlers/package.json
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/LocaleService.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts
 rename webapp/packages/{plugin-connections/src/ConnectionForm/SSH => plugin-connection-network-handlers/src}/SSHForm.tsx (79%)
 rename webapp/packages/{plugin-connections/src/ConnectionForm/SSH => plugin-connection-network-handlers/src}/SSHKeyUploader.tsx (95%)
 rename webapp/packages/{plugin-connections/src/ConnectionForm/SSH => plugin-connection-network-handlers/src}/authTypes.ts (100%)
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/index.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/de.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/en.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/fr.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/it.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/ru.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/vi.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/locales/zh.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/module.ts
 create mode 100644 webapp/packages/plugin-connection-network-handlers/tsconfig.json

diff --git a/webapp/packages/core-connections/src/locales/de.ts b/webapp/packages/core-connections/src/locales/de.ts
index 963de89116..5b2c1936fb 100644
--- a/webapp/packages/core-connections/src/locales/de.ts
+++ b/webapp/packages/core-connections/src/locales/de.ts
@@ -38,10 +38,6 @@ export default [
   ['connections_connection_test_fail', 'Verbindungstest ist fehlgeschlagen'],
   ['connections_network_handler_default_user', 'Benutzer'],
   ['connections_network_handler_default_password', 'Passwort'],
-  ['connections_network_handler_ssh_tunnel_user', 'Benutzer'],
-  ['connections_network_handler_ssh_tunnel_password', 'Passwort'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Authentifizierungsmethode'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Erweiterte Einstellungen'],
   ['connections_not_found', 'Es wurden keine Datenbankverbindungen gefunden'],
 
   ['core_connections_settings_disable', 'Disable'],
diff --git a/webapp/packages/core-connections/src/locales/en.ts b/webapp/packages/core-connections/src/locales/en.ts
index d72526c95a..a4b4fe4d80 100644
--- a/webapp/packages/core-connections/src/locales/en.ts
+++ b/webapp/packages/core-connections/src/locales/en.ts
@@ -59,15 +59,6 @@ export default [
   ['connections_network_handler_default_password', 'Password'],
   ['connections_network_handler_ssh_tunnel_title', 'SSH Tunnel'],
   ['connections_network_handler_ssh_tunnel_enable', 'Use SSH Tunnel'],
-  ['connections_network_handler_ssh_tunnel_host', 'Host'],
-  ['connections_network_handler_ssh_tunnel_port', 'Port'],
-  ['connections_network_handler_ssh_tunnel_user', 'User'],
-  ['connections_network_handler_ssh_tunnel_password', 'Password'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Authentication method'],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Private Key'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Advanced Settings'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Alive interval (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Connect timeout (ms)'],
   ['connections_driver_search_placeholder', 'Type driver name...'],
   ['connections_not_found', 'No database connections were found'],
 
diff --git a/webapp/packages/core-connections/src/locales/fr.ts b/webapp/packages/core-connections/src/locales/fr.ts
index 9dca6d2428..91a8cf708f 100644
--- a/webapp/packages/core-connections/src/locales/fr.ts
+++ b/webapp/packages/core-connections/src/locales/fr.ts
@@ -64,15 +64,6 @@ export default [
   ['connections_network_handler_default_password', 'Mot de passe'],
   ['connections_network_handler_ssh_tunnel_title', 'Tunnel SSH'],
   ['connections_network_handler_ssh_tunnel_enable', 'Utiliser le tunnel SSH'],
-  ['connections_network_handler_ssh_tunnel_host', 'Hôte'],
-  ['connections_network_handler_ssh_tunnel_port', 'Port'],
-  ['connections_network_handler_ssh_tunnel_user', 'Utilisateur'],
-  ['connections_network_handler_ssh_tunnel_password', 'Mot de passe'],
-  ['connections_network_handler_ssh_tunnel_auth_type', "Méthode d'authentification"],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Clé privée'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Paramètres avancés'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Intervalle de maintien en vie (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Délai de connexion (ms)'],
   ['connections_driver_search_placeholder', 'Saisir le nom du pilote...'],
   ['connections_not_found', 'Aucune connexion de base de données trouvée'],
 
diff --git a/webapp/packages/core-connections/src/locales/it.ts b/webapp/packages/core-connections/src/locales/it.ts
index 7f2bd972ab..c32d583e7d 100644
--- a/webapp/packages/core-connections/src/locales/it.ts
+++ b/webapp/packages/core-connections/src/locales/it.ts
@@ -57,15 +57,6 @@ export default [
   ['connections_network_handler_default_password', 'Password'],
   ['connections_network_handler_ssh_tunnel_title', 'Tunnel SSH'],
   ['connections_network_handler_ssh_tunnel_enable', 'Usa il Tunnel SSH'],
-  ['connections_network_handler_ssh_tunnel_host', 'Host'],
-  ['connections_network_handler_ssh_tunnel_port', 'Porta'],
-  ['connections_network_handler_ssh_tunnel_user', 'Utente'],
-  ['connections_network_handler_ssh_tunnel_password', 'Password'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Authentication method'],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Private key'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Advanced Settings'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Alive interval (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Connect timeout (ms)'],
   ['connections_driver_search_placeholder', 'Digita il nome del driver...'],
   ['connections_not_found', 'Nessuna connessione al database trovata'],
 
diff --git a/webapp/packages/core-connections/src/locales/ru.ts b/webapp/packages/core-connections/src/locales/ru.ts
index 76b631b8f9..e37352e328 100644
--- a/webapp/packages/core-connections/src/locales/ru.ts
+++ b/webapp/packages/core-connections/src/locales/ru.ts
@@ -68,15 +68,6 @@ export default [
   ['connections_network_handler_default_password', 'Пароль'],
   ['connections_network_handler_ssh_tunnel_title', 'SSH Тунель'],
   ['connections_network_handler_ssh_tunnel_enable', 'Использовать SSH Тунель'],
-  ['connections_network_handler_ssh_tunnel_host', 'Хост'],
-  ['connections_network_handler_ssh_tunnel_port', 'Порт'],
-  ['connections_network_handler_ssh_tunnel_user', 'Пользователь'],
-  ['connections_network_handler_ssh_tunnel_password', 'Пароль'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Метод аутентификации'],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Приватный ключ'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Дополнительные настройки'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Интервал keep-alive (мс)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Тайм-аут подключения (мс)'],
   ['connections_driver_search_placeholder', 'Введите название драйвера...'],
   ['connections_not_found', 'Подключения к базам данных не найдены'],
 
diff --git a/webapp/packages/core-connections/src/locales/vi.ts b/webapp/packages/core-connections/src/locales/vi.ts
index eab661ccfe..d687e2ee9f 100644
--- a/webapp/packages/core-connections/src/locales/vi.ts
+++ b/webapp/packages/core-connections/src/locales/vi.ts
@@ -74,15 +74,6 @@ export default [
   ['connections_network_handler_default_password', 'Mật khẩu'],
   ['connections_network_handler_ssh_tunnel_title', 'Tunnel SSH'],
   ['connections_network_handler_ssh_tunnel_enable', 'Sử dụng Tunnel SSH'],
-  ['connections_network_handler_ssh_tunnel_host', 'Máy chủ'],
-  ['connections_network_handler_ssh_tunnel_port', 'Cổng'],
-  ['connections_network_handler_ssh_tunnel_user', 'Người dùng'],
-  ['connections_network_handler_ssh_tunnel_password', 'Mật khẩu'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Phương thức xác thực'],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Khóa riêng'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Cài đặt nâng cao'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Khoảng thời gian giữ kết nối (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Thời gian chờ kết nối (ms)'],
   ['connections_driver_search_placeholder', 'Nhập tên trình điều khiển (driver)...'],
   ['connections_not_found', 'Không tìm thấy kết nối cơ sở dữ liệu'],
   [
diff --git a/webapp/packages/core-connections/src/locales/zh.ts b/webapp/packages/core-connections/src/locales/zh.ts
index f009d1d178..ea17a34fdb 100644
--- a/webapp/packages/core-connections/src/locales/zh.ts
+++ b/webapp/packages/core-connections/src/locales/zh.ts
@@ -51,15 +51,6 @@ export default [
   ['connections_network_handler_default_password', '密码'],
   ['connections_network_handler_ssh_tunnel_title', 'SSH隧道'],
   ['connections_network_handler_ssh_tunnel_enable', '使用SSH隧道'],
-  ['connections_network_handler_ssh_tunnel_host', '主机'],
-  ['connections_network_handler_ssh_tunnel_port', '端口'],
-  ['connections_network_handler_ssh_tunnel_user', '用户'],
-  ['connections_network_handler_ssh_tunnel_password', '密码'],
-  ['connections_network_handler_ssh_tunnel_auth_type', '认证方式'],
-  ['connections_network_handler_ssh_tunnel_private_key', '私钥'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', '高级设置'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', '活动间隔 (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', '连接超时 (ms)'],
   ['connections_driver_search_placeholder', '输入驱动名称...'],
   ['connections_not_found', '未找到数据库连接'],
 
diff --git a/webapp/packages/plugin-connection-network-handlers/package.json b/webapp/packages/plugin-connection-network-handlers/package.json
new file mode 100644
index 0000000000..981850ad81
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@cloudbeaver/plugin-connection-network-handlers",
+  "type": "module",
+  "sideEffects": [
+    "./lib/module.js",
+    "./lib/index.js",
+    "src/**/*.css",
+    "public/**/*"
+  ],
+  "version": "0.1.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "exports": {
+    ".": "./lib/index.js",
+    "./module": "./lib/module.js"
+  },
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rimraf --glob lib",
+    "lint": "eslint ./src/ --ext .ts,.tsx",
+    "test": "dbeaver-test",
+    "validate-dependencies": "core-cli-validate-dependencies"
+  },
+  "dependencies": {
+    "@cloudbeaver/core-blocks": "workspace:*",
+    "@cloudbeaver/core-connections": "workspace:*",
+    "@cloudbeaver/core-di": "workspace:*",
+    "@cloudbeaver/core-localization": "workspace:*",
+    "@cloudbeaver/core-projects": "workspace:*",
+    "@cloudbeaver/core-root": "workspace:*",
+    "@cloudbeaver/core-sdk": "workspace:*",
+    "@cloudbeaver/core-utils": "workspace:*",
+    "mobx": "^6",
+    "mobx-react-lite": "^4",
+    "react": "^19",
+    "react-dom": "^19"
+  },
+  "devDependencies": {
+    "@cloudbeaver/core-cli": "workspace:*",
+    "@cloudbeaver/tsconfig": "workspace:*",
+    "@dbeaver/cli": "workspace:*",
+    "@types/react": "^19",
+    "rimraf": "^6",
+    "tslib": "^2",
+    "typescript": "^5"
+  }
+}
diff --git a/webapp/packages/plugin-connection-network-handlers/src/LocaleService.ts b/webapp/packages/plugin-connection-network-handlers/src/LocaleService.ts
new file mode 100644
index 0000000000..888ca00103
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/LocaleService.ts
@@ -0,0 +1,39 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { LocalizationService } from '@cloudbeaver/core-localization';
+
+@injectable(() => [LocalizationService])
+export class LocaleService extends Bootstrap {
+  constructor(private readonly localizationService: LocalizationService) {
+    super();
+  }
+
+  override register(): void {
+    this.localizationService.addProvider(this.provider.bind(this));
+  }
+
+  private async provider(locale: string) {
+    switch (locale) {
+      case 'ru':
+        return (await import('./locales/ru.js')).default;
+      case 'de':
+        return (await import('./locales/de.js')).default;
+      case 'it':
+        return (await import('./locales/it.js')).default;
+      case 'zh':
+        return (await import('./locales/zh.js')).default;
+      case 'fr':
+        return (await import('./locales/fr.js')).default;
+      case 'vi':
+        return (await import('./locales/vi.js')).default;
+      default:
+        return (await import('./locales/en.js')).default;
+    }
+  }
+}
diff --git a/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts b/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts
new file mode 100644
index 0000000000..1a9bbc2887
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts
@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { Bootstrap, injectable } from '@cloudbeaver/core-di';
+
+@injectable()
+export class PluginConnectionNetworkHandlersBootstrap extends Bootstrap {
+  constructor() {
+    super();
+  }
+
+  override register() {}
+}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx
similarity index 79%
rename from webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx
rename to webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx
index 0923b82aeb..f39dfec0af 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHForm.tsx
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx
@@ -43,7 +43,6 @@ export interface ISSHFormProps {
   projectId: string;
 }
 
-// TODO move it to a separate plugin so we can reuse it in admin part in the future without pulling with it extra dependencies
 export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initialState, disabled, readonly, sharedCredentials, projectId }) {
   const translate = useTranslate();
 
@@ -51,12 +50,12 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
   const keyAuth = state.authType === NetworkHandlerAuthType.PublicKey;
   const serverConfigResource = useResource(SSHForm, ServerConfigResource, undefined);
 
-  const passwordLabel = keyAuth ? 'Passphrase' : translate('connections_network_handler_ssh_tunnel_password');
+  const passwordLabel = keyAuth ? 'Passphrase' : translate('plugin_connection_network_handlers_ssh_tunnel_password');
   const passwordSaved = initialState?.password === '' && initialState?.authType === state.authType;
   const keySaved = initialState?.key === '';
 
-  const aliveIntervalLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_alive_interval');
-  const connectTimeoutLabel = translate('connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout');
+  const aliveIntervalLabel = translate('plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval');
+  const connectTimeoutLabel = translate('plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout');
   const { credentialsSavingEnabled } = useAdministrationSettings();
   const projectInfoResource = useService(ProjectInfoResource);
   const isSharedProject = projectInfoResource.isProjectShared(projectId);
@@ -77,14 +76,14 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
         tiny
         onSelect={handleAuthTypeChange}
       >
-        {translate('connections_network_handler_ssh_tunnel_auth_type')}
+        {translate('plugin_connection_network_handlers_ssh_tunnel_auth_type')}
       </Select>
       <Container wrap gap>
         <InputField type="text" name="host" state={state.properties} autoComplete="on" readOnly={isDisabled} required small>
-          {translate('connections_network_handler_ssh_tunnel_host')}
+          {translate('plugin_connection_network_handlers_ssh_tunnel_host')}
         </InputField>
         <InputField type="number" name="port" state={state.properties} autoComplete="on" readOnly={isDisabled} required tiny>
-          {translate('connections_network_handler_ssh_tunnel_port')}
+          {translate('plugin_connection_network_handlers_ssh_tunnel_port')}
         </InputField>
       </Container>
       <Container wrap gap>
@@ -98,7 +97,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
           tiny
           fill
         >
-          {translate('connections_network_handler_ssh_tunnel_user')}
+          {translate('plugin_connection_network_handlers_ssh_tunnel_user')}
         </InputField>
         <InputField
           type="password"
@@ -120,8 +119,8 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
           id={SSH_TUNNEL_ID + '_savePassword'}
           title={translate(
             !isSharedProject || serverConfigResource.data?.distributed
-              ? 'connections_connection_authentication_save_credentials_for_user_tooltip'
-              : 'connections_connection_edit_save_credentials_shared_tooltip',
+              ? 'plugin_connection_network_handlers_save_credentials_for_user_tooltip'
+              : 'plugin_connection_network_handlers_save_credentials_shared_tooltip',
           )}
           name="savePassword"
           state={state}
@@ -129,13 +128,13 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
         >
           {translate(
             !isSharedProject || serverConfigResource.data?.distributed
-              ? 'connections_connection_authentication_save_credentials_for_user'
-              : 'connections_connection_edit_save_credentials_shared',
+              ? 'plugin_connection_network_handlers_save_credentials_for_user'
+              : 'plugin_connection_network_handlers_save_credentials_shared',
           )}
         </FieldCheckbox>
       )}
       <Container gap>
-        <Expandable label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}>
+        <Expandable label={translate('plugin_connection_network_handlers_ssh_tunnel_advanced_settings')}>
           <Container gap>
             <InputField type="number" name="aliveInterval" state={state.properties} readOnly={isDisabled} labelTooltip={aliveIntervalLabel} tiny>
               {aliveIntervalLabel}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSHKeyUploader.tsx
similarity index 95%
rename from webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx
rename to webapp/packages/plugin-connection-network-handlers/src/SSHKeyUploader.tsx
index c84af42db1..9cb7d6f5ad 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSHKeyUploader.tsx
@@ -48,7 +48,7 @@ export const SSHKeyUploader = observer<Props>(function SSHKeyUploader({ state, s
         required={state.savePassword && !saved}
         medium
       >
-        {translate('connections_network_handler_ssh_tunnel_private_key')}
+        {translate('plugin_connection_network_handlers_ssh_tunnel_private_key')}
       </Textarea>
       <GroupItem>
         <UploadArea disabled={disabled || readonly} reset onChange={handleKeyUpload}>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts b/webapp/packages/plugin-connection-network-handlers/src/authTypes.ts
similarity index 100%
rename from webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts
rename to webapp/packages/plugin-connection-network-handlers/src/authTypes.ts
diff --git a/webapp/packages/plugin-connection-network-handlers/src/index.ts b/webapp/packages/plugin-connection-network-handlers/src/index.ts
new file mode 100644
index 0000000000..e8b3932e76
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/index.ts
@@ -0,0 +1,13 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 './module.js';
+
+export * from './SSHForm.js';
+export * from './SSHKeyUploader.js';
+export * from './authTypes.js';
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/de.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/de.ts
new file mode 100644
index 0000000000..18eec516eb
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/de.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', 'Authentifizierungsmethode'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Host'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Port'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'Benutzer'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Passwort'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Privater Schlüssel'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Erweiterte Einstellungen'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Keep-alive-Intervall (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Verbindungs-Timeout (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Zugangsdaten für den aktuellen Benutzer speichern'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'Diese Zugangsdaten werden für die automatische Verbindung verwendet'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Zugangsdaten für alle Benutzer mit Zugriff speichern'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', 'Diese Zugangsdaten werden für die automatische Verbindung für alle Benutzer mit Zugriff verwendet'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/en.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/en.ts
new file mode 100644
index 0000000000..e2a396562e
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/en.ts
@@ -0,0 +1,26 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', 'Authentication method'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Host'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Port'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'User'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Password'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Private Key'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Advanced Settings'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Alive interval (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Connect timeout (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Save credentials for the current user'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'These credentials will be used to make automatic connection'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Save credentials for all users with access'],
+  [
+    'plugin_connection_network_handlers_save_credentials_shared_tooltip',
+    'These credentials will be used to make automatic connection for all users having access',
+  ],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/fr.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/fr.ts
new file mode 100644
index 0000000000..1063fdd03d
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/fr.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', "Méthode d'authentification"],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Hôte'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Port'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'Utilisateur'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Mot de passe'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Clé privée'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Paramètres avancés'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Intervalle de maintien en vie (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Délai de connexion (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Enregistrer les identifiants pour l\'utilisateur actuel'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'Ces identifiants seront utilisés pour établir une connexion automatique'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Enregistrer les identifiants pour tous les utilisateurs ayant accès'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', 'Ces identifiants seront utilisés pour établir une connexion automatique pour tous les utilisateurs ayant accès'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/it.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/it.ts
new file mode 100644
index 0000000000..231f8f0e1f
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/it.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', 'Metodo di autenticazione'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Host'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Porta'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'Utente'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Password'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Chiave privata'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Impostazioni avanzate'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Intervallo keep-alive (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Timeout connessione (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Salva le credenziali per l\'utente corrente'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'Queste credenziali verranno utilizzate per la connessione automatica'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Salva le credenziali per tutti gli utenti con accesso'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', 'Queste credenziali verranno utilizzate per la connessione automatica per tutti gli utenti con accesso'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/ru.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/ru.ts
new file mode 100644
index 0000000000..cd265fadd5
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/ru.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', 'Метод аутентификации'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Хост'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Порт'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'Пользователь'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Пароль'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Приватный ключ'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Дополнительные настройки'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Интервал keep-alive (мс)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Тайм-аут подключения (мс)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Сохранить данные для текущего пользователя'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'Эти учетные данные будут использоваться для автоматического подключения'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Запомнить данные для всех пользователей с доступом'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', 'Эти учетные данные будут использоваться для автоматического подключения для всех пользователей с доступом'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/vi.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/vi.ts
new file mode 100644
index 0000000000..50ff52cb5c
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/vi.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', 'Phương thức xác thực'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', 'Máy chủ'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', 'Cổng'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', 'Người dùng'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', 'Mật khẩu'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', 'Khóa riêng'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', 'Cài đặt nâng cao'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', 'Khoảng thời gian giữ kết nối (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', 'Thời gian chờ kết nối (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', 'Lưu thông tin xác thực cho người dùng hiện tại'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', 'Thông tin xác thực này sẽ được sử dụng để kết nối tự động'],
+  ['plugin_connection_network_handlers_save_credentials_shared', 'Lưu thông tin xác thực cho tất cả người dùng có quyền truy cập'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', 'Thông tin xác thực này sẽ được sử dụng để kết nối tự động cho tất cả người dùng có quyền truy cập'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/locales/zh.ts b/webapp/packages/plugin-connection-network-handlers/src/locales/zh.ts
new file mode 100644
index 0000000000..cfa7d2687b
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/locales/zh.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export default [
+  ['plugin_connection_network_handlers_ssh_tunnel_auth_type', '认证方式'],
+  ['plugin_connection_network_handlers_ssh_tunnel_host', '主机'],
+  ['plugin_connection_network_handlers_ssh_tunnel_port', '端口'],
+  ['plugin_connection_network_handlers_ssh_tunnel_user', '用户'],
+  ['plugin_connection_network_handlers_ssh_tunnel_password', '密码'],
+  ['plugin_connection_network_handlers_ssh_tunnel_private_key', '私钥'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings', '高级设置'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_alive_interval', '活动间隔 (ms)'],
+  ['plugin_connection_network_handlers_ssh_tunnel_advanced_settings_connect_timeout', '连接超时 (ms)'],
+  ['plugin_connection_network_handlers_save_credentials_for_user', '为当前用户保存凭证'],
+  ['plugin_connection_network_handlers_save_credentials_for_user_tooltip', '凭证将用于自动连接数据库'],
+  ['plugin_connection_network_handlers_save_credentials_shared', '为所有访问用户保存凭证'],
+  ['plugin_connection_network_handlers_save_credentials_shared_tooltip', '凭证将用于为所有访问用户自动连接数据库'],
+];
diff --git a/webapp/packages/plugin-connection-network-handlers/src/module.ts b/webapp/packages/plugin-connection-network-handlers/src/module.ts
new file mode 100644
index 0000000000..13e3194844
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/module.ts
@@ -0,0 +1,13 @@
+import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di';
+import { LocaleService } from './LocaleService.js';
+import { PluginConnectionNetworkHandlersBootstrap } from './PluginConnectionNetworkHandlersBootstrap.js';
+
+export default ModuleRegistry.add({
+  name: '@cloudbeaver/plugin-connection-network-handlers',
+
+  configure: serviceCollection => {
+    serviceCollection
+      .addSingleton(Bootstrap, LocaleService)
+      .addSingleton(Bootstrap, PluginConnectionNetworkHandlersBootstrap);
+  },
+});
\ No newline at end of file
diff --git a/webapp/packages/plugin-connection-network-handlers/tsconfig.json b/webapp/packages/plugin-connection-network-handlers/tsconfig.json
new file mode 100644
index 0000000000..7d4ce6fe97
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/tsconfig.json
@@ -0,0 +1,54 @@
+{
+  "extends": "@cloudbeaver/tsconfig/tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib",
+    "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo",
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../common-typescript/@dbeaver/cli"
+    },
+    {
+      "path": "../core-blocks"
+    },
+    {
+      "path": "../core-cli"
+    },
+    {
+      "path": "../core-connections"
+    },
+    {
+      "path": "../core-di"
+    },
+    {
+      "path": "../core-di/tsconfig.json"
+    },
+    {
+      "path": "../core-localization"
+    },
+    {
+      "path": "../core-projects"
+    },
+    {
+      "path": "../core-root"
+    },
+    {
+      "path": "../core-sdk"
+    },
+    {
+      "path": "../core-utils"
+    }
+  ],
+  "include": [
+    "__custom_mocks__/**/*",
+    "src/**/*",
+    "src/**/*.json",
+    "src/**/*.css"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "lib/**/*"
+  ]
+}
diff --git a/webapp/packages/plugin-connections/package.json b/webapp/packages/plugin-connections/package.json
index c86ef66330..f6ed1326d9 100644
--- a/webapp/packages/plugin-connections/package.json
+++ b/webapp/packages/plugin-connections/package.json
@@ -42,6 +42,7 @@
     "@cloudbeaver/core-utils": "workspace:*",
     "@cloudbeaver/core-view": "workspace:*",
     "@cloudbeaver/plugin-authentication": "workspace:*",
+    "@cloudbeaver/plugin-connection-network-handlers": "workspace:*",
     "@cloudbeaver/plugin-navigation-tree": "workspace:*",
     "@cloudbeaver/plugin-projects": "workspace:*",
     "@cloudbeaver/plugin-top-app-bar": "workspace:*",
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
index 854b976c59..be7f1924e8 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
@@ -14,7 +14,7 @@ import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 
-import { SSHKeyUploader } from '../ConnectionForm/SSH/SSHKeyUploader.js';
+import { SSHKeyUploader } from '@cloudbeaver/plugin-connection-network-handlers';
 import { PROPERTY_FEATURE_SECURED } from '../ConnectionForm/SSL/PROPERTY_FEATURE_SECURED.js';
 
 interface Props {
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 664b7b215d..31d4005743 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -17,7 +17,7 @@ import { useTab, type IFormState, type TabContainerPanelComponent } from '@cloud
 import styles from './SSH.module.css';
 import { getConnectionFormSSHPart } from './getConnectionFormSSHPart.js';
 import { getConnectionFormOptionsPart } from '../Options/getConnectionFormOptionsPart.js';
-import { SSHForm } from './SSHForm.js';
+import { SSHForm } from '@cloudbeaver/plugin-connection-network-handlers';
 import type { IConnectionFormState } from '../IConnectionFormState.js';
 
 interface Props {
diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts
index 7fbda0524d..98f6225da8 100644
--- a/webapp/packages/plugin-connections/src/index.ts
+++ b/webapp/packages/plugin-connections/src/index.ts
@@ -14,9 +14,6 @@ export * from './ConnectionForm/Options/ConnectionOptionsTabService.js';
 export * from './ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.js';
 export * from './ConnectionForm/SSH/ConnectionSSHTabService.js';
 export * from './ConnectionForm/Options/IConnectionNetworkHanler.js';
-export * from './ConnectionForm/SSH/SSHForm.js';
-export * from './ConnectionForm/SSH/SSHKeyUploader.js';
-export * from './ConnectionForm/SSH/authTypes.js';
 export * from './ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.js';
 export * from './ConnectionForm/ConnectionFormBaseActionsLoader.js';
 export * from './ConnectionForm/ConnectionFormLoader.js';
diff --git a/webapp/packages/plugin-connections/tsconfig.json b/webapp/packages/plugin-connections/tsconfig.json
index 79a75a5163..85a9890d5b 100644
--- a/webapp/packages/plugin-connections/tsconfig.json
+++ b/webapp/packages/plugin-connections/tsconfig.json
@@ -79,6 +79,9 @@
     {
       "path": "../plugin-authentication"
     },
+    {
+      "path": "../plugin-connection-network-handlers"
+    },
     {
       "path": "../plugin-navigation-tree"
     },
diff --git a/webapp/packages/plugin-set-common/package.json b/webapp/packages/plugin-set-common/package.json
index e081437df8..6466fbfc0b 100644
--- a/webapp/packages/plugin-set-common/package.json
+++ b/webapp/packages/plugin-set-common/package.json
@@ -64,6 +64,7 @@
     "@cloudbeaver/plugin-browser": "workspace:*",
     "@cloudbeaver/plugin-codemirror6": "workspace:*",
     "@cloudbeaver/plugin-connection-custom": "workspace:*",
+    "@cloudbeaver/plugin-connection-network-handlers": "workspace:*",
     "@cloudbeaver/plugin-connection-preferences": "workspace:*",
     "@cloudbeaver/plugin-connection-search": "workspace:*",
     "@cloudbeaver/plugin-connection-view": "workspace:*",
diff --git a/webapp/packages/plugin-set-common/src/index.ts b/webapp/packages/plugin-set-common/src/index.ts
index 33b622b038..72d42b7c64 100644
--- a/webapp/packages/plugin-set-common/src/index.ts
+++ b/webapp/packages/plugin-set-common/src/index.ts
@@ -40,6 +40,7 @@ import coreSupport from '@cloudbeaver/core-support/module';
 import coreView from '@cloudbeaver/core-view/module';
 import coreServerNotifications from '@cloudbeaver/core-server-notifications/module';
 import coreSessionActions from '@cloudbeaver/core-session-actions/module';
+import pluginConnectionNetworkHandlers from '@cloudbeaver/plugin-connection-network-handlers/module';
 
 import pluginAdministration from '@cloudbeaver/plugin-administration/module';
 import pluginAppLogo from '@cloudbeaver/plugin-app-logo/module';
@@ -225,4 +226,5 @@ export const commonSet = [
   pluginConnectionView,
   pluginConnectionPreferences,
   pluginProjectInfo,
+  pluginConnectionNetworkHandlers,
 ];
diff --git a/webapp/packages/plugin-set-common/tsconfig.json b/webapp/packages/plugin-set-common/tsconfig.json
index 2d5941ff64..7faa0785cc 100644
--- a/webapp/packages/plugin-set-common/tsconfig.json
+++ b/webapp/packages/plugin-set-common/tsconfig.json
@@ -139,6 +139,9 @@
     {
       "path": "../plugin-connection-custom"
     },
+    {
+      "path": "../plugin-connection-network-handlers"
+    },
     {
       "path": "../plugin-connection-preferences"
     },
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5d638f4282..23a3cf7593 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2691,6 +2691,32 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@cloudbeaver/plugin-connection-network-handlers@workspace:*, @cloudbeaver/plugin-connection-network-handlers@workspace:packages/plugin-connection-network-handlers":
+  version: 0.0.0-use.local
+  resolution: "@cloudbeaver/plugin-connection-network-handlers@workspace:packages/plugin-connection-network-handlers"
+  dependencies:
+    "@cloudbeaver/core-blocks": "workspace:*"
+    "@cloudbeaver/core-cli": "workspace:*"
+    "@cloudbeaver/core-connections": "workspace:*"
+    "@cloudbeaver/core-di": "workspace:*"
+    "@cloudbeaver/core-localization": "workspace:*"
+    "@cloudbeaver/core-projects": "workspace:*"
+    "@cloudbeaver/core-root": "workspace:*"
+    "@cloudbeaver/core-sdk": "workspace:*"
+    "@cloudbeaver/core-utils": "workspace:*"
+    "@cloudbeaver/tsconfig": "workspace:*"
+    "@dbeaver/cli": "workspace:*"
+    "@types/react": "npm:^19"
+    mobx: "npm:^6"
+    mobx-react-lite: "npm:^4"
+    react: "npm:^19"
+    react-dom: "npm:^19"
+    rimraf: "npm:^6"
+    tslib: "npm:^2"
+    typescript: "npm:^5"
+  languageName: unknown
+  linkType: soft
+
 "@cloudbeaver/plugin-connection-preferences@workspace:*, @cloudbeaver/plugin-connection-preferences@workspace:packages/plugin-connection-preferences":
   version: 0.0.0-use.local
   resolution: "@cloudbeaver/plugin-connection-preferences@workspace:packages/plugin-connection-preferences"
@@ -2853,6 +2879,7 @@ __metadata:
     "@cloudbeaver/core-utils": "workspace:*"
     "@cloudbeaver/core-view": "workspace:*"
     "@cloudbeaver/plugin-authentication": "workspace:*"
+    "@cloudbeaver/plugin-connection-network-handlers": "workspace:*"
     "@cloudbeaver/plugin-navigation-tree": "workspace:*"
     "@cloudbeaver/plugin-projects": "workspace:*"
     "@cloudbeaver/plugin-top-app-bar": "workspace:*"
@@ -4010,6 +4037,7 @@ __metadata:
     "@cloudbeaver/plugin-browser": "workspace:*"
     "@cloudbeaver/plugin-codemirror6": "workspace:*"
     "@cloudbeaver/plugin-connection-custom": "workspace:*"
+    "@cloudbeaver/plugin-connection-network-handlers": "workspace:*"
     "@cloudbeaver/plugin-connection-preferences": "workspace:*"
     "@cloudbeaver/plugin-connection-search": "workspace:*"
     "@cloudbeaver/plugin-connection-view": "workspace:*"

From bad002465d9b8fde47eec5df41333c396bb3e8d3 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Sat, 13 Jun 2026 00:00:54 +0200
Subject: [PATCH 04/12] dbeaver/pro#9526 moves ssh files to
 connection-network-handlers-plugin

---
 webapp/packages/core-connections/src/index.ts            | 4 +---
 .../src/{ => SSH}/SSHForm.tsx                            | 4 ++--
 .../src/{ => SSH}/SSHKeyUploader.tsx                     | 0
 .../src/SSH}/getNetworkHandlerDefaultProperties.ts       | 0
 .../src/{authTypes.ts => SSH/sshAuthTypes.ts}            | 4 ++--
 .../src/SSH}/validateSSHConfig.ts                        | 0
 .../plugin-connection-network-handlers/src/index.ts      | 8 +++++---
 .../src/ConnectionForm/SSH/ConnectionFormSSHPart.ts      | 9 ++-------
 8 files changed, 12 insertions(+), 17 deletions(-)
 rename webapp/packages/plugin-connection-network-handlers/src/{ => SSH}/SSHForm.tsx (98%)
 rename webapp/packages/plugin-connection-network-handlers/src/{ => SSH}/SSHKeyUploader.tsx (100%)
 rename webapp/packages/{core-connections/src => plugin-connection-network-handlers/src/SSH}/getNetworkHandlerDefaultProperties.ts (100%)
 rename webapp/packages/plugin-connection-network-handlers/src/{authTypes.ts => SSH/sshAuthTypes.ts} (85%)
 rename webapp/packages/{core-connections/src => plugin-connection-network-handlers/src/SSH}/validateSSHConfig.ts (100%)

diff --git a/webapp/packages/core-connections/src/index.ts b/webapp/packages/core-connections/src/index.ts
index c270a6436b..60c42aa6f4 100644
--- a/webapp/packages/core-connections/src/index.ts
+++ b/webapp/packages/core-connections/src/index.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -59,8 +59,6 @@ export * from './DBDriverResource.js';
 export * from './CONNECTION_INFO_PARAM_SCHEMA.js';
 export * from './isJDBCConnection.js';
 export * from './NetworkHandlerResource.js';
-export * from './getNetworkHandlerDefaultProperties.js';
-export * from './validateSSHConfig.js';
 export * from './useConnectionInfo.js';
 export * from './useDBDriver.js';
 export * from './USER_NAME_PROPERTY_ID.js';
diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
similarity index 98%
rename from webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx
rename to webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
index f39dfec0af..89f1b33080 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/SSHForm.tsx
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
@@ -20,7 +20,7 @@ import {
 } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 
-import { authTypes } from './authTypes.js';
+import { sshAuthTypes } from './sshAuthTypes.js';
 import { SSHKeyUploader } from './SSHKeyUploader.js';
 import { SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
@@ -69,7 +69,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
       <Select
         name="authType"
         state={state}
-        items={authTypes}
+        items={sshAuthTypes}
         keySelector={value => value.key}
         valueSelector={value => value.label}
         disabled={isDisabled}
diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSHKeyUploader.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHKeyUploader.tsx
similarity index 100%
rename from webapp/packages/plugin-connection-network-handlers/src/SSHKeyUploader.tsx
rename to webapp/packages/plugin-connection-network-handlers/src/SSH/SSHKeyUploader.tsx
diff --git a/webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/getNetworkHandlerDefaultProperties.ts
similarity index 100%
rename from webapp/packages/core-connections/src/getNetworkHandlerDefaultProperties.ts
rename to webapp/packages/plugin-connection-network-handlers/src/SSH/getNetworkHandlerDefaultProperties.ts
diff --git a/webapp/packages/plugin-connection-network-handlers/src/authTypes.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshAuthTypes.ts
similarity index 85%
rename from webapp/packages/plugin-connection-network-handlers/src/authTypes.ts
rename to webapp/packages/plugin-connection-network-handlers/src/SSH/sshAuthTypes.ts
index e6e65fc63f..d72d3b7345 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/authTypes.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshAuthTypes.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@ interface IAuthType {
   label: TLocalizationToken;
 }
 
-export const authTypes: IAuthType[] = [
+export const sshAuthTypes: IAuthType[] = [
   {
     key: NetworkHandlerAuthType.Password,
     label: 'Password',
diff --git a/webapp/packages/core-connections/src/validateSSHConfig.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts
similarity index 100%
rename from webapp/packages/core-connections/src/validateSSHConfig.ts
rename to webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts
diff --git a/webapp/packages/plugin-connection-network-handlers/src/index.ts b/webapp/packages/plugin-connection-network-handlers/src/index.ts
index e8b3932e76..bd20d62c3b 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/index.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/index.ts
@@ -8,6 +8,8 @@
 
 import './module.js';
 
-export * from './SSHForm.js';
-export * from './SSHKeyUploader.js';
-export * from './authTypes.js';
+export * from './SSH/SSHForm.js';
+export * from './SSH/SSHKeyUploader.js';
+export * from './SSH/sshAuthTypes.js';
+export * from './SSH/validateSSHConfig.js';
+export * from './SSH/getNetworkHandlerDefaultProperties.js';
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
index fe390b3cd8..73c590fdce 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
@@ -14,17 +14,12 @@ import {
   type NetworkHandlerConfigInput,
   type NetworkHandlerDescriptor,
 } from '@cloudbeaver/core-sdk';
-import {
-  ConnectionInfoNetworkHandlersResource,
-  getNetworkHandlerDefaultProperties,
-  NetworkHandlerResource,
-  SSH_TUNNEL_ID,
-  validateSSHConfig,
-} from '@cloudbeaver/core-connections';
+import { ConnectionInfoNetworkHandlersResource, NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 import { toJS } from 'mobx';
 import type { IConnectionFormState } from '../IConnectionFormState.js';
 import type { INetworkHandlerConfig } from '../Options/IConnectionNetworkHanler.js';
 import { ConnectionFormOptionsPart } from '../Options/ConnectionFormOptionsPart.js';
+import { getNetworkHandlerDefaultProperties, validateSSHConfig } from '@cloudbeaver/plugin-connection-network-handlers';
 
 const getDefaultState = () =>
   ({

From 8df9e2b37c13bb168a0025f2d3ab35e6e1da3d9c Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Sun, 14 Jun 2026 15:30:33 +0200
Subject: [PATCH 05/12] pr fixes

---
 ...PluginConnectionNetworkHandlersBootstrap.ts | 18 ------------------
 .../src/module.ts                              | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts

diff --git a/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts b/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts
deleted file mode 100644
index 1a9bbc2887..0000000000
--- a/webapp/packages/plugin-connection-network-handlers/src/PluginConnectionNetworkHandlersBootstrap.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2026 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 { Bootstrap, injectable } from '@cloudbeaver/core-di';
-
-@injectable()
-export class PluginConnectionNetworkHandlersBootstrap extends Bootstrap {
-  constructor() {
-    super();
-  }
-
-  override register() {}
-}
diff --git a/webapp/packages/plugin-connection-network-handlers/src/module.ts b/webapp/packages/plugin-connection-network-handlers/src/module.ts
index 13e3194844..8260952023 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/module.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/module.ts
@@ -1,13 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di';
 import { LocaleService } from './LocaleService.js';
-import { PluginConnectionNetworkHandlersBootstrap } from './PluginConnectionNetworkHandlersBootstrap.js';
 
 export default ModuleRegistry.add({
   name: '@cloudbeaver/plugin-connection-network-handlers',
 
   configure: serviceCollection => {
-    serviceCollection
-      .addSingleton(Bootstrap, LocaleService)
-      .addSingleton(Bootstrap, PluginConnectionNetworkHandlersBootstrap);
+    serviceCollection.addSingleton(Bootstrap, LocaleService);
   },
-});
\ No newline at end of file
+});

From 66e0bde557f39967f01b231f27b09cc9e97a7f6a Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Sun, 14 Jun 2026 19:23:06 +0200
Subject: [PATCH 06/12] moves enable form switch inside SSHForm

---
 .../src/SSH/SSHForm.tsx                       | 39 ++++++++++++++-----
 .../src/ConnectionForm/SSH/SSH.tsx            |  7 +---
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
index 89f1b33080..8673f0b055 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
@@ -14,6 +14,7 @@ import {
   FieldCheckbox,
   InputField,
   Select,
+  Switch,
   useAdministrationSettings,
   useResource,
   useTranslate,
@@ -46,7 +47,8 @@ export interface ISSHFormProps {
 export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initialState, disabled, readonly, sharedCredentials, projectId }) {
   const translate = useTranslate();
 
-  const isDisabled = disabled || readonly;
+  const enabled = state.enabled;
+  const disabledInternal = disabled || readonly || enabled === false;
   const keyAuth = state.authType === NetworkHandlerAuthType.PublicKey;
   const serverConfigResource = useResource(SSHForm, ServerConfigResource, undefined);
 
@@ -66,23 +68,26 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
 
   return (
     <>
+      <Switch id="ssh-enable-switch" name="enabled" state={state} mod={['primary']} disabled={disabled || readonly}>
+        {translate('connections_network_handler_ssh_tunnel_enable')}
+      </Switch>
       <Select
         name="authType"
         state={state}
         items={sshAuthTypes}
         keySelector={value => value.key}
         valueSelector={value => value.label}
-        disabled={isDisabled}
+        disabled={disabledInternal}
         tiny
         onSelect={handleAuthTypeChange}
       >
         {translate('plugin_connection_network_handlers_ssh_tunnel_auth_type')}
       </Select>
       <Container wrap gap>
-        <InputField type="text" name="host" state={state.properties} autoComplete="on" readOnly={isDisabled} required small>
+        <InputField type="text" name="host" state={state.properties} autoComplete="on" readOnly={disabledInternal} required small>
           {translate('plugin_connection_network_handlers_ssh_tunnel_host')}
         </InputField>
-        <InputField type="number" name="port" state={state.properties} autoComplete="on" readOnly={isDisabled} required tiny>
+        <InputField type="number" name="port" state={state.properties} autoComplete="on" readOnly={disabledInternal} required tiny>
           {translate('plugin_connection_network_handlers_ssh_tunnel_port')}
         </InputField>
       </Container>
@@ -91,7 +96,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
           type="text"
           name="userName"
           state={state}
-          readOnly={isDisabled}
+          readOnly={disabledInternal}
           required={state.savePassword}
           autoComplete="section-ssh-authentication username"
           tiny
@@ -104,7 +109,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
           name="password"
           autoComplete="section-ssh-authentication new-password"
           state={state}
-          readOnly={isDisabled}
+          readOnly={disabledInternal}
           required={!passwordSaved && !keyAuth && state.savePassword}
           description={passwordSaved ? translate('ui_processing_saved') : undefined}
           tiny
@@ -112,7 +117,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
         >
           {passwordLabel}
         </InputField>
-        {keyAuth && <SSHKeyUploader state={state} saved={keySaved} disabled={isDisabled} readonly={readonly} />}
+        {keyAuth && <SSHKeyUploader state={state} saved={keySaved} disabled={disabledInternal} readonly={readonly} />}
       </Container>
       {credentialsSavingEnabled && !sharedCredentials && (
         <FieldCheckbox
@@ -124,7 +129,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
           )}
           name="savePassword"
           state={state}
-          disabled={isDisabled}
+          disabled={disabledInternal}
         >
           {translate(
             !isSharedProject || serverConfigResource.data?.distributed
@@ -136,10 +141,24 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
       <Container gap>
         <Expandable label={translate('plugin_connection_network_handlers_ssh_tunnel_advanced_settings')}>
           <Container gap>
-            <InputField type="number" name="aliveInterval" state={state.properties} readOnly={isDisabled} labelTooltip={aliveIntervalLabel} tiny>
+            <InputField
+              type="number"
+              name="aliveInterval"
+              state={state.properties}
+              readOnly={disabledInternal}
+              labelTooltip={aliveIntervalLabel}
+              tiny
+            >
               {aliveIntervalLabel}
             </InputField>
-            <InputField type="number" name="sshConnectTimeout" state={state.properties} readOnly={isDisabled} labelTooltip={connectTimeoutLabel} tiny>
+            <InputField
+              type="number"
+              name="sshConnectTimeout"
+              state={state.properties}
+              readOnly={disabledInternal}
+              labelTooltip={connectTimeoutLabel}
+              tiny
+            >
               {connectTimeoutLabel}
             </InputField>
           </Container>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 31d4005743..5b019a447b 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
 
-import { Button, ColoredContainer, Form, Group, GroupItem, s, Switch, useAutoLoad, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, ColoredContainer, Form, Group, GroupItem, s, useAutoLoad, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 import { NetworkHandlerResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
@@ -57,13 +57,10 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
     <Form className={s(style, { form: true })}>
       <ColoredContainer parent>
         <Group form gap keepSize large>
-          <Switch id="ssh-enable-switch" name="enabled" state={handlerState} mod={['primary']} disabled={disabled}>
-            {translate('connections_network_handler_ssh_tunnel_enable')}
-          </Switch>
           <SSHForm
             state={handlerState}
             initialState={SSHPart.initialState}
-            disabled={disabled || !enabled}
+            disabled={disabled}
             readonly={formState.isReadOnly}
             sharedCredentials={optionsPart.state.sharedCredentials}
             projectId={formState.state.projectId}

From 3103d99a40094c8882d53eda18ffaef285523682 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Sun, 14 Jun 2026 20:23:16 +0200
Subject: [PATCH 07/12] dbeaver/pro#9526 shares the rest logic for configuring
 the ssh with profiles form as well

---
 .../src/SSH/sshHelpers.ts                     | 83 +++++++++++++++++++
 .../src/index.ts                              |  1 +
 .../SSH/ConnectionFormSSHPart.ts              | 77 ++---------------
 3 files changed, 89 insertions(+), 72 deletions(-)
 create mode 100644 webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts

diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts
new file mode 100644
index 0000000000..8690fea00a
--- /dev/null
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts
@@ -0,0 +1,83 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
+import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+import { toJS } from 'mobx';
+
+export const SSH_DEFAULT_HANDLER_CONFIG: () => NetworkHandlerConfigInput = () => ({
+  id: SSH_TUNNEL_ID,
+  enabled: false,
+  authType: NetworkHandlerAuthType.Password,
+  password: undefined,
+  savePassword: false,
+  userName: '',
+  key: undefined,
+  properties: {
+    port: 22,
+    host: '',
+    aliveInterval: '0',
+    sshConnectTimeout: '10000',
+  },
+});
+
+export function isSSHPasswordChanged(handler: NetworkHandlerConfigInput, initial?: NetworkHandlerConfigInput | null): boolean {
+  if (!initial && !handler.enabled) {
+    return false;
+  }
+
+  return (
+    (((initial?.password === null && handler.password !== null) || initial?.password === '') && handler.password !== '') || !!handler.password?.length
+  );
+}
+
+export function isSSHKeyChanged(handler: NetworkHandlerConfigInput, initial?: NetworkHandlerConfigInput | null): boolean {
+  if (!initial && !handler.enabled) {
+    return false;
+  }
+
+  return (((initial?.key === null && handler.key !== null) || initial?.key === '') && handler.key !== '') || !!handler.key?.length;
+}
+
+export function getSSHHandlerConfig(
+  state: NetworkHandlerConfigInput,
+  initialState?: NetworkHandlerConfigInput | null,
+  savePassword?: boolean,
+): NetworkHandlerConfigInput {
+  const passwordChanged = isSSHPasswordChanged(state, initialState);
+  const keyChanged = isSSHKeyChanged(state, initialState);
+
+  const handlerConfig: NetworkHandlerConfigInput = {
+    ...state,
+    savePassword: state.savePassword || (savePassword ?? false),
+    key: state.authType === NetworkHandlerAuthType.PublicKey && keyChanged ? state.key : undefined,
+    password: passwordChanged ? state.password : undefined,
+  };
+
+  delete handlerConfig.secureProperties;
+
+  return trimSSHConfig(handlerConfig);
+}
+
+function trimSSHConfig(input: NetworkHandlerConfigInput): NetworkHandlerConfigInput {
+  const trimmedInput = toJS(input);
+  const attributesToTrim = Object.keys(input) as (keyof NetworkHandlerConfigInput)[];
+
+  for (const key of attributesToTrim) {
+    if (typeof trimmedInput[key] === 'string') {
+      trimmedInput[key] = trimmedInput[key]?.trim();
+    }
+  }
+
+  for (const key in trimmedInput.properties) {
+    if (typeof trimmedInput.properties[key] === 'string') {
+      trimmedInput.properties[key] = trimmedInput.properties[key]?.trim();
+    }
+  }
+
+  return trimmedInput;
+}
diff --git a/webapp/packages/plugin-connection-network-handlers/src/index.ts b/webapp/packages/plugin-connection-network-handlers/src/index.ts
index bd20d62c3b..798b21e102 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/index.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/index.ts
@@ -13,3 +13,4 @@ export * from './SSH/SSHKeyUploader.js';
 export * from './SSH/sshAuthTypes.js';
 export * from './SSH/validateSSHConfig.js';
 export * from './SSH/getNetworkHandlerDefaultProperties.js';
+export * from './SSH/sshHelpers.js';
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
index 73c590fdce..d0204900bb 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
@@ -10,7 +10,6 @@ import { FormPart, formValidationContext, type IFormState } from '@cloudbeaver/c
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import {
   DriverConfigurationType,
-  NetworkHandlerAuthType,
   type NetworkHandlerConfigInput,
   type NetworkHandlerDescriptor,
 } from '@cloudbeaver/core-sdk';
@@ -19,26 +18,9 @@ import { toJS } from 'mobx';
 import type { IConnectionFormState } from '../IConnectionFormState.js';
 import type { INetworkHandlerConfig } from '../Options/IConnectionNetworkHanler.js';
 import { ConnectionFormOptionsPart } from '../Options/ConnectionFormOptionsPart.js';
-import { getNetworkHandlerDefaultProperties, validateSSHConfig } from '@cloudbeaver/plugin-connection-network-handlers';
-
-const getDefaultState = () =>
-  ({
-    id: SSH_TUNNEL_ID,
-    enabled: false,
-    authType: NetworkHandlerAuthType.Password,
-    // should initially undefined cause if it's empty string it counts as saved password
-    password: undefined,
-    savePassword: false,
-    userName: '',
-    // should initially undefined cause if it's empty string it counts as saved private key
-    key: undefined,
-    properties: {
-      port: 22,
-      host: '',
-      aliveInterval: '0',
-      sshConnectTimeout: '10000',
-    },
-  }) as INetworkHandlerConfig;
+import { getNetworkHandlerDefaultProperties, getSSHHandlerConfig, SSH_DEFAULT_HANDLER_CONFIG, validateSSHConfig } from '@cloudbeaver/plugin-connection-network-handlers';
+
+const getDefaultState = (): INetworkHandlerConfig => SSH_DEFAULT_HANDLER_CONFIG() as INetworkHandlerConfig;
 
 export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConnectionFormState> {
   constructor(
@@ -51,19 +33,7 @@ export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConn
   }
 
   getConfig(): NetworkHandlerConfigInput {
-    const passwordChanged = isPasswordChanged(this.state, this.initialState);
-    const keyChanged = isKeyChanged(this.state, this.initialState);
-
-    const handlerConfig: NetworkHandlerConfigInput = {
-      ...this.state,
-      savePassword: this.state.savePassword || this.optionsPart.state.sharedCredentials,
-      key: this.state.authType === NetworkHandlerAuthType.PublicKey && keyChanged ? this.state.key : undefined,
-      password: passwordChanged ? this.state.password : undefined,
-    };
-
-    delete handlerConfig.secureProperties;
-
-    return handlerConfig;
+    return getSSHHandlerConfig(this.state, this.initialState, this.optionsPart.state.sharedCredentials);
   }
 
   override isOutdated(): boolean {
@@ -116,7 +86,7 @@ export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConn
       return;
     }
 
-    const config = getTrimmedSSHConfig(this.getConfig());
+    const config = this.getConfig();
 
     if (this.state.enabled && !this.state.savePassword) {
       this.formState.state.requiredNetworkHandlersIds.push(this.state.id);
@@ -142,40 +112,3 @@ export class ConnectionFormSSHPart extends FormPart<INetworkHandlerConfig, IConn
     }
   }
 }
-
-function getTrimmedSSHConfig(input: NetworkHandlerConfigInput): NetworkHandlerConfigInput {
-  const trimmedInput = toJS(input);
-  const attributesToTrim = Object.keys(input) as (keyof NetworkHandlerConfigInput)[];
-
-  for (const key of attributesToTrim) {
-    if (typeof trimmedInput[key] === 'string') {
-      trimmedInput[key] = trimmedInput[key]?.trim();
-    }
-  }
-
-  for (const key in trimmedInput.properties) {
-    if (typeof trimmedInput.properties[key] === 'string') {
-      trimmedInput.properties[key] = trimmedInput.properties[key]?.trim();
-    }
-  }
-
-  return trimmedInput;
-}
-
-function isPasswordChanged(handler: NetworkHandlerConfigInput, initial?: NetworkHandlerConfigInput) {
-  if (!initial && !handler.enabled) {
-    return false;
-  }
-
-  return (
-    (((initial?.password === null && handler.password !== null) || initial?.password === '') && handler.password !== '') || !!handler.password?.length
-  );
-}
-
-function isKeyChanged(handler: NetworkHandlerConfigInput, initial?: NetworkHandlerConfigInput) {
-  if (!initial && !handler.enabled) {
-    return false;
-  }
-
-  return (((initial?.key === null && handler.key !== null) || initial?.key === '') && handler.key !== '') || !!handler.key?.length;
-}

From c046a954530e8fa02c8afb18740ea9060ad280b7 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Sun, 14 Jun 2026 21:34:17 +0200
Subject: [PATCH 08/12] dbeaver/pro#9526 cleanup

---
 .../plugin-connection-network-handlers/src/SSH/SSHForm.tsx   | 5 +++--
 .../plugin-connection-network-handlers/src/SSH/sshHelpers.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
index 8673f0b055..c1356971fa 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/SSHForm.tsx
@@ -44,7 +44,7 @@ export interface ISSHFormProps {
   projectId: string;
 }
 
-export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initialState, disabled, readonly, sharedCredentials, projectId }) {
+export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initialState, disabled, readonly, sharedCredentials = false, projectId }) {
   const translate = useTranslate();
 
   const enabled = state.enabled;
@@ -61,6 +61,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
   const { credentialsSavingEnabled } = useAdministrationSettings();
   const projectInfoResource = useService(ProjectInfoResource);
   const isSharedProject = projectInfoResource.isProjectShared(projectId);
+  const showSaveCredentials = credentialsSavingEnabled && !sharedCredentials;
 
   const handleAuthTypeChange = useCallback(() => {
     state.password = '';
@@ -119,7 +120,7 @@ export const SSHForm = observer<ISSHFormProps>(function SSHForm({ state, initial
         </InputField>
         {keyAuth && <SSHKeyUploader state={state} saved={keySaved} disabled={disabledInternal} readonly={readonly} />}
       </Container>
-      {credentialsSavingEnabled && !sharedCredentials && (
+      {showSaveCredentials && (
         <FieldCheckbox
           id={SSH_TUNNEL_ID + '_savePassword'}
           title={translate(
diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts
index 8690fea00a..68a75078ae 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/sshHelpers.ts
@@ -53,7 +53,7 @@ export function getSSHHandlerConfig(
 
   const handlerConfig: NetworkHandlerConfigInput = {
     ...state,
-    savePassword: state.savePassword || (savePassword ?? false),
+    savePassword: (state.savePassword ?? false) || (savePassword ?? false),
     key: state.authType === NetworkHandlerAuthType.PublicKey && keyChanged ? state.key : undefined,
     password: passwordChanged ? state.password : undefined,
   };

From 0d17c7f76753863602e623db8a4659c6ec33e777 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 15 Jun 2026 11:30:38 +0200
Subject: [PATCH 09/12] dbeaver/pro#9526 adds go back to profiles arrow action

---
 .../src/ProjectInfoForm/ProjectInfoFormPanel.tsx |  2 +-
 .../ProjectInfoForm/ProjectInfoFormService.ts    | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
index fe03e9c9f2..7897d85336 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
@@ -17,7 +17,7 @@ export const ProjectInfoFormPanel = observer<IProjectInfoFormProps>(function Pro
   const service = useService(ProjectInfoFormService);
 
   return (
-    <TabsState container={service.parts} localState={formState.parts} formState={formState}>
+    <TabsState container={service.parts} localState={formState.parts} selectedId={service.defaultSelectedId} formState={formState}>
       <div className="tw:flex tw:flex-col tw:flex-1 tw:h-full tw:overflow-auto theme-background-secondary theme-text-on-secondary">
         <div className="tw:relative tw:flex tw:items-end tw:border-b-2 theme-border-color-background theme-background-secondary theme-text-on-secondary">
           <div className="tw:flex-1 tw:overflow-hidden">
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
index 2cb20a3888..aa9ab15b29 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
@@ -23,6 +23,7 @@ const formGetter = () => ProjectInfoForm;
 @injectable(() => [LocalizationService, NotificationService, OptionsPanelService, IServiceProvider])
 export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormState> {
   formState: FormState<IProjectInfoFormState> | null;
+  defaultSelectedId: string | undefined;
 
   constructor(
     localizationService: LocalizationService,
@@ -33,21 +34,23 @@ export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormStat
     super(localizationService, notificationService, 'ProjectInfoForm');
 
     this.formState = null;
+    this.defaultSelectedId = undefined;
 
     makeObservable(this, {
       formState: observable.shallow,
+      defaultSelectedId: observable,
       open: action.bound,
       close: action.bound,
     });
   }
 
-  async open(projectId: string): Promise<boolean> {
-    const opened = await this.optionsPanelService.open(formGetter);
+  async open(projectId: string, selectedTab?: string): Promise<boolean> {
+    const opened = await this.optionsPanelService.open(formGetter, () => {
+      this.defaultSelectedId = selectedTab;
+    });
 
-    if (opened) {
-      this.formState?.dispose();
-      this.formState = new FormState<IProjectInfoFormState>(this.serviceProvider, this, { projectId }).setMode(FormMode.Edit);
-    }
+    this.formState?.dispose();
+    this.formState = new FormState<IProjectInfoFormState>(this.serviceProvider, this, { projectId }).setMode(FormMode.Edit);
 
     return opened;
   }
@@ -55,6 +58,7 @@ export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormStat
   async close(): Promise<void> {
     this.formState?.dispose();
     this.formState = null;
+    this.defaultSelectedId = undefined;
     await this.optionsPanelService.close();
   }
 }

From 38943a3803bb9020cfb53973917d2006963d3314 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Tue, 16 Jun 2026 10:52:23 +0200
Subject: [PATCH 10/12] dbeaver/pro#9526 small ui adjustments

---
 webapp/packages/core-blocks/src/Containers/GroupBack.tsx | 4 ++--
 webapp/packages/core-blocks/src/Flex/Flex.module.css     | 4 ++++
 webapp/packages/core-blocks/src/Flex/Flex.tsx            | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/core-blocks/src/Containers/GroupBack.tsx b/webapp/packages/core-blocks/src/Containers/GroupBack.tsx
index bbf662dc7b..c4ba98dedc 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupBack.tsx
+++ b/webapp/packages/core-blocks/src/Containers/GroupBack.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ export const GroupBack: React.FC<React.HTMLAttributes<HTMLButtonElement>> = func
   const styles = useS(classes);
 
   return (
-    <Flex gap="xs" align="center">
+    <Flex gap="xxs" align="center">
       <ActionIconButton className={s(styles, { button: true }, className)} name="angle" title={translate('ui_close')} {...rest} />
       {children}
     </Flex>
diff --git a/webapp/packages/core-blocks/src/Flex/Flex.module.css b/webapp/packages/core-blocks/src/Flex/Flex.module.css
index cbc9739dba..393463f3a9 100644
--- a/webapp/packages/core-blocks/src/Flex/Flex.module.css
+++ b/webapp/packages/core-blocks/src/Flex/Flex.module.css
@@ -14,6 +14,10 @@
     overflow: auto;
   }
 
+  &[data-s-gap='xxs'] {
+    gap: 4px;
+  }
+
   &[data-s-gap='xs'] {
     gap: 8px;
   }
diff --git a/webapp/packages/core-blocks/src/Flex/Flex.tsx b/webapp/packages/core-blocks/src/Flex/Flex.tsx
index a307f96cd8..bd62bc9b35 100644
--- a/webapp/packages/core-blocks/src/Flex/Flex.tsx
+++ b/webapp/packages/core-blocks/src/Flex/Flex.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@ import classes from './Flex.module.css';
 
 interface Props extends React.HTMLAttributes<HTMLDivElement> {
   overflow?: boolean;
-  gap?: 'xs' | 'md' | 'lg';
+  gap?: 'xxs' | 'xs' | 'md' | 'lg';
   wrap?: React.CSSProperties['flexWrap'];
   direction?: React.CSSProperties['flexDirection'];
   align?: React.CSSProperties['alignItems'];

From cdf4232f093d00111312f234a16b02b0baf1b8bb Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Tue, 16 Jun 2026 13:42:03 +0200
Subject: [PATCH 11/12] dbeaver/pro#9618 pr fixes

---
 .../src/SSH/validateSSHConfig.ts                       | 10 +++++-----
 .../src/ProjectInfoForm/ProjectInfoFormService.ts      |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts b/webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts
index 31ea3fccfd..4a94363ba3 100644
--- a/webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts
+++ b/webapp/packages/plugin-connection-network-handlers/src/SSH/validateSSHConfig.ts
@@ -10,16 +10,16 @@ import { NetworkHandlerAuthType, type NetworkHandlerConfigInput } from '@cloudbe
 export function validateSSHConfig(state: NetworkHandlerConfigInput, initialState?: NetworkHandlerConfigInput | null): string[] {
   const errors: string[] = [];
 
-  if (!state.properties?.['host']?.length) {
+  if (!state.properties?.['host']?.trim().length) {
     errors.push("Field SSH 'Host' can't be empty");
   }
 
-  const port = Number(state.properties?.['port']);
-  if (Number.isNaN(port) || port < 1) {
-    errors.push("Field SSH 'Port' can't be empty");
+  const port = Number(String(state.properties?.['port'] ?? '').trim());
+  if (isNaN(port) || port < 1) {
+    errors.push("Field SSH 'Port' must be a positive number");
   }
 
-  if (state.savePassword && !state.userName?.length) {
+  if (state.savePassword && !state.userName?.trim()?.length) {
     errors.push("Field SSH 'User' can't be empty");
   }
 
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
index aa9ab15b29..d7b2458f8b 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
@@ -45,6 +45,10 @@ export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormStat
   }
 
   async open(projectId: string, selectedTab?: string): Promise<boolean> {
+    if (this.optionsPanelService.isOpen(formGetter)) {
+      return true;
+    }
+
     const opened = await this.optionsPanelService.open(formGetter, () => {
       this.defaultSelectedId = selectedTab;
     });

From 2ec2be570624d93e15033289517b0b452efa93dd Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 17 Jun 2026 14:21:00 +0200
Subject: [PATCH 12/12] dbeaver/pro#9526 creates ProjectInfoOptionsPanelService
 to incapsulate opening logic with tabId

---
 .../src/ConnectionForm/SSH/SSH.tsx            | 10 +++----
 .../ProjectInfoForm/ProjectInfoFormPanel.tsx  |  9 ++++++-
 .../ProjectInfoForm/ProjectInfoFormService.ts | 26 ++++++-------------
 .../ProjectInfoOptionsPanelService.ts         | 25 ++++++++++++++++++
 .../packages/plugin-project-info/src/index.ts |  1 +
 .../plugin-project-info/src/module.ts         |  2 ++
 6 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoOptionsPanelService.ts

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 5b019a447b..f2d04b9811 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -30,12 +30,12 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
   const [loading, setLoading] = useState(false);
   const networkHandlerResource = useService(NetworkHandlerResource);
 
-  const SSHPart = getConnectionFormSSHPart(formState);
+  const sshPart = getConnectionFormSSHPart(formState);
   const optionsPart = getConnectionFormOptionsPart(formState);
 
   async function testConnection() {
     setLoading(true);
-    const config = SSHPart.getConfig();
+    const config = sshPart.getConfig();
     try {
       await networkHandlerResource.test(config, formState.state.projectId, formState.state.connectionId);
     } finally {
@@ -48,10 +48,10 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
   const disabled = formState.isDisabled || loading || formState.isReadOnly;
   const enabled = handlerState.enabled || false;
   const keyAuth = handlerState.authType === NetworkHandlerAuthType.PublicKey;
-  const passwordFilled = (SSHPart.initialState?.password === null && handlerState.password !== '') || !!handlerState.password?.length;
+  const passwordFilled = (sshPart.initialState?.password === null && handlerState.password !== '') || !!handlerState.password?.length;
   const testAvailable = keyAuth ? !!handlerState.key?.length : passwordFilled;
 
-  useAutoLoad(SSH, [SSHPart, optionsPart], selected);
+  useAutoLoad(SSH, [sshPart, optionsPart], selected);
 
   return (
     <Form className={s(style, { form: true })}>
@@ -59,7 +59,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ fo
         <Group form gap keepSize large>
           <SSHForm
             state={handlerState}
-            initialState={SSHPart.initialState}
+            initialState={sshPart.initialState}
             disabled={disabled}
             readonly={formState.isReadOnly}
             sharedCredentials={optionsPart.state.sharedCredentials}
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
index 7897d85336..d9c80c456f 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormPanel.tsx
@@ -12,12 +12,19 @@ import { TabList, TabPanelList, TabsState } from '@cloudbeaver/core-ui';
 
 import type { IProjectInfoFormProps } from './IProjectInfoFormProps.js';
 import { ProjectInfoFormService } from './ProjectInfoFormService.js';
+import { ProjectInfoOptionsPanelService } from './ProjectInfoOptionsPanelService.js';
 
 export const ProjectInfoFormPanel = observer<IProjectInfoFormProps>(function ProjectInfoFormPanel({ formState }) {
   const service = useService(ProjectInfoFormService);
+  const projectInfoOptionsPanelService = useService(ProjectInfoOptionsPanelService);
 
   return (
-    <TabsState container={service.parts} localState={formState.parts} selectedId={service.defaultSelectedId} formState={formState}>
+    <TabsState
+      container={service.parts}
+      localState={formState.parts}
+      selectedId={projectInfoOptionsPanelService.itemId ?? undefined}
+      formState={formState}
+    >
       <div className="tw:flex tw:flex-col tw:flex-1 tw:h-full tw:overflow-auto theme-background-secondary theme-text-on-secondary">
         <div className="tw:relative tw:flex tw:items-end tw:border-b-2 theme-border-color-background theme-background-secondary theme-text-on-secondary">
           <div className="tw:flex-1 tw:overflow-hidden">
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
index d7b2458f8b..64270988fa 100644
--- a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoFormService.ts
@@ -8,50 +8,41 @@
 
 import { action, makeObservable, observable } from 'mobx';
 
-import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import { injectable, IServiceProvider } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { FormBaseService, FormMode, FormState, OptionsPanelService } from '@cloudbeaver/core-ui';
+import { FormBaseService, FormMode, FormState } from '@cloudbeaver/core-ui';
 
 import type { IProjectInfoFormState } from './IProjectInfoFormState.js';
+import { ProjectInfoOptionsPanelService } from './ProjectInfoOptionsPanelService.js';
 
-const ProjectInfoForm = importLazyComponent(() => import('./ProjectInfoForm.js').then(m => m.ProjectInfoForm));
-
-const formGetter = () => ProjectInfoForm;
-
-@injectable(() => [LocalizationService, NotificationService, OptionsPanelService, IServiceProvider])
+@injectable(() => [LocalizationService, NotificationService, ProjectInfoOptionsPanelService, IServiceProvider])
 export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormState> {
   formState: FormState<IProjectInfoFormState> | null;
-  defaultSelectedId: string | undefined;
 
   constructor(
     localizationService: LocalizationService,
     notificationService: NotificationService,
-    private readonly optionsPanelService: OptionsPanelService,
+    private readonly projectInfoOptionsPanelService: ProjectInfoOptionsPanelService,
     private readonly serviceProvider: IServiceProvider,
   ) {
     super(localizationService, notificationService, 'ProjectInfoForm');
 
     this.formState = null;
-    this.defaultSelectedId = undefined;
 
     makeObservable(this, {
       formState: observable.shallow,
-      defaultSelectedId: observable,
       open: action.bound,
       close: action.bound,
     });
   }
 
-  async open(projectId: string, selectedTab?: string): Promise<boolean> {
-    if (this.optionsPanelService.isOpen(formGetter)) {
+  async open(projectId: string, tabId?: string): Promise<boolean> {
+    if (this.projectInfoOptionsPanelService.isOpen()) {
       return true;
     }
 
-    const opened = await this.optionsPanelService.open(formGetter, () => {
-      this.defaultSelectedId = selectedTab;
-    });
+    const opened = await this.projectInfoOptionsPanelService.open(tabId);
 
     this.formState?.dispose();
     this.formState = new FormState<IProjectInfoFormState>(this.serviceProvider, this, { projectId }).setMode(FormMode.Edit);
@@ -62,7 +53,6 @@ export class ProjectInfoFormService extends FormBaseService<IProjectInfoFormStat
   async close(): Promise<void> {
     this.formState?.dispose();
     this.formState = null;
-    this.defaultSelectedId = undefined;
-    await this.optionsPanelService.close();
+    await this.projectInfoOptionsPanelService.close();
   }
 }
diff --git a/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoOptionsPanelService.ts b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoOptionsPanelService.ts
new file mode 100644
index 0000000000..bd73577d76
--- /dev/null
+++ b/webapp/packages/plugin-project-info/src/ProjectInfoForm/ProjectInfoOptionsPanelService.ts
@@ -0,0 +1,25 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 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 { importLazyComponent } from '@cloudbeaver/core-blocks';
+import { injectable } from '@cloudbeaver/core-di';
+import { BaseOptionsPanelService, OptionsPanelService } from '@cloudbeaver/core-ui';
+
+const ProjectInfoForm = importLazyComponent(() => import('./ProjectInfoForm.js').then(m => m.ProjectInfoForm));
+const panelGetter = () => ProjectInfoForm;
+
+@injectable(() => [OptionsPanelService])
+export class ProjectInfoOptionsPanelService extends BaseOptionsPanelService<string | undefined> {
+  constructor(optionsPanelService: OptionsPanelService) {
+    super(optionsPanelService, panelGetter);
+  }
+
+  override open(tabId?: string): Promise<boolean> {
+    return super.open(tabId);
+  }
+}
diff --git a/webapp/packages/plugin-project-info/src/index.ts b/webapp/packages/plugin-project-info/src/index.ts
index 45edf73809..dc3073778c 100644
--- a/webapp/packages/plugin-project-info/src/index.ts
+++ b/webapp/packages/plugin-project-info/src/index.ts
@@ -9,3 +9,4 @@
 import './module.js';
 
 export { ProjectInfoFormService } from './ProjectInfoForm/ProjectInfoFormService.js';
+export { ProjectInfoOptionsPanelService } from './ProjectInfoForm/ProjectInfoOptionsPanelService.js';
diff --git a/webapp/packages/plugin-project-info/src/module.ts b/webapp/packages/plugin-project-info/src/module.ts
index 5654337cdf..4aa3a2e5ad 100644
--- a/webapp/packages/plugin-project-info/src/module.ts
+++ b/webapp/packages/plugin-project-info/src/module.ts
@@ -10,6 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di';
 import { LocaleService } from './LocaleService.js';
 import { ProjectInfoFormOptionsTabBootstrap } from './ProjectInfoForm/Options/ProjectInfoFormOptionsTabBootstrap.js';
 import { ProjectInfoFormService } from './ProjectInfoForm/ProjectInfoFormService.js';
+import { ProjectInfoOptionsPanelService } from './ProjectInfoForm/ProjectInfoOptionsPanelService.js';
 import { ProjectInfoBootstrap } from './ProjectInfoBootstrap.js';
 
 export default ModuleRegistry.add({
@@ -20,6 +21,7 @@ export default ModuleRegistry.add({
       .addSingleton(Bootstrap, ProjectInfoBootstrap)
       .addSingleton(Bootstrap, LocaleService)
       .addSingleton(Bootstrap, ProjectInfoFormOptionsTabBootstrap)
+      .addSingleton(ProjectInfoOptionsPanelService)
       .addSingleton(ProjectInfoFormService);
   },
 });