From 304ee3cba8735e0fb5c2dd34c41a41a8202d7992 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Wed, 31 Aug 2022 13:00:42 +0300
Subject: [PATCH 01/37] CB-1551 fix(plugin-connections): Disable file button on
 SSH tab

---
 .../src/ConnectionForm/SSH/SSH.tsx            | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index b41e5e533f..2472e4f18b 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -73,8 +73,8 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
 
   const styles = useStyles(SSH_STYLES, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
-  const disabled = formDisabled || loading;
   const enabled = handlerState.enabled || false;
+  const disabled = formDisabled || loading || !enabled;
   const keyAuth = handlerState.authType === NetworkHandlerAuthType.PublicKey;
   const passwordFilled = (initialConfig?.password === null && handlerState.password !== '') || !!handlerState.password?.length;
   const testAvailable = keyAuth ? !!handlerState.key?.length : passwordFilled;
@@ -122,7 +122,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             items={authTypes}
             keySelector={value => value.key}
             valueSelector={value => value.label}
-            disabled={disabled || readonly || !enabled}
+            disabled={disabled || readonly}
             tiny
             onSelect={authTypeChangeHandler}
           >
@@ -133,7 +133,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="text"
               name="host"
               state={handlerState.properties}
-              disabled={disabled || !enabled}
+              disabled={disabled}
               readOnly={readonly}
               mod='surface'
               required
@@ -145,7 +145,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="number"
               name="port"
               state={handlerState.properties}
-              disabled={disabled || !enabled}
+              disabled={disabled}
               readOnly={readonly}
               mod='surface'
               required
@@ -159,7 +159,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="text"
               name="userName"
               state={handlerState}
-              disabled={disabled || !enabled}
+              disabled={disabled}
               readOnly={readonly}
               mod='surface'
               required={handlerState.savePassword}
@@ -172,7 +172,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               name="password"
               autoComplete='new-password'
               state={handlerState}
-              disabled={disabled || !enabled}
+              disabled={disabled}
               readOnly={readonly}
               mod='surface'
               required={!keyAuth && handlerState.savePassword}
@@ -186,7 +186,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                 <Textarea
                   name='key'
                   state={handlerState}
-                  disabled={disabled || !enabled}
+                  disabled={disabled}
                   readOnly={readonly}
                   description={keySaved ? translate('ui_processing_saved') : undefined}
                   required
@@ -197,12 +197,13 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                 <GroupItem>
                   <UploadArea
                     accept='.txt, .ssh'
-                    disabled={disabled || readonly || !enabled}
+                    disabled={disabled || readonly}
                     reset
                     onChange={handleKeyUpload}
                   >
                     <Button
-                      tag='div'
+                      type="button"
+                      disabled={disabled || readonly}
                       mod={['outlined']}
                     >
                       {translate('ui_file')}
@@ -217,7 +218,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               id={SSH_TUNNEL_ID + ' savePassword'}
               name="savePassword"
               state={handlerState}
-              disabled={disabled || !enabled || readonly}
+              disabled={disabled || readonly}
             >
               {translate('connections_connection_edit_save_credentials')}
             </FieldCheckbox>
@@ -232,7 +233,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                   type='number'
                   name='aliveInterval'
                   state={handlerState.properties}
-                  disabled={disabled || !enabled}
+                  disabled={disabled}
                   readOnly={readonly}
                   labelTooltip={aliveIntervalLabel}
                   mod='surface'
@@ -244,7 +245,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                   type='number'
                   name='sshConnectTimeout'
                   state={handlerState.properties}
-                  disabled={disabled || !enabled}
+                  disabled={disabled}
                   readOnly={readonly}
                   labelTooltip={connectTimeoutLabel}
                   mod='surface'
@@ -259,7 +260,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             <Button
               type='button'
               mod={['unelevated']}
-              disabled={disabled || !enabled || !testAvailable}
+              disabled={disabled || !testAvailable}
               loader
               onClick={testConnection}
             >

From 96e4f703dc5a23cc3f8b64abff6fac95af6b20c5 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 1 Sep 2022 12:10:39 +0300
Subject: [PATCH 02/37] CB-2477 feat(plugin-connection-search) Add public
 connection searching

---
 .../plugin-connection-search/.gitignore       | 17 ++++
 .../plugin-connection-search/package.json     | 48 ++++++++++
 .../src/Search/ConnectionSearchService.ts     | 96 +++++++++++++++++++
 .../src/Search/Database.tsx                   | 77 +++++++++++++++
 .../src/Search/DatabaseList.tsx               | 70 ++++++++++++++
 .../src/Search/SearchDatabase.tsx             | 39 ++++++++
 .../src/SearchConnectionPluginBootstrap.ts    | 48 ++++++++++
 .../plugin-connection-search/src/index.ts     |  3 +
 .../plugin-connection-search/src/manifest.ts  | 14 +++
 .../plugin-connection-search/tsconfig.json    | 11 +++
 webapp/packages/product-default/package.json  |  1 +
 webapp/packages/product-default/src/index.ts  |  3 +
 12 files changed, 427 insertions(+)
 create mode 100644 webapp/packages/plugin-connection-search/.gitignore
 create mode 100644 webapp/packages/plugin-connection-search/package.json
 create mode 100644 webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
 create mode 100644 webapp/packages/plugin-connection-search/src/Search/Database.tsx
 create mode 100644 webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
 create mode 100644 webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
 create mode 100644 webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
 create mode 100644 webapp/packages/plugin-connection-search/src/index.ts
 create mode 100644 webapp/packages/plugin-connection-search/src/manifest.ts
 create mode 100644 webapp/packages/plugin-connection-search/tsconfig.json

diff --git a/webapp/packages/plugin-connection-search/.gitignore b/webapp/packages/plugin-connection-search/.gitignore
new file mode 100644
index 0000000000..15bc16c7c3
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/.gitignore
@@ -0,0 +1,17 @@
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/lib
+
+# misc
+.DS_Store
+.env*
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/webapp/packages/plugin-connection-search/package.json b/webapp/packages/plugin-connection-search/package.json
new file mode 100644
index 0000000000..b49f2e35ac
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "@cloudbeaver/plugin-connection-search",
+  "sideEffects": false,
+  "version": "0.1.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "main": "lib/index.js",
+  "module": "lib/index.js",
+  "types": "src/index.ts",
+  "scripts": {
+    "prebuild": "rimraf lib/*",
+    "build": "webpack --config ../../configs/webpack.plugin.config.js",
+    "postbuild": "tsc",
+    "lint": "eslint ./src/ --ext .ts,.tsx",
+    "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix"
+  },
+  "peerDependencies": {
+    "@cloudbeaver/core-administration": "~0.1.0",
+    "@cloudbeaver/core-app": "~0.1.0",
+    "@cloudbeaver/core-authentication": "~0.1.0",
+    "@cloudbeaver/core-blocks": "~0.1.0",
+    "@cloudbeaver/core-connections": "~0.1.0",
+    "@cloudbeaver/core-di": "~0.1.0",
+    "@cloudbeaver/core-dialogs": "~0.1.0",
+    "@cloudbeaver/core-events": "~0.1.0",
+    "@cloudbeaver/core-executor": "~0.1.0",
+    "@cloudbeaver/core-extensions": "~0.1.0",
+    "@cloudbeaver/core-localization": "~0.1.0",
+    "@cloudbeaver/core-notifications": "~0.1.0",
+    "@cloudbeaver/core-plugin": "~0.1.0",
+    "@cloudbeaver/core-projects": "~0.1.0",
+    "@cloudbeaver/core-product": "~0.1.0",
+    "@cloudbeaver/core-root": "~0.1.0",
+    "@cloudbeaver/core-routing": "~0.1.0",
+    "@cloudbeaver/core-sdk": "~0.1.0",
+    "@cloudbeaver/core-settings": "~0.1.0",
+    "@cloudbeaver/core-theming": "~0.1.0",
+    "@cloudbeaver/core-ui": "~0.1.0",
+    "@cloudbeaver/core-utils": "~0.1.0",
+    "@cloudbeaver/core-view": "~0.1.0",
+    "@cloudbeaver/plugin-top-app-bar": "~0.1.0",
+    "@cloudbeaver/plugin-connections": "~0.1.0",
+    "react": "~18.x.x",
+    "mobx": "~6.x.x",
+    "mobx-react-lite": "~3.x.x",
+    "reshadow": "~0.x.x"
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
new file mode 100644
index 0000000000..8c253870cd
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -0,0 +1,96 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { observable, makeObservable } from 'mobx';
+
+import { AdministrationScreenService } from '@cloudbeaver/core-administration';
+import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
+import { injectable } from '@cloudbeaver/core-di';
+import { NotificationService } from '@cloudbeaver/core-events';
+import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
+import { PublicConnectionFormService } from '@cloudbeaver/plugin-connections';
+
+@injectable()
+export class ConnectionSearchService {
+  hosts = 'localhost';
+  databases: AdminConnectionSearchInfo[];
+
+  disabled = false;
+
+  // get disabled(): boolean {
+  //   return this.createConnectionService.disabled;
+  // }
+
+  // set disabled(value: boolean) {
+  //   this.createConnectionService.disabled = value;
+  // }
+
+  constructor(
+    private readonly notificationService: NotificationService,
+    private readonly connectionInfoResource: ConnectionInfoResource,
+    // private createConnectionService: CreateConnectionService,
+    private readonly administrationScreenService: AdministrationScreenService,
+    private readonly publicConnectionFormService: PublicConnectionFormService
+  ) {
+    makeObservable(this, {
+      hosts: observable,
+      databases: observable,
+      disabled: observable,
+    });
+
+    this.databases = [];
+    this.search = this.search.bind(this);
+    this.change = this.change.bind(this);
+    this.select = this.select.bind(this);
+  }
+
+  close(): void {
+    this.hosts = 'localhost';
+    this.databases = [];
+  }
+
+  async load(): Promise<void> {
+    if (this.administrationScreenService.isConfigurationMode && this.databases.length === 0) {
+      await this.search();
+    }
+  }
+
+  async search(): Promise<void> {
+    if (this.disabled || !this.hosts || !this.hosts.trim()) {
+      return;
+    }
+
+    this.disabled = true;
+
+    try {
+      const hosts = this.hosts
+        .trim()
+        .replace(/[\s,|+-]+/gm, ' ')
+        .split(/[\s,|+-]/);
+
+      this.databases = await this.connectionInfoResource.searchDatabases(hosts);
+    } catch (exception: any) {
+      this.notificationService.logException(exception, 'Databases search failed');
+    } finally {
+      this.disabled = false;
+    }
+  }
+
+  change(hosts: string): void {
+    this.hosts = hosts;
+  }
+
+  select(projectId: string, database: AdminConnectionSearchInfo): void {
+    this.publicConnectionFormService.open(projectId, {
+      ...this.connectionInfoResource.getEmptyConfig(),
+      driverId: database.defaultDriver,
+      host: database.host,
+      port: `${database.port}`,
+    }, database.possibleDrivers);
+  }
+}
diff --git a/webapp/packages/plugin-connection-search/src/Search/Database.tsx b/webapp/packages/plugin-connection-search/src/Search/Database.tsx
new file mode 100644
index 0000000000..10a2227dca
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/Search/Database.tsx
@@ -0,0 +1,77 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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, useMemo } from 'react';
+import styled, { css } from 'reshadow';
+
+import {
+  ListItem, ListItemIcon, StaticImage, ListItemName
+} from '@cloudbeaver/core-blocks';
+import { DBDriverResource } from '@cloudbeaver/core-connections';
+import { useService } from '@cloudbeaver/core-di';
+import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
+import { useStyles } from '@cloudbeaver/core-theming';
+
+const styles = css`
+    ListItemIcon {
+      position: relative;
+      min-width: 80px;
+      justify-content: flex-end;
+    }
+
+    StaticImage {
+      composes: theme-background-surface theme-border-color-surface from global;
+      box-sizing: border-box;
+      width: 32px;
+      border-radius: 50%;
+      border: solid 2px;
+
+      &:hover {
+        z-index: 1;
+      }
+      &:not(:first-child) {
+        margin-left: -20px;
+      }
+    }
+  `;
+
+interface Props {
+  database: AdminConnectionSearchInfo;
+  onSelect: (database: AdminConnectionSearchInfo) => void;
+}
+
+export const Database = observer<Props>(function Database({ database, onSelect }) {
+  const drivers = useService(DBDriverResource);
+  const select = useCallback(() => onSelect(database), [database]);
+  const orderedDrivers = useMemo(() => (
+    database.possibleDrivers
+      .slice()
+      .sort((a, b) => {
+        if (a === database.defaultDriver) {
+          return 1;
+        }
+        if (b === database.defaultDriver) {
+          return -1;
+        }
+        return a.localeCompare(b);
+      })
+  ), [database]);
+
+  const host = database.host + ':' + database.port;
+  const name = database.displayName !== database.host ? database.displayName + ' (' + host + ')' : host;
+
+  return styled(useStyles(styles))(
+    <ListItem onClick={select}>
+      <ListItemIcon>
+        {orderedDrivers.map(driverId => <StaticImage key={driverId} icon={drivers.get(driverId)?.icon} />)}
+      </ListItemIcon>
+      <ListItemName>{name}</ListItemName>
+    </ListItem>
+  );
+});
diff --git a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
new file mode 100644
index 0000000000..5208922dcb
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
@@ -0,0 +1,70 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 styled, { css } from 'reshadow';
+
+import {
+  ItemListSearch, ItemList, SubmittingForm, TextPlaceholder, useFocus
+} from '@cloudbeaver/core-blocks';
+import { useTranslate } from '@cloudbeaver/core-localization';
+import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
+import { useStyles } from '@cloudbeaver/core-theming';
+
+import { Database } from './Database';
+
+const styles = css`
+    SubmittingForm {
+      composes: theme-background-surface theme-text-on-surface from global;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow: auto;
+    }
+  `;
+
+interface Props {
+  databases: AdminConnectionSearchInfo[];
+  hosts: string;
+  disabled?: boolean;
+  className?: string;
+  onSelect: (database: AdminConnectionSearchInfo) => void;
+  onChange: (hosts: string) => void;
+  onSearch?: () => Promise<void>;
+}
+
+export const DatabaseList = observer<Props>(function DatabaseList({
+  databases, hosts, disabled, className, onSelect, onChange, onSearch,
+}) {
+  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
+  const translate = useTranslate();
+  const [isSearched, setIsSearched] = useState(false);
+
+  const searchHandler = useCallback(() => {
+    if (onSearch) {
+      onSearch().then(() => {
+        setIsSearched(true);
+      });
+    }
+  }, [onSearch]);
+
+  const placeholderMessage = isSearched ? 'connections_not_found' : 'connections_administration_search_database_tip';
+
+  return styled(useStyles(styles))(
+    <SubmittingForm ref={focusedRef} className={className} onSubmit={onSearch}>
+      <ItemListSearch value={hosts} placeholder={translate('connections_administration_search_database_tip')} disabled={disabled} onChange={onChange} onSearch={searchHandler} />
+      <ItemList>
+        {databases.map(database => (
+          <Database key={database.host + database.port} database={database} onSelect={onSelect} />
+        ))}
+      </ItemList>
+      {!databases.length && <TextPlaceholder>{translate(placeholderMessage)}</TextPlaceholder>}
+    </SubmittingForm>
+  );
+});
diff --git a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
new file mode 100644
index 0000000000..788feab705
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
@@ -0,0 +1,39 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { useMapResource } from '@cloudbeaver/core-blocks';
+import { useService } from '@cloudbeaver/core-di';
+import { ProjectsResource, PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
+import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
+
+// import { CustomConnection } from '../Manual/CustomConnection';
+import { ConnectionSearchService } from './ConnectionSearchService';
+import { DatabaseList } from './DatabaseList';
+
+export const SearchDatabase: React.FC = observer(function SearchDatabase() {
+  const connectionSearchService = useService(ConnectionSearchService);
+  // useMapResource(CustomConnection, ProjectsResource, CachedMapAllKey);
+
+  function select(database: AdminConnectionSearchInfo) {
+    connectionSearchService.select(PROJECT_GLOBAL_ID, database);
+  }
+
+  return (
+    <DatabaseList
+      databases={connectionSearchService.databases}
+      hosts={connectionSearchService.hosts}
+      disabled={connectionSearchService.disabled}
+      onSelect={select}
+      onChange={connectionSearchService.change}
+      onSearch={connectionSearchService.search}
+    />
+  );
+});
diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
new file mode 100644
index 0000000000..3ffeebf60d
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -0,0 +1,48 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { ProjectsService } from '@cloudbeaver/core-projects';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
+import { OptionsPanelService } from '@cloudbeaver/core-ui';
+import { MainMenuService, EMainMenu } from '@cloudbeaver/plugin-top-app-bar';
+
+import { SearchDatabase } from './Search/SearchDatabase';
+
+@injectable()
+export class SearchConnectionPluginBootstrap extends Bootstrap {
+  constructor(
+    private readonly mainMenuService: MainMenuService,
+    private readonly serverConfigResource: ServerConfigResource,
+    private readonly projectsService: ProjectsService,
+    private readonly optionsPanelService: OptionsPanelService,
+  ) {
+    super();
+  }
+
+  register(): void | Promise<void> {
+    this.mainMenuService.onConnectionClick.addHandler(() => {
+      this.projectsService.load();
+    });
+
+    this.mainMenuService.registerMenuItem(EMainMenu.mainMenuConnectionsPanel, {
+      id: 'searchConnection',
+      order: 3,
+      title: 'connections_connection_create_search_database',
+      isHidden: () => (
+        !this.serverConfigResource.data?.supportsCustomConnections
+        || !this.projectsService.activeProject?.canCreateConnections
+      ),
+      onClick: () => {
+        this.optionsPanelService.open(() => SearchDatabase);
+      },
+    });
+  }
+
+  load(): void | Promise<void> { }
+}
diff --git a/webapp/packages/plugin-connection-search/src/index.ts b/webapp/packages/plugin-connection-search/src/index.ts
new file mode 100644
index 0000000000..b239f1cea3
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/index.ts
@@ -0,0 +1,3 @@
+import { connectionSearchPlugin } from './manifest';
+
+export default connectionSearchPlugin;
\ No newline at end of file
diff --git a/webapp/packages/plugin-connection-search/src/manifest.ts b/webapp/packages/plugin-connection-search/src/manifest.ts
new file mode 100644
index 0000000000..14ed2f493b
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/src/manifest.ts
@@ -0,0 +1,14 @@
+import type { PluginManifest } from '@cloudbeaver/core-di';
+
+import { ConnectionSearchService } from './Search/ConnectionSearchService';
+import { SearchConnectionPluginBootstrap } from './SearchConnectionPluginBootstrap';
+
+export const connectionSearchPlugin: PluginManifest = {
+  info: {
+    name: 'Search connection plugin',
+  },
+  providers: [
+    SearchConnectionPluginBootstrap,
+    ConnectionSearchService,
+  ],
+};
\ No newline at end of file
diff --git a/webapp/packages/plugin-connection-search/tsconfig.json b/webapp/packages/plugin-connection-search/tsconfig.json
new file mode 100644
index 0000000000..2a4cc370f7
--- /dev/null
+++ b/webapp/packages/plugin-connection-search/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib",
+    "composite": true
+  },
+  "include": ["src"],
+  "exclude": ["**/node_modules", "**/.*/"],
+  "references": [{ "path": "../*" }]
+}
diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json
index 262cb65f3f..25f9126a53 100644
--- a/webapp/packages/product-default/package.json
+++ b/webapp/packages/product-default/package.json
@@ -27,6 +27,7 @@
     "@cloudbeaver/plugin-authentication-administration": "0.1.0",
     "@cloudbeaver/plugin-connection-custom": "0.1.0",
     "@cloudbeaver/plugin-connection-template": "0.1.0",
+    "@cloudbeaver/plugin-connection-search": "0.1.0",
     "@cloudbeaver/plugin-connections": "0.1.0",
     "@cloudbeaver/plugin-data-export": "0.1.0",
     "@cloudbeaver/plugin-data-spreadsheet-new": "0.1.0",
diff --git a/webapp/packages/product-default/src/index.ts b/webapp/packages/product-default/src/index.ts
index 0b75ef65e3..6a515f680d 100644
--- a/webapp/packages/product-default/src/index.ts
+++ b/webapp/packages/product-default/src/index.ts
@@ -6,6 +6,7 @@ import administration from '@cloudbeaver/plugin-administration';
 import authentication from '@cloudbeaver/plugin-authentication';
 import authenticationAdministration from '@cloudbeaver/plugin-authentication-administration';
 import connectionCustom from '@cloudbeaver/plugin-connection-custom';
+import connectionSearch from '@cloudbeaver/plugin-connection-search';
 import connectionTemplate from '@cloudbeaver/plugin-connection-template';
 import connectionPlugin from '@cloudbeaver/plugin-connections';
 import connectionAdministration from '@cloudbeaver/plugin-connections-administration';
@@ -39,6 +40,7 @@ import userProfileAdministration from '@cloudbeaver/plugin-user-profile-administ
 import version from '@cloudbeaver/plugin-version';
 import versionUpdate from '@cloudbeaver/plugin-version-update-administration';
 
+
 import { defaultProductManifest } from './manifest';
 
 const PLUGINS: PluginManifest[] = [
@@ -50,6 +52,7 @@ const PLUGINS: PluginManifest[] = [
   localization,
   connectionCustom,
   connectionTemplate,
+  connectionSearch,
   dataExport,
   dataViewer,
   gisViewer,

From 9d02c3448683cabc9aff12a4d26bc163805d6145 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 1 Sep 2022 12:14:54 +0300
Subject: [PATCH 03/37] CB-1551 fix(plugin-connections): Fix file button

---
 .../src/ConnectionForm/SSH/SSH.tsx            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 2472e4f18b..a8da3efbb5 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -73,8 +73,8 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
 
   const styles = useStyles(SSH_STYLES, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
+  const disabled = formDisabled || loading;
   const enabled = handlerState.enabled || false;
-  const disabled = formDisabled || loading || !enabled;
   const keyAuth = handlerState.authType === NetworkHandlerAuthType.PublicKey;
   const passwordFilled = (initialConfig?.password === null && handlerState.password !== '') || !!handlerState.password?.length;
   const testAvailable = keyAuth ? !!handlerState.key?.length : passwordFilled;
@@ -122,7 +122,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             items={authTypes}
             keySelector={value => value.key}
             valueSelector={value => value.label}
-            disabled={disabled || readonly}
+            disabled={disabled || readonly || !enabled}
             tiny
             onSelect={authTypeChangeHandler}
           >
@@ -133,7 +133,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="text"
               name="host"
               state={handlerState.properties}
-              disabled={disabled}
+              disabled={disabled || !enabled}
               readOnly={readonly}
               mod='surface'
               required
@@ -145,7 +145,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="number"
               name="port"
               state={handlerState.properties}
-              disabled={disabled}
+              disabled={disabled || !enabled}
               readOnly={readonly}
               mod='surface'
               required
@@ -159,7 +159,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               type="text"
               name="userName"
               state={handlerState}
-              disabled={disabled}
+              disabled={disabled || !enabled}
               readOnly={readonly}
               mod='surface'
               required={handlerState.savePassword}
@@ -172,7 +172,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               name="password"
               autoComplete='new-password'
               state={handlerState}
-              disabled={disabled}
+              disabled={disabled || !enabled}
               readOnly={readonly}
               mod='surface'
               required={!keyAuth && handlerState.savePassword}
@@ -186,7 +186,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                 <Textarea
                   name='key'
                   state={handlerState}
-                  disabled={disabled}
+                  disabled={disabled || !enabled}
                   readOnly={readonly}
                   description={keySaved ? translate('ui_processing_saved') : undefined}
                   required
@@ -197,13 +197,13 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                 <GroupItem>
                   <UploadArea
                     accept='.txt, .ssh'
-                    disabled={disabled || readonly}
+                    disabled={disabled || readonly || !enabled}
                     reset
                     onChange={handleKeyUpload}
                   >
                     <Button
                       type="button"
-                      disabled={disabled || readonly}
+                      disabled={disabled || readonly || !enabled}
                       mod={['outlined']}
                     >
                       {translate('ui_file')}
@@ -218,7 +218,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               id={SSH_TUNNEL_ID + ' savePassword'}
               name="savePassword"
               state={handlerState}
-              disabled={disabled || readonly}
+              disabled={disabled || !enabled || readonly}
             >
               {translate('connections_connection_edit_save_credentials')}
             </FieldCheckbox>
@@ -233,7 +233,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                   type='number'
                   name='aliveInterval'
                   state={handlerState.properties}
-                  disabled={disabled}
+                  disabled={disabled || !enabled}
                   readOnly={readonly}
                   labelTooltip={aliveIntervalLabel}
                   mod='surface'
@@ -245,7 +245,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                   type='number'
                   name='sshConnectTimeout'
                   state={handlerState.properties}
-                  disabled={disabled}
+                  disabled={disabled || !enabled}
                   readOnly={readonly}
                   labelTooltip={connectTimeoutLabel}
                   mod='surface'
@@ -260,7 +260,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             <Button
               type='button'
               mod={['unelevated']}
-              disabled={disabled || !testAvailable}
+              disabled={disabled || !enabled || !testAvailable}
               loader
               onClick={testConnection}
             >

From 35a9fc81f34864d8ca9e8449020ecd16b0f71fee Mon Sep 17 00:00:00 2001
From: yagudin10 <yagudin10@yandex.ru>
Date: Fri, 2 Sep 2022 16:35:49 +0300
Subject: [PATCH 04/37] CB-2525 add aws template connections to the session fix

---
 .../io/cloudbeaver/service/admin/impl/WebServiceAdmin.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
index 2fd74b31bd..b087a8fda2 100644
--- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
@@ -404,8 +404,9 @@ public class WebServiceAdmin implements DBWServiceAdmin {
 
             ((DataSourceDescriptor) newDataSource).setNavigatorSettings(CBApplication.getInstance().getAppConfiguration().getDefaultNavigatorSettings());
             globalDataSourceRegistry.addDataSource(newDataSource);
-
-            return new WebConnectionInfo(webSession, newDataSource);
+            WebConnectionInfo connectionInfo = new WebConnectionInfo(webSession, newDataSource);
+            webSession.addConnection(connectionInfo);
+            return connectionInfo;
         } catch (DBException e) {
             throw new DBWebException("Error copying connection", e);
         }

From b77a99394c9c60332be12a311e8172f73a09672c Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Fri, 2 Sep 2022 16:48:38 +0300
Subject: [PATCH 05/37] CB-2477 feat(plugin-connection-search): Show search
 menu only for admins

---
 .../src/SearchConnectionPluginBootstrap.ts                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
index 3ffeebf60d..e37b355ab2 100644
--- a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -6,9 +6,10 @@
  * you may not use this file except in compliance with the License.
  */
 
+import { EAdminPermission } from '@cloudbeaver/core-administration';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ProjectsService } from '@cloudbeaver/core-projects';
-import { ServerConfigResource } from '@cloudbeaver/core-root';
+import { PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
 import { MainMenuService, EMainMenu } from '@cloudbeaver/plugin-top-app-bar';
 
@@ -21,6 +22,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
     private readonly serverConfigResource: ServerConfigResource,
     private readonly projectsService: ProjectsService,
     private readonly optionsPanelService: OptionsPanelService,
+    private readonly permissionsService: PermissionsService,
   ) {
     super();
   }
@@ -37,6 +39,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
       isHidden: () => (
         !this.serverConfigResource.data?.supportsCustomConnections
         || !this.projectsService.activeProject?.canCreateConnections
+        || !this.permissionsService.has(EAdminPermission.admin)
       ),
       onClick: () => {
         this.optionsPanelService.open(() => SearchDatabase);

From a6bdb996f2eb316a335dc9d12241e98118e2d5a5 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Sun, 4 Sep 2022 08:29:47 +0200
Subject: [PATCH 06/37] #1912 service refactoring (#1106)

* dbeaver/dbeaver-ee#1912 QMController, DBPlatform, DBPWorkspace refactoring. Redundant code delete.

* dbeaver/dbeaver-ee#1912 Redundant resource handlers remove

* dbeaver/dbeaver-ee#1912 Desktop features moved to desktop workspace

* dbeaver/dbeaver-ee#1912 Desktop platform additions
---
 .../model/app/BaseWebApplication.java         |  6 +-
 .../rm/local/LocalResourceController.java     |  5 --
 .../io/cloudbeaver/server/WebWorkspace.java   | 10 ---
 .../src/io/cloudbeaver/WebServiceUtils.java   |  5 --
 .../src/io/cloudbeaver/server/CBPlatform.java | 24 ++----
 .../cloudbeaver/server/CBResourceHandler.java | 85 -------------------
 6 files changed, 8 insertions(+), 127 deletions(-)
 delete mode 100644 server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBResourceHandler.java

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
index 01fbd0c655..4ad833ec70 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
@@ -17,8 +17,10 @@
 package io.cloudbeaver.model.app;
 
 import io.cloudbeaver.DataSourceFilter;
+import io.cloudbeaver.VirtualProjectImpl;
 import io.cloudbeaver.model.log.SLF4JLogHandler;
 import io.cloudbeaver.model.rm.local.LocalResourceController;
+import io.cloudbeaver.server.WebWorkspace;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplicationContext;
@@ -35,8 +37,6 @@ import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.security.SMController;
 import org.jkiss.dbeaver.registry.BaseApplicationImpl;
-import org.jkiss.dbeaver.registry.EclipseWorkspaceImpl;
-import io.cloudbeaver.VirtualProjectImpl;
 import org.jkiss.dbeaver.runtime.IVariableResolver;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 
@@ -60,7 +60,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     @NotNull
     @Override
     public DBPWorkspace createWorkspace(@NotNull DBPPlatform platform, @NotNull IWorkspace eclipseWorkspace) {
-        return new EclipseWorkspaceImpl(platform, eclipseWorkspace);
+        return new WebWorkspace(platform, eclipseWorkspace);
     }
 
     @Nullable
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
index f461124595..7f5f39f361 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -413,11 +413,6 @@ public class LocalResourceController implements RMController {
         );
     }
 
-    @Override
-    public RMResource[] getResourcePath(@NotNull String projectId, @NotNull String resourcePath) throws DBException {
-        return makeResourcePath(projectId, getTargetPath(projectId, resourcePath), false).toArray(RMResource[]::new);
-    }
-
     @NotNull
     @Override
     public byte[] getResourceContents(@NotNull String projectId, @NotNull String resourcePath) throws DBException {
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebWorkspace.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebWorkspace.java
index bc340c4f52..2f5e6f8082 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebWorkspace.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebWorkspace.java
@@ -17,7 +17,6 @@
 package io.cloudbeaver.server;
 
 import org.eclipse.core.resources.IWorkspace;
-import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.registry.EclipseWorkspaceImpl;
 
@@ -28,17 +27,8 @@ import org.jkiss.dbeaver.registry.EclipseWorkspaceImpl;
  */
 public class WebWorkspace extends EclipseWorkspaceImpl {
 
-    private final String workspaceId;
-
     public WebWorkspace(DBPPlatform platform, IWorkspace eclipseWorkspace) {
         super(platform, eclipseWorkspace);
-        workspaceId = readWorkspaceId();
-    }
-
-    @NotNull
-    @Override
-    public String getWorkspaceId() {
-        return workspaceId;
     }
 
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
index 13733841f7..614f8db36f 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -100,11 +100,6 @@ public class WebServiceUtils extends WebCommonUtils {
         return session.getProjectById(WebAppUtils.getGlobalProjectId()).getDataSourceRegistry();
     }
 
-    @NotNull
-    public static DBNModel getGlobalNavigatorModel() throws DBWebException {
-        return DBWorkbench.getPlatform().getNavigatorModel();
-    }
-
     public static InputStream openStaticResource(String path) {
         return WebServiceUtils.class.getClassLoader().getResourceAsStream(path);
     }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
index 04aada1252..da00499683 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -25,10 +25,8 @@ import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPExternalFileManager;
 import org.jkiss.dbeaver.model.app.DBACertificateStorage;
 import org.jkiss.dbeaver.model.app.DBASecureStorage;
-import org.jkiss.dbeaver.model.app.DBPResourceHandler;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderRegistry;
@@ -36,15 +34,15 @@ import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPDriverLibrary;
 import org.jkiss.dbeaver.model.impl.app.DefaultCertificateStorage;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
-import org.jkiss.dbeaver.model.qm.QMController;
+import org.jkiss.dbeaver.model.qm.QMRegistry;
 import org.jkiss.dbeaver.model.qm.QMUtils;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.registry.BasePlatformImpl;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.runtime.SecurityProviderUtils;
-import org.jkiss.dbeaver.runtime.qm.QMControllerImpl;
 import org.jkiss.dbeaver.runtime.qm.QMLogFileWriter;
+import org.jkiss.dbeaver.runtime.qm.QMRegistryImpl;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.osgi.framework.Bundle;
@@ -76,7 +74,7 @@ public class CBPlatform extends BasePlatformImpl {
 
     private Path tempFolder;
 
-    private QMControllerImpl queryManager;
+    private QMRegistryImpl queryManager;
     private QMLogFileWriter qmLogWriter;
     private DBACertificateStorage certificateStorage;
     private WebWorkspace workspace;
@@ -141,7 +139,7 @@ public class CBPlatform extends BasePlatformImpl {
         this.workspace.initializeProjects();
 
         QMUtils.initApplication(this);
-        this.queryManager = new QMControllerImpl();
+        this.queryManager = new QMRegistryImpl();
 
         this.qmLogWriter = new QMLogFileWriter();
         this.queryManager.registerMetaListener(qmLogWriter);
@@ -206,12 +204,6 @@ public class CBPlatform extends BasePlatformImpl {
         return workspace;
     }
 
-    @NotNull
-    @Override
-    public DBPResourceHandler getDefaultResourceHandler() {
-        return CBResourceHandler.INSTANCE;
-    }
-
     @NotNull
     @Override
     public CBApplication getApplication() {
@@ -229,7 +221,7 @@ public class CBPlatform extends BasePlatformImpl {
     }
 
     @NotNull
-    public QMController getQueryManager() {
+    public QMRegistry getQueryManager() {
         return queryManager;
     }
 
@@ -251,12 +243,6 @@ public class CBPlatform extends BasePlatformImpl {
         return application.getSecureStorage();
     }
 
-    @NotNull
-    @Override
-    public DBPExternalFileManager getExternalFileManager() {
-        return workspace;
-    }
-
     @NotNull
     public File getTempFolder(DBRProgressMonitor monitor, String name) {
         if (tempFolder == null) {
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBResourceHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBResourceHandler.java
deleted file mode 100644
index 9cd8edab6d..0000000000
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBResourceHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.server;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.app.DBPResourceHandler;
-import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.model.navigator.DBNNodeWithResource;
-import org.jkiss.dbeaver.model.navigator.DBNResource;
-
-import java.util.List;
-
-/**
- * Default resource handler
- */
-public class CBResourceHandler implements DBPResourceHandler {
-
-    public static final CBResourceHandler INSTANCE = new CBResourceHandler();
-
-    @Override
-    public int getFeatures(IResource resource) {
-        if (resource instanceof IFile) {
-            return FEATURE_OPEN | FEATURE_DELETE | FEATURE_RENAME;
-        } else {
-            return FEATURE_DELETE | FEATURE_RENAME | FEATURE_CREATE_FOLDER | FEATURE_MOVE_INTO;
-        }
-    }
-
-    @NotNull
-    @Override
-    public String getTypeName(@NotNull IResource resource) {
-        return "resource"; //$NON-NLS-1$
-    }
-
-    @Override
-    public String getResourceDescription(@NotNull IResource resource) {
-        return "";
-    }
-
-    @Override
-    public List<DBPDataSourceContainer> getAssociatedDataSources(DBNResource resource) {
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public String getResourceNodeName(@NotNull IResource resource) {
-        return resource.getName();
-    }
-
-    @NotNull
-    @Override
-    public DBNResource makeNavigatorNode(@NotNull DBNNode parentNode, @NotNull IResource resource) throws CoreException, DBException {
-        DBNResource node = new DBNResource(parentNode, resource, this);
-        return node;
-    }
-
-    @Override
-    public void updateNavigatorNodeFromResource(@NotNull DBNNodeWithResource node, @NotNull IResource resource) {
-    }
-
-    @Override
-    public void openResource(@NotNull IResource resource) throws CoreException, DBException {
-    }
-
-}

From bcab44cac25b86ec8591b4e2569e64ad981aaea2 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Sat, 3 Sep 2022 11:15:57 +0300
Subject: [PATCH 07/37] fix(plugin-data-viewer): CB-2524 connection
 subscription

---
 .../useDataViewerDatabaseDataModel.ts         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
index 92eb172d14..15af79b9fc 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
@@ -13,7 +13,6 @@ import { ILoadableState, isContainsException, useMapResource, useObservableRef }
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
-import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import type { ITab } from '@cloudbeaver/plugin-navigation-tabs';
 import type { IObjectViewerTabState } from '@cloudbeaver/plugin-object-viewer';
 
@@ -38,26 +37,30 @@ export function useDataViewerDatabaseDataModel(tab: ITab<IObjectViewerTabState>)
   const dataPresentationService = useService(DataPresentationService);
   const dataViewerDataChangeConfirmationService = useService(DataViewerDataChangeConfirmationService);
 
-  const connections = useMapResource(useDataViewerDatabaseDataModel, connectionInfoResource, CachedMapAllKey);
+  const connection = useMapResource(
+    useDataViewerDatabaseDataModel,
+    ConnectionInfoResource,
+    tab.handlerState.connectionKey ?? null
+  );
 
   const state = useObservableRef<IDataViewerDatabaseDataModel>(() => ({
     _exception: null,
     _loading: false,
     get exception() {
-      if (isContainsException(connections.exception)) {
-        return connections.exception;
+      if (isContainsException(connection.exception)) {
+        return connection.exception;
       }
       return this._exception;
     },
     isLoading(): boolean {
-      return connections.isLoading() || this._loading;
+      return connection.isLoading() || this._loading;
     },
     isLoaded(): boolean {
-      return connections.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
+      return connection.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
     },
     async reload() {
-      if (isContainsException(connections.exception)) {
-        connections.reload?.();
+      if (isContainsException(connection.exception)) {
+        connection.reload?.();
       }
       this.init();
     },

From 6e987e72cd1eaf1e5bc5496c2fd1d70e6be2751f Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Sun, 4 Sep 2022 01:19:12 +0300
Subject: [PATCH 08/37] fix(plugin-navigation-tree): CB-2530 no results
 placeholder

---
 .../src/Tree/TreeNode/TreeNodeNestedMessage.tsx        |  1 +
 .../core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts    | 10 ++++++++++
 .../src/NavigationTree/ElementsTree/ElementsTree.tsx   |  4 +++-
 .../NavigationTree/ElementsTree/ElementsTreeLoader.tsx |  9 ++++++++-
 .../packages/plugin-navigation-tree/src/locales/en.ts  |  1 +
 .../packages/plugin-navigation-tree/src/locales/it.ts  |  1 +
 .../packages/plugin-navigation-tree/src/locales/ru.ts  |  1 +
 .../packages/plugin-navigation-tree/src/locales/zh.ts  |  1 +
 8 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
index ce086aea24..12e6444763 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
@@ -7,6 +7,7 @@
  */
 
 interface Props {
+  big?: boolean;
   className?: string;
 }
 
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
index 6b636e8a32..81c3fb97a2 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
@@ -128,6 +128,16 @@ export const TREE_NODE_STYLES = css`
     TreeNodeNestedMessage {
       composes: theme-typography--caption from global;
       padding: 4px 12px;
+
+      [big] {
+        padding: 4px 24px;
+      }
+    }
+
+    tree-box[|big] {
+      & TreeNodeNestedMessage {
+        padding: 4px 24px;
+      }
     }
 
     node TreeNodeControl[big] {
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
index 6108efb502..d341bda009 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
@@ -83,6 +83,7 @@ interface Props extends IElementsTreeOptions {
   selectionTree?: boolean;
   control?: NavTreeControlComponent;
   emptyPlaceholder?: React.FC;
+  big?: boolean;
   style?: ComponentStyle;
   className?: string;
   navNodeFilterCompare?: NavNodeFilterCompareFn;
@@ -103,6 +104,7 @@ export const ElementsTree = observer<Props>(function ElementsTree({
   filters = [],
   renderers = [],
   expandStateGetters,
+  big,
   style,
   className,
   getChildren,
@@ -288,7 +290,7 @@ export const ElementsTree = observer<Props>(function ElementsTree({
   return styled(useStyles(TREE_NODE_STYLES, styles, style))(
     <>
       <ElementsTreeTools tree={tree} style={style} />
-      <tree-box>
+      <tree-box {...use({ big })}>
         <ElementsTreeLoader
           root={root}
           context={context}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx
index 42b4a24d45..bf90a915bd 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx
@@ -9,7 +9,8 @@
 import { observer } from 'mobx-react-lite';
 import styled, { css } from 'reshadow';
 
-import { ILoadableState, Loader } from '@cloudbeaver/core-blocks';
+import { ILoadableState, Loader, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { Translate } from '@cloudbeaver/core-localization';
 
 import type { IElementsTreeContext } from './ElementsTreeContext';
 
@@ -59,6 +60,12 @@ export const ElementsTreeLoader = observer<React.PropsWithChildren<Props>>(funct
           <Loader />
         </center>
       );
+    } else if (context.tree.filtering) {
+      return styled(TREE_NODE_STYLES)(
+        <TreeNodeNestedMessage>
+          <Translate token='app_navigationTree_node_no_results' filter={context.tree.filter} />
+        </TreeNodeNestedMessage>
+      );
     } else if (context.folderExplorer.root === context.folderExplorer.state.folder) {
       return <>{Placeholder && <Placeholder />}</>;
     }
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/en.ts b/webapp/packages/plugin-navigation-tree/src/locales/en.ts
index 9431480094..c79370bf38 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/en.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/en.ts
@@ -16,6 +16,7 @@ export default [
   ['app_navigationTree_node_delete_error', 'Failed to delete "{args.name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Node not found'],
   ['app_navigationTree_connection_view', 'Connection view'],
   ['app_navigationTree_connection_view_option_simple', 'Simple'],
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/it.ts b/webapp/packages/plugin-navigation-tree/src/locales/it.ts
index 1f292e0253..ba3869b56c 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/it.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/it.ts
@@ -16,6 +16,7 @@ export default [
   ['app_navigationTree_settings_folders_title', 'Folders'],
   ['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Node not found'],
   ['app_navigationTree_connection_view', 'Vista di connessione'],
   ['app_navigationTree_connection_view_option_simple', 'Semplice'],
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/ru.ts b/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
index 548fb7d8f2..d53283394a 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
@@ -19,6 +19,7 @@ export default [
   ['app_navigationTree_node_rename_error', 'Ошибка переименования ноды'],
 
   ['app_navigationTree_node_empty', 'Пусто'],
+  ['app_navigationTree_node_no_results', "Извините, не удалось найти элементы содержащие '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Элемент не найден'],
   ['app_navigationTree_connection_view', 'Отображение'],
   ['app_navigationTree_connection_view_option_simple', 'Упрощенное'],
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/zh.ts b/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
index dc78dd91ba..2152ea0e2d 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
@@ -15,6 +15,7 @@ export default [
   ['app_navigationTree_node_delete_error', 'Failed to delete "{args.name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_openNodeTab', '打开'],
   ['app_navigationTree_connection_view', '连接视图'],
   ['app_navigationTree_node_not_found', 'Node not found'],

From 5f793c58d58555a0370bd0a3ba67b0be731dec31 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Tue, 6 Sep 2022 12:43:42 +0300
Subject: [PATCH 09/37] refactor(core-blocks): CB-2425 TabsBox autoSelect
 property

---
 .../core-blocks/src/Split/splitButtonStyles.ts     |  2 +-
 webapp/packages/core-blocks/src/Split/styles.ts    |  5 +++++
 webapp/packages/core-ui/src/Tabs/TabsState.tsx     | 14 +++++++++++---
 .../TablePresentationBar/TablePresentationBar.tsx  |  8 +++++---
 .../src/SqlResultTabs/SqlResultTabs.tsx            |  3 +--
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts b/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
index bca1a25e44..f13c35d775 100644
--- a/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
+++ b/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
@@ -24,7 +24,7 @@ export const buttonStyles = css`
     }
 
     button {
-      composes: theme-button theme-button_unelevated theme-button_background from global;
+      composes: theme-button theme-button_unelevated theme-button_background theme-elevation-z3 from global;
       opacity: 0;
       transition-property: opacity, box-shadow !important;
     }
diff --git a/webapp/packages/core-blocks/src/Split/styles.ts b/webapp/packages/core-blocks/src/Split/styles.ts
index 63897d0cac..1dc65c596f 100644
--- a/webapp/packages/core-blocks/src/Split/styles.ts
+++ b/webapp/packages/core-blocks/src/Split/styles.ts
@@ -36,6 +36,11 @@ export const splitStyles = css`
       cursor: col-resize;
       user-select: none;
       z-index: 1;
+      transition: box-shadow 0.3s ease-in-out;
+
+      &:hover {
+        box-shadow: 0px 3px 3px -2px rgb(0 0 0 / 20%), 0px 3px 4px 0px rgb(0 0 0 / 14%), 0px 1px 8px 0px rgb(0 0 0 / 12%);
+      }
     }
 
     ResizerControls:before {
diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
index d609aacd9e..6d9a3fe924 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
@@ -29,6 +29,7 @@ type Props<T = Record<string, any>> = ExtractContainerProps<T> & React.PropsWith
   localState?: MetadataMap<string, any>;
   lazy?: boolean;
   manual?: boolean;
+  autoSelect?: boolean;
   tabList?: string[];
   enabledBaseActions?: boolean;
   onChange?: (tab: ITabData<T>) => void;
@@ -43,6 +44,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
   localState,
   children,
   lazy = false,
+  autoSelect = true,
   manual,
   tabList,
   enabledBaseActions,
@@ -53,10 +55,16 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
   const props = rest as any as T;
   if (
     !selectedId
-    && currentTabId === undefined
-    && container
+    && (currentTabId === undefined || currentTabId === null)
+    && autoSelect
   ) {
-    const displayed = container.getIdList(props);
+    let displayed: string[] = [];
+
+    if (container) {
+      displayed = container.getIdList(props);
+    } else if (tabList) {
+      displayed = tabList;
+    }
 
     if (displayed.length > 0) {
       selectedId = displayed[0];
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
index 6eebed0ac7..ae77416de5 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
@@ -80,14 +80,16 @@ export const TablePresentationBar = observer<Props>(function TablePresentationBa
     }
   };
 
-  if (presentations.length <= 1 && type === DataPresentationType.main) {
+  const main = type === DataPresentationType.main;
+
+  if (presentations.length <= 1 && main) {
     return null;
   }
 
   return styled(style)(
     <table-left-bar className={className}>
-      <TabsState currentTabId={presentationId}>
-        <TabList {...use({ flexible: type === DataPresentationType.main })}>
+      <TabsState currentTabId={presentationId} autoSelect={main}>
+        <TabList {...use({ flexible: main })}>
           {presentations.map(presentation => (
             <Tab
               key={presentation.id}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
index 11889cc0a2..c1420ca0f2 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
@@ -90,13 +90,12 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
     return styled(style)(<TextPlaceholder>{translate('sql_editor_placeholder')}</TextPlaceholder>);
   }
 
-  const currentId = state.currentTabId || '';
   const tabList = orderedTabs.map(tab => tab.id);
 
   return styled(style)(
     <wrapper>
       <TabsState
-        currentTabId={currentId}
+        currentTabId={state.currentTabId}
         tabList={tabList}
         enabledBaseActions
         onChange={handleSelect}

From 1434c741a1981235bd8c4a606b87e7079973aa45 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Tue, 6 Sep 2022 12:48:15 +0300
Subject: [PATCH 10/37] chore(corer-blocks): CB-2548 product information design

---
 .../core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts  | 8 ++++++++
 .../core-blocks/src/Containers/IContainerProps.ts         | 1 +
 .../src/Containers/filterContainerFakeProps.ts            | 1 +
 webapp/packages/plugin-product/src/ProductInfoDialog.tsx  | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts b/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts
index d41df8da17..894f2f2fcc 100644
--- a/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts
@@ -62,6 +62,10 @@ export const BASE_CONTAINERS_STYLES = css`
       &[parent] {
         padding: 24px;
 
+        &[compact] {
+          padding: 16px;
+        }
+
         &[dense] {
           padding: 8px;
         }
@@ -70,6 +74,10 @@ export const BASE_CONTAINERS_STYLES = css`
       &[gap] {
         gap: 24px;
 
+        &[compact] {
+          gap: 16px;
+        }
+
         &[dense] {
           gap: 8px;
         }
diff --git a/webapp/packages/core-blocks/src/Containers/IContainerProps.ts b/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
index c9c38f2e3a..3023967dad 100644
--- a/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
+++ b/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
@@ -20,4 +20,5 @@ export interface IContainerProps extends ILayoutSizeProps {
   gap?: boolean;
   grid?: boolean;
   dense?: boolean;
+  compact?: boolean;
 }
diff --git a/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts b/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
index ddbf8ee49e..630bfa80a4 100644
--- a/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
+++ b/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
@@ -22,6 +22,7 @@ export function filterContainerFakeProps<T extends IContainerProps>(props: T): O
     gap,
     grid,
     dense,
+    compact,
     ...rest
   } = filterLayoutFakeProps(props);
 
diff --git a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
index 69377937a3..493023c956 100644
--- a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
+++ b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
@@ -65,7 +65,7 @@ export const ProductInfoDialog = observer<DialogComponentProps<null>>(
         onReject={props.rejectDialog}
       >
         <ColoredContainer>
-          <Group gap>
+          <Group gap compact box>
             {!productInfo ? (
               <TextPlaceholder>{translate('app_product_info_placeholder')}</TextPlaceholder>
             ) : (

From bfd15751c769829deddda30b95a71f50d6b01201 Mon Sep 17 00:00:00 2001
From: Aleksandr Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Mon, 5 Sep 2022 20:01:43 +0300
Subject: [PATCH 11/37] CB-2545 fix web session context

---
 .../model/session/SMWebSessionContext.java    | 65 -------------------
 .../cloudbeaver/model/session/WebSession.java |  3 +-
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SMWebSessionContext.java

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SMWebSessionContext.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SMWebSessionContext.java
deleted file mode 100644
index 2db79cbe59..0000000000
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SMWebSessionContext.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.cloudbeaver.model.session;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.auth.SMAuthSpace;
-import org.jkiss.dbeaver.model.auth.SMAuthToken;
-import org.jkiss.dbeaver.model.auth.SMSession;
-import org.jkiss.dbeaver.model.auth.SMSessionContext;
-import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-
-public class SMWebSessionContext implements SMSessionContext {
-
-    private final WebSession session;
-    private final SMSessionContext parentContext;
-
-    public SMWebSessionContext(SMSessionContext parentContext, WebSession session) {
-        this.parentContext = parentContext;
-        this.session = session;
-    }
-
-    @Nullable
-    @Override
-    public SMSession getSpaceSession(@NotNull DBRProgressMonitor monitor, @NotNull SMAuthSpace space, boolean open) throws DBException {
-        return parentContext.getSpaceSession(monitor, session.getSessionSpace(), open);
-    }
-
-    @Nullable
-    @Override
-    public SMSession findSpaceSession(@NotNull SMAuthSpace space) {
-        return parentContext.findSpaceSession(session.getSessionSpace());
-    }
-
-    @Override
-    public SMAuthToken[] getSavedTokens() {
-        return parentContext.getSavedTokens();
-    }
-
-    @Override
-    public void addSession(@NotNull SMSession session) {
-        parentContext.addSession(session);
-    }
-
-    @Override
-    public boolean removeSession(@NotNull SMSession session) {
-        return parentContext.removeSession(session);
-    }
-}
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index 8a3fcb092b..576bec1450 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -352,10 +352,9 @@ public class WebSession extends AbstractSessionPersistent implements SMSession,
     public VirtualProjectImpl createVirtualProject(RMProject project) {
         // Do not filter data sources from user project
         DataSourceFilter filter = project.getType() == RMProject.Type.USER ? x -> true : this::isDataSourceAccessible;
-        SMSessionContext projectSessionContext = new SMWebSessionContext(sessionAuthContext, this);
         VirtualProjectImpl sessionProject = application.createProjectImpl(
             project,
-            projectSessionContext,
+            sessionAuthContext,
             this,
             filter);
         DBPDataSourceRegistry dataSourceRegistry = sessionProject.getDataSourceRegistry();

From be9a5804d4b7dde2a248eac544da4e81aa1dd351 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Tue, 6 Sep 2022 13:44:26 +0300
Subject: [PATCH 12/37] CB-2112 fix(plugin-sql-editor): Format only current
 script

---
 webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
index 19c363af76..e2b4e3c204 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
@@ -203,7 +203,7 @@ export function useSqlEditor(state: ISqlEditorTabState): ISQLEditorData {
       }
 
       const query = this.value;
-      const script = this.getExecutingQuery(true);
+      const script = this.getExecutingQuery(false);
 
       if (!script) {
         return;

From ac4841e815336753701390eef808031b78fa4d55 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 7 Sep 2022 09:37:17 +0200
Subject: [PATCH 13/37] dbeaver/dbeaver-ee#1905 Driver controller model, use
 config controllers to load/save drivers

---
 .../io/cloudbeaver/server/WebPlatformActivator.java    | 10 ----------
 .../src/io/cloudbeaver/server/CBPlatform.java          |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
index d883272519..e3c97cb7cf 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
@@ -72,16 +72,6 @@ public class WebPlatformActivator extends Plugin {
         super.stop(context);
     }
 
-    /**
-     * Returns configuration file
-     */
-    public static synchronized File getConfigurationFile(String fileName) {
-        if (configDir == null) {
-            configDir = getInstance().getStateLocation().toFile();
-        }
-        return new File(configDir, fileName);
-    }
-
     public DBPPreferenceStore getPreferences() {
         return preferences;
     }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
index da00499683..e64aed6c67 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -21,6 +21,7 @@ import io.cloudbeaver.registry.WebDriverRegistry;
 import io.cloudbeaver.service.session.WebSessionManager;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -268,10 +269,9 @@ public class CBPlatform extends BasePlatformImpl {
         return folder.toFile();
     }
 
-    @NotNull
     @Override
-    public File getConfigurationFile(String fileName) {
-        return WebPlatformActivator.getConfigurationFile(fileName);
+    protected Plugin getProductPlugin() {
+        return WebPlatformActivator.getInstance();
     }
 
     @Override

From 47961b283b9ce15579122d12dc209d5d0c5f775f Mon Sep 17 00:00:00 2001
From: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:03:51 +0300
Subject: [PATCH 14/37] CB-123 chore: update README

---
 README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/README.md b/README.md
index 44fdfae0f3..e90490e3f1 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,34 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 
 ## Changelog
 
+### CloudBeaver 22.2.0 - 2022-09-06
+
+Changes since 22.1.0
+- Public page:
+  - administrators can create shared connections via the Connection menu.
+- Resource Manager:
+  - users can group scripts into folders; 
+  - when internet connection is lost, script editing is disabled to prevent users from losing data;
+  - users can refresh all scripts by clicking one button; 
+  - users can rename scripts. 
+- Database Navigator:
+  - users can group connections into folders. 
+- SQL Editor:
+  - "Link with Editor" tool is now available for the SQL Editor and synchronizes it with the element in the Database Navigator; 
+  - script formatting can be undone.
+- The Data Editor:
+  - non-editable tables are marked;
+  - users can change the coordinate system for spatial data in the Value panel. 
+- Local configuration:
+  - the application language can be set;
+  - the number of table rows to load can be configured to prevent the application from slowing down in the following cases:
+    - the default number of loaded rows when users open a table and then scroll it,
+    - the minimum and maximum number of rows, which users can load at once when scrolling the table;
+  - SQL query execution time limit can be changed;
+- The cookies can be disabled.
+- The product upgrade scripts were improved to avoid possible UI issues.
+- A lot of small bug fixes, enhancements and improvements have been made.
+
 ### CloudBeaver 22.1.4 - 2022-08-08
 - Local  configuration:
   - The structure of the local configuration file has been improved to simplify the modification process;

From ba3e26453b0a6afb753b27312ff40c995130e800 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 7 Sep 2022 11:27:40 +0200
Subject: [PATCH 15/37] dbeaver/dbeaver-ee#1905 Switch local configs to NIO

---
 .../rm/local/LocalResourceController.java     |  6 +--
 .../src/io/cloudbeaver/server/CBPlatform.java |  4 +-
 .../service/sql/WebSQLDataLOBReceiver.java    | 16 +++++---
 .../service/sql/WebSQLResultServlet.java      | 15 ++++---
 .../cloudbeaver/service/sql/WebSQLUtils.java  |  4 +-
 .../transfer/impl/WebDataTransferServlet.java | 10 ++---
 .../impl/WebDataTransferTaskConfig.java       | 18 ++++----
 .../transfer/impl/WebServiceDataTransfer.java | 41 ++++++++++---------
 8 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
index 7f5f39f361..c11891bbf7 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -204,7 +204,7 @@ public class LocalResourceController implements RMController {
     public RMProject createProject(@NotNull String name, @Nullable String description) throws DBException {
         if (!Files.exists(sharedProjectsPath)) {
             try {
-                Files.createDirectory(sharedProjectsPath);
+                Files.createDirectories(sharedProjectsPath);
             } catch (IOException e) {
                 throw new DBException("Error creating shared project path", e);
             }
@@ -216,7 +216,7 @@ public class LocalResourceController implements RMController {
             throw new DBException("Project '" + name + "' already exists");
         }
         try {
-            Files.createDirectory(getProjectPath(project.getId()));
+            Files.createDirectories(getProjectPath(project.getId()));
             return project;
         } catch (IOException e) {
             throw new DBException("Error creating project path", e);
@@ -354,7 +354,7 @@ public class LocalResourceController implements RMController {
         }
         try {
             if (isFolder) {
-                Files.createDirectory(targetPath);
+                Files.createDirectories(targetPath);
             } else {
                 Files.createFile(targetPath);
             }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
index e64aed6c67..598dbdb69b 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -245,7 +245,7 @@ public class CBPlatform extends BasePlatformImpl {
     }
 
     @NotNull
-    public File getTempFolder(DBRProgressMonitor monitor, String name) {
+    public Path getTempFolder(DBRProgressMonitor monitor, String name) {
         if (tempFolder == null) {
             // Make temp folder
             monitor.subTask("Create temp folder");
@@ -266,7 +266,7 @@ public class CBPlatform extends BasePlatformImpl {
                 log.error("Error creating temp folder '" + folder.toAbsolutePath() + "'", e);
             }
         }
-        return folder.toFile();
+        return folder;
     }
 
     @Override
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
index a5d5a34309..635e857d8e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
@@ -28,9 +28,9 @@ import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -38,7 +38,7 @@ import java.util.List;
 
 public class WebSQLDataLOBReceiver implements DBDDataReceiver {
     private static final Log log = Log.getLog(WebSQLDataLOBReceiver.class);
-    public static final File DATA_EXPORT_FOLDER = CBPlatform.getInstance().getTempFolder(new VoidProgressMonitor(), "sql-lob-files");
+    public static final Path DATA_EXPORT_FOLDER = CBPlatform.getInstance().getTempFolder(new VoidProgressMonitor(), "sql-lob-files");
 
     private final String tableName;
     private final DBSDataContainer dataContainer;
@@ -51,8 +51,12 @@ public class WebSQLDataLOBReceiver implements DBDDataReceiver {
         this.tableName = tableName;
         this.dataContainer = dataContainer;
         this.rowIndex = rowIndex;
-        if (!DATA_EXPORT_FOLDER.exists()){
-            DATA_EXPORT_FOLDER.mkdirs();
+        if (!Files.exists(DATA_EXPORT_FOLDER)){
+            try {
+                Files.createDirectories(DATA_EXPORT_FOLDER);
+            } catch (IOException e) {
+                log.error("Error creating temp folder", e);
+            }
         }
 
     }
@@ -81,8 +85,8 @@ public class WebSQLDataLOBReceiver implements DBDDataReceiver {
             throw new DBQuotaException(
                     "Data export quota exceeded", CBConstants.QUOTA_PROP_FILE_LIMIT, fileSizeLimit.longValue(), binaryValue.length);
         }
-        File file = new File(DATA_EXPORT_FOLDER, exportFileName);
-        Files.write(file.toPath(), binaryValue);
+        Path file = DATA_EXPORT_FOLDER.resolve(exportFileName);
+        Files.write(file, binaryValue);
         return exportFileName;
     }
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultServlet.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultServlet.java
index b711238394..bd55958c2e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultServlet.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultServlet.java
@@ -17,11 +17,10 @@ import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -29,7 +28,7 @@ import java.util.regex.Pattern;
 public class WebSQLResultServlet extends WebServiceServletBase {
 
     private static final Log log = Log.getLog(WebSQLResultServlet.class);
-    private static final MultipartConfigElement MULTI_PART_CONFIG = new MultipartConfigElement(WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER.getAbsolutePath());
+    private static final MultipartConfigElement MULTI_PART_CONFIG = new MultipartConfigElement(WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER.toAbsolutePath().toString());
 
     // context-id/result-id/row-number/attribute-name
     private static final Pattern URL_PATTERN = Pattern.compile("/?([\\w]+)/([0-9]+)/([0-9]+)/([0-9]+)/(.+)[/\\?]?");
@@ -68,18 +67,18 @@ public class WebSQLResultServlet extends WebServiceServletBase {
                 valuePath = valuePath.substring(1);
             }
 
-            File dataFile = new File(WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER, valuePath);
+            Path dataFile = WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER.resolve(valuePath);
             session.addInfoMessage("Download LOB file ...");
             response.setHeader("Content-Type", "application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment; filename=\"" + dataFile.getName() + "\"");
-            response.setHeader("Content-Length", String.valueOf(dataFile.length()));
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + dataFile.getFileName().toString() + "\"");
+            response.setHeader("Content-Length", String.valueOf(Files.size(dataFile)));
             response.setDateHeader("Expires", System.currentTimeMillis() + CBStaticServlet.STATIC_CACHE_SECONDS * 1000);
             response.setHeader("Cache-Control", "public, max-age=" + CBStaticServlet.STATIC_CACHE_SECONDS);
 
-            try (InputStream is = new FileInputStream(dataFile)) {
+            try (InputStream is = Files.newInputStream(dataFile)) {
                 IOUtils.copyStream(is, response.getOutputStream());
             }
-            Files.deleteIfExists(dataFile.toPath());
+            Files.deleteIfExists(dataFile);
         }
     }
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
index 74ca228f4b..a464549408 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
@@ -39,9 +39,9 @@ import org.jkiss.utils.Base64;
 import org.jkiss.utils.CommonUtils;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.*;
 
 /**
@@ -211,7 +211,7 @@ public class WebSQLUtils {
                     case WebSQLConstants.VALUE_TYPE_CONTENT: {
                         if (map.get(WebSQLConstants.ATTR_BINARY) != null) {
                             DBDContentStorage storage;
-                            File openFile = new File(WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER, (String) map.get("fileName"));
+                            Path openFile = WebSQLDataLOBReceiver.DATA_EXPORT_FOLDER.resolve((String) map.get("fileName"));
                             Object tempValue = ((DBDAttributeBinding) attribute).getValueHandler().getValueFromObject(
                                     session,
                                     attribute,
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
index 3ab5a9471f..623be196df 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
@@ -14,10 +14,10 @@ import org.jkiss.utils.IOUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class WebDataTransferServlet extends WebServiceServletBase {
 
@@ -56,13 +56,13 @@ public class WebDataTransferServlet extends WebServiceServletBase {
             fileName = taskInfo.getDataFileId();
         }
 
-        File dataFile = taskInfo.getDataFile();
+        Path dataFile = taskInfo.getDataFile();
         session.addInfoMessage("Download data ...");
         response.setHeader("Content-Type", processor.getContentType());
         response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
-        response.setHeader("Content-Length", String.valueOf(dataFile.length()));
+        response.setHeader("Content-Length", String.valueOf(Files.size(dataFile)));
 
-        try (InputStream is = new FileInputStream(dataFile)) {
+        try (InputStream is = Files.newInputStream(dataFile)) {
             IOUtils.copyStream(is, response.getOutputStream());
         }
 
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferTaskConfig.java b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferTaskConfig.java
index f9ebb9aa80..c56f0c73c2 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferTaskConfig.java
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferTaskConfig.java
@@ -2,27 +2,29 @@ package io.cloudbeaver.service.data.transfer.impl;
 
 import org.jkiss.dbeaver.Log;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class WebDataTransferTaskConfig {
 
     private static final Log log = Log.getLog(WebDataTransferTaskConfig.class);
 
-    private File dataFile;
+    private Path dataFile;
     private WebDataTransferParameters parameters;
     private String exportFileName;
 
-    public WebDataTransferTaskConfig(File dataFile, WebDataTransferParameters parameters) {
+    public WebDataTransferTaskConfig(Path dataFile, WebDataTransferParameters parameters) {
         this.dataFile = dataFile;
         this.parameters = parameters;
     }
 
-    public File getDataFile() {
+    public Path getDataFile() {
         return dataFile;
     }
 
     public String getDataFileId() {
-        return dataFile.getName();
+        return dataFile.getFileName().toString();
     }
 
     public WebDataTransferParameters getParameters() {
@@ -38,8 +40,10 @@ public class WebDataTransferTaskConfig {
     }
 
     public void deleteFile() {
-        if (!dataFile.delete()) {
-            log.error("Error deleting export file " + dataFile.getAbsolutePath());
+        try {
+            Files.delete(dataFile);
+        } catch (IOException e) {
+            log.error("Error deleting export file " + dataFile.toAbsolutePath(), e);
         }
     }
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
index 7f3860c785..81fc63357f 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
@@ -51,9 +51,10 @@ import org.jkiss.dbeaver.tools.transfer.stream.StreamTransferConsumer;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,21 +67,19 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
 
     private static final Log log = Log.getLog(WebServiceDataTransfer.class);
 
-    private final File dataExportFolder;
+    private final Path dataExportFolder;
 
     public WebServiceDataTransfer() {
         dataExportFolder = CBPlatform.getInstance().getTempFolder(new VoidProgressMonitor(), "data-transfer");
 
         ContentUtils.deleteFileRecursive(dataExportFolder);
-        if (!dataExportFolder.mkdirs()) {
-            log.error("Error re-creating temporary folder");
+        try {
+            Files.createDirectories(dataExportFolder);
+        } catch (IOException e) {
+            log.error("Error re-creating temporary folder", e);
         }
     }
 
-    public File getDataExportFolder() {
-        return dataExportFolder;
-    }
-
     @Override
     public List<WebDataTransferStreamProcessor> getAvailableStreamProcessors(WebSession session) {
         List<DataTransferProcessorDescriptor> processors = DataTransferRegistry.getInstance().getAvailableProcessors(StreamTransferConsumer.class, DBSEntity.class);
@@ -130,10 +129,12 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
         if (taskInfo == null) {
             throw new DBWebException("Session task '" + dataFileId + "' not found");
         }
-        File dataFile = taskInfo.getDataFile();
+        Path dataFile = taskInfo.getDataFile();
         if (dataFile != null) {
-            if (!dataFile.delete()) {
-                log.warn("Error deleting data file '" + dataFile.getAbsolutePath() + "'");
+            try {
+                Files.delete(dataFile);
+            } catch (IOException e) {
+                log.warn("Error deleting data file '" + dataFile.toAbsolutePath() + "'", e);
             }
         }
         dtConfig.removeTask(taskInfo);
@@ -151,13 +152,15 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
                 monitor.beginTask("Export data", 1);
                 try {
                     monitor.subTask("Export data using " + processor.getName());
-                    File exportFile = new File(dataExportFolder, makeUniqueFileName(sqlProcessor, processor));
+                    Path exportFile = dataExportFolder.resolve(makeUniqueFileName(sqlProcessor, processor));
                     try {
                         exportData(monitor, processor, dataContainer, parameters, resultsInfo, exportFile);
                     } catch (Exception e) {
-                        if (exportFile.exists()) {
-                            if (!exportFile.delete()) {
-                                log.error("Error deleting export file " + exportFile.getAbsolutePath());
+                        if (Files.exists(exportFile)) {
+                            try {
+                                Files.delete(exportFile);
+                            } catch (IOException ex) {
+                                log.error("Error deleting export file " + exportFile.toAbsolutePath(), e);
                             }
                         }
                         if (e instanceof DBException) {
@@ -170,7 +173,7 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
                     taskConfig.setExportFileName(exportFileName);
                     WebDataTransferUtils.getSessionDataTransferConfig(sqlProcessor.getWebSession()).addTask(taskConfig);
 
-                    result = exportFile.getName();
+                    result = exportFile.getFileName().toString();
                 } catch (Throwable e) {
                     throw new InvocationTargetException(e);
                 } finally {
@@ -187,7 +190,7 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
         DBSDataContainer dataContainer,
         WebDataTransferParameters parameters,
         WebSQLResultsInfo resultsInfo,
-        File exportFile) throws DBException, IOException
+        Path exportFile) throws DBException, IOException
     {
         IDataTransferProcessor processorInstance = processor.getInstance();
         if (!(processorInstance instanceof IStreamDataExporter)) {
@@ -211,8 +214,8 @@ public class WebServiceDataTransfer implements DBWServiceDataTransfer {
         StreamConsumerSettings settings = new StreamConsumerSettings();
 
         settings.setOutputEncodingBOM(false);
-        settings.setOutputFolder(exportFile.getParentFile().getAbsolutePath());
-        settings.setOutputFilePattern(exportFile.getName());
+        settings.setOutputFolder(exportFile.getParent().toAbsolutePath().toString());
+        settings.setOutputFilePattern(exportFile.getFileName().toString());
 
         Map<String, Object> properties = new HashMap<>();
 

From d9d0a73c533ba114f20f1f7bda7e2896bd604490 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Wed, 7 Sep 2022 14:30:40 +0300
Subject: [PATCH 16/37] CB-2289 fix(plugin-sql-editor): Update suggestions for
 sql editor after schema change

---
 .../core-utils/src/createLastPromiseGetter.ts | 26 +++++++++++
 webapp/packages/core-utils/src/index.ts       |  3 +-
 .../src/SqlEditor/ISQLEditorData.ts           |  6 ++-
 .../useSQLCodeEditorPanel.ts                  | 43 +++----------------
 .../src/SqlEditor/useSqlEditor.ts             | 34 +++++++++++----
 5 files changed, 63 insertions(+), 49 deletions(-)
 create mode 100644 webapp/packages/core-utils/src/createLastPromiseGetter.ts

diff --git a/webapp/packages/core-utils/src/createLastPromiseGetter.ts b/webapp/packages/core-utils/src/createLastPromiseGetter.ts
new file mode 100644
index 0000000000..13ab66912d
--- /dev/null
+++ b/webapp/packages/core-utils/src/createLastPromiseGetter.ts
@@ -0,0 +1,26 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 type LastPromiseGetterKey = Array<string | number | boolean | undefined | null>;
+export type LastPromiseGetter<R> = (key: LastPromiseGetterKey, query: () => Promise<R>) => Promise<R>;
+export function createLastPromiseGetter<R>(): LastPromiseGetter<R> {
+  let lastKey: LastPromiseGetterKey | undefined = undefined;
+  let lastPromise: Promise<R> | undefined = undefined;
+
+  return async (key: LastPromiseGetterKey, getter: () => Promise<R>) => {
+    const currentKeyStr = JSON.stringify(key);
+    const lastKeyStr = lastKey ? JSON.stringify(lastKey) : undefined;
+
+    if (currentKeyStr !== lastKeyStr) {
+      lastKey = key;
+      lastPromise = getter();
+    }
+
+    return lastPromise!;
+  };
+}
diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
index a4ec9351de..1ea1946795 100644
--- a/webapp/packages/core-utils/src/index.ts
+++ b/webapp/packages/core-utils/src/index.ts
@@ -44,4 +44,5 @@ export * from './createPath';
 export * from './debounce';
 export * from './svgToDataUri';
 export * from './uriToBlob';
-export * from './utf8ToBase64';
\ No newline at end of file
+export * from './utf8ToBase64';
+export * from './createLastPromiseGetter';
\ No newline at end of file
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
index 29ec4c89c5..26bd087745 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
@@ -60,7 +60,11 @@ export interface ISQLEditorData {
   executeQueryNewTab(): Promise<void>;
   showExecutionPlan(): Promise<void>;
   executeScript(): Promise<void>;
-  getHintProposals(position: number, simple: boolean): Promise<SQLProposal[]>;
+  getHintProposals(
+    position: number,
+    word: string,
+    simple: boolean
+  ): Promise<SQLProposal[]>;
   executeQueryAction<T>(
     segment: ISQLScriptSegment | undefined,
     action: (query: ISQLScriptSegment) => Promise<T>,
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
index 12d6142bfd..024d92c59d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
@@ -18,16 +18,11 @@ import { action } from 'mobx';
 import type { IControlledCodeMirror } from 'react-codemirror2';
 
 import { useExecutor, useObservableRef } from '@cloudbeaver/core-blocks';
-import type { SqlCompletionProposal } from '@cloudbeaver/core-sdk';
 
 import type { ISQLEditorData } from '../ISQLEditorData';
 import type { SQLCodeEditorController } from '../SQLCodeEditor/SQLCodeEditorController';
 
 interface ISQLCodeEditorPanelData {
-  proposalsWordFrom: Position | null;
-  proposalsWord: string | null;
-  proposalsMode: boolean | null;
-  proposals: SqlCompletionProposal[] | null;
   readonly activeSuggest: boolean;
   readonly bindings: Omit<IControlledCodeMirror, 'value'>;
   closeHint(): void;
@@ -51,7 +46,6 @@ export function useSQLCodeEditorPanel(
   controller: SQLCodeEditorController | null
 ): ISQLCodeEditorPanelData {
   const editorPanelData = useObservableRef<ISQLCodeEditorPanelDataPrivate>(() => ({
-    proposals: null,
     activeSuggest: true,
     options: {
       theme: 'material',
@@ -225,38 +219,11 @@ export function useSQLCodeEditorPanel(
           : from
       );
 
-      const proposalWord = word.slice(0, 1);
-      let proposals = editorPanelData.proposals;
-
-      if (
-        proposals === null
-        || editorPanelData.proposalsWord !== proposalWord
-        || editorPanelData.proposalsMode !== options.completeSingle
-        || editorPanelData.proposalsWordFrom?.ch !== from.ch
-        || editorPanelData.proposalsWordFrom.line !== from.line
-        || !word.startsWith(editorPanelData.proposalsWord)
-      ) {
-        const proposalsMode = options.completeSingle ?? false;
-        editorPanelData.proposalsMode = proposalsMode;
-        editorPanelData.proposalsWord = proposalWord;
-        editorPanelData.proposalsWordFrom = from;
-        editorPanelData.proposals = [];
-
-        proposals = await editorPanelData.data.getHintProposals(cursorPosition, !options.completeSingle);
-
-        if (
-          editorPanelData.proposalsWord === proposalWord
-          && editorPanelData.proposalsWordFrom === from
-          && editorPanelData.proposalsMode === proposalsMode
-        ) {
-          editorPanelData.proposals = proposals;
-
-          if (editor.state.completionActive && proposals.length > 0) {
-            editor.state.completionActive.update();
-            return;
-          }
-        }
-      }
+      let proposals = await editorPanelData.data.getHintProposals(
+        cursorPosition,
+        word,
+        !options.completeSingle
+      );
 
       proposals = proposals.filter(
         ({ displayString }) => (
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
index 19c363af76..f17861e975 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
@@ -14,8 +14,8 @@ import { ConnectionExecutionContextService, createConnectionParam } from '@cloud
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { SyncExecutor } from '@cloudbeaver/core-executor';
-import type { SqlDialectInfo } from '@cloudbeaver/core-sdk';
-import { throttleAsync } from '@cloudbeaver/core-utils';
+import type { SqlCompletionProposal, SqlDialectInfo } from '@cloudbeaver/core-sdk';
+import { createLastPromiseGetter, LastPromiseGetter, throttleAsync } from '@cloudbeaver/core-utils';
 
 import type { ISqlEditorTabState } from '../ISqlEditorTabState';
 import type { ISqlDataSource } from '../SqlDataSource/ISqlDataSource';
@@ -38,6 +38,7 @@ interface ISQLEditorDataPrivate extends ISQLEditorData {
   readonly commonDialogService: CommonDialogService;
   readonly sqlResultTabsService: SqlResultTabsService;
   readonly dataSource: ISqlDataSource | undefined;
+  readonly getLastAutocomplete: LastPromiseGetter<SqlCompletionProposal[]>;
 
   cursor: ICursor;
   readonlyState: boolean;
@@ -179,22 +180,37 @@ export function useSqlEditor(state: ISqlEditorTabState): ISQLEditorData {
       this.onUpdate.execute();
     },
 
-    getHintProposals: throttleAsync(async function getHintProposals(this: ISQLEditorDataPrivate, position, simple) {
+    getLastAutocomplete: createLastPromiseGetter(),
+
+    getHintProposals: throttleAsync(async function getHintProposals(
+      this: ISQLEditorDataPrivate,
+      position,
+      word,
+      simple
+    ) {
       if (!this.dataSource?.executionContext) {
         return [];
       }
 
-      const proposals = await this.sqlEditorService
+      const { connectionId, id, defaultSchema, defaultCatalog } = this.dataSource.executionContext;
+
+      return this.getLastAutocomplete([
+        connectionId,
+        id,
+        defaultSchema,
+        defaultCatalog,
+        position,
+        simple,
+        word.slice(0, 1),
+      ], () => this.sqlEditorService
         .getAutocomplete(
-          this.dataSource.executionContext.connectionId,
-          this.dataSource.executionContext.id,
+          connectionId,
+          id,
           this.value,
           position,
           undefined,
           simple
-        );
-
-      return proposals;
+        ));
     }, 1000 / 3),
 
     async formatScript(): Promise<void> {

From 322baa419703a5481de4727db2c1aef14aa9e466 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 15:52:24 +0300
Subject: [PATCH 17/37] fix(plugin-connections): CB-2503 driver properties
 loading

---
 .../ConnectionForm/DriverProperties/DriverProperties.tsx    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
index eb11f8eeb4..4d7ac0dec2 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
@@ -11,10 +11,10 @@ import { observer } from 'mobx-react-lite';
 import { useMemo, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, IProperty, Loader, PropertiesTable, useMapResource } from '@cloudbeaver/core-blocks';
 import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { useStyles } from '@cloudbeaver/core-theming';
+import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 import { uuid } from '@cloudbeaver/core-utils';
 
 import type { IConnectionFormProps } from '../IConnectionFormProps';
@@ -66,10 +66,10 @@ export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps>
     DBDriverResource,
     { key: (selected && formState.config.driverId) || null, includes: ['includeDriverProperties'] },
     {
-      isActive: () => selected && !!formState.config.driverId,
+      active: selected && !!formState.config.driverId,
       onData: driver => {
         for (const key of Object.keys(formState.config.properties)) {
-          if (driver.driverProperties?.some(property => property.id === key)
+          if (driver.driverProperties.some(property => property.id === key)
            || state.propertiesList.some(property => property.key === key)) {
             continue;
           }

From a2d77271552990cd337281a5bd46dc5231d663a5 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Tue, 6 Sep 2022 10:40:44 +0300
Subject: [PATCH 18/37] CB-2514 fix(plugin-connections): Do not show unsaved
 changes dialog

---
 .../src/ConnectionForm/Options/ConnectionOptionsTabService.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index 54528cbd67..acc6f743e9 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -237,9 +237,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
 
     tempConfig.description = state.config.description;
 
-    if (state.projectId === PROJECT_GLOBAL_ID) {
-      tempConfig.template = state.config.template;
-    }
+    tempConfig.template = state.projectId === PROJECT_GLOBAL_ID ? state.config.template : false;
 
     tempConfig.driverId = state.config.driverId;
 

From a6cbbc8a472dcbd063c3876c2700d30a1509fc9c Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 16:47:44 +0300
Subject: [PATCH 19/37] fix: CB-2503 cached resources optimization

---
 .../core-blocks/src/useMapResource.ts         |  1 +
 .../core-connections/src/DBDriverResource.ts  | 17 ++++---
 webapp/packages/core-di/src/App.ts            | 50 ++++++++++---------
 webapp/packages/core-di/src/DIService.ts      |  2 +-
 .../src/Resource/CachedMapResource.ts         |  1 +
 .../core-sdk/src/Resource/CachedResource.ts   |  8 ++-
 6 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/webapp/packages/core-blocks/src/useMapResource.ts b/webapp/packages/core-blocks/src/useMapResource.ts
index 2a3c55b40d..ae9f4cfd7d 100644
--- a/webapp/packages/core-blocks/src/useMapResource.ts
+++ b/webapp/packages/core-blocks/src/useMapResource.ts
@@ -276,6 +276,7 @@ export function useMapResource<
     preloaded: computed,
     exception: observable.ref,
     loading: observable.ref,
+    resource: observable.ref,
   }, {
     exceptionObserved: false,
     resource,
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index a853b9e832..d8a2c5ab1e 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { computed, makeObservable } from 'mobx';
+import { computed, makeObservable, runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { EPermission, SessionPermissionsResource, ServerConfigResource } from '@cloudbeaver/core-root';
@@ -72,16 +72,19 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
         ...this.getIncludesMap(driverId, includes),
       });
 
-      if (all) {
-        this.resetIncludes();
-        this.data.clear();
-      }
-
       if (driverId && !drivers.some(driver => driver.id === driverId)) {
         throw new Error('Driver is not found');
       }
 
-      this.updateDriver(...drivers);
+      runInAction(() => {
+
+        if (all) {
+          this.resetIncludes();
+          this.data.clear();
+        }
+
+        this.updateDriver(...drivers);
+      });
     });
 
     return this.data;
diff --git a/webapp/packages/core-di/src/App.ts b/webapp/packages/core-di/src/App.ts
index 2c3edc1b5c..88feb6db4a 100644
--- a/webapp/packages/core-di/src/App.ts
+++ b/webapp/packages/core-di/src/App.ts
@@ -6,10 +6,12 @@
  * you may not use this file except in compliance with the License.
  */
 
+import { flat } from '@cloudbeaver/core-utils';
+
 import { Bootstrap } from './Bootstrap';
 import { Dependency } from './Dependency';
 import type { DIContainer } from './DIContainer';
-import type { IServiceCollection, IServiceInjector } from './IApp';
+import type { IServiceCollection, IServiceConstructor, IServiceInjector } from './IApp';
 import { IDiWrapper, inversifyWrapper } from './inversifyWrapper';
 import type { PluginManifest } from './PluginManifest';
 
@@ -24,6 +26,14 @@ export class App {
     this.getServiceCollection().addServiceByClass(App, this);
   }
 
+  getPlugins(): PluginManifest[] {
+    return [...this.plugins];
+  }
+
+  getServices(): IServiceConstructor<any>[] {
+    return flat(this.plugins.map(plugin => plugin.providers));
+  }
+
   registerChildContainer(container: DIContainer): void {
     this.diWrapper.registerChildContainer(container);
   }
@@ -42,41 +52,33 @@ export class App {
 
   // first phase register all dependencies
   registerServices(): void {
-    for (const plugin of this.plugins) {
-      if (plugin.providers.length) {
-        plugin.providers.forEach(provider => {
-          // console.log('provider', provider.name);
-          this.diWrapper.collection.addServiceByClass(provider);
-        });
-      }
+    for (const service of this.getServices()) {
+      // console.log('provider', provider.name);
+      this.diWrapper.collection.addServiceByClass(service);
     }
   }
 
   async initializeServices(): Promise<void> {
-    for (const plugin of this.plugins) {
-      for (const service of plugin.providers) {
-        if (service.prototype instanceof Bootstrap) {
-          const serviceInstance = this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
+    for (const service of this.getServices()) {
+      if (service.prototype instanceof Bootstrap) {
+        const serviceInstance = this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
 
-          if ('register' in serviceInstance) {
-            await serviceInstance.register();
-          }
-        } else if (service.prototype instanceof Dependency) {
-          this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
+        if ('register' in serviceInstance) {
+          await serviceInstance.register();
         }
+      } else if (service.prototype instanceof Dependency) {
+        this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
       }
     }
   }
 
   async loadServices(): Promise<void> {
-    for (const plugin of this.plugins) {
-      for (const service of plugin.providers) {
-        if (service.prototype instanceof Bootstrap) {
-          const serviceInstance = this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
+    for (const service of this.getServices()) {
+      if (service.prototype instanceof Bootstrap) {
+        const serviceInstance = this.diWrapper.injector.getServiceByClass<Bootstrap>(service);
 
-          if ('load' in serviceInstance) {
-            await serviceInstance.load();
-          }
+        if ('load' in serviceInstance) {
+          await serviceInstance.load();
         }
       }
     }
diff --git a/webapp/packages/core-di/src/DIService.ts b/webapp/packages/core-di/src/DIService.ts
index d9e12f8672..ee64426027 100644
--- a/webapp/packages/core-di/src/DIService.ts
+++ b/webapp/packages/core-di/src/DIService.ts
@@ -8,7 +8,7 @@
 
 import type { ISyncContextLoader } from '@cloudbeaver/core-executor';
 
-import type { App } from './App';
+import { App } from './App';
 import type { IServiceConstructor, IServiceInjector } from './IApp';
 import { injectable } from './injectable';
 
diff --git a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
index 4a38af4b34..c43a0bfe68 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
@@ -454,6 +454,7 @@ export abstract class CachedMapResource<
     if (key === undefined) {
       key = ResourceKeyUtils.join(resourceKeyList(this.keys), ...this.loadedKeys.map(key => this.transformParam(key)));
       this.loadedKeys = [];
+      this.resetIncludes();
     } else {
       if (this.isAlias(key)) {
         const index = this.loadedKeys.findIndex(loadedKey => this.isAliasEqual(key!, loadedKey));
diff --git a/webapp/packages/core-sdk/src/Resource/CachedResource.ts b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
index 80fe862dab..4e751b2682 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
@@ -98,7 +98,10 @@ export abstract class CachedResource<
       this.spy(this.onDataError, 'onDataError');
     }
 
-    makeObservable<CachedResource<TData, TParam, TKey, TContext>, 'loader' | 'loadedKeys'>(this, {
+    makeObservable<
+    CachedResource<TData, TParam, TKey, TContext>,
+    'loader' | 'loadedKeys' | 'commitIncludes' | 'resetIncludes' | 'markOutdatedSync'
+    >(this, {
       loadedKeys: observable,
       data: observable,
       loader: action,
@@ -107,6 +110,9 @@ export abstract class CachedResource<
       markDataError: action,
       markOutdated: action,
       markUpdated: action,
+      commitIncludes: action,
+      markOutdatedSync: action,
+      resetIncludes: action,
     });
   }
 

From ac927586a3630a8b647547576cfc668f6f5b2928 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 16:51:55 +0300
Subject: [PATCH 20/37] refactor: CB-2503 DataContext find fn

---
 .../core-ui/src/Tabs/TabsBootstrap.ts         |  2 +-
 .../core-view/src/DataContext/DataContext.ts  | 23 +++++++++++++++++--
 .../src/DataContext/DynamicDataContext.ts     | 12 ++++++++--
 .../src/DataContext/IDataContextProvider.ts   |  4 +++-
 .../core-view/src/Menu/MenuService.ts         |  2 +-
 .../TableHeader/TableHeaderService.ts         |  2 +-
 .../ConnectionSchemaManagerBootstrap.ts       |  4 ++--
 .../src/DdlViewer/DDLViewerFooterService.ts   |  2 +-
 .../SqlGenerators/SqlGeneratorsBootstrap.ts   |  2 +-
 9 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts b/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
index bdc74d68bb..0caf82a6d2 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
@@ -31,7 +31,7 @@ export class TabsBootstrap extends Bootstrap {
     this.actionService.addHandler({
       id: 'tabs-base-handler',
       isActionApplicable: (context, action) => {
-        const menu = context.find(DATA_CONTEXT_MENU, MENU_TAB);
+        const menu = context.hasValue(DATA_CONTEXT_MENU, MENU_TAB);
         const state = context.tryGet(DATA_CONTEXT_TABS_CONTEXT);
         const tab = context.tryGet(DATA_CONTEXT_TAB_ID);
 
diff --git a/webapp/packages/core-view/src/DataContext/DataContext.ts b/webapp/packages/core-view/src/DataContext/DataContext.ts
index 04f47348ac..6c476cda2e 100644
--- a/webapp/packages/core-view/src/DataContext/DataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/DataContext.ts
@@ -15,7 +15,7 @@ import type { DeleteVersionedContextCallback, IDataContext } from './IDataContex
 import type { IDataContextProvider } from './IDataContextProvider';
 
 export class DataContext implements IDataContext {
-  private readonly map: Map<DataContextGetter<any>, any>;
+  readonly map: Map<DataContextGetter<any>, any>;
   private readonly versions: MetadataMap<DataContextGetter<any>, number>;
   fallback?: IDataContextProvider;
 
@@ -40,7 +40,7 @@ export class DataContext implements IDataContext {
     return this.map.has(context) || this.fallback?.has(context) || false;
   }
 
-  find<T>(context: DataContextGetter<T>, value: T): boolean {
+  hasValue<T>(context: DataContextGetter<T>, value: T): boolean {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let provider: IDataContextProvider = this;
 
@@ -57,6 +57,25 @@ export class DataContext implements IDataContext {
     }
   }
 
+  find<T>(context: DataContextGetter<T>, predicate: (value: T) => boolean): T | undefined {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let provider: IDataContextProvider = this;
+
+    while (true) {
+      const value = provider.map.get(context);
+
+      if (predicate(value)) {
+        return value;
+      }
+
+      if (provider.fallback) {
+        provider = provider.fallback;
+      } else {
+        return undefined;
+      }
+    }
+  }
+
   set<T>(context: DataContextGetter<T>, value: T): DeleteVersionedContextCallback {
     const data = this.map.get(context);
     let version = this.versions.get(context);
diff --git a/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts b/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
index 9686833c00..6048085556 100644
--- a/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
@@ -15,6 +15,10 @@ export class DynamicDataContext implements IDataContext {
   fallback: IDataContext;
   contexts: Map<DataContextGetter<any>, DeleteVersionedContextCallback>;
 
+  get map() {
+    return this.fallback.map;
+  }
+
   constructor(fallback: IDataContext) {
     this.fallback = fallback;
     this.contexts = new Map();
@@ -56,8 +60,12 @@ export class DynamicDataContext implements IDataContext {
     return this.fallback.get(context);
   }
 
-  find <T>(context: DataContextGetter<T>, value: T): boolean {
-    return this.fallback.find(context, value);
+  hasValue <T>(context: DataContextGetter<T>, value: T): boolean {
+    return this.fallback.hasValue(context, value);
+  }
+
+  find<T>(context: DataContextGetter<T>, predicate: (value: T) => boolean): T | undefined {
+    return this.fallback.find(context, predicate);
   }
 
   tryGet <T>(context: DataContextGetter<T>): T | undefined {
diff --git a/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts b/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
index b38f41bd94..3b0e12e875 100644
--- a/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
+++ b/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
@@ -10,8 +10,10 @@ import type { DataContextGetter } from './DataContextGetter';
 
 export interface IDataContextProvider {
   fallback?: IDataContextProvider;
+  readonly map: Map<DataContextGetter<any>, any>;
   has: (context: DataContextGetter<any>) => boolean;
   get: <T>(context: DataContextGetter<T>) => T;
-  find: <T>(context: DataContextGetter<T>, value: T) => boolean;
+  find: <T>(context: DataContextGetter<T>, predicate: (item: T) => boolean) => T | undefined;
+  hasValue: <T>(context: DataContextGetter<T>, value: T) => boolean;
   tryGet: <T>(context: DataContextGetter<T>) => T | undefined;
 }
diff --git a/webapp/packages/core-view/src/Menu/MenuService.ts b/webapp/packages/core-view/src/Menu/MenuService.ts
index a8c994c99b..c77af8d911 100644
--- a/webapp/packages/core-view/src/Menu/MenuService.ts
+++ b/webapp/packages/core-view/src/Menu/MenuService.ts
@@ -114,7 +114,7 @@ function filterApplicable(contexts: IDataContextProvider): (creator: IMenuItemsC
       }
 
       if (creator.menus) {
-        const applicable = creator.menus.some(menu => contexts.find(DATA_CONTEXT_MENU, menu));
+        const applicable = creator.menus.some(menu => contexts.hasValue(DATA_CONTEXT_MENU, menu));
 
         if (!applicable) {
           return false;
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts
index 5f47b3a73b..8d40977f0d 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts
@@ -42,7 +42,7 @@ export class TableHeaderService extends Bootstrap {
     this.actionService.addHandler({
       id: 'table-header-menu-base-handler',
       isActionApplicable(context, action) {
-        const menu = context.find(DATA_CONTEXT_MENU, DATA_VIEWER_DATA_MODEL_TOOLS_MENU);
+        const menu = context.hasValue(DATA_CONTEXT_MENU, DATA_VIEWER_DATA_MODEL_TOOLS_MENU);
         const model = context.tryGet(DATA_CONTEXT_DATA_VIEWER_DATABASE_DATA_MODEL);
         const resultIndex = context.tryGet(DATA_CONTEXT_DATA_VIEWER_DATABASE_DATA_MODEL_RESULT_INDEX);
 
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
index 70b179112d..6034ed8cb0 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
@@ -42,7 +42,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
     this.menuService.setHandler({
       id: 'connection-selector-base',
-      isApplicable: context => context.find(DATA_CONTEXT_MENU, MENU_CONNECTION_SELECTOR),
+      isApplicable: context => context.hasValue(DATA_CONTEXT_MENU, MENU_CONNECTION_SELECTOR),
       isLoading: () => this.connectionSelectorLoading,
       isDisabled: () => (
         !this.connectionSchemaManagerService.isConnectionChangeable
@@ -104,7 +104,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
     this.menuService.setHandler({
       id: 'connection-data-container-selector-base',
-      isApplicable: context => context.find(DATA_CONTEXT_MENU, MENU_CONNECTION_DATA_CONTAINER_SELECTOR),
+      isApplicable: context => context.hasValue(DATA_CONTEXT_MENU, MENU_CONNECTION_DATA_CONTAINER_SELECTOR),
       isDisabled: () => (
         !this.connectionSchemaManagerService.currentConnection?.connected
         || this.connectionSelectorLoading
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
index 1aa0616c08..3ff7ad052f 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
@@ -31,7 +31,7 @@ export class DDLViewerFooterService {
     this.actionsService.addHandler({
       id: 'ddl-viewer-footer-base-handler',
       isActionApplicable(context, action) {
-        const menu = context.find(DATA_CONTEXT_MENU, MENU_DDL_VIEWER_FOOTER);
+        const menu = context.hasValue(DATA_CONTEXT_MENU, MENU_DDL_VIEWER_FOOTER);
         const node = context.tryGet(DATA_CONTEXT_DDL_VIEWER_NODE);
 
         if (!menu || !node) {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlGenerators/SqlGeneratorsBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlGenerators/SqlGeneratorsBootstrap.ts
index bdea89e574..077b533bcf 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlGenerators/SqlGeneratorsBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlGenerators/SqlGeneratorsBootstrap.ts
@@ -58,7 +58,7 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
           return false;
         }
 
-        return !context.find(DATA_CONTEXT_MENU, MENU_SQL_GENERATORS) && !context.has(DATA_CONTEXT_MENU_NESTED);
+        return !context.hasValue(DATA_CONTEXT_MENU, MENU_SQL_GENERATORS) && !context.has(DATA_CONTEXT_MENU_NESTED);
       },
       getItems: (context, items) => [
         ...items,

From 12789b8d68dcbf5833aaa4486d8d9093b777e6f3 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 17:06:23 +0300
Subject: [PATCH 21/37] fix: CB-2503 context menu behavior

---
 webapp/packages/core-blocks/src/Menu/Menu.tsx | 14 +++++++++--
 .../core-blocks/src/Menu/MenuItemElement.tsx  |  4 +++-
 .../core-blocks/src/Menu/MenuPanel.tsx        |  1 +
 .../core-blocks/src/Menu/menuPanelStyles.ts   | 19 +++++++++++++++
 .../core-ui/src/ContextMenu/ContextMenu.tsx   |  1 +
 .../src/ContextMenu/MenuItemRenderer.tsx      |  8 ++++---
 .../src/ContextMenu/SubMenuElement.tsx        | 24 +++++++++++++------
 .../src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts     | 12 ++++++++++
 .../src/Menu/MenuItem/IMenuSubMenuItem.ts     |  3 +++
 .../src/Menu/MenuItem/MenuSubMenuItem.ts      |  9 +++++++
 webapp/packages/core-view/src/index.ts        |  1 +
 .../ConnectionSelector/ConnectionSelector.tsx | 14 ++++++-----
 12 files changed, 91 insertions(+), 19 deletions(-)
 create mode 100644 webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts

diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx
index 95bd5ac53d..272182d9cb 100644
--- a/webapp/packages/core-blocks/src/Menu/Menu.tsx
+++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx
@@ -25,6 +25,7 @@ interface IMenuProps extends Omit<React.ButtonHTMLAttributes<any>, 'style'> {
   style?: ComponentStyle;
   disclosure?: boolean;
   placement?: MenuInitialState['placement'];
+  submenu?: boolean;
   modal?: boolean;
   visible?: boolean;
   rtl?: boolean;
@@ -48,6 +49,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
   getHasBindings,
   onVisibleSwitch,
   modal,
+  submenu,
   rtl,
   ...props
 }, ref) {
@@ -64,11 +66,17 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
     propsRef.onVisibleSwitch?.(menu.visible);
   }, [menu.visible]);
 
+  let menuVisible = menu.visible;
+
+  if (panelAvailable === false) {
+    menuVisible = false;
+  }
+
 
   if (React.isValidElement(children) && disclosure) {
     return styled(styles)(
       <MenuStateContext.Provider value={menu}>
-        <MenuButton ref={ref} {...menu} {...props} {...children.props}>
+        <MenuButton ref={ref} {...menu} visible={menuVisible} {...props} {...children.props}>
           {disclosureProps => React.cloneElement(children, { ...disclosureProps, ...children.props })}
         </MenuButton>
         <MenuPanel
@@ -76,6 +84,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
           menu={menu}
           style={style}
           rtl={rtl}
+          submenu={submenu}
           panelAvailable={panelAvailable}
           hasBindings={hasBindings}
           getHasBindings={getHasBindings}
@@ -88,7 +97,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
 
   return styled(styles)(
     <MenuStateContext.Provider value={menu}>
-      <MenuButton ref={ref} {...menu} {...props}>
+      <MenuButton ref={ref} {...menu} visible={menuVisible} {...props}>
         <box>{children}</box>
       </MenuButton>
       <MenuPanel
@@ -96,6 +105,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
         menu={menu}
         style={style}
         rtl={rtl}
+        submenu={submenu}
         panelAvailable={panelAvailable}
         hasBindings={hasBindings}
         getHasBindings={getHasBindings}
diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
index 28ff20906e..419ea30066 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
@@ -22,6 +22,7 @@ interface IMenuItemElementProps {
   icon?: string | React.ReactNode;
   menu?: boolean;
   loading?: boolean;
+  panelAvailable?: boolean;
   style?: ComponentStyle;
 }
 
@@ -31,6 +32,7 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
   binding,
   icon,
   menu,
+  panelAvailable,
   loading = false,
   style = [],
 }) {
@@ -52,7 +54,7 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
       </menu-item-binding>
       <menu-item-content>
         {loading && <Loader small fullSize />}
-        {menu && !loading && <Icon name="arrow" viewBox="0 0 16 16" />}
+        {panelAvailable !== false && menu && !loading && <Icon name="arrow" viewBox="0 0 16 16" />}
       </menu-item-content>
     </menu-panel-item>
 
diff --git a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
index fa54995b1e..e55657e7e0 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
@@ -26,6 +26,7 @@ export interface IMenuPanelProps {
   getHasBindings?: () => boolean;
   children: React.ReactNode | (() => React.ReactNode);
   rtl?: boolean;
+  submenu?: boolean;
   style?: ComponentStyle;
   className?: string;
 }
diff --git a/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts b/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
index bc7508bd56..08933a5cfc 100644
--- a/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
+++ b/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
@@ -39,6 +39,9 @@ export const menuPanelStyles = css`
       outline: none;
       z-index: 999;
     }
+    MenuPanel[submenu] {
+      margin-top: -12px;
+    }
     menu-box {
       composes: theme-typography--body2 theme-elevation-z5 from global;
       min-width: 140px;
@@ -58,6 +61,12 @@ export const menuPanelStyles = css`
       }
     }
 
+    Menu[modal] menu-box {
+      overflow: auto;
+      max-height: 80vh;
+      overflow-x: hidden;
+    }
+
     MenuItem, MenuItemCheckbox, MenuItemRadio {
       display: flex;
       align-items: center;
@@ -109,6 +118,7 @@ export const menuPanelStyles = css`
       align-items: center;
       height: 30px;
       padding: 0 4px;
+
       & menu-item-text, & menu-item-binding  {
         display: block;
         padding: 0 4px;
@@ -145,4 +155,13 @@ export const menuPanelStyles = css`
         width: 16px;
       }
     }
+
+    Menu[rtl] {
+      & menu-item-text {
+        text-align: right;
+      }
+      & menu-panel-item menu-item-content Icon {
+        transform: rotate(90deg);
+      }
+    }
   `;
diff --git a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
index 261d55cd3a..e5a9fc1021 100644
--- a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
@@ -100,6 +100,7 @@ export const ContextMenu = observer<IContextMenuProps, HTMLButtonElement>(forwar
           menuData={menuData}
           rtl={rtl}
           menu={menu.current}
+          modal={modal}
           style={style}
           onItemClose={handlers.handleItemClose}
         />
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
index 0ecacc403a..4f8c4339d1 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
@@ -23,13 +23,14 @@ export interface IMenuItemRendererProps extends Omit<React.ButtonHTMLAttributes<
   item: IMenuItem;
   menuData: IMenuData;
   menu: MenuStateReturn; // from reakit useMenuState
+  modal?: boolean;
   rtl?: boolean;
   onItemClose?: () => void;
   style?: ComponentStyle;
 }
 
 export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuItemRenderer({
-  item, rtl, menuData, menu, onItemClose, style,
+  item, modal, rtl, menuData, menu, onItemClose, style,
 }) {
   const styles = useStyles(menuPanelStyles, style);
   const onClick = useCallback(() => {
@@ -44,17 +45,18 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
     return styled(styles)(
       <MenuItem
         {...menu}
+        {...{ as: SubMenuElement }}
         {...use({ hidden: item.hidden })}
         id={item.id}
         aria-label={item.menu.label}
         itemRenderer={MenuItemRenderer}
-        rtl={rtl}
+        menuRtl={rtl}
         menuData={menuData}
+        menuModal={modal}
         subMenu={item}
         style={style}
         onItemClose={onItemClose}
         onClick={onClick}
-        {...{ as: SubMenuElement }}
       />
     );
   }
diff --git a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
index 8948d3ac7a..563b7cad9c 100644
--- a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
@@ -13,7 +13,7 @@ import styled from 'reshadow';
 import { getComputed, IMenuState, Menu, MenuItemElement, menuPanelStyles, useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming';
-import { DATA_CONTEXT_MENU_NESTED, IMenuData, IMenuSubMenuItem, MenuActionItem, MenuService, useMenu } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU_NESTED, DATA_CONTEXT_SUBMENU_ITEM, IMenuData, IMenuSubMenuItem, MenuActionItem, MenuService, useMenu } from '@cloudbeaver/core-view';
 
 import type { IMenuItemRendererProps } from './MenuItemRenderer';
 
@@ -21,7 +21,8 @@ interface ISubMenuElementProps extends Omit<React.ButtonHTMLAttributes<any>, 'st
   menuData: IMenuData;
   subMenu: IMenuSubMenuItem;
   itemRenderer: React.FC<IMenuItemRendererProps>;
-  rtl?: boolean;
+  menuModal?: boolean;
+  menuRtl?: boolean;
   onItemClose?: () => void;
   style?: ComponentStyle;
 }
@@ -32,7 +33,8 @@ export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(
     subMenu,
     itemRenderer,
     style,
-    rtl,
+    menuModal: modal,
+    menuRtl: rtl,
     onItemClose,
     ...rest
   },
@@ -43,6 +45,7 @@ export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(
   const styles = useStyles(menuPanelStyles, style);
   const subMenuData = useMenu({ menu: subMenu.menu, context: menuData.context });
   subMenuData.context.set(DATA_CONTEXT_MENU_NESTED, true);
+  subMenuData.context.set(DATA_CONTEXT_SUBMENU_ITEM, subMenu);
 
   const handler = menuService.getHandler(subMenuData.context);
   const hidden = getComputed(() => handler?.isHidden?.(subMenuData.context));
@@ -72,6 +75,7 @@ export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(
   const loading = getComputed(() => handler?.isLoading?.(subMenuData.context));
   const disabled = getComputed(() => handler?.isDisabled?.(subMenuData.context));
   const MenuItemRenderer = itemRenderer;
+  const panelAvailable = subMenuData.available && !loading;
 
   return styled(styles)(
     <Menu
@@ -84,22 +88,28 @@ export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(
           item={item}
           menuData={subMenuData}
           menu={menu.current}
+          rtl={rtl}
+          modal={modal}
           style={style}
           onItemClose={handlers.handleItemClose}
         />
       ))}
       rtl={rtl}
+      modal={modal}
       style={style}
-      panelAvailable={subMenuData.available && !loading}
+      placement={rtl ? 'left-start' : 'right-start'}
+      panelAvailable={panelAvailable}
       disabled={disabled}
       getHasBindings={handlers.hasBindings}
+      submenu
       onVisibleSwitch={handlers.handleVisibleSwitch}
       {...rest}
     >
       <MenuItemElement
-        label={subMenu.menu.label}
-        icon={subMenu.menu.icon}
-        tooltip={subMenu.menu.tooltip}
+        label={subMenu.label ?? subMenu.menu.label}
+        icon={subMenu.icon ?? subMenu.menu.icon}
+        tooltip={subMenu.tooltip ?? subMenu.menu.tooltip}
+        panelAvailable={panelAvailable}
         loading={loading}
         style={style}
         menu
diff --git a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts
new file mode 100644
index 0000000000..e9250d1fa1
--- /dev/null
+++ b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createDataContext } from '../DataContext/createDataContext';
+import type { IMenuSubMenuItem } from './MenuItem/IMenuSubMenuItem';
+
+export const DATA_CONTEXT_SUBMENU_ITEM = createDataContext<IMenuSubMenuItem>('submenu-item');
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
index ef0da95d36..b4f4e983c3 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
@@ -15,5 +15,8 @@ export interface IMenuSubMenuEvents extends IMenuItemEvents {
 
 export interface IMenuSubMenuItem extends IMenuItem {
   menu: IMenu;
+  label?: string;
+  icon?: string;
+  tooltip?: string;
   events?: IMenuSubMenuEvents;
 }
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
index 331ba4dcd7..31f76d75a5 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
@@ -12,15 +12,24 @@ import { MenuItem } from './MenuItem';
 
 export class MenuSubMenuItem extends MenuItem implements IMenuSubMenuItem {
   readonly menu: IMenu;
+  readonly label?: string;
+  readonly icon?: string;
+  readonly tooltip?: string;
   readonly events?: IMenuSubMenuEvents;
   readonly hidden: boolean;
 
   constructor(
     menu: IMenu,
+    label?: string,
+    icon?: string,
+    tooltip?: string,
     events?: IMenuSubMenuEvents
   ) {
     super(menu.id);
     this.menu = menu;
+    this.label = label;
+    this.icon = icon;
+    this.tooltip = tooltip;
     this.hidden = false;
     this.events = events;
   }
diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts
index 6edaadd9b3..8165c09213 100644
--- a/webapp/packages/core-view/src/index.ts
+++ b/webapp/packages/core-view/src/index.ts
@@ -42,6 +42,7 @@ export * from './Menu/createMenu';
 export * from './Menu/DATA_CONTEXT_MENU_LOCAL';
 export * from './Menu/DATA_CONTEXT_MENU_NESTED';
 export * from './Menu/DATA_CONTEXT_MENU';
+export * from './Menu/DATA_CONTEXT_SUBMENU_ITEM';
 export * from './Menu/IMenu';
 export * from './Menu/menuExtractActions';
 export * from './Menu/MenuService';
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionSelector.tsx b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionSelector.tsx
index bbc24e58d7..5f185ac80e 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionSelector.tsx
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionSelector.tsx
@@ -27,15 +27,17 @@ import { MENU_CONNECTION_SELECTOR } from '../MENU_CONNECTION_SELECTOR';
 
 const menuStyles = css`
   Menu {
-    max-height: 400px;
-    overflow: auto;
+    & menu-box {
+      max-height: 80vh;
+      overflow: auto;
+    }
     & menu-panel-item {
-        overflow-x: hidden;
+      overflow-x: hidden;
     }
     & menu-item-text {
-        max-width: 400px;
-        overflow-x: hidden;
-        text-overflow: ellipsis;
+      max-width: 400px;
+      overflow-x: hidden;
+      text-overflow: ellipsis;
     }
   }
 `;

From 24ab22dd52abd5d7ac689f7f900a5b34b7150d30 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 17:17:51 +0300
Subject: [PATCH 22/37] feat: CB-2503 devtools

---
 .../src/manifest.ts                           |   2 +-
 webapp/packages/plugin-devtools/.gitignore    |  17 ++
 webapp/packages/plugin-devtools/package.json  |  47 +++++
 .../plugin-devtools/src/DevToolsService.ts    |  44 ++++
 .../plugin-devtools/src/PluginBootstrap.ts    | 197 ++++++++++++++++++
 .../src/actions/ACTION_DEVTOOLS.ts            |  15 ++
 webapp/packages/plugin-devtools/src/index.ts  |   3 +
 .../packages/plugin-devtools/src/manifest.ts  |  22 ++
 .../plugin-devtools/src/menu/MENU_DEVTOOLS.ts |  14 ++
 .../plugin-devtools/src/menu/MENU_PLUGIN.ts   |  14 ++
 .../plugin-devtools/src/menu/MENU_PLUGINS.ts  |  14 ++
 .../plugin-devtools/src/menu/MENU_RESOURCE.ts |  16 ++
 .../src/menu/MENU_RESOURCES.ts                |  16 ++
 .../src/menu/PluginSubMenuItem.ts             |  26 +++
 .../src/menu/ResourceSubMenuItem.ts           |  26 +++
 webapp/packages/plugin-devtools/tsconfig.json |  16 ++
 .../src/manifest.ts                           |   2 +-
 webapp/packages/product-default/src/index.ts  |   2 +
 18 files changed, 491 insertions(+), 2 deletions(-)
 create mode 100644 webapp/packages/plugin-devtools/.gitignore
 create mode 100644 webapp/packages/plugin-devtools/package.json
 create mode 100644 webapp/packages/plugin-devtools/src/DevToolsService.ts
 create mode 100644 webapp/packages/plugin-devtools/src/PluginBootstrap.ts
 create mode 100644 webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts
 create mode 100644 webapp/packages/plugin-devtools/src/index.ts
 create mode 100644 webapp/packages/plugin-devtools/src/manifest.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts
 create mode 100644 webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts
 create mode 100644 webapp/packages/plugin-devtools/tsconfig.json

diff --git a/webapp/packages/plugin-connection-template/src/manifest.ts b/webapp/packages/plugin-connection-template/src/manifest.ts
index ab335adb47..029a0a942e 100644
--- a/webapp/packages/plugin-connection-template/src/manifest.ts
+++ b/webapp/packages/plugin-connection-template/src/manifest.ts
@@ -14,7 +14,7 @@ import { TemplateConnectionsResource } from './TemplateConnectionsResource';
 
 export const connectionTemplate: PluginManifest = {
   info: {
-    name: 'Connections plugin',
+    name: 'Template Connections plugin',
   },
 
   providers: [
diff --git a/webapp/packages/plugin-devtools/.gitignore b/webapp/packages/plugin-devtools/.gitignore
new file mode 100644
index 0000000000..15bc16c7c3
--- /dev/null
+++ b/webapp/packages/plugin-devtools/.gitignore
@@ -0,0 +1,17 @@
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/lib
+
+# misc
+.DS_Store
+.env*
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/webapp/packages/plugin-devtools/package.json b/webapp/packages/plugin-devtools/package.json
new file mode 100644
index 0000000000..5914cd45f0
--- /dev/null
+++ b/webapp/packages/plugin-devtools/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@cloudbeaver/plugin-devtools",
+  "sideEffects": false,
+  "version": "0.1.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "main": "lib/index.js",
+  "module": "lib/index.js",
+  "types": "src/index.ts",
+  "scripts": {
+    "prebuild": "rimraf lib/*",
+    "build": "webpack --config ../../configs/webpack.plugin.config.js",
+    "postbuild": "tsc",
+    "lint": "eslint ./src/ --ext .ts,.tsx",
+    "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix"
+  },
+  "peerDependencies": {
+    "@cloudbeaver/core-administration": "~0.1.0",
+    "@cloudbeaver/core-app": "~0.1.0",
+    "@cloudbeaver/core-authentication": "~0.1.0",
+    "@cloudbeaver/core-blocks": "~0.1.0",
+    "@cloudbeaver/core-connections": "~0.1.0",
+    "@cloudbeaver/core-di": "~0.1.0",
+    "@cloudbeaver/core-dialogs": "~0.1.0",
+    "@cloudbeaver/core-events": "~0.1.0",
+    "@cloudbeaver/core-executor": "~0.1.0",
+    "@cloudbeaver/core-extensions": "~0.1.0",
+    "@cloudbeaver/core-localization": "~0.1.0",
+    "@cloudbeaver/core-notifications": "~0.1.0",
+    "@cloudbeaver/core-plugin": "~0.1.0",
+    "@cloudbeaver/core-product": "~0.1.0",
+    "@cloudbeaver/core-root": "~0.1.0",
+    "@cloudbeaver/core-routing": "~0.1.0",
+    "@cloudbeaver/core-sdk": "~0.1.0",
+    "@cloudbeaver/core-settings": "~0.1.0",
+    "@cloudbeaver/core-theming": "~0.1.0",
+    "@cloudbeaver/core-ui": "~0.1.0",
+    "@cloudbeaver/core-utils": "~0.1.0",
+    "@cloudbeaver/core-view": "~0.1.0",
+    "@cloudbeaver/plugin-top-app-bar": "~0.1.0",
+    "@cloudbeaver/plugin-user-profile": "~0.1.0",
+    "mobx": "~6.x.x",
+    "mobx-react-lite": "~3.x.x",
+    "react": "~18.x.x",
+    "reshadow": "~0.x.x"
+  }
+}
diff --git a/webapp/packages/plugin-devtools/src/DevToolsService.ts b/webapp/packages/plugin-devtools/src/DevToolsService.ts
new file mode 100644
index 0000000000..081f2374ea
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/DevToolsService.ts
@@ -0,0 +1,44 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { makeObservable, observable } from 'mobx';
+
+import { injectable } from '@cloudbeaver/core-di';
+import { LocalStorageSaveService } from '@cloudbeaver/core-settings';
+
+interface IDevToolsSettings {
+  enabled: boolean;
+}
+
+const DEVTOOLS = 'devtools';
+
+@injectable()
+export class DevToolsService {
+  get isEnabled(): boolean {
+    return this.settings.enabled;
+  }
+
+  private readonly settings: IDevToolsSettings;
+
+  constructor(
+    private readonly autoSaveService: LocalStorageSaveService,
+  ) {
+    this.settings = {
+      enabled: false,
+    };
+
+    makeObservable<this, 'settings'>(this, {
+      settings: observable,
+    });
+    this.autoSaveService.withAutoSave(this.settings, DEVTOOLS);
+  }
+
+  switch() {
+    this.settings.enabled = !this.settings.enabled;
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
new file mode 100644
index 0000000000..5cfcd51481
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
@@ -0,0 +1,197 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { EAdminPermission } from '@cloudbeaver/core-administration';
+import { App, Bootstrap, DIService, injectable } from '@cloudbeaver/core-di';
+import { PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
+import { CachedResource } from '@cloudbeaver/core-sdk';
+import { ActionService, DATA_CONTEXT_MENU, DATA_CONTEXT_SUBMENU_ITEM, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { TOP_NAV_BAR_SETTINGS_MENU } from '@cloudbeaver/plugin-settings-menu';
+import { MainMenuService } from '@cloudbeaver/plugin-top-app-bar';
+import { MENU_USER_PROFILE } from '@cloudbeaver/plugin-user-profile';
+
+import { ACTION_DEVTOOLS } from './actions/ACTION_DEVTOOLS';
+import { DevToolsService } from './DevToolsService';
+import { MENU_DEVTOOLS } from './menu/MENU_DEVTOOLS';
+import { MENU_PLUGIN } from './menu/MENU_PLUGIN';
+import { MENU_PLUGINS } from './menu/MENU_PLUGINS';
+import { MENU_RESOURCE } from './menu/MENU_RESOURCE';
+import { MENU_RESOURCES } from './menu/MENU_RESOURCES';
+import { PluginSubMenuItem } from './menu/PluginSubMenuItem';
+import { ResourceSubMenuItem } from './menu/ResourceSubMenuItem';
+
+@injectable()
+export class PluginBootstrap extends Bootstrap {
+  constructor(
+    private readonly app: App,
+    private readonly diService: DIService,
+    private readonly menuService: MenuService,
+    private readonly actionService: ActionService,
+    private readonly mainMenuService: MainMenuService,
+    private readonly devToolsService: DevToolsService,
+    private readonly permissionsService: PermissionsService,
+    private readonly serverConfigResource: ServerConfigResource
+  ) {
+    super();
+  }
+
+  register(): void {
+    this.menuService.addCreator({
+      isApplicable: context => {
+        if (!this.permissionsService.has(EAdminPermission.admin)) {
+          return false;
+        }
+        return context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU;
+      },
+      getItems: (context, items) => [
+        ACTION_DEVTOOLS,
+        ...items,
+      ],
+    });
+
+
+    this.actionService.addHandler({
+      id: 'devtools',
+      isActionApplicable: (context, action) => [
+        ACTION_DEVTOOLS,
+      ].includes(action),
+      isChecked: (context, action) => {
+
+        switch (action) {
+          case ACTION_DEVTOOLS: {
+            return this.devToolsService.isEnabled;
+          }
+        }
+
+        return false;
+      },
+      handler: (context, action) => {
+        switch (action) {
+          case ACTION_DEVTOOLS: {
+            this.devToolsService.switch();
+            break;
+          }
+        }
+      },
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => {
+        if (!this.devToolsService.isEnabled) {
+          return false;
+        }
+        return context.get(DATA_CONTEXT_MENU) === MENU_USER_PROFILE;
+      },
+      getItems: (context, items) => [
+        MENU_DEVTOOLS,
+        ...items,
+      ],
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_DEVTOOLS,
+      getItems: (context, items) => [
+        MENU_PLUGINS,
+        ...items,
+      ],
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_PLUGINS,
+      getItems: (context, items) => [
+        ...this.app
+          .getPlugins()
+          .sort((a, b) => a.info.name.localeCompare(b.info.name))
+          .map(plugin => new PluginSubMenuItem(plugin)),
+        ...items,
+      ],
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => {
+        if (context.get(DATA_CONTEXT_MENU) !== MENU_PLUGIN) {
+          return false;
+        }
+        const item = context.tryGet(DATA_CONTEXT_SUBMENU_ITEM);
+
+        if (item instanceof PluginSubMenuItem) {
+          return item.plugin.providers.some(provider => provider.prototype instanceof CachedResource);
+        }
+
+        return false;
+      },
+      getItems: (_, items) => [
+        MENU_RESOURCES,
+        ...items,
+      ],
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => (
+        context.get(DATA_CONTEXT_MENU) === MENU_RESOURCES
+        && context.has(DATA_CONTEXT_SUBMENU_ITEM)
+      ),
+      getItems: (context, items) => {
+        const item = context.find(DATA_CONTEXT_SUBMENU_ITEM, item => item instanceof PluginSubMenuItem);
+
+        if (!item) {
+          return items;
+        }
+
+        const plugin = this.app
+          .getPlugins()
+          .find(plugin => plugin.info.name === item.id);
+
+        if (!plugin) {
+          return items;
+        }
+
+        return [
+          ...plugin.providers
+            .slice()
+            .sort((a, b) => a.name.localeCompare(b.name))
+            .filter(service => service.prototype instanceof CachedResource)
+            .map(resource => new ResourceSubMenuItem(resource)),
+          ...items,
+        ];
+      },
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => (
+        context.get(DATA_CONTEXT_MENU) === MENU_RESOURCE
+        && context.get(DATA_CONTEXT_SUBMENU_ITEM) instanceof ResourceSubMenuItem
+      ),
+      getItems: (context, items) => {
+        const item = context.get(DATA_CONTEXT_SUBMENU_ITEM) as ResourceSubMenuItem;
+
+        return [
+          new MenuBaseItem(
+            {
+              id: 'markOutdated',
+              label: 'Mark outdated',
+              tooltip: 'Outdate resource',
+            },
+            {
+              onSelect: () => {
+                const instance = this.diService.serviceInjector.getServiceByClass<CachedResource<any, any>>(
+                  item.resource
+                );
+                instance.markOutdated(undefined);
+              },
+            }
+          ),
+          ...items,
+        ];
+      },
+    });
+  }
+
+  load(): void | Promise<void> {
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts b/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts
new file mode 100644
index 0000000000..75ce8853a2
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts
@@ -0,0 +1,15 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createAction } from '@cloudbeaver/core-view';
+
+export const ACTION_DEVTOOLS = createAction('devtools', {
+  type: 'checkbox',
+  label: 'DevTools',
+  tooltip: 'Show DevTools menu',
+});
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/index.ts b/webapp/packages/plugin-devtools/src/index.ts
new file mode 100644
index 0000000000..76453a8b8e
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/index.ts
@@ -0,0 +1,3 @@
+import { devToolsPlugin } from './manifest';
+
+export default devToolsPlugin;
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/manifest.ts b/webapp/packages/plugin-devtools/src/manifest.ts
new file mode 100644
index 0000000000..da4f216277
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/manifest.ts
@@ -0,0 +1,22 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { PluginManifest } from '@cloudbeaver/core-di';
+
+import { DevToolsService } from './DevToolsService';
+import { PluginBootstrap } from './PluginBootstrap';
+
+export const devToolsPlugin: PluginManifest = {
+  info: {
+    name: 'DevTools plugin',
+  },
+  providers: [
+    PluginBootstrap,
+    DevToolsService,
+  ],
+};
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts b/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
new file mode 100644
index 0000000000..2b46988d41
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const MENU_DEVTOOLS = createMenu(
+  'devtools',
+  'DevTools'
+);
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts
new file mode 100644
index 0000000000..471b1c2d79
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const MENU_PLUGIN = createMenu(
+  'plugin',
+  'Plugin'
+);
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts
new file mode 100644
index 0000000000..b3a906bee1
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const MENU_PLUGINS = createMenu(
+  'plugins',
+  'Plugins'
+);
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts
new file mode 100644
index 0000000000..053458caa4
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts
@@ -0,0 +1,16 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const MENU_RESOURCE = createMenu(
+  'resource',
+  'Resource',
+  undefined,
+  'Resource actions'
+);
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts
new file mode 100644
index 0000000000..713925a237
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts
@@ -0,0 +1,16 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const MENU_RESOURCES = createMenu(
+  'resources-list',
+  'Resources',
+  undefined,
+  'List of registered resources'
+);
diff --git a/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts b/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts
new file mode 100644
index 0000000000..7cb7535b65
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts
@@ -0,0 +1,26 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { PluginManifest } from '@cloudbeaver/core-di';
+import { MenuSubMenuItem } from '@cloudbeaver/core-view';
+
+import { MENU_PLUGIN } from './MENU_PLUGIN';
+
+export class PluginSubMenuItem extends MenuSubMenuItem {
+  readonly plugin: PluginManifest;
+
+  constructor(plugin: PluginManifest) {
+    super(MENU_PLUGIN, plugin.info.name);
+
+    this.plugin = plugin;
+
+    Object.assign(this, {
+      id: plugin.info.name,
+    });
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts b/webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts
new file mode 100644
index 0000000000..c6d82c193f
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts
@@ -0,0 +1,26 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { IServiceConstructor } from '@cloudbeaver/core-di';
+import { MenuSubMenuItem } from '@cloudbeaver/core-view';
+
+import { MENU_RESOURCE } from './MENU_RESOURCE';
+
+export class ResourceSubMenuItem extends MenuSubMenuItem {
+  readonly resource: IServiceConstructor<any>;
+
+  constructor(resource: IServiceConstructor<any>) {
+    super(MENU_RESOURCE, resource.name);
+
+    this.resource = resource;
+
+    Object.assign(this, {
+      id: resource.name,
+    });
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/tsconfig.json b/webapp/packages/plugin-devtools/tsconfig.json
new file mode 100644
index 0000000000..ad14f68a20
--- /dev/null
+++ b/webapp/packages/plugin-devtools/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib",
+    "composite": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "**/.*/"
+  ],
+  "references": [{ "path": "../*" }]
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts
index 6d3e28b5e4..86b08d8878 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts
@@ -14,7 +14,7 @@ import { SqlEditorTabService } from './SqlEditorTabService';
 
 export const sqlEditorTabPluginManifest: PluginManifest = {
   info: {
-    name: 'Sql Editor Plugin',
+    name: 'Sql Editor Navigation Tab Plugin',
   },
 
   providers: [
diff --git a/webapp/packages/product-default/src/index.ts b/webapp/packages/product-default/src/index.ts
index 0b75ef65e3..ec1f91b20d 100644
--- a/webapp/packages/product-default/src/index.ts
+++ b/webapp/packages/product-default/src/index.ts
@@ -14,6 +14,7 @@ import spreadsheetNew from '@cloudbeaver/plugin-data-spreadsheet-new';
 import dataViewer from '@cloudbeaver/plugin-data-viewer';
 import datasourceContextSwitch from '@cloudbeaver/plugin-datasource-context-switch';
 import ddlViewer from '@cloudbeaver/plugin-ddl-viewer';
+import devTools from '@cloudbeaver/plugin-devtools';
 import gisViewer from '@cloudbeaver/plugin-gis-viewer';
 import help from '@cloudbeaver/plugin-help';
 import localization from '@cloudbeaver/plugin-localization';
@@ -42,6 +43,7 @@ import versionUpdate from '@cloudbeaver/plugin-version-update-administration';
 import { defaultProductManifest } from './manifest';
 
 const PLUGINS: PluginManifest[] = [
+  devTools,
   administration,
   spreadsheetNew,
   authentication,

From a0bdb375c8037cb22c7eab17b0240130380eea35 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 7 Sep 2022 16:30:14 +0200
Subject: [PATCH 23/37] dbeaver/dbeaver-ee#1905 Remote config controller

---
 .../src/io/cloudbeaver/DBWConstants.java                     | 3 ++-
 .../src/io/cloudbeaver/model/app/WebApplication.java         | 5 +++--
 .../src/io/cloudbeaver/server/CBApplication.java             | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java
index 747f03b3db..9dfeda52b3 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java
@@ -22,9 +22,10 @@ package io.cloudbeaver;
 public class DBWConstants {
 
     public static final String PERMISSION_PUBLIC = "public";
-
     public static final String PERMISSION_ADMIN = "admin";
 
+    public static final String PERMISSION_CONFIGURATION_MANAGER = "configuration-manager";
+
     public static final String PERMISSION_EDIT_STRUCTURE = "edit-meta";
     public static final String PERMISSION_EDIT_DATA = "edit-data";
 
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java
index 7788a34a03..43a6ba8e53 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java
@@ -17,7 +17,7 @@
 package io.cloudbeaver.model.app;
 
 import io.cloudbeaver.DataSourceFilter;
-import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.VirtualProjectImpl;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.app.DBPApplication;
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.security.SMController;
-import io.cloudbeaver.VirtualProjectImpl;
 
 import java.nio.file.Path;
 
@@ -41,6 +40,8 @@ public interface WebApplication extends DBPApplication {
 
     Path getDataDirectory(boolean create);
 
+    Path getWorkspaceDirectory();
+
     Path getHomeDirectory();
 
     boolean isMultiNode();
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 63e88d14a1..6b3c84d8c6 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -456,6 +456,11 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
         return dataDir.toPath();
     }
 
+    @Override
+    public Path getWorkspaceDirectory() {
+        return Path.of(workspaceLocation);
+    }
+
     private void initializeSecurityController() throws DBException {
         securityController = createGlobalSecurityController();
     }

From ac4b70fdd29ff504b699c2c52b4443a2c7e0c108 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 7 Sep 2022 18:16:12 +0300
Subject: [PATCH 24/37] feat(plugin-devtools): CB-2503 resources search

---
 webapp/packages/core-blocks/src/Menu/Menu.tsx | 51 ++++++++++---------
 .../core-blocks/src/Menu/MenuPanel.tsx        | 19 ++++---
 .../src/ContextMenu/IContextMenuItemProps.ts  | 20 ++++++++
 .../src/ContextMenu/MenuActionElement.tsx     | 11 ++--
 .../src/ContextMenu/MenuItemRenderer.tsx      | 17 ++++++-
 webapp/packages/core-ui/src/index.ts          |  1 +
 .../src/Menu/MenuItem/IMenuCustomItem.ts      | 36 +++++++++++++
 .../src/Menu/MenuItem/MenuCustomItem.ts       | 39 ++++++++++++++
 webapp/packages/core-view/src/index.ts        |  2 +
 .../ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts   | 11 ++++
 .../src/ContextMenu/SearchResourceMenuItem.ts | 21 ++++++++
 .../SearchResourceMenuItemComponent.tsx       | 48 +++++++++++++++++
 .../plugin-devtools/src/PluginBootstrap.ts    | 40 +++++++++++----
 13 files changed, 268 insertions(+), 48 deletions(-)
 create mode 100644 webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
 create mode 100644 webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
 create mode 100644 webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
 create mode 100644 webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts
 create mode 100644 webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts
 create mode 100644 webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx

diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx
index 272182d9cb..da3ab5dcfa 100644
--- a/webapp/packages/core-blocks/src/Menu/Menu.tsx
+++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx
@@ -13,6 +13,7 @@ import styled from 'reshadow';
 
 import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming';
 
+import { ErrorBoundary } from '../ErrorBoundary';
 import { useObjectRef } from '../useObjectRef';
 import { MenuPanel } from './MenuPanel';
 import { menuPanelStyles } from './menuPanelStyles';
@@ -75,9 +76,33 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
 
   if (React.isValidElement(children) && disclosure) {
     return styled(styles)(
+      <ErrorBoundary>
+        <MenuStateContext.Provider value={menu}>
+          <MenuButton ref={ref} {...menu} visible={menuVisible} {...props} {...children.props}>
+            {disclosureProps => React.cloneElement(children, { ...disclosureProps, ...children.props })}
+          </MenuButton>
+          <MenuPanel
+            label={label}
+            menu={menu}
+            style={style}
+            rtl={rtl}
+            submenu={submenu}
+            panelAvailable={panelAvailable}
+            hasBindings={hasBindings}
+            getHasBindings={getHasBindings}
+          >
+            {items}
+          </MenuPanel>
+        </MenuStateContext.Provider>
+      </ErrorBoundary>
+    );
+  }
+
+  return styled(styles)(
+    <ErrorBoundary>
       <MenuStateContext.Provider value={menu}>
-        <MenuButton ref={ref} {...menu} visible={menuVisible} {...props} {...children.props}>
-          {disclosureProps => React.cloneElement(children, { ...disclosureProps, ...children.props })}
+        <MenuButton ref={ref} {...menu} visible={menuVisible} {...props}>
+          <box>{children}</box>
         </MenuButton>
         <MenuPanel
           label={label}
@@ -92,26 +117,6 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
           {items}
         </MenuPanel>
       </MenuStateContext.Provider>
-    );
-  }
-
-  return styled(styles)(
-    <MenuStateContext.Provider value={menu}>
-      <MenuButton ref={ref} {...menu} visible={menuVisible} {...props}>
-        <box>{children}</box>
-      </MenuButton>
-      <MenuPanel
-        label={label}
-        menu={menu}
-        style={style}
-        rtl={rtl}
-        submenu={submenu}
-        panelAvailable={panelAvailable}
-        hasBindings={hasBindings}
-        getHasBindings={getHasBindings}
-      >
-        {items}
-      </MenuPanel>
-    </MenuStateContext.Provider>
+    </ErrorBoundary>
   );
 }));
\ No newline at end of file
diff --git a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
index e55657e7e0..60d979b5d9 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
@@ -13,6 +13,7 @@ import styled, { use } from 'reshadow';
 
 import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming';
 
+import { ErrorBoundary } from '../ErrorBoundary';
 import { getComputed } from '../getComputed';
 import { MenuEmptyItem } from './MenuEmptyItem';
 import { menuPanelStyles } from './menuPanelStyles';
@@ -60,13 +61,15 @@ export const MenuPanel = observer<IMenuPanelProps>(function MenuPanel({
   }
 
   return styled(styles)(
-    <Menu {...menu} aria-label={label} className={className} visible={panelAvailable}>
-      <menu-box dir={rtl ? 'rtl' : undefined} {...use({ hasBindings })}>
-        {Children.count(renderedChildren) === 0 && (
-          <MenuEmptyItem style={style} />
-        )}
-        {renderedChildren}
-      </menu-box>
-    </Menu>
+    <ErrorBoundary>
+      <Menu {...menu} aria-label={label} className={className} visible={panelAvailable}>
+        <menu-box dir={rtl ? 'rtl' : undefined} {...use({ hasBindings })}>
+          {Children.count(renderedChildren) === 0 && (
+            <MenuEmptyItem style={style} />
+          )}
+          {renderedChildren}
+        </menu-box>
+      </Menu>
+    </ErrorBoundary>
   );
 });
\ No newline at end of file
diff --git a/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts b/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
new file mode 100644
index 0000000000..9d92816f10
--- /dev/null
+++ b/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
@@ -0,0 +1,20 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { MenuStateReturn } from 'reakit/ts';
+
+import type { ComponentStyle } from '@cloudbeaver/core-theming';
+import type { IMenuData, IMenuItem } from '@cloudbeaver/core-view';
+
+export interface IContextMenuItemProps {
+  item: IMenuItem;
+  menu: MenuStateReturn;
+  menuData: IMenuData;
+  style?: ComponentStyle;
+  onClick: () => void;
+}
\ No newline at end of file
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
index fd3e68b92e..5481e28718 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
@@ -8,18 +8,17 @@
 
 import { observer } from 'mobx-react-lite';
 import React from 'react';
-import { MenuItem, MenuItemCheckbox, MenuItemRadio, MenuStateReturn } from 'reakit/Menu';
+import { MenuItem, MenuItemCheckbox, MenuItemRadio } from 'reakit/Menu';
 import styled, { use } from 'reshadow';
 
 import { Checkbox, MenuItemElement, menuPanelStyles, Radio } from '@cloudbeaver/core-blocks';
-import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming';
+import { useStyles } from '@cloudbeaver/core-theming';
 import type { IMenuActionItem } from '@cloudbeaver/core-view';
 
-interface IMenuActionElementProps {
+import type { IContextMenuItemProps } from './IContextMenuItemProps';
+
+interface IMenuActionElementProps extends IContextMenuItemProps {
   item: IMenuActionItem;
-  menu: MenuStateReturn;
-  style?: ComponentStyle;
-  onClick: () => void;
 }
 
 export const MenuActionElement = observer<IMenuActionElementProps>(function MenuActionElement({
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
index 4f8c4339d1..7531a13433 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
@@ -13,7 +13,7 @@ import styled, { use } from 'reshadow';
 
 import { MenuItemElement, menuPanelStyles } from '@cloudbeaver/core-blocks';
 import { ComponentStyle, joinStyles, useStyles } from '@cloudbeaver/core-theming';
-import { IMenuItem, IMenuData, MenuSubMenuItem, MenuSeparatorItem, MenuActionItem, MenuBaseItem } from '@cloudbeaver/core-view';
+import { IMenuItem, IMenuData, MenuSubMenuItem, MenuSeparatorItem, MenuActionItem, MenuBaseItem, MenuCustomItem } from '@cloudbeaver/core-view';
 
 import { MenuActionElement } from './MenuActionElement';
 import { SubMenuElement } from './SubMenuElement';
@@ -41,6 +41,20 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
     }
   }, [item, onItemClose]);
 
+  if (item instanceof MenuCustomItem) {
+    const CustomMenuItem = item.getComponent();
+
+    return styled(styles)(
+      <CustomMenuItem
+        item={item}
+        menu={menu}
+        menuData={menuData}
+        style={style}
+        onClick={onClick}
+      />
+    );
+  }
+
   if (item instanceof MenuSubMenuItem) {
     return styled(styles)(
       <MenuItem
@@ -70,6 +84,7 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
       <MenuActionElement
         item={item}
         menu={menu}
+        menuData={menuData}
         style={style}
         onClick={onClick}
       />
diff --git a/webapp/packages/core-ui/src/index.ts b/webapp/packages/core-ui/src/index.ts
index 742487adde..0ea0dd819b 100644
--- a/webapp/packages/core-ui/src/index.ts
+++ b/webapp/packages/core-ui/src/index.ts
@@ -2,6 +2,7 @@ export * from './Clipboard/ClipboardBootstrap';
 export * from './Clipboard/ClipboardService';
 
 export * from './ContextMenu/ContextMenu';
+export * from './ContextMenu/IContextMenuItemProps';
 export * from './ContextMenu/MenuBar/MenuBar';
 export * from './ContextMenu/MenuBar/MENU_BAR_DEFAULT_STYLES';
 export * from './ContextMenu/MenuBar/MENU_BAR_SMALL_STYLES';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
new file mode 100644
index 0000000000..25bda90e12
--- /dev/null
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
@@ -0,0 +1,36 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { ComponentStyle } from '@cloudbeaver/core-theming';
+
+import type { IMenuItem } from './IMenuItem';
+
+interface IMenuCustomItemCommonProperties<TExtraProps = unknown> {
+  hidden?: boolean;
+  disabled?: boolean;
+  getExtraProps?: () => TExtraProps;
+}
+
+export type ICustomMenuItemComponent<TExtraProps = unknown> = React.FC<ICustomMenuItemProps<TExtraProps> & TExtraProps>;
+
+export interface ICustomMenuItemProps<TExtraProps = unknown> {
+  item: IMenuCustomItem<TExtraProps>;
+  style?: ComponentStyle;
+  className?: string;
+}
+
+export interface IMenuCustomItemOptions<TExtraProps = unknown>
+  extends IMenuCustomItemCommonProperties<TExtraProps> {
+  id: string;
+  getComponent: () => ICustomMenuItemComponent<TExtraProps>;
+}
+
+export interface IMenuCustomItem<TExtraProps = unknown>
+  extends IMenuItem, IMenuCustomItemCommonProperties<TExtraProps> {
+  getComponent?: () => ICustomMenuItemComponent<TExtraProps>;
+}
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
new file mode 100644
index 0000000000..5d764e5966
--- /dev/null
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
@@ -0,0 +1,39 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { ICustomMenuItemComponent, IMenuCustomItem, IMenuCustomItemOptions } from './IMenuCustomItem';
+import type { IMenuItemEvents } from './IMenuItem';
+import { MenuItem } from './MenuItem';
+
+interface IMenuCustomItemPropertyGetters<TExtraProps = unknown> {
+  getExtraProps?: () => TExtraProps;
+  isDisabled?: () => boolean;
+}
+
+export class MenuCustomItem<TExtraProps = unknown> extends MenuItem implements IMenuCustomItem<TExtraProps> {
+  private readonly isDisabled?: () => boolean;
+
+  readonly hidden?: boolean;
+  readonly getComponent: () => ICustomMenuItemComponent<TExtraProps>;
+  readonly getExtraProps?: () => TExtraProps;
+
+  get disabled(): boolean {
+    return this.isDisabled?.() ?? false;
+  }
+
+  constructor(
+    options: IMenuCustomItemOptions<TExtraProps>,
+    events?: IMenuItemEvents,
+    getters?: IMenuCustomItemPropertyGetters<TExtraProps>,
+  ) {
+    super(options.id, events);
+    this.getComponent = options.getComponent;
+    this.isDisabled = getters?.isDisabled;
+    this.getExtraProps = getters?.getExtraProps;
+  }
+}
diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts
index 8165c09213..9e6b171e15 100644
--- a/webapp/packages/core-view/src/index.ts
+++ b/webapp/packages/core-view/src/index.ts
@@ -30,10 +30,12 @@ export * from './DataContext/useDataContext';
 export * from './DataContext/useDynamicDataContext';
 export * from './Menu/MenuItem/IMenuActionItem';
 export * from './Menu/MenuItem/IMenuBaseItem';
+export * from './Menu/MenuItem/IMenuCustomItem';
 export * from './Menu/MenuItem/IMenuItem';
 export * from './Menu/MenuItem/IMenuSubMenuItem';
 export * from './Menu/MenuItem/MenuActionItem';
 export * from './Menu/MenuItem/MenuBaseItem';
+export * from './Menu/MenuItem/MenuCustomItem';
 export * from './Menu/MenuItem/MenuGroupItem';
 export * from './Menu/MenuItem/MenuLazyItem';
 export * from './Menu/MenuItem/MenuSeparatorItem';
diff --git a/webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts b/webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts
new file mode 100644
index 0000000000..8448f823a0
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts
@@ -0,0 +1,11 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2021 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+import { createDataContext } from '@cloudbeaver/core-view';
+
+export const DATA_CONTEXT_MENU_SEARCH = createDataContext<string>('menu-local', '');
diff --git a/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts
new file mode 100644
index 0000000000..3ad5dffc4e
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts
@@ -0,0 +1,21 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 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 { IContextMenuItemProps } from '@cloudbeaver/core-ui';
+import { MenuCustomItem } from '@cloudbeaver/core-view';
+
+import { SearchResourceMenuItemComponent } from './SearchResourceMenuItemComponent';
+
+export class SearchResourceMenuItem extends MenuCustomItem<IContextMenuItemProps> {
+  constructor() {
+    super({
+      id: 'search-resource',
+      getComponent: () => SearchResourceMenuItemComponent,
+    });
+  }
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx
new file mode 100644
index 0000000000..bd4a647c5b
--- /dev/null
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx
@@ -0,0 +1,48 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2022 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+import { observer } from 'mobx-react-lite';
+import styled, { css } from 'reshadow';
+
+import { useStyles } from '@cloudbeaver/core-theming';
+import type { IContextMenuItemProps } from '@cloudbeaver/core-ui';
+import type { ICustomMenuItemComponent } from '@cloudbeaver/core-view';
+
+import { DATA_CONTEXT_MENU_SEARCH } from './DATA_CONTEXT_MENU_SEARCH';
+
+const styles = css`
+  search-box {
+    padding: 8px 12px;
+  }
+`;
+
+export const SearchResourceMenuItemComponent: ICustomMenuItemComponent<IContextMenuItemProps> = observer(function SearchResourceMenuItemComponent({
+  item,
+  menu,
+  onClick,
+  menuData,
+  className,
+  style,
+}) {
+  const value = menuData.context.tryGet(DATA_CONTEXT_MENU_SEARCH) ?? '';
+  function handleChange(value: string) {
+    menuData.context.set(DATA_CONTEXT_MENU_SEARCH, value);
+  }
+
+  return styled(useStyles(style, styles))(
+    <search-box dir="ltr" className={className}>
+      <input
+        name='search'
+        placeholder='Search for resource...'
+        value={value}
+        autoComplete="off"
+        onChange={event => handleChange(event.target.value)}
+      />
+    </search-box>
+  );
+});
\ No newline at end of file
diff --git a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
index 5cfcd51481..55b7e8ef8f 100644
--- a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
@@ -7,7 +7,7 @@
  */
 
 import { EAdminPermission } from '@cloudbeaver/core-administration';
-import { App, Bootstrap, DIService, injectable } from '@cloudbeaver/core-di';
+import { App, Bootstrap, DIService, injectable, IServiceConstructor } from '@cloudbeaver/core-di';
 import { PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
 import { CachedResource } from '@cloudbeaver/core-sdk';
 import { ActionService, DATA_CONTEXT_MENU, DATA_CONTEXT_SUBMENU_ITEM, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
@@ -16,6 +16,8 @@ import { MainMenuService } from '@cloudbeaver/plugin-top-app-bar';
 import { MENU_USER_PROFILE } from '@cloudbeaver/plugin-user-profile';
 
 import { ACTION_DEVTOOLS } from './actions/ACTION_DEVTOOLS';
+import { DATA_CONTEXT_MENU_SEARCH } from './ContextMenu/DATA_CONTEXT_MENU_SEARCH';
+import { SearchResourceMenuItem } from './ContextMenu/SearchResourceMenuItem';
 import { DevToolsService } from './DevToolsService';
 import { MENU_DEVTOOLS } from './menu/MENU_DEVTOOLS';
 import { MENU_PLUGIN } from './menu/MENU_PLUGIN';
@@ -95,10 +97,25 @@ export class PluginBootstrap extends Bootstrap {
 
     this.menuService.addCreator({
       isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_DEVTOOLS,
-      getItems: (context, items) => [
-        MENU_PLUGINS,
-        ...items,
-      ],
+      getItems: (context, items) => {
+        const search = context.tryGet(DATA_CONTEXT_MENU_SEARCH);
+
+        if (search) {
+
+          return [
+            new SearchResourceMenuItem(),
+            ...this.getResources(this.app
+              .getServices()
+              .filter(service => service.name.toLocaleLowerCase().includes(search.toLocaleLowerCase()))),
+          ];
+        }
+
+        return [
+          new SearchResourceMenuItem(),
+          MENU_PLUGINS,
+          ...items,
+        ];
+      },
     });
 
     this.menuService.addCreator({
@@ -152,11 +169,7 @@ export class PluginBootstrap extends Bootstrap {
         }
 
         return [
-          ...plugin.providers
-            .slice()
-            .sort((a, b) => a.name.localeCompare(b.name))
-            .filter(service => service.prototype instanceof CachedResource)
-            .map(resource => new ResourceSubMenuItem(resource)),
+          ...this.getResources(plugin.providers),
           ...items,
         ];
       },
@@ -194,4 +207,11 @@ export class PluginBootstrap extends Bootstrap {
 
   load(): void | Promise<void> {
   }
+
+  private getResources(providers: IServiceConstructor<any>[]): ResourceSubMenuItem[] {
+    return providers
+      .filter(service => service.prototype instanceof CachedResource)
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map(resource => new ResourceSubMenuItem(resource));
+  }
 }
\ No newline at end of file

From 4544064ea867f11ec06897f6f35aa2997d555d88 Mon Sep 17 00:00:00 2001
From: Aleksandr Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Wed, 7 Sep 2022 21:17:35 +0300
Subject: [PATCH 25/37] CB-2559 not update navigator model if context not
 changed

---
 .../src/io/cloudbeaver/model/session/WebSession.java        | 6 ++++--
 .../src/io/cloudbeaver/model/session/WebUserContext.java    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index 576bec1450..be9d1f1715 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -957,8 +957,10 @@ public class WebSession extends AbstractSessionPersistent implements SMSession,
     }
 
     public synchronized void updateSMAuthInfo(SMAuthInfo smAuthInfo) throws DBException {
-        userContext.refresh(smAuthInfo);
-        refreshUserData();
+        boolean contextChanged = userContext.refresh(smAuthInfo);
+        if (contextChanged) {
+            refreshUserData();
+        }
     }
 
     @Override
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java
index fa51e53d89..b47fdccf0c 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java
@@ -65,7 +65,7 @@ public class WebUserContext implements SMCredentialsProvider {
      * @param smAuthInfo - auth info from security manager
      * @throws DBException - if user already authorized and new token come from another user
      */
-    public synchronized void refresh(SMAuthInfo smAuthInfo) throws DBException {
+    public synchronized boolean refresh(SMAuthInfo smAuthInfo) throws DBException {
         if (smAuthInfo.getAuthStatus() != SMAuthStatus.SUCCESS) {
             throw new DBCException("Authorization did not complete successfully");
         }
@@ -92,7 +92,7 @@ public class WebUserContext implements SMCredentialsProvider {
             this.smSessionId = smAuthInfo.getAuthPermissions().getSessionId();
             setUser(authPermissions.getUserId() == null ? null : new WebUser(securityController.getUserById(authPermissions.getUserId())));
         }
-
+        return isSessionChanged;
     }
 
     public synchronized void refreshSMSession() throws DBException {

From 863cd7b73900ca42a640d864cdcfbb0218675387 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Thu, 8 Sep 2022 09:20:18 +0300
Subject: [PATCH 26/37] fix(core-sdk): CB-CB-2503 cached resource includes
 observing

---
 .../src/UserInfoResource.ts                   |  4 +--
 .../core-blocks/src/useMapResource.ts         | 27 ++++++++++---------
 .../core-connections/src/DBDriverResource.ts  | 11 ++++----
 .../src/Resource/CachedMapResource.ts         | 20 ++++++--------
 .../core-sdk/src/Resource/CachedResource.ts   | 18 ++++++-------
 .../core-sdk/src/Resource/ResourceKeyList.ts  |  4 +++
 6 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/webapp/packages/core-authentication/src/UserInfoResource.ts b/webapp/packages/core-authentication/src/UserInfoResource.ts
index 447e2d7ee8..f7952ae74a 100644
--- a/webapp/packages/core-authentication/src/UserInfoResource.ts
+++ b/webapp/packages/core-authentication/src/UserInfoResource.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { computed, makeObservable, runInAction } from 'mobx';
+import { computed, makeObservable, observable, runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { SyncExecutor, ISyncExecutor, ITask, AutoRunningTask, whileTask } from '@cloudbeaver/core-executor';
@@ -253,7 +253,7 @@ UserInfoIncludes
 
   protected resetIncludes(): void {
     const metadata = this.getMetadata();
-    metadata.includes = [...this.defaultIncludes];
+    metadata.includes = observable([...this.defaultIncludes]);
   }
 
   getIncludes(key: void): string[] {
diff --git a/webapp/packages/core-blocks/src/useMapResource.ts b/webapp/packages/core-blocks/src/useMapResource.ts
index ae9f4cfd7d..eb7ceaefdf 100644
--- a/webapp/packages/core-blocks/src/useMapResource.ts
+++ b/webapp/packages/core-blocks/src/useMapResource.ts
@@ -14,6 +14,7 @@ import { NotificationService } from '@cloudbeaver/core-events';
 import { CachedResourceIncludeArgs, CachedMapResource, CachedMapResourceGetter, ResourceKey, CachedMapResourceValue, CachedMapResourceKey, CachedMapResourceArguments, CachedMapResourceLoader, ResourceKeyList, CachedMapResourceListGetter, isResourceKeyList } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
+import { getComputed } from './getComputed';
 import type { ILoadableState } from './Loader/ILoadableState';
 import { useObservableRef } from './useObservableRef';
 
@@ -364,20 +365,22 @@ export function useMapResource<
     loading: computed,
   }, false);
 
-  // TODO: getComputed skips update somehow ...
-  const outdated = (
-    !result.loading
-    && (result.outdated || !result.loaded)
-  );
-
-  const preloaded = refObj.preloaded; // make mobx subscription
+  const canLoad = getComputed(() => (
+    (
+      !keyRef.actual
+      || result.outdated
+      || !result.loaded
+    )
+    && refObj.preloaded
+    && keyRef.key !== null
+    && (
+      result.exception === null
+      || (Array.isArray(result.exception) && !result.exception.some(Boolean))
+    )
+  ));
 
   useEffect(() => {
-    if (!preloaded || (!outdated && keyRef.actual) || keyRef.key === null) {
-      return;
-    }
-
-    if (result.exception === null || (Array.isArray(result.exception) && !result.exception.some(Boolean))) {
+    if (canLoad) {
       (refObj as any)[loadFunctionName]();
     }
   });
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index d8a2c5ab1e..08b14aff81 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -37,7 +37,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
     super();
     permissionsResource.require(this, EPermission.public);
 
-    this.serverConfigResource.onDataOutdated.addHandler(this.markOutdated.bind(this));
+    this.serverConfigResource.onDataOutdated.addHandler(() => this.markOutdated());
 
     makeObservable(this, {
       enabledDrivers: computed,
@@ -69,7 +69,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
         includeDriverParameters: false,
         includeDriverProperties: false,
         includeProviderProperties: false,
-        ...this.getIncludesMap(driverId, includes),
+        ...this.getIncludesMap(driverId, (all ? this.defaultIncludes : includes)),
       });
 
       if (driverId && !drivers.some(driver => driver.id === driverId)) {
@@ -77,10 +77,9 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
       }
 
       runInAction(() => {
-
         if (all) {
-          this.resetIncludes();
-          this.data.clear();
+          const removedDrivers = this.keys.filter(key => !drivers.some(driver => driver.id === key));
+          this.delete(resourceKeyList(removedDrivers));
         }
 
         this.updateDriver(...drivers);
@@ -94,6 +93,6 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
     const keys = resourceKeyList(drivers.map(driver => driver.id));
 
     const oldDriver = this.get(keys);
-    this.set(keys, oldDriver.map((oldDriver, i) => ({ ...oldDriver, ...drivers[i] })));
+    this.set(keys, oldDriver.map((oldDriver, i) => (Object.assign(oldDriver ?? {}, drivers[i]))));
   }
 }
diff --git a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
index c43a0bfe68..4ef124c396 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
@@ -366,25 +366,21 @@ export abstract class CachedMapResource<
   }
 
   includes(param: ResourceKey<TKey>, key: ResourceKey<TKey>): boolean {
-    if (param === key) {
+    if
+    (
+      this.isAliasEqual(param, key)
+      || (ResourceKeyUtils.isEmpty(param) && ResourceKeyUtils.isEmpty(key))
+    ) {
       return true;
     }
 
     if (this.isAlias(param) || this.isAlias(key)) {
-      return this.isAliasEqual(param, key);
-    }
-
-    if (ResourceKeyUtils.isEmpty(param) || ResourceKeyUtils.isEmpty(key)) {
-      return ResourceKeyUtils.isEmpty(param) && ResourceKeyUtils.isEmpty(key);
+      return true;
     }
 
     param = ResourceKeyUtils.mapKey(param, this.getKeyRef.bind(this));
     key = ResourceKeyUtils.mapKey(key, this.getKeyRef.bind(this));
 
-    if (param === key) {
-      return true;
-    }
-
     return ResourceKeyUtils.includes(param, key, this.isKeyEqual);
   }
 
@@ -467,10 +463,10 @@ export abstract class CachedMapResource<
       key = this.transformParam(key);
     }
 
-    runInAction(() => ResourceKeyUtils.forEach(key!, key => {
+    ResourceKeyUtils.forEach(key, key => {
       const metadata = this.getMetadata(key);
       metadata.outdated = true;
-    }));
+    });
 
     this.onDataOutdated.execute(key);
   }
diff --git a/webapp/packages/core-sdk/src/Resource/CachedResource.ts b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
index 4e751b2682..a4fc7956ad 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
@@ -366,7 +366,7 @@ export abstract class CachedResource<
             break transform;
           }
         } else {
-          if (this.includes(alias.param, param)) {
+          if (alias.param === param) {
             param = alias.getAlias(param);
             deep++;
             // eslint-disable-next-line no-labels
@@ -412,7 +412,7 @@ export abstract class CachedResource<
 
   protected resetIncludes(): void {
     for (const metadata of this.metadata.values()) {
-      metadata.includes = [...this.defaultIncludes];
+      metadata.includes = observable([...this.defaultIncludes]);
     }
   }
 
@@ -447,12 +447,16 @@ export abstract class CachedResource<
   }
 
   isAliasEqual(param: TParam, second: TParam): boolean {
+    if (param === second) {
+      return true;
+    }
+
     return this.paramAliases.some(alias => {
       if ('getter' in alias && alias.getter) {
         return alias.param(param) && alias.param(second);
-      } else {
-        return alias.param === param && alias.param === second;
       }
+
+      return false;
     });
   }
 
@@ -461,14 +465,10 @@ export abstract class CachedResource<
   }
 
   protected includes(param: TParam, second: TParam): boolean {
-    if (param === second) {
+    if (this.isAliasEqual(param, second)) {
       return true;
     }
 
-    if (this.isAlias(param) || this.isAlias(second)) {
-      return this.isAliasEqual(param, second);
-    }
-
     param = this.transformParam(param);
     second = this.transformParam(second);
     return this.isKeyEqual(param, second);
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts b/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
index 44f8ca306f..ca23605a08 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
@@ -188,6 +188,10 @@ export const ResourceKeyUtils: ResourceKeyUtils = {
     key: ResourceKey<TKey>,
     isEqual = (keyA: TKey, keyB: TKey) => keyA === keyB
   ): boolean {
+    if (param === key) {
+      return true;
+    }
+
     if (isResourceKeyList(param)) {
       return param.includes(key);
     }

From a43df1fb705e0474816436ee5d9132d95892e805 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Tue, 6 Sep 2022 09:27:27 +0300
Subject: [PATCH 27/37] fix(core-blocks): CB-2500 loader cancellation

---
 webapp/packages/core-blocks/src/Loader/Loader.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/core-blocks/src/Loader/Loader.tsx b/webapp/packages/core-blocks/src/Loader/Loader.tsx
index f73593f2c6..d6c05ba971 100644
--- a/webapp/packages/core-blocks/src/Loader/Loader.tsx
+++ b/webapp/packages/core-blocks/src/Loader/Loader.tsx
@@ -116,8 +116,9 @@ export const Loader = observer<Props>(function Loader({
 
         if (loading) {
           if (element.cancel) {
+            const cancelCopy = onCancel;
             onCancel = () => {
-              onCancel?.();
+              cancelCopy?.();
               element.cancel?.();
             };
           }

From 5ee209f5f11d7849ea914b80bb8b34a4ea9e043c Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Wed, 7 Sep 2022 16:54:56 +0300
Subject: [PATCH 28/37] CB-2558 fix(plugin-log-viewer): Start logs polling on
 mount

---
 .../plugin-log-viewer/src/LogViewer/LogViewerService.ts  | 9 ++++-----
 .../plugin-log-viewer/src/LogViewer/useLogViewer.tsx     | 8 ++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
index deb3a26085..cdbdb90acb 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
@@ -63,9 +63,9 @@ export class LogViewerService {
 
   toggle(): void {
     if (this.isActive) {
-      this.stopLog();
+      this.settings.active = false;
     } else {
-      this.startLog();
+      this.settings.active = true;
     }
   }
 
@@ -74,14 +74,14 @@ export class LogViewerService {
   }
 
   async startLog(): Promise<void> {
-    if (this.isActive) {
+    if (this.timeoutTaskId !== null) {
       return;
     }
+
     if (!this.isLogViewerAvailable()) {
       throw new Error('Access denied');
     }
     this.failedRequestsCount = 0;
-    this.settings.active = true;
 
     const refreshInterval = this.logViewerSettingsService.settings.isValueDefault('refreshTimeout')
       ? this.coreSettingsService.settings.getValue('app.logViewer.refreshTimeout')
@@ -100,7 +100,6 @@ export class LogViewerService {
       clearTimeout(this.timeoutTaskId);
       this.timeoutTaskId = null;
     }
-    this.settings.active = false;
   }
 
   clearLog(): void {
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
index 2e86c3d618..752651fb08 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
@@ -7,6 +7,7 @@
  */
 
 import { observable } from 'mobx';
+import { useEffect } from 'react';
 
 import { useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
@@ -22,6 +23,13 @@ interface Props {
 export function useLogViewer() {
   const logViewerService = useService(LogViewerService);
 
+  useEffect(() => {
+    logViewerService.startLog();
+    return () => {
+      logViewerService.stopLog();
+    };
+  }, []);
+
   const props: Props = useObservableRef(
     () => ({ selectedItem: null }),
     { selectedItem: observable.ref },

From 035e636145962e1197e39296ac2883320f7a5935 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Thu, 8 Sep 2022 10:05:40 +0300
Subject: [PATCH 29/37] fix(core-events): CB-2565 autoClose prop for
 notifications

---
 webapp/packages/core-events/src/INotification.ts          | 2 ++
 webapp/packages/core-events/src/NotificationService.ts    | 1 +
 .../src/NotificationsItem/NotificationItemController.ts   | 8 ++++++--
 .../src/PluginBootstrap.ts                                | 2 +-
 .../packages/plugin-sql-editor/src/SqlEditor/useTools.tsx | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/core-events/src/INotification.ts b/webapp/packages/core-events/src/INotification.ts
index b25bf6ac7f..12d4e8b5ce 100644
--- a/webapp/packages/core-events/src/INotification.ts
+++ b/webapp/packages/core-events/src/INotification.ts
@@ -54,6 +54,7 @@ export interface INotification<TProps extends INotificationExtraProps<any> = INo
   message?: string;
   timestamp: number;
   details?: string | Error | null;
+  autoClose?: boolean;
   persistent?: boolean;
   state: { deleteDelay: number };
   isSilent: boolean;
@@ -69,6 +70,7 @@ export interface INotificationOptions<TProps extends INotificationExtraProps<any
   message?: string;
   details?: string | Error | null;
   isSilent?: boolean;
+  autoClose?: boolean;
   persistent?: boolean;
   extraProps?: TProps;
   timestamp?: number;
diff --git a/webapp/packages/core-events/src/NotificationService.ts b/webapp/packages/core-events/src/NotificationService.ts
index 0809b752aa..f2f6c1f57f 100644
--- a/webapp/packages/core-events/src/NotificationService.ts
+++ b/webapp/packages/core-events/src/NotificationService.ts
@@ -80,6 +80,7 @@ export class NotificationService {
       isSilent: !!options.isSilent,
       customComponent: options.customComponent,
       extraProps: options.extraProps || {} as TProps,
+      autoClose: options.autoClose,
       persistent: options.persistent,
       state: observable({ deleteDelay: 0 }),
       timestamp: options.timestamp || Date.now(),
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts b/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
index b2f3964c22..85ce49f138 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
+++ b/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
@@ -22,7 +22,7 @@ export class NotificationItemController implements IInitializableController {
   isDetailsDialogOpen = false;
   private notification!: INotification<any>;
 
-  constructor(private commonDialogService: CommonDialogService) {
+  constructor(private readonly commonDialogService: CommonDialogService) {
     makeObservable(this, {
       isDetailsDialogOpen: observable,
     });
@@ -35,7 +35,11 @@ export class NotificationItemController implements IInitializableController {
       this.handleShowDetails = this.showDetails.bind(this);
     }
 
-    if (notification.type !== ENotificationType.Error && !notification.persistent) {
+    if (
+      notification.type !== ENotificationType.Error
+      && !notification.persistent
+      && notification.autoClose !== false
+    ) {
       this.closeAfter = FadeTimeout;
     }
   }
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-resource/src/PluginBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab-resource/src/PluginBootstrap.ts
index ad452d3422..faa055529a 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-resource/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-resource/src/PluginBootstrap.ts
@@ -204,7 +204,7 @@ export class PluginBootstrap extends Bootstrap {
         this.notificationService.logInfo({
           title: 'sql_editor_upload_script_max_size_title',
           message: `Max size: ${maxSize}KB\nFile size: ${size}KB`,
-          persistent: true,
+          autoClose: false,
         });
 
         return;
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
index 9640f2b9a4..0c4b6f8c61 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
@@ -82,6 +82,7 @@ export function useTools(state: ISqlEditorTabState): Readonly<State> {
         this.notificationService.logInfo({
           title: 'sql_editor_upload_script_max_size_title',
           message: `Max size: ${maxSize}KB\nFile size: ${size}KB`,
+          autoClose: false,
         });
 
         return false;

From 2c2bf15c308b7a4e9ed9b150e5cd26492c5c85f1 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 8 Sep 2022 11:28:02 +0300
Subject: [PATCH 30/37] CB-1551 fix(core-blocks): Add disabled styles for non
 button element

---
 webapp/packages/core-blocks/src/Button.tsx      |  1 -
 webapp/packages/core-blocks/src/UploadArea.tsx  |  8 ++++++--
 .../core-theming/src/styles/_button.scss        | 17 ++++++++++++++++-
 .../NavigationTabsBar/NavigationTabsBar.tsx     |  8 ++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx
index 19acb004e2..75ee9ca8a8 100644
--- a/webapp/packages/core-blocks/src/Button.tsx
+++ b/webapp/packages/core-blocks/src/Button.tsx
@@ -57,7 +57,6 @@ const buttonStyles = css`
         text-decoration: none;
       }
     }
-    
   `;
 
 const buttonMod = {
diff --git a/webapp/packages/core-blocks/src/UploadArea.tsx b/webapp/packages/core-blocks/src/UploadArea.tsx
index 5ba4a5684e..1e487b37c2 100644
--- a/webapp/packages/core-blocks/src/UploadArea.tsx
+++ b/webapp/packages/core-blocks/src/UploadArea.tsx
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-import styled, { css } from 'reshadow';
+import styled, { css, use } from 'reshadow';
 
 import { uuid } from '@cloudbeaver/core-utils';
 
@@ -19,6 +19,10 @@ interface Props extends React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLIn
 const styles = css`
   label {
     cursor: pointer;
+
+    &[|disabled] {
+      cursor: default;
+    }
   }
 `;
 
@@ -39,7 +43,7 @@ export const UploadArea: React.FC<Props> = function UploadArea({ id, reset, clas
   return styled(styles)(
     <>
       <input {...rest} type='file' id={_id} hidden onChange={handleChange} />
-      <label htmlFor={_id} className={className} title={rest.title}>
+      <label htmlFor={_id} {...use({ disabled: rest.disabled })} className={className} title={rest.title}>
         {children}
       </label>
     </>
diff --git a/webapp/packages/core-theming/src/styles/_button.scss b/webapp/packages/core-theming/src/styles/_button.scss
index 4b6ac3beb2..7afa351db1 100644
--- a/webapp/packages/core-theming/src/styles/_button.scss
+++ b/webapp/packages/core-theming/src/styles/_button.scss
@@ -21,24 +21,38 @@
       opacity: 1;
     }
   }
+
   .theme-button__label {
     @extend .mdc-button__label;
   }
+
   .theme-button__icon {
     @extend .mdc-button__icon;
   }
+
   .theme-button_ripple {
     @extend .mdc-button__ripple;
   }
+
   .theme-button_raised {
     @extend .mdc-button--raised;
   }
+
   .theme-button_unelevated {
     @extend .mdc-button--unelevated;
   }
+
   .theme-button_outlined {
     @extend .mdc-button--outlined;
+
+    &[disabled] {
+      border-color: change-color($color: $mdc-theme-on-surface, $alpha: 0.37);
+      color: change-color($color: $mdc-theme-on-surface, $alpha: 0.37);
+      cursor: default;
+      pointer-events: none;
+    }
   }
+
   .theme-button_secondary {
     @include mdc-button-ink-color(secondary, $query);
     @include mdc-states($color: secondary, $query: $query, $ripple-target: $mdc-button-ripple-target);
@@ -54,6 +68,7 @@
       @include mdc-states($color: on-secondary, $query: $query, $ripple-target: $mdc-button-ripple-target);
     }
   }
+
   .theme-button_background {
     @include mdc-button-ink-color(background, $query);
     @include mdc-states($color: background, $query: $query, $ripple-target: $mdc-button-ripple-target);
@@ -69,4 +84,4 @@
       @include mdc-states($color: on-secondary, $query: $query, $ripple-target: $mdc-button-ripple-target);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
index f15be16bc8..b8e011b8b1 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -11,7 +11,7 @@ import { useCallback, useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
-import { TextPlaceholder, useExecutor } from '@cloudbeaver/core-blocks';
+import { Button, TextPlaceholder, useExecutor } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { useTranslate } from '@cloudbeaver/core-localization';
 import { useStyles } from '@cloudbeaver/core-theming';
@@ -73,7 +73,11 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
   }, []);
 
   if (navigation.tabIdList.length === 0) {
-    return <TextPlaceholder>{translate('app_shared_navigationTabsBar_placeholder')}</TextPlaceholder>;
+    return (
+      <TextPlaceholder>
+        {translate('app_shared_navigationTabsBar_placeholder')}
+      </TextPlaceholder>
+    );
   }
 
   return styled(style)(

From 8e99f20f1723f48f2777834b6bc04ab0ac6cb6eb Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 8 Sep 2022 11:29:26 +0300
Subject: [PATCH 31/37] CB-1551 remove unused import

---
 .../src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
index b8e011b8b1..6d324effb5 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -11,7 +11,7 @@ import { useCallback, useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
-import { Button, TextPlaceholder, useExecutor } from '@cloudbeaver/core-blocks';
+import { TextPlaceholder, useExecutor } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { useTranslate } from '@cloudbeaver/core-localization';
 import { useStyles } from '@cloudbeaver/core-theming';

From 6d8895b2466cdbb033e3743aab99cdb47d7571b0 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 8 Sep 2022 17:28:10 +0300
Subject: [PATCH 32/37] CB-2477 feat(plugin-connection-search): Add connection
 form to search service

---
 .../src/Search/ConnectionSearchService.ts     | 107 ++++++++++++++++--
 .../src/Search/SearchDatabase.tsx             |  17 ++-
 .../src/SearchConnectionPluginBootstrap.ts    |   7 +-
 3 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
index 8c253870cd..72626646a6 100644
--- a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -9,11 +9,18 @@
 import { observable, makeObservable } from 'mobx';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
-import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
+import { ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
+import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { ExecutorInterrupter, IExecutorHandler } from '@cloudbeaver/core-executor';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
-import { PublicConnectionFormService } from '@cloudbeaver/plugin-connections';
+import { OptionsPanelService } from '@cloudbeaver/core-ui';
+import { ConnectionFormService, ConnectionFormState, IConnectionFormState, PublicConnectionFormService } from '@cloudbeaver/plugin-connections';
+
+import { SearchDatabase } from './SearchDatabase';
+
+const formGetter = () => SearchDatabase;
 
 @injectable()
 export class ConnectionSearchService {
@@ -22,6 +29,8 @@ export class ConnectionSearchService {
 
   disabled = false;
 
+  formState: IConnectionFormState | null = null;
+
   // get disabled(): boolean {
   //   return this.createConnectionService.disabled;
   // }
@@ -35,12 +44,18 @@ export class ConnectionSearchService {
     private readonly connectionInfoResource: ConnectionInfoResource,
     // private createConnectionService: CreateConnectionService,
     private readonly administrationScreenService: AdministrationScreenService,
-    private readonly publicConnectionFormService: PublicConnectionFormService
+    private readonly publicConnectionFormService: PublicConnectionFormService,
+    private readonly connectionFormService: ConnectionFormService,
+    private readonly optionsPanelService: OptionsPanelService,
+    private readonly commonDialogService: CommonDialogService,
   ) {
+    this.optionsPanelService.closeTask.addHandler(this.closeHandler);
+
     makeObservable(this, {
       hosts: observable,
       databases: observable,
       disabled: observable,
+      formState: observable.shallow,
     });
 
     this.databases = [];
@@ -49,6 +64,10 @@ export class ConnectionSearchService {
     this.select = this.select.bind(this);
   }
 
+  open(): void {
+    this.optionsPanelService.open(formGetter);
+  }
+
   close(): void {
     this.hosts = 'localhost';
     this.databases = [];
@@ -81,16 +100,86 @@ export class ConnectionSearchService {
     }
   }
 
+  private readonly closeHandler: IExecutorHandler<any> = async (data, contexts) => {
+    const isDialogClosed = await this.showUnsavedChangesDialog();
+
+    if (!isDialogClosed) {
+      ExecutorInterrupter.interrupt(contexts);
+      return;
+    }
+
+    this.clearFormState();
+  };
+
+  private async showUnsavedChangesDialog(): Promise<boolean> {
+    if (
+      !this.formState
+      || !this.optionsPanelService.isOpen(formGetter)
+      || (
+        this.formState.config.connectionId
+        && this.formState.projectId !== null
+        && !this.connectionInfoResource.has(createConnectionParam(
+          this.formState.projectId,
+          this.formState.config.connectionId
+        ))
+      )
+    ) {
+      return true;
+    }
+
+    const state = await this.formState.checkFormState();
+
+    if (!state?.edited) {
+      return true;
+    }
+
+    const result = await this.commonDialogService.open(ConfirmationDialog, {
+      title: 'connections_public_connection_edit_cancel_title',
+      message: 'connections_public_connection_edit_cancel_message',
+      confirmActionText: 'ui_processing_ok',
+    });
+
+    return result !== DialogueStateResult.Rejected;
+  }
+
   change(hosts: string): void {
     this.hosts = hosts;
   }
 
+  saveConnection() {
+    this.goBack();
+  }
+
+  goBack() {
+    this.clearFormState();
+  }
+
   select(projectId: string, database: AdminConnectionSearchInfo): void {
-    this.publicConnectionFormService.open(projectId, {
-      ...this.connectionInfoResource.getEmptyConfig(),
-      driverId: database.defaultDriver,
-      host: database.host,
-      port: `${database.port}`,
-    }, database.possibleDrivers);
+    if (!this.formState) {
+      this.formState = new ConnectionFormState(
+        this.connectionFormService,
+        this.connectionInfoResource
+      );
+    }
+
+    this.formState
+      .setOptions(
+        'create',
+        'public'
+      )
+      .setConfig(projectId, {
+        ...this.connectionInfoResource.getEmptyConfig(),
+        driverId: database.defaultDriver,
+        host: database.host,
+        port: `${database.port}`,
+      })
+      .setAvailableDrivers(database.possibleDrivers);
+
+    this.formState.load();
+  }
+
+  private clearFormState() {
+    this.formState?.dispose();
+    this.formState = null;
   }
 }
diff --git a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
index 788feab705..4f5d0717a1 100644
--- a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
@@ -8,24 +8,31 @@
 
 import { observer } from 'mobx-react-lite';
 
-
-import { useMapResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { ProjectsResource, PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
+import {  PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
+import { ConnectionForm } from '@cloudbeaver/plugin-connections';
 
-// import { CustomConnection } from '../Manual/CustomConnection';
 import { ConnectionSearchService } from './ConnectionSearchService';
 import { DatabaseList } from './DatabaseList';
 
 export const SearchDatabase: React.FC = observer(function SearchDatabase() {
   const connectionSearchService = useService(ConnectionSearchService);
-  // useMapResource(CustomConnection, ProjectsResource, CachedMapAllKey);
 
   function select(database: AdminConnectionSearchInfo) {
     connectionSearchService.select(PROJECT_GLOBAL_ID, database);
   }
 
+  if (connectionSearchService.formState) {
+    return (
+      <ConnectionForm
+        state={connectionSearchService.formState}
+        onSave={() => connectionSearchService.saveConnection()}
+        onCancel={() => connectionSearchService.goBack()}
+      />
+    );
+  }
+
   return (
     <DatabaseList
       databases={connectionSearchService.databases}
diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
index e37b355ab2..9b2cd2452c 100644
--- a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -10,10 +10,9 @@ import { EAdminPermission } from '@cloudbeaver/core-administration';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import { PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
-import { OptionsPanelService } from '@cloudbeaver/core-ui';
 import { MainMenuService, EMainMenu } from '@cloudbeaver/plugin-top-app-bar';
 
-import { SearchDatabase } from './Search/SearchDatabase';
+import { ConnectionSearchService } from './Search/ConnectionSearchService';
 
 @injectable()
 export class SearchConnectionPluginBootstrap extends Bootstrap {
@@ -21,8 +20,8 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
     private readonly mainMenuService: MainMenuService,
     private readonly serverConfigResource: ServerConfigResource,
     private readonly projectsService: ProjectsService,
-    private readonly optionsPanelService: OptionsPanelService,
     private readonly permissionsService: PermissionsService,
+    private readonly connectionSearchService: ConnectionSearchService,
   ) {
     super();
   }
@@ -42,7 +41,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
         || !this.permissionsService.has(EAdminPermission.admin)
       ),
       onClick: () => {
-        this.optionsPanelService.open(() => SearchDatabase);
+        this.connectionSearchService.open();
       },
     });
   }

From ccd3f55e409acfb10aa13930caad46d406256749 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Thu, 8 Sep 2022 17:29:48 +0300
Subject: [PATCH 33/37] CB-2477 feat(plugin-connection-searc): Fix code review

---
 .../src/Search/ConnectionSearchService.ts            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
index 72626646a6..d71795d1a1 100644
--- a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -51,17 +51,17 @@ export class ConnectionSearchService {
   ) {
     this.optionsPanelService.closeTask.addHandler(this.closeHandler);
 
+    this.databases = [];
+    this.search = this.search.bind(this);
+    this.change = this.change.bind(this);
+    this.select = this.select.bind(this);
+
     makeObservable(this, {
       hosts: observable,
       databases: observable,
       disabled: observable,
       formState: observable.shallow,
     });
-
-    this.databases = [];
-    this.search = this.search.bind(this);
-    this.change = this.change.bind(this);
-    this.select = this.select.bind(this);
   }
 
   open(): void {
@@ -74,7 +74,7 @@ export class ConnectionSearchService {
   }
 
   async load(): Promise<void> {
-    if (this.administrationScreenService.isConfigurationMode && this.databases.length === 0) {
+    if (this.databases.length === 0) {
       await this.search();
     }
   }

From 6ccdb6d189429ce2dfe8b974942a01d6cef80088 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Fri, 9 Sep 2022 09:51:03 +0300
Subject: [PATCH 34/37] CB-2477 feat(plugin-connections-administration): Remove
 connection search from admin

---
 .../src/Search/ConnectionSearchService.ts     | 21 +---
 .../CreateConnectionBaseBootstrap.ts          | 18 ----
 .../Search/ConnectionSearchService.ts         | 97 -------------------
 .../CreateConnection/Search/Database.tsx      | 77 ---------------
 .../CreateConnection/Search/DatabaseList.tsx  | 70 -------------
 .../Search/SearchDatabase.tsx                 | 39 --------
 .../src/index.ts                              |  1 -
 .../src/manifest.ts                           |  2 -
 8 files changed, 2 insertions(+), 323 deletions(-)
 delete mode 100644 webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/ConnectionSearchService.ts
 delete mode 100644 webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/Database.tsx
 delete mode 100644 webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/DatabaseList.tsx
 delete mode 100644 webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/SearchDatabase.tsx

diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
index d71795d1a1..39e6283040 100644
--- a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -8,7 +8,6 @@
 
 import { observable, makeObservable } from 'mobx';
 
-import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
@@ -16,7 +15,7 @@ import { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter, IExecutorHandler } from '@cloudbeaver/core-executor';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
-import { ConnectionFormService, ConnectionFormState, IConnectionFormState, PublicConnectionFormService } from '@cloudbeaver/plugin-connections';
+import { ConnectionFormService, ConnectionFormState, IConnectionFormState } from '@cloudbeaver/plugin-connections';
 
 import { SearchDatabase } from './SearchDatabase';
 
@@ -31,20 +30,9 @@ export class ConnectionSearchService {
 
   formState: IConnectionFormState | null = null;
 
-  // get disabled(): boolean {
-  //   return this.createConnectionService.disabled;
-  // }
-
-  // set disabled(value: boolean) {
-  //   this.createConnectionService.disabled = value;
-  // }
-
   constructor(
     private readonly notificationService: NotificationService,
     private readonly connectionInfoResource: ConnectionInfoResource,
-    // private createConnectionService: CreateConnectionService,
-    private readonly administrationScreenService: AdministrationScreenService,
-    private readonly publicConnectionFormService: PublicConnectionFormService,
     private readonly connectionFormService: ConnectionFormService,
     private readonly optionsPanelService: OptionsPanelService,
     private readonly commonDialogService: CommonDialogService,
@@ -68,11 +56,6 @@ export class ConnectionSearchService {
     this.optionsPanelService.open(formGetter);
   }
 
-  close(): void {
-    this.hosts = 'localhost';
-    this.databases = [];
-  }
-
   async load(): Promise<void> {
     if (this.databases.length === 0) {
       await this.search();
@@ -100,7 +83,7 @@ export class ConnectionSearchService {
     }
   }
 
-  private readonly closeHandler: IExecutorHandler<any> = async (data, contexts) => {
+  private readonly closeHandler: IExecutorHandler<void> = async (data, contexts) => {
     const isDialogClosed = await this.showUnsavedChangesDialog();
 
     if (!isDialogClosed) {
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap.ts
index 0194de1ae8..78de8687f1 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap.ts
@@ -9,17 +9,12 @@
 import { injectable, Bootstrap } from '@cloudbeaver/core-di';
 
 import { CreateConnectionService } from '../CreateConnectionService';
-import { ConnectionManualService } from './Manual/ConnectionManualService';
 import { CustomConnection } from './Manual/CustomConnection';
-import { ConnectionSearchService } from './Search/ConnectionSearchService';
-import { SearchDatabase } from './Search/SearchDatabase';
 
 @injectable()
 export class CreateConnectionBaseBootstrap extends Bootstrap {
   constructor(
     private readonly createConnectionService: CreateConnectionService,
-    private readonly connectionManualService: ConnectionManualService,
-    private readonly connectionSearchService: ConnectionSearchService
   ) {
     super();
   }
@@ -31,19 +26,6 @@ export class CreateConnectionBaseBootstrap extends Bootstrap {
       order: 1,
       panel: () => CustomConnection,
     });
-    this.createConnectionService.tabsContainer.add({
-      key: 'search',
-      name: 'connections_connection_create_search_database',
-      order: 2,
-      panel: () => SearchDatabase,
-      onOpen: () => this.connectionSearchService.load(),
-      options: {
-        configurationWizard: {
-          activationPriority: 2,
-        },
-        close: () => this.connectionSearchService.close(),
-      },
-    });
   }
 
   load(): void | Promise<void> { }
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/ConnectionSearchService.ts
deleted file mode 100644
index 6b558fa861..0000000000
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/ConnectionSearchService.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2022 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 { observable, makeObservable } from 'mobx';
-
-import { AdministrationScreenService } from '@cloudbeaver/core-administration';
-import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
-import { injectable } from '@cloudbeaver/core-di';
-import { NotificationService } from '@cloudbeaver/core-events';
-import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
-
-import { CreateConnectionService } from '../../CreateConnectionService';
-
-@injectable()
-export class ConnectionSearchService {
-  hosts = 'localhost';
-  databases: AdminConnectionSearchInfo[];
-
-  get disabled(): boolean {
-    return this.createConnectionService.disabled;
-  }
-
-  set disabled(value: boolean) {
-    this.createConnectionService.disabled = value;
-  }
-
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly connectionInfoResource: ConnectionInfoResource,
-    private createConnectionService: CreateConnectionService,
-    private readonly administrationScreenService: AdministrationScreenService
-  ) {
-    makeObservable(this, {
-      hosts: observable,
-      databases: observable,
-    });
-
-    this.databases = [];
-    this.search = this.search.bind(this);
-    this.change = this.change.bind(this);
-    this.select = this.select.bind(this);
-  }
-
-  close(): void {
-    this.hosts = 'localhost';
-    this.databases = [];
-  }
-
-  async load(): Promise<void> {
-    if (this.administrationScreenService.isConfigurationMode && this.databases.length === 0) {
-      await this.search();
-    }
-  }
-
-  async search(): Promise<void> {
-    if (this.disabled || !this.hosts || !this.hosts.trim()) {
-      return;
-    }
-
-    this.disabled = true;
-
-    try {
-      const hosts = this.hosts
-        .trim()
-        .replace(/[\s,|+-]+/gm, ' ')
-        .split(/[\s,|+-]/);
-
-      this.databases = await this.connectionInfoResource.searchDatabases(hosts);
-    } catch (exception: any) {
-      this.notificationService.logException(exception, 'Databases search failed');
-    } finally {
-      this.disabled = false;
-    }
-  }
-
-  change(hosts: string): void {
-    this.hosts = hosts;
-  }
-
-  select(projectId: string, database: AdminConnectionSearchInfo): void {
-    this.createConnectionService.setConnectionTemplate(
-      projectId,
-      {
-        ...this.connectionInfoResource.getEmptyConfig(),
-        driverId: database.defaultDriver,
-        host: database.host,
-        port: `${database.port}`,
-      },
-      database.possibleDrivers
-    );
-  }
-}
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/Database.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/Database.tsx
deleted file mode 100644
index 10a2227dca..0000000000
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/Database.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2022 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, useMemo } from 'react';
-import styled, { css } from 'reshadow';
-
-import {
-  ListItem, ListItemIcon, StaticImage, ListItemName
-} from '@cloudbeaver/core-blocks';
-import { DBDriverResource } from '@cloudbeaver/core-connections';
-import { useService } from '@cloudbeaver/core-di';
-import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
-import { useStyles } from '@cloudbeaver/core-theming';
-
-const styles = css`
-    ListItemIcon {
-      position: relative;
-      min-width: 80px;
-      justify-content: flex-end;
-    }
-
-    StaticImage {
-      composes: theme-background-surface theme-border-color-surface from global;
-      box-sizing: border-box;
-      width: 32px;
-      border-radius: 50%;
-      border: solid 2px;
-
-      &:hover {
-        z-index: 1;
-      }
-      &:not(:first-child) {
-        margin-left: -20px;
-      }
-    }
-  `;
-
-interface Props {
-  database: AdminConnectionSearchInfo;
-  onSelect: (database: AdminConnectionSearchInfo) => void;
-}
-
-export const Database = observer<Props>(function Database({ database, onSelect }) {
-  const drivers = useService(DBDriverResource);
-  const select = useCallback(() => onSelect(database), [database]);
-  const orderedDrivers = useMemo(() => (
-    database.possibleDrivers
-      .slice()
-      .sort((a, b) => {
-        if (a === database.defaultDriver) {
-          return 1;
-        }
-        if (b === database.defaultDriver) {
-          return -1;
-        }
-        return a.localeCompare(b);
-      })
-  ), [database]);
-
-  const host = database.host + ':' + database.port;
-  const name = database.displayName !== database.host ? database.displayName + ' (' + host + ')' : host;
-
-  return styled(useStyles(styles))(
-    <ListItem onClick={select}>
-      <ListItemIcon>
-        {orderedDrivers.map(driverId => <StaticImage key={driverId} icon={drivers.get(driverId)?.icon} />)}
-      </ListItemIcon>
-      <ListItemName>{name}</ListItemName>
-    </ListItem>
-  );
-});
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/DatabaseList.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/DatabaseList.tsx
deleted file mode 100644
index 5208922dcb..0000000000
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/DatabaseList.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2022 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 styled, { css } from 'reshadow';
-
-import {
-  ItemListSearch, ItemList, SubmittingForm, TextPlaceholder, useFocus
-} from '@cloudbeaver/core-blocks';
-import { useTranslate } from '@cloudbeaver/core-localization';
-import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
-import { useStyles } from '@cloudbeaver/core-theming';
-
-import { Database } from './Database';
-
-const styles = css`
-    SubmittingForm {
-      composes: theme-background-surface theme-text-on-surface from global;
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
-
-interface Props {
-  databases: AdminConnectionSearchInfo[];
-  hosts: string;
-  disabled?: boolean;
-  className?: string;
-  onSelect: (database: AdminConnectionSearchInfo) => void;
-  onChange: (hosts: string) => void;
-  onSearch?: () => Promise<void>;
-}
-
-export const DatabaseList = observer<Props>(function DatabaseList({
-  databases, hosts, disabled, className, onSelect, onChange, onSearch,
-}) {
-  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
-  const translate = useTranslate();
-  const [isSearched, setIsSearched] = useState(false);
-
-  const searchHandler = useCallback(() => {
-    if (onSearch) {
-      onSearch().then(() => {
-        setIsSearched(true);
-      });
-    }
-  }, [onSearch]);
-
-  const placeholderMessage = isSearched ? 'connections_not_found' : 'connections_administration_search_database_tip';
-
-  return styled(useStyles(styles))(
-    <SubmittingForm ref={focusedRef} className={className} onSubmit={onSearch}>
-      <ItemListSearch value={hosts} placeholder={translate('connections_administration_search_database_tip')} disabled={disabled} onChange={onChange} onSearch={searchHandler} />
-      <ItemList>
-        {databases.map(database => (
-          <Database key={database.host + database.port} database={database} onSelect={onSelect} />
-        ))}
-      </ItemList>
-      {!databases.length && <TextPlaceholder>{translate(placeholderMessage)}</TextPlaceholder>}
-    </SubmittingForm>
-  );
-});
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/SearchDatabase.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/SearchDatabase.tsx
deleted file mode 100644
index f0ddab4d99..0000000000
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Search/SearchDatabase.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2022 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 { useMapResource } from '@cloudbeaver/core-blocks';
-import { useService } from '@cloudbeaver/core-di';
-import { ProjectsResource, PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
-import { CachedMapAllKey, type AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
-
-import { CustomConnection } from '../Manual/CustomConnection';
-import { ConnectionSearchService } from './ConnectionSearchService';
-import { DatabaseList } from './DatabaseList';
-
-export const SearchDatabase: React.FC = observer(function SearchDatabase() {
-  const connectionSearchService = useService(ConnectionSearchService);
-  useMapResource(CustomConnection, ProjectsResource, CachedMapAllKey);
-
-  function select(database: AdminConnectionSearchInfo) {
-    connectionSearchService.select(PROJECT_GLOBAL_ID, database);
-  }
-
-  return (
-    <DatabaseList
-      databases={connectionSearchService.databases}
-      hosts={connectionSearchService.hosts}
-      disabled={connectionSearchService.disabled}
-      onSelect={select}
-      onChange={connectionSearchService.change}
-      onSearch={connectionSearchService.search}
-    />
-  );
-});
diff --git a/webapp/packages/plugin-connections-administration/src/index.ts b/webapp/packages/plugin-connections-administration/src/index.ts
index 46a8d31ba9..515700d344 100644
--- a/webapp/packages/plugin-connections-administration/src/index.ts
+++ b/webapp/packages/plugin-connections-administration/src/index.ts
@@ -1,7 +1,6 @@
 import { connectionPlugin } from './manifest';
 export * from './Administration/Connections/ConnectionsAdministration';
 export * from './Administration/Connections/CreateConnection/Manual/ConnectionManualService';
-export * from './Administration/Connections/CreateConnection/Search/ConnectionSearchService';
 export * from './Administration/Connections/ConnectionsAdministrationNavService';
 export * from './Administration/Connections/ConnectionsAdministrationService';
 export * from './Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap';
diff --git a/webapp/packages/plugin-connections-administration/src/manifest.ts b/webapp/packages/plugin-connections-administration/src/manifest.ts
index 371d7be6f4..4cc5d755de 100644
--- a/webapp/packages/plugin-connections-administration/src/manifest.ts
+++ b/webapp/packages/plugin-connections-administration/src/manifest.ts
@@ -12,7 +12,6 @@ import { ConnectionsAdministrationNavService } from './Administration/Connection
 import { ConnectionsAdministrationService } from './Administration/Connections/ConnectionsAdministrationService';
 import { CreateConnectionBaseBootstrap } from './Administration/Connections/CreateConnection/CreateConnectionBaseBootstrap';
 import { ConnectionManualService } from './Administration/Connections/CreateConnection/Manual/ConnectionManualService';
-import { ConnectionSearchService } from './Administration/Connections/CreateConnection/Search/ConnectionSearchService';
 import { CreateConnectionService } from './Administration/Connections/CreateConnectionService';
 import { ConnectionAccessTabService } from './ConnectionForm/ConnectionAccess/ConnectionAccessTabService';
 import { LocaleService } from './LocaleService';
@@ -28,7 +27,6 @@ export const connectionPlugin: PluginManifest = {
     ConnectionsAdministrationNavService,
     CreateConnectionService,
     ConnectionManualService,
-    ConnectionSearchService,
     CreateConnectionBaseBootstrap,
     ConnectionAccessTabService,
   ],

From 6cf3c3d02b92e1885955d0824e3ece45ac5f18b0 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Fri, 9 Sep 2022 10:07:46 +0300
Subject: [PATCH 35/37] CB-2477 feat(plugin-connection-search): Fix code review

---
 .../src/Search/ConnectionSearchService.ts            | 12 ++++++++++--
 .../src/Search/SearchDatabase.tsx                    |  3 +--
 .../src/SearchConnectionPluginBootstrap.ts           |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
index 39e6283040..d16c9575cc 100644
--- a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -13,6 +13,7 @@ import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter, IExecutorHandler } from '@cloudbeaver/core-executor';
+import { ProjectsService, PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
 import { ConnectionFormService, ConnectionFormState, IConnectionFormState } from '@cloudbeaver/plugin-connections';
@@ -36,6 +37,7 @@ export class ConnectionSearchService {
     private readonly connectionFormService: ConnectionFormService,
     private readonly optionsPanelService: OptionsPanelService,
     private readonly commonDialogService: CommonDialogService,
+    private readonly projectsService: ProjectsService,
   ) {
     this.optionsPanelService.closeTask.addHandler(this.closeHandler);
 
@@ -56,6 +58,11 @@ export class ConnectionSearchService {
     this.optionsPanelService.open(formGetter);
   }
 
+  close(): void {
+    this.hosts = 'localhost';
+    this.databases = [];
+  }
+
   async load(): Promise<void> {
     if (this.databases.length === 0) {
       await this.search();
@@ -92,6 +99,7 @@ export class ConnectionSearchService {
     }
 
     this.clearFormState();
+    this.close();
   };
 
   private async showUnsavedChangesDialog(): Promise<boolean> {
@@ -137,7 +145,7 @@ export class ConnectionSearchService {
     this.clearFormState();
   }
 
-  select(projectId: string, database: AdminConnectionSearchInfo): void {
+  select(database: AdminConnectionSearchInfo): void {
     if (!this.formState) {
       this.formState = new ConnectionFormState(
         this.connectionFormService,
@@ -150,7 +158,7 @@ export class ConnectionSearchService {
         'create',
         'public'
       )
-      .setConfig(projectId, {
+      .setConfig(this.projectsService.activeProject?.id ?? PROJECT_GLOBAL_ID, {
         ...this.connectionInfoResource.getEmptyConfig(),
         driverId: database.defaultDriver,
         host: database.host,
diff --git a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
index 4f5d0717a1..4e75cd7a3e 100644
--- a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
@@ -9,7 +9,6 @@
 import { observer } from 'mobx-react-lite';
 
 import { useService } from '@cloudbeaver/core-di';
-import {  PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 import { ConnectionForm } from '@cloudbeaver/plugin-connections';
 
@@ -20,7 +19,7 @@ export const SearchDatabase: React.FC = observer(function SearchDatabase() {
   const connectionSearchService = useService(ConnectionSearchService);
 
   function select(database: AdminConnectionSearchInfo) {
-    connectionSearchService.select(PROJECT_GLOBAL_ID, database);
+    connectionSearchService.select(database);
   }
 
   if (connectionSearchService.formState) {
diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
index 9b2cd2452c..2eb1023f7e 100644
--- a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -36,8 +36,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
       order: 3,
       title: 'connections_connection_create_search_database',
       isHidden: () => (
-        !this.serverConfigResource.data?.supportsCustomConnections
-        || !this.projectsService.activeProject?.canCreateConnections
+        !this.projectsService.activeProject?.canCreateConnections
         || !this.permissionsService.has(EAdminPermission.admin)
       ),
       onClick: () => {

From edc012b7333c67c5c326d56ea2b7dfecff544331 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Fri, 9 Sep 2022 17:44:54 +0300
Subject: [PATCH 36/37] CB-2503 build: keep class and function names

---
 webapp/packages/core-cli/configs/webpack.product.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp/packages/core-cli/configs/webpack.product.config.js b/webapp/packages/core-cli/configs/webpack.product.config.js
index 2908e0e90b..0d3e4a7b01 100644
--- a/webapp/packages/core-cli/configs/webpack.product.config.js
+++ b/webapp/packages/core-cli/configs/webpack.product.config.js
@@ -74,6 +74,10 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
 
     minimizer: [new TerserPlugin({
       extractComments: /Copyright \(C\)/i,
+      terserOptions: {
+        keep_classnames: true,
+        keep_fnames: true,
+      },
     })],
   },
   plugins: [

From 2d36f809910691e2693d9827c480a3fe22d866d6 Mon Sep 17 00:00:00 2001
From: Konstantin Vasilev <konstantin.vasiliev@dbeaver.com>
Date: Mon, 12 Sep 2022 10:15:49 +0300
Subject: [PATCH 37/37] CB-1551 fix(CB-1551): Fix upload SSH key button

---
 .../packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index a8da3efbb5..8b5547bb9e 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -202,7 +202,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
                     onChange={handleKeyUpload}
                   >
                     <Button
-                      type="button"
+                      tag="div"
                       disabled={disabled || readonly || !enabled}
                       mod={['outlined']}
                     >