diff --git a/webapp/.eslintrc.cjs b/webapp/.eslintrc.cjs
index e328085e23..c22fd15204 100644
--- a/webapp/.eslintrc.cjs
+++ b/webapp/.eslintrc.cjs
@@ -12,8 +12,6 @@ module.exports = {
   parserOptions: {
     ecmaVersion: 2019,
     sourceType: 'module',
-    tsconfigRootDir: __dirname,
-    project: './tsconfig.eslint.json',
     ecmaFeatures: {
       jsx: true,
     },
diff --git a/webapp/package.json b/webapp/package.json
index f71e3d6701..82c341a523 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -27,13 +27,15 @@
     "mobx-react-lite": "~3.4.2",
     "msw": "^1.1.0",
     "path-browserify": "~1.0.1",
+    "prettier": "^2.8.8",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "reakit": "~1.3.11",
     "reflect-metadata": "~0.1.13",
-    "reshadow": "~0.0.1",
+    "reshadow": "^0.0.1",
     "rimraf": "~4.3.1",
     "typescript": "4.9.5"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "prettier": "@cloudbeaver/prettier-config"
 }
diff --git a/webapp/packages/core-administration/src/AdministrationItem/AdministrationItemService.ts b/webapp/packages/core-administration/src/AdministrationItem/AdministrationItemService.ts
index 72d7c39d6b..2ceedb9aa3 100644
--- a/webapp/packages/core-administration/src/AdministrationItem/AdministrationItemService.ts
+++ b/webapp/packages/core-administration/src/AdministrationItem/AdministrationItemService.ts
@@ -5,17 +5,14 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor, IExecutorHandler } from '@cloudbeaver/core-executor';
 import type { RouterState } from '@cloudbeaver/core-routing';
 
 import { filterConfigurationWizard } from './filterConfigurationWizard';
-import {
-  IAdministrationItem, IAdministrationItemOptions, IAdministrationItemSubItem, AdministrationItemType
-} from './IAdministrationItem';
+import { AdministrationItemType, IAdministrationItem, IAdministrationItemOptions, IAdministrationItemSubItem } from './IAdministrationItem';
 import type { IAdministrationItemRoute } from './IAdministrationItemRoute';
 import { orderAdministrationItems } from './orderAdministrationItems';
 
@@ -49,20 +46,29 @@ export class AdministrationItemService {
     this.deActivationTask = new Executor();
 
     this.activationTask
-      .addHandler(() => { this.itemActivating = true; })
+      .addHandler(() => {
+        this.itemActivating = true;
+      })
       .addHandler(this.activateHandler)
-      .addPostHandler(() => { this.itemActivating = false; });
+      .addPostHandler(() => {
+        this.itemActivating = false;
+      });
 
     this.deActivationTask
-      .addHandler(() => { this.itemDeactivating = true; })
+      .addHandler(() => {
+        this.itemDeactivating = true;
+      })
       .addHandler(this.deActivateHandler)
-      .addPostHandler(() => { this.itemDeactivating = false; });
+      .addPostHandler(() => {
+        this.itemDeactivating = false;
+      });
   }
 
   getUniqueItems(configurationWizard: boolean): IAdministrationItem[] {
     const items: IAdministrationItem[] = [];
 
-    const orderedByPriority = this.items.slice()
+    const orderedByPriority = this.items
+      .slice()
       .sort((a, b) => {
         if (a.name !== b.name) {
           return a.name.localeCompare(b.name);
@@ -88,10 +94,9 @@ export class AdministrationItemService {
   }
 
   getActiveItems(configurationWizard: boolean): IAdministrationItem[] {
-    return this.getUniqueItems(configurationWizard).filter(item =>
-      filterHiddenAdministrationItem(configurationWizard)(item)
-      && filterConfigurationWizard(configurationWizard)(item)
-    ).sort(orderAdministrationItems(configurationWizard));
+    return this.getUniqueItems(configurationWizard)
+      .filter(item => filterHiddenAdministrationItem(configurationWizard)(item) && filterConfigurationWizard(configurationWizard)(item))
+      .sort(orderAdministrationItems(configurationWizard));
   }
 
   getDefaultItem(configurationWizard: boolean): string | null {
@@ -140,11 +145,10 @@ export class AdministrationItemService {
   create(options: IAdministrationItemOptions): void {
     const type = options.type ?? AdministrationItemType.Administration;
 
-    const existedIndex = this.items.findIndex(item => item.name === options.name && (
-      item.type === type
-      || item.type === AdministrationItemType.Default
-      || type === AdministrationItemType.Default
-    ));
+    const existedIndex = this.items.findIndex(
+      item =>
+        item.name === options.name && (item.type === type || item.type === AdministrationItemType.Default || type === AdministrationItemType.Default),
+    );
 
     if (!options.replace && existedIndex !== -1) {
       throw new Error(`Administration item "${options.name}" already exists in the same visibility scope`);
@@ -159,21 +163,11 @@ export class AdministrationItemService {
     this.items.push(item);
   }
 
-  async activate(
-    screen: IAdministrationItemRoute,
-    configurationWizard: boolean,
-    outside: boolean,
-    outsideAdminPage: boolean
-  ): Promise<void> {
+  async activate(screen: IAdministrationItemRoute, configurationWizard: boolean, outside: boolean, outsideAdminPage: boolean): Promise<void> {
     await this.activationTask.execute({ screen, configurationWizard, outside, outsideAdminPage });
   }
 
-  async deActivate(
-    screen: IAdministrationItemRoute,
-    configurationWizard: boolean,
-    outside: boolean,
-    outsideAdminPage: boolean
-  ): Promise<void> {
+  async deActivate(screen: IAdministrationItemRoute, configurationWizard: boolean, outside: boolean, outsideAdminPage: boolean): Promise<void> {
     await this.deActivationTask.execute({ screen, configurationWizard, outside, outsideAdminPage });
   }
 
@@ -181,7 +175,7 @@ export class AdministrationItemService {
     screen: IAdministrationItemRoute,
     toScreen: IAdministrationItemRoute | null,
     configurationWizard: boolean,
-    outside: boolean
+    outside: boolean,
   ): Promise<boolean> {
     const item = this.getItem(screen.item, configurationWizard);
     let nextItem = null;
@@ -207,11 +201,7 @@ export class AdministrationItemService {
     return true;
   }
 
-  async canActivate(
-    screen: IAdministrationItemRoute,
-    configurationWizard: boolean,
-    outside: boolean
-  ): Promise<boolean> {
+  async canActivate(screen: IAdministrationItemRoute, configurationWizard: boolean, outside: boolean): Promise<boolean> {
     const item = this.getItem(screen.item, configurationWizard);
     if (!item) {
       return false;
@@ -231,12 +221,7 @@ export class AdministrationItemService {
     return true;
   }
 
-  private activateHandler: IExecutorHandler<IActivationData> = async ({
-    screen,
-    configurationWizard,
-    outside,
-    outsideAdminPage,
-  }) => {
+  private activateHandler: IExecutorHandler<IActivationData> = async ({ screen, configurationWizard, outside, outsideAdminPage }) => {
     let lastItem = 0;
     while (true) {
       const items = this.getActiveItems(configurationWizard);
@@ -271,12 +256,7 @@ export class AdministrationItemService {
     }
   };
 
-  private deActivateHandler: IExecutorHandler<IActivationData> = async ({
-    screen,
-    configurationWizard,
-    outside,
-    outsideAdminPage,
-  }) => {
+  private deActivateHandler: IExecutorHandler<IActivationData> = async ({ screen, configurationWizard, outside, outsideAdminPage }) => {
     const item = this.getItem(screen.item, configurationWizard);
     if (!item) {
       return;
diff --git a/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts b/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts
index 55a1365e7d..e8a761efc1 100644
--- a/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts
+++ b/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts
@@ -5,7 +5,6 @@
  * 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 { IRouteParams } from './IRouteParams';
@@ -13,7 +12,7 @@ import type { IRouteParams } from './IRouteParams';
 export enum AdministrationItemType {
   Default,
   Administration,
-  ConfigurationWizard
+  ConfigurationWizard,
 }
 
 export interface IAdministrationItemReplaceOptions {
@@ -44,29 +43,15 @@ export type AdministrationItemSubContentProps = AdministrationItemContentProps &
 };
 export type AdministrationItemSubContentComponent = React.FunctionComponent<AdministrationItemSubContentProps>;
 
-export type AdministrationItemEvent = (
-  configurationWizard: boolean,
-  outside: boolean,
-  outsideAdminPage: boolean
-) => Promise<void> | void;
-export type AdministrationItemCanActivateEvent = (
-  configurationWizard: boolean,
-  administration: boolean,
-) => Promise<boolean> | boolean;
+export type AdministrationItemEvent = (configurationWizard: boolean, outside: boolean, outsideAdminPage: boolean) => Promise<void> | void;
+export type AdministrationItemCanActivateEvent = (configurationWizard: boolean, administration: boolean) => Promise<boolean> | boolean;
 export type AdministrationItemCanDeActivateEvent = (
   configurationWizard: boolean,
   administration: boolean,
   nextAdministrationItem: IAdministrationItem | null,
 ) => Promise<boolean> | boolean;
-export type AdministrationItemSubEvent = (
-  param: string | null,
-  configurationWizard: boolean,
-  outside: boolean
-) => Promise<void> | void;
-export type AdministrationItemSubCanActivateEvent = (
-  param: string | null,
-  configurationWizard: boolean
-) => Promise<boolean> | boolean;
+export type AdministrationItemSubEvent = (param: string | null, configurationWizard: boolean, outside: boolean) => Promise<void> | void;
+export type AdministrationItemSubCanActivateEvent = (param: string | null, configurationWizard: boolean) => Promise<boolean> | boolean;
 
 export interface IAdministrationItemSubItem {
   name: string;
diff --git a/webapp/packages/core-administration/src/AdministrationItem/filterConfigurationWizard.ts b/webapp/packages/core-administration/src/AdministrationItem/filterConfigurationWizard.ts
index 4ea439b06d..13d5d9de3d 100644
--- a/webapp/packages/core-administration/src/AdministrationItem/filterConfigurationWizard.ts
+++ b/webapp/packages/core-administration/src/AdministrationItem/filterConfigurationWizard.ts
@@ -5,11 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationItemType, IAdministrationItem } from './IAdministrationItem';
 
 export function filterConfigurationWizard(configurationWizard: boolean) {
-  return (item: IAdministrationItem) => (configurationWizard
-    ? item.type !== AdministrationItemType.Administration
-    : item.type !== AdministrationItemType.ConfigurationWizard);
+  return (item: IAdministrationItem) =>
+    configurationWizard ? item.type !== AdministrationItemType.Administration : item.type !== AdministrationItemType.ConfigurationWizard;
 }
diff --git a/webapp/packages/core-administration/src/AdministrationItem/orderAdministrationItems.ts b/webapp/packages/core-administration/src/AdministrationItem/orderAdministrationItems.ts
index bd333a13bb..30f1395fc2 100644
--- a/webapp/packages/core-administration/src/AdministrationItem/orderAdministrationItems.ts
+++ b/webapp/packages/core-administration/src/AdministrationItem/orderAdministrationItems.ts
@@ -5,17 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAdministrationItem } from './IAdministrationItem';
 
 export function orderAdministrationItems(configuration: boolean) {
   return (itemA: IAdministrationItem, itemB: IAdministrationItem): number => {
     if (configuration) {
-      return (
-        itemA.configurationWizardOptions?.order ?? itemA.order
-      ) - (
-        itemB.configurationWizardOptions?.order ?? itemB.order
-      );
+      return (itemA.configurationWizardOptions?.order ?? itemA.order) - (itemB.configurationWizardOptions?.order ?? itemB.order);
     }
     return itemA.order - itemB.order;
   };
diff --git a/webapp/packages/core-administration/src/AdministrationLocaleService.ts b/webapp/packages/core-administration/src/AdministrationLocaleService.ts
index d59fd0e120..eee014dcfb 100644
--- a/webapp/packages/core-administration/src/AdministrationLocaleService.ts
+++ b/webapp/packages/core-administration/src/AdministrationLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class AdministrationLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
index abb4eb2bfe..ad505c52c6 100644
--- a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
+++ b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
@@ -5,15 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { computed, observable, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { EAdminPermission } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { IExecutor, Executor } from '@cloudbeaver/core-executor';
-import { SessionPermissionsResource, PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
-import { ScreenService, RouterState } from '@cloudbeaver/core-routing';
+import { Executor, IExecutor } from '@cloudbeaver/core-executor';
+import { PermissionsService, ServerConfigResource, SessionPermissionsResource } from '@cloudbeaver/core-root';
+import { RouterState, ScreenService } from '@cloudbeaver/core-routing';
 import { LocalStorageSaveService } from '@cloudbeaver/core-settings';
 import { GlobalConstants } from '@cloudbeaver/core-utils';
 
@@ -73,7 +72,7 @@ export class AdministrationScreenService {
     private readonly administrationItemService: AdministrationItemService,
     private readonly autoSaveService: LocalStorageSaveService,
     private readonly serverConfigResource: ServerConfigResource,
-    private readonly notificationService: NotificationService
+    private readonly notificationService: NotificationService,
   ) {
     this.info = getDefaultAdministrationScreenInfo();
     this.itemState = new Map();
@@ -146,27 +145,17 @@ export class AdministrationScreenService {
       this.getRouteName(itemName, item?.defaultSub, item?.defaultParam),
       itemName,
       item?.defaultSub,
-      item?.defaultParam
+      item?.defaultParam,
     );
   }
 
   navigateToItemSub(item: string, sub: string, param?: string): void {
-    this.screenService.navigateToScreen(
-      this.getRouteName(item, sub, param),
-      item,
-      sub,
-      param
-    );
+    this.screenService.navigateToScreen(this.getRouteName(item, sub, param), item, sub, param);
   }
 
   getItemState<T>(name: string): T | undefined;
   getItemState<T>(name: string, defaultState: () => T, update?: boolean, validate?: (state: T) => boolean): T;
-  getItemState<T>(
-    name: string,
-    defaultState?: () => T,
-    update?: boolean,
-    validate?: (state: T) => boolean
-  ): T | undefined {
+  getItemState<T>(name: string, defaultState?: () => T, update?: boolean, validate?: (state: T) => boolean): T | undefined {
     if (!this.serverConfigResource.isLoaded()) {
       throw new Error('Administration screen getItemState can be used only after server configuration loaded');
     }
@@ -193,8 +182,8 @@ export class AdministrationScreenService {
 
   isAdministrationRouteActive(routeName: string): boolean {
     return (
-      this.screenService.isActive(routeName, AdministrationScreenService.screenName)
-      || this.screenService.isActive(routeName, AdministrationScreenService.setupName)
+      this.screenService.isActive(routeName, AdministrationScreenService.screenName) ||
+      this.screenService.isActive(routeName, AdministrationScreenService.setupName)
     );
   }
 
@@ -207,16 +196,10 @@ export class AdministrationScreenService {
     const screen = this.getScreen(state);
 
     if (screen) {
-      await this.administrationItemService.deActivate(
-        screen,
-        this.isConfigurationMode,
-        screen.item !== toScreen?.item,
-        toScreen === null
-      );
+      await this.administrationItemService.deActivate(screen, this.isConfigurationMode, screen.item !== toScreen?.item, toScreen === null);
     }
 
-    if (this.isConfigurationMode
-      && !this.screenService.isActive(nextState.name, AdministrationScreenService.setupName)) {
+    if (this.isConfigurationMode && !this.screenService.isActive(nextState.name, AdministrationScreenService.setupName)) {
       this.navigateToRoot();
     }
   }
@@ -233,12 +216,7 @@ export class AdministrationScreenService {
       return true;
     }
 
-    return this.administrationItemService.canDeActivate(
-      screen,
-      toScreen,
-      this.isConfigurationMode,
-      screen.item !== toScreen?.item
-    );
+    return this.administrationItemService.canDeActivate(screen, toScreen, this.isConfigurationMode, screen.item !== toScreen?.item);
   }
 
   async handleCanActivate(toState: RouterState, fromState: RouterState): Promise<boolean> {
@@ -252,11 +230,7 @@ export class AdministrationScreenService {
       return false;
     }
 
-    return this.administrationItemService.canActivate(
-      screen,
-      this.isConfigurationMode,
-      screen.item !== fromScreen?.item
-    );
+    return this.administrationItemService.canActivate(screen, this.isConfigurationMode, screen.item !== fromScreen?.item);
   }
 
   async handleActivate(state: RouterState, prevState?: RouterState): Promise<void> {
@@ -269,21 +243,16 @@ export class AdministrationScreenService {
     const screen = this.getScreen(state);
     const fromScreen = this.getScreen(prevState);
     if (screen) {
-      await this.administrationItemService.activate(
-        screen,
-        this.isConfigurationMode,
-        screen.item !== fromScreen?.item,
-        fromScreen === null
-      );
+      await this.administrationItemService.activate(screen, this.isConfigurationMode, screen.item !== fromScreen?.item, fromScreen === null);
     }
   }
 
   private validateState() {
     if (
-      this.info.workspaceId !== this.serverConfigResource.workspaceId
-      || this.info.configurationMode !== this.isConfigurationMode
-      || this.info.serverVersion !== this.serverConfigResource.serverVersion
-      || this.info.version !== GlobalConstants.version
+      this.info.workspaceId !== this.serverConfigResource.workspaceId ||
+      this.info.configurationMode !== this.isConfigurationMode ||
+      this.info.serverVersion !== this.serverConfigResource.serverVersion ||
+      this.info.version !== GlobalConstants.version
     ) {
       this.clearItemsState();
       this.info.workspaceId = this.serverConfigResource.workspaceId;
diff --git a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
index 35e915f822..a5925c0eb0 100644
--- a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
+++ b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -20,11 +19,9 @@ import { AdministrationScreenService } from '../AdministrationScreenService';
 @injectable()
 export class ConfigurationWizardService {
   get steps(): IAdministrationItem[] {
-    return this.administrationItemService.getUniqueItems(true)
-      .filter(item =>
-        filterConfigurationWizard(true)(item)
-        && filterHiddenAdministrationItem(true)(item)
-      )
+    return this.administrationItemService
+      .getUniqueItems(true)
+      .filter(item => filterConfigurationWizard(true)(item) && filterHiddenAdministrationItem(true)(item))
       .sort(orderAdministrationItems(true));
   }
 
@@ -33,9 +30,7 @@ export class ConfigurationWizardService {
   }
 
   get finishedSteps(): IAdministrationItem[] {
-    return this.steps.filter(step => (
-      step.configurationWizardOptions?.isDone && step.configurationWizardOptions.isDone()
-    ));
+    return this.steps.filter(step => step.configurationWizardOptions?.isDone && step.configurationWizardOptions.isDone());
   }
 
   get currentStepIndex(): number {
@@ -48,8 +43,7 @@ export class ConfigurationWizardService {
 
   get canFinish(): boolean {
     return this.steps.every(step => {
-      if (step.configurationWizardOptions?.isDone
-          && !step.configurationWizardOptions?.isDone()) {
+      if (step.configurationWizardOptions?.isDone && !step.configurationWizardOptions?.isDone()) {
         return false;
       }
 
@@ -78,7 +72,7 @@ export class ConfigurationWizardService {
   constructor(
     private administrationItemService: AdministrationItemService,
     private administrationScreenService: AdministrationScreenService,
-    private notificationService: NotificationService
+    private notificationService: NotificationService,
   ) {
     makeObservable(this, {
       steps: computed,
@@ -144,10 +138,7 @@ export class ConfigurationWizardService {
 
     if (this.currentStepIndex + 1 < this.steps.length) {
       if (this.nextStep) {
-        this.administrationScreenService.navigateTo(
-          this.nextStep.name,
-          this.nextStep.configurationWizardOptions?.defaultRoute
-        );
+        this.administrationScreenService.navigateTo(this.nextStep.name, this.nextStep.configurationWizardOptions?.defaultRoute);
       }
     } else {
       await this.finish();
@@ -166,8 +157,7 @@ export class ConfigurationWizardService {
   }
 
   private getStep(name: string) {
-    return this.administrationItemService.getUniqueItems(true)
-      .find(step => filterConfigurationWizard(true)(step) && step.name === name);
+    return this.administrationItemService.getUniqueItems(true).find(step => filterConfigurationWizard(true)(step) && step.name === name);
   }
 
   private async finish() {
diff --git a/webapp/packages/core-administration/src/AdministrationSettingsService.test.ts b/webapp/packages/core-administration/src/AdministrationSettingsService.test.ts
index 2bd36d74d7..1aab7c0b30 100644
--- a/webapp/packages/core-administration/src/AdministrationSettingsService.test.ts
+++ b/webapp/packages/core-administration/src/AdministrationSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -21,10 +20,7 @@ import { AdministrationSettings, AdministrationSettingsService } from './Adminis
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -42,11 +38,9 @@ test('Read settings', async () => {
   const settings = app.injector.getServiceByClass(AdministrationSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('baseFeatures')).toEqual(testValue);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-administration/src/AdministrationSettingsService.ts b/webapp/packages/core-administration/src/AdministrationSettingsService.ts
index c1e716dc43..bca4d49c3e 100644
--- a/webapp/packages/core-administration/src/AdministrationSettingsService.ts
+++ b/webapp/packages/core-administration/src/AdministrationSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-administration/src/AdministrationToolsPanelStyles.ts b/webapp/packages/core-administration/src/AdministrationToolsPanelStyles.ts
index c2e29e4c1b..c5273d2049 100644
--- a/webapp/packages/core-administration/src/AdministrationToolsPanelStyles.ts
+++ b/webapp/packages/core-administration/src/AdministrationToolsPanelStyles.ts
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2022 DBeaver Corp and others
@@ -6,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const ADMINISTRATION_TOOLS_PANEL_STYLES = css`
-    ToolsPanel {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-      border-bottom: solid 1px;
-      flex: 0 0 auto;
-    }
-  `;
+  ToolsPanel {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
+    border-bottom: solid 1px;
+    flex: 0 0 auto;
+  }
+`;
diff --git a/webapp/packages/core-administration/src/PermissionsResource.ts b/webapp/packages/core-administration/src/PermissionsResource.ts
index 97b9e70e7e..65aff275cc 100644
--- a/webapp/packages/core-administration/src/PermissionsResource.ts
+++ b/webapp/packages/core-administration/src/PermissionsResource.ts
@@ -5,23 +5,31 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SessionDataResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, CachedMapAllKey, AdminPermissionInfoFragment, AdminObjectGrantInfoFragment, ResourceKey, resourceKeyList } from '@cloudbeaver/core-sdk';
+import {
+  AdminObjectGrantInfoFragment,
+  AdminPermissionInfoFragment,
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  ResourceKey,
+  resourceKeyList,
+} from '@cloudbeaver/core-sdk';
 
 export type PermissionInfo = AdminPermissionInfoFragment;
 export type AdminObjectGrantInfo = AdminObjectGrantInfoFragment;
 
 @injectable()
 export class PermissionsResource extends CachedMapResource<string, PermissionInfo> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionDataResource: SessionDataResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionDataResource: SessionDataResource) {
     super();
 
-    this.sync(sessionDataResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      sessionDataResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
   }
 
   protected async loader(): Promise<Map<string, PermissionInfo>> {
diff --git a/webapp/packages/core-administration/src/manifest.ts b/webapp/packages/core-administration/src/manifest.ts
index 2a0398ac81..1e1bd39108 100644
--- a/webapp/packages/core-administration/src/manifest.ts
+++ b/webapp/packages/core-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AdministrationItemService } from './AdministrationItem/AdministrationItemService';
@@ -15,7 +14,6 @@ import { ConfigurationWizardService } from './AdministrationScreen/Configuration
 import { AdministrationSettingsService } from './AdministrationSettingsService';
 import { PermissionsResource } from './PermissionsResource';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Administration',
diff --git a/webapp/packages/core-app/src/AppLocaleService.ts b/webapp/packages/core-app/src/AppLocaleService.ts
index 3a9628a255..068bf68478 100644
--- a/webapp/packages/core-app/src/AppLocaleService.ts
+++ b/webapp/packages/core-app/src/AppLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class AppLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-app/src/AppScreen/AppScreen.tsx b/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
index 5f7dff7430..46e6f0713a 100644
--- a/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
+++ b/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { memo } from 'react';
 
 import { Loader, Placeholder } from '@cloudbeaver/core-blocks';
diff --git a/webapp/packages/core-app/src/AppScreen/AppScreenBootstrap.ts b/webapp/packages/core-app/src/AppScreen/AppScreenBootstrap.ts
index 31cbc8749d..7bf4123558 100644
--- a/webapp/packages/core-app/src/AppScreen/AppScreenBootstrap.ts
+++ b/webapp/packages/core-app/src/AppScreen/AppScreenBootstrap.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { ScreenService } from '@cloudbeaver/core-routing';
 
@@ -17,9 +16,7 @@ import { AppScreenService } from './AppScreenService';
 export class AppScreenBootstrap extends Bootstrap {
   readonly activation: IExecutor;
 
-  constructor(
-    private readonly screenService: ScreenService
-  ) {
+  constructor(private readonly screenService: ScreenService) {
     super();
     this.activation = new Executor();
   }
@@ -30,9 +27,11 @@ export class AppScreenBootstrap extends Bootstrap {
       routes: [{ name: AppScreenService.screenName, path: '/' }],
       component: AppScreen,
       root: true,
-      onActivate: async () => { await this.activation.execute(); },
+      onActivate: async () => {
+        await this.activation.execute();
+      },
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/core-app/src/AppScreen/AppScreenService.ts b/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
index 56993eacf0..37991bc238 100644
--- a/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
+++ b/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/core-app/src/AppScreen/Main.tsx b/webapp/packages/core-app/src/AppScreen/Main.tsx
index ca42bf4043..5f7f3dff4b 100644
--- a/webapp/packages/core-app/src/AppScreen/Main.tsx
+++ b/webapp/packages/core-app/src/AppScreen/Main.tsx
@@ -5,11 +5,10 @@
  * 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 { splitStyles, Split, ResizerControls, Pane, useSplitUserState, useStyles, Loader, getComputed } from '@cloudbeaver/core-blocks';
+import { getComputed, Loader, Pane, ResizerControls, Split, splitStyles, useSplitUserState, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { LeftBarPanelService, SideBarPanel, SideBarPanelService } from '@cloudbeaver/core-ui';
 
@@ -44,30 +43,20 @@ export const Main = observer(function Main() {
   return styled(styles)(
     <Loader suspense>
       <space as="main">
-        <Split
-          {...splitMainState}
-          sticky={30}
-          mode={leftBarDisabled ? 'minimize' : splitMainState.mode}
-          disable={leftBarDisabled}
-        >
-          <Pane basis='250px' main>
+        <Split {...splitMainState} sticky={30} mode={leftBarDisabled ? 'minimize' : splitMainState.mode} disable={leftBarDisabled}>
+          <Pane basis="250px" main>
             <Loader suspense>
               <SideBarPanel container={leftBarPanelService.tabsContainer} />
             </Loader>
           </Pane>
           <ResizerControls />
           <Pane>
-            <Split
-              {...splitRightState}
-              mode={sideBarDisabled ? 'minimize' : splitRightState.mode}
-              disable={sideBarDisabled}
-              sticky={30}
-            >
+            <Split {...splitRightState} mode={sideBarDisabled ? 'minimize' : splitRightState.mode} disable={sideBarDisabled} sticky={30}>
               <Pane>
                 <RightArea />
               </Pane>
               <ResizerControls />
-              <Pane basis='250px' main>
+              <Pane basis="250px" main>
                 <Loader suspense>
                   <SideBarPanel container={sideBarPanelService.tabsContainer} />
                 </Loader>
@@ -76,6 +65,6 @@ export const Main = observer(function Main() {
           </Pane>
         </Split>
       </space>
-    </Loader>
+    </Loader>,
   );
 });
diff --git a/webapp/packages/core-app/src/AppScreen/RightArea.tsx b/webapp/packages/core-app/src/AppScreen/RightArea.tsx
index 36e39b1587..6937e68bc6 100644
--- a/webapp/packages/core-app/src/AppScreen/RightArea.tsx
+++ b/webapp/packages/core-app/src/AppScreen/RightArea.tsx
@@ -5,42 +5,41 @@
  * 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 {
+  Loader,
   Pane,
   ResizerControls,
   SlideBox,
-  SlideElement,
   slideBoxStyles,
+  SlideElement,
+  SlideOverlay,
   Split,
   splitHorizontalStyles,
   splitStyles,
-  SlideOverlay,
-  useStyles,
   useSplitUserState,
-  Loader
+  useStyles,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
 import { NavigationTabsBar } from '@cloudbeaver/plugin-navigation-tabs';
-import { ToolsPanelService, ToolsPanel } from '@cloudbeaver/plugin-tools-panel';
+import { ToolsPanel, ToolsPanelService } from '@cloudbeaver/plugin-tools-panel';
 
 const styles = css`
-    Pane {
-      composes: theme-background-surface theme-text-on-surface from global;
-      display: flex;
-      overflow: auto;
-    }
-    Loader {
-      height: 100%;
-    }
-    SlideBox {
-      flex: 1;
-    }
-  `;
+  Pane {
+    composes: theme-background-surface theme-text-on-surface from global;
+    display: flex;
+    overflow: auto;
+  }
+  Loader {
+    height: 100%;
+  }
+  SlideBox {
+    flex: 1;
+  }
+`;
 
 interface Props {
   className?: string;
@@ -64,21 +63,14 @@ export const RightArea = observer<Props>(function RightArea({ className }) {
         </Loader>
       </SlideElement>
       <SlideElement>
-        <Split
-          {...splitState}
-          sticky={30}
-          split="horizontal"
-          mode={toolsDisabled ? 'minimize' : splitState.mode}
-          disable={toolsDisabled}
-          keepRatio
-        >
+        <Split {...splitState} sticky={30} split="horizontal" mode={toolsDisabled ? 'minimize' : splitState.mode} disable={toolsDisabled} keepRatio>
           <Pane>
             <Loader suspense>
               <NavigationTabsBar />
             </Loader>
           </Pane>
           <ResizerControls />
-          <Pane basis='30%' main>
+          <Pane basis="30%" main>
             <Loader suspense>
               <ToolsPanel container={toolsPanelService.tabsContainer} />
             </Loader>
@@ -86,6 +78,6 @@ export const RightArea = observer<Props>(function RightArea({ className }) {
         </Split>
         <SlideOverlay onClick={() => optionsPanelService.close()} />
       </SlideElement>
-    </SlideBox>
+    </SlideBox>,
   );
 });
diff --git a/webapp/packages/core-app/src/Body.tsx b/webapp/packages/core-app/src/Body.tsx
index 19d4c317b4..a4b52dde4d 100644
--- a/webapp/packages/core-app/src/Body.tsx
+++ b/webapp/packages/core-app/src/Body.tsx
@@ -5,9 +5,8 @@
  * 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 { useRef, useLayoutEffect } from 'react';
+import { useLayoutEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { Loader, useResource, useStyles } from '@cloudbeaver/core-blocks';
@@ -23,18 +22,18 @@ import { DNDProvider } from '@cloudbeaver/core-ui';
 import { useAppVersion } from '@cloudbeaver/plugin-version';
 
 const bodyStyles = css`
-    theme {
-      composes: theme-background-surface theme-text-on-surface theme-typography from global;
-      height: 100vh;
-      display: flex;
-      padding: 0 !important; /* fix additional padding with modal reakit menu */
-      flex-direction: column;
-      overflow: hidden;
-    }
-    Loader {
-      height: 100vh;
-    }
-  `;
+  theme {
+    composes: theme-background-surface theme-text-on-surface theme-typography from global;
+    height: 100vh;
+    display: flex;
+    padding: 0 !important; /* fix additional padding with modal reakit menu */
+    flex-direction: column;
+    overflow: hidden;
+  }
+  Loader {
+    height: 100vh;
+  }
+`;
 
 export const Body = observer(function Body() {
   // const serverConfigLoader = useResource(Body, ServerConfigResource, undefined);
@@ -61,13 +60,11 @@ export const Body = observer(function Body() {
     <DNDProvider>
       <Loader suspense>
         <theme ref={ref} className={`theme-${themeService.currentTheme.id}`}>
-          <Loader suspense>
-            {Screen && <Screen {...screenService.routerService.params} />}
-          </Loader>
+          <Loader suspense>{Screen && <Screen {...screenService.routerService.params} />}</Loader>
           <DialogsPortal />
           <Notifications />
         </theme>
       </Loader>
-    </DNDProvider>
+    </DNDProvider>,
   );
 });
diff --git a/webapp/packages/core-app/src/CoreSettingsService.ts b/webapp/packages/core-app/src/CoreSettingsService.ts
index 53333b5db8..244591f2c5 100644
--- a/webapp/packages/core-app/src/CoreSettingsService.ts
+++ b/webapp/packages/core-app/src/CoreSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-app/src/index.ts b/webapp/packages/core-app/src/index.ts
index f27293437d..234d80e3fb 100644
--- a/webapp/packages/core-app/src/index.ts
+++ b/webapp/packages/core-app/src/index.ts
@@ -9,4 +9,4 @@ export * from './AppLocaleService';
 export * from './Body';
 
 // Interfaces
-export * from './manifest';
\ No newline at end of file
+export * from './manifest';
diff --git a/webapp/packages/core-app/src/locales/en.ts b/webapp/packages/core-app/src/locales/en.ts
index 82928d3791..fd517fa08b 100644
--- a/webapp/packages/core-app/src/locales/en.ts
+++ b/webapp/packages/core-app/src/locales/en.ts
@@ -5,10 +5,7 @@ export default [
   ['app_shared_inlineEditor_dialog_title', 'Edit mode'],
   ['app_shared_inlineEditor_dialog_apply', 'Apply'],
   ['app_shared_inlineEditor_dialog_cancel', 'Cancel'],
-  [
-    'app_shared_navigationTabsBar_placeholder',
-    'There are no objects to show. Double click on an object in the navigation tree to open it.',
-  ],
+  ['app_shared_navigationTabsBar_placeholder', 'There are no objects to show. Double click on an object in the navigation tree to open it.'],
   ['app_shared_sql_generators_panel_title', 'Generate SQL'],
   ['app_shared_sql_generators_dialog_title', 'Generated SQL'],
 ];
diff --git a/webapp/packages/core-app/src/locales/it.ts b/webapp/packages/core-app/src/locales/it.ts
index baebf7d32f..00964e5d75 100644
--- a/webapp/packages/core-app/src/locales/it.ts
+++ b/webapp/packages/core-app/src/locales/it.ts
@@ -5,8 +5,5 @@ export default [
   ['app_shared_inlineEditor_dialog_title', 'Modalità modifica'],
   ['app_shared_inlineEditor_dialog_apply', 'Applica'],
   ['app_shared_inlineEditor_dialog_cancel', 'Cancella'],
-  [
-    'app_shared_navigationTabsBar_placeholder',
-    'Non ci sono oggetti da mostrare. Fai doppio click su un oggetto per aprirlo.',
-  ],
+  ['app_shared_navigationTabsBar_placeholder', 'Non ci sono oggetti da mostrare. Fai doppio click su un oggetto per aprirlo.'],
 ];
diff --git a/webapp/packages/core-app/src/locales/zh.ts b/webapp/packages/core-app/src/locales/zh.ts
index a7e323732d..d66e8f7d82 100644
--- a/webapp/packages/core-app/src/locales/zh.ts
+++ b/webapp/packages/core-app/src/locales/zh.ts
@@ -5,10 +5,7 @@ export default [
   ['app_shared_inlineEditor_dialog_title', '编辑模式'],
   ['app_shared_inlineEditor_dialog_apply', '应用'],
   ['app_shared_inlineEditor_dialog_cancel', '取消'],
-  [
-    'app_shared_navigationTabsBar_placeholder',
-    '没有要显示的对象。双击导航树中的对象将其打开。',
-  ],
+  ['app_shared_navigationTabsBar_placeholder', '没有要显示的对象。双击导航树中的对象将其打开。'],
   ['app_shared_sql_generators_panel_title', '生成SQL'],
   ['app_shared_sql_generators_dialog_title', '生成的SQL'],
 ];
diff --git a/webapp/packages/core-app/src/manifest.ts b/webapp/packages/core-app/src/manifest.ts
index d8f154e278..5c8b4de424 100644
--- a/webapp/packages/core-app/src/manifest.ts
+++ b/webapp/packages/core-app/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AppLocaleService } from './AppLocaleService';
@@ -13,16 +12,10 @@ import { AppScreenBootstrap } from './AppScreen/AppScreenBootstrap';
 import { AppScreenService } from './AppScreen/AppScreenService';
 import { CoreSettingsService } from './CoreSettingsService';
 
-
 export const coreAppManifest: PluginManifest = {
   info: {
     name: 'Core App',
   },
 
-  providers: [
-    AppScreenService,
-    AppScreenBootstrap,
-    CoreSettingsService,
-    AppLocaleService,
-  ],
+  providers: [AppScreenService, AppScreenBootstrap, CoreSettingsService, AppLocaleService],
 };
diff --git a/webapp/packages/core-authentication/mocks/mockAuthentication.ts b/webapp/packages/core-authentication/mocks/mockAuthentication.ts
index 2d8d8dba20..0c71cdefa6 100644
--- a/webapp/packages/core-authentication/mocks/mockAuthentication.ts
+++ b/webapp/packages/core-authentication/mocks/mockAuthentication.ts
@@ -5,13 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { graphql } from 'msw';
 
 import { mockGetActiveUser } from './resolvers/mockGetActiveUser';
 
 export function mockAuthentication(endpoint: ReturnType<typeof graphql.link>) {
-  return [
-    endpoint.query('getActiveUser', mockGetActiveUser),
-  ];
-}
\ No newline at end of file
+  return [endpoint.query('getActiveUser', mockGetActiveUser)];
+}
diff --git a/webapp/packages/core-authentication/mocks/resolvers/mockGetActiveUser.ts b/webapp/packages/core-authentication/mocks/resolvers/mockGetActiveUser.ts
index ac9602848b..04b2afa69e 100644
--- a/webapp/packages/core-authentication/mocks/resolvers/mockGetActiveUser.ts
+++ b/webapp/packages/core-authentication/mocks/resolvers/mockGetActiveUser.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { GraphQLContext, GraphQLRequest, ResponseComposition } from 'msw';
 
 import type { GetActiveUserQuery, GetActiveUserQueryVariables } from '@cloudbeaver/core-sdk';
@@ -13,11 +12,11 @@ import type { GetActiveUserQuery, GetActiveUserQueryVariables } from '@cloudbeav
 export function mockGetActiveUser(
   req: GraphQLRequest<GetActiveUserQueryVariables>,
   res: ResponseComposition<GetActiveUserQuery>,
-  ctx: GraphQLContext<GetActiveUserQuery>
+  ctx: GraphQLContext<GetActiveUserQuery>,
 ) {
   return res(
     ctx.data({
-      'user': null as unknown as undefined,
+      user: null as unknown as undefined,
     }),
   );
 }
diff --git a/webapp/packages/core-authentication/src/AppAuthService.ts b/webapp/packages/core-authentication/src/AppAuthService.ts
index 8373e5b7b9..8c46114bed 100644
--- a/webapp/packages/core-authentication/src/AppAuthService.ts
+++ b/webapp/packages/core-authentication/src/AppAuthService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { Executor, ExecutorInterrupter, IExecutor } from '@cloudbeaver/core-executor';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { CachedDataResourceKey, CachedResource, getCachedDataResourceLoaderState } from '@cloudbeaver/core-sdk';
@@ -19,11 +18,7 @@ export class AppAuthService extends Bootstrap {
   get authenticated(): boolean {
     const user = this.userInfoResource.data;
 
-    return (
-      this.serverConfigResource.anonymousAccessEnabled
-      || this.serverConfigResource.configurationMode
-      || user !== null
-    );
+    return this.serverConfigResource.anonymousAccessEnabled || this.serverConfigResource.configurationMode || user !== null;
   }
 
   get loaders(): ILoadableState[] {
@@ -35,10 +30,7 @@ export class AppAuthService extends Bootstrap {
 
   readonly auth: IExecutor<boolean>;
 
-  constructor(
-    private readonly serverConfigResource: ServerConfigResource,
-    private readonly userInfoResource: UserInfoResource,
-  ) {
+  constructor(private readonly serverConfigResource: ServerConfigResource, private readonly userInfoResource: UserInfoResource) {
     super();
     this.auth = new Executor();
     this.userInfoResource.onDataUpdate.addHandler(this.authUser.bind(this));
@@ -46,7 +38,7 @@ export class AppAuthService extends Bootstrap {
 
   requireAuthentication<T = CachedDataResourceKey<UserInfoResource>>(
     resource: CachedResource<any, any, T, any, any>,
-    map?: (param: T | undefined) => T
+    map?: (param: T | undefined) => T,
   ): this {
     resource
       .preloadResource(this.userInfoResource, () => {})
@@ -61,14 +53,12 @@ export class AppAuthService extends Bootstrap {
   async isAuthNeeded(): Promise<boolean> {
     const config = await this.serverConfigResource.load();
     if (!config) {
-      throw new Error('Can\'t configure Authentication');
+      throw new Error("Can't configure Authentication");
     }
 
     const user = await this.userInfoResource.load();
 
-    return !this.serverConfigResource.configurationMode
-      && !this.serverConfigResource.anonymousAccessEnabled
-      && user === null;
+    return !this.serverConfigResource.configurationMode && !this.serverConfigResource.anonymousAccessEnabled && user === null;
   }
 
   async authUser(): Promise<boolean> {
@@ -79,7 +69,7 @@ export class AppAuthService extends Bootstrap {
     return state;
   }
 
-  register(): void { }
+  register(): void {}
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/core-authentication/src/AuthConfigurationParametersResource.ts b/webapp/packages/core-authentication/src/AuthConfigurationParametersResource.ts
index d715a8194d..c495cd2688 100644
--- a/webapp/packages/core-authentication/src/AuthConfigurationParametersResource.ts
+++ b/webapp/packages/core-authentication/src/AuthConfigurationParametersResource.ts
@@ -5,20 +5,26 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { SessionPermissionsResource, SessionDataResource } from '@cloudbeaver/core-root';
-import { AuthProviderConfigurationParametersFragment, CachedMapResource, GetAuthProviderConfigurationParametersQueryVariables, GraphQLService, isResourceAlias, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
+import { SessionDataResource, SessionPermissionsResource } from '@cloudbeaver/core-root';
+import {
+  AuthProviderConfigurationParametersFragment,
+  CachedMapResource,
+  GetAuthProviderConfigurationParametersQueryVariables,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import { EAdminPermission } from './EAdminPermission';
 
 @injectable()
-export class AuthConfigurationParametersResource
-  extends CachedMapResource<
+export class AuthConfigurationParametersResource extends CachedMapResource<
   string,
   AuthProviderConfigurationParametersFragment[],
   GetAuthProviderConfigurationParametersQueryVariables
-  > {
+> {
   constructor(
     private readonly graphQLService: GraphQLService,
     private readonly sessionDataResource: SessionDataResource,
@@ -30,9 +36,7 @@ export class AuthConfigurationParametersResource
     permissionsResource.require(this, EAdminPermission.admin);
   }
 
-  protected async loader(
-    key: ResourceKey<string>
-  ): Promise<Map<string, AuthProviderConfigurationParametersFragment[]>> {
+  protected async loader(key: ResourceKey<string>): Promise<Map<string, AuthProviderConfigurationParametersFragment[]>> {
     if (isResourceAlias(key)) {
       throw new Error('Aliases not supported by this resource.');
     }
diff --git a/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts b/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
index 24622e6774..92bc6f7538 100644
--- a/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
+++ b/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
@@ -5,12 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { SessionPermissionsResource } from '@cloudbeaver/core-root';
-import { AdminAuthProviderConfiguration, CachedMapAllKey, CachedMapResource, GetAuthProviderConfigurationsQueryVariables, GraphQLService, isResourceAlias, ResourceKey, ResourceKeyList, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
+import {
+  AdminAuthProviderConfiguration,
+  CachedMapAllKey,
+  CachedMapResource,
+  GetAuthProviderConfigurationsQueryVariables,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  ResourceKeyList,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import type { AuthProviderConfiguration } from './AuthProvidersResource';
 import { EAdminPermission } from './EAdminPermission';
@@ -22,17 +33,11 @@ export type AuthConfiguration = AdminAuthProviderConfiguration;
 type NewConfiguration = AuthConfiguration & { [NEW_CONFIGURATION_SYMBOL]: boolean; timestamp: number };
 
 @injectable()
-export class AuthConfigurationsResource
-  extends CachedMapResource<string, AuthConfiguration, GetAuthProviderConfigurationsQueryVariables> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    permissionsResource: SessionPermissionsResource,
-  ) {
+export class AuthConfigurationsResource extends CachedMapResource<string, AuthConfiguration, GetAuthProviderConfigurationsQueryVariables> {
+  constructor(private readonly graphQLService: GraphQLService, permissionsResource: SessionPermissionsResource) {
     super(() => new Map(), []);
 
-    permissionsResource
-      .require(this, EAdminPermission.admin)
-      .outdateResource(this);
+    permissionsResource.require(this, EAdminPermission.admin).outdateResource(this);
   }
 
   async saveConfiguration(config: AuthConfiguration): Promise<AuthConfiguration> {
@@ -111,15 +116,11 @@ export class AuthConfigurationsResource
   }
 }
 
-function isNewConfiguration(
-  configuration: AuthConfiguration | NewConfiguration
-): configuration is NewConfiguration {
+function isNewConfiguration(configuration: AuthConfiguration | NewConfiguration): configuration is NewConfiguration {
   return (configuration as NewConfiguration)[NEW_CONFIGURATION_SYMBOL];
 }
 
-export function compareAuthConfigurations(
-  a: AuthConfiguration, b: AuthConfiguration
-): number {
+export function compareAuthConfigurations(a: AuthConfiguration, b: AuthConfiguration): number {
   if (isNewConfiguration(a) && isNewConfiguration(b)) {
     return b.timestamp - a.timestamp;
   }
diff --git a/webapp/packages/core-authentication/src/AuthInfoService.ts b/webapp/packages/core-authentication/src/AuthInfoService.ts
index bbf9566b86..cec031c28c 100644
--- a/webapp/packages/core-authentication/src/AuthInfoService.ts
+++ b/webapp/packages/core-authentication/src/AuthInfoService.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { type ITask, AutoRunningTask } from '@cloudbeaver/core-executor';
+import { AutoRunningTask, type ITask } from '@cloudbeaver/core-executor';
 import { WindowsService } from '@cloudbeaver/core-routing';
 import { AuthInfo, AuthStatus, UserInfo } from '@cloudbeaver/core-sdk';
 import { uuid } from '@cloudbeaver/core-utils';
 
-import { AuthProvidersResource, AuthProviderConfiguration } from './AuthProvidersResource';
+import { AuthProviderConfiguration, AuthProvidersResource } from './AuthProvidersResource';
 import { type ILoginOptions, UserInfoResource } from './UserInfoResource';
 
 export interface IUserAuthConfiguration {
@@ -36,14 +35,10 @@ export class AuthInfoService {
 
     for (const token of tokens) {
       if (token.authConfiguration) {
-        const provider = this.authProvidersResource.values.find(
-          provider => provider.id === token.authProvider
-        );
+        const provider = this.authProvidersResource.values.find(provider => provider.id === token.authProvider);
 
         if (provider) {
-          const configuration = provider.configurations?.find(
-            configuration => configuration.id === token.authConfiguration
-          );
+          const configuration = provider.configurations?.find(configuration => configuration.id === token.authConfiguration);
 
           if (configuration) {
             result.push({ providerId: provider.id, configuration });
@@ -58,13 +53,13 @@ export class AuthInfoService {
   constructor(
     private readonly userInfoResource: UserInfoResource,
     private readonly authProvidersResource: AuthProvidersResource,
-    private readonly windowsService: WindowsService
-  ) {
-  }
+    private readonly windowsService: WindowsService,
+  ) {}
 
   login(providerId: string, options: ILoginOptions): ITask<UserInfo | null> {
-    return new AutoRunningTask(async () => await this.userInfoResource.login(providerId, options))
-      .then(authInfo => this.federatedAuthentication(providerId, options, authInfo));
+    return new AutoRunningTask(async () => await this.userInfoResource.login(providerId, options)).then(authInfo =>
+      this.federatedAuthentication(providerId, options, authInfo),
+    );
   }
 
   async logout(): Promise<void> {
@@ -74,7 +69,7 @@ export class AuthInfoService {
   private federatedAuthentication(
     providerId: string,
     options: ILoginOptions,
-    { redirectLink, authId, authStatus }: AuthInfo
+    { redirectLink, authId, authStatus }: AuthInfo,
   ): ITask<UserInfo | null> {
     let window: Window | null = null;
     let id = providerId;
@@ -101,16 +96,19 @@ export class AuthInfoService {
       }
     }
 
-    return new AutoRunningTask(() => {
-      if (authId && authStatus === AuthStatus.InProgress) {
-        return this.userInfoResource.finishFederatedAuthentication(authId, options.linkUser);
-      }
+    return new AutoRunningTask(
+      () => {
+        if (authId && authStatus === AuthStatus.InProgress) {
+          return this.userInfoResource.finishFederatedAuthentication(authId, options.linkUser);
+        }
 
-      return AutoRunningTask.resolve(this.userInfoResource.data);
-    }, () => {
-      if (window) {
-        this.windowsService.close(window);
-      }
-    });
+        return AutoRunningTask.resolve(this.userInfoResource.data);
+      },
+      () => {
+        if (window) {
+          this.windowsService.close(window);
+        }
+      },
+    );
   }
 }
diff --git a/webapp/packages/core-authentication/src/AuthProviderService.ts b/webapp/packages/core-authentication/src/AuthProviderService.ts
index 4baaeb86f6..a16d17d450 100644
--- a/webapp/packages/core-authentication/src/AuthProviderService.ts
+++ b/webapp/packages/core-authentication/src/AuthProviderService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { md5, uuid } from '@cloudbeaver/core-utils';
@@ -39,9 +38,7 @@ export class AuthProviderService {
 
   private readonly serviceDescriptionLinker: IServiceDescriptionLink[]; // TODO: probably should be replaced by PlaceholderContainer
 
-  constructor(
-    private readonly authProvidersResource: AuthProvidersResource
-  ) {
+  constructor(private readonly authProvidersResource: AuthProvidersResource) {
     this.requestAuthProvider = new Executor();
     this.serviceDescriptionLinker = [];
   }
diff --git a/webapp/packages/core-authentication/src/AuthProvidersResource.ts b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
index 6edef333e1..7213aaada3 100644
--- a/webapp/packages/core-authentication/src/AuthProvidersResource.ts
+++ b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
@@ -5,12 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, ResourceKey, resourceKeyList, ResourceKeyUtils, CachedMapAllKey, AuthProviderInfoFragment, AuthProviderConfigurationInfoFragment, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import {
+  AuthProviderConfigurationInfoFragment,
+  AuthProviderInfoFragment,
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import { AuthConfigurationsResource } from './AuthConfigurationsResource';
 import { AuthSettingsService } from './AuthSettingsService';
@@ -28,11 +37,15 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
     private readonly authSettingsService: AuthSettingsService,
     private readonly graphQLService: GraphQLService,
     private readonly serverConfigResource: ServerConfigResource,
-    private readonly authConfigurationsResource: AuthConfigurationsResource
+    private readonly authConfigurationsResource: AuthConfigurationsResource,
   ) {
     super();
 
-    this.sync(serverConfigResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
 
     this.authConfigurationsResource.onItemUpdate.addHandler(this.updateConfigurations.bind(this));
     this.authConfigurationsResource.onItemDelete.addHandler(this.deleteConfigurations.bind(this));
@@ -42,7 +55,7 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
     });
   }
 
-  getConfiguration(providerId: string, configurationId: string): AuthProviderConfiguration | undefined  {
+  getConfiguration(providerId: string, configurationId: string): AuthProviderConfiguration | undefined {
     const provider = this.get(providerId);
 
     if (provider) {
@@ -108,9 +121,7 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
   private updateConfigurations(key: ResourceKeySimple<string>) {
     const configurations = this.authConfigurationsResource.get(ResourceKeyUtils.toList(key));
 
-    const providerIds = resourceKeyList(
-      configurations.filter(Boolean).map(configuration => configuration!.providerId)
-    );
+    const providerIds = resourceKeyList(configurations.filter(Boolean).map(configuration => configuration!.providerId));
 
     this.markOutdated(providerIds);
   }
diff --git a/webapp/packages/core-authentication/src/AuthRolesResource.ts b/webapp/packages/core-authentication/src/AuthRolesResource.ts
index c7ca994fdd..d48feab975 100644
--- a/webapp/packages/core-authentication/src/AuthRolesResource.ts
+++ b/webapp/packages/core-authentication/src/AuthRolesResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SessionPermissionsResource } from '@cloudbeaver/core-root';
 import { CachedDataResource, GraphQLService } from '@cloudbeaver/core-sdk';
@@ -14,15 +13,10 @@ import { EAdminPermission } from './EAdminPermission';
 
 @injectable()
 export class AuthRolesResource extends CachedDataResource<string[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionPermissionsResource: SessionPermissionsResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionPermissionsResource: SessionPermissionsResource) {
     super(() => []);
 
-    sessionPermissionsResource
-      .require(this, EAdminPermission.admin)
-      .outdateResource(this);
+    sessionPermissionsResource.require(this, EAdminPermission.admin).outdateResource(this);
   }
 
   protected async loader(): Promise<string[]> {
diff --git a/webapp/packages/core-authentication/src/AuthSettingsService.test.ts b/webapp/packages/core-authentication/src/AuthSettingsService.test.ts
index d4d2cb296b..42186566ce 100644
--- a/webapp/packages/core-authentication/src/AuthSettingsService.test.ts
+++ b/webapp/packages/core-authentication/src/AuthSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -21,10 +20,7 @@ import { AuthSettings, AuthSettingsService } from './AuthSettingsService';
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -42,13 +38,11 @@ test('Read settings', async () => {
   const settings = app.injector.getServiceByClass(AuthSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('baseAuthProvider')).toBe('sd');
   expect(settings.settings.getValue('primaryAuthProvider')).toBe('sd');
   expect(settings.settings.getValue('disableAnonymousAccess')).toBe(true);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-authentication/src/AuthSettingsService.ts b/webapp/packages/core-authentication/src/AuthSettingsService.ts
index 7d16d8fe8e..f18a8d8e27 100644
--- a/webapp/packages/core-authentication/src/AuthSettingsService.ts
+++ b/webapp/packages/core-authentication/src/AuthSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-authentication/src/DATA_CONTEXT_USER.ts b/webapp/packages/core-authentication/src/DATA_CONTEXT_USER.ts
index 4f3009ec83..c37f85296d 100644
--- a/webapp/packages/core-authentication/src/DATA_CONTEXT_USER.ts
+++ b/webapp/packages/core-authentication/src/DATA_CONTEXT_USER.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { UserInfo } from '@cloudbeaver/core-sdk';
 import { createDataContext } from '@cloudbeaver/core-view';
 
diff --git a/webapp/packages/core-authentication/src/EAdminPermission.ts b/webapp/packages/core-authentication/src/EAdminPermission.ts
index 332d7a0c91..bc7a4439b8 100644
--- a/webapp/packages/core-authentication/src/EAdminPermission.ts
+++ b/webapp/packages/core-authentication/src/EAdminPermission.ts
@@ -7,5 +7,5 @@
  */
 
 export enum EAdminPermission {
-  admin = 'admin'
+  admin = 'admin',
 }
diff --git a/webapp/packages/core-authentication/src/ELMRole.ts b/webapp/packages/core-authentication/src/ELMRole.ts
index 4d399f24c3..6a57db2501 100644
--- a/webapp/packages/core-authentication/src/ELMRole.ts
+++ b/webapp/packages/core-authentication/src/ELMRole.ts
@@ -12,4 +12,4 @@ export enum ELMRole {
   DATA_MANAGER = 'DATA_MANAGER',
   EDITOR = 'EDITOR',
   VIEWER = 'VIEWER',
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-authentication/src/TeamMetaParametersResource.ts b/webapp/packages/core-authentication/src/TeamMetaParametersResource.ts
index 930399e152..3079c0b470 100644
--- a/webapp/packages/core-authentication/src/TeamMetaParametersResource.ts
+++ b/webapp/packages/core-authentication/src/TeamMetaParametersResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SessionResource } from '@cloudbeaver/core-root';
 import { CachedDataResource, GraphQLService, ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
@@ -14,13 +13,14 @@ export type TeamMetaParameter = ObjectPropertyInfo;
 
 @injectable()
 export class TeamMetaParametersResource extends CachedDataResource<TeamMetaParameter[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionResource: SessionResource,
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionResource: SessionResource) {
     super(() => []);
 
-    this.sync(sessionResource, () => { }, () => { });
+    this.sync(
+      sessionResource,
+      () => {},
+      () => {},
+    );
   }
 
   protected async loader(): Promise<TeamMetaParameter[]> {
diff --git a/webapp/packages/core-authentication/src/TeamsManagerService.ts b/webapp/packages/core-authentication/src/TeamsManagerService.ts
index 09cad9aed3..906ac725ba 100644
--- a/webapp/packages/core-authentication/src/TeamsManagerService.ts
+++ b/webapp/packages/core-authentication/src/TeamsManagerService.ts
@@ -5,15 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { TeamsResource } from './TeamsResource';
 
 @injectable()
 export class TeamsManagerService {
-  constructor(
-    readonly teams: TeamsResource
-  ) {
-  }
+  constructor(readonly teams: TeamsResource) {}
 }
diff --git a/webapp/packages/core-authentication/src/TeamsResource.ts b/webapp/packages/core-authentication/src/TeamsResource.ts
index c45b4b2720..2674b0b0cd 100644
--- a/webapp/packages/core-authentication/src/TeamsResource.ts
+++ b/webapp/packages/core-authentication/src/TeamsResource.ts
@@ -5,9 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { GraphQLService, CachedMapResource, ResourceKey, ResourceKeyUtils, AdminTeamInfoFragment, AdminConnectionGrantInfo, CachedMapAllKey, GetTeamsListQueryVariables, ResourceKeySimple, resourceKeyList, isResourceAlias } from '@cloudbeaver/core-sdk';
+import {
+  AdminConnectionGrantInfo,
+  AdminTeamInfoFragment,
+  CachedMapAllKey,
+  CachedMapResource,
+  GetTeamsListQueryVariables,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 const NEW_TEAM_SYMBOL = Symbol('new-team');
@@ -23,13 +34,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou
     super();
   }
 
-  async createTeam({
-    teamId,
-    teamPermissions,
-    teamName,
-    description,
-    metaParameters,
-  }: TeamInfo): Promise<TeamInfo> {
+  async createTeam({ teamId, teamPermissions, teamName, description, metaParameters }: TeamInfo): Promise<TeamInfo> {
     const response = await this.graphQLService.sdk.createTeam({
       teamId,
       teamName,
@@ -52,13 +57,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou
     return this.get(teamId)!;
   }
 
-  async updateTeam({
-    teamId,
-    teamPermissions,
-    teamName,
-    description,
-    metaParameters,
-  }: TeamInfo): Promise<TeamInfo> {
+  async updateTeam({ teamId, teamPermissions, teamName, description, metaParameters }: TeamInfo): Promise<TeamInfo> {
     const { team } = await this.graphQLService.sdk.updateTeam({
       teamId,
       teamName,
@@ -105,9 +104,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou
       return;
     }
 
-    const {
-      permissions: newPermissions,
-    } = await this.graphQLService.sdk.setSubjectPermissions({ subjectId, permissions });
+    const { permissions: newPermissions } = await this.graphQLService.sdk.setSubjectPermissions({ subjectId, permissions });
 
     if (team) {
       team.teamPermissions = newPermissions.map(permission => permission.id);
@@ -121,10 +118,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou
     await this.graphQLService.sdk.saveTeamMetaParameters({ teamId, parameters });
   }
 
-  protected async loader(
-    originalKey: ResourceKey<string>,
-    includes?: string[]
-  ): Promise<Map<string, TeamInfo>> {
+  protected async loader(originalKey: ResourceKey<string>, includes?: string[]): Promise<Map<string, TeamInfo>> {
     const all = this.isAlias(originalKey, CachedMapAllKey);
     const teamsList: TeamInfo[] = [];
 
diff --git a/webapp/packages/core-authentication/src/UserConfigurationBootstrap.ts b/webapp/packages/core-authentication/src/UserConfigurationBootstrap.ts
index fae7d12ce1..46c9edd192 100644
--- a/webapp/packages/core-authentication/src/UserConfigurationBootstrap.ts
+++ b/webapp/packages/core-authentication/src/UserConfigurationBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { SessionResource } from '@cloudbeaver/core-root';
@@ -18,12 +17,11 @@ const USER_APP_LANGUAGE = 'app.language';
 
 @injectable()
 export class UserConfigurationBootstrap extends Bootstrap {
-
   constructor(
     private readonly userInfoResource: UserInfoResource,
     private readonly themeService: ThemeService,
     private readonly localizationService: LocalizationService,
-    private readonly sessionResource: SessionResource
+    private readonly sessionResource: SessionResource,
   ) {
     super();
     this.userInfoResource.onDataUpdate.addHandler(() => {
@@ -58,10 +56,9 @@ export class UserConfigurationBootstrap extends Bootstrap {
     });
   }
 
-  register(): void {  }
+  register(): void {}
 
   async load(): Promise<void> {
     await this.userInfoResource.load();
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-authentication/src/UserDataService.ts b/webapp/packages/core-authentication/src/UserDataService.ts
index 5945a8c7a7..a6d3e08820 100644
--- a/webapp/packages/core-authentication/src/UserDataService.ts
+++ b/webapp/packages/core-authentication/src/UserDataService.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -19,10 +18,7 @@ export class UserDataService {
   private readonly userData: Map<string, Record<string, any>>;
   private readonly tempData: TempMap<string, Record<string, any>>;
 
-  constructor(
-    private readonly userInfoResource: UserInfoResource,
-    private readonly autoSaveService: LocalStorageSaveService,
-  ) {
+  constructor(private readonly userInfoResource: UserInfoResource, private readonly autoSaveService: LocalStorageSaveService) {
     this.userData = new Map();
 
     makeObservable<this, 'userData'>(this, {
@@ -31,11 +27,7 @@ export class UserDataService {
 
     this.tempData = new TempMap(this.userData);
 
-    this.autoSaveService.withAutoSave(
-      'user_data',
-      this.userData,
-      () => new Map()
-    );
+    this.autoSaveService.withAutoSave('user_data', this.userData, () => new Map());
   }
 
   getUserData<T extends Record<any, any>>(key: string, defaultValue: () => T, validate?: (data: T) => boolean): T {
@@ -47,10 +39,7 @@ export class UserDataService {
 
     const data = this.tempData.get(userId)!;
 
-    if (
-      !(key in data)
-      || validate?.(data[key]) === false
-    ) {
+    if (!(key in data) || validate?.(data[key]) === false) {
       data[key] = observable(defaultValue());
     }
 
diff --git a/webapp/packages/core-authentication/src/UserInfoResource.ts b/webapp/packages/core-authentication/src/UserInfoResource.ts
index 93995283e0..aaa8ffcd7c 100644
--- a/webapp/packages/core-authentication/src/UserInfoResource.ts
+++ b/webapp/packages/core-authentication/src/UserInfoResource.ts
@@ -5,13 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
-import { SyncExecutor, ISyncExecutor, ITask, AutoRunningTask, whileTask } from '@cloudbeaver/core-executor';
+import { AutoRunningTask, ISyncExecutor, ITask, SyncExecutor, whileTask } from '@cloudbeaver/core-executor';
 import { SessionDataResource, SessionResource } from '@cloudbeaver/core-root';
-import { AuthInfo, AuthStatus, CachedDataResource, GetActiveUserQueryVariables, GraphQLService, ResourceKeySimple, ResourceKeyUtils, UserAuthToken, UserInfo } from '@cloudbeaver/core-sdk';
+import {
+  AuthInfo,
+  AuthStatus,
+  CachedDataResource,
+  GetActiveUserQueryVariables,
+  GraphQLService,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+  UserAuthToken,
+  UserInfo,
+} from '@cloudbeaver/core-sdk';
 
 import { AUTH_PROVIDER_LOCAL_ID } from './AUTH_PROVIDER_LOCAL_ID';
 import { AuthProviderService } from './AuthProviderService';
@@ -27,11 +36,7 @@ export interface ILoginOptions {
 }
 
 @injectable()
-export class UserInfoResource extends CachedDataResource<
-UserInfo | null,
-void,
-UserInfoIncludes
-> {
+export class UserInfoResource extends CachedDataResource<UserInfo | null, void, UserInfoIncludes> {
   readonly onUserChange: ISyncExecutor<string>;
 
   get authRole(): ELMRole | undefined {
@@ -46,13 +51,17 @@ UserInfoIncludes
     private readonly graphQLService: GraphQLService,
     private readonly authProviderService: AuthProviderService,
     private readonly sessionResource: SessionResource,
-    private readonly sessionDataResource: SessionDataResource
+    private readonly sessionDataResource: SessionDataResource,
   ) {
     super(() => null, undefined, ['customIncludeOriginDetails', 'includeConfigurationParameters']);
 
     this.onUserChange = new SyncExecutor();
 
-    this.sync(sessionResource, () => {}, () => {});
+    this.sync(
+      sessionResource,
+      () => {},
+      () => {},
+    );
 
     makeObservable(this, {
       parametersAvailable: computed,
@@ -77,15 +86,10 @@ UserInfoIncludes
     }
 
     // TODO: will be changed due wrong origin in authTokens
-    return (
-      this.data.authTokens.some(token => token.authProvider === providerId)
-    );
+    return this.data.authTokens.some(token => token.authProvider === providerId);
   }
 
-  async login(
-    provider: string,
-    { credentials, configurationId, linkUser }: ILoginOptions
-  ): Promise<AuthInfo> {
+  async login(provider: string, { credentials, configurationId, linkUser }: ILoginOptions): Promise<AuthInfo> {
     let processedCredentials: Record<string, any> | undefined;
 
     if (credentials) {
@@ -106,7 +110,7 @@ UserInfoIncludes
         this.resetIncludes();
         this.markOutdated();
       } else {
-        this.data.authTokens.push(...authInfo.userTokens as UserAuthToken[]);
+        this.data.authTokens.push(...(authInfo.userTokens as UserAuthToken[]));
       }
 
       this.sessionDataResource.markOutdated();
@@ -118,49 +122,49 @@ UserInfoIncludes
   finishFederatedAuthentication(authId: string, linkUser?: boolean): ITask<UserInfo | null> {
     let activeTask: ITask<AuthInfo> | undefined;
 
-    return new AutoRunningTask<UserInfo | null>(() => this.performUpdate(
-      undefined,
-      [],
-      async () => {
-        activeTask = whileTask<AuthInfo>(
-          authInfo => {
-            if (authInfo.authStatus === AuthStatus.Success) {
-              return true;
-            } else if (authInfo.authStatus === AuthStatus.Error) {
-              throw new Error('Authentication error');
+    return new AutoRunningTask<UserInfo | null>(
+      () =>
+        this.performUpdate(undefined, [], async () => {
+          activeTask = whileTask<AuthInfo>(
+            authInfo => {
+              if (authInfo.authStatus === AuthStatus.Success) {
+                return true;
+              } else if (authInfo.authStatus === AuthStatus.Error) {
+                throw new Error('Authentication error');
+              }
+
+              return false;
+            },
+            async () => {
+              const { authInfo } = await this.graphQLService.sdk.getAuthStatus({
+                authId,
+                linkUser,
+                customIncludeOriginDetails: true,
+              });
+              return authInfo as AuthInfo;
+            },
+            1000,
+          );
+
+          const authInfo = await activeTask;
+
+          if (authInfo.userTokens && authInfo.authStatus === AuthStatus.Success) {
+            if (this.data === null) {
+              this.resetIncludes();
+              this.setData(await this.loader());
+            } else {
+              this.data.authTokens.push(...(authInfo.userTokens as UserAuthToken[]));
             }
 
-            return false;
-          },
-          async () => {
-            const { authInfo } = await this.graphQLService.sdk.getAuthStatus({
-              authId,
-              linkUser,
-              customIncludeOriginDetails: true,
-            });
-            return authInfo as AuthInfo;
-          },
-          1000
-        );
-
-        const authInfo = await activeTask;
-
-        if (authInfo.userTokens && authInfo.authStatus === AuthStatus.Success) {
-          if (this.data === null) {
-            this.resetIncludes();
-            this.setData(await this.loader());
-          } else {
-            this.data.authTokens.push(...authInfo.userTokens as UserAuthToken[]);
+            this.sessionDataResource.markOutdated();
           }
 
-          this.sessionDataResource.markOutdated();
-        }
-
-        return this.data;
-      }
-    ), () => {
-      activeTask?.cancel();
-    });
+          return this.data;
+        }),
+      () => {
+        activeTask?.cancel();
+      },
+    );
   }
 
   async logout(provider?: string, configuration?: string): Promise<void> {
@@ -230,10 +234,7 @@ UserInfoIncludes
     return this.data?.configurationParameters[key];
   }
 
-  protected async loader(
-    key: void,
-    includes?: ReadonlyArray<string>,
-  ): Promise<UserInfo | null> {
+  protected async loader(key: void, includes?: ReadonlyArray<string>): Promise<UserInfo | null> {
     const { user } = await this.graphQLService.sdk.getActiveUser({
       ...this.getDefaultIncludes(),
       ...this.getIncludesMap(key, includes),
diff --git a/webapp/packages/core-authentication/src/UserMetaParametersResource.ts b/webapp/packages/core-authentication/src/UserMetaParametersResource.ts
index 2a7f79e083..2ea613f163 100644
--- a/webapp/packages/core-authentication/src/UserMetaParametersResource.ts
+++ b/webapp/packages/core-authentication/src/UserMetaParametersResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
 import { SessionResource } from '@cloudbeaver/core-root';
@@ -14,7 +13,7 @@ import { CachedDataResource, GraphQLService, UserConnectionAuthPropertiesFragmen
 import { UserInfoResource } from './UserInfoResource';
 
 export type UserMetaParameter = UserConnectionAuthPropertiesFragment;
-export interface IUserMetaParameterOptions{
+export interface IUserMetaParameterOptions {
   id: string;
   displayName: string;
   description?: string;
@@ -23,17 +22,15 @@ export interface IUserMetaParameterOptions{
 
 @injectable()
 export class UserMetaParametersResource extends CachedDataResource<UserMetaParameter[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionResource: SessionResource,
-    userInfoResource: UserInfoResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionResource: SessionResource, userInfoResource: UserInfoResource) {
     super(() => []);
 
-    this.sync(sessionResource, () => {}, () => {});
-    this
-      .preloadResource(userInfoResource, () => {})
-      .before(ExecutorInterrupter.interrupter(() => userInfoResource.data === null));
+    this.sync(
+      sessionResource,
+      () => {},
+      () => {},
+    );
+    this.preloadResource(userInfoResource, () => {}).before(ExecutorInterrupter.interrupter(() => userInfoResource.data === null));
   }
 
   async add(options: IUserMetaParameterOptions): Promise<UserMetaParameter> {
diff --git a/webapp/packages/core-authentication/src/UsersResource.ts b/webapp/packages/core-authentication/src/UsersResource.ts
index 453ee1b2e7..768098cda5 100644
--- a/webapp/packages/core-authentication/src/UsersResource.ts
+++ b/webapp/packages/core-authentication/src/UsersResource.ts
@@ -5,25 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource, SessionPermissionsResource } from '@cloudbeaver/core-root';
 import {
-  GraphQLService,
-  CachedMapResource,
-  ResourceKey,
   AdminConnectionGrantInfo,
-  AdminUserInfoFragment,
   AdminUserInfo,
-  ResourceKeyUtils,
-  GetUsersListQueryVariables,
+  AdminUserInfoFragment,
   CachedMapAllKey,
-  resourceKeyList,
+  CachedMapResource,
+  GetUsersListQueryVariables,
+  GraphQLService,
+  isResourceAlias,
   isResourceKeyAlias,
+  ResourceKey,
+  resourceKeyList,
   ResourceKeySimple,
-  isResourceAlias
+  ResourceKeyUtils,
 } from '@cloudbeaver/core-sdk';
 
 import { AUTH_PROVIDER_LOCAL_ID } from './AUTH_PROVIDER_LOCAL_ID';
@@ -56,13 +55,11 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
     private readonly serverConfigResource: ServerConfigResource,
     private readonly authProviderService: AuthProviderService,
     private readonly authInfoService: AuthInfoService,
-    sessionPermissionsResource: SessionPermissionsResource
+    sessionPermissionsResource: SessionPermissionsResource,
   ) {
     super();
 
-    sessionPermissionsResource
-      .require(this, EAdminPermission.admin)
-      .outdateResource(this);
+    sessionPermissionsResource.require(this, EAdminPermission.admin).outdateResource(this);
   }
 
   isNew(id: string): boolean {
@@ -79,10 +76,12 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
       grantedConnections: [],
       configurationParameters: {},
       metaParameters: {},
-      origins: [{
-        type: AUTH_PROVIDER_LOCAL_ID,
-        displayName: 'Local',
-      }],
+      origins: [
+        {
+          type: AUTH_PROVIDER_LOCAL_ID,
+          displayName: 'Local',
+        },
+      ],
       linkedAuthProviders: [AUTH_PROVIDER_LOCAL_ID],
       enabled: true,
       authRole: this.serverConfigResource.data?.defaultAuthRole ?? undefined,
@@ -103,15 +102,7 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
     await this.graphQLService.sdk.saveUserMetaParameters({ userId, parameters });
   }
 
-  async create({
-    userId,
-    teams,
-    credentials,
-    metaParameters,
-    grantedConnections,
-    enabled,
-    authRole,
-  }: UserCreateOptions): Promise<AdminUser> {
+  async create({ userId, teams, credentials, metaParameters, grantedConnections, enabled, authRole }: UserCreateOptions): Promise<AdminUser> {
     const { user } = await this.graphQLService.sdk.createUser({
       userId,
       enabled,
@@ -129,7 +120,7 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
 
       await this.setConnections(userId, grantedConnections);
       await this.setMetaParameters(userId, metaParameters);
-      const user = await this.refresh(userId) as unknown as AdminUserNew;
+      const user = (await this.refresh(userId)) as unknown as AdminUserNew;
       user[NEW_USER_SYMBOL] = true;
     } catch (exception: any) {
       this.delete(userId);
@@ -191,7 +182,7 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
   async delete(key: ResourceKeySimple<string>): Promise<void> {
     await ResourceKeyUtils.forEachAsync(key, async key => {
       if (this.isActiveUser(key)) {
-        throw new Error('You can\'t delete current logged user');
+        throw new Error("You can't delete current logged user");
       }
       await this.graphQLService.sdk.deleteUser({ userId: key });
       super.delete(key);
@@ -214,10 +205,7 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
     return this.authInfoService.userInfo?.userId === userId;
   }
 
-  protected async loader(
-    originalKey: ResourceKey<string>,
-    includes?: string[]
-  ): Promise<Map<string, AdminUser>> {
+  protected async loader(originalKey: ResourceKey<string>, includes?: string[]): Promise<Map<string, AdminUser>> {
     const all = this.isAlias(originalKey, CachedMapAllKey);
     const usersList: AdminUser[] = [];
 
diff --git a/webapp/packages/core-authentication/src/index.ts b/webapp/packages/core-authentication/src/index.ts
index af6c0d942c..6a16e93160 100644
--- a/webapp/packages/core-authentication/src/index.ts
+++ b/webapp/packages/core-authentication/src/index.ts
@@ -18,4 +18,4 @@ export * from './UserInfoResource';
 export * from './UserMetaParametersResource';
 export * from './UsersResource';
 export * from './TeamMetaParametersResource';
-export * from './EAdminPermission';
\ No newline at end of file
+export * from './EAdminPermission';
diff --git a/webapp/packages/core-authentication/src/manifest.ts b/webapp/packages/core-authentication/src/manifest.ts
index a8c3cd4eed..b703aadf28 100644
--- a/webapp/packages/core-authentication/src/manifest.ts
+++ b/webapp/packages/core-authentication/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AppAuthService } from './AppAuthService';
diff --git a/webapp/packages/core-blocks/src/AppRefreshButton.tsx b/webapp/packages/core-blocks/src/AppRefreshButton.tsx
index 7cbd179ac8..a9d7849d86 100644
--- a/webapp/packages/core-blocks/src/AppRefreshButton.tsx
+++ b/webapp/packages/core-blocks/src/AppRefreshButton.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type React from 'react';
 import styled, { css } from 'reshadow';
 
@@ -18,13 +17,14 @@ const style = css`
     background-color: #2a7cb4;
     padding: 5px 16px;
     border-radius: 4px;
-    letter-spacing: .08929em;
-    font-size: .875rem;
+    letter-spacing: 0.08929em;
+    font-size: 0.875rem;
     text-transform: uppercase;
     cursor: pointer;
     outline: none;
     border: none;
-    &:hover, &:focus {
+    &:hover,
+    &:focus {
       opacity: 0.8;
     }
     &:active {
@@ -44,5 +44,9 @@ export const AppRefreshButton: React.FC<IProps> = function AppRefreshButton({ cl
     app.start();
   }
 
-  return styled(style)(<button className={className} onClick={refresh}>Refresh</button>);
+  return styled(style)(
+    <button className={className} onClick={refresh}>
+      Refresh
+    </button>,
+  );
 };
diff --git a/webapp/packages/core-blocks/src/BlocksLocaleService.ts b/webapp/packages/core-blocks/src/BlocksLocaleService.ts
index a2e29a8e4e..0df1b7f25a 100644
--- a/webapp/packages/core-blocks/src/BlocksLocaleService.ts
+++ b/webapp/packages/core-blocks/src/BlocksLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx
index 8e2bbd13d5..f1e9fc37ed 100644
--- a/webapp/packages/core-blocks/src/Button.tsx
+++ b/webapp/packages/core-blocks/src/Button.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import styled, { css, use } from 'reshadow';
@@ -18,84 +17,83 @@ import { useObservableRef } from './useObservableRef';
 import { useStyles } from './useStyles';
 
 const buttonStyles = css`
-    button-label {
-      composes: theme-button__label from global;
+  button-label {
+    composes: theme-button__label from global;
+  }
+  button-icon {
+    composes: theme-button__icon from global;
+  }
+  ripple {
+    composes: theme-button_ripple from global;
+  }
+  Button {
+    composes: theme-button from global;
+    display: flex;
+
+    & IconOrImage {
+      width: 100%;
     }
-    button-icon {
-      composes: theme-button__icon from global;
+
+    &[disabled] IconOrImage {
+      opacity: 0.5;
     }
-    ripple {
-      composes: theme-button_ripple from global;
+
+    & Loader,
+    & button-label {
+      transition: opacity cubic-bezier(0.4, 0, 0.2, 1) 0.3s;
     }
-    Button {
-      composes: theme-button from global;
-      display: flex;
 
-      & IconOrImage {
-        width: 100%;
-      }
+    & Loader {
+      position: absolute;
+      opacity: 0 !important;
+    }
 
-      &[disabled] IconOrImage {
-        opacity: 0.5;
-      }
-
-      & Loader, & button-label {
-        transition: opacity cubic-bezier(0.4, 0.0, 0.2, 1) 0.3s;
-      }
+    & button-label {
+      opacity: 1;
+    }
 
+    &[|loading] {
       & Loader {
-        position: absolute;
-        opacity: 0 !important;
+        opacity: 1 !important;
       }
 
       & button-label {
-        opacity: 1;
-      }
-
-      &[|loading] {
-        & Loader {
-          opacity: 1 !important;
-        }
-
-        & button-label {
-          opacity: 0;
-        }
-      }
-
-      &[href] {
-        text-decoration: none !important;
+        opacity: 0;
       }
     }
-  `;
+
+    &[href] {
+      text-decoration: none !important;
+    }
+  }
+`;
 
 const buttonMod = {
   raised: css`
     Button {
       composes: theme-button_raised from global;
     }
-    `,
+  `,
   unelevated: css`
     Button {
       composes: theme-button_unelevated from global;
     }
-    `,
+  `,
   outlined: css`
     Button {
       composes: theme-button_outlined from global;
     }
-    `,
+  `,
   secondary: css`
     Button {
       composes: theme-button_secondary from global;
     }
-    `,
+  `,
 };
 
-type ButtonProps = (
-  React.ButtonHTMLAttributes<HTMLButtonElement | HTMLAnchorElement>
-  & React.LinkHTMLAttributes<HTMLLinkElement | HTMLButtonElement>
-  & React.HTMLAttributes<HTMLDivElement>
-) & {
+type ButtonProps = (React.ButtonHTMLAttributes<HTMLButtonElement | HTMLAnchorElement> &
+  React.LinkHTMLAttributes<HTMLLinkElement | HTMLButtonElement> &
+  React.HTMLAttributes<HTMLDivElement>) & {
   loading?: boolean;
   icon?: string;
   viewBox?: string;
@@ -105,9 +103,7 @@ type ButtonProps = (
   href?: string;
   target?: '_blank' | '_self' | '_parent' | '_top';
   loader?: boolean;
-  onClick?: React.MouseEventHandler<
-  HTMLButtonElement | HTMLAnchorElement | HTMLLinkElement | HTMLDivElement
-  > | (() => Promise<any>);
+  onClick?: React.MouseEventHandler<HTMLButtonElement | HTMLAnchorElement | HTMLLinkElement | HTMLDivElement> | (() => Promise<any>);
   download?: boolean;
 };
 
@@ -126,24 +122,29 @@ export const Button = observer<ButtonProps>(function Button({
   className,
   ...rest
 }) {
-  const state = useObservableRef(() => ({
-    loading: false,
-  }), {
-    loading: observable.ref,
-  }, {
-    click(e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement | HTMLLinkElement | HTMLDivElement>) {
-      const returnValue = onClick?.(e);
-
-      if (returnValue instanceof Promise) {
-        if (loader) {
-          this.loading = true;
-          returnValue.finally(() => {
-            this.loading = false;
-          });
-        }
-      }
+  const state = useObservableRef(
+    () => ({
+      loading: false,
+    }),
+    {
+      loading: observable.ref,
     },
-  }, ['click']);
+    {
+      click(e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement | HTMLLinkElement | HTMLDivElement>) {
+        const returnValue = onClick?.(e);
+
+        if (returnValue instanceof Promise) {
+          if (loader) {
+            this.loading = true;
+            returnValue.finally(() => {
+              this.loading = false;
+            });
+          }
+        }
+      },
+    },
+    ['click'],
+  );
 
   loading = state.loading || loading;
 
@@ -153,18 +154,15 @@ export const Button = observer<ButtonProps>(function Button({
 
   const Button = tag;
   return styled(useStyles(styles, buttonStyles, ...(mod || []).map(mod => buttonMod[mod])))(
-    <Button
-      {...rest}
-      type={type}
-      disabled={disabled}
-      {...use({ loading })}
-      className={className}
-      onClick={state.click}
-    >
+    <Button {...rest} type={type} disabled={disabled} {...use({ loading })} className={className} onClick={state.click}>
       <ripple />
-      {icon && <button-icon><IconOrImage icon={icon} viewBox={viewBox} /></button-icon>}
-      <button-label as='span'>{children}</button-label>
+      {icon && (
+        <button-icon>
+          <IconOrImage icon={icon} viewBox={viewBox} />
+        </button-icon>
+      )}
+      <button-label as="span">{children}</button-label>
       <Loader small />
-    </Button>
+    </Button>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Cell.tsx b/webapp/packages/core-blocks/src/Cell.tsx
index 2740e1a86b..9c1e5b1dd4 100644
--- a/webapp/packages/core-blocks/src/Cell.tsx
+++ b/webapp/packages/core-blocks/src/Cell.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -22,40 +21,40 @@ interface Props {
 }
 
 const styles = css`
-    main {
-      position: relative;
-      display: flex;
-      align-items: center;
-      padding: 8px;
-    }
-    before {
-      margin-right: 16px;
-      width: 24px;
-      height: 24px;
-      flex-shrink: 0;
-    }
-    after {
-      margin-left: 16px;
-      flex-shrink: 0;
-    }
-    info {
-      composes: theme-typography--body2 from global;
-      flex: 1;
-      line-height: 1.4;
-      display: flex;
-      flex-direction: column;
-      font-weight: 500;
-    }
-    description {
-      composes: theme-typography--caption from global;
-      line-height: 1.2;
-    }
+  main {
+    position: relative;
+    display: flex;
+    align-items: center;
+    padding: 8px;
+  }
+  before {
+    margin-right: 16px;
+    width: 24px;
+    height: 24px;
+    flex-shrink: 0;
+  }
+  after {
+    margin-left: 16px;
+    flex-shrink: 0;
+  }
+  info {
+    composes: theme-typography--body2 from global;
+    flex: 1;
+    line-height: 1.4;
+    display: flex;
+    flex-direction: column;
+    font-weight: 500;
+  }
+  description {
+    composes: theme-typography--caption from global;
+    line-height: 1.2;
+  }
 `;
 
 const RIPPLE_STYLES = css`
   cell {
     composes: theme-ripple from global;
-  } 
+  }
 `;
 
 export const Cell: React.FC<React.PropsWithChildren<Props>> = function Cell({
@@ -77,6 +76,6 @@ export const Cell: React.FC<React.PropsWithChildren<Props>> = function Cell({
         </info>
         <after>{after}</after>
       </main>
-    </cell>
+    </cell>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Code.tsx b/webapp/packages/core-blocks/src/Code.tsx
index b091c590f7..78067153c6 100644
--- a/webapp/packages/core-blocks/src/Code.tsx
+++ b/webapp/packages/core-blocks/src/Code.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 interface Props {
@@ -13,19 +12,17 @@ interface Props {
 }
 
 const styles = css`
-    code-container {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      padding: 16px;
-      border-radius: var(--theme-group-element-radius);
-    }
+  code-container {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    padding: 16px;
+    border-radius: var(--theme-group-element-radius);
+  }
 `;
 
 export const Code: React.FC<React.PropsWithChildren<Props>> = function Code({ children, className }) {
   return styled(styles)(
     <code-container className={className}>
-      <code>
-        {children}
-      </code>
-    </code-container>
+      <code>{children}</code>
+    </code-container>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ComplexLoader.tsx b/webapp/packages/core-blocks/src/ComplexLoader.tsx
index 13f83b0ec5..0d134feadb 100644
--- a/webapp/packages/core-blocks/src/ComplexLoader.tsx
+++ b/webapp/packages/core-blocks/src/ComplexLoader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { LoadingError } from '@cloudbeaver/core-utils';
 
 export interface IComplexLoaderData<T> {
@@ -65,7 +64,7 @@ export function createComplexLoader<T>(loader: () => Promise<T>): IComplexLoader
         this.data = await this.promise;
         return this.data;
       } catch (cause: any) {
-        this.error = new LoadingError(() => this.refresh(), 'Can\'t load element', { cause });
+        this.error = new LoadingError(() => this.refresh(), "Can't load element", { cause });
         throw this.error;
       }
     },
diff --git a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMask.tsx b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMask.tsx
index 576e4c1c90..b1790c0003 100644
--- a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMask.tsx
+++ b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMask.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionImageWithMaskSvg } from './ConnectionImageWithMaskSvg';
 import { ConnectionMark } from './ConnectionMark';
 
@@ -19,9 +18,7 @@ interface Props {
   className?: string;
 }
 
-export const ConnectionImageWithMask: React.FC<Props> = (
-  { icon, connected, maskId, size, markerRadius, paddingSize, className }
-) => (
+export const ConnectionImageWithMask: React.FC<Props> = ({ icon, connected, maskId, size, markerRadius, paddingSize, className }) => (
   <>
     <ConnectionImageWithMaskSvg
       icon={icon}
diff --git a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMaskSvg.tsx b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMaskSvg.tsx
index a3c25989c4..7906f0517a 100644
--- a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMaskSvg.tsx
+++ b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionImageWithMaskSvg.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { GlobalConstants, isValidUrl } from '@cloudbeaver/core-utils';
 
 interface Props {
@@ -18,9 +17,7 @@ interface Props {
   className?: string;
 }
 
-export const ConnectionImageWithMaskSvg: React.FC<Props> = (
-  { icon, connected, maskId, size = 16, markerRadius = 4, paddingSize = 0, className }
-) => {
+export const ConnectionImageWithMaskSvg: React.FC<Props> = ({ icon, connected, maskId, size = 16, markerRadius = 4, paddingSize = 0, className }) => {
   if (!icon) {
     return null;
   }
@@ -42,7 +39,14 @@ export const ConnectionImageWithMaskSvg: React.FC<Props> = (
       <mask id={maskId}>
         <rect fill="#fff" x="0" y="0" width={size} height={size} />
         <circle fill="#000" cx={circleParams.coordinate} cy={circleParams.coordinate} r={circleParams.radius} />
-        <rect fill="#000" x={rectParams.coordinate} y={rectParams.coordinate} width={rectParams.size} height={rectParams.size} mask={`url(#${maskId})`} />
+        <rect
+          fill="#000"
+          x={rectParams.coordinate}
+          y={rectParams.coordinate}
+          width={rectParams.size}
+          height={rectParams.size}
+          mask={`url(#${maskId})`}
+        />
       </mask>
       <image xlinkHref={url} width={size} height={size} mask={connected ? `url(#${maskId})` : undefined} />
     </svg>
diff --git a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.tsx b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.tsx
index d2cfbbe7c1..1f9ebb35a8 100644
--- a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.tsx
+++ b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.tsx
@@ -5,26 +5,25 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css, use } from 'reshadow';
 
 const styles = css`
-    status {
-      composes: theme-background-positive from global;
-      position: absolute;
-      opacity: 0;
-      transition: opacity 0.3s ease;
-      bottom: 0;
-      right: 0;
-      box-sizing: border-box;
-      width: 8px;
-      height: 8px;
-      border-radius: 50%;
+  status {
+    composes: theme-background-positive from global;
+    position: absolute;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+    bottom: 0;
+    right: 0;
+    box-sizing: border-box;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
 
-      &[|connected] {
-        opacity: 1;
-      }
+    &[|connected] {
+      opacity: 1;
     }
+  }
 `;
 
 interface Props {
@@ -33,7 +32,5 @@ interface Props {
 }
 
 export const ConnectionMark: React.FC<Props> = function ConnectionMark({ connected, className }) {
-  return styled(styles)(
-    <status {...use({ connected })} className={className} />
-  );
-};
\ No newline at end of file
+  return styled(styles)(<status {...use({ connected })} className={className} />);
+};
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 bdc4c75958..db39c41229 100644
--- a/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts
@@ -5,217 +5,234 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BASE_CONTAINERS_STYLES = css`
-    Group {
-      composes: theme-background-surface theme-text-on-surface from global;
+  Group {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  ColoredContainer {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  GroupSubTitle {
+    composes: theme-text-text-hint-on-light from global;
+  }
+  Container,
+  ColoredContainer,
+  Group {
+    display: flex;
+    flex-direction: row;
+    align-content: baseline;
+    position: relative;
+
+    &[hideEmpty]:empty {
+      display: none;
     }
-    ColoredContainer {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    GroupSubTitle {
-      composes: theme-text-text-hint-on-light from global;
-    }
-    Container, ColoredContainer, Group {
-      display: flex;
-      flex-direction: row;
-      align-content: baseline;
-      position: relative;
 
-      &[hideEmpty]:empty {
-        display: none;
+    &[vertical] {
+      flex-direction: column;
+      align-content: stretch;
+
+      & > :global(*) {
+        flex-basis: 0 !important;
       }
-
-      &[vertical] {
-        flex-direction: column;
-        align-content: stretch;
-
-        & > :global(*) {
-          flex-basis: 0 !important;
-        }
-        & > [keepSize] {
-          flex-basis: auto !important;
-        }
-      }
-
-      &[baseline] {
-        align-items: baseline;
-      }
-
-      &[flexStart]{
-        align-items: flex-start;
-      }
-
-      &[center] {
-        align-items: center;
-        justify-content: center;
-        align-content: center;
-      }
-
-      &[wrap] {
-        flex-wrap: wrap;
-      }
-
-      &[overflow] {
-        overflow: auto;
-      }
-
-      &[parent] {
-        padding: 24px;
-
-        &[compact] {
-          padding: 16px;
-        }
-
-        &[dense] {
-          padding: 8px;
-        }
-      }
-
-      &[gap] {
-        gap: 24px;
-
-        &[compact] {
-          gap: 16px;
-        }
-
-        &[dense] {
-          gap: 8px;
-        }
+      & > [keepSize] {
+        flex-basis: auto !important;
       }
     }
 
-    Group {
-      align-content: baseline;
-      box-sizing: border-box;
+    &[baseline] {
+      align-items: baseline;
+    }
+
+    &[flexStart] {
+      align-items: flex-start;
+    }
+
+    &[center] {
+      align-items: center;
+      justify-content: center;
+      align-content: center;
+    }
+
+    &[wrap] {
+      flex-wrap: wrap;
+    }
+
+    &[overflow] {
+      overflow: auto;
+    }
+
+    &[parent] {
       padding: 24px;
-      border-radius: var(--theme-group-element-radius);
+
+      &[compact] {
+        padding: 16px;
+      }
 
       &[dense] {
         padding: 8px;
       }
-
-      &[form] > :global(*) {
-        margin-right: 25%;
-      }
-
-      &[box] {
-        padding: 0;
-          overflow: hidden;
-      }
-
-      &[box="no-overflow"] {
-        padding: 0;
-        overflow: initial;
-      }
-
-      &[center] {
-        margin: 0 auto;
-      }
     }
 
-    Container, ColoredContainer, Group {
-      &[grid] {
-        display: grid;
+    &[gap] {
+      gap: 24px;
+
+      &[compact] {
+        gap: 16px;
       }
 
-      /* increase css specificity */
-      &[grid]:nth-child(n) {
-        flex-basis: unset;
-        max-width: unset;
-      }
-
-      &[grid][tiny] {
-        grid-template-columns: repeat(auto-fit, minmax(140px, max-content));
-      }
-
-      &[grid][small] {
-        grid-template-columns: repeat(auto-fit, minmax(260px, max-content));
-      }
-
-      &[grid][medium] {
-          grid-template-columns: repeat(auto-fit, minmax(460px, max-content));
-      }
-
-      &[grid][large] {
-        grid-template-columns: repeat(auto-fit, minmax(800px, max-content));
+      &[dense] {
+        gap: 8px;
       }
     }
+  }
 
-    Container, ColoredContainer, Group {
-      flex-wrap: wrap;
+  Group {
+    align-content: baseline;
+    box-sizing: border-box;
+    padding: 24px;
+    border-radius: var(--theme-group-element-radius);
+
+    &[dense] {
+      padding: 8px;
+    }
+
+    &[form] > :global(*) {
+      margin-right: 25%;
+    }
+
+    &[box] {
+      padding: 0;
+      overflow: hidden;
+    }
+
+    &[box='no-overflow'] {
+      padding: 0;
+      overflow: initial;
+    }
+
+    &[center] {
+      margin: 0 auto;
+    }
+  }
+
+  Container,
+  ColoredContainer,
+  Group {
+    &[grid] {
+      display: grid;
+    }
+
+    /* increase css specificity */
+    &[grid]:nth-child(n) {
+      flex-basis: unset;
+      max-width: unset;
+    }
+
+    &[grid][tiny] {
+      grid-template-columns: repeat(auto-fit, minmax(140px, max-content));
+    }
+
+    &[grid][small] {
+      grid-template-columns: repeat(auto-fit, minmax(260px, max-content));
+    }
+
+    &[grid][medium] {
+      grid-template-columns: repeat(auto-fit, minmax(460px, max-content));
+    }
+
+    &[grid][large] {
+      grid-template-columns: repeat(auto-fit, minmax(800px, max-content));
+    }
+  }
+
+  Container,
+  ColoredContainer,
+  Group {
+    flex-wrap: wrap;
+    flex: 1 1 100%;
+
+    & > :global(*) {
       flex: 1 1 100%;
-
-      & > :global(*) {
-        flex: 1 1 100%;
-      }
-
-      &[keepSize], & > [keepSize] {
-        flex-grow: 0;
-        flex-basis: 0;
-        flex-basis: auto; /* test for layout */
-      }
-
-      &[tiny], & > [tiny], &[grid][tiny] > * {
-        flex-basis: 140px;
-        max-width: 210px;
-      }
-
-      &[small], & > [small], &[grid][small] > * {
-        flex-basis: 260px;
-        max-width: 390px;
-      }
-
-      &[medium], & > [medium], &[grid][medium] > * {
-        flex-basis: 460px;
-        max-width: 640px;
-      }
-
-      &[large], & > [large], &[grid][large] > * {
-        flex-basis: 800px;
-        max-width: 800px;
-      }
-
-      &[maximum], & > [maximum], &[grid][maximum] > * {
-        max-width: 100%;
-      }
-
-      &[fill], & > [fill] {
-        max-width: none;
-      }
     }
 
-    GroupItem {
-      min-width: min-content;
+    &[keepSize],
+    & > [keepSize] {
+      flex-grow: 0;
+      flex-basis: 0;
+      flex-basis: auto; /* test for layout */
     }
 
-    GroupTitle {
-      composes: theme-typography--body2 from global;
-      font-weight: 400;
-      margin: 0;
-      text-transform: uppercase;
-      opacity: 0.9;
+    &[tiny],
+    & > [tiny],
+    &[grid][tiny] > * {
+      flex-basis: 140px;
+      max-width: 210px;
     }
 
-    Group[box] > GroupTitle {
-      padding: 24px;
+    &[small],
+    & > [small],
+    &[grid][small] > * {
+      flex-basis: 260px;
+      max-width: 390px;
     }
 
-    GroupSubTitle {
-      composes: theme-typography--caption from global;
-      display: block;
-      text-transform: none;
+    &[medium],
+    & > [medium],
+    &[grid][medium] > * {
+      flex-basis: 460px;
+      max-width: 640px;
     }
 
-    GroupClose {
-      width: 18px;
-      height: 18px;
-      cursor: pointer;
-      display: flex;
-      position: absolute;
-      right: 24px;
-      margin-right: 0 !important;
+    &[large],
+    & > [large],
+    &[grid][large] > * {
+      flex-basis: 800px;
+      max-width: 800px;
     }
-  `;
+
+    &[maximum],
+    & > [maximum],
+    &[grid][maximum] > * {
+      max-width: 100%;
+    }
+
+    &[fill],
+    & > [fill] {
+      max-width: none;
+    }
+  }
+
+  GroupItem {
+    min-width: min-content;
+  }
+
+  GroupTitle {
+    composes: theme-typography--body2 from global;
+    font-weight: 400;
+    margin: 0;
+    text-transform: uppercase;
+    opacity: 0.9;
+  }
+
+  Group[box] > GroupTitle {
+    padding: 24px;
+  }
+
+  GroupSubTitle {
+    composes: theme-typography--caption from global;
+    display: block;
+    text-transform: none;
+  }
+
+  GroupClose {
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    display: flex;
+    position: absolute;
+    right: 24px;
+    margin-right: 0 !important;
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx b/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
index 644f3a65f4..5c63682d6d 100644
--- a/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
+++ b/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
@@ -5,13 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 import { filterContainerFakeProps } from './filterContainerFakeProps';
 import type { IContainerProps } from './IContainerProps';
 
-export const ColoredContainer = forwardRef<HTMLDivElement, IContainerProps & React.HTMLAttributes<HTMLDivElement>>(function ColoredContainer(props, ref) {
+export const ColoredContainer = forwardRef<HTMLDivElement, IContainerProps & React.HTMLAttributes<HTMLDivElement>>(function ColoredContainer(
+  props,
+  ref,
+) {
   const divProps = filterContainerFakeProps(props);
 
   return <div ref={ref} {...divProps} />;
diff --git a/webapp/packages/core-blocks/src/Containers/Container.tsx b/webapp/packages/core-blocks/src/Containers/Container.tsx
index 137c9df907..906ef247be 100644
--- a/webapp/packages/core-blocks/src/Containers/Container.tsx
+++ b/webapp/packages/core-blocks/src/Containers/Container.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 import { filterContainerFakeProps } from './filterContainerFakeProps';
diff --git a/webapp/packages/core-blocks/src/Containers/Group.tsx b/webapp/packages/core-blocks/src/Containers/Group.tsx
index e5c03df696..586f2a263c 100644
--- a/webapp/packages/core-blocks/src/Containers/Group.tsx
+++ b/webapp/packages/core-blocks/src/Containers/Group.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 import { filterContainerFakeProps } from './filterContainerFakeProps';
@@ -17,12 +16,7 @@ interface Props extends IContainerProps {
   box?: boolean | 'no-overflow';
 }
 
-export const Group = forwardRef<HTMLDivElement, Props & React.HTMLAttributes<HTMLDivElement>>(function Group({
-  form,
-  center,
-  box,
-  ...rest
-}, ref) {
+export const Group = forwardRef<HTMLDivElement, Props & React.HTMLAttributes<HTMLDivElement>>(function Group({ form, center, box, ...rest }, ref) {
   const divProps = filterContainerFakeProps(rest);
 
   return <div ref={ref} {...divProps} />;
diff --git a/webapp/packages/core-blocks/src/Containers/GroupClose.tsx b/webapp/packages/core-blocks/src/Containers/GroupClose.tsx
index 16173ebd81..5f27032eed 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupClose.tsx
+++ b/webapp/packages/core-blocks/src/Containers/GroupClose.tsx
@@ -5,16 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Icon } from '../Icon';
 
 interface IProps {
   onClick?: () => void;
 }
 
-export const GroupClose: React.FC<IProps & React.HTMLAttributes<HTMLDivElement>> = function GroupClose({
-  onClick,
-  ...rest
-}) {
-  return <div {...rest}><Icon name="cross" viewBox="0 0 16 16" onClick={onClick} /></div>;
+export const GroupClose: React.FC<IProps & React.HTMLAttributes<HTMLDivElement>> = function GroupClose({ onClick, ...rest }) {
+  return (
+    <div {...rest}>
+      <Icon name="cross" viewBox="0 0 16 16" onClick={onClick} />
+    </div>
+  );
 };
diff --git a/webapp/packages/core-blocks/src/Containers/GroupItem.tsx b/webapp/packages/core-blocks/src/Containers/GroupItem.tsx
index 212e55d44d..9e3404d1af 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupItem.tsx
+++ b/webapp/packages/core-blocks/src/Containers/GroupItem.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { filterLayoutFakeProps } from './filterLayoutFakeProps';
 import type { ILayoutSizeProps } from './ILayoutSizeProps';
 
diff --git a/webapp/packages/core-blocks/src/Containers/GroupSubTitle.tsx b/webapp/packages/core-blocks/src/Containers/GroupSubTitle.tsx
index b90e1012ac..13e155ecc3 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupSubTitle.tsx
+++ b/webapp/packages/core-blocks/src/Containers/GroupSubTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { filterLayoutFakeProps } from './filterLayoutFakeProps';
 import type { ILayoutSizeProps } from './ILayoutSizeProps';
 
diff --git a/webapp/packages/core-blocks/src/Containers/GroupTitle.tsx b/webapp/packages/core-blocks/src/Containers/GroupTitle.tsx
index f63decd096..a622d1b383 100644
--- a/webapp/packages/core-blocks/src/Containers/GroupTitle.tsx
+++ b/webapp/packages/core-blocks/src/Containers/GroupTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { filterLayoutFakeProps } from './filterLayoutFakeProps';
 import type { ILayoutSizeProps } from './ILayoutSizeProps';
 
diff --git a/webapp/packages/core-blocks/src/Containers/IContainerProps.ts b/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
index 8ac6018928..5839ff3f47 100644
--- a/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
+++ b/webapp/packages/core-blocks/src/Containers/IContainerProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ILayoutSizeProps } from './ILayoutSizeProps';
 
 export interface IContainerProps extends ILayoutSizeProps {
diff --git a/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts b/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
index 4818f1db72..acb850f498 100644
--- a/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
+++ b/webapp/packages/core-blocks/src/Containers/filterContainerFakeProps.ts
@@ -5,26 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { filterLayoutFakeProps } from './filterLayoutFakeProps';
 import type { IContainerProps } from './IContainerProps';
 
 export function filterContainerFakeProps<T extends IContainerProps>(props: T): Omit<T, keyof IContainerProps> {
-  const {
-    hideEmpty,
-    flexStart,
-    baseline,
-    center,
-    vertical,
-    wrap,
-    overflow,
-    parent,
-    gap,
-    grid,
-    dense,
-    compact,
-    ...rest
-  } = filterLayoutFakeProps(props);
+  const { hideEmpty, flexStart, baseline, center, vertical, wrap, overflow, parent, gap, grid, dense, compact, ...rest } =
+    filterLayoutFakeProps(props);
 
   return rest as Omit<T, keyof IContainerProps>;
 }
diff --git a/webapp/packages/core-blocks/src/Containers/filterLayoutFakeProps.ts b/webapp/packages/core-blocks/src/Containers/filterLayoutFakeProps.ts
index ec547ad156..97d0a5d455 100644
--- a/webapp/packages/core-blocks/src/Containers/filterLayoutFakeProps.ts
+++ b/webapp/packages/core-blocks/src/Containers/filterLayoutFakeProps.ts
@@ -5,20 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ILayoutSizeProps } from './ILayoutSizeProps';
 
 export function filterLayoutFakeProps<T extends ILayoutSizeProps>(props: T): Omit<T, keyof ILayoutSizeProps> {
-  const {
-    keepSize,
-    tiny,
-    small,
-    medium,
-    large,
-    maximum,
-    fill,
-    ...rest
-  } = props;
+  const { keepSize, tiny, small, medium, large, maximum, fill, ...rest } = props;
 
   return rest;
 }
diff --git a/webapp/packages/core-blocks/src/DisplayError.tsx b/webapp/packages/core-blocks/src/DisplayError.tsx
index 08cf3c6338..f3d130246c 100644
--- a/webapp/packages/core-blocks/src/DisplayError.tsx
+++ b/webapp/packages/core-blocks/src/DisplayError.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type React from 'react';
 import styled, { css, use } from 'reshadow';
 
@@ -51,14 +50,7 @@ interface Props {
   styles?: ComponentStyle;
 }
 
-export const DisplayError: React.FC<React.PropsWithChildren<Props>> = function DisplayError({
-  root,
-  children,
-  error,
-  errorInfo,
-  className,
-  styles,
-}) {
+export const DisplayError: React.FC<React.PropsWithChildren<Props>> = function DisplayError({ root, children, error, errorInfo, className, styles }) {
   const stack = errorInfo?.componentStack || error?.stack;
 
   return styled(useStyles(style, styles))(
@@ -76,6 +68,6 @@ export const DisplayError: React.FC<React.PropsWithChildren<Props>> = function D
           </details>
         )}
       </error-inner-block>
-    </error>
+    </error>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ErrorBoundary.tsx b/webapp/packages/core-blocks/src/ErrorBoundary.tsx
index 973842c2e8..907e9b1eb6 100644
--- a/webapp/packages/core-blocks/src/ErrorBoundary.tsx
+++ b/webapp/packages/core-blocks/src/ErrorBoundary.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React, { ErrorInfo } from 'react';
 import styled, { css } from 'reshadow';
 
@@ -43,15 +42,9 @@ interface IState {
   exceptions: IErrorData[];
 }
 
-export class ErrorBoundary
-  extends React.Component<React.PropsWithChildren<Props>, IState>
-  implements IExceptionContext {
+export class ErrorBoundary extends React.Component<React.PropsWithChildren<Props>, IState> implements IExceptionContext {
   get canRefresh(): boolean {
-    return (
-      !!this.props.remount
-      || !!this.props.onRefresh
-      || this.state.exceptions.some(error => errorOf(error.error, LoadingError))
-    );
+    return !!this.props.remount || !!this.props.onRefresh || this.state.exceptions.some(error => errorOf(error.error, LoadingError));
   }
   constructor(props: Props) {
     super(props);
@@ -69,12 +62,15 @@ export class ErrorBoundary
       if (state.exceptions.some(data => data.error === error)) {
         return state;
       }
-      return ({
-        exceptions: [...state.exceptions, {
-          error,
-          errorInfo,
-        }],
-      });
+      return {
+        exceptions: [
+          ...state.exceptions,
+          {
+            error,
+            errorInfo,
+          },
+        ],
+      };
     });
   }
 
@@ -84,16 +80,18 @@ export class ErrorBoundary
     for (const errorData of this.state.exceptions) {
       if (root) {
         return styled(style)(
-          <DisplayError
-            className={className}
-            root={root}
-            error={errorData.error}
-            styles={styles}
-            errorInfo={errorData.errorInfo}
-          >
-            {onClose && <action><Button onClick={onClose}>Close</Button></action>}
-            {this.canRefresh && <action><Button onClick={this.refresh}>Refresh</Button></action>}
-          </DisplayError>
+          <DisplayError className={className} root={root} error={errorData.error} styles={styles} errorInfo={errorData.errorInfo}>
+            {onClose && (
+              <action>
+                <Button onClick={onClose}>Close</Button>
+              </action>
+            )}
+            {this.canRefresh && (
+              <action>
+                <Button onClick={this.refresh}>Refresh</Button>
+              </action>
+            )}
+          </DisplayError>,
         );
       } else {
         return (
@@ -110,11 +108,7 @@ export class ErrorBoundary
       }
     }
 
-    return (
-      <ErrorContext.Provider value={this}>
-        {children}
-      </ErrorContext.Provider>
-    );
+    return <ErrorContext.Provider value={this}>{children}</ErrorContext.Provider>;
   }
 
   private refresh() {
diff --git a/webapp/packages/core-blocks/src/ErrorContext.ts b/webapp/packages/core-blocks/src/ErrorContext.ts
index 5b59603a3a..c021ec932b 100644
--- a/webapp/packages/core-blocks/src/ErrorContext.ts
+++ b/webapp/packages/core-blocks/src/ErrorContext.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface IExceptionContext {
   catch(exception: Error): void;
 }
 
-export const ErrorContext = createContext<IExceptionContext | null>(null);
\ No newline at end of file
+export const ErrorContext = createContext<IExceptionContext | null>(null);
diff --git a/webapp/packages/core-blocks/src/ErrorMessage.test.tsx b/webapp/packages/core-blocks/src/ErrorMessage.test.tsx
index 9705a4ee69..d665b95b63 100644
--- a/webapp/packages/core-blocks/src/ErrorMessage.test.tsx
+++ b/webapp/packages/core-blocks/src/ErrorMessage.test.tsx
@@ -5,8 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
+import { screen } from '@testing-library/react';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
 import { createApp } from '@cloudbeaver/core-cli/tests/utils/createApp';
@@ -14,21 +14,17 @@ import { renderInApp } from '@cloudbeaver/core-cli/tests/utils/renderInApp';
 import { createGQLEndpoint } from '@cloudbeaver/core-root/mocks/createGQLEndpoint';
 import { mockAppInit } from '@cloudbeaver/core-root/mocks/mockAppInit';
 import { mockGraphQL } from '@cloudbeaver/core-root/mocks/mockGraphQL';
-import { screen } from '@testing-library/react';
 
 import { ErrorMessage } from './ErrorMessage';
 
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
 test('icons.svg#name', () => {
-  renderInApp(<ErrorMessage text='error' />, app);
+  renderInApp(<ErrorMessage text="error" />, app);
   expect(screen.getByText('error')).not.toBeNull();
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/ErrorMessage.tsx b/webapp/packages/core-blocks/src/ErrorMessage.tsx
index c7102d5e26..c771f390aa 100644
--- a/webapp/packages/core-blocks/src/ErrorMessage.tsx
+++ b/webapp/packages/core-blocks/src/ErrorMessage.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -20,7 +19,7 @@ const styles = css`
     align-items: center;
     border-radius: var(--theme-group-element-radius);
     height: 50px;
-    padding: 8px 12px;  
+    padding: 8px 12px;
   }
 
   IconOrImage {
@@ -52,27 +51,20 @@ interface Props {
   onShowDetails?: () => void;
 }
 
-export const ErrorMessage = observer<Props>(function ErrorMessage({
-  text,
-  className,
-  hasDetails,
-  onShowDetails,
-}) {
+export const ErrorMessage = observer<Props>(function ErrorMessage({ text, className, hasDetails, onShowDetails }) {
   const translate = useTranslate();
 
   return styled(styles)(
     <message className={className}>
       <IconOrImage icon="/icons/error_icon_sm.svg" />
-      <message-body title={text}>
-        {text}
-      </message-body>
+      <message-body title={text}>{text}</message-body>
       <message-actions>
         {hasDetails && (
-          <Button type='button' mod={['outlined']} onClick={onShowDetails}>
+          <Button type="button" mod={['outlined']} onClick={onShowDetails}>
             {translate('ui_errors_details')}
           </Button>
         )}
       </message-actions>
-    </message>
+    </message>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/ExceptionMessage.tsx b/webapp/packages/core-blocks/src/ExceptionMessage.tsx
index 3fbf4ca488..368213a19c 100644
--- a/webapp/packages/core-blocks/src/ExceptionMessage.tsx
+++ b/webapp/packages/core-blocks/src/ExceptionMessage.tsx
@@ -5,7 +5,6 @@
  * 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, use } from 'reshadow';
 
@@ -116,7 +115,15 @@ interface Props {
 }
 
 export const ExceptionMessage = observer<Props>(function ExceptionMessage({
-  name, message, exception = null, icon, inline, className, styles, onRetry, onClose,
+  name,
+  message,
+  exception = null,
+  icon,
+  inline,
+  className,
+  styles,
+  onRetry,
+  onClose,
 }) {
   const translate = useTranslate();
   const error = useErrorDetails(exception);
@@ -146,12 +153,12 @@ export const ExceptionMessage = observer<Props>(function ExceptionMessage({
             <error-message>{message}</error-message>
             <error-actions>
               {error.hasDetails && (
-                <Button type='button' mod={['outlined']} disabled={error.isOpen} onClick={error.open}>
+                <Button type="button" mod={['outlined']} disabled={error.isOpen} onClick={error.open}>
                   {translate('ui_errors_details')}
                 </Button>
               )}
               {onRetry && (
-                <Button type='button' mod={['unelevated']} onClick={onRetry}>
+                <Button type="button" mod={['unelevated']} onClick={onRetry}>
                   {translate('ui_processing_retry')}
                 </Button>
               )}
@@ -164,6 +171,6 @@ export const ExceptionMessage = observer<Props>(function ExceptionMessage({
           )}
         </>
       )}
-    </error>
+    </error>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts b/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
index b0407d7dd5..8876bd2e9b 100644
--- a/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const EXPANDABLE_FORM_STYLES = css`
@@ -16,4 +15,4 @@ export const EXPANDABLE_FORM_STYLES = css`
     text-transform: uppercase;
     opacity: 0.9;
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/core-blocks/src/Expand/Expandable.tsx b/webapp/packages/core-blocks/src/Expand/Expandable.tsx
index c345a6f9d0..8d393d024b 100644
--- a/webapp/packages/core-blocks/src/Expand/Expandable.tsx
+++ b/webapp/packages/core-blocks/src/Expand/Expandable.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef, ReactNode, useImperativeHandle } from 'react';
 import { Disclosure, DisclosureContent, DisclosureStateReturn, useDisclosureState } from 'reakit';
@@ -60,28 +59,24 @@ const styles = css`
   }
 `;
 
-export const Expandable = observer<Props, ExpandableState>(forwardRef(function Expandable({
-  label,
-  defaultExpanded,
-  disabled,
-  children,
-  style,
-}, ref) {
-  const disclosure = useDisclosureState({ visible: defaultExpanded ?? false });
+export const Expandable = observer<Props, ExpandableState>(
+  forwardRef(function Expandable({ label, defaultExpanded, disabled, children, style }, ref) {
+    const disclosure = useDisclosureState({ visible: defaultExpanded ?? false });
 
-  useImperativeHandle(ref, () => disclosure);
+    useImperativeHandle(ref, () => disclosure);
 
-  return styled(useStyles(styles, style))(
-    <>
-      <Disclosure {...disclosure} disabled={disabled}>
-        <expand-icon {...use({ expanded: disclosure.visible })}>
-          <IconOrImage icon='arrow' />
-        </expand-icon>
-        <expand-label as='h2'>{label}</expand-label>
-      </Disclosure>
-      <DisclosureContent {...disclosure}>
-        <>{children}</>
-      </DisclosureContent>
-    </>
-  );
-}));
\ No newline at end of file
+    return styled(useStyles(styles, style))(
+      <>
+        <Disclosure {...disclosure} disabled={disabled}>
+          <expand-icon {...use({ expanded: disclosure.visible })}>
+            <IconOrImage icon="arrow" />
+          </expand-icon>
+          <expand-label as="h2">{label}</expand-label>
+        </Disclosure>
+        <DisclosureContent {...disclosure}>
+          <>{children}</>
+        </DisclosureContent>
+      </>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorer.tsx b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorer.tsx
index 536bf039f2..f76a2a2a4c 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorer.tsx
+++ b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorer.tsx
@@ -5,20 +5,14 @@
  * 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 { FolderExplorerContext, IFolderExplorerContext } from './FolderExplorerContext';
 
-interface Props{
+interface Props {
   state: IFolderExplorerContext;
 }
 
-export const FolderExplorer = observer<React.PropsWithChildren<Props>>(function FolderExplorer({
-  state,
-  children,
-}) {
-  return (
-    <FolderExplorerContext.Provider value={state}>{children}</FolderExplorerContext.Provider>
-  );
+export const FolderExplorer = observer<React.PropsWithChildren<Props>>(function FolderExplorer({ state, children }) {
+  return <FolderExplorerContext.Provider value={state}>{children}</FolderExplorerContext.Provider>;
 });
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerContext.ts b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerContext.ts
index 05f125c080..b99aa4d6cc 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerContext.ts
+++ b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface IFolderExplorerOptions {
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerPath.tsx b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerPath.tsx
index 8f0daae043..7a11ad662f 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerPath.tsx
+++ b/webapp/packages/core-blocks/src/FolderExplorer/FolderExplorerPath.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
@@ -20,11 +19,7 @@ interface Props {
   className?: string;
 }
 
-export const FolderExplorerPath = observer<Props>(function FolderExplorerPath({
-  getName,
-  canSkip,
-  className,
-}) {
+export const FolderExplorerPath = observer<Props>(function FolderExplorerPath({ getName, canSkip, className }) {
   const context = useContext(FolderExplorerContext);
 
   if (!context) {
@@ -44,32 +39,12 @@ export const FolderExplorerPath = observer<Props>(function FolderExplorerPath({
     const path = context.state.fullPath.slice(0, i);
     const skipFolder = !canSkip || canSkip(folder);
 
-    if (
-      i === 0
-      || i === context.state.fullPath.length - 1
-      || !skipFolder
-      || context.state.fullPath.length < 5
-    ) {
+    if (i === 0 || i === context.state.fullPath.length - 1 || !skipFolder || context.state.fullPath.length < 5) {
       if (skip) {
-        pathElements.push(
-          <FolderName
-            key={i - 1}
-            path={path}
-            title={skipTitle}
-            short
-          />
-        );
+        pathElements.push(<FolderName key={i - 1} path={path} title={skipTitle} short />);
       }
 
-      pathElements.push(
-        <FolderName
-          key={i}
-          folder={folder}
-          path={path}
-          last={i === context.state.fullPath.length - 1}
-          getName={getName}
-        />
-      );
+      pathElements.push(<FolderName key={i} folder={folder} path={path} last={i === context.state.fullPath.length - 1} getName={getName} />);
       skip = false;
       skipTitle = '';
       continue;
@@ -79,15 +54,11 @@ export const FolderExplorerPath = observer<Props>(function FolderExplorerPath({
       if (skipTitle !== '') {
         skipTitle += ' > ';
       }
-      skipTitle += (getName?.(folder) || folder);
+      skipTitle += getName?.(folder) || folder;
       skip = true;
       continue;
     }
   }
 
-  return styled(folderExplorerStyles)(
-    <folder-explorer-path className={className}>
-      {pathElements}
-    </folder-explorer-path>
-  );
+  return styled(folderExplorerStyles)(<folder-explorer-path className={className}>{pathElements}</folder-explorer-path>);
 });
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/FolderName.tsx b/webapp/packages/core-blocks/src/FolderExplorer/FolderName.tsx
index dab81866b9..6edbd1cfc5 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/FolderName.tsx
+++ b/webapp/packages/core-blocks/src/FolderExplorer/FolderName.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
@@ -36,14 +35,7 @@ interface ShortProps extends BaseProps {
   short: boolean;
 }
 
-export const FolderName = observer<FolderProps | ShortProps>(function FolderName({
-  folder,
-  path,
-  title,
-  short,
-  last,
-  getName,
-}) {
+export const FolderName = observer<FolderProps | ShortProps>(function FolderName({ folder, path, title, short, last, getName }) {
   const context = useContext(FolderExplorerContext);
 
   if (!context) {
@@ -71,10 +63,8 @@ export const FolderName = observer<FolderProps | ShortProps>(function FolderName
         <Icon name="arrow" viewBox="0 0 16 16" />
       </folder-explorer-path-element-arrow>
       <folder-explorer-path-element-name>
-        {last
-          ? name
-          : <Link onClick={() => context.open(path, folder!)}>{name}</Link>}
+        {last ? name : <Link onClick={() => context.open(path, folder!)}>{name}</Link>}
       </folder-explorer-path-element-name>
-    </folder-explorer-path-element>
+    </folder-explorer-path-element>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/folderExplorerStyles.ts b/webapp/packages/core-blocks/src/FolderExplorer/folderExplorerStyles.ts
index b73c0c5602..e6dd4adf51 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/folderExplorerStyles.ts
+++ b/webapp/packages/core-blocks/src/FolderExplorer/folderExplorerStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const folderExplorerStyles = css`
@@ -33,8 +32,8 @@ export const folderExplorerStyles = css`
     text-overflow: ellipsis;
     padding: 0 4px;
   }
-  
+
   folder-explorer-path-element:first-child folder-explorer-path-element-arrow {
-    display: none
+    display: none;
   }
 `;
diff --git a/webapp/packages/core-blocks/src/FolderExplorer/useFolderExplorer.ts b/webapp/packages/core-blocks/src/FolderExplorer/useFolderExplorer.ts
index e1aba0742d..f866859472 100644
--- a/webapp/packages/core-blocks/src/FolderExplorer/useFolderExplorer.ts
+++ b/webapp/packages/core-blocks/src/FolderExplorer/useFolderExplorer.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, observable } from 'mobx';
 import { useContext, useMemo } from 'react';
 
@@ -23,40 +22,42 @@ export function useFolderExplorer(root: string, options: IFolderExplorerOptions
       fullPath: [root],
       folder: root,
     }),
-    () => { },
-    data => (
-      typeof data === 'object'
-      && typeof data.folder === 'string'
-      && Array.isArray(data.path)
-      && Array.isArray(data.fullPath)
-    )
+    () => {},
+    data => typeof data === 'object' && typeof data.folder === 'string' && Array.isArray(data.path) && Array.isArray(data.fullPath),
   );
 
-  useMemo(action(() => {
-    if (!options.saveState) {
-      userState.folder = root;
-      userState.fullPath = [root];
-      userState.path = [];
-    }
-  }), [userState]);
+  useMemo(
+    action(() => {
+      if (!options.saveState) {
+        userState.folder = root;
+        userState.fullPath = [root];
+        userState.path = [];
+      }
+    }),
+    [userState],
+  );
 
-  const data = useObservableRef<IFolderExplorerContext>(() => ({
-    root,
-    options,
-    open(path: string[], folder: string) {
-      this.state.path = path.slice();
-      this.state.fullPath = [...path, folder];
-      this.state.folder = folder;
+  const data = useObservableRef<IFolderExplorerContext>(
+    () => ({
+      root,
+      options,
+      open(path: string[], folder: string) {
+        this.state.path = path.slice();
+        this.state.fullPath = [...path, folder];
+        this.state.folder = folder;
+      },
+    }),
+    {
+      root: observable,
+      state: observable.ref,
+      options: observable.ref,
+      open: action.bound,
     },
-  }), {
-    root: observable,
-    state: observable.ref,
-    options: observable.ref,
-    open: action.bound,
-  }, {
-    state: userState,
-    root,
-  });
+    {
+      state: userState,
+      root,
+    },
+  );
 
   return context || data;
 }
diff --git a/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts b/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts
index f68095b6b8..1f29199361 100644
--- a/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts
+++ b/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts
@@ -5,51 +5,51 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BASE_DROPDOWN_STYLES = css`
-    MenuItem {
-      composes: theme-ripple from global;
-    }
+  MenuItem {
+    composes: theme-ripple from global;
+  }
 
-    Menu {
-      composes: theme-text-on-surface theme-background-surface theme-typography--caption theme-elevation-z3 from global;
+  Menu {
+    composes: theme-text-on-surface theme-background-surface theme-typography--caption theme-elevation-z3 from global;
+    display: flex;
+    flex-direction: column;
+    max-height: 300px;
+    overflow: auto;
+    outline: none;
+    z-index: 999;
+    border-radius: var(--theme-form-element-radius);
+
+    & MenuItem {
+      background: transparent;
       display: flex;
-      flex-direction: column;
-      max-height: 300px;
-      overflow: auto;
+      flex-direction: row;
+      align-items: center;
+      padding: 8px 12px;
+      text-align: left;
       outline: none;
-      z-index: 999;
-      border-radius: var(--theme-form-element-radius);
+      color: inherit;
+      cursor: pointer;
+      gap: 8px;
 
-      & MenuItem {
-        background: transparent;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        padding: 8px 12px;
-        text-align: left;
-        outline: none;
-        color: inherit;
-        cursor: pointer;
-        gap: 8px;
+      & item-icon,
+      & item-title {
+        position: relative;
+      }
 
-        & item-icon, & item-title {
-          position: relative;
+      & item-icon {
+        width: 16px;
+        height: 16px;
+        overflow: hidden;
+        flex-shrink: 0;
+
+        & IconOrImage {
+          width: 100%;
+          height: 100%;
         }
-
-        & item-icon {
-          width: 16px;
-          height: 16px;
-          overflow: hidden;
-          flex-shrink: 0;
-
-          & IconOrImage {
-            width: 100%;
-            height: 100%;
-          }
-        } 
       }
     }
-  `;
\ No newline at end of file
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
index ba16e510dd..3063872aca 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
@@ -5,7 +5,6 @@
  * 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 type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -23,12 +22,16 @@ export interface CheckboxBaseProps {
   style?: ComponentStyle;
 }
 
-export type CheckboxInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'type' | 'value' | 'defaultValue' | 'checked' | 'defaultChecked' | 'style'> & ILayoutSizeProps & {
-  value?: string;
-  defaultValue?: string;
-  defaultChecked?: boolean;
-  label?: string;
-};
+export type CheckboxInputProps = Omit<
+  React.InputHTMLAttributes<HTMLInputElement>,
+  'onChange' | 'type' | 'value' | 'defaultValue' | 'checked' | 'defaultChecked' | 'style'
+> &
+  ILayoutSizeProps & {
+    value?: string;
+    defaultValue?: string;
+    defaultChecked?: boolean;
+    label?: string;
+  };
 
 export interface ICheckboxControlledProps extends CheckboxInputProps {
   state?: never;
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
index 467cd550b4..42c8ef1868 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useLayoutEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
@@ -37,55 +36,55 @@ const checkboxStyles = css`
   checkbox-ripple {
     composes: theme-checkbox__ripple from global;
   }
-    checkbox-container {
-      display: flex;
-      align-items: center;
-    }
-    checkbox-label {
-      composes: theme-typography--body2 from global;
-      cursor: pointer;
-    }
-  `;
+  checkbox-container {
+    display: flex;
+    align-items: center;
+  }
+  checkbox-label {
+    composes: theme-typography--body2 from global;
+    cursor: pointer;
+  }
+`;
 
 const checkboxMod: Record<CheckboxMod, any> = {
   primary: css`
-      checkbox {
-        composes: theme-checkbox_primary from global;
-      }
-    `,
+    checkbox {
+      composes: theme-checkbox_primary from global;
+    }
+  `,
   surface: css`
-      checkbox {
-        composes: theme-checkbox_surface from global;
-      }
-    `,
+    checkbox {
+      composes: theme-checkbox_surface from global;
+    }
+  `,
   small: css`
-      checkbox {
-        composes: theme-checkbox_small from global;
+    checkbox {
+      composes: theme-checkbox_small from global;
+    }
+    checkbox-container {
+      & checkbox {
+        width: 14px;
+        height: 14px;
       }
-      checkbox-container {
-        & checkbox {
-          width: 14px;
-          height: 14px;
-        }
-        & checkbox-background {
-          width: 14px;
-          height: 14px;
-        }
+      & checkbox-background {
+        width: 14px;
+        height: 14px;
       }
-    `,
+    }
+  `,
 };
 
 const checkboxState = {
   disabled: css`
-      checkbox {
-        composes: theme-checkbox--disabled from global;
-      }
-    `,
+    checkbox {
+      composes: theme-checkbox--disabled from global;
+    }
+  `,
   checked: css`
-      checkbox {
-        composes: theme-checkbox--checked from global;
-      }
-    `,
+    checkbox {
+      composes: theme-checkbox--checked from global;
+    }
+  `,
 };
 
 interface ICheckboxMarkupProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'style'> {
@@ -97,7 +96,16 @@ interface ICheckboxMarkupProps extends Omit<React.InputHTMLAttributes<HTMLInputE
 }
 
 export const CheckboxMarkup: React.FC<ICheckboxMarkupProps> = function CheckboxMarkup({
-  id, label, indeterminate, className, title, mod = ['primary'], ripple = true, style, readOnly, ...rest
+  id,
+  label,
+  indeterminate,
+  className,
+  title,
+  mod = ['primary'],
+  ripple = true,
+  style,
+  readOnly,
+  ...rest
 }) {
   const checkboxRef = useRef<HTMLInputElement>(null);
 
@@ -113,30 +121,25 @@ export const CheckboxMarkup: React.FC<ICheckboxMarkupProps> = function CheckboxM
       ...(mod || []).map(mod => checkboxMod[mod]),
       rest.disabled && checkboxState.disabled,
       rest.checked && checkboxState.checked,
-      style
-    )
+      style,
+    ),
   )(
     <checkbox-container className={className} title={title}>
       <checkbox>
-        <checkbox-input
-          ref={checkboxRef}
-          as='input'
-          type='checkbox'
-          {...rest}
-          disabled={rest.disabled || readOnly}
-          id={id || rest.name}
-        />
+        <checkbox-input ref={checkboxRef} as="input" type="checkbox" {...rest} disabled={rest.disabled || readOnly} id={id || rest.name} />
         <checkbox-background>
-          <checkbox-checkmark as='svg' viewBox='0 0 24 24'>
-            <checkbox-checkmark-path as='path' fill='none' d='M1.73,12.91 8.1,19.28 22.79,4.59' />
+          <checkbox-checkmark as="svg" viewBox="0 0 24 24">
+            <checkbox-checkmark-path as="path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59" />
           </checkbox-checkmark>
           <checkbox-mixedmark />
         </checkbox-background>
-        {ripple && (
-          <checkbox-ripple />
-        )}
+        {ripple && <checkbox-ripple />}
       </checkbox>
-      {label && (id || rest.name) && <checkbox-label as='label' htmlFor={id || rest.name}>{label}</checkbox-label>}
-    </checkbox-container>
+      {label && (id || rest.name) && (
+        <checkbox-label as="label" htmlFor={id || rest.name}>
+          {label}
+        </checkbox-label>
+      )}
+    </checkbox-container>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index 843d7946c0..e78b506ca6 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { useStyles } from '../../useStyles';
@@ -30,7 +29,7 @@ const style = css`
     }
   }
   field-label {
-      composes: theme-typography--body2 from global;
+    composes: theme-typography--body2 from global;
   }
   Checkbox[disabled] + field-label {
     cursor: auto;
@@ -51,13 +50,9 @@ export const FieldCheckbox: CheckboxType = function FieldCheckbox({
   return styled(styles)(
     <field className={className}>
       <Checkbox {...(rest as CheckboxBaseProps & ICheckboxControlledProps)} />
-      <field-label
-        htmlFor={rest.id || rest.name}
-        title={rest.title}
-        as="label"
-      >
+      <field-label htmlFor={rest.id || rest.name} title={rest.title} as="label">
         {children}
       </field-label>
-    </field>
+    </field>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
index 85c6d23f70..974f739cde 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx
@@ -5,12 +5,9 @@
  * 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 { filterLayoutFakeProps } from '../../Containers/filterLayoutFakeProps';
 import { useStyles } from '../../useStyles';
 import { baseFormControlStyles, baseValidFormControlStyles } from '../baseFormControlStyles';
@@ -19,72 +16,72 @@ import type { ICheckboxControlledProps, ICheckboxObjectProps } from './Checkbox'
 import { useCheckboxState } from './useCheckboxState';
 
 const switchStyles = css`
-switch-control {
-  composes: theme-switch from global;
-}
-switch-control-track {
-  composes: theme-switch__track from global;
-}
-switch-input {
-  composes: theme-switch_native-control from global;
-}
-switch-control-underlay {
-  composes: theme-switch__thumb-underlay from global;
-}
-switch-control-thumb {
-  composes: theme-switch__thumb from global;
-}
-radio-ripple {
-  composes: theme-radio_ripple from global;
-}
-    switch-body {
-      display: flex;
-      align-items: center;
-    }
-    switch-body {
-      composes: theme-typography--body1 from global;
-    }
-    switch-body field-label {
-      cursor: pointer;
-      user-select: none;
-      display: block;
-      padding-left: 18px;
-      min-width: 50px;
-      white-space: pre-wrap;
-      font-weight: 500;
-    }
-  `;
+  switch-control {
+    composes: theme-switch from global;
+  }
+  switch-control-track {
+    composes: theme-switch__track from global;
+  }
+  switch-input {
+    composes: theme-switch_native-control from global;
+  }
+  switch-control-underlay {
+    composes: theme-switch__thumb-underlay from global;
+  }
+  switch-control-thumb {
+    composes: theme-switch__thumb from global;
+  }
+  radio-ripple {
+    composes: theme-radio_ripple from global;
+  }
+  switch-body {
+    display: flex;
+    align-items: center;
+  }
+  switch-body {
+    composes: theme-typography--body1 from global;
+  }
+  switch-body field-label {
+    cursor: pointer;
+    user-select: none;
+    display: block;
+    padding-left: 18px;
+    min-width: 50px;
+    white-space: pre-wrap;
+    font-weight: 500;
+  }
+`;
 
 const switchMod = {
   primary: css`
-      switch-control {
-        composes: theme-switch_primary from global;
-      }
-    `,
+    switch-control {
+      composes: theme-switch_primary from global;
+    }
+  `,
   dense: css`
-      switch-body {
-        composes: theme-switch_dense from global;
-      }
-      field-label {
-        composes: theme-typography--body2 from global;
-      }
-      switch-body field-label {
-        font-weight: initial;
-      }
-    `,
+    switch-body {
+      composes: theme-switch_dense from global;
+    }
+    field-label {
+      composes: theme-typography--body2 from global;
+    }
+    switch-body field-label {
+      font-weight: initial;
+    }
+  `,
 };
 
 const switchState = {
   disabled: css`
-      switch-control {
-        composes: theme-switch--disabled mdc-switch--disabled from global;
-      }
-    `,
+    switch-control {
+      composes: theme-switch--disabled mdc-switch--disabled from global;
+    }
+  `,
   checked: css`
-      switch-control {
-        composes: theme-switch--checked mdc-switch--checked from global;
-      }
-    `,
+    switch-control {
+      composes: theme-switch--checked mdc-switch--checked from global;
+    }
+  `,
 };
 
 interface IBaseProps {
@@ -130,7 +127,7 @@ export const Switch: SwitchType = observer(function Switch({
     switchStyles,
     ...mod.map(mod => switchMod[mod]),
     disabled && switchState.disabled,
-    checkboxState.checked && switchState.checked
+    checkboxState.checked && switchState.checked,
   );
 
   if (autoHide && !isControlPresented(name, state)) {
@@ -145,7 +142,7 @@ export const Switch: SwitchType = observer(function Switch({
           <switch-control-underlay>
             <switch-control-thumb />
             <switch-input
-              as='input'
+              as="input"
               {...rest}
               type="checkbox"
               id={id || value || name}
@@ -157,9 +154,11 @@ export const Switch: SwitchType = observer(function Switch({
             />
           </switch-control-underlay>
         </switch-control>
-        <field-label as="label" htmlFor={id || value || name}>{children}</field-label>
+        <field-label as="label" htmlFor={id || value || name}>
+          {children}
+        </field-label>
       </switch-body>
       {description && <field-description>{description}</field-description>}
-    </field>
+    </field>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
index 460bcbed33..dfd7700304 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext, useState } from 'react';
 
 import { useObjectRef } from '../../useObjectRef';
@@ -19,16 +18,16 @@ export type CheckboxStateOptions<TKey extends string> = {
   checked: boolean | undefined;
   defaultChecked: boolean | undefined;
 } & (
-  {
-    state: undefined;
-    name: string | undefined;
-    onChange: CheckboxOnChangeEvent<string | undefined> | undefined;
-  }
   | {
-    state: Record<TKey, boolean | undefined | null | string | string[]> | undefined;
-    name: TKey;
-    onChange: CheckboxOnChangeEvent<TKey> | undefined;
-  }
+      state: undefined;
+      name: string | undefined;
+      onChange: CheckboxOnChangeEvent<string | undefined> | undefined;
+    }
+  | {
+      state: Record<TKey, boolean | undefined | null | string | string[]> | undefined;
+      name: TKey;
+      onChange: CheckboxOnChangeEvent<TKey> | undefined;
+    }
 );
 
 interface ICheckboxState {
@@ -57,35 +56,39 @@ export function useCheckboxState<TKey extends string>(options: CheckboxStateOpti
     }
   }
 
-  return useObjectRef<ICheckboxState>(() => ({
-    checked,
-    change(event: React.ChangeEvent<HTMLInputElement>) {
-      const { state, name, value, onChange, count, context } = optionsRef;
-      const checked = event.target.checked;
+  return useObjectRef<ICheckboxState>(
+    () => ({
+      checked,
+      change(event: React.ChangeEvent<HTMLInputElement>) {
+        const { state, name, value, onChange, count, context } = optionsRef;
+        const checked = event.target.checked;
 
-      if (state !== undefined && name !== undefined) {
-        const currentState = state[name as TKey];
+        if (state !== undefined && name !== undefined) {
+          const currentState = state[name as TKey];
 
-        if (typeof value === 'string') {
-          if (Array.isArray(currentState)) {
-            const elementIndex = currentState.indexOf(value);
-            if (checked && elementIndex === -1) {
-              currentState.push(value);
-            } else if (elementIndex !== -1) {
-              currentState.splice(elementIndex, 1);
+          if (typeof value === 'string') {
+            if (Array.isArray(currentState)) {
+              const elementIndex = currentState.indexOf(value);
+              if (checked && elementIndex === -1) {
+                currentState.push(value);
+              } else if (elementIndex !== -1) {
+                currentState.splice(elementIndex, 1);
+              }
+            } else {
+              state[name as TKey] = value;
             }
           } else {
-            state[name as TKey] = value;
+            state[name as TKey] = checked;
           }
-        } else {
-          state[name as TKey] = checked;
         }
-      }
 
-      onChange?.(checked, name as TKey);
-      context?.change(checked, name);
+        onChange?.(checked, name as TKey);
+        context?.change(checked, name);
 
-      refresh(count + 1);
-    },
-  }), { checked }, ['change']);
+        refresh(count + 1);
+      },
+    }),
+    { checked },
+    ['change'],
+  );
 }
diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
index 8a2a16f46f..520a125bf1 100644
--- a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
@@ -5,10 +5,9 @@
  * 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 { useLayoutEffect, useCallback, useState, useRef, useContext, useEffect } from 'react';
-import { useMenuState, Menu, MenuItem, MenuButton } from 'reakit/Menu';
+import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { Menu, MenuButton, MenuItem, useMenuState } from 'reakit/Menu';
 import styled, { css, use } from 'reshadow';
 
 import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps';
@@ -23,131 +22,134 @@ import { baseFormControlStyles, baseValidFormControlStyles } from './baseFormCon
 import { FormContext } from './FormContext';
 
 const styles = css`
-    field[|inline] {
-      display: flex;
-      align-items: center;
+  field[|inline] {
+    display: flex;
+    align-items: center;
 
-      & field-label {
-        padding-right: 8px;
-        padding-bottom: 0;
-      }
+    & field-label {
+      padding-right: 8px;
+      padding-bottom: 0;
     }
-    field input {
-      margin: 0;
+  }
+  field input {
+    margin: 0;
+  }
+  field-label {
+    display: block;
+    padding-bottom: 10px;
+    composes: theme-typography--body1 from global;
+    font-weight: 500;
+  }
+  input {
+    padding-right: 24px !important;
+  }
+  MenuButton {
+    position: absolute;
+    right: 0;
+    background: transparent;
+    outline: none;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    padding: 0 8px 0 0;
+    cursor: pointer;
+    &:hover,
+    &:focus {
+      opacity: 0.7;
     }
-    field-label {
-      display: block;
-      padding-bottom: 10px;
-      composes: theme-typography--body1 from global;
-      font-weight: 500;
-    }
-    input {
-      padding-right: 24px !important;
-    }
-    MenuButton {
-      position: absolute;
-      right: 0;
+  }
+  MenuItem {
+    composes: theme-ripple from global;
+  }
+
+  Menu {
+    composes: theme-text-on-surface theme-background-surface theme-typography--caption theme-elevation-z3 from global;
+    display: flex;
+    flex-direction: column;
+    max-height: 300px;
+    overflow: auto;
+    outline: none;
+    z-index: 999;
+    border-radius: var(--theme-form-element-radius);
+
+    & MenuItem {
       background: transparent;
-      outline: none;
       display: flex;
+      flex-direction: row;
       align-items: center;
-      height: 100%;
-      padding: 0 8px 0 0;
+      padding: 8px 12px;
+      text-align: left;
+      outline: none;
+      color: inherit;
       cursor: pointer;
-      &:hover, &:focus {
-        opacity: 0.7;
+      gap: 8px;
+
+      & item-icon,
+      & item-title {
+        position: relative;
       }
-    }
-    MenuItem {
-      composes: theme-ripple from global;
-    }
 
-    Menu {
-      composes: theme-text-on-surface theme-background-surface theme-typography--caption theme-elevation-z3 from global;
-      display: flex;
-      flex-direction: column;
-      max-height: 300px;
-      overflow: auto;
-      outline: none;
-      z-index: 999;
-      border-radius: var(--theme-form-element-radius);
+      & item-icon {
+        width: 16px;
+        height: 16px;
+        overflow: hidden;
+        flex-shrink: 0;
 
-      & MenuItem {
-        background: transparent;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        padding: 8px 12px;
-        text-align: left;
-        outline: none;
-        color: inherit;
-        cursor: pointer;
-        gap: 8px;
-
-        & item-icon, & item-title {
-          position: relative;
-        }
-
-        & item-icon {
-          width: 16px;
-          height: 16px;
-          overflow: hidden;
-          flex-shrink: 0;
-
-          & IconOrImage {
-            width: 100%;
-            height: 100%;
-          }
+        & IconOrImage {
+          width: 100%;
+          height: 100%;
         }
       }
     }
-    Icon {
+  }
+  Icon {
+    height: 16px;
+    display: block;
+  }
+  MenuButton Icon[|focus] {
+    transform: rotate(180deg);
+  }
+  input-box {
+    flex: 1;
+    position: relative;
+    display: flex;
+    align-items: center;
+
+    & input-icon {
+      position: absolute;
+      left: 0;
+      width: 16px;
       height: 16px;
-      display: block;
-    }
-    MenuButton Icon[|focus] {
-      transform: rotate(180deg);
-    }
-    input-box {
-      flex: 1;
-      position: relative;
-      display: flex;
-      align-items: center;
+      margin-left: 12px;
 
-      & input-icon {
-          position: absolute;
-          left: 0;
-          width: 16px;
-          height: 16px;
-          margin-left: 12px;
+      & IconOrImage {
+        width: 100%;
+        height: 100%;
+      }
 
-          & IconOrImage {
-            width: 100%;
-            height: 100%;
-          }
-
-          &:not(:empty) + input {
-            padding-left: 34px !important;
-          }
+      &:not(:empty) + input {
+        padding-left: 34px !important;
       }
     }
-  `;
+  }
+`;
 
-type BaseProps<TKey, TValue> = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'onSelect' | 'name' | 'value' | 'defaultValue'> & ILayoutSizeProps & {
-  propertyName?: string;
-  items: TValue[];
-  searchable?: boolean;
-  defaultValue?: TKey;
-  loading?: boolean;
-  description?: string;
-  keySelector?: (item: TValue, index: number) => TKey;
-  valueSelector?: (item: TValue) => string;
-  titleSelector?: (item: TValue) => string | undefined;
-  iconSelector?: (item: TValue) => string | React.ReactElement | undefined;
-  isDisabled?: (item: TValue) => boolean;
-  onSwitch?: (state: boolean) => void;
-  inline?: boolean;
-};
+type BaseProps<TKey, TValue> = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'onSelect' | 'name' | 'value' | 'defaultValue'> &
+  ILayoutSizeProps & {
+    propertyName?: string;
+    items: TValue[];
+    searchable?: boolean;
+    defaultValue?: TKey;
+    loading?: boolean;
+    description?: string;
+    keySelector?: (item: TValue, index: number) => TKey;
+    valueSelector?: (item: TValue) => string;
+    titleSelector?: (item: TValue) => string | undefined;
+    iconSelector?: (item: TValue) => string | React.ReactElement | undefined;
+    isDisabled?: (item: TValue) => boolean;
+    onSwitch?: (state: boolean) => void;
+    inline?: boolean;
+  };
 
 type ControlledProps<TKey, TValue> = BaseProps<TKey, TValue> & {
   name?: string;
@@ -191,7 +193,7 @@ export const Combobox: ComboboxType = observer(function Combobox({
   iconSelector,
   titleSelector,
   isDisabled,
-  onChange = () => { },
+  onChange = () => {},
   onSelect,
   onSwitch,
   ...rest
@@ -217,9 +219,7 @@ export const Combobox: ComboboxType = observer(function Combobox({
   const [searchValue, setSearchValue] = useState<string | null>(null);
 
   const filteredItems = getComputed(() => {
-    const result = items.filter(
-      item => !searchValue || valueSelector(item).toUpperCase().includes(searchValue.toUpperCase())
-    );
+    const result = items.filter(item => !searchValue || valueSelector(item).toUpperCase().includes(searchValue.toUpperCase()));
 
     if (isDisabled) {
       return result.sort((a, b) => Number(isDisabled(a)) - Number(isDisabled(b)));
@@ -252,61 +252,73 @@ export const Combobox: ComboboxType = observer(function Combobox({
     }
   }
 
-  const handleChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.target.value;
-    onChange(value, name);
-    setSearchValue(value);
-  }, [name, onChange]);
+  const handleChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      const value = event.target.value;
+      onChange(value, name);
+      setSearchValue(value);
+    },
+    [name, onChange],
+  );
 
-  const handleSelect = useCallback((id: any) => {
-    id = id ?? value ?? '';
-    const changed = id !== value;
+  const handleSelect = useCallback(
+    (id: any) => {
+      id = id ?? value ?? '';
+      const changed = id !== value;
 
-    menu.hide();
-    if (state && changed) {
-      state[name] = id;
-    }
-    if (onSelect && changed) {
-      onSelect(id, name, value);
-    }
-    if (context && changed) {
-      context.change(id, name);
-    }
-    setSearchValue(null);
-  }, [value, state, name, menu, context, onSelect]);
-
-  const matchItems = useCallback((input?: boolean) => {
-    if (searchValue === null) {
-      return;
-    }
-
-    if (filteredItems.length === 0) {
-      setSearchValue(null);
-      return;
-    }
-
-    const filteredItemIndex = items.indexOf(filteredItems[0]);
-
-    if (filteredItems.length === 1) {
-      handleSelect(keySelector(filteredItems[0], filteredItemIndex));
-      return;
-    }
-
-    if (filteredItems.length > 0) {
-      if (input) {
-        handleSelect(keySelector(filteredItems[0], filteredItemIndex));
-      } else {
-        setSearchValue(null);
+      menu.hide();
+      if (state && changed) {
+        state[name] = id;
       }
-    }
-  }, [items, filteredItems, keySelector, handleSelect, searchValue]);
+      if (onSelect && changed) {
+        onSelect(id, name, value);
+      }
+      if (context && changed) {
+        context.change(id, name);
+      }
+      setSearchValue(null);
+    },
+    [value, state, name, menu, context, onSelect],
+  );
 
-  const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Enter') {
-      event.preventDefault();
-      matchItems(true);
-    }
-  }, [matchItems]);
+  const matchItems = useCallback(
+    (input?: boolean) => {
+      if (searchValue === null) {
+        return;
+      }
+
+      if (filteredItems.length === 0) {
+        setSearchValue(null);
+        return;
+      }
+
+      const filteredItemIndex = items.indexOf(filteredItems[0]);
+
+      if (filteredItems.length === 1) {
+        handleSelect(keySelector(filteredItems[0], filteredItemIndex));
+        return;
+      }
+
+      if (filteredItems.length > 0) {
+        if (input) {
+          handleSelect(keySelector(filteredItems[0], filteredItemIndex));
+        } else {
+          setSearchValue(null);
+        }
+      }
+    },
+    [items, filteredItems, keySelector, handleSelect, searchValue],
+  );
+
+  const handleKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLInputElement>) => {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        matchItems(true);
+      }
+    },
+    [matchItems],
+  );
 
   useEffect(() => {
     if (inputRef === document.activeElement) {
@@ -353,16 +365,15 @@ export const Combobox: ComboboxType = observer(function Combobox({
 
   return styled(useStyles(baseFormControlStyles, baseValidFormControlStyles, styles))(
     <field className={className} {...use({ inline })}>
-      {children && <field-label title={title}>{children}{rest.required && ' *'}</field-label>}
+      {children && (
+        <field-label title={title}>
+          {children}
+          {rest.required && ' *'}
+        </field-label>
+      )}
       <input-box>
         {(icon || loading) && (
-          <input-icon>
-            {loading ? (
-              <Loader small fullSize />
-            ) : (
-              typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon
-            )}
-          </input-icon>
+          <input-icon>{loading ? <Loader small fullSize /> : typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon}</input-icon>
         )}
         <input
           ref={setInputRef}
@@ -391,13 +402,12 @@ export const Combobox: ComboboxType = observer(function Combobox({
           // unstable_initialFocusRef={ref}
           modal
         >
-          {!filteredItems.length
-            ? (
-              <MenuItem id='placeholder' disabled {...menu}>
-                {translate('combobox_no_results_placeholder')}
-              </MenuItem>
-            )
-            : (filteredItems.map((item, index) => {
+          {!filteredItems.length ? (
+            <MenuItem id="placeholder" disabled {...menu}>
+              {translate('combobox_no_results_placeholder')}
+            </MenuItem>
+          ) : (
+            filteredItems.map((item, index) => {
               const icon = iconSelector?.(item);
               const title = titleSelector?.(item);
               const disabled = isDisabled?.(item);
@@ -406,28 +416,21 @@ export const Combobox: ComboboxType = observer(function Combobox({
                 <MenuItem
                   key={keySelector(item, index)}
                   id={keySelector(item, index)}
-                  type='button'
+                  type="button"
                   title={title}
                   {...menu}
                   disabled={disabled}
                   onClick={event => handleSelect(event.currentTarget.id)}
                 >
-                  {iconSelector && (
-                    <item-icon>
-                      {icon && typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon}
-                    </item-icon>
-                  )}
+                  {iconSelector && <item-icon>{icon && typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon}</item-icon>}
                   <item-value>{valueSelector(item)}</item-value>
                 </MenuItem>
               );
-            }))}
+            })
+          )}
         </Menu>
       </input-box>
-      {description && (
-        <field-description>
-          {description}
-        </field-description>
-      )}
-    </field>
+      {description && <field-description>{description}</field-description>}
+    </field>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/Filter.tsx b/webapp/packages/core-blocks/src/FormControls/Filter.tsx
index 13d67cf383..3d437f34f0 100644
--- a/webapp/packages/core-blocks/src/FormControls/Filter.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Filter.tsx
@@ -5,7 +5,6 @@
  * 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, useEffect, useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -51,10 +50,10 @@ const filterStyles = css`
 `;
 
 const toggleModeButtonStyle = css`
-    IconButton {
-      composes: theme-background-primary theme-text-on-primary from global;
-      cursor: pointer;
-    }
+  IconButton {
+    composes: theme-background-primary theme-text-on-primary from global;
+    cursor: pointer;
+  }
 `;
 
 const innerInputStyle = css`
@@ -108,17 +107,20 @@ export const Filter = observer<ControlledProps | ObjectsProps<any, any>>(functio
   const [inputRef, ref] = useFocus<HTMLInputElement>({});
   const [toggled, setToggled] = useState(!toggleMode);
 
-  const filter = useCallback((value: string | number, name?: string) => {
-    value = String(value);
+  const filter = useCallback(
+    (value: string | number, name?: string) => {
+      value = String(value);
 
-    if (state && name) {
-      state[name] = value;
-    }
+      if (state && name) {
+        state[name] = value;
+      }
 
-    if (onFilter) {
-      onFilter(value, name);
-    }
-  }, [onFilter, state]);
+      if (onFilter) {
+        onFilter(value, name);
+      }
+    },
+    [onFilter, state],
+  );
 
   const toggle = useCallback(() => {
     if (!toggleMode) {
@@ -161,12 +163,7 @@ export const Filter = observer<ControlledProps | ObjectsProps<any, any>>(functio
         onKeyDown={onKeyDown}
         {...use({ toggled, max })}
       />
-      <IconButton
-        name='search'
-        disabled={disabled}
-        onClick={toggle}
-        {...use({ toggled })}
-      />
-    </filter-container>
+      <IconButton name="search" disabled={disabled} onClick={toggle} {...use({ toggled })} />
+    </filter-container>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/FormBox.tsx b/webapp/packages/core-blocks/src/FormControls/FormBox.tsx
index 05d5897795..4fd120e961 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormBox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/FormBox.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
@@ -21,9 +20,5 @@ interface Props {
 }
 
 export const FormBox: React.FC<React.PropsWithChildren<Props>> = function FormBox({ children, className }) {
-  return styled(styles)(
-    <box className={className}>
-      {children}
-    </box>
-  );
+  return styled(styles)(<box className={className}>{children}</box>);
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/FormBoxElement.tsx b/webapp/packages/core-blocks/src/FormControls/FormBoxElement.tsx
index c3abc77746..2f3582111b 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormBoxElement.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/FormBoxElement.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css, use } from 'reshadow';
 
 const styles = css`
@@ -26,8 +25,8 @@ interface Props {
 
 export const FormBoxElement: React.FC<React.PropsWithChildren<Props>> = function FormBoxElement({ children, className, max }) {
   return styled(styles)(
-    <box-element as='div' className={className} {...use({ max })}>
+    <box-element as="div" className={className} {...use({ max })}>
       {children}
-    </box-element>
+    </box-element>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/FormContext.ts b/webapp/packages/core-blocks/src/FormControls/FormContext.ts
index a93a43d856..6714dfb38b 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormContext.ts
+++ b/webapp/packages/core-blocks/src/FormControls/FormContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { IExecutor } from '@cloudbeaver/core-executor';
diff --git a/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx b/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx
index 07de072ac5..32ec829d25 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps';
@@ -42,10 +41,8 @@ export const FormFieldDescription: React.FC<React.PropsWithChildren<Props>> = fu
 
   return styled(styles)(
     <field title={title} className={className} {...rest}>
-      {label && <field-label as='label'>{label}</field-label>}
-      <field-description>
-        {children}
-      </field-description>
-    </field>
+      {label && <field-label as="label">{label}</field-label>}
+      <field-description>{children}</field-description>
+    </field>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/FormGroup.tsx b/webapp/packages/core-blocks/src/FormControls/FormGroup.tsx
index 1b2d54902d..0859fff033 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormGroup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/FormGroup.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
@@ -20,9 +19,5 @@ interface Props {
 }
 
 export const FormGroup: React.FC<React.PropsWithChildren<Props>> = function FormGroup({ children, className }) {
-  return styled(styles)(
-    <group className={className}>
-      {children}
-    </group>
-  );
+  return styled(styles)(<group className={className}>{children}</group>);
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
index b7e05d785d..9afde055a8 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
@@ -5,10 +5,9 @@
  * 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 { forwardRef, useCallback, useContext, useState } from 'react';
-import styled, { use, css } from 'reshadow';
+import styled, { css, use } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -25,55 +24,57 @@ import { isControlPresented } from './isControlPresented';
 import { useCapsLockTracker } from './useCapsLockTracker';
 
 const INPUT_FIELD_STYLES = css`
-    Icon {
-      composes: theme-text-on-secondary from global;
-    }
-    field-label {
-      display: block;
-      composes: theme-typography--body1 from global;
-      font-weight: 500;
-    }
-    field-label:not(:empty) {
-      padding-bottom: 10px;
-    }
-    input-container {
-      position: relative;
-    }
-    loader-container, icon-container {
-      position: absolute;
-      right: 8px;
-      top: 50%;
-      transform: translateY(-50%);
-      width: 24px;
-      height: 24px;
-      display: flex;
-    }
-    icon-container {
-      cursor: pointer;
-      & Icon {
-        width: 100%;
-        height: 100%;
-      }
-    }
-    input[disabled] + icon-container {
-      cursor: auto;
-      opacity: 0.8;
-    }
-    input:not(:only-child) {
-      padding-right: 32px !important;
+  Icon {
+    composes: theme-text-on-secondary from global;
+  }
+  field-label {
+    display: block;
+    composes: theme-typography--body1 from global;
+    font-weight: 500;
+  }
+  field-label:not(:empty) {
+    padding-bottom: 10px;
+  }
+  input-container {
+    position: relative;
+  }
+  loader-container,
+  icon-container {
+    position: absolute;
+    right: 8px;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 24px;
+    height: 24px;
+    display: flex;
+  }
+  icon-container {
+    cursor: pointer;
+    & Icon {
+      width: 100%;
+      height: 100%;
     }
+  }
+  input[disabled] + icon-container {
+    cursor: auto;
+    opacity: 0.8;
+  }
+  input:not(:only-child) {
+    padding-right: 32px !important;
+  }
 `;
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'style'> & ILayoutSizeProps & {
-  error?: boolean;
-  loading?: boolean;
-  description?: string;
-  labelTooltip?: string;
-  mod?: 'surface';
-  ref?: React.Ref<HTMLInputElement>;
-  style?: ComponentStyle;
-  onCustomCopy?: () => void;
-};
+type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'style'> &
+  ILayoutSizeProps & {
+    error?: boolean;
+    loading?: boolean;
+    description?: string;
+    labelTooltip?: string;
+    mod?: 'surface';
+    ref?: React.Ref<HTMLInputElement>;
+    style?: ComponentStyle;
+    onCustomCopy?: () => void;
+  };
 
 type ControlledProps = BaseProps & {
   name?: string;
@@ -100,134 +101,128 @@ interface InputFieldType {
   <TKey extends keyof TState, TState>(props: ObjectProps<TKey, TState>): React.ReactElement<any, any> | null;
 }
 
-export const InputField: InputFieldType = observer(forwardRef(function InputField({
-  name,
-  style,
-  value: valueControlled,
-  defaultValue,
-  required,
-  state,
-  mapState,
-  mapValue,
-  children,
-  className,
-  error,
-  loading,
-  description,
-  labelTooltip,
-  mod,
-  fill,
-  small,
-  medium,
-  large,
-  tiny,
-  autoHide,
-  onChange,
-  onCustomCopy,
-  ...rest
-}: ControlledProps | ObjectProps<any, any>, ref: React.Ref<HTMLInputElement>) {
-  const capsLock = useCapsLockTracker();
-  const [passwordRevealed, setPasswordRevealed] = useState(false);
-  const translate = useTranslate();
-  const styles = useStyles(
-    baseFormControlStyles,
-    error ? baseInvalidFormControlStyles : baseValidFormControlStyles,
-    INPUT_FIELD_STYLES,
-    style
-  );
-  const context = useContext(FormContext);
-  loading = useStateDelay(loading ?? false, 300);
+export const InputField: InputFieldType = observer(
+  forwardRef(function InputField(
+    {
+      name,
+      style,
+      value: valueControlled,
+      defaultValue,
+      required,
+      state,
+      mapState,
+      mapValue,
+      children,
+      className,
+      error,
+      loading,
+      description,
+      labelTooltip,
+      mod,
+      fill,
+      small,
+      medium,
+      large,
+      tiny,
+      autoHide,
+      onChange,
+      onCustomCopy,
+      ...rest
+    }: ControlledProps | ObjectProps<any, any>,
+    ref: React.Ref<HTMLInputElement>,
+  ) {
+    const capsLock = useCapsLockTracker();
+    const [passwordRevealed, setPasswordRevealed] = useState(false);
+    const translate = useTranslate();
+    const styles = useStyles(baseFormControlStyles, error ? baseInvalidFormControlStyles : baseValidFormControlStyles, INPUT_FIELD_STYLES, style);
+    const context = useContext(FormContext);
+    loading = useStateDelay(loading ?? false, 300);
 
-  const revealPassword = useCallback(() => {
-    if (rest.disabled) {
-      return;
+    const revealPassword = useCallback(() => {
+      if (rest.disabled) {
+        return;
+      }
+
+      setPasswordRevealed(prev => !prev);
+    }, [rest.disabled]);
+
+    const handleChange = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const value = mapValue?.(event.target.value) ?? event.target.value;
+
+        if (state) {
+          state[name] = value;
+        }
+        if (onChange) {
+          onChange(value, name);
+        }
+        if (context) {
+          context.change(value, name);
+        }
+      },
+      [state, name, context, onChange],
+    );
+
+    const handleBlur = useCombinedHandler(rest.onBlur, capsLock.handleBlur);
+    const handleKeyDown = useCombinedHandler(rest.onKeyDown, capsLock.handleKeyDown, context?.keyDown);
+
+    if (autoHide && !isControlPresented(name, state, defaultValue)) {
+      return null;
     }
 
-    setPasswordRevealed(prev => !prev);
-  }, [rest.disabled]);
+    let value: any = valueControlled ?? defaultValue ?? undefined;
 
-  const handleChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = mapValue?.(event.target.value) ?? event.target.value;
-
-    if (state) {
-      state[name] = value;
+    if (state && name !== undefined && name in state) {
+      value = state[name];
     }
-    if (onChange) {
-      onChange(value, name);
+
+    if (mapState) {
+      value = mapState(value);
     }
-    if (context) {
-      context.change(value, name);
+
+    const showRevealPasswordButton = rest.type === 'password' && !rest.readOnly;
+
+    if (showRevealPasswordButton && capsLock.warn) {
+      description = translate('ui_capslock_on');
     }
-  }, [state, name, context, onChange]);
 
-  const handleBlur = useCombinedHandler(rest.onBlur, capsLock.handleBlur);
-  const handleKeyDown = useCombinedHandler(rest.onKeyDown, capsLock.handleKeyDown, context?.keyDown);
-
-  if (autoHide && !isControlPresented(name, state, defaultValue)) {
-    return null;
-  }
-
-  let value: any = valueControlled ?? defaultValue ?? undefined;
-
-  if (state && name !== undefined && name in state) {
-    value = state[name];
-  }
-
-  if (mapState) {
-    value = mapState(value);
-  }
-
-  const showRevealPasswordButton = rest.type === 'password' && !rest.readOnly;
-
-  if (showRevealPasswordButton && capsLock.warn) {
-    description = translate('ui_capslock_on');
-  }
-
-  return styled(styles)(
-    <field className={className} {...use({ small, medium, large, tiny })}>
-      <field-label title={labelTooltip || rest.title}>{children}{required && ' *'}</field-label>
-      <input-container>
-        <input
-          ref={ref}
-          {...rest}
-          type={passwordRevealed ? 'text' : rest.type}
-          name={name}
-          value={value ?? ''}
-          onChange={handleChange}
-          onBlur={handleBlur}
-          onKeyDown={handleKeyDown}
-          {...use({ mod })}
-          required={required}
-        />
-        {loading && (
-          <loader-container
-            title={translate('ui_processing_loading')}
-          >
-            <Loader small />
-          </loader-container>
-        )}
-        {showRevealPasswordButton && (
-          <icon-container
-            title={translate('ui_reveal_password')}
-            onClick={revealPassword}
-          >
-            <Icon
-              name={passwordRevealed ? 'password-hide' : 'password-show'}
-              viewBox='0 0 16 16'
-            />
-          </icon-container>
-        )}
-        {onCustomCopy && (
-          <icon-container title={translate('ui_copy_to_clipboard')} onClick={onCustomCopy}>
-            <Icon name="copy" viewBox='0 0 32 32' />
-          </icon-container>
-        )}
-      </input-container>
-      {(description || showRevealPasswordButton) && (
-        <field-description>
-          {description}
-        </field-description>
-      )}
-    </field>
-  );
-}));
+    return styled(styles)(
+      <field className={className} {...use({ small, medium, large, tiny })}>
+        <field-label title={labelTooltip || rest.title}>
+          {children}
+          {required && ' *'}
+        </field-label>
+        <input-container>
+          <input
+            ref={ref}
+            {...rest}
+            type={passwordRevealed ? 'text' : rest.type}
+            name={name}
+            value={value ?? ''}
+            onChange={handleChange}
+            onBlur={handleBlur}
+            onKeyDown={handleKeyDown}
+            {...use({ mod })}
+            required={required}
+          />
+          {loading && (
+            <loader-container title={translate('ui_processing_loading')}>
+              <Loader small />
+            </loader-container>
+          )}
+          {showRevealPasswordButton && (
+            <icon-container title={translate('ui_reveal_password')} onClick={revealPassword}>
+              <Icon name={passwordRevealed ? 'password-hide' : 'password-show'} viewBox="0 0 16 16" />
+            </icon-container>
+          )}
+          {onCustomCopy && (
+            <icon-container title={translate('ui_copy_to_clipboard')} onClick={onCustomCopy}>
+              <Icon name="copy" viewBox="0 0 32 32" />
+            </icon-container>
+          )}
+        </input-container>
+        {(description || showRevealPasswordButton) && <field-description>{description}</field-description>}
+      </field>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/FormControls/InputFileTextContent.tsx b/webapp/packages/core-blocks/src/FormControls/InputFileTextContent.tsx
index 2e38251621..d60caaaf90 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputFileTextContent.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputFileTextContent.tsx
@@ -5,7 +5,6 @@
  * 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 { ReactNode, useContext, useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -67,9 +66,7 @@ interface Props<TState> extends ILayoutSizeProps {
   mapValue?: (value: string) => string;
 }
 
-type InputFileTextContentType = <TState extends Record<string, any>>(
-  props: Props<TState>
-) => React.ReactElement<any, any>;
+type InputFileTextContentType = <TState extends Record<string, any>>(props: Props<TState>) => React.ReactElement<any, any>;
 
 export const InputFileTextContent: InputFileTextContentType = observer(function InputFileTextContent({
   name,
@@ -97,12 +94,7 @@ export const InputFileTextContent: InputFileTextContentType = observer(function
   const [selected, setSelected] = useState<File | null>(null);
   const [error, setError] = useState<Error | null>(null);
 
-  const styles = useStyles(
-    INPUT_FILE_FIELD_STYLES,
-    baseFormControlStyles,
-    style,
-    error ? baseInvalidFormControlStyles : baseValidFormControlStyles
-  );
+  const styles = useStyles(INPUT_FILE_FIELD_STYLES, baseFormControlStyles, style, error ? baseInvalidFormControlStyles : baseValidFormControlStyles);
 
   const savedExternally = !!fileName && state[name] !== '';
   const saved = savedExternally || !!state[name];
@@ -138,10 +130,12 @@ export const InputFileTextContent: InputFileTextContentType = observer(function
     const maxFileSizeBytes = maxFileSize * 1024;
 
     if (size > maxFileSizeBytes) {
-      throw new Error(translate('ui_file_size_exceeds', undefined, {
-        size: bytesToSize(size),
-        maxSize: bytesToSize(maxFileSizeBytes),
-      }));
+      throw new Error(
+        translate('ui_file_size_exceeds', undefined, {
+          size: bytesToSize(size),
+          maxSize: bytesToSize(maxFileSizeBytes),
+        }),
+      );
     }
   }
 
@@ -170,21 +164,19 @@ export const InputFileTextContent: InputFileTextContentType = observer(function
 
   return styled(styles)(
     <field className={className} {...use({ small, medium, large, tiny })}>
-      <field-label title={labelTooltip}>{children}{required && ' *'}</field-label>
+      <field-label title={labelTooltip}>
+        {children}
+        {required && ' *'}
+      </field-label>
       <UploadArea title={tooltip} disabled={disabled} accept={accept} reset onChange={handleChange}>
-        <Button
-          icon='/icons/import.svg'
-          tag='div'
-          mod={['outlined']}
-          disabled={disabled}
-        >
+        <Button icon="/icons/import.svg" tag="div" mod={['outlined']} disabled={disabled}>
           {translate('ui_upload_file')}
         </Button>
       </UploadArea>
       <field-description>
         {description}
-        {(selected || saved) && <IconButton disabled={disabled} name='cross' onClick={removeFile} />}
+        {(selected || saved) && <IconButton disabled={disabled} name="cross" onClick={removeFile} />}
       </field-description>
-    </field>
+    </field>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx b/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
index 34f1038e6e..115419e09d 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
@@ -5,10 +5,9 @@
  * 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 { forwardRef, useContext, useEffect, useState } from 'react';
-import styled, { use, css } from 'reshadow';
+import styled, { css, use } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -27,36 +26,37 @@ import { FormContext } from './FormContext';
 import { isControlPresented } from './isControlPresented';
 
 const INPUT_FIELD_STYLES = css`
-    field-label {
-      display: block;
-      composes: theme-typography--body1 from global;
-      font-weight: 500;
-    }
-    field-label:not(:empty) {
-      padding-bottom: 10px;
-    }
-    input-container {
-      position: relative;
-    }
-    Tags {
-      padding-top: 8px;
+  field-label {
+    display: block;
+    composes: theme-typography--body1 from global;
+    font-weight: 500;
+  }
+  field-label:not(:empty) {
+    padding-bottom: 10px;
+  }
+  input-container {
+    position: relative;
+  }
+  Tags {
+    padding-top: 8px;
 
-      &:empty {
-        display: none;
-      }
+    &:empty {
+      display: none;
     }
+  }
 `;
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'style'> & ILayoutSizeProps & {
-  error?: boolean;
-  loading?: boolean;
-  description?: string;
-  labelTooltip?: string;
-  hideTags?: boolean;
-  mod?: 'surface';
-  ref?: React.Ref<HTMLInputElement>;
-  style?: ComponentStyle;
-};
+type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'style'> &
+  ILayoutSizeProps & {
+    error?: boolean;
+    loading?: boolean;
+    description?: string;
+    labelTooltip?: string;
+    hideTags?: boolean;
+    mod?: 'surface';
+    ref?: React.Ref<HTMLInputElement>;
+    style?: ComponentStyle;
+  };
 
 type ControlledProps = BaseProps & {
   name?: string;
@@ -79,128 +79,114 @@ interface InputFilesType {
   <TKey extends keyof TState, TState>(props: ObjectProps<TKey, TState>): React.ReactElement<any, any> | null;
 }
 
-export const InputFiles: InputFilesType = observer(forwardRef(function InputFiles({
-  name,
-  style,
-  value: valueControlled,
-  required,
-  state,
-  children,
-  className,
-  error,
-  loading,
-  description,
-  labelTooltip,
-  hideTags,
-  mod,
-  fill,
-  small,
-  medium,
-  large,
-  tiny,
-  autoHide,
-  onChange,
-  ...rest
-}: ControlledProps | ObjectProps<any, any>, refInherit: React.Ref<HTMLInputElement>) {
-  const ref = useRefInherit<HTMLInputElement>(refInherit);
-  const [innerState, setInnerState] = useState<FileList | null>(null);
-  const translate = useTranslate();
-  const styles = useStyles(
-    baseFormControlStyles,
-    error ? baseInvalidFormControlStyles : baseValidFormControlStyles,
-    INPUT_FIELD_STYLES,
-    style
-  );
-  const context = useContext(FormContext);
-  loading = useStateDelay(loading ?? false, 300);
+export const InputFiles: InputFilesType = observer(
+  forwardRef(function InputFiles(
+    {
+      name,
+      style,
+      value: valueControlled,
+      required,
+      state,
+      children,
+      className,
+      error,
+      loading,
+      description,
+      labelTooltip,
+      hideTags,
+      mod,
+      fill,
+      small,
+      medium,
+      large,
+      tiny,
+      autoHide,
+      onChange,
+      ...rest
+    }: ControlledProps | ObjectProps<any, any>,
+    refInherit: React.Ref<HTMLInputElement>,
+  ) {
+    const ref = useRefInherit<HTMLInputElement>(refInherit);
+    const [innerState, setInnerState] = useState<FileList | null>(null);
+    const translate = useTranslate();
+    const styles = useStyles(baseFormControlStyles, error ? baseInvalidFormControlStyles : baseValidFormControlStyles, INPUT_FIELD_STYLES, style);
+    const context = useContext(FormContext);
+    loading = useStateDelay(loading ?? false, 300);
 
-  let value = valueControlled ?? innerState;
+    let value = valueControlled ?? innerState;
 
-  if (state && name !== undefined && name in state) {
-    value = state[name];
-  }
-
-  function setValue(value: FileList | null) {
-    setInnerState(value);
-    if (state) {
-      state[name] = value;
-    }
-    if (onChange) {
-      onChange(value, name);
-    }
-    if (context) {
-      context.change(value, name);
-    }
-  }
-
-  const removeFile = useCombinedHandler(function removeFile(index: number): void {
-    if (!value) {
-      return;
+    if (state && name !== undefined && name in state) {
+      value = state[name];
     }
 
-    const dt = new DataTransfer();
-
-    for (let i = 0; i < value.length; i++) {
-      const file = value[i];
-      if (index !== i) {
-        dt.items.add(file);
+    function setValue(value: FileList | null) {
+      setInnerState(value);
+      if (state) {
+        state[name] = value;
+      }
+      if (onChange) {
+        onChange(value, name);
+      }
+      if (context) {
+        context.change(value, name);
       }
     }
 
-    setValue(dt.files.length === 0 ? null : dt.files);
-  });
+    const removeFile = useCombinedHandler(function removeFile(index: number): void {
+      if (!value) {
+        return;
+      }
 
-  const handleChange = useCombinedHandler((event: React.ChangeEvent<HTMLInputElement>) => {
-    setValue(event.target.files);
-  });
+      const dt = new DataTransfer();
 
-  useEffect(() => {
-    if (value !== innerState) {
-      setInnerState(value);
+      for (let i = 0; i < value.length; i++) {
+        const file = value[i];
+        if (index !== i) {
+          dt.items.add(file);
+        }
+      }
+
+      setValue(dt.files.length === 0 ? null : dt.files);
+    });
+
+    const handleChange = useCombinedHandler((event: React.ChangeEvent<HTMLInputElement>) => {
+      setValue(event.target.files);
+    });
+
+    useEffect(() => {
+      if (value !== innerState) {
+        setInnerState(value);
+      }
+    });
+
+    if (autoHide && !isControlPresented(name, state)) {
+      return null;
     }
-  });
 
-  if (autoHide && !isControlPresented(name, state)) {
-    return null;
-  }
+    const files = Array.from(value ?? []);
 
-  const files = Array.from(value ?? []);
-
-  return styled(styles)(
-    <field className={className} {...use({ small, medium, large, tiny })}>
-      <field-label title={labelTooltip || rest.title}>{children}{required && ' *'}</field-label>
-      <input-container>
-        <UploadArea
-          ref={ref}
-          {...rest}
-          name={name}
-          value={value}
-          {...use({ mod })}
-          required={required}
-          onChange={handleChange}
-        >
-          <Button
-            icon='/icons/import.svg'
-            tag='div'
-            loading={loading}
-            mod={['outlined']}
-          >
-            {translate(rest.multiple ? 'ui_upload_files' : 'ui_upload_file')}
-          </Button>
-        </UploadArea>
-        {!hideTags && (
-          <Tags>
-            {files.map((file, i) => (
-              <Tag key={file.name} id={i} label={file.name} onRemove={removeFile} />
-            ))}
-          </Tags>
-        )}
-      </input-container>
-      {description && (
-        <field-description>
-          {description}
-        </field-description>
-      )}
-    </field>
-  );
-}));
+    return styled(styles)(
+      <field className={className} {...use({ small, medium, large, tiny })}>
+        <field-label title={labelTooltip || rest.title}>
+          {children}
+          {required && ' *'}
+        </field-label>
+        <input-container>
+          <UploadArea ref={ref} {...rest} name={name} value={value} {...use({ mod })} required={required} onChange={handleChange}>
+            <Button icon="/icons/import.svg" tag="div" loading={loading} mod={['outlined']}>
+              {translate(rest.multiple ? 'ui_upload_files' : 'ui_upload_file')}
+            </Button>
+          </UploadArea>
+          {!hideTags && (
+            <Tags>
+              {files.map((file, i) => (
+                <Tag key={file.name} id={i} label={file.name} onRemove={removeFile} />
+              ))}
+            </Tags>
+          )}
+        </input-container>
+        {description && <field-description>{description}</field-description>}
+      </field>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/FormControls/Radio.tsx b/webapp/packages/core-blocks/src/FormControls/Radio.tsx
index c22a77d063..42b7beaa33 100644
--- a/webapp/packages/core-blocks/src/FormControls/Radio.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Radio.tsx
@@ -5,9 +5,8 @@
  * 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 { useContext, useCallback } from 'react';
+import { useCallback, useContext } from 'react';
 import styled, { css, use } from 'reshadow';
 
 import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps';
@@ -18,38 +17,38 @@ import { FormContext } from './FormContext';
 import { RadioGroupContext } from './RadioGroupContext';
 
 const radioStyles = css`
-    radio {
-      composes: theme-radio from global;
+  radio {
+    composes: theme-radio from global;
+  }
+  radio-background {
+    composes: theme-radio_background from global;
+  }
+  input {
+    composes: theme-radio_native-control from global;
+  }
+  radio-outer-circle {
+    composes: theme-radio_outer-circle from global;
+  }
+  radio-inner-circle {
+    composes: theme-radio_inner-circle from global;
+  }
+  radio-ripple {
+    composes: theme-radio_ripple from global;
+  }
+  field {
+    display: inline-flex;
+    align-items: center;
+    font-weight: 500;
+    padding: 7px 12px;
+    vertical-align: middle;
+  }
+  label {
+    cursor: pointer;
+    &[|disabled] {
+      cursor: auto;
     }
-    radio-background {
-      composes: theme-radio_background from global;
-    }
-    input {
-      composes: theme-radio_native-control from global;
-    }
-    radio-outer-circle {
-      composes: theme-radio_outer-circle from global;
-    }
-    radio-inner-circle {
-      composes: theme-radio_inner-circle from global;
-    }
-    radio-ripple {
-      composes: theme-radio_ripple from global;
-    }
-    field {
-      display: inline-flex;
-      align-items: center;
-      font-weight: 500;
-      padding: 7px 12px;
-      vertical-align: middle;
-    }
-    label {
-      cursor: pointer;
-      &[|disabled] {
-        cursor: auto;
-      }
-    }
-  `;
+  }
+`;
 
 const radioMod = {
   primary: css`
@@ -78,35 +77,34 @@ const radioMod = {
         height: 14px;
       }
       & radio-inner-circle {
-       border-width: 7px;
+        border-width: 7px;
       }
     }
   `,
 };
 
 const noRippleStyles = css`
-    radio {
-      composes: theme-radio_no-ripple from global;
-    }
-  `;
+  radio {
+    composes: theme-radio_no-ripple from global;
+  }
+`;
 
 const radioState = {
   disabled: css`
-      radio {
-        composes: theme-radio--disabled from global;
-      }
-      input {
-        opacity: 0 !important;
-      }
-    `,
+    radio {
+      composes: theme-radio--disabled from global;
+    }
+    input {
+      opacity: 0 !important;
+    }
+  `,
 };
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'checked'>
-& ILayoutSizeProps
-& {
-  mod?: Array<keyof typeof radioMod>;
-  ripple?: boolean;
-};
+type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'checked'> &
+  ILayoutSizeProps & {
+    mod?: Array<keyof typeof radioMod>;
+    ripple?: boolean;
+  };
 
 type ControlledProps = BaseProps & {
   value?: string | number;
@@ -147,25 +145,28 @@ export const Radio: RadioType = observer(function Radio({
 
   const name = context?.name || controlledName;
 
-  const handleChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    if (!event.target.checked) {
-      return;
-    }
+  const handleChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (!event.target.checked) {
+        return;
+      }
 
-    if (state) {
-      state[name] = value;
-    }
+      if (state) {
+        state[name] = value;
+      }
 
-    if (context) {
-      context.onChange(value);
-    } else if (formContext) {
-      formContext.change(value, name);
-    }
+      if (context) {
+        context.onChange(value);
+      } else if (formContext) {
+        formContext.change(value, name);
+      }
 
-    if (onChange) {
-      onChange(value, name);
-    }
-  }, [value, context, state, name, formContext, onChange]);
+      if (onChange) {
+        onChange(value, name);
+      }
+    },
+    [value, context, state, name, formContext, onChange],
+  );
 
   const id = controlledId ?? `${name}_${value}`;
   let checked = controlledChecked;
@@ -178,31 +179,27 @@ export const Radio: RadioType = observer(function Radio({
     checked = state[name] === value;
   }
 
-  return styled(useStyles(
-    baseFormControlStyles,
-    radioStyles,
-    ...(mod || []).map(mod => radioMod[mod]),
-    !ripple && noRippleStyles,
-    rest.disabled && radioState.disabled
-  ))(
+  return styled(
+    useStyles(
+      baseFormControlStyles,
+      radioStyles,
+      ...(mod || []).map(mod => radioMod[mod]),
+      !ripple && noRippleStyles,
+      rest.disabled && radioState.disabled,
+    ),
+  )(
     <field className={className}>
       <radio>
-        <input
-          {...rest}
-          type="radio"
-          id={id}
-          name={name}
-          value={value ?? ''}
-          checked={checked}
-          onChange={handleChange}
-        />
+        <input {...rest} type="radio" id={id} name={name} value={value ?? ''} checked={checked} onChange={handleChange} />
         <radio-background>
           <radio-outer-circle />
           <radio-inner-circle />
         </radio-background>
         {ripple && <radio-ripple />}
       </radio>
-      <label {...use({ disabled: rest.disabled })} htmlFor={id}>{children}</label>
-    </field>
+      <label {...use({ disabled: rest.disabled })} htmlFor={id}>
+        {children}
+      </label>
+    </field>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx b/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
index d5f69518ad..5ef4fc22bf 100644
--- a/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
@@ -5,14 +5,11 @@
  * 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, useState, useContext
-} from 'react';
+import { useCallback, useContext, useMemo, useState } from 'react';
 
 import { FormContext } from './FormContext';
-import { RadioGroupContext, IRadioGroupContext } from './RadioGroupContext';
+import { IRadioGroupContext, RadioGroupContext } from './RadioGroupContext';
 
 type BaseProps = React.PropsWithChildren<{
   name: string;
@@ -48,33 +45,35 @@ export const RadioGroup: RadioGroupType = observer(function RadioGroup({
   const formContext = useContext(FormContext);
   const [selfValue, setValue] = useState<string | number>();
 
-  const handleChange = useCallback((value: string | number) => {
-    if (state) {
-      state[name] = value;
-    } else {
-      setValue(value);
-    }
+  const handleChange = useCallback(
+    (value: string | number) => {
+      if (state) {
+        state[name] = value;
+      } else {
+        setValue(value);
+      }
 
-    if (onChange) {
-      onChange(value, name);
-    }
+      if (onChange) {
+        onChange(value, name);
+      }
 
-    if (formContext) {
-      formContext.change(value, name);
-    }
-  }, [name, state, formContext, onChange]);
+      if (formContext) {
+        formContext.change(value, name);
+      }
+    },
+    [name, state, formContext, onChange],
+  );
 
   const value = state ? state[name] : controlledValue ?? selfValue;
 
-  const context: IRadioGroupContext = useMemo(() => ({
-    name,
-    value,
-    onChange: handleChange,
-  }), [value, value, handleChange]);
-
-  return (
-    <RadioGroupContext.Provider value={context}>
-      {children}
-    </RadioGroupContext.Provider>
+  const context: IRadioGroupContext = useMemo(
+    () => ({
+      name,
+      value,
+      onChange: handleChange,
+    }),
+    [value, value, handleChange],
   );
+
+  return <RadioGroupContext.Provider value={context}>{children}</RadioGroupContext.Provider>;
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/RadioGroupContext.ts b/webapp/packages/core-blocks/src/FormControls/RadioGroupContext.ts
index 5e0979f4a2..1cc97975e1 100644
--- a/webapp/packages/core-blocks/src/FormControls/RadioGroupContext.ts
+++ b/webapp/packages/core-blocks/src/FormControls/RadioGroupContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface IRadioGroupContext {
diff --git a/webapp/packages/core-blocks/src/FormControls/ShadowInput.tsx b/webapp/packages/core-blocks/src/FormControls/ShadowInput.tsx
index cdb9242bff..86ebd34c65 100644
--- a/webapp/packages/core-blocks/src/FormControls/ShadowInput.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/ShadowInput.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 type ShadowInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'children'> & {
@@ -14,17 +13,6 @@ type ShadowInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onCha
   className?: string;
 };
 
-export const ShadowInput = forwardRef<HTMLInputElement, ShadowInputProps>(function ShadowInput({
-  onChange,
-  children,
-  ...rest
-}, ref) {
-  return (
-    <input
-      ref={ref}
-      value={children ?? ''}
-      onChange={e => onChange?.(e.target.value)}
-      {...rest}
-    />
-  );
+export const ShadowInput = forwardRef<HTMLInputElement, ShadowInputProps>(function ShadowInput({ onChange, children, ...rest }, ref) {
+  return <input ref={ref} value={children ?? ''} onChange={e => onChange?.(e.target.value)} {...rest} />;
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx b/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
index 226927faea..be627f6e76 100644
--- a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React, { forwardRef, useContext, useState } from 'react';
 
 import { Executor } from '@cloudbeaver/core-executor';
@@ -29,15 +28,8 @@ type FormDetailedProps = Omit<React.DetailedHTMLProps<React.FormHTMLAttributes<H
 };
 
 export const SubmittingForm = forwardRef<HTMLFormElement, FormDetailedProps>(function SubmittingForm(
-  {
-    disabled: disabledProp,
-    disableEnterSubmit,
-    children,
-    onSubmit,
-    onChange = () => {},
-    ...rest
-  },
-  ref
+  { disabled: disabledProp, disableEnterSubmit, children, onSubmit, onChange = () => {}, ...rest },
+  ref,
 ) {
   const [formRef, setFormInnerRef] = useState<HTMLFormElement | null>(null);
   const setFormRef = useCombinedRef<HTMLFormElement>(setFormInnerRef, ref);
@@ -45,57 +37,63 @@ export const SubmittingForm = forwardRef<HTMLFormElement, FormDetailedProps>(fun
 
   disabled = disabled || disabledProp || false;
 
-  const props = useObjectRef(() => ({
-    handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-      e.preventDefault();
+  const props = useObjectRef(
+    () => ({
+      handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+        e.preventDefault();
 
-      setDisabled(true);
-      const result = this.onSubmit?.(e);
+        setDisabled(true);
+        const result = this.onSubmit?.(e);
 
-      if (result instanceof Promise) {
-        result.finally(() => { setDisabled(false); });
-      } else {
-        setDisabled(false);
-      }
+        if (result instanceof Promise) {
+          result.finally(() => {
+            setDisabled(false);
+          });
+        } else {
+          setDisabled(false);
+        }
+      },
+    }),
+    {
+      formRef,
+      disableEnterSubmit,
+      parentContext: useContext(FormContext),
+      onChange,
+      onSubmit,
     },
-  }), {
-    formRef,
-    disableEnterSubmit,
-    parentContext: useContext(FormContext),
-    onChange,
-    onSubmit,
-  }, ['handleSubmit']);
+    ['handleSubmit'],
+  );
 
-  const context = useObjectRef<IFormContext>(() => ({
-    changeExecutor: new Executor<IChangeData>(),
-    change(value, name) {
-      props.onChange(value, name);
-      props.parentContext?.change(value, name);
-      this.changeExecutor.execute({ value, name });
-    },
-    keyDown(event: React.KeyboardEvent<HTMLInputElement>) {
-      if (event.key === 'Enter') {
-        const form = event.currentTarget.closest('form');
-        if (form) {
-          event.preventDefault();
-          const submitButton = form.querySelector<HTMLButtonElement>(
-            'button[type=submit]'
-          );
-          if (submitButton) {
-            submitButton.click();
+  const context = useObjectRef<IFormContext>(
+    () => ({
+      changeExecutor: new Executor<IChangeData>(),
+      change(value, name) {
+        props.onChange(value, name);
+        props.parentContext?.change(value, name);
+        this.changeExecutor.execute({ value, name });
+      },
+      keyDown(event: React.KeyboardEvent<HTMLInputElement>) {
+        if (event.key === 'Enter') {
+          const form = event.currentTarget.closest('form');
+          if (form) {
+            event.preventDefault();
+            const submitButton = form.querySelector<HTMLButtonElement>('button[type=submit]');
+            if (submitButton) {
+              submitButton.click();
+            }
           }
         }
-      }
-      props.parentContext?.keyDown(event);
-    },
-  }), false, ['change', 'keyDown']);
+        props.parentContext?.keyDown(event);
+      },
+    }),
+    false,
+    ['change', 'keyDown'],
+  );
 
   return (
     <form {...rest} ref={setFormRef} onSubmit={e => props.handleSubmit(e)}>
       <fieldset disabled={disabled} className={rest.className}>
-        <FormContext.Provider value={context}>
-          {children}
-        </FormContext.Provider>
+        <FormContext.Provider value={context}>{children}</FormContext.Provider>
       </fieldset>
       <button type="submit" disabled={disableEnterSubmit} aria-hidden={disableEnterSubmit} hidden />
     </form>
diff --git a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx
index 211f0e0a2b..bc6a2814c1 100644
--- a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx
@@ -5,7 +5,6 @@
  * 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, useContext } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -25,7 +24,7 @@ const styles = css`
     height: 100%;
     display: flex;
     flex-direction: column;
-    
+
     & textarea {
       border-radius: 0 !important;
       height: 100%;
@@ -44,13 +43,14 @@ const styles = css`
   }
 `;
 
-type BaseProps = Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'onChange' | 'style'> & ILayoutSizeProps & {
-  description?: string;
-  labelTooltip?: string;
-  mod?: 'surface';
-  style?: ComponentStyle;
-  embedded?: boolean;
-};
+type BaseProps = Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'onChange' | 'style'> &
+  ILayoutSizeProps & {
+    description?: string;
+    labelTooltip?: string;
+    mod?: 'surface';
+    style?: ComponentStyle;
+    embedded?: boolean;
+  };
 
 type ControlledProps = BaseProps & {
   name?: string;
@@ -88,45 +88,36 @@ export const Textarea: TextareaType = observer(function Textarea({
   labelTooltip,
   mod,
   embedded,
-  onChange = () => { },
+  onChange = () => {},
   ...rest
 }: ControlledProps | ObjectProps<any, any>) {
   const context = useContext(FormContext);
 
-  const handleChange = useCallback((event: React.ChangeEvent<HTMLTextAreaElement>) => {
-    if (state) {
-      state[name] = event.target.value;
-    }
-    if (onChange) {
-      onChange(event.target.value, name);
-    }
-    if (context) {
-      context.change(event.target.value, name);
-    }
-  }, [state, name, onChange]);
+  const handleChange = useCallback(
+    (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+      if (state) {
+        state[name] = event.target.value;
+      }
+      if (onChange) {
+        onChange(event.target.value, name);
+      }
+      if (context) {
+        context.change(event.target.value, name);
+      }
+    },
+    [state, name, onChange],
+  );
 
   const value = state ? state[name] : controlledValue;
 
   return styled(useStyles(baseFormControlStyles, baseValidFormControlStyles, styles, style))(
     <field className={className} {...use({ tiny, small, medium, large, embedded })}>
-      <field-label
-        title={labelTooltip || rest.title}
-      >
-        {children}{required && ' *'}
+      <field-label title={labelTooltip || rest.title}>
+        {children}
+        {required && ' *'}
       </field-label>
-      <textarea
-        {...rest}
-        value={value ?? ''}
-        name={name}
-        data-embedded={embedded}
-        onChange={handleChange}
-        {...use({ mod })}
-      />
-      {description && (
-        <field-description>
-          {description}
-        </field-description>
-      )}
-    </field>
+      <textarea {...rest} value={value ?? ''} name={name} data-embedded={embedded} onChange={handleChange} {...use({ mod })} />
+      {description && <field-description>{description}</field-description>}
+    </field>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/FormControls/baseFormControlStyles.ts b/webapp/packages/core-blocks/src/FormControls/baseFormControlStyles.ts
index 8f516051bc..c55a4a900c 100644
--- a/webapp/packages/core-blocks/src/FormControls/baseFormControlStyles.ts
+++ b/webapp/packages/core-blocks/src/FormControls/baseFormControlStyles.ts
@@ -5,63 +5,63 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const baseFormControlStyles = css`
-    field {
-      box-sizing: border-box;
-      max-width: 100%;
+  field {
+    box-sizing: border-box;
+    max-width: 100%;
 
-      &[|small] {
-        max-width: 250px;
-      }
-      &[|medium] {
-        max-width: 450px;
-      }
-      &[|large] {
-        max-width: 650px;
-      }
-
-      & field {
-        height: 32px;
-        padding: 0;
-      }
+    &[|small] {
+      max-width: 250px;
+    }
+    &[|medium] {
+      max-width: 450px;
+    }
+    &[|large] {
+      max-width: 650px;
     }
 
-    field-label {
-      composes: theme-typography--body1 from global;
-      box-sizing: border-box;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
+    & field {
+      height: 32px;
+      padding: 0;
     }
+  }
 
-    field-description {
-      composes: theme-typography--caption from global;
-      box-sizing: border-box;
-      padding-top: 4px;
-      min-height: 24px;
+  field-label {
+    composes: theme-typography--body1 from global;
+    box-sizing: border-box;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  field-description {
+    composes: theme-typography--caption from global;
+    box-sizing: border-box;
+    padding-top: 4px;
+    min-height: 24px;
+  }
+
+  input,
+  textarea {
+    font-size: 12px;
+
+    &[|select] {
+      cursor: pointer;
+      user-select: none;
     }
-
-    input, textarea {
-      font-size: 12px;
-
-      &[|select] {
-        cursor: pointer;
-        user-select: none;
-      }
-    }
-  `;
+  }
+`;
 
 export const baseValidFormControlStyles = css`
-    field-description {
-      composes: theme-text-text-hint-on-light from global;
-    }
-  `;
+  field-description {
+    composes: theme-text-text-hint-on-light from global;
+  }
+`;
 
 export const baseInvalidFormControlStyles = css`
-    field-description {
-      composes: theme-text-negative from global;
-    }
-  `;
+  field-description {
+    composes: theme-text-negative from global;
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
index 0c82370abb..a9272655b6 100644
--- a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
+++ b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
@@ -6,9 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-export function isControlPresented(
-  name: string | undefined, state: any, defaultValue?: string | number | readonly string[]
-): boolean {
+export function isControlPresented(name: string | undefined, state: any, defaultValue?: string | number | readonly string[]): boolean {
   if (state !== undefined && name !== undefined) {
     if (name in state) {
       return state[name] !== null && state[name] !== undefined;
diff --git a/webapp/packages/core-blocks/src/FormControls/useCapsLockTracker.ts b/webapp/packages/core-blocks/src/FormControls/useCapsLockTracker.ts
index cf222af9f8..489f42e533 100644
--- a/webapp/packages/core-blocks/src/FormControls/useCapsLockTracker.ts
+++ b/webapp/packages/core-blocks/src/FormControls/useCapsLockTracker.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 export function useCapsLockTracker() {
@@ -28,4 +27,4 @@ export function useCapsLockTracker() {
     handleBlur,
     handleKeyDown,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/Icon.test.tsx b/webapp/packages/core-blocks/src/Icon.test.tsx
index b81d85c0ed..c42e1a0799 100644
--- a/webapp/packages/core-blocks/src/Icon.test.tsx
+++ b/webapp/packages/core-blocks/src/Icon.test.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
 
@@ -14,20 +13,20 @@ import { Icon } from './Icon';
 test('icons.svg#name', () => {
   (globalThis as any)._ROOT_URI_ = undefined;
 
-  render(<Icon name='test' />);
+  render(<Icon name="test" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/icons/icons.svg#test');
 });
 
 test('/image.jpg', () => {
   (globalThis as any)._ROOT_URI_ = undefined;
 
-  render(<Icon name='/image.jpg' />);
+  render(<Icon name="/image.jpg" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/image.jpg');
 });
 
 test('{_ROOT_URI_}/icons.svg#name', () => {
   (globalThis as any)._ROOT_URI_ = '/path/';
 
-  render(<Icon name='test' />);
+  render(<Icon name="test" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/path/icons/icons.svg#test');
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Icon.tsx b/webapp/packages/core-blocks/src/Icon.tsx
index a7d1ea7603..5dd7a79be7 100644
--- a/webapp/packages/core-blocks/src/Icon.tsx
+++ b/webapp/packages/core-blocks/src/Icon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SVGAttributes } from 'react';
 
 import { GlobalConstants } from '@cloudbeaver/core-utils';
diff --git a/webapp/packages/core-blocks/src/IconButton.tsx b/webapp/packages/core-blocks/src/IconButton.tsx
index 039174f7fa..3be8334fb1 100644
--- a/webapp/packages/core-blocks/src/IconButton.tsx
+++ b/webapp/packages/core-blocks/src/IconButton.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Button, ButtonProps } from 'reakit/Button';
 import styled, { css } from 'reshadow';
 
@@ -27,7 +26,8 @@ const styles = css`
     height: 16px;
     width: 16px;
 
-    & Icon, & StaticImage {
+    & Icon,
+    & StaticImage {
       width: 100%;
       height: 100%;
     }
@@ -46,6 +46,6 @@ export function IconButton({ name, img, viewBox, style, ...rest }: Props & Butto
     <Button {...rest}>
       {img && <StaticImage icon={name} />}
       {!img && <Icon name={name} viewBox={viewBox} />}
-    </Button>
+    </Button>,
   );
 }
diff --git a/webapp/packages/core-blocks/src/IconOrImage.tsx b/webapp/packages/core-blocks/src/IconOrImage.tsx
index 279c81e4c3..b43d6bb7e1 100644
--- a/webapp/packages/core-blocks/src/IconOrImage.tsx
+++ b/webapp/packages/core-blocks/src/IconOrImage.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useMemo } from 'react';
 
 import { isValidUrl } from '@cloudbeaver/core-utils';
@@ -22,10 +21,7 @@ export interface IconOrImageProps {
 }
 
 export const IconOrImage: React.FC<IconOrImageProps> = function IconOrImage({ icon, className, title, onClick, viewBox }) {
-  const isStaticIcon = useMemo(
-    () => icon && (icon.startsWith('platform:') || icon.startsWith('/')),
-    [icon]
-  );
+  const isStaticIcon = useMemo(() => icon && (icon.startsWith('platform:') || icon.startsWith('/')), [icon]);
 
   if (isStaticIcon || isValidUrl(icon)) {
     return <StaticImage title={title} icon={icon} className={className} onClick={onClick} />;
diff --git a/webapp/packages/core-blocks/src/Iframe.tsx b/webapp/packages/core-blocks/src/Iframe.tsx
index 35932316a6..e29cff1f53 100644
--- a/webapp/packages/core-blocks/src/Iframe.tsx
+++ b/webapp/packages/core-blocks/src/Iframe.tsx
@@ -5,21 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DetailedHTMLProps, IframeHTMLAttributes } from 'react';
 import styled, { css } from 'reshadow';
 
 import { useStyles } from './useStyles';
 
 const styles = css`
-    iframe {
-      composes: theme-border-color-background from global;
-      border: 1px solid;
-    }
-  `;
+  iframe {
+    composes: theme-border-color-background from global;
+    border: 1px solid;
+  }
+`;
 
 export const Iframe: React.FC<DetailedHTMLProps<IframeHTMLAttributes<HTMLIFrameElement>, HTMLIFrameElement>> = function Iframe(props) {
-  return styled(useStyles(styles))(
-    <iframe {...props} />
-  );
+  return styled(useStyles(styles))(<iframe {...props} />);
 };
diff --git a/webapp/packages/core-blocks/src/InfoItem.tsx b/webapp/packages/core-blocks/src/InfoItem.tsx
index 81c8a4bd60..e4f31ec551 100644
--- a/webapp/packages/core-blocks/src/InfoItem.tsx
+++ b/webapp/packages/core-blocks/src/InfoItem.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -42,6 +41,6 @@ export const InfoItem = observer<Props>(function InfoItem({ info, icon = '/icons
     <info-item className={className}>
       <IconOrImage icon={icon} />
       {translate(info)}
-    </info-item>
+    </info-item>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
index 863477a8ba..16227f7d61 100644
--- a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
@@ -5,29 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { useStyles } from '../useStyles';
-import { Styles, ITEM_LIST_STYLES } from './styles';
+import { ITEM_LIST_STYLES, Styles } from './styles';
 
 interface Props {
   className?: string;
   styles?: ComponentStyle;
 }
 
-export const ItemList: React.FC<React.PropsWithChildren<Props>> = function ItemList({
-  children, className, styles,
-}) {
+export const ItemList: React.FC<React.PropsWithChildren<Props>> = function ItemList({ children, className, styles }) {
   return styled(useStyles(styles || ITEM_LIST_STYLES))(
     <item-list className={className}>
       <item-list-overflow-top />
-      <Styles.Provider value={styles || ITEM_LIST_STYLES}>
-        {children}
-      </Styles.Provider>
+      <Styles.Provider value={styles || ITEM_LIST_STYLES}>{children}</Styles.Provider>
       <item-list-overflow />
-    </item-list>
+    </item-list>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx b/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx
index 23d5f8a1c3..4a3adfaea7 100644
--- a/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx
@@ -5,10 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import {
-  useState, useCallback, useContext, useRef
-} from 'react';
+import { useCallback, useContext, useRef, useState } from 'react';
 import styled, { use } from 'reshadow';
 
 import { IconButton } from '../IconButton';
@@ -25,21 +22,22 @@ interface IProps {
   className?: string;
 }
 
-export const ItemListSearch: React.FC<IProps> = function ItemListSearch({
-  value, placeholder, disabled, onChange, onSearch, className,
-}) {
+export const ItemListSearch: React.FC<IProps> = function ItemListSearch({ value, placeholder, disabled, onChange, onSearch, className }) {
   const inputRef = useRef<HTMLInputElement>(null);
   const styles = useContext(Styles);
   const [search, setSearch] = useState(value ?? '');
   const translate = useTranslate();
-  const changeHandler = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
-    if (value === undefined) {
-      setSearch(event.target.value);
-    }
-    if (onChange) {
-      onChange(event.target.value);
-    }
-  }, [value, onChange]);
+  const changeHandler = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (value === undefined) {
+        setSearch(event.target.value);
+      }
+      if (onChange) {
+        onChange(event.target.value);
+      }
+    },
+    [value, onChange],
+  );
 
   const searchHandler = useCallback(() => {
     if (!inputRef.current) {
@@ -61,7 +59,7 @@ export const ItemListSearch: React.FC<IProps> = function ItemListSearch({
       <input-box>
         <input
           ref={inputRef}
-          name='search'
+          name="search"
           placeholder={translate(placeholder || 'ui_search')}
           value={value ?? search}
           autoComplete="off"
@@ -69,8 +67,10 @@ export const ItemListSearch: React.FC<IProps> = function ItemListSearch({
           onChange={changeHandler}
           {...use({ mod: 'surface' })}
         />
-        <search-button as='div' onClick={searchHandler}><ListSearchButton name='search' /></search-button>
+        <search-button as="div" onClick={searchHandler}>
+          <ListSearchButton name="search" />
+        </search-button>
       </input-box>
-    </list-search>
+    </list-search>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ListItem.tsx b/webapp/packages/core-blocks/src/ItemList/ListItem.tsx
index a281710415..0f082b450f 100644
--- a/webapp/packages/core-blocks/src/ItemList/ListItem.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ListItem.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 import styled from 'reshadow';
 
@@ -17,16 +16,12 @@ interface Props {
   className?: string;
 }
 
-export const ListItem: React.FC<React.PropsWithChildren<Props>> = function ListItem({
-  children,
-  onClick,
-  className,
-}) {
+export const ListItem: React.FC<React.PropsWithChildren<Props>> = function ListItem({ children, onClick, className }) {
   const styles = useContext(Styles);
 
   return styled(useStyles(styles))(
     <list-item as="div" className={className} onClick={onClick}>
       {children}
-    </list-item>
+    </list-item>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx
index 9807baddfa..54b76fc392 100644
--- a/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 import styled from 'reshadow';
 
@@ -17,14 +16,12 @@ interface Props {
   className?: string;
 }
 
-export const ListItemDescription: React.FC<React.PropsWithChildren<Props>> = function ListItemDescription({
-  title,
-  children,
-  className,
-}) {
+export const ListItemDescription: React.FC<React.PropsWithChildren<Props>> = function ListItemDescription({ title, children, className }) {
   const styles = useContext(Styles);
 
   return styled(useStyles(styles))(
-    <list-item-description title={title} className={className}>{children}</list-item-description>
+    <list-item-description title={title} className={className}>
+      {children}
+    </list-item-description>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx
index 0996f8c0fb..4e18a7eb7b 100644
--- a/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 import styled from 'reshadow';
 
@@ -16,13 +15,8 @@ interface Props {
   className?: string;
 }
 
-export const ListItemIcon: React.FC<React.PropsWithChildren<Props>> = function ListItemIcon({
-  children,
-  className,
-}) {
+export const ListItemIcon: React.FC<React.PropsWithChildren<Props>> = function ListItemIcon({ children, className }) {
   const styles = useContext(Styles);
 
-  return styled(useStyles(styles))(
-    <list-item-icon className={className}>{children}</list-item-icon>
-  );
+  return styled(useStyles(styles))(<list-item-icon className={className}>{children}</list-item-icon>);
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx
index 797bfe372e..9078ac8da6 100644
--- a/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 import styled from 'reshadow';
 
@@ -16,13 +15,8 @@ interface Props {
   className?: string;
 }
 
-export const ListItemName: React.FC<React.PropsWithChildren<Props>> = function ListItemName({
-  children,
-  className,
-}) {
+export const ListItemName: React.FC<React.PropsWithChildren<Props>> = function ListItemName({ children, className }) {
   const styles = useContext(Styles);
 
-  return styled(useStyles(styles))(
-    <list-item-name className={className}>{children}</list-item-name>
-  );
+  return styled(useStyles(styles))(<list-item-name className={className}>{children}</list-item-name>);
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/styles.ts b/webapp/packages/core-blocks/src/ItemList/styles.ts
index 0bda112bfb..8a1ff690e3 100644
--- a/webapp/packages/core-blocks/src/ItemList/styles.ts
+++ b/webapp/packages/core-blocks/src/ItemList/styles.ts
@@ -5,119 +5,119 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 import { css } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 export const ITEM_LIST_STYLES = css`
-    item-list {
-      composes: theme-background-surface from global;
-      box-sizing: border-box;
-      border-collapse: collapse;
-      z-index: 0;
-      overflow: auto;
-    }
-    item-list-overflow, item-list-overflow-top {
-      position: sticky;
-      flex-shrink: 0;
-      width: 100%;
-      height: 8px;
-      pointer-events: none;
-    }
-    item-list-overflow {
-      composes: branding-overflow from global;
-      bottom: 0;
-    }
-    item-list-overflow-top {
-      composes: branding-overflow-inverse from global;
-      top: 0;
-      z-index: 1;
-    }
-    list-search {
-      composes: theme-background-surface theme-text-on-surface theme-typography--body1 from global;
-      position: sticky;
-      top: 0;
-      padding: 16px 24px;
-      z-index: 1;
+  item-list {
+    composes: theme-background-surface from global;
+    box-sizing: border-box;
+    border-collapse: collapse;
+    z-index: 0;
+    overflow: auto;
+  }
+  item-list-overflow,
+  item-list-overflow-top {
+    position: sticky;
+    flex-shrink: 0;
+    width: 100%;
+    height: 8px;
+    pointer-events: none;
+  }
+  item-list-overflow {
+    composes: branding-overflow from global;
+    bottom: 0;
+  }
+  item-list-overflow-top {
+    composes: branding-overflow-inverse from global;
+    top: 0;
+    z-index: 1;
+  }
+  list-search {
+    composes: theme-background-surface theme-text-on-surface theme-typography--body1 from global;
+    position: sticky;
+    top: 0;
+    padding: 16px 24px;
+    z-index: 1;
 
-      & input-box {
-        position: relative;
-      }
-
-      & input {
-        padding: 4px 32px 4px 8px;
-      }
-
-      & search-button {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        height: 100%;
-        top: 50%;
-        right: 4px;
-        transform: translateY(-50%);
-
-        & ListSearchButton {
-          position: relative;
-          box-sizing: border-box;
-          overflow: hidden;
-          border-radius: 2px;
-          height: 24px;
-          width: 24px;
-          margin: 0;
-        }
-      }
-    }
-    ListSearchButton {
-      composes: theme-ripple theme-background-primary theme-text-on-primary from global;
-    }
-    list-item:not(:nth-last-child(2)) {
-      border-bottom: 1px solid;
-    }
-    list-item {
-      composes: theme-ripple theme-background-surface theme-border-color-secondary from global;
+    & input-box {
       position: relative;
-      cursor: pointer;
-      display: flex;
-      box-sizing: border-box;
-      align-items: center;
-      padding: 0 16px;
     }
-    list-item-icon {
+
+    & input {
+      padding: 4px 32px 4px 8px;
+    }
+
+    & search-button {
+      position: absolute;
       display: flex;
       align-items: center;
-      box-sizing: border-box;
-      padding: 8px;
+      height: 100%;
+      top: 50%;
+      right: 4px;
+      transform: translateY(-50%);
 
-      & StaticImage {
+      & ListSearchButton {
+        position: relative;
         box-sizing: border-box;
+        overflow: hidden;
+        border-radius: 2px;
+        height: 24px;
         width: 24px;
+        margin: 0;
       }
     }
-    list-item-name {
-      composes: theme-border-color-secondary theme-typography--body1 from global;
+  }
+  ListSearchButton {
+    composes: theme-ripple theme-background-primary theme-text-on-primary from global;
+  }
+  list-item:not(:nth-last-child(2)) {
+    border-bottom: 1px solid;
+  }
+  list-item {
+    composes: theme-ripple theme-background-surface theme-border-color-secondary from global;
+    position: relative;
+    cursor: pointer;
+    display: flex;
+    box-sizing: border-box;
+    align-items: center;
+    padding: 0 16px;
+  }
+  list-item-icon {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 8px;
+
+    & StaticImage {
       box-sizing: border-box;
-      font-weight: 500;
-      min-width: 250px;
-      padding: 8px 24px 8px 8px;
-      border-right: 1px solid;
-    
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+      width: 24px;
     }
-    list-item-description {
-      composes: theme-typography--body2 from global;
-      box-sizing: border-box;
-      max-width: 460px;
-      padding: 8px 8px 8px 24px;
-    
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  `;
+  }
+  list-item-name {
+    composes: theme-border-color-secondary theme-typography--body1 from global;
+    box-sizing: border-box;
+    font-weight: 500;
+    min-width: 250px;
+    padding: 8px 24px 8px 8px;
+    border-right: 1px solid;
+
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  list-item-description {
+    composes: theme-typography--body2 from global;
+    box-sizing: border-box;
+    max-width: 460px;
+    padding: 8px 8px 8px 24px;
+
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+`;
 
 export const Styles = createContext<ComponentStyle>(ITEM_LIST_STYLES);
diff --git a/webapp/packages/core-blocks/src/Link.tsx b/webapp/packages/core-blocks/src/Link.tsx
index 9f2d4cd168..cb4ae51c0f 100644
--- a/webapp/packages/core-blocks/src/Link.tsx
+++ b/webapp/packages/core-blocks/src/Link.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css, use } from 'reshadow';
 
 import { IconOrImage } from './IconOrImage';
@@ -25,7 +24,10 @@ const styles = css`
     cursor: pointer;
   }
   a[|wrapper] {
-    &, &:hover, &:focus, &:active {
+    &,
+    &:hover,
+    &:focus,
+    &:active {
       color: inherit;
       text-decoration: none !important;
       outline: none;
@@ -38,23 +40,13 @@ const styles = css`
   }
 `;
 
-export const Link: React.FC<Props> = function Link({
-  inline,
-  wrapper,
-  indicator,
-  className,
-  children,
-  ...rest
-}) {
+export const Link: React.FC<Props> = function Link({ inline, wrapper, indicator, className, children, ...rest }) {
   return styled(styles)(
     <div className={className} {...use({ inline })}>
-      <a
-        {...use({ wrapper })}
-        {...rest}
-      >
-        {indicator && <IconOrImage icon='external-link' />}
+      <a {...use({ wrapper })} {...rest}>
+        {indicator && <IconOrImage icon="external-link" />}
         {children}
       </a>
-    </div>
+    </div>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Loader/Loader.tsx b/webapp/packages/core-blocks/src/Loader/Loader.tsx
index 1edc459848..142b3f654e 100644
--- a/webapp/packages/core-blocks/src/Loader/Loader.tsx
+++ b/webapp/packages/core-blocks/src/Loader/Loader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useState, useEffect, useContext, useRef, Suspense } from 'react';
+import { Suspense, useContext, useEffect, useRef, useState } from 'react';
 import styled, { use } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -23,9 +22,11 @@ import { useStyles } from '../useStyles';
 import { ILoaderContext, LoaderContext } from './LoaderContext';
 import { loaderStyles, overlayStyles } from './loaderStyles';
 
-type LoaderState = ILoadableState | {
-  loading: boolean;
-};
+type LoaderState =
+  | ILoadableState
+  | {
+      loading: boolean;
+    };
 
 interface Props {
   /** if false, nothing will be rendered, by default true */
@@ -105,11 +106,7 @@ export const Loader = observer<Props>(function Loader({
     for (let i = 0; i < state.length; i++) {
       const element = state[i];
 
-      if (
-        'isLoaded' in element
-        && 'isLoading' in element
-      ) {
-
+      if ('isLoaded' in element && 'isLoading' in element) {
         if (i === 0 && loadingUndefined) {
           loaded = element.isLoaded();
           loading = element.isLoading();
@@ -199,11 +196,14 @@ export const Loader = observer<Props>(function Loader({
     }
   });
 
-  useEffect(() => () => {
-    if (context) {
-      context.state.delete(loaderId);
-    }
-  }, []);
+  useEffect(
+    () => () => {
+      if (context) {
+        context.state.delete(loaderId);
+      }
+    },
+    [],
+  );
 
   useEffect(() => {
     if (loaderRef.current) {
@@ -216,7 +216,7 @@ export const Loader = observer<Props>(function Loader({
       <LoaderContext.Provider value={contextState}>
         <ErrorBoundary icon={small} inline={inline} remount>
           <Suspense
-            fallback={(
+            fallback={
               <Loader
                 message={message}
                 hideMessage={hideMessage}
@@ -229,7 +229,7 @@ export const Loader = observer<Props>(function Loader({
                 inlineException={inlineException}
                 style={style}
               />
-            )}
+            }
           >
             {typeof children === 'function' ? children() : children}
           </Suspense>
@@ -246,14 +246,7 @@ export const Loader = observer<Props>(function Loader({
     if (hideException) {
       return null;
     }
-    return styled(style)(
-      <ExceptionMessage
-        exception={exception}
-        inline={inline || inlineException}
-        className={className}
-        onRetry={reload}
-      />
-    );
+    return styled(style)(<ExceptionMessage exception={exception} inline={inline || inlineException} className={className} onRetry={reload} />);
   }
 
   if (children && (!loader || !loading) && !overlay) {
@@ -287,21 +280,20 @@ export const Loader = observer<Props>(function Loader({
             <StaticImage icon={spinnerType.secondary} {...use({ secondaryIcon: true })} />
             <StaticImage icon={spinnerType.secondarySmall} {...use({ secondarySmallIcon: true })} />
           </icon>
-          {!hideMessage && <message><Translate token={message || 'ui_processing_loading'} /></message>}
+          {!hideMessage && (
+            <message>
+              <Translate token={message || 'ui_processing_loading'} />
+            </message>
+          )}
           {onCancel && (
             <actions>
-              <Button
-                type="button"
-                mod={['unelevated']}
-                disabled={cancelDisabled}
-                onClick={onCancel}
-              >
-                <Translate token='ui_processing_cancel' />
+              <Button type="button" mod={['unelevated']} disabled={cancelDisabled} onClick={onCancel}>
+                <Translate token="ui_processing_cancel" />
               </Button>
             </actions>
           )}
         </loader>
       </>
-    </LoaderContext.Provider>
+    </LoaderContext.Provider>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Loader/LoaderContext.ts b/webapp/packages/core-blocks/src/Loader/LoaderContext.ts
index b99c3049fd..fb59d6c955 100644
--- a/webapp/packages/core-blocks/src/Loader/LoaderContext.ts
+++ b/webapp/packages/core-blocks/src/Loader/LoaderContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface ILoaderContext {
diff --git a/webapp/packages/core-blocks/src/Loader/loaderStyles.ts b/webapp/packages/core-blocks/src/Loader/loaderStyles.ts
index 1e4d53bce0..dfd299d3c2 100644
--- a/webapp/packages/core-blocks/src/Loader/loaderStyles.ts
+++ b/webapp/packages/core-blocks/src/Loader/loaderStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const loaderStyles = css`
@@ -16,7 +15,7 @@ export const loaderStyles = css`
     justify-content: center;
     align-items: center;
     opacity: 0;
-    transition: opacity cubic-bezier(0.4, 0.0, 0.2, 1) 0.3s;
+    transition: opacity cubic-bezier(0.4, 0, 0.2, 1) 0.3s;
 
     &:global(.animate) {
       opacity: 1;
@@ -84,7 +83,7 @@ export const loaderStyles = css`
     flex-direction: row;
     margin: 0;
     justify-content: left;
-    
+
     & icon {
       width: 24px;
       height: 24px;
@@ -119,21 +118,21 @@ export const loaderStyles = css`
 
   @keyframes rotation {
     from {
-        transform: rotate(0deg);
+      transform: rotate(0deg);
     }
     to {
-        transform: rotate(359deg);
+      transform: rotate(359deg);
     }
   }
 `;
 export const overlayStyles = css`
-    loader {
-      composes: theme-text-on-primary from global;
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background-color: rgba(0, 0, 0, 0.4);
-    }
-  `;
+  loader {
+    composes: theme-text-on-primary from global;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts b/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
index 6e91527204..419ec23bef 100644
--- a/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
+++ b/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import { ILoadableState, isLoadableStateHasException } from '@cloudbeaver/core-utils';
@@ -16,23 +15,15 @@ export interface IAutoLoadable extends ILoadableState {
   load: () => void;
 }
 
-export function useAutoLoad(
-  state: IAutoLoadable | IAutoLoadable[],
-  enabled = true,
-  lazy = false
-) {
+export function useAutoLoad(state: IAutoLoadable | IAutoLoadable[], enabled = true, lazy = false) {
   if (!Array.isArray(state)) {
     state = [state];
   }
 
   for (const loader of state as IAutoLoadable[]) {
-    getComputed( // activate mobx subscriptions
-      () => (
-        (
-          !loader.isLoaded()
-          || loader.isOutdated?.() === true
-        ) && !isLoadableStateHasException(loader)
-      )
+    getComputed(
+      // activate mobx subscriptions
+      () => (!loader.isLoaded() || loader.isOutdated?.() === true) && !isLoadableStateHasException(loader),
     );
   }
 
@@ -42,10 +33,7 @@ export function useAutoLoad(
     }
 
     for (const loader of state as IAutoLoadable[]) {
-      if (
-        isLoadableStateHasException(loader)
-        || (loader.lazy === true && !lazy)
-      ) {
+      if (isLoadableStateHasException(loader) || (loader.lazy === true && !lazy)) {
         continue;
       }
 
@@ -54,4 +42,4 @@ export function useAutoLoad(
       }
     }
   });
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx b/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
index 54169ab267..1815311c77 100644
--- a/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
+++ b/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useRef } from 'react';
 import styled from 'reshadow';
 
@@ -24,12 +23,12 @@ function LoadingScreen() {
       setTimeout(() => (loadingNode as any).classList.add(styles.fadeIn));
       setTimeout(() => appContainer.removeChild(loadingNode), FADE_IN_DELAY);
     },
-    []
+    [],
   );
 
   return styled(styles)(
     <div ref={ref}>
       <Icon name="logo" viewBox="0 0 1755.6533 681.13202" />
-    </div>
+    </div>,
   );
 }
diff --git a/webapp/packages/core-blocks/src/Menu/ACTION_ICON_BUTTON_STYLES.ts b/webapp/packages/core-blocks/src/Menu/ACTION_ICON_BUTTON_STYLES.ts
index 1c0981edd6..05180fdf80 100644
--- a/webapp/packages/core-blocks/src/Menu/ACTION_ICON_BUTTON_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Menu/ACTION_ICON_BUTTON_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const ACTION_ICON_BUTTON_STYLES = css`
@@ -19,4 +18,4 @@ export const ACTION_ICON_BUTTON_STYLES = css`
     overflow: hidden;
     flex-shrink: 0;
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx
index d4c1ed915a..eb4f09a45f 100644
--- a/webapp/packages/core-blocks/src/Menu/Menu.tsx
+++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx
@@ -5,7 +5,6 @@
  * 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 React, { forwardRef, useLayoutEffect, useRef, useState } from 'react';
 import { MenuButton, MenuInitialState, useMenuState } from 'reakit/Menu';
@@ -40,105 +39,127 @@ interface IMenuProps extends Omit<React.ButtonHTMLAttributes<any>, 'style'> {
   onVisibleSwitch?: (visible: boolean) => void;
 }
 
-export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function Menu({
-  mouseContextMenu,
-  label,
-  items,
-  menuRef,
-  disclosure,
-  children,
-  style,
-  placement,
-  visible,
-  hasBindings,
-  panelAvailable,
-  getHasBindings,
-  onVisibleSwitch,
-  modal,
-  submenu,
-  rtl,
-  ...props
-}, ref) {
-  const innerMenuButtonRef = useRef<HTMLButtonElement>(null);
-  const combinedRef = useCombinedRef(ref, innerMenuButtonRef);
-  const [relativePosition, setRelativePosition] = useState<{ x: number; y: number } | null>(null);
-  const menuButtonLinkRef = useRef<HTMLButtonElement>(null);
-  const menuPanelRef = useRef<HTMLDivElement>(null);
-  const propsRef = useObjectRef({ onVisibleSwitch, visible });
-  const menu = useMenuState({
-    modal,
-    placement,
-    visible,
-    rtl,
-  });
-  const styles = useStyles(menuPanelStyles, style);
+export const Menu = observer<IMenuProps, HTMLButtonElement>(
+  forwardRef(function Menu(
+    {
+      mouseContextMenu,
+      label,
+      items,
+      menuRef,
+      disclosure,
+      children,
+      style,
+      placement,
+      visible,
+      hasBindings,
+      panelAvailable,
+      getHasBindings,
+      onVisibleSwitch,
+      modal,
+      submenu,
+      rtl,
+      ...props
+    },
+    ref,
+  ) {
+    const innerMenuButtonRef = useRef<HTMLButtonElement>(null);
+    const combinedRef = useCombinedRef(ref, innerMenuButtonRef);
+    const [relativePosition, setRelativePosition] = useState<{ x: number; y: number } | null>(null);
+    const menuButtonLinkRef = useRef<HTMLButtonElement>(null);
+    const menuPanelRef = useRef<HTMLDivElement>(null);
+    const propsRef = useObjectRef({ onVisibleSwitch, visible });
+    const menu = useMenuState({
+      modal,
+      placement,
+      visible,
+      rtl,
+    });
+    const styles = useStyles(menuPanelStyles, style);
 
-  if (menuRef) {
-  //@ts-expect-error Ref mutation
-    menuRef.current = menu;
-  }
-
-  let menuVisible = menu.visible;
-
-  if (panelAvailable === false) {
-    menuVisible = false;
-  }
-
-  useLayoutEffect(() => {
-    if (!menuVisible) {
-      setRelativePosition(null);
+    if (menuRef) {
+      //@ts-expect-error Ref mutation
+      menuRef.current = menu;
     }
 
-    propsRef.onVisibleSwitch?.(menuVisible);
-  }, [menuVisible]);
+    let menuVisible = menu.visible;
 
-  useLayoutEffect(() => {
-    if (!mouseContextMenu?.position) {
-      return;
+    if (panelAvailable === false) {
+      menuVisible = false;
     }
 
-    if (menuVisible) {
-      menu.hide();
-      return;
-    }
-
-    if (innerMenuButtonRef.current) {
-      menu.show();
-
-      const boxSize = innerMenuButtonRef.current.getBoundingClientRect();
-      setRelativePosition({
-        x: mouseContextMenu.position.x - boxSize.x,
-        y: mouseContextMenu.position.y - boxSize.y,
-      });
-
-      mouseContextMenu.position = null;
-    }
-  }, [mouseContextMenu?.position, menuVisible]);
-
-  useLayoutEffect(() => {
-    if (relativePosition) {
-      if (menuButtonLinkRef.current) {
-        menuButtonLinkRef.current.style.left = `${relativePosition.x}px`;
-        menuButtonLinkRef.current.style.top = `${relativePosition.y}px`;
+    useLayoutEffect(() => {
+      if (!menuVisible) {
+        setRelativePosition(null);
       }
+
+      propsRef.onVisibleSwitch?.(menuVisible);
+    }, [menuVisible]);
+
+    useLayoutEffect(() => {
+      if (!mouseContextMenu?.position) {
+        return;
+      }
+
+      if (menuVisible) {
+        menu.hide();
+        return;
+      }
+
+      if (innerMenuButtonRef.current) {
+        menu.show();
+
+        const boxSize = innerMenuButtonRef.current.getBoundingClientRect();
+        setRelativePosition({
+          x: mouseContextMenu.position.x - boxSize.x,
+          y: mouseContextMenu.position.y - boxSize.y,
+        });
+
+        mouseContextMenu.position = null;
+      }
+    }, [mouseContextMenu?.position, menuVisible]);
+
+    useLayoutEffect(() => {
+      if (relativePosition) {
+        if (menuButtonLinkRef.current) {
+          menuButtonLinkRef.current.style.left = `${relativePosition.x}px`;
+          menuButtonLinkRef.current.style.top = `${relativePosition.y}px`;
+        }
+      }
+    });
+
+    const MenuButtonLink = MenuButton;
+
+    if (React.isValidElement(children) && disclosure) {
+      return styled(styles)(
+        <ErrorBoundary>
+          <MenuStateContext.Provider value={menu}>
+            <MenuButton key={relativePosition ? 'link' : 'main'} ref={combinedRef} {...menu} visible={menuVisible} {...props} {...children.props}>
+              {disclosureProps => React.cloneElement(children, { ...disclosureProps, ...children.props })}
+            </MenuButton>
+            <MenuPanel
+              ref={menuPanelRef}
+              label={label}
+              menu={menu}
+              style={style}
+              rtl={rtl}
+              submenu={submenu}
+              panelAvailable={panelAvailable}
+              hasBindings={hasBindings}
+              getHasBindings={getHasBindings}
+            >
+              {items}
+            </MenuPanel>
+            {relativePosition && <MenuButtonLink ref={menuButtonLinkRef} {...menu} visible={menuVisible} />}
+          </MenuStateContext.Provider>
+        </ErrorBoundary>,
+      );
     }
-  });
 
-  const MenuButtonLink = MenuButton;
-
-  if (React.isValidElement(children) && disclosure) {
     return styled(styles)(
       <ErrorBoundary>
         <MenuStateContext.Provider value={menu}>
-          <MenuButton
-            key={relativePosition ? 'link' : 'main'}
-            ref={combinedRef}
-            {...menu}
-            visible={menuVisible}
-            {...props}
-            {...children.props}
-          >
-            {disclosureProps => React.cloneElement(children, { ...disclosureProps, ...children.props })}
+          <MenuButton key={relativePosition ? 'link' : 'main'} ref={combinedRef} {...menu} visible={menuVisible} {...props}>
+            <box>{children}</box>
           </MenuButton>
           <MenuPanel
             ref={menuPanelRef}
@@ -153,51 +174,9 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(forwardRef(function
           >
             {items}
           </MenuPanel>
-          {relativePosition && (
-            <MenuButtonLink
-              ref={menuButtonLinkRef}
-              {...menu}
-              visible={menuVisible}
-            />
-          )}
+          {relativePosition && <MenuButtonLink ref={menuButtonLinkRef} {...menu} visible={menuVisible} />}
         </MenuStateContext.Provider>
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
-  }
-
-  return styled(styles)(
-    <ErrorBoundary>
-      <MenuStateContext.Provider value={menu}>
-        <MenuButton
-          key={relativePosition ? 'link' : 'main'}
-          ref={combinedRef}
-          {...menu}
-          visible={menuVisible}
-          {...props}
-        >
-          <box>{children}</box>
-        </MenuButton>
-        <MenuPanel
-          ref={menuPanelRef}
-          label={label}
-          menu={menu}
-          style={style}
-          rtl={rtl}
-          submenu={submenu}
-          panelAvailable={panelAvailable}
-          hasBindings={hasBindings}
-          getHasBindings={getHasBindings}
-        >
-          {items}
-        </MenuPanel>
-        {relativePosition && (
-          <MenuButtonLink
-            ref={menuButtonLinkRef}
-            {...menu}
-            visible={menuVisible}
-          />
-        )}
-      </MenuStateContext.Provider>
-    </ErrorBoundary>
-  );
-}));
\ No newline at end of file
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx b/webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx
index 334c5df34b..a9683ae0a0 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ButtonProps } from 'reakit/ts';
 import styled, { css } from 'reshadow';
 
@@ -60,21 +59,12 @@ export const MenuBarSmallItem: React.FC<React.PropsWithChildren<Props>> = functi
   onClick,
   ...rest
 }) {
-
   // TODO: replace IconButton with StaticImage / Icon
   // TODO: use button for icon-box (maybe)
   return styled(useStyles(styles, style))(
     <icon-box className={className} tabIndex={0} onClick={onClick}>
-      {name && (
-        <IconButton
-          name={name}
-          viewBox={viewBox}
-          {...rest}
-        />
-      )}
-      {children && (
-        <icon-label>{children}</icon-label>
-      )}
-    </icon-box>
+      {name && <IconButton name={name} viewBox={viewBox} {...rest} />}
+      {children && <icon-label>{children}</icon-label>}
+    </icon-box>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx b/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx
index 1e69b95ea7..f2a825498d 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -17,26 +16,19 @@ import { MenuItem } from './MenuItem';
 import { MenuItemElement } from './MenuItemElement';
 import { menuPanelStyles } from './menuPanelStyles';
 
-
 interface Props extends Omit<React.ButtonHTMLAttributes<any>, 'style'> {
   style?: ComponentStyle;
 }
 
-export const MenuEmptyItem = observer<Props>(function MenuEmptyItem({
-  style,
-}) {
+export const MenuEmptyItem = observer<Props>(function MenuEmptyItem({ style }) {
   const styles = useStyles(menuPanelStyles, style);
   const translate = useTranslate();
 
   const label = translate('core_ui_empty');
 
   return styled(styles)(
-    <MenuItem
-      id='empty'
-      label={label}
-      disabled
-    >
+    <MenuItem id="empty" label={label} disabled>
       <MenuItemElement label={label} style={style} />
-    </MenuItem>
+    </MenuItem>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Menu/MenuItem.tsx b/webapp/packages/core-blocks/src/Menu/MenuItem.tsx
index a16463a0c0..cc894dde3d 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItem.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItem.tsx
@@ -5,7 +5,6 @@
  * 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 React, { useContext } from 'react';
 import { MenuItem as ReakitMenuItem } from 'reakit/Menu';
@@ -18,7 +17,6 @@ import { useStyles } from '../useStyles';
 import { menuPanelStyles } from './menuPanelStyles';
 import { MenuStateContext } from './MenuStateContext';
 
-
 export interface IMenuItemProps extends Omit<React.ButtonHTMLAttributes<any>, 'style'> {
   label: string;
   hidden?: boolean;
@@ -27,16 +25,7 @@ export interface IMenuItemProps extends Omit<React.ButtonHTMLAttributes<any>, 's
   style?: ComponentStyle;
 }
 
-export const MenuItem = observer<IMenuItemProps>(function MenuItem({
-  label,
-  children,
-  hidden,
-  selected,
-  close,
-  style,
-  onClick,
-  ...rest
-}) {
+export const MenuItem = observer<IMenuItemProps>(function MenuItem({ label, children, hidden, selected, close, style, onClick, ...rest }) {
   const menu = useContext(MenuStateContext);
   const styles = useStyles(menuPanelStyles, style);
 
@@ -59,6 +48,6 @@ export const MenuItem = observer<IMenuItemProps>(function MenuItem({
       onClick={handleClick}
     >
       {children}
-    </MenuItem>
+    </MenuItem>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
index f49e3ea967..d64a384e7f 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -50,22 +49,13 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
 
   return styled(useStyles(menuPanelStyles, style))(
     <menu-panel-item title={tooltip ? translate(tooltip) : title}>
-      <menu-item-icon>
-        {typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon}
-      </menu-item-icon>
-      {displayLabel ? (
-        <menu-item-text title={title}>
-          {title}
-        </menu-item-text>
-      ) : (<padding />)}
-      <menu-item-binding title={binding}>
-        {binding}
-      </menu-item-binding>
+      <menu-item-icon>{typeof icon === 'string' ? <IconOrImage icon={icon} /> : icon}</menu-item-icon>
+      {displayLabel ? <menu-item-text title={title}>{title}</menu-item-text> : <padding />}
+      <menu-item-binding title={binding}>{binding}</menu-item-binding>
       <menu-item-content>
         {loading && <Loader small fullSize />}
         {panelAvailable !== false && menu && !loading && <Icon name="context-menu-submenu" viewBox="0 0 6 7" />}
       </menu-item-content>
-    </menu-panel-item>
-
+    </menu-panel-item>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
index c18401e0cc..a58f87c6a1 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx
@@ -5,7 +5,6 @@
  * 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 { Children, forwardRef } from 'react';
 import { Menu, MenuStateReturn } from 'reakit/Menu';
@@ -19,7 +18,6 @@ import { useStyles } from '../useStyles';
 import { MenuEmptyItem } from './MenuEmptyItem';
 import { menuPanelStyles } from './menuPanelStyles';
 
-
 export interface IMenuPanelProps {
   label: string;
   menu: MenuStateReturn; // from reakit useMenuState
@@ -33,44 +31,32 @@ export interface IMenuPanelProps {
   className?: string;
 }
 
-export const MenuPanel = observer<IMenuPanelProps, HTMLDivElement>(forwardRef(function MenuPanel({
-  label,
-  menu,
-  panelAvailable = true,
-  rtl,
-  getHasBindings,
-  hasBindings,
-  children,
-  style,
-  className,
-}, ref) {
-  const styles = useStyles(menuPanelStyles, style);
-  const visible = menu.visible;
+export const MenuPanel = observer<IMenuPanelProps, HTMLDivElement>(
+  forwardRef(function MenuPanel({ label, menu, panelAvailable = true, rtl, getHasBindings, hasBindings, children, style, className }, ref) {
+    const styles = useStyles(menuPanelStyles, style);
+    const visible = menu.visible;
 
-  if (!visible) {
-    return null;
-  }
+    if (!visible) {
+      return null;
+    }
 
-  hasBindings = panelAvailable && (hasBindings || getComputed(() => getHasBindings?.()));
+    hasBindings = panelAvailable && (hasBindings || getComputed(() => getHasBindings?.()));
 
-  let renderedChildren: React.ReactNode = <></>;
+    let renderedChildren: React.ReactNode = <></>;
 
-  if (panelAvailable) {
-    renderedChildren = typeof children === 'function'
-      ? children()
-      : children;
-  }
+    if (panelAvailable) {
+      renderedChildren = typeof children === 'function' ? children() : children;
+    }
 
-  return styled(styles)(
-    <ErrorBoundary>
-      <Menu ref={ref} {...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
+    return styled(styles)(
+      <ErrorBoundary>
+        <Menu ref={ref} {...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>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/Menu/MenuStateContext.ts b/webapp/packages/core-blocks/src/Menu/MenuStateContext.ts
index 346b7c7a88..f9b93f5efe 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuStateContext.ts
+++ b/webapp/packages/core-blocks/src/Menu/MenuStateContext.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 import type { MenuStateReturn } from 'reakit/ts';
 
 export type IMenuState = MenuStateReturn;
 
-export const MenuStateContext = createContext<IMenuState | null>(null);
\ No newline at end of file
+export const MenuStateContext = createContext<IMenuState | null>(null);
diff --git a/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts b/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
index e5750318b2..137cd3d6c6 100644
--- a/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
+++ b/webapp/packages/core-blocks/src/Menu/menuPanelStyles.ts
@@ -5,177 +5,182 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const menuPanelStyles = css`
-    menu-box {
-      composes: theme-background-surface theme-text-on-surface from global;
+  menu-box {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  MenuItem,
+  MenuItemCheckbox,
+  MenuItemRadio,
+  MenuButton,
+  MenuItemElement {
+    composes: theme-ripple from global;
+  }
+  menu-panel-item,
+  MenuSeparator {
+    composes: theme-border-color-background from global;
+  }
+  MenuButton {
+    background: none;
+    border: none;
+    outline: none !important;
+    color: inherit;
+    cursor: pointer;
+    & box {
+      display: flex;
+      align-items: center;
+      flex: 1;
+      height: inherit;
     }
-    MenuItem,
-    MenuItemCheckbox,
-    MenuItemRadio,
-    MenuButton,
-    MenuItemElement {
-      composes: theme-ripple from global;
-    }
-    menu-panel-item, MenuSeparator {
-      composes: theme-border-color-background from global;
-    }
-    MenuButton {
-      background: none;
-      border: none;
-      outline: none !important;
-      color: inherit;
-      cursor: pointer;
-      & box {
-        display: flex;
-        align-items: center;
-        flex: 1;
-        height: inherit;
-      }
-    }
-    MenuButtonLink {
-      position: absolute;
-      width: 0;
-      height: 0;
-      overflow: hidden;
-      box-sizing: border-box;
-      padding: 0;
-      margin: 0;
-      border: none;
-      background: transparent;
-    }
-    Menu {
-      outline: none;
-      z-index: 999;
-    }
-    MenuPanel[submenu] {
+  }
+  MenuButtonLink {
+    position: absolute;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    box-sizing: border-box;
+    padding: 0;
+    margin: 0;
+    border: none;
+    background: transparent;
+  }
+  Menu {
+    outline: none;
+    z-index: 999;
+  }
+  MenuPanel[submenu] {
+    margin-top: -6px;
+  }
+  menu-box {
+    composes: theme-group-element-radius theme-typography--body2 theme-elevation-z5 from global;
+    min-width: 140px;
+    padding: 6px 0;
+
+    & menu-box {
       margin-top: -6px;
     }
-    menu-box {
-      composes: theme-group-element-radius theme-typography--body2 theme-elevation-z5 from global;
-      min-width: 140px;
-      padding: 6px 0;
+  }
 
-      & menu-box {
-        margin-top: -6px;
-      }
+  menu-box {
+    display: flex;
+    flex-direction: column;
+
+    &:not([|hasBindings]) menu-item-binding {
+      width: 0;
+    }
+  }
+
+  Menu[modal] menu-box {
+    overflow: auto;
+    max-height: 80vh;
+    overflow-x: hidden;
+  }
+
+  MenuItem,
+  MenuItemCheckbox,
+  MenuItemRadio {
+    display: flex;
+    align-items: center;
+    border: none;
+    padding: 0;
+    background: none;
+    text-align: left;
+    outline: none;
+    color: inherit;
+    cursor: pointer;
+    white-space: nowrap;
+
+    &[use|hidden] {
+      display: none;
     }
 
-    menu-box {
-      display: flex;
-      flex-direction: column;
-
-      &:not([|hasBindings]) menu-item-binding {
-        width: 0;
-      }
+    &:global([aria-selected='true']) {
+      opacity: 0.7;
     }
 
-    Menu[modal] menu-box {
-      overflow: auto;
-      max-height: 80vh;
-      overflow-x: hidden;
-    }
-
-    MenuItem, MenuItemCheckbox, MenuItemRadio {
-      display: flex;
-      align-items: center;
-      border: none;
-      padding: 0;
-      background: none;
-      text-align: left;
-      outline: none;
-      color: inherit;
-      cursor: pointer;
-      white-space: nowrap;
-      
-      &[use|hidden] {
-        display: none;
-      }
-
-      &:global([aria-selected="true"]) {
-        opacity: 0.7;
-      }
-
-      &:hover, &:global([aria-expanded="true"]) {
-        & Icon {
-          opacity: 1;
-        }
-      }
-    }
-
-    MenuSeparator {
-      flex: 1;
-      width: 100%;
-      display: flex;
-      margin: 6px 0;
-      border: none !important;
-      border-bottom: 1px solid !important;
-
-      &:first-child, &:last-child {
-        display: none;
-      }
-    }
-
-    menu-item-binding {
-      composes: theme-typography--caption from global;
-    }
-
-    menu-panel-item {
-      flex: 1;
-      display: flex;
-      position: relative;
-      align-items: center;
-      height: 30px;
-      padding: 0 4px;
-
-      & menu-item-text, & menu-item-binding  {
-        display: block;
-        padding: 0 4px;
-      }
-      & menu-item-binding {
-        flex: 1;
-        text-align: right;
-        padding-left: 32px;
-        width: 80px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      & menu-item-icon,
-      & menu-item-content {
-        width: 24px;
-        height: 24px;
-        overflow: hidden;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      & menu-item-content Icon {
-        width: 10px;
-        height: 10px;
-      }
+    &:hover,
+    &:global([aria-expanded='true']) {
       & Icon {
-        width: 16px;
-        height: 16px;
-        opacity: 0.5;
-      }
-      & IconOrImage {
-        width: 16px;
-        height: 16px;
-        object-fit: contain;
-      }
-      & Loader {
-        width: 16px;
+        opacity: 1;
       }
     }
+  }
 
-    Menu[rtl] {
-      & menu-item-text {
-        text-align: right;
-      }
-      & menu-panel-item menu-item-content Icon {
-        transform: rotate(180deg);
-      }
+  MenuSeparator {
+    flex: 1;
+    width: 100%;
+    display: flex;
+    margin: 6px 0;
+    border: none !important;
+    border-bottom: 1px solid !important;
+
+    &:first-child,
+    &:last-child {
+      display: none;
     }
-  `;
+  }
+
+  menu-item-binding {
+    composes: theme-typography--caption from global;
+  }
+
+  menu-panel-item {
+    flex: 1;
+    display: flex;
+    position: relative;
+    align-items: center;
+    height: 30px;
+    padding: 0 4px;
+
+    & menu-item-text,
+    & menu-item-binding {
+      display: block;
+      padding: 0 4px;
+    }
+    & menu-item-binding {
+      flex: 1;
+      text-align: right;
+      padding-left: 32px;
+      width: 80px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    & menu-item-icon,
+    & menu-item-content {
+      width: 24px;
+      height: 24px;
+      overflow: hidden;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    & menu-item-content Icon {
+      width: 10px;
+      height: 10px;
+    }
+    & Icon {
+      width: 16px;
+      height: 16px;
+      opacity: 0.5;
+    }
+    & IconOrImage {
+      width: 16px;
+      height: 16px;
+      object-fit: contain;
+    }
+    & Loader {
+      width: 16px;
+    }
+  }
+
+  Menu[rtl] {
+    & menu-item-text {
+      text-align: right;
+    }
+    & menu-panel-item menu-item-content Icon {
+      transform: rotate(180deg);
+    }
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Menu/useMouseContextMenu.ts b/webapp/packages/core-blocks/src/Menu/useMouseContextMenu.ts
index 191874a965..679769a947 100644
--- a/webapp/packages/core-blocks/src/Menu/useMouseContextMenu.ts
+++ b/webapp/packages/core-blocks/src/Menu/useMouseContextMenu.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { useObservableRef } from '../useObservableRef';
@@ -21,19 +20,24 @@ export interface IMouseContextMenu {
 }
 
 export function useMouseContextMenu(): IMouseContextMenu {
-  return useObservableRef<IMouseContextMenu>(() => ({
-    position: null,
-    handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
-      if (!event.currentTarget.contains(event.target as Node)) {
-        return;
-      }
-      event.preventDefault();
-      event.stopPropagation();
+  return useObservableRef<IMouseContextMenu>(
+    () => ({
+      position: null,
+      handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
+        if (!event.currentTarget.contains(event.target as Node)) {
+          return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
 
-      this.position = {
-        x: event.clientX,
-        y: event.clientY,
-      };
-    },
-  }), { position: observable.ref }, false, ['handleContextMenuOpen']);
-}
\ No newline at end of file
+        this.position = {
+          x: event.clientX,
+          y: event.clientY,
+        };
+      },
+    }),
+    { position: observable.ref },
+    false,
+    ['handleContextMenuOpen'],
+  );
+}
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
index 4f410fd4b0..61514b2f08 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 
@@ -44,11 +43,14 @@ export const ObjectPropertyInfoForm = observer<ObjectPropertyFormProps>(function
   hideEmptyPlaceholder,
   onFocus,
 }) {
-  const handleFocus = useCallback((e: React.FocusEvent<HTMLInputElement>) => {
-    if (onFocus) {
-      onFocus(e.target.name);
-    }
-  }, [onFocus]);
+  const handleFocus = useCallback(
+    (e: React.FocusEvent<HTMLInputElement>) => {
+      if (onFocus) {
+        onFocus(e.target.name);
+      }
+    },
+    [onFocus],
+  );
 
   if (properties.length === 0 && !hideEmptyPlaceholder) {
     return <TextPlaceholder>Properties empty</TextPlaceholder>;
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
index ef5ce07373..816d890e9f 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
@@ -5,7 +5,6 @@
  * 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 type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
@@ -112,7 +111,9 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
   if (controltype === 'link') {
     return (
       <FormFieldDescription label={property.displayName} className={className}>
-        <Link href={state?.[property.id!]} target='_blank' rel='noopener noreferrer'>{property.description}</Link>
+        <Link href={state?.[property.id!]} target="_blank" rel="noopener noreferrer">
+          {property.description}
+        </Link>
       </FormFieldDescription>
     );
   }
@@ -206,7 +207,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
           state={state}
           disabled={disabled}
           readOnly={readOnly}
-          mod='surface'
+          mod="surface"
           className={className}
         >
           {property.displayName ?? ''}
@@ -222,7 +223,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         value={value}
         disabled={disabled}
         readOnly={readOnly}
-        mod='surface'
+        mod="surface"
         className={className}
       >
         {property.displayName ?? ''}
@@ -244,7 +245,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         readOnly={readOnly}
         autoHide={autoHide}
         autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
-        mod='surface'
+        mod="surface"
         className={className}
         onFocus={onFocus}
       >
@@ -265,7 +266,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
       disabled={disabled}
       readOnly={readOnly}
       autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
-      mod='surface'
+      mod="surface"
       className={className}
       onFocus={onFocus}
     >
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/useObjectPropertyCategories.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/useObjectPropertyCategories.tsx
index fa67965f73..7f35b5d809 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/useObjectPropertyCategories.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/useObjectPropertyCategories.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, IComputedValue } from 'mobx';
 import { useMemo } from 'react';
 
@@ -17,26 +16,30 @@ interface ICategoriesInfo {
 }
 
 export function useObjectPropertyCategories(properties: ObjectPropertyInfo[]) {
-  const categories: IComputedValue<ICategoriesInfo> = useMemo(() => computed(() => {
-    const result: ICategoriesInfo = {
-      categories: [],
-      isUncategorizedExists: false,
-    };
+  const categories: IComputedValue<ICategoriesInfo> = useMemo(
+    () =>
+      computed(() => {
+        const result: ICategoriesInfo = {
+          categories: [],
+          isUncategorizedExists: false,
+        };
 
-    for (const property of properties) {
-      const category = property.category;
-      if (!category) {
-        result.isUncategorizedExists = true;
-        continue;
-      }
+        for (const property of properties) {
+          const category = property.category;
+          if (!category) {
+            result.isUncategorizedExists = true;
+            continue;
+          }
 
-      if (!result.categories.includes(category)) {
-        result.categories.push(category);
-      }
-    }
+          if (!result.categories.includes(category)) {
+            result.categories.push(category);
+          }
+        }
 
-    return result;
-  }), [properties]);
+        return result;
+      }),
+    [properties],
+  );
 
   return categories.get();
 }
diff --git a/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts b/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
index 21b77adf79..46317c1020 100644
--- a/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
@@ -5,120 +5,123 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const OVERLAY_BASE_STYLES = css`
-    overlay {
-      composes: theme-text-on-primary from global;
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background-color: rgba(0, 0, 0, 0.4);
+  overlay {
+    composes: theme-text-on-primary from global;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.4);
 
-      &:not([|active]) {
-        display: none;
-      }
-      
-      &[|fill] {
-        background-color: var(--theme-background-surface);
-      }
-    }
-  
-    overlay {
-      margin: auto;
+    &:not([|active]) {
+      display: none;
     }
 
-    overlay, box {
-      display: flex;
-      flex-direction: column; 
-      justify-content: center;
-      align-items: center;
-      overflow: auto;
+    &[|fill] {
+      background-color: var(--theme-background-surface);
     }
+  }
 
-    box {
-      composes: theme-background-surface theme-text-on-surface theme-elevation-z6 from global;
-      border-radius: 0.25rem;
-      align-items: normal;
-      max-width: calc(100% - 48px);
-      max-height: calc(100% - 48px);
+  overlay {
+    margin: auto;
+  }
+
+  overlay,
+  box {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    overflow: auto;
+  }
+
+  box {
+    composes: theme-background-surface theme-text-on-surface theme-elevation-z6 from global;
+    border-radius: 0.25rem;
+    align-items: normal;
+    max-width: calc(100% - 48px);
+    max-height: calc(100% - 48px);
+  }
+
+  overlay[|fill] box {
+    box-shadow: none;
+  }
+
+  actions {
+    gap: 16px;
+    display: flex;
+  }
+
+  header,
+  message,
+  actions {
+    flex-shrink: 0;
+    padding: 24px;
+  }
+
+  message {
+    padding-right: 0px;
+    overflow: auto;
+    flex: 1;
+
+    &:not(:first-child) {
+      padding-top: 0px;
     }
+  }
 
-    overlay[|fill] box {
-      box-shadow: none;
-    }
+  message-box {
+    padding-right: 24px;
+  }
 
-    actions {
-      gap: 16px;
-      display: flex;
-    }
+  header {
+    position: relative;
+    display: grid;
+    grid-template-columns: max-content 1fr;
+    flex: 0 0 auto;
+    box-sizing: border-box;
+  }
 
-    header, message, actions {
-      flex-shrink: 0;
-      padding: 24px;
-    }
+  header-title,
+  sub-title {
+    max-width: 400px;
+  }
 
-    message {
-      padding-right: 0px;
-      overflow: auto;
-      flex: 1;
+  header-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+    min-height: 24px;
+    overflow: auto;
+  }
 
-      &:not(:first-child) {
-        padding-top: 0px;
-      }
-    }
+  icon-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 
-    message-box {
-      padding-right: 24px;
-    }
+  IconOrImage {
+    width: 24px;
+    height: 24px;
+    margin-right: 16px;
+  }
 
-    header {
-      position: relative;
-      display: grid;
-      grid-template-columns: max-content 1fr;
-      flex: 0 0 auto;
-      box-sizing: border-box;
-    }
+  h3 {
+    margin: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
-    header-title, sub-title {
-      max-width: 400px;
-    }
-
-    header-title {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      position: relative;
-      min-height: 24px;
-      overflow: auto;
-    }
-
-    icon-container {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    IconOrImage {
-      width: 24px;
-      height: 24px;
-      margin-right: 16px;
-    }
-
-    h3 {
-      margin: 0;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    sub-title {
-      composes: theme-typography--caption from global;
-      grid-column: 2;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  `;
\ No newline at end of file
+  sub-title {
+    composes: theme-typography--caption from global;
+    grid-column: 2;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
index cebbc5c87b..95394888ae 100644
--- a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
@@ -5,7 +5,6 @@
  * 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, { use } from 'reshadow';
 
@@ -17,21 +16,14 @@ interface Props {
   className?: string;
 }
 
-export const Overlay = observer<React.PropsWithChildren<Props>>(function Overlay({
-  active,
-  fill,
-  className,
-  children,
-}) {
+export const Overlay = observer<React.PropsWithChildren<Props>>(function Overlay({ active, fill, className, children }) {
   if (!active) {
     return null;
   }
 
   return styled(OVERLAY_BASE_STYLES)(
     <overlay className={className} {...use({ active, fill })}>
-      <box>
-        {children}
-      </box>
-    </overlay>
+      <box>{children}</box>
+    </overlay>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx
index f5a14880e1..92c27b3084 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,13 +14,6 @@ interface Props {
   className?: string;
 }
 
-export const OverlayActions = observer<React.PropsWithChildren<Props>>(function OverlayActions({
-  className,
-  children,
-}) {
-  return styled(OVERLAY_BASE_STYLES)(
-    <actions className={className}>
-      {children}
-    </actions>
-  );
-});
\ No newline at end of file
+export const OverlayActions = observer<React.PropsWithChildren<Props>>(function OverlayActions({ className, children }) {
+  return styled(OVERLAY_BASE_STYLES)(<actions className={className}>{children}</actions>);
+});
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx
index 687d04a351..b9c7ef92a6 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES';
@@ -15,9 +14,5 @@ interface Props {
 }
 
 export const OverlayHeader: React.FC<React.PropsWithChildren<Props>> = function OverlayHeader({ className, children }) {
-  return styled(OVERLAY_BASE_STYLES)(
-    <header className={className}>
-      {children}
-    </header>
-  );
-};
\ No newline at end of file
+  return styled(OVERLAY_BASE_STYLES)(<header className={className}>{children}</header>);
+};
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx
index b769384b52..45df0b3c55 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { IconOrImage } from '../IconOrImage';
@@ -26,6 +25,6 @@ export const OverlayHeaderIcon: React.FC<React.PropsWithChildren<Props>> = funct
     <icon-container className={className}>
       {icon && <IconOrImage icon={icon} viewBox={viewBox} />}
       {children}
-    </icon-container>
+    </icon-container>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx
index 1acd1b2715..75de360886 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES';
@@ -15,7 +14,5 @@ interface Props {
 }
 
 export const OverlayHeaderSubTitle: React.FC<React.PropsWithChildren<Props>> = function OverlayHeaderSubTitle({ className, children }) {
-  return styled(OVERLAY_BASE_STYLES)(
-    <sub-title className={className}>{children}</sub-title>
-  );
-};
\ No newline at end of file
+  return styled(OVERLAY_BASE_STYLES)(<sub-title className={className}>{children}</sub-title>);
+};
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx
index 4e3f5fdc47..578d06a9d4 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES';
@@ -18,6 +17,6 @@ export const OverlayHeaderTitle: React.FC<React.PropsWithChildren<Props>> = func
   return styled(OVERLAY_BASE_STYLES)(
     <header-title className={className}>
       <h3>{children}</h3>
-    </header-title>
+    </header-title>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx
index d79fdede0d..62daa21e6c 100644
--- a/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,15 +14,10 @@ interface Props {
   className?: string;
 }
 
-export const OverlayMessage = observer<React.PropsWithChildren<Props>>(function OverlayMessage({
-  className,
-  children,
-}) {
+export const OverlayMessage = observer<React.PropsWithChildren<Props>>(function OverlayMessage({ className, children }) {
   return styled(OVERLAY_BASE_STYLES)(
     <message className={className}>
-      <message-box>
-        {children}
-      </message-box>
-    </message>
+      <message-box>{children}</message-box>
+    </message>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Placeholder/Placeholder.tsx b/webapp/packages/core-blocks/src/Placeholder/Placeholder.tsx
index cb03c80d9e..c61d5a94cb 100644
--- a/webapp/packages/core-blocks/src/Placeholder/Placeholder.tsx
+++ b/webapp/packages/core-blocks/src/Placeholder/Placeholder.tsx
@@ -5,7 +5,6 @@
  * 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 type { PlaceholderContainer, PlaceholderElement } from './PlaceholderContainer';
@@ -15,27 +14,24 @@ type Props<T extends Record<string, any>> = T & {
   elements?: PlaceholderElement<T>[];
 };
 
-export const Placeholder = observer(function Placeholder<T extends Record<string, any>>({
-  container,
-  elements: extraElements,
-  ...rest
-}: Props<T>) {
+export const Placeholder = observer(function Placeholder<T extends Record<string, any>>({ container, elements: extraElements, ...rest }: Props<T>) {
   let elements = container.get();
 
   if (extraElements) {
-    elements = [...elements, ...extraElements]
-      .sort((a, b) => {
-        if (a.order === b.order) {
-          return 0;
-        }
+    elements = [...elements, ...extraElements].sort((a, b) => {
+      if (a.order === b.order) {
+        return 0;
+      }
 
-        return (a.order ?? Number.MAX_SAFE_INTEGER) - (b.order ?? Number.MAX_SAFE_INTEGER);
-      });
+      return (a.order ?? Number.MAX_SAFE_INTEGER) - (b.order ?? Number.MAX_SAFE_INTEGER);
+    });
   }
 
   return (
     <>
-      {elements.map(({ id, component: Component }) => <Component key={id} {...(rest as any as T)} />)}
+      {elements.map(({ id, component: Component }) => (
+        <Component key={id} {...(rest as any as T)} />
+      ))}
     </>
   );
 });
diff --git a/webapp/packages/core-blocks/src/Placeholder/PlaceholderContainer.ts b/webapp/packages/core-blocks/src/Placeholder/PlaceholderContainer.ts
index 4c0bfa2df6..6637c1b924 100644
--- a/webapp/packages/core-blocks/src/Placeholder/PlaceholderContainer.ts
+++ b/webapp/packages/core-blocks/src/Placeholder/PlaceholderContainer.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { uuid } from '@cloudbeaver/core-utils';
@@ -41,8 +40,7 @@ export class PlaceholderContainer<T extends Record<string, any> = Record<string,
   }
 
   private findPosition(order: number) {
-    const position = this.placeholders
-      .findIndex(placeholder => placeholder.order === undefined || order <= placeholder.order);
+    const position = this.placeholders.findIndex(placeholder => placeholder.order === undefined || order <= placeholder.order);
 
     if (position === -1) {
       return this.placeholders.length;
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
index a82eacc23b..76eabfb2c7 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useMemo, useState } from 'react';
@@ -40,11 +39,16 @@ export const PropertiesTable = observer<Props>(function PropertiesTable(props) {
 
   const [filterValue, setFilterValue] = useState('');
 
-  const sortedProperties = useMemo(() => computed(() => propsRef.properties
-    .slice()
-    .sort((a, b) => (a.displayName ?? '').localeCompare(b.displayName ?? ''))
-    .filter(p => p.new || p.key.toLocaleLowerCase().includes(filterValue.toLocaleLowerCase()))
-  ), [propsRef.properties, filterValue]);
+  const sortedProperties = useMemo(
+    () =>
+      computed(() =>
+        propsRef.properties
+          .slice()
+          .sort((a, b) => (a.displayName ?? '').localeCompare(b.displayName ?? ''))
+          .filter(p => p.new || p.key.toLocaleLowerCase().includes(filterValue.toLocaleLowerCase())),
+      ),
+    [propsRef.properties, filterValue],
+  );
 
   const changeName = useCallback((id: string, key: string) => {
     const { properties, propertiesState, onKeyChange } = propsRef;
@@ -109,40 +113,23 @@ export const PropertiesTable = observer<Props>(function PropertiesTable(props) {
     }
   }, []);
 
-  const isKeyUnique = useCallback(
-    (key: string) => propsRef.properties.filter(property => property.key === key).length === 1,
-    []
-  );
+  const isKeyUnique = useCallback((key: string) => propsRef.properties.filter(property => property.key === key).length === 1, []);
 
   return styled(PROPERTIES_TABLE_STYLES)(
     <properties className={className}>
       <properties-header>
         <properties-header-name>
-          <div>
-            {translate('core_block_properties_table_name')}
-          </div>
+          <div>{translate('core_block_properties_table_name')}</div>
           {props.filterable ? (
-            <ShadowInput
-              value={filterValue}
-              placeholder={translate('core_block_properties_table_filter_name')}
-              onChange={setFilterValue}
-            />
+            <ShadowInput value={filterValue} placeholder={translate('core_block_properties_table_filter_name')} onChange={setFilterValue} />
           ) : null}
         </properties-header-name>
-        <properties-header-value>
-          {translate('core_block_properties_table_value')}
-        </properties-header-value>
+        <properties-header-value>{translate('core_block_properties_table_value')}</properties-header-value>
       </properties-header>
       <properties-list>
         {onAdd && !readOnly && (
           <properties-header-add>
-            <Button
-              icon='add_sm'
-              viewBox="0 0 18 18"
-              type='button'
-              styles={PROPERTIES_TABLE_ADD_STYLES}
-              onClick={() => onAdd()}
-            >
+            <Button icon="add_sm" viewBox="0 0 18 18" type="button" styles={PROPERTIES_TABLE_ADD_STYLES} onClick={() => onAdd()}>
               {translate('core_block_properties_table_add')}
             </Button>
           </properties-header-add>
@@ -161,6 +148,6 @@ export const PropertiesTable = observer<Props>(function PropertiesTable(props) {
         ))}
         <properties-list-overflow />
       </properties-list>
-    </properties>
+    </properties>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx
index 1b9f02fa4c..a1e45cc736 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx
@@ -5,9 +5,8 @@
  * 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, useRef, useState, useLayoutEffect } from 'react';
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
 import { ShadowInput } from '../FormControls/ShadowInput';
@@ -18,92 +17,100 @@ import type { IProperty } from './IProperty';
 import { PropertyValueSelector } from './PropertyValueSelector';
 
 const styles = css`
-    [|error] {
-      composes: theme-text-error from global;
-    }
-    property-item, button {
-      composes: theme-ripple from global;
-    }
-    property-item {
-      box-sizing: border-box;
-      display: inline-flex;
-      padding: 0px 1px;
-    }
-    property-name, property-value {
-      composes: theme-typography--caption from global;
-      position: relative;
-      display: flex;
-      align-items: center;
-      box-sizing: border-box;
-      flex: 1;
-      padding: 4px 0;
+  [|error] {
+    composes: theme-text-error from global;
+  }
+  property-item,
+  button {
+    composes: theme-ripple from global;
+  }
+  property-item {
+    box-sizing: border-box;
+    display: inline-flex;
+    padding: 0px 1px;
+  }
+  property-name,
+  property-value {
+    composes: theme-typography--caption from global;
+    position: relative;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    flex: 1;
+    padding: 4px 0;
 
-      & ShadowInput {
-        height: 24px;
-        padding: 0 36px 0 12px;
-      }
+    & ShadowInput {
+      height: 24px;
+      padding: 0 36px 0 12px;
     }
-    property-value, property-name {
-      margin-left: 24px;
-    }
-    property-name {
-      flex: 0 0 auto;
-      width: 276px;
-    }
-    property-remove {
-      position: relative;
-      flex: 0 0 auto;
-      align-items: center;
-      display: flex;
-      opacity: 0;
-    }
-    property-select {
-      flex: 0 0 auto;
-      align-items: center;
-      display: flex;
-    }
-    property-item:hover property-remove {
-      opacity: 1;
-    }
-    ShadowInput {
-      composes: theme-background-surface from global;
-    }
-    property-name ShadowInput, property-value ShadowInput {
-      box-sizing: border-box;
-      font: inherit;
-      color: inherit;
-      width: 100%;
-      outline: none;
+  }
+  property-value,
+  property-name {
+    margin-left: 24px;
+  }
+  property-name {
+    flex: 0 0 auto;
+    width: 276px;
+  }
+  property-remove {
+    position: relative;
+    flex: 0 0 auto;
+    align-items: center;
+    display: flex;
+    opacity: 0;
+  }
+  property-select {
+    flex: 0 0 auto;
+    align-items: center;
+    display: flex;
+  }
+  property-item:hover property-remove {
+    opacity: 1;
+  }
+  ShadowInput {
+    composes: theme-background-surface from global;
+  }
+  property-name ShadowInput,
+  property-value ShadowInput {
+    box-sizing: border-box;
+    font: inherit;
+    color: inherit;
+    width: 100%;
+    outline: none;
 
-      &[|edited] {
-        font-weight: 600;
-      }
-      &:global([readonly]), &:not(:focus):not([|focus]) {
-        background: transparent !important;
-        border: solid 2px transparent !important;
-      }
+    &[|edited] {
+      font-weight: 600;
     }
-    Icon, IconOrImage {
-      height: 16px;
-      display: block;
+    &:global([readonly]),
+    &:not(:focus):not([|focus]) {
+      background: transparent !important;
+      border: solid 2px transparent !important;
     }
-    property-select Icon, property-select IconOrImage {
-      &[|focus] {
-        transform: rotate(180deg);
-      }
+  }
+  Icon,
+  IconOrImage {
+    height: 16px;
+    display: block;
+  }
+  property-select Icon,
+  property-select IconOrImage {
+    &[|focus] {
+      transform: rotate(180deg);
     }
-    button {
-      background: transparent;
-      outline: none;
-      padding: 4px;
-      cursor: pointer;
-    }
-    button, PropertyValueSelector {
-      composes: theme-form-element-radius from global;
-      margin: 2px;
-      overflow: hidden;
-    }
-  `;
+  }
+  button {
+    background: transparent;
+    outline: none;
+    padding: 4px;
+    cursor: pointer;
+  }
+  button,
+  PropertyValueSelector {
+    composes: theme-form-element-radius from global;
+    margin: 2px;
+    overflow: hidden;
+  }
+`;
 
 interface Props {
   property: IProperty;
@@ -115,15 +122,7 @@ interface Props {
   readOnly?: boolean;
 }
 
-export const PropertyItem = observer<Props>(function PropertyItem({
-  property,
-  value,
-  onNameChange,
-  onValueChange,
-  onRemove,
-  error,
-  readOnly,
-}) {
+export const PropertyItem = observer<Props>(function PropertyItem({ property, value, onNameChange, onValueChange, onRemove, error, readOnly }) {
   const translate = useTranslate();
   const isDeletable = !readOnly && !property.displayName;
   const edited = value !== undefined && value !== property.defaultValue;
@@ -133,22 +132,14 @@ export const PropertyItem = observer<Props>(function PropertyItem({
   const [valueRef, setValueRef] = useState<HTMLDivElement | null>(null);
 
   const handleKeyChange = useCallback((key: string) => onNameChange(property.id, key), [property]);
-  const handleValueChange = useCallback(
-    (value: string) => onValueChange(property.id, value),
-    [property]
-  );
+  const handleValueChange = useCallback((value: string) => onValueChange(property.id, value), [property]);
   const handleRemove = useCallback(() => onRemove(property.id), [property]);
   function handleRevert() {
     onValueChange(property.id, property.defaultValue ?? null);
   }
 
   useLayoutEffect(() => {
-    if (
-      keyInputRef.current
-      && isDeletable
-      && property.new
-      && !(document.activeElement instanceof HTMLInputElement)
-    ) {
+    if (keyInputRef.current && isDeletable && property.new && !(document.activeElement instanceof HTMLInputElement)) {
       keyInputRef.current.focus();
     }
   }, [property]);
@@ -160,11 +151,11 @@ export const PropertyItem = observer<Props>(function PropertyItem({
       <property-name title={property.description} {...use({ error })}>
         <ShadowInput
           ref={keyInputRef}
-          type='text'
+          type="text"
           name={property.id}
           placeholder={property.keyPlaceholder}
           readOnly={!isDeletable}
-          autoComplete='none'
+          autoComplete="none"
           onChange={handleKeyChange}
         >
           {property.displayName || property.key}
@@ -172,10 +163,10 @@ export const PropertyItem = observer<Props>(function PropertyItem({
       </property-name>
       <property-value ref={setValueRef} title={propertyValue}>
         <ShadowInput
-          type='text'
+          type="text"
           name={`${property.id}_value`}
           placeholder={property.valuePlaceholder}
-          autoComplete='none'
+          autoComplete="none"
           readOnly={readOnly}
           data-focus={focus}
           onChange={handleValueChange}
@@ -197,7 +188,7 @@ export const PropertyItem = observer<Props>(function PropertyItem({
             </button>
           </property-remove>
         )}
-        {(!readOnly && property.validValues && property.validValues.length > 0) && (
+        {!readOnly && property.validValues && property.validValues.length > 0 && (
           <property-select>
             <PropertyValueSelector
               propertyName={property.id}
@@ -211,6 +202,6 @@ export const PropertyItem = observer<Props>(function PropertyItem({
           </property-select>
         )}
       </property-value>
-    </property-item>
+    </property-item>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
index 2a2ff50f83..b6afa12978 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
@@ -5,15 +5,9 @@
  * 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, useEffect, useRef } from 'react';
-import {
-  useMenuState,
-  Menu,
-  MenuItem,
-  MenuButton
-} from 'reakit/Menu';
+import { Menu, MenuButton, MenuItem, useMenuState } from 'reakit/Menu';
 import styled, { css } from 'reshadow';
 
 import { BASE_DROPDOWN_STYLES } from '../FormControls/BASE_DROPDOWN_STYLES';
@@ -56,7 +50,7 @@ export const PropertyValueSelector = observer<React.PropsWithChildren<Props>>(fu
       menu.hide();
       onSelect(event.currentTarget.id);
     },
-    [menu, onSelect]
+    [menu, onSelect],
   );
   useEffect(() => onSwitch(menu.visible), [menu.visible]);
 
@@ -69,7 +63,7 @@ export const PropertyValueSelector = observer<React.PropsWithChildren<Props>>(fu
       const containerSize = container.getBoundingClientRect();
       if (menuRef.current && containerSize !== undefined) {
         // 1px offset of MenuButton
-        menuRef.current.style.width = (containerSize.width - 1) + 'px';
+        menuRef.current.style.width = containerSize.width - 1 + 'px';
       }
     });
 
@@ -82,16 +76,22 @@ export const PropertyValueSelector = observer<React.PropsWithChildren<Props>>(fu
 
   const visible = menu.visible;
 
-  return styled(BASE_DROPDOWN_STYLES, styles)(
+  return styled(
+    BASE_DROPDOWN_STYLES,
+    styles,
+  )(
     <>
-      <MenuButton {...menu} className={className} visible={visible}>{children}</MenuButton>
+      <MenuButton {...menu} className={className} visible={visible}>
+        {children}
+      </MenuButton>
       <Menu {...menu} ref={menuRef} visible={visible} aria-label={propertyName} modal>
-        {visible && values.map(value => (
-          <MenuItem key={value} id={value} type='button' {...menu} onClick={handleMenuSelect}>
-            {value}
-          </MenuItem>
-        ))}
+        {visible &&
+          values.map(value => (
+            <MenuItem key={value} id={value} type="button" {...menu} onClick={handleMenuSelect}>
+              {value}
+            </MenuItem>
+          ))}
       </Menu>
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/styles.ts b/webapp/packages/core-blocks/src/PropertiesTable/styles.ts
index 1ddd5146be..99005ab314 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/styles.ts
+++ b/webapp/packages/core-blocks/src/PropertiesTable/styles.ts
@@ -5,67 +5,67 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const PROPERTIES_TABLE_STYLES = css`
-    properties {
-      display: flex;
-      flex: 1 0 auto;
-      flex-direction: column;
-    }
-    properties-header {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-secondary from global;
-      box-sizing: border-box;
-      display: inline-flex;
-      border-bottom: solid 1px;
-      align-items: center;
-    }
-    properties-header-name, properties-header-value {
-      composes: theme-typography--caption from global;
-      text-transform: uppercase;
-      box-sizing: border-box;
-      flex: 1;
-      padding: 4px 36px;
-    }
-    properties-header-name {
-      flex: 0 0 auto;
-      width: 300px;
-      display: flex;
-      align-items: center;
-    }
-    properties-header-add {
-      flex: 0 0 auto;
-      padding: 0px 28px;
-    }
+  properties {
+    display: flex;
+    flex: 1 0 auto;
+    flex-direction: column;
+  }
+  properties-header {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-secondary from global;
+    box-sizing: border-box;
+    display: inline-flex;
+    border-bottom: solid 1px;
+    align-items: center;
+  }
+  properties-header-name,
+  properties-header-value {
+    composes: theme-typography--caption from global;
+    text-transform: uppercase;
+    box-sizing: border-box;
+    flex: 1;
+    padding: 4px 36px;
+  }
+  properties-header-name {
+    flex: 0 0 auto;
+    width: 300px;
+    display: flex;
+    align-items: center;
+  }
+  properties-header-add {
+    flex: 0 0 auto;
+    padding: 0px 28px;
+  }
 
-    properties-list {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-      max-height: 600px;
-      padding: 4px 0px;
-    }
+  properties-list {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    max-height: 600px;
+    padding: 4px 0px;
+  }
 
-    properties-list-overflow {
-      composes: branding-overflow from global;
-      position: sticky;
-      flex-shrink: 0;
-      bottom: -4px;
-      width: 100%;
-      height: 24px;
-      pointer-events: none;
-    }
+  properties-list-overflow {
+    composes: branding-overflow from global;
+    position: sticky;
+    flex-shrink: 0;
+    bottom: -4px;
+    width: 100%;
+    height: 24px;
+    pointer-events: none;
+  }
 
-    ShadowInput {
-      composes: theme-background-surface from global;
-      box-sizing: border-box;
-      height: 24px;
-      flex: 1;
-      margin-left: 8px;
-    }
-  `;
+  ShadowInput {
+    composes: theme-background-surface from global;
+    box-sizing: border-box;
+    height: 24px;
+    flex: 1;
+    margin-left: 8px;
+  }
+`;
 
 export const PROPERTIES_TABLE_ADD_STYLES = css`
   button-icon {
diff --git a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
index 3e06e2b759..5631c7c276 100644
--- a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
+++ b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
@@ -5,12 +5,26 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { action, computed, observable, reaction, toJS, untracked, comparer } from 'mobx';
-import { useEffect, useContext, useState } from 'react';
+import { action, comparer, computed, observable, reaction, toJS, untracked } from 'mobx';
+import { useContext, useEffect, useState } from 'react';
 
 import { IServiceConstructor, useService } from '@cloudbeaver/core-di';
-import { CachedMapResource, CachedMapResourceGetter, CachedMapResourceValue, CachedMapResourceLoader, ResourceKeyList, CachedMapResourceListGetter, CachedResourceData, CachedDataResourceGetter, CachedResource, CachedDataResource, CachedResourceKey, CachedResourceContext, ResourceKey, ResourceKeyListAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedDataResource,
+  CachedDataResourceGetter,
+  CachedMapResource,
+  CachedMapResourceGetter,
+  CachedMapResourceListGetter,
+  CachedMapResourceLoader,
+  CachedMapResourceValue,
+  CachedResource,
+  CachedResourceContext,
+  CachedResourceData,
+  CachedResourceKey,
+  ResourceKey,
+  ResourceKeyList,
+  ResourceKeyListAlias,
+} from '@cloudbeaver/core-sdk';
 import { ILoadableState, isArraysEqual, isContainsException, LoadingError } from '@cloudbeaver/core-utils';
 
 import { ErrorContext } from '../ErrorContext';
@@ -23,25 +37,16 @@ interface KeyWithIncludes<TKey, TIncludes> {
   readonly includes: TIncludes;
 }
 
-type ResourceData<
-  TResource extends CachedResource<any, any, any, any, any>,
-  TKey,
-  TIncludes
-> = TResource extends CachedDataResource<any, any, any, any>
+type ResourceData<TResource extends CachedResource<any, any, any, any, any>, TKey, TIncludes> = TResource extends CachedDataResource<
+  any,
+  any,
+  any,
+  any
+>
   ? CachedResourceData<TResource>
-  : CachedMapResourceLoader<
-  TKey,
-  CachedResourceKey<TResource>,
-  CachedResourceData<TResource> extends Map<any, infer I> ? I : never,
-  TIncludes
-  >
-;
+  : CachedMapResourceLoader<TKey, CachedResourceKey<TResource>, CachedResourceData<TResource> extends Map<any, infer I> ? I : never, TIncludes>;
 
-interface IActions<
-  TResource extends CachedResource<any, any, any, any, any>,
-  TKey,
-  TIncludes
-> {
+interface IActions<TResource extends CachedResource<any, any, any, any, any>, TKey, TIncludes> {
   active?: boolean;
   forceSuspense?: boolean;
   silent?: boolean;
@@ -70,26 +75,14 @@ interface IMapResourceState<TResource> extends ILoadableState {
 }
 
 interface IMapResourceListResult<TResource, TIncludes> extends IMapResourceState<TResource> {
-  data: CachedMapResourceListGetter<
-  CachedMapResourceValue<TResource>,
-  TIncludes
-  >;
-  tryGetData: CachedMapResourceListGetter<
-  CachedMapResourceValue<TResource>,
-  TIncludes
-  >;
+  data: CachedMapResourceListGetter<CachedMapResourceValue<TResource>, TIncludes>;
+  tryGetData: CachedMapResourceListGetter<CachedMapResourceValue<TResource>, TIncludes>;
   exception: Error[] | null;
 }
 
 interface IMapResourceResult<TResource, TIncludes> extends IMapResourceState<TResource> {
-  data: CachedMapResourceGetter<
-  CachedMapResourceValue<TResource>,
-  TIncludes
-  >;
-  tryGetData: CachedMapResourceGetter<
-  CachedMapResourceValue<TResource>,
-  TIncludes
-  >;
+  data: CachedMapResourceGetter<CachedMapResourceValue<TResource>, TIncludes>;
+  tryGetData: CachedMapResourceGetter<CachedMapResourceValue<TResource>, TIncludes>;
   exception: Error | null;
 }
 
@@ -99,39 +92,33 @@ interface IDataResourceResult<TResource, TIncludes> extends IMapResourceState<TR
   exception: Error | null;
 }
 
-type TResult<TResource, TKey, TIncludes> = (
-  TResource extends CachedDataResource<any, any, any>
-    ? IDataResourceResult<TResource, TIncludes>
-    : (
-      TKey extends ResourceKeyList<any> | ResourceKeyListAlias<any, any>
-        ? IMapResourceListResult<TResource, TIncludes>
-        : IMapResourceResult<TResource, TIncludes>
-    )
-);
+type TResult<TResource, TKey, TIncludes> = TResource extends CachedDataResource<any, any, any>
+  ? IDataResourceResult<TResource, TIncludes>
+  : TKey extends ResourceKeyList<any> | ResourceKeyListAlias<any, any>
+  ? IMapResourceListResult<TResource, TIncludes>
+  : IMapResourceResult<TResource, TIncludes>;
 
 export function useResource<
   TResource extends CachedResource<any, any, any, any, any>,
   TKeyArg extends ResourceKey<CachedResourceKey<TResource>>,
-  TIncludes extends Readonly<CachedResourceContext<TResource>>
+  TIncludes extends Readonly<CachedResourceContext<TResource>>,
 >(
   component: { name: string },
   ctor: IServiceConstructor<TResource> | TResource,
   keyObj: TResource extends any ? TKeyArg | null | KeyWithIncludes<TKeyArg, TIncludes> : never,
-  actions?: TResource extends any ? IActions<TResource, TKeyArg, TIncludes> : never
+  actions?: TResource extends any ? IActions<TResource, TKeyArg, TIncludes> : never,
 ): TResult<TResource, TKeyArg, TIncludes>;
 
 export function useResource<
   TResource extends CachedResource<any, any, any, any, any>,
   TKeyArg extends ResourceKey<CachedResourceKey<TResource>>,
-  TIncludes extends CachedResourceContext<TResource>
+  TIncludes extends CachedResourceContext<TResource>,
 >(
   component: { name: string },
   ctor: IServiceConstructor<TResource> | TResource,
   keyObj: TResource extends any ? TKeyArg | null | KeyWithIncludes<TKeyArg, TIncludes> : never,
-  actions?: TResource extends any ? IActions<TResource, TKeyArg, TIncludes> : never
-): IMapResourceResult<TResource, TIncludes>
-  | IMapResourceListResult<TResource, TIncludes>
-  | IDataResourceResult<TResource, TIncludes> {
+  actions?: TResource extends any ? IActions<TResource, TKeyArg, TIncludes> : never,
+): IMapResourceResult<TResource, TIncludes> | IMapResourceListResult<TResource, TIncludes> | IDataResourceResult<TResource, TIncludes> {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const resource = ctor instanceof CachedResource ? ctor : useService(ctor);
   const errorContext = useContext(ErrorContext);
@@ -144,30 +131,30 @@ export function useResource<
     includes = keyObj.includes;
   }
 
-  actions = useObjectRef(actions ?? {} as any);
+  actions = useObjectRef(actions ?? ({} as any));
 
-  const propertiesRef = useObservableRef(() => ({
-    key,
-    includes,
-    resource,
-    errorContext,
-  }), {
-    key: observable.ref,
-    includes: observable.ref,
-    resource: observable.ref,
-    errorContext: observable.ref,
-  }, false);
+  const propertiesRef = useObservableRef(
+    () => ({
+      key,
+      includes,
+      resource,
+      errorContext,
+    }),
+    {
+      key: observable.ref,
+      includes: observable.ref,
+      resource: observable.ref,
+      errorContext: observable.ref,
+    },
+    false,
+  );
 
   untracked(() => {
     if (!isArraysEqual(includes, propertiesRef.includes)) {
       propertiesRef.includes = includes;
     }
 
-    if (
-      key === null
-      || propertiesRef.key === null
-      || !propertiesRef.resource.isIntersect(key, propertiesRef.key)
-    ) {
+    if (key === null || propertiesRef.key === null || !propertiesRef.resource.isIntersect(key, propertiesRef.key)) {
       propertiesRef.key = key;
     }
   });
@@ -188,12 +175,7 @@ export function useResource<
     }
     if (actions?.preload) {
       for (const preload of actions.preload) {
-        if (
-          !preload.isLoaded()
-          || preload.isOutdated?.()
-          || preload.isLoading()
-          || preload.isError()
-        ) {
+        if (!preload.isLoaded() || preload.isOutdated?.() || preload.isLoading() || preload.isError()) {
           return false;
         }
       }
@@ -201,97 +183,97 @@ export function useResource<
     return true;
   });
 
-  const refObj = useObservableRef(() => ({
-    loadingPromise: null as (Promise<void> | null),
-    exception: null as Error | null,
-    useRef: [null, ''] as [ResourceKey<TKeyArg> | null, string],
-    get resourceException(): Error | null {
-      if (propertiesRef.key === null) {
-        return null;
-      }
+  const refObj = useObservableRef(
+    () => ({
+      loadingPromise: null as Promise<void> | null,
+      exception: null as Error | null,
+      useRef: [null, ''] as [ResourceKey<TKeyArg> | null, string],
+      get resourceException(): Error | null {
+        if (propertiesRef.key === null) {
+          return null;
+        }
 
-      return propertiesRef.resource.getException(propertiesRef.key);
-    },
-    isResourceError(): boolean {
-      return isContainsException(this.resourceException);
-    },
-    use(key: ResourceKey<TKeyArg> | null): void {
-      key = toJS(key);
+        return propertiesRef.resource.getException(propertiesRef.key);
+      },
+      isResourceError(): boolean {
+        return isContainsException(this.resourceException);
+      },
+      use(key: ResourceKey<TKeyArg> | null): void {
+        key = toJS(key);
 
-      if (this.useRef[0] !== null && propertiesRef.resource.hasUseId(this.useRef[1])) {
-        if (key !== null && propertiesRef.resource.isIntersect(key, this.useRef[0])) {
+        if (this.useRef[0] !== null && propertiesRef.resource.hasUseId(this.useRef[1])) {
+          if (key !== null && propertiesRef.resource.isIntersect(key, this.useRef[0])) {
+            return;
+          }
+
+          propertiesRef.resource.free(this.useRef[0], this.useRef[1]);
+        }
+        this.useRef = [key, key === null ? '' : propertiesRef.resource.use(key)];
+      },
+      async [loadFunctionName](refresh?: boolean): Promise<void> {
+        const { key, includes, resource } = propertiesRef;
+
+        if (refresh) {
+          resource.markOutdated(key);
+        }
+
+        await resource.load(key, includes as any);
+      },
+      async load(refresh?: boolean): Promise<void> {
+        if (this.loadingPromise) {
+          return this.loadingPromise;
+        }
+
+        if (propertiesRef.key === null) {
           return;
         }
 
-        propertiesRef.resource.free(this.useRef[0], this.useRef[1]);
-      }
-      this.useRef = [key, key === null ? '' : propertiesRef.resource.use(key)];
-    },
-    async [loadFunctionName](refresh?: boolean): Promise<void> {
-      const { key, includes, resource } = propertiesRef;
+        try {
+          this.loadingPromise = (this[loadFunctionName] as (refresh?: boolean) => Promise<void>)(refresh);
+          await this.loadingPromise;
+          this.exception = null;
+        } catch (exception: any) {
+          if (actions?.silent !== true && propertiesRef.errorContext) {
+            if (this.isResourceError()) {
+              const errors = Array.isArray(this.resourceException) ? this.resourceException : [this.resourceException];
 
-      if (refresh) {
-        resource.markOutdated(key);
-      }
-
-      await resource.load(key, includes as any);
-    },
-    async load(refresh?: boolean): Promise<void> {
-      if (this.loadingPromise) {
-        return this.loadingPromise;
-      }
-
-      if (propertiesRef.key === null) {
-        return;
-      }
-
-      try {
-        this.loadingPromise = (this[loadFunctionName] as (refresh?: boolean) => Promise<void>)(refresh);
-        await this.loadingPromise;
-        this.exception = null;
-      } catch (exception: any) {
-        if (actions?.silent !== true && propertiesRef.errorContext) {
-          if (this.isResourceError()) {
-            const errors = Array.isArray(this.resourceException) ? this.resourceException : [this.resourceException];
-
-            for (const error of errors) {
-              if (error) {
-                propertiesRef.errorContext.catch(error);
+              for (const error of errors) {
+                if (error) {
+                  propertiesRef.errorContext.catch(error);
+                }
               }
+            } else {
+              this.exception = new LoadingError(
+                () => {
+                  this.exception = null;
+                  this.load.bind(this, true);
+                },
+                'Application is unable to load resource',
+                { cause: exception },
+              );
+              propertiesRef.errorContext.catch(this.exception);
             }
-          } else {
-            this.exception = new LoadingError(() => {
-              this.exception = null;
-              this.load.bind(this, true);
-            }, 'Application is unable to load resource', { cause: exception });
-            propertiesRef.errorContext.catch(this.exception);
           }
+          actions?.onError?.(exception);
+        } finally {
+          this.loadingPromise = null;
         }
-        actions?.onError?.(exception);
-      } finally {
-        this.loadingPromise = null;
-      }
+      },
+    }),
+    {
+      load: action,
+      resourceException: computed,
+      exception: observable.ref,
+      loadingPromise: observable.ref,
     },
-  }), {
-    load: action,
-    resourceException: computed,
-    exception: observable.ref,
-    loadingPromise: observable.ref,
-  }, false);
+    false,
+  );
 
-  const result = useObservableRef<(
-  IMapResourceResult<TResource, TIncludes>
-  | IMapResourceListResult<TResource, TIncludes>
-  ) & IResourcePrivateState
-  >(() => ({
+  const result = useObservableRef<(IMapResourceResult<TResource, TIncludes> | IMapResourceListResult<TResource, TIncludes>) & IResourcePrivateState>(
+    () => ({
       preloaded,
       get canLoad(): boolean {
-        return (
-          propertiesRef.key !== null
-          && this.preloaded
-          && this.outdated
-          && !this.loading
-        );
+        return propertiesRef.key !== null && this.preloaded && this.outdated && !this.loading;
       },
       get resource() {
         return propertiesRef.resource;
@@ -308,20 +290,14 @@ export function useResource<
         return refObj.resourceException;
       },
       get tryGetData() {
-        if (
-          propertiesRef.key === null
-          && this.resource instanceof CachedMapResource
-        ) {
+        if (propertiesRef.key === null && this.resource instanceof CachedMapResource) {
           return undefined;
         }
 
         return getData();
       },
       get data() {
-        if (
-          propertiesRef.key === null
-          && this.resource instanceof CachedMapResource
-        ) {
+        if (propertiesRef.key === null && this.resource instanceof CachedMapResource) {
           return undefined;
         }
 
@@ -348,13 +324,7 @@ export function useResource<
         return getData();
       },
       get outdated() {
-        return (
-          propertiesRef.key === null
-          || !this.preloaded
-          || this.loading
-          || !this.loaded
-          || this.resource.isOutdated(propertiesRef.key)
-        );
+        return propertiesRef.key === null || !this.preloaded || this.loading || !this.loaded || this.resource.isOutdated(propertiesRef.key);
       },
       get loaded() {
         if (propertiesRef.key === null) {
@@ -388,7 +358,8 @@ export function useResource<
       isLoading() {
         return this.loading;
       },
-    }), {
+    }),
+    {
       canLoad: computed,
       exception: computed<any>({
         equals: (a, b) => {
@@ -423,7 +394,9 @@ export function useResource<
       loaded: computed,
       loading: computed,
       preloaded: observable.ref,
-    }, { preloaded });
+    },
+    { preloaded },
+  );
 
   useEffect(() => {
     const disposeDataUpdate = reaction(
@@ -434,7 +407,7 @@ export function useResource<
       {
         onError: () => {},
         fireImmediately: true,
-      }
+      },
     );
     const disposeErrorUpdate = reaction(
       () => result.exception,
@@ -455,7 +428,7 @@ export function useResource<
       },
       {
         fireImmediately: true,
-      }
+      },
     );
     return () => {
       disposeDataUpdate();
diff --git a/webapp/packages/core-blocks/src/Slide/SlideBox.tsx b/webapp/packages/core-blocks/src/Slide/SlideBox.tsx
index f6bd67df86..471a614215 100644
--- a/webapp/packages/core-blocks/src/Slide/SlideBox.tsx
+++ b/webapp/packages/core-blocks/src/Slide/SlideBox.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useRef } from 'react';
 
 interface Props {
diff --git a/webapp/packages/core-blocks/src/Slide/SlideBoxStyles.ts b/webapp/packages/core-blocks/src/Slide/SlideBoxStyles.ts
index e24e9ba7c2..57566ae503 100644
--- a/webapp/packages/core-blocks/src/Slide/SlideBoxStyles.ts
+++ b/webapp/packages/core-blocks/src/Slide/SlideBoxStyles.ts
@@ -5,59 +5,58 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const slideBoxStyles = css`
-    SlideBox {
-      overflow: hidden;
-      white-space: nowrap;
+  SlideBox {
+    overflow: hidden;
+    white-space: nowrap;
 
-      & SlideElement {
+    & SlideElement {
+      width: 100%;
+      height: 100%;
+      display: inline-block;
+      vertical-align: top;
+      white-space: normal;
+      transition: transform cubic-bezier(0.4, 0, 0.2, 1) 0.6s;
+      transform: translateX(-100%);
+
+      &:first-child {
+        transition: width cubic-bezier(0.4, 0, 0.2, 1) 0.6s;
+        width: 100%;
+      }
+    }
+
+    & SlideOverlay {
+      position: absolute;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      width: 0;
+      height: 0;
+      top: 0;
+      left: 0;
+      background: rgb(0 0 0 / 0%);
+      transition: background cubic-bezier(0.4, 0, 0.2, 1) 0.6s;
+    }
+
+    &[open] {
+      & SlideOverlay {
         width: 100%;
         height: 100%;
-        display: inline-block;
-        vertical-align:top;
-        white-space: normal;
-        transition: transform cubic-bezier(0.4, 0.0, 0.2, 1) 0.6s;
-        transform: translateX(-100%);
+        background: rgb(0 0 0 / 35%);
+
+        & > :global(div) {
+          display: flex;
+        }
+      }
+      & SlideElement {
+        transform: translateX(0%);
 
         &:first-child {
-          transition: width cubic-bezier(0.4, 0.0, 0.2, 1) 0.6s;
-          width: 100%;
-        }
-      }
-
-      & SlideOverlay {
-        position: absolute;
-        cursor: pointer;
-        display: flex;
-        align-items: center;
-        width: 0;
-        height: 0;
-        top: 0;
-        left: 0;
-        background: rgb(0 0 0 / 0%);
-        transition: background cubic-bezier(0.4, 0.0, 0.2, 1) 0.6s;
-      }
-
-      &[open] {
-        & SlideOverlay {
-          width: 100%;
-          height: 100%;
-          background: rgb(0 0 0 / 35%);
-
-          & > :global(div) {
-            display: flex;
-          }
-        }
-        & SlideElement {
-          transform: translateX(0%);
-
-          &:first-child {
-            width: calc(100% - 120px);
-          }
+          width: calc(100% - 120px);
         }
       }
     }
-  `;
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Slide/SlideElement.tsx b/webapp/packages/core-blocks/src/Slide/SlideElement.tsx
index f819aea5a2..d25a30fe04 100644
--- a/webapp/packages/core-blocks/src/Slide/SlideElement.tsx
+++ b/webapp/packages/core-blocks/src/Slide/SlideElement.tsx
@@ -11,9 +11,5 @@ interface Props {
 }
 
 export const SlideElement: React.FC<React.PropsWithChildren<Props>> = function SlideElement({ children, className }) {
-  return (
-    <div className={className}>
-      {children}
-    </div>
-  );
+  return <div className={className}>{children}</div>;
 };
diff --git a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx
index e263ce41e8..32a5b01b12 100644
--- a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx
+++ b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Icon } from '../Icon';
@@ -16,36 +15,33 @@ interface Props {
 }
 
 const styles = css`
-    div {
-      z-index: 1;
-    }
-    icon-btn {
-      composes: theme-background-surface theme-text-on-surface theme-ripple from global;
-      box-sizing: border-box;
-      margin-left: 36px;
-      width: 48px;
-      height: 48px;
-      padding: 16px;
-      border-radius: 50%;
-      display: none;
-      overflow: hidden;
-      align-items: center;
-      transform: rotate(90deg);
-    }
-    Icon {
-      width: 100%;
-    }
-  `;
+  div {
+    z-index: 1;
+  }
+  icon-btn {
+    composes: theme-background-surface theme-text-on-surface theme-ripple from global;
+    box-sizing: border-box;
+    margin-left: 36px;
+    width: 48px;
+    height: 48px;
+    padding: 16px;
+    border-radius: 50%;
+    display: none;
+    overflow: hidden;
+    align-items: center;
+    transform: rotate(90deg);
+  }
+  Icon {
+    width: 100%;
+  }
+`;
 
-export const SlideOverlay: React.FC<Props> = function SlideOverlay({
-  className,
-  onClick,
-}) {
+export const SlideOverlay: React.FC<Props> = function SlideOverlay({ className, onClick }) {
   return styled(styles)(
     <div className={className} onClick={onClick}>
       <icon-btn>
         <Icon name="angle" viewBox="0 0 15 8" />
       </icon-btn>
-    </div>
+    </div>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx
index d4aac7f9a8..1ffa3be1d3 100644
--- a/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx
@@ -5,7 +5,6 @@
  * 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 type { INotificationExtraProps, NotificationComponent } from '@cloudbeaver/core-events';
@@ -23,18 +22,14 @@ export interface ActionSnackbarProps extends INotificationExtraProps {
   actionText: string;
 }
 
-export const ActionSnackbar: NotificationComponent<ActionSnackbarProps> = observer(function ActionSnackbar({
-  notification, onAction, actionText,
-}) {
+export const ActionSnackbar: NotificationComponent<ActionSnackbarProps> = observer(function ActionSnackbar({ notification, onAction, actionText }) {
   const translate = useTranslate();
 
   return (
     <SnackbarWrapper persistent={notification.persistent} onClose={() => notification.close(false)}>
       <SnackbarStatus status={notification.type} />
       <SnackbarContent>
-        <SnackbarBody title={translate(notification.title)}>
-          {notification.message && translate(notification.message)}
-        </SnackbarBody>
+        <SnackbarBody title={translate(notification.title)}>{notification.message && translate(notification.message)}</SnackbarBody>
         <SnackbarFooter timestamp={notification.timestamp}>
           <Button type="button" mod={['outlined']} onClick={onAction}>
             {translate(actionText)}
diff --git a/webapp/packages/core-blocks/src/Snackbars/NotificationMark.tsx b/webapp/packages/core-blocks/src/Snackbars/NotificationMark.tsx
index 3b19f053e4..691fdf5a2a 100644
--- a/webapp/packages/core-blocks/src/Snackbars/NotificationMark.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/NotificationMark.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { HTMLProps } from 'react';
 
 import { ENotificationType } from '@cloudbeaver/core-events';
@@ -19,9 +18,9 @@ type IconProps = HTMLProps<HTMLDivElement> & {
 export const NotificationMark: React.FC<IconProps> = function NotificationMark({ type, ...props }) {
   return (
     <div {...props}>
-      {type === ENotificationType.Info && <IconOrImage icon='/icons/info_icon.svg' />}
-      {type === ENotificationType.Error && <IconOrImage icon='/icons/error_icon.svg' />}
-      {type === ENotificationType.Success && <IconOrImage icon='/icons/success_icon.svg' />}
+      {type === ENotificationType.Info && <IconOrImage icon="/icons/info_icon.svg" />}
+      {type === ENotificationType.Error && <IconOrImage icon="/icons/error_icon.svg" />}
+      {type === ENotificationType.Success && <IconOrImage icon="/icons/success_icon.svg" />}
     </div>
   );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx
index dd5bca86e4..1f11bf658a 100644
--- a/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx
@@ -5,10 +5,9 @@
  * 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 { INotificationProcessExtraProps, ENotificationType, NotificationComponent } from '@cloudbeaver/core-events';
+import { ENotificationType, INotificationProcessExtraProps, NotificationComponent } from '@cloudbeaver/core-events';
 
 import { Button } from '../Button';
 import { useTranslate } from '../localization/useTranslate';
@@ -52,17 +51,10 @@ export const ProcessSnackbar: NotificationComponent<Props> = observer(function P
     >
       <SnackbarStatus status={status} />
       <SnackbarContent>
-        <SnackbarBody title={translate(title)}>
-          {message && translate(message)}
-        </SnackbarBody>
+        <SnackbarBody title={translate(title)}>{message && translate(message)}</SnackbarBody>
         <SnackbarFooter timestamp={notification.timestamp}>
           {details.hasDetails && (
-            <Button
-              type="button"
-              mod={['outlined']}
-              disabled={details.isOpen}
-              onClick={details.open}
-            >
+            <Button type="button" mod={['outlined']} disabled={details.isOpen} onClick={details.open}>
               {translate('ui_errors_details')}
             </Button>
           )}
diff --git a/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx
index 23d01e6f47..d81809c091 100644
--- a/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx
@@ -5,7 +5,6 @@
  * 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 type { ENotificationType } from '@cloudbeaver/core-events';
@@ -53,17 +52,10 @@ export const Snackbar = observer<SnackbarProps>(function Snackbar({
       <Loader suspense>
         <SnackbarStatus status={type} />
         <SnackbarContent>
-          <SnackbarBody title={translate(title)}>
-            {message && translate(message)}
-          </SnackbarBody>
+          <SnackbarBody title={translate(title)}>{message && translate(message)}</SnackbarBody>
           <SnackbarFooter timestamp={time}>
             {onShowDetails && (
-              <Button
-                type="button"
-                mod={['outlined']}
-                disabled={disableShowDetails}
-                onClick={onShowDetails}
-              >
+              <Button type="button" mod={['outlined']} disabled={disableShowDetails} onClick={onShowDetails}>
                 {translate('ui_errors_details')}
               </Button>
             )}
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarBody.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarBody.tsx
index db61929860..36c4c1d359 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarBody.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarBody.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const SNACKBAR_BODY_STYLES = css`
@@ -46,17 +45,15 @@ interface Props {
   className?: string;
 }
 
-export const SnackbarBody: React.FC<React.PropsWithChildren<Props>> = function SnackbarBody({
-  title, className, children,
-}) {
+export const SnackbarBody: React.FC<React.PropsWithChildren<Props>> = function SnackbarBody({ title, className, children }) {
   return styled(SNACKBAR_BODY_STYLES)(
     <notification-body as="div" className={className}>
-      <body-text-block as='div'>
-        <text-block-title title={title} as='h2'>{title}</text-block-title>
-        <message as="div">
-          {children}
-        </message>
+      <body-text-block as="div">
+        <text-block-title title={title} as="h2">
+          {title}
+        </text-block-title>
+        <message as="div">{children}</message>
       </body-text-block>
-    </notification-body>
+    </notification-body>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarContent.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarContent.tsx
index 60824b233a..b9761f0be8 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarContent.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarContent.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const SNACKBAR_CONTENT_STYLES = css`
@@ -23,8 +22,8 @@ interface Props {
 
 export const SnackbarContent: React.FC<React.PropsWithChildren<Props>> = function SnackbarContent({ children, className }) {
   return styled(SNACKBAR_CONTENT_STYLES)(
-    <notification-content as='div' className={className}>
+    <notification-content as="div" className={className}>
       {children}
-    </notification-content>
+    </notification-content>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarFooter.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarFooter.tsx
index 7be8648242..f308b7509b 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarFooter.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarFooter.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const SNACKBAR_FOOTER_STYLES = css`
@@ -35,11 +34,9 @@ export const SnackbarFooter: React.FC<React.PropsWithChildren<Props>> = function
   const timeStringFromTimestamp = new Date(timestamp).toLocaleTimeString();
 
   return styled(SNACKBAR_FOOTER_STYLES)(
-    <notification-footer as='div' className={className}>
-      <footer-time as='span'>{timeStringFromTimestamp}</footer-time>
-      <actions as="div">
-        {children}
-      </actions>
-    </notification-footer>
+    <notification-footer as="div" className={className}>
+      <footer-time as="span">{timeStringFromTimestamp}</footer-time>
+      <actions as="div">{children}</actions>
+    </notification-footer>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
index ceeae707be..fdfb64d88a 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { ENotificationType } from '@cloudbeaver/core-events';
@@ -15,7 +14,7 @@ import { NotificationMark } from '../NotificationMark';
 
 const SNACKBAR_STATUS_STYLES = css`
   NotificationMark {
-    padding-right: 12px; 
+    padding-right: 12px;
   }
   loader-container {
     padding-right: 12px;
@@ -37,5 +36,8 @@ export const SnackbarStatus: React.FC<SnackbarStatusProps> = function SnackbarSt
       <loader-container className={className}>
         <Loader fullSize hideMessage />
       </loader-container>
-    ) : <NotificationMark className={className} type={status} />);
+    ) : (
+      <NotificationMark className={className} type={status} />
+    ),
+  );
 };
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx
index f663397bea..d747d0965b 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
 import { IconButton } from '../../IconButton';
 
-const SNACKBAR_WRAPPER_STYLES = css` 
+const SNACKBAR_WRAPPER_STYLES = css`
   notification {
     composes: theme-background-surface theme-text-on-surface theme-elevation-z5 from global;
     position: relative;
@@ -45,7 +44,8 @@ const SNACKBAR_WRAPPER_STYLES = css`
     &:hover {
       opacity: 0.7;
     }
-  }`;
+  }
+`;
 
 interface Props {
   closing?: boolean;
@@ -55,7 +55,11 @@ interface Props {
 }
 
 export const SnackbarWrapper: React.FC<React.PropsWithChildren<Props>> = function SnackbarWrapper({
-  closing = false, persistent, onClose, children, className,
+  closing = false,
+  persistent,
+  onClose,
+  children,
+  className,
 }) {
   const [mounted, setMounted] = useState(false);
 
@@ -66,9 +70,7 @@ export const SnackbarWrapper: React.FC<React.PropsWithChildren<Props>> = functio
   return styled(SNACKBAR_WRAPPER_STYLES)(
     <notification as="div" className={className} {...use({ mounted, closing })}>
       {children}
-      {!persistent && onClose && (
-        <IconButton name="cross" viewBox="0 0 16 16" onClick={onClose} />
-      )}
-    </notification>
+      {!persistent && onClose && <IconButton name="cross" viewBox="0 0 16 16" onClick={onClose} />}
+    </notification>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Split/Pane.tsx b/webapp/packages/core-blocks/src/Split/Pane.tsx
index f7bfa9902f..3db678268b 100644
--- a/webapp/packages/core-blocks/src/Split/Pane.tsx
+++ b/webapp/packages/core-blocks/src/Split/Pane.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Pane as BasePane, PaneProps } from 'go-split';
 
 export function Pane(props: PaneProps) {
diff --git a/webapp/packages/core-blocks/src/Split/ResizerControls.tsx b/webapp/packages/core-blocks/src/Split/ResizerControls.tsx
index 417b84e195..d87a27bb34 100644
--- a/webapp/packages/core-blocks/src/Split/ResizerControls.tsx
+++ b/webapp/packages/core-blocks/src/Split/ResizerControls.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Resizer } from 'go-split';
 
 import { SplitControls } from './SplitControls';
diff --git a/webapp/packages/core-blocks/src/Split/Split.tsx b/webapp/packages/core-blocks/src/Split/Split.tsx
index 30d2840348..7961c1b295 100644
--- a/webapp/packages/core-blocks/src/Split/Split.tsx
+++ b/webapp/packages/core-blocks/src/Split/Split.tsx
@@ -5,12 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { SplitProps, Split as BaseSplit } from 'go-split';
+import { Split as BaseSplit, SplitProps } from 'go-split';
 
 export type ISplitProps = SplitProps;
 
 export function Split(props: ISplitProps) {
-
   return <BaseSplit {...props} />;
 }
diff --git a/webapp/packages/core-blocks/src/Split/SplitControls.tsx b/webapp/packages/core-blocks/src/Split/SplitControls.tsx
index ee80433d4c..f60063a3c0 100644
--- a/webapp/packages/core-blocks/src/Split/SplitControls.tsx
+++ b/webapp/packages/core-blocks/src/Split/SplitControls.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { use } from 'reshadow';
 
 import { useObjectRef } from '../useObjectRef';
@@ -31,22 +30,26 @@ export const SplitControls: React.FC = function SplitControls() {
     }
   }
 
-  const handlers = useObjectRef(() => ({
-    handleCollapse(event: React.SyntheticEvent<HTMLButtonElement>) {
-      if (this.mode === 'maximize') {
-        this.setMode('resize');
-      } else {
-        this.setMode('minimize');
-      }
-    },
-    handleExpand(event: React.SyntheticEvent<HTMLButtonElement>) {
-      if (this.mode === 'minimize') {
-        this.setMode('resize');
-      } else {
-        this.setMode('maximize');
-      }
-    },
-  }), { mode: split.state.mode, setMode: split.state.setMode }, ['handleCollapse', 'handleExpand']);
+  const handlers = useObjectRef(
+    () => ({
+      handleCollapse(event: React.SyntheticEvent<HTMLButtonElement>) {
+        if (this.mode === 'maximize') {
+          this.setMode('resize');
+        } else {
+          this.setMode('minimize');
+        }
+      },
+      handleExpand(event: React.SyntheticEvent<HTMLButtonElement>) {
+        if (this.mode === 'minimize') {
+          this.setMode('resize');
+        } else {
+          this.setMode('maximize');
+        }
+      },
+    }),
+    { mode: split.state.mode, setMode: split.state.setMode },
+    ['handleCollapse', 'handleExpand'],
+  );
 
   return styled(buttonStyles)(
     <container
@@ -58,23 +61,15 @@ export const SplitControls: React.FC = function SplitControls() {
       {...use({ split: split.state.split, inverse, mode: inverseMode })}
     >
       {split.state.mode !== 'minimize' && (
-        <button
-          type="button"
-          {...use({ isPrimary: !inverse })}
-          onClick={handlers.handleCollapse}
-        >
+        <button type="button" {...use({ isPrimary: !inverse })} onClick={handlers.handleCollapse}>
           <ripple />
         </button>
       )}
       {split.state.mode !== 'maximize' && (
-        <button
-          type="button"
-          {...use({ isPrimary: inverse })}
-          onClick={handlers.handleExpand}
-        >
+        <button type="button" {...use({ isPrimary: inverse })} onClick={handlers.handleExpand}>
           <ripple />
         </button>
       )}
-    </container>
+    </container>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts b/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
index 977d74629d..2c23461da5 100644
--- a/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
+++ b/webapp/packages/core-blocks/src/Split/splitButtonStyles.ts
@@ -5,128 +5,127 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const buttonStyles = css`
-    container {
+  container {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    align-items: center;
+
+    /* pointer outline */
+    &::before {
+      content: '';
       position: absolute;
-      display: flex;
-      justify-content: center;
-      align-content: center;
-      align-items: center;
+      background: transparent;
+    }
+  }
 
-      /* pointer outline */
-      &::before {
-        content: '';
-        position: absolute;
-        background: transparent;
-      }
+  button {
+    composes: theme-button theme-button_unelevated theme-button_background theme-elevation-z3 from global;
+    opacity: 0;
+    transition-property: opacity, box-shadow !important;
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  ripple {
+    composes: theme-button_ripple from global;
+  }
+
+  container:hover button {
+    opacity: 1;
+  }
+
+  container[|split='vertical'] {
+    flex-direction: column;
+    cursor: ew-resize;
+    height: 100%;
+    width: 5px;
+    left: -2px;
+
+    &[|mode='minimize'] {
+      left: 0;
     }
 
-    button {
-      composes: theme-button theme-button_unelevated theme-button_background theme-elevation-z3 from global;
-      opacity: 0;
-      transition-property: opacity, box-shadow !important;
-      transition: opacity 0.3s ease-in-out;
-    }
-
-    ripple {
-      composes: theme-button_ripple from global;
-    }
-
-    container:hover button {
-      opacity: 1;
-    }
-
-    container[|split='vertical'] {
-      flex-direction: column;
-      cursor: ew-resize;
-      height: 100%;
-      width: 5px;
+    &[|mode='maximize'] {
       left: -2px;
-
-      &[|mode=minimize] {
-        left: 0;
-      }
-
-      &[|mode=maximize] {
-        left: -2px;
-      }
-
-      & button {
-        margin: 8px 0;
-        min-width: 16px;
-
-        &::after {
-          transform: rotate(180deg);
-        }
-      }
-
-      &[|mode=maximize] button,
-      &[|mode=minimize] button {
-        min-height: 64px;
-      }
-
-      & button[|isPrimary]::after {
-        transform: rotate(0deg);
-      }
-    }
-    container[|split='vertical'][|inverse] {
-      flex-direction: column-reverse;
     }
 
-    container[|split='horizontal'] {
-      flex-direction: row;
-      cursor: ns-resize;
-      width: 100%;
-      height: 5px;
-      top: -2px;
+    & button {
+      margin: 8px 0;
+      min-width: 16px;
 
-      &[|mode=minimize] {
-        top: 0;
-      }
-
-      &[|mode=maximize] {
-        top: -2px;
-      }
-
-      & button {
-        margin: 0 8px;
-        min-width: 28px;
-        height: 16px;
-
-        &::after {
-          transform: rotate(270deg);
-        }
-      }
-
-      &[|mode=maximize] button,
-      &[|mode=minimize] button {
-        min-width: 64px;
-      }
-
-      & button[|isPrimary]::after {
-        transform: rotate(90deg);
-      }
-    }
-    container[|split='horizontal'][|inverse] {
-      flex-direction: row-reverse;
-    }
-    button {
-      padding: 0 !important;
       &::after {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        content: '';
-        display: block;
-        width: 0;
-        height: 0;
-        border-style: solid;
-        border-width: 3px 4px 3px 0;
-        border-color: transparent #000 transparent transparent;
-        margin: -3px -2px;
+        transform: rotate(180deg);
       }
     }
-  `;
+
+    &[|mode='maximize'] button,
+    &[|mode='minimize'] button {
+      min-height: 64px;
+    }
+
+    & button[|isPrimary]::after {
+      transform: rotate(0deg);
+    }
+  }
+  container[|split='vertical'][|inverse] {
+    flex-direction: column-reverse;
+  }
+
+  container[|split='horizontal'] {
+    flex-direction: row;
+    cursor: ns-resize;
+    width: 100%;
+    height: 5px;
+    top: -2px;
+
+    &[|mode='minimize'] {
+      top: 0;
+    }
+
+    &[|mode='maximize'] {
+      top: -2px;
+    }
+
+    & button {
+      margin: 0 8px;
+      min-width: 28px;
+      height: 16px;
+
+      &::after {
+        transform: rotate(270deg);
+      }
+    }
+
+    &[|mode='maximize'] button,
+    &[|mode='minimize'] button {
+      min-width: 64px;
+    }
+
+    & button[|isPrimary]::after {
+      transform: rotate(90deg);
+    }
+  }
+  container[|split='horizontal'][|inverse] {
+    flex-direction: row-reverse;
+  }
+  button {
+    padding: 0 !important;
+    &::after {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      content: '';
+      display: block;
+      width: 0;
+      height: 0;
+      border-style: solid;
+      border-width: 3px 4px 3px 0;
+      border-color: transparent #000 transparent transparent;
+      margin: -3px -2px;
+    }
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Split/styles.ts b/webapp/packages/core-blocks/src/Split/styles.ts
index 759f2f4fcc..27276d2b4d 100644
--- a/webapp/packages/core-blocks/src/Split/styles.ts
+++ b/webapp/packages/core-blocks/src/Split/styles.ts
@@ -5,55 +5,54 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const splitStyles = css`
-    space {
-      display: flex;
-      flex-direction: row;
-      flex: 1;
-      overflow: hidden;
-    }
-    Split {
-      display: flex;
-      flex-direction: row;
-      flex: 1;
-      overflow: hidden;
-      z-index: 0;
-    }
-    Pane {
-      flex: 1 1 0%;
-      overflow: auto;
-      z-index: 0;
-    }
+  space {
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+    overflow: hidden;
+  }
+  Split {
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+    overflow: hidden;
+    z-index: 0;
+  }
+  Pane {
+    flex: 1 1 0%;
+    overflow: auto;
+    z-index: 0;
+  }
 
-    ResizerControls {
-      composes: theme-background-background theme-text-on-secondary from global;
-      position: relative;
-      flex: 0 1 auto;
-      width: 2px;
-      cursor: ew-resize;
-      user-select: none;
-      z-index: 1;
-      transition: background-color 0.3s ease-in-out;
+  ResizerControls {
+    composes: theme-background-background theme-text-on-secondary from global;
+    position: relative;
+    flex: 0 1 auto;
+    width: 2px;
+    cursor: ew-resize;
+    user-select: none;
+    z-index: 1;
+    transition: background-color 0.3s ease-in-out;
 
-      &:hover {
-        background-color: var(--theme-primary);
-      }
+    &:hover {
+      background-color: var(--theme-primary);
     }
+  }
 
-    ResizerControls:before {
-      content: ' ';
-      position: absolute;
-      width: 4px;
-      height: 100%;
-      top: 0;
-      left: -1px;
-      cursor: ew-resize;
-      box-sizing: border-box;
-    }
-  `;
+  ResizerControls:before {
+    content: ' ';
+    position: absolute;
+    width: 4px;
+    height: 100%;
+    top: 0;
+    left: -1px;
+    cursor: ew-resize;
+    box-sizing: border-box;
+  }
+`;
 
 export const splitHorizontalStyles = css`
   space {
diff --git a/webapp/packages/core-blocks/src/Split/useSplit.tsx b/webapp/packages/core-blocks/src/Split/useSplit.tsx
index da1553926c..471aa12880 100644
--- a/webapp/packages/core-blocks/src/Split/useSplit.tsx
+++ b/webapp/packages/core-blocks/src/Split/useSplit.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ISplitState, SplitContext, SplitterMode } from 'go-split';
 import { useContext } from 'react';
 
@@ -17,18 +16,22 @@ interface ISplit {
 }
 
 export function useSplit(): ISplit {
-  return useObjectRef<ISplit>(() => ({
-    fixate(mode, state) {
-      if (state) {
-        if (this.state.mode !== mode || !this.state.disable) {
-          this.state.setDisable(true);
-          this.state.setMode(mode);
+  return useObjectRef<ISplit>(
+    () => ({
+      fixate(mode, state) {
+        if (state) {
+          if (this.state.mode !== mode || !this.state.disable) {
+            this.state.setDisable(true);
+            this.state.setMode(mode);
+          }
+        } else if (this.state.disable) {
+          this.state.setDisable(false);
         }
-      } else if (this.state.disable) {
-        this.state.setDisable(false);
-      }
+      },
+    }),
+    {
+      state: useContext(SplitContext),
     },
-  }), {
-    state: useContext(SplitContext),
-  }, ['fixate']);
+    ['fixate'],
+  );
 }
diff --git a/webapp/packages/core-blocks/src/Split/useSplitUserState.ts b/webapp/packages/core-blocks/src/Split/useSplitUserState.ts
index be53f3496c..014e63bbbb 100644
--- a/webapp/packages/core-blocks/src/Split/useSplitUserState.ts
+++ b/webapp/packages/core-blocks/src/Split/useSplitUserState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SplitProps, SplitterMode } from 'go-split';
 
 import { useObjectRef } from '../useObjectRef';
@@ -20,28 +19,32 @@ export function useSplitUserState(id: string): SplitState {
     () => {},
   );
 
-  return useObjectRef<SplitState & { state: SplitState }>(() => ({
-    get mode(): SplitterMode | undefined {
-      return this.state.mode;
-    },
-    get size(): number | undefined {
-      return this.state.size;
-    },
-    get ratio(): number | undefined {
-      return this.state.ratio;
-    },
-    get disable(): boolean | undefined {
-      return this.state.disable;
-    },
-    onModeChange(mode) {
-      this.state.mode = mode;
-    },
-    onResize(size, ratio) {
-      this.state.ratio = ratio;
-      this.state.size = size;
-    },
-    onDisable(disable) {
-      this.state.disable = disable ? true : undefined;
-    },
-  }), { state }, ['onModeChange', 'onResize', 'onDisable']);
-}
\ No newline at end of file
+  return useObjectRef<SplitState & { state: SplitState }>(
+    () => ({
+      get mode(): SplitterMode | undefined {
+        return this.state.mode;
+      },
+      get size(): number | undefined {
+        return this.state.size;
+      },
+      get ratio(): number | undefined {
+        return this.state.ratio;
+      },
+      get disable(): boolean | undefined {
+        return this.state.disable;
+      },
+      onModeChange(mode) {
+        this.state.mode = mode;
+      },
+      onResize(size, ratio) {
+        this.state.ratio = ratio;
+        this.state.size = size;
+      },
+      onDisable(disable) {
+        this.state.disable = disable ? true : undefined;
+      },
+    }),
+    { state },
+    ['onModeChange', 'onResize', 'onDisable'],
+  );
+}
diff --git a/webapp/packages/core-blocks/src/StaticImage.tsx b/webapp/packages/core-blocks/src/StaticImage.tsx
index e6a27c0853..d5638ceb91 100644
--- a/webapp/packages/core-blocks/src/StaticImage.tsx
+++ b/webapp/packages/core-blocks/src/StaticImage.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { GlobalConstants, isValidUrl } from '@cloudbeaver/core-utils';
 
 interface Props {
@@ -15,9 +14,7 @@ interface Props {
   onClick?: (e: React.MouseEvent) => void;
 }
 
-export const StaticImage: React.FC<Props> = function StaticImage({
-  icon, className, title, onClick,
-}) {
+export const StaticImage: React.FC<Props> = function StaticImage({ icon, className, title, onClick }) {
   if (!icon) {
     return null;
   }
diff --git a/webapp/packages/core-blocks/src/StatusMessage.tsx b/webapp/packages/core-blocks/src/StatusMessage.tsx
index cf059237ac..0a30a5119f 100644
--- a/webapp/packages/core-blocks/src/StatusMessage.tsx
+++ b/webapp/packages/core-blocks/src/StatusMessage.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -29,7 +28,8 @@ const styles = css`
     height: 24px;
     width: 24px;
   }
-  message, Link {
+  message,
+  Link {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -47,13 +47,7 @@ interface Props {
   className?: string;
 }
 
-export const StatusMessage = observer<Props>(function StatusMessage({
-  status,
-  message,
-  exception = null,
-  onShowDetails,
-  className,
-}) {
+export const StatusMessage = observer<Props>(function StatusMessage({ status, message, exception = null, onShowDetails, className }) {
   const translate = useTranslate();
   const errorDetails = useErrorDetails(exception);
 
@@ -84,6 +78,6 @@ export const StatusMessage = observer<Props>(function StatusMessage({
           <message title={message}>{onShowDetails ? <Link onClick={onShowDetails}>{message}</Link> : message}</message>
         </>
       )}
-    </status-message>
+    </status-message>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/BASE_TABLE_STYLES.ts b/webapp/packages/core-blocks/src/Table/BASE_TABLE_STYLES.ts
index e34ceb9b45..dbb24634d9 100644
--- a/webapp/packages/core-blocks/src/Table/BASE_TABLE_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Table/BASE_TABLE_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BASE_TABLE_STYLES = css`
@@ -23,18 +22,18 @@ export const BASE_TABLE_STYLES = css`
         top: 0;
         z-index: 1;
 
-        &> tr {
+        & > tr {
           border-top: none !important;
           border-bottom: none !important;
 
-          &> th {
+          & > th {
             box-shadow: inset 0 -1px 0 var(--theme-background);
           }
         }
       }
     }
 
-    &[|size="big"] {
+    &[|size='big'] {
       & > thead > tr > th {
         height: 54px;
 
@@ -55,111 +54,111 @@ export const BASE_TABLE_STYLES = css`
     }
   }
 
-tr {
-  outline: none;
-  border-bottom: 1px solid;
-  border-color: var(--theme-background)!important;
-}
-
-tbody > tr {
-  &:last-child {
-    border-bottom: none;
+  tr {
+    outline: none;
+    border-bottom: 1px solid;
+    border-color: var(--theme-background) !important;
   }
 
-  &:focus {
-    border-color: var(--theme-background);
-  }
+  tbody > tr {
+    &:last-child {
+      border-bottom: none;
+    }
 
-  &:not([|noHover]):hover,
-  &:not([|noHover])[|selected],
-  &:not([|noHover])[|expanded] {
-    background-color: var(--theme-sub-secondary);
-  }
+    &:focus {
+      border-color: var(--theme-background);
+    }
 
-  &[|disabled] {
-    opacity: 0.85;
-  }
-}
+    &:not([|noHover]):hover,
+    &:not([|noHover])[|selected],
+    &:not([|noHover])[|expanded] {
+      background-color: var(--theme-sub-secondary);
+    }
 
-th {
-  box-sizing: border-box;
-  white-space: nowrap;
-  padding: 16px;
-  height: 36px;
-  padding-top: unset;
-  padding-bottom: unset;
-  border-color: var(--theme-background);
-  text-transform: uppercase;
-  text-align: left;
-  text-decoration: none !important;
-
-  &[|min] {
-    width: 28px;
-  }
-
-  &[|centerContent] > th-flex {
-    align-items: center;
-    justify-content: center;
-  }
-
-  &> th-flex {
-    display: flex;
-  }
-
-  &:last-child {
-    border-right: none;
-  }
-}
-
-td {
-  position: relative;
-  box-sizing: border-box;
-  height: 28px;
-  padding: 0 16px;
-  transition: padding ease-in-out 0.24s;
-
-  &[|ellipsis] {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  &[|centerContent] > td-flex {
-    align-items: center;
-    justify-content: center;
-  }
-
-  & > td-flex {
-    display: flex;
-  }
-
-  &[|expandArea] {
-    padding: 0;
-  }
-
-  & > input[type="checkbox"] {
-    display: block;
-    height: 16px;
-    width: 16px;
-  }
-}
-
-table-item-expand-box {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  width: 16px;
-  height: 100%;
-  padding: 0;
-
-  & > Icon {
-    width: 16px;
-    height: 16px;
-    padding: 0;
-
-    &[use|expanded] {
-      transform: rotate(180deg);
+    &[|disabled] {
+      opacity: 0.85;
     }
   }
-}
-`;
\ No newline at end of file
+
+  th {
+    box-sizing: border-box;
+    white-space: nowrap;
+    padding: 16px;
+    height: 36px;
+    padding-top: unset;
+    padding-bottom: unset;
+    border-color: var(--theme-background);
+    text-transform: uppercase;
+    text-align: left;
+    text-decoration: none !important;
+
+    &[|min] {
+      width: 28px;
+    }
+
+    &[|centerContent] > th-flex {
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > th-flex {
+      display: flex;
+    }
+
+    &:last-child {
+      border-right: none;
+    }
+  }
+
+  td {
+    position: relative;
+    box-sizing: border-box;
+    height: 28px;
+    padding: 0 16px;
+    transition: padding ease-in-out 0.24s;
+
+    &[|ellipsis] {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    &[|centerContent] > td-flex {
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > td-flex {
+      display: flex;
+    }
+
+    &[|expandArea] {
+      padding: 0;
+    }
+
+    & > input[type='checkbox'] {
+      display: block;
+      height: 16px;
+      width: 16px;
+    }
+  }
+
+  table-item-expand-box {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    width: 16px;
+    height: 100%;
+    padding: 0;
+
+    & > Icon {
+      width: 16px;
+      height: 16px;
+      padding: 0;
+
+      &[use|expanded] {
+        transform: rotate(180deg);
+      }
+    }
+  }
+`;
diff --git a/webapp/packages/core-blocks/src/Table/EventTableItemExpandFlag.ts b/webapp/packages/core-blocks/src/Table/EventTableItemExpandFlag.ts
index 3a90a9b9f9..af3a1dca61 100644
--- a/webapp/packages/core-blocks/src/Table/EventTableItemExpandFlag.ts
+++ b/webapp/packages/core-blocks/src/Table/EventTableItemExpandFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from '@cloudbeaver/core-events';
 
 export const EventTableItemExpandFlag = EventContext.create<boolean>('table-item-expand');
diff --git a/webapp/packages/core-blocks/src/Table/EventTableItemSelectionFlag.ts b/webapp/packages/core-blocks/src/Table/EventTableItemSelectionFlag.ts
index 994ab36f07..05433eaef0 100644
--- a/webapp/packages/core-blocks/src/Table/EventTableItemSelectionFlag.ts
+++ b/webapp/packages/core-blocks/src/Table/EventTableItemSelectionFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from '@cloudbeaver/core-events';
 
 export const EventTableItemSelectionFlag = EventContext.create<boolean>('table-item-selection');
diff --git a/webapp/packages/core-blocks/src/Table/Table.tsx b/webapp/packages/core-blocks/src/Table/Table.tsx
index 92568b95ff..357922108c 100644
--- a/webapp/packages/core-blocks/src/Table/Table.tsx
+++ b/webapp/packages/core-blocks/src/Table/Table.tsx
@@ -5,16 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, action } from 'mobx';
+import { action, computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useState, useCallback, useMemo, useEffect } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import styled, { use } from 'reshadow';
 
 import { useObjectRef } from '../useObjectRef';
 import { useObservableRef } from '../useObservableRef';
 import { BASE_TABLE_STYLES } from './BASE_TABLE_STYLES';
-import { TableContext, ITableContext, ITableState } from './TableContext';
+import { ITableContext, ITableState, TableContext } from './TableContext';
 
 interface Props {
   keys?: any[];
@@ -27,59 +26,72 @@ interface Props {
 }
 
 export const Table = observer<React.PropsWithChildren<Props>>(function Table({
-  keys, isItemSelectable, selectedItems, expandedItems, className, size, children, onSelect,
+  keys,
+  isItemSelectable,
+  selectedItems,
+  expandedItems,
+  className,
+  size,
+  children,
+  onSelect,
 }) {
   const props = useObjectRef({ onSelect });
 
   const [selected] = useState<Map<any, boolean>>(() => selectedItems || observable(new Map()));
   const [expanded] = useState<Map<any, boolean>>(() => expandedItems || observable(new Map()));
 
-  useEffect(action(() => {
-    if (!keys) {
-      return;
-    }
-
-    const removeSelected = Array.from(selected.keys()).filter(key => !keys.includes(key));
-    const removeExpanded = Array.from(expanded.keys()).filter(key => !keys.includes(key));
-
-    for (const id of removeSelected) {
-      selected.delete(id);
-    }
-
-    for (const id of removeExpanded) {
-      expanded.delete(id);
-    }
-  }), [keys]);
-
-  const state: ITableState = useObservableRef(() => ({
-    get selectableItems() {
-      if (!this.keys) {
-        return [];
+  useEffect(
+    action(() => {
+      if (!keys) {
+        return;
       }
 
-      if (!this.isItemSelectable) {
-        return this.keys;
+      const removeSelected = Array.from(selected.keys()).filter(key => !keys.includes(key));
+      const removeExpanded = Array.from(expanded.keys()).filter(key => !keys.includes(key));
+
+      for (const id of removeSelected) {
+        selected.delete(id);
       }
 
-      return this.keys.filter(this.isItemSelectable);
-    },
-    get tableSelected() {
-      return this.selectableItems.length > 0 && this.selectableItems.every(item => selected.get(item));
-    },
-    selectTable() {
-      const tableSelected = this.tableSelected;
-      for (const item of this.selectableItems) {
-        selected.set(item, !tableSelected);
+      for (const id of removeExpanded) {
+        expanded.delete(id);
       }
-    },
+    }),
+    [keys],
+  );
 
-  }), {
-    keys: observable.ref,
-    isItemSelectable: observable.ref,
-    selectableItems: computed,
-    tableSelected: computed,
-    selectTable: action.bound,
-  }, { keys, isItemSelectable });
+  const state: ITableState = useObservableRef(
+    () => ({
+      get selectableItems() {
+        if (!this.keys) {
+          return [];
+        }
+
+        if (!this.isItemSelectable) {
+          return this.keys;
+        }
+
+        return this.keys.filter(this.isItemSelectable);
+      },
+      get tableSelected() {
+        return this.selectableItems.length > 0 && this.selectableItems.every(item => selected.get(item));
+      },
+      selectTable() {
+        const tableSelected = this.tableSelected;
+        for (const item of this.selectableItems) {
+          selected.set(item, !tableSelected);
+        }
+      },
+    }),
+    {
+      keys: observable.ref,
+      isItemSelectable: observable.ref,
+      selectableItems: computed,
+      tableSelected: computed,
+      selectTable: action.bound,
+    },
+    { keys, isItemSelectable },
+  );
 
   const isExpanded = useMemo(() => computed(() => Array.from(expanded.values()).some(Boolean)), [expanded]);
 
@@ -108,6 +120,6 @@ export const Table = observer<React.PropsWithChildren<Props>>(function Table({
       <table className={className} {...use({ expanded: isExpanded.get(), size })}>
         {children}
       </table>
-    </TableContext.Provider>
+    </TableContext.Provider>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableBody.tsx b/webapp/packages/core-blocks/src/Table/TableBody.tsx
index 0a5c9965f1..8e16cd1701 100644
--- a/webapp/packages/core-blocks/src/Table/TableBody.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableBody.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { BASE_TABLE_STYLES } from './BASE_TABLE_STYLES';
@@ -15,9 +14,5 @@ interface Props {
 }
 
 export const TableBody: React.FC<React.PropsWithChildren<Props>> = function TableBody({ children, className }) {
-  return styled(BASE_TABLE_STYLES)(
-    <tbody className={className}>
-      {children}
-    </tbody>
-  );
+  return styled(BASE_TABLE_STYLES)(<tbody className={className}>{children}</tbody>);
 };
diff --git a/webapp/packages/core-blocks/src/Table/TableColumnHeader.tsx b/webapp/packages/core-blocks/src/Table/TableColumnHeader.tsx
index 5e72eb8143..cda72a98ab 100644
--- a/webapp/packages/core-blocks/src/Table/TableColumnHeader.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableColumnHeader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { use } from 'reshadow';
 
 import { BASE_TABLE_STYLES } from './BASE_TABLE_STYLES';
@@ -19,15 +18,16 @@ interface Props {
 }
 
 export const TableColumnHeader: React.FC<React.PropsWithChildren<Props>> = function TableColumnHeader({
-  title, min, flex, centerContent, className, children,
+  title,
+  min,
+  flex,
+  centerContent,
+  className,
+  children,
 }) {
   return styled(BASE_TABLE_STYLES)(
-    <th
-      title={title}
-      className={className}
-      {...use({ min, centerContent })}
-    >
+    <th title={title} className={className} {...use({ min, centerContent })}>
       {flex ? <th-flex className={className}>{children}</th-flex> : children}
-    </th>
+    </th>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Table/TableColumnValue.tsx b/webapp/packages/core-blocks/src/Table/TableColumnValue.tsx
index 1a3d45d22a..1728498cec 100644
--- a/webapp/packages/core-blocks/src/Table/TableColumnValue.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableColumnValue.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef, useCallback, useContext } from 'react';
 import styled, { use } from 'reshadow';
@@ -30,57 +29,51 @@ type Props = {
   onDoubleClick?: () => void;
 } & React.DetailedHTMLProps<React.TdHTMLAttributes<HTMLTableCellElement>, HTMLTableCellElement>;
 
-export const TableColumnValue = observer<Props, HTMLTableCellElement>(forwardRef(function TableColumnValue({
-  align,
-  children,
-  centerContent,
-  ellipsis,
-  flex,
-  expand,
-  className,
-  onClick,
-  onDoubleClick,
-  ...rest
-}, ref) {
-  const tableContext = useContext(TableContext);
-  const context = useContext(TableItemContext);
-  const props = useObjectRef({ onClick, onDoubleClick });
+export const TableColumnValue = observer<Props, HTMLTableCellElement>(
+  forwardRef(function TableColumnValue({ align, children, centerContent, ellipsis, flex, expand, className, onClick, onDoubleClick, ...rest }, ref) {
+    const tableContext = useContext(TableContext);
+    const context = useContext(TableItemContext);
+    const props = useObjectRef({ onClick, onDoubleClick });
+
+    const handleClick = useCallback(
+      (event: React.MouseEvent<HTMLTableCellElement>) => {
+        if (!context) {
+          return;
+        }
+
+        if (expand && !EventContext.has(event, EventTableItemExpandFlag)) {
+          const state = !context.isExpanded();
+          EventContext.set(event, EventTableItemExpandFlag, state);
+          EventContext.set(event, EventTableItemSelectionFlag);
+          tableContext?.setItemExpand(context.item, state);
+        }
+
+        props.onClick?.();
+      },
+      [tableContext, context, expand],
+    );
+
+    const handleDoubleClick = useCallback((event: React.MouseEvent<HTMLTableCellElement>) => {
+      props.onDoubleClick?.();
+    }, []);
 
-  const handleClick = useCallback((event: React.MouseEvent<HTMLTableCellElement>) => {
     if (!context) {
-      return;
+      return null;
     }
 
-    if (expand && !EventContext.has(event, EventTableItemExpandFlag)) {
-      const state = !context.isExpanded();
-      EventContext.set(event, EventTableItemExpandFlag, state);
-      EventContext.set(event, EventTableItemSelectionFlag);
-      tableContext?.setItemExpand(context.item, state);
-    }
-
-    props.onClick?.();
-  }, [tableContext, context, expand]);
-
-  const handleDoubleClick = useCallback((event: React.MouseEvent<HTMLTableCellElement>) => {
-    props.onDoubleClick?.();
-  }, []);
-
-  if (!context) {
-    return null;
-  }
-
-  return styled(BASE_TABLE_STYLES)(
-    <td
-      align={align}
-      className={className}
-      {...use({ centerContent, ellipsis })}
-      ref={ref}
-      onClick={handleClick}
-      onDoubleClick={handleDoubleClick}
-      {...rest}
-    >
-      {flex && <td-flex className={className}>{children}</td-flex>}
-      {!flex && children}
-    </td>
-  );
-}));
+    return styled(BASE_TABLE_STYLES)(
+      <td
+        align={align}
+        className={className}
+        {...use({ centerContent, ellipsis })}
+        ref={ref}
+        onClick={handleClick}
+        onDoubleClick={handleDoubleClick}
+        {...rest}
+      >
+        {flex && <td-flex className={className}>{children}</td-flex>}
+        {!flex && children}
+      </td>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/Table/TableContext.ts b/webapp/packages/core-blocks/src/Table/TableContext.ts
index eb9cd5a340..8ba726fafe 100644
--- a/webapp/packages/core-blocks/src/Table/TableContext.ts
+++ b/webapp/packages/core-blocks/src/Table/TableContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface ITableState {
diff --git a/webapp/packages/core-blocks/src/Table/TableHeader.tsx b/webapp/packages/core-blocks/src/Table/TableHeader.tsx
index 560f0a7eb2..aaa54f34d6 100644
--- a/webapp/packages/core-blocks/src/Table/TableHeader.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableHeader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { use } from 'reshadow';
 
 import { BASE_TABLE_STYLES } from './BASE_TABLE_STYLES';
@@ -18,9 +17,7 @@ interface Props {
 export const TableHeader: React.FC<React.PropsWithChildren<Props>> = function TableHeader({ fixed, children, className }) {
   return styled(BASE_TABLE_STYLES)(
     <thead className={className} {...use({ fixed })}>
-      <tr>
-        {children}
-      </tr>
-    </thead>
+      <tr>{children}</tr>
+    </thead>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Table/TableItem.tsx b/webapp/packages/core-blocks/src/Table/TableItem.tsx
index b682be4d24..d4bb94e123 100644
--- a/webapp/packages/core-blocks/src/Table/TableItem.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItem.tsx
@@ -5,9 +5,8 @@
  * 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 { useContext, useCallback, useMemo, Children } from 'react';
+import { Children, useCallback, useContext, useMemo } from 'react';
 import styled, { use } from 'reshadow';
 
 import { EventContext } from '@cloudbeaver/core-events';
@@ -17,7 +16,7 @@ import { useObjectRef } from '../useObjectRef';
 import { BASE_TABLE_STYLES } from './BASE_TABLE_STYLES';
 import { EventTableItemSelectionFlag } from './EventTableItemSelectionFlag';
 import { TableContext } from './TableContext';
-import { TableItemContext, ITableItemContext } from './TableItemContext';
+import { ITableItemContext, TableItemContext } from './TableItemContext';
 
 interface ExpandProps {
   item: any;
@@ -54,43 +53,50 @@ export const TableItem = observer<React.PropsWithChildren<Props>>(function Table
     throw new Error('TableContext must be provided');
   }
 
-  const selectionDisabled = selectDisabled || getComputed(() => (!!context.state.isItemSelectable && ((
-    context.state.selectableItems.length > 0 && !context.state.selectableItems.includes(item)
-  ) || !context.state.isItemSelectable(item))));
+  const selectionDisabled =
+    selectDisabled ||
+    getComputed(
+      () =>
+        !!context.state.isItemSelectable &&
+        ((context.state.selectableItems.length > 0 && !context.state.selectableItems.includes(item)) || !context.state.isItemSelectable(item)),
+    );
 
-  const itemContext = useMemo<ITableItemContext>(() => ({
-    item,
-    selectDisabled: selectionDisabled,
-    isSelected: () => !!context.selectedItems.get(item),
-    isExpanded: () => !!context.expandedItems.get(item),
-  }), [item, selectionDisabled]);
+  const itemContext = useMemo<ITableItemContext>(
+    () => ({
+      item,
+      selectDisabled: selectionDisabled,
+      isSelected: () => !!context.selectedItems.get(item),
+      isExpanded: () => !!context.expandedItems.get(item),
+    }),
+    [item, selectionDisabled],
+  );
 
   const isSelected = itemContext.isSelected();
   const isExpanded = itemContext.isExpanded();
 
   const ref = useObjectRef({ isSelected, itemContext, context, onClick });
 
-  const handleClick = useCallback(
-    (event: React.MouseEvent<HTMLTableRowElement>) => {
-      const { isSelected, itemContext, context, onClick } = ref;
+  const handleClick = useCallback((event: React.MouseEvent<HTMLTableRowElement>) => {
+    const { isSelected, itemContext, context, onClick } = ref;
 
-      if (props.selectOnItem && !itemContext.selectDisabled && !EventContext.has(event, EventTableItemSelectionFlag)) {
-        context.setItemSelect(itemContext.item, !isSelected);
-      }
+    if (props.selectOnItem && !itemContext.selectDisabled && !EventContext.has(event, EventTableItemSelectionFlag)) {
+      context.setItemSelect(itemContext.item, !isSelected);
+    }
 
-      if (onClick) {
-        onClick();
+    if (onClick) {
+      onClick();
+    }
+  }, []);
+
+  const handleDoubleClick = useCallback(
+    (e: React.MouseEvent<HTMLTableRowElement>) => {
+      if (onDoubleClick) {
+        onDoubleClick();
       }
     },
-    []
+    [onDoubleClick],
   );
 
-  const handleDoubleClick = useCallback((e: React.MouseEvent<HTMLTableRowElement>) => {
-    if (onDoubleClick) {
-      onDoubleClick();
-    }
-  }, [onDoubleClick]);
-
   const ExpandElement = expandElement;
 
   return styled(BASE_TABLE_STYLES)(
@@ -111,6 +117,6 @@ export const TableItem = observer<React.PropsWithChildren<Props>>(function Table
           </td>
         </tr>
       )}
-    </TableItemContext.Provider>
+    </TableItemContext.Provider>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableItemContext.ts b/webapp/packages/core-blocks/src/Table/TableItemContext.ts
index 6716027477..2cb92f8c9a 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemContext.ts
+++ b/webapp/packages/core-blocks/src/Table/TableItemContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface ITableItemContext {
diff --git a/webapp/packages/core-blocks/src/Table/TableItemExpand.tsx b/webapp/packages/core-blocks/src/Table/TableItemExpand.tsx
index ac1d1ba3bc..6d3bdec642 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemExpand.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemExpand.tsx
@@ -5,9 +5,8 @@
  * 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 { useContext, useCallback } from 'react';
+import { useCallback, useContext } from 'react';
 import styled, { use } from 'reshadow';
 
 import { EventContext } from '@cloudbeaver/core-events';
@@ -26,36 +25,35 @@ interface Props {
   disabled?: boolean;
 }
 
-export const TableItemExpand = observer<Props>(function TableItemExpand({
-  onExpand,
-  className,
-  disabled,
-}) {
+export const TableItemExpand = observer<Props>(function TableItemExpand({ onExpand, className, disabled }) {
   const translate = useTranslate();
   const tableContext = useContext(TableContext);
   const context = useContext(TableItemContext);
   if (!context) {
     throw new Error('TableContext must be provided');
   }
-  const handleClick = useCallback((event: React.MouseEvent<HTMLInputElement>) => {
-    if (disabled) {
-      return;
-    }
+  const handleClick = useCallback(
+    (event: React.MouseEvent<HTMLInputElement>) => {
+      if (disabled) {
+        return;
+      }
 
-    const state = !context.isExpanded();
+      const state = !context.isExpanded();
 
-    EventContext.set(event, EventTableItemExpandFlag, state);
-    EventContext.set(event, EventTableItemSelectionFlag);
-    tableContext?.setItemExpand(context.item, state);
+      EventContext.set(event, EventTableItemExpandFlag, state);
+      EventContext.set(event, EventTableItemSelectionFlag);
+      tableContext?.setItemExpand(context.item, state);
 
-    if (onExpand) {
-      onExpand(context.item, state);
-    }
-  }, [tableContext, context, onExpand, disabled]);
+      if (onExpand) {
+        onExpand(context.item, state);
+      }
+    },
+    [tableContext, context, onExpand, disabled],
+  );
 
   return styled(BASE_TABLE_STYLES)(
     <table-item-expand-box className={className} title={translate('ui_expand')} onClick={handleClick}>
       <Icon name="angle" viewBox="0 0 15 8" {...use({ expanded: context.isExpanded() })} />
-    </table-item-expand-box>
+    </table-item-expand-box>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
index ac694d743f..56287d3465 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
@@ -5,9 +5,8 @@
  * 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 { useContext, useCallback } from 'react';
+import { useCallback, useContext } from 'react';
 import styled, { css } from 'reshadow';
 
 import { EventContext } from '@cloudbeaver/core-events';
@@ -35,27 +34,33 @@ const checkboxStyles = css`
 export const TableItemSelect = observer<Props>(function TableItemSelect({ checked, disabled, tooltip, className }) {
   const tableContext = useContext(TableContext);
   const context = useContext(TableItemContext);
-  const handleClick = useCallback((event: React.MouseEvent<HTMLInputElement>) => {
-    if (!context) {
-      return;
-    }
-    const state = !context.isSelected();
-    EventContext.set(event, EventTableItemSelectionFlag, state);
+  const handleClick = useCallback(
+    (event: React.MouseEvent<HTMLInputElement>) => {
+      if (!context) {
+        return;
+      }
+      const state = !context.isSelected();
+      EventContext.set(event, EventTableItemSelectionFlag, state);
 
-    tableContext?.setItemSelect(context.item, state);
-  }, [tableContext, context]);
+      tableContext?.setItemSelect(context.item, state);
+    },
+    [tableContext, context],
+  );
 
   if (!context) {
     return null;
   }
 
-  return styled(BASE_TABLE_STYLES, checkboxStyles)(
+  return styled(
+    BASE_TABLE_STYLES,
+    checkboxStyles,
+  )(
     <Checkbox
       className={className}
       title={tooltip}
       disabled={context.selectDisabled || disabled}
       checked={checked || context.isSelected()}
       onClick={handleClick}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx b/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
index 98fef3ae36..048a0956f8 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
@@ -5,7 +5,6 @@
  * 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, { use } from 'reshadow';
 
@@ -30,6 +29,6 @@ export const TableItemSeparator = observer<React.PropsWithChildren<Props>>(funct
       <td colSpan={colSpan} {...use({ expandArea: true })}>
         {children}
       </td>
-    </tr>
+    </tr>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableSelect.tsx b/webapp/packages/core-blocks/src/Table/TableSelect.tsx
index 4435f614e6..6bc441f8e0 100644
--- a/webapp/packages/core-blocks/src/Table/TableSelect.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableSelect.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled, { css } from 'reshadow';
@@ -37,7 +36,10 @@ export const TableSelect = observer<Props>(function TableSelect({ id, disabled,
     throw new Error('Context must be provided');
   }
 
-  return styled(BASE_TABLE_STYLES, styles)(
+  return styled(
+    BASE_TABLE_STYLES,
+    styles,
+  )(
     <Checkbox
       id={id}
       className={className}
@@ -45,6 +47,6 @@ export const TableSelect = observer<Props>(function TableSelect({ id, disabled,
       disabled={disabled || !tableContext.state.selectableItems.length}
       checked={tableContext.state.tableSelected}
       onClick={tableContext.state.selectTable}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableState.ts b/webapp/packages/core-blocks/src/Table/TableState.ts
index 6e5af07219..db5b2059e6 100644
--- a/webapp/packages/core-blocks/src/Table/TableState.ts
+++ b/webapp/packages/core-blocks/src/Table/TableState.ts
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable } from 'mobx';
 
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
@@ -29,15 +27,13 @@ export class TableState {
   }
 
   get selectedList(): string[] {
-    return Array
-      .from(this.selected)
+    return Array.from(this.selected)
       .filter(([_, value]) => value)
       .map(([key]) => key);
   }
 
   get expandedList(): string[] {
-    return Array
-      .from(this.expanded)
+    return Array.from(this.expanded)
       .filter(([_, value]) => value)
       .map(([key]) => key);
   }
diff --git a/webapp/packages/core-blocks/src/Table/useTable.ts b/webapp/packages/core-blocks/src/Table/useTable.ts
index 8398165a81..f94bc00225 100644
--- a/webapp/packages/core-blocks/src/Table/useTable.ts
+++ b/webapp/packages/core-blocks/src/Table/useTable.ts
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import { TableState } from './TableState';
diff --git a/webapp/packages/core-blocks/src/Tags/Tag.tsx b/webapp/packages/core-blocks/src/Tags/Tag.tsx
index c51a34c94a..ffb5ef250b 100644
--- a/webapp/packages/core-blocks/src/Tags/Tag.tsx
+++ b/webapp/packages/core-blocks/src/Tags/Tag.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -18,67 +17,61 @@ export interface ITag<T extends string | number = string> {
 }
 
 const style = css`
-    tag-container {
-      composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
-      display: flex;
-      align-items: center;
-      padding: 4px 4px 4px 8px;
+  tag-container {
+    composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
+    display: flex;
+    align-items: center;
+    padding: 4px 4px 4px 8px;
+    border-radius: var(--theme-form-element-radius);
+    max-width: 150px;
+    &::before {
       border-radius: var(--theme-form-element-radius);
-      max-width: 150px;
-      &::before {
-        border-radius: var(--theme-form-element-radius);
-      }
     }
-    tag-icon {
-      display: flex;
-      flex-shrink: 0;
-      width: 16px;
-      margin-right: var(--theme-form-element-radius);
-    }
-    tag-content {
-      composes: theme-typography--caption from global;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    tag-actions {
-      position: relative;
-      display: flex;
-    }
-    tag-action {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 12px;
-      padding: 4px;
-      cursor: pointer;
-      flex-shrink: 0;
-      opacity: 0.5;
+  }
+  tag-icon {
+    display: flex;
+    flex-shrink: 0;
+    width: 16px;
+    margin-right: var(--theme-form-element-radius);
+  }
+  tag-content {
+    composes: theme-typography--caption from global;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  tag-actions {
+    position: relative;
+    display: flex;
+  }
+  tag-action {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 12px;
+    padding: 4px;
+    cursor: pointer;
+    flex-shrink: 0;
+    opacity: 0.5;
 
-      &:hover {
-        opacity: 1;
-      }
+    &:hover {
+      opacity: 1;
     }
-    IconOrImage {
-      width: 100%;
-      height: 100%;
-    }
-  `;
+  }
+  IconOrImage {
+    width: 100%;
+    height: 100%;
+  }
+`;
 
 interface Props<T extends string | number> extends ITag<T> {
   onRemove: (id: T) => void;
   className?: string;
 }
 
-export const Tag = observer(function Tag<T extends string | number>({
-  id,
-  label,
-  icon,
-  onRemove,
-  className,
-}: Props<T>) {
+export const Tag = observer(function Tag<T extends string | number>({ id, label, icon, onRemove, className }: Props<T>) {
   return styled(style)(
-    <tag-container as='li' title={label} className={className}>
+    <tag-container as="li" title={label} className={className}>
       {icon && (
         <tag-icon>
           <IconOrImage icon={icon} />
@@ -87,9 +80,9 @@ export const Tag = observer(function Tag<T extends string | number>({
       <tag-content>{label}</tag-content>
       <tag-actions>
         <tag-action onClick={() => onRemove(id)}>
-          <IconOrImage icon='cross' />
+          <IconOrImage icon="cross" />
         </tag-action>
       </tag-actions>
-    </tag-container>
+    </tag-container>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/Tags/Tags.tsx b/webapp/packages/core-blocks/src/Tags/Tags.tsx
index 130d2ee15e..b4a6203b7b 100644
--- a/webapp/packages/core-blocks/src/Tags/Tags.tsx
+++ b/webapp/packages/core-blocks/src/Tags/Tags.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -27,8 +26,8 @@ const style = css`
 
 export const Tags = observer<React.PropsWithChildren<Props>>(function Tags({ children, className }) {
   return styled(style)(
-    <tags as='ul' className={className}>
+    <tags as="ul" className={className}>
       {children}
-    </tags>
+    </tags>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-blocks/src/TextPlaceholder.tsx b/webapp/packages/core-blocks/src/TextPlaceholder.tsx
index b26e69bb84..ee0349d773 100644
--- a/webapp/packages/core-blocks/src/TextPlaceholder.tsx
+++ b/webapp/packages/core-blocks/src/TextPlaceholder.tsx
@@ -5,23 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const TextPlaceholderStyles = css`
-    div {
-      flex: 1;
-      display: flex;
-      width: 100%;
-      height: 100%;
-      min-width: 230px;
-      margin: auto;
-    }
-    span {
-      margin: auto;
-      text-align: center;
-    }
-  `;
+  div {
+    flex: 1;
+    display: flex;
+    width: 100%;
+    height: 100%;
+    min-width: 230px;
+    margin: auto;
+  }
+  span {
+    margin: auto;
+    text-align: center;
+  }
+`;
 
 interface Props {
   className?: string;
@@ -30,9 +29,7 @@ interface Props {
 export const TextPlaceholder: React.FC<React.PropsWithChildren<Props>> = function TextPlaceholder(props) {
   return styled(TextPlaceholderStyles)(
     <div>
-      <span className={props.className}>
-        {props.children}
-      </span>
-    </div>
+      <span className={props.className}>{props.children}</span>
+    </div>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/TimerIcon.tsx b/webapp/packages/core-blocks/src/TimerIcon.tsx
index 8e8c7b97a7..6cc7755fd4 100644
--- a/webapp/packages/core-blocks/src/TimerIcon.tsx
+++ b/webapp/packages/core-blocks/src/TimerIcon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type React from 'react';
 import styled, { css } from 'reshadow';
 
@@ -35,7 +34,8 @@ const style = css`
       }
     }
   }
-  state, interval {
+  state,
+  interval {
     position: absolute;
     right: 0;
     top: 0;
@@ -68,17 +68,17 @@ interface Props {
   styles?: ComponentStyle;
 }
 
-export const TimerIcon: React.FC<Props & React.ButtonHTMLAttributes<HTMLDivElement>> = function TimerIcon({
-  state,
-  interval,
-  styles,
-  ...rest
-}) {
-  return styled(style, useStyles(styles))(
+export const TimerIcon: React.FC<Props & React.ButtonHTMLAttributes<HTMLDivElement>> = function TimerIcon({ state, interval, styles, ...rest }) {
+  return styled(
+    style,
+    useStyles(styles),
+  )(
     <timer {...rest}>
-      <Icon name='/icons/timer_m.svg#root' viewBox="0 0 24 24" />
-      <state><Icon name={`/icons/timer-${state}_m.svg#root`}  viewBox="0 0 12 12" /></state>
+      <Icon name="/icons/timer_m.svg#root" viewBox="0 0 24 24" />
+      <state>
+        <Icon name={`/icons/timer-${state}_m.svg#root`} viewBox="0 0 12 12" />
+      </state>
       <interval>{interval}</interval>
-    </timer>
+    </timer>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx b/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx
index ee03ea5f29..72ef0f9a61 100644
--- a/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx
+++ b/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx
@@ -5,37 +5,36 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ButtonHTMLAttributes } from 'react';
 import styled, { css } from 'reshadow';
 
 import { IconOrImage } from '../IconOrImage';
 
 const styles = css`
-    button {
-      composes: theme-ripple from global;
-      padding: 0 8px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      background: transparent;
-      outline: none;
-      color: inherit;
-    }
-    IconOrImage {
-      display: block;
-      width: 16px;
-    }
-    button-label {
-      display: block;
-      text-transform: uppercase;
-      font-weight: 700;
-      font-size: 12px;
-    }
-    IconOrImage + button-label {
-      padding-left: 4px
-    }
-  `;
+  button {
+    composes: theme-ripple from global;
+    padding: 0 8px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    background: transparent;
+    outline: none;
+    color: inherit;
+  }
+  IconOrImage {
+    display: block;
+    width: 16px;
+  }
+  button-label {
+    display: block;
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 12px;
+  }
+  IconOrImage + button-label {
+    padding-left: 4px;
+  }
+`;
 
 interface Props extends ButtonHTMLAttributes<any> {
   icon?: string;
@@ -44,9 +43,9 @@ interface Props extends ButtonHTMLAttributes<any> {
 
 export const ToolsAction: React.FC<Props> = function ToolsAction({ icon, viewBox, children, ...rest }) {
   return styled(styles)(
-    <button type='button' {...rest}>
+    <button type="button" {...rest}>
       {icon && <IconOrImage icon={icon} viewBox={viewBox} />}
       {children && <button-label>{children}</button-label>}
-    </button>
+    </button>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
index a376e2cede..6b7a3bf748 100644
--- a/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
+++ b/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
@@ -21,9 +20,5 @@ interface Props {
 }
 
 export const ToolsPanel: React.FC<React.PropsWithChildren<Props>> = function ToolsPanel({ className, children }) {
-  return styled(styles)(
-    <container className={className}>
-      {children}
-    </container>
-  );
+  return styled(styles)(<container className={className}>{children}</container>);
 };
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeClickFlag.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeClickFlag.ts
index da093aefe7..3bafde4c73 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeClickFlag.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeClickFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from '@cloudbeaver/core-events';
 
 export const EventTreeNodeClickFlag = EventContext.create<boolean>('tree-node-click');
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeExpandFlag.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeExpandFlag.ts
index 26bb9d0b68..95624c6b79 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeExpandFlag.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeExpandFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from '@cloudbeaver/core-events';
 
 export const EventTreeNodeExpandFlag = EventContext.create<boolean>('tree-node-expand');
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeSelectFlag.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeSelectFlag.ts
index b58c6aba1d..65f8d4dc53 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeSelectFlag.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/EventTreeNodeSelectFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from '@cloudbeaver/core-events';
 
 export const EventTreeNodeSelectFlag = EventContext.create<boolean>('tree-node-select');
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
index 8c87ad497c..256c38d27f 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { forwardRef } from 'react';
@@ -31,88 +30,95 @@ interface IInnerTreeNodeContext extends ITreeNodeContext {
   inProgress: number;
 }
 
-export const TreeNode = observer<Props, HTMLDivElement | null>(forwardRef(function TreeNode({
-  group = false,
-  loading = false,
-  selected = false,
-  indeterminateSelected = false,
-  disabled = false,
-  expanded = false,
-  showInFilter = false,
-  externalExpanded,
-  leaf = false,
-  className,
-  children,
-  ...handlers
-}, ref) {
-  const handlersRef = useObjectRef(handlers);
+export const TreeNode = observer<Props, HTMLDivElement | null>(
+  forwardRef(function TreeNode(
+    {
+      group = false,
+      loading = false,
+      selected = false,
+      indeterminateSelected = false,
+      disabled = false,
+      expanded = false,
+      showInFilter = false,
+      externalExpanded,
+      leaf = false,
+      className,
+      children,
+      ...handlers
+    },
+    ref,
+  ) {
+    const handlersRef = useObjectRef(handlers);
 
-  async function processAction(action: () => Promise<void>) {
-    nodeContext.inProgress++;
+    async function processAction(action: () => Promise<void>) {
+      nodeContext.inProgress++;
 
-    try {
-      await action();
-    } finally {
-      nodeContext.inProgress--;
+      try {
+        await action();
+      } finally {
+        nodeContext.inProgress--;
+      }
     }
-  }
 
-  const nodeContext = useObservableRef<IInnerTreeNodeContext>(() => ({
-    get processing() {
-      return this.inProgress > 0;
-    },
-    inProgress: 0,
-    async click() {
-      await processAction(async () => {
-        await handlersRef.onClick?.(this.leaf);
-      });
-    },
-    async expand() {
-      await processAction(async () => {
-        await handlersRef.onExpand?.();
-      });
-    },
-    async select(multiple?: boolean, nested?: boolean) {
-      await processAction(async () => {
-        await handlersRef.onSelect?.(multiple, nested);
-      });
-    },
-    async open() {
-      await processAction(async () => {
-        await handlersRef.onOpen?.(this.leaf);
-      });
-    },
-  }), {
-    group: observable.ref,
-    disabled: observable.ref,
-    processing: computed,
-    inProgress: observable.ref,
-    loading: observable.ref,
-    selected: observable.ref,
-    indeterminateSelected: observable.ref,
-    expanded: observable.ref,
-    externalExpanded: observable.ref,
-    showInFilter: observable.ref,
-    leaf: observable.ref,
-  }, {
-    group,
-    disabled,
-    loading,
-    selected,
-    indeterminateSelected,
-    expanded,
-    showInFilter,
-    externalExpanded,
-    leaf,
-  });
+    const nodeContext = useObservableRef<IInnerTreeNodeContext>(
+      () => ({
+        get processing() {
+          return this.inProgress > 0;
+        },
+        inProgress: 0,
+        async click() {
+          await processAction(async () => {
+            await handlersRef.onClick?.(this.leaf);
+          });
+        },
+        async expand() {
+          await processAction(async () => {
+            await handlersRef.onExpand?.();
+          });
+        },
+        async select(multiple?: boolean, nested?: boolean) {
+          await processAction(async () => {
+            await handlersRef.onSelect?.(multiple, nested);
+          });
+        },
+        async open() {
+          await processAction(async () => {
+            await handlersRef.onOpen?.(this.leaf);
+          });
+        },
+      }),
+      {
+        group: observable.ref,
+        disabled: observable.ref,
+        processing: computed,
+        inProgress: observable.ref,
+        loading: observable.ref,
+        selected: observable.ref,
+        indeterminateSelected: observable.ref,
+        expanded: observable.ref,
+        externalExpanded: observable.ref,
+        showInFilter: observable.ref,
+        leaf: observable.ref,
+      },
+      {
+        group,
+        disabled,
+        loading,
+        selected,
+        indeterminateSelected,
+        expanded,
+        showInFilter,
+        externalExpanded,
+        leaf,
+      },
+    );
 
-  const elementExpanded = getComputed(() => nodeContext.externalExpanded ?? nodeContext.expanded);
+    const elementExpanded = getComputed(() => nodeContext.externalExpanded ?? nodeContext.expanded);
 
-  return styled(TREE_NODE_STYLES)(
-    <node {...use({ expanded: elementExpanded })} ref={ref} className={className}>
-      <TreeNodeContext.Provider value={nodeContext}>
-        {children}
-      </TreeNodeContext.Provider>
-    </node>
-  );
-}));
+    return styled(TREE_NODE_STYLES)(
+      <node {...use({ expanded: elementExpanded })} ref={ref} className={className}>
+        <TreeNodeContext.Provider value={nodeContext}>{children}</TreeNodeContext.Provider>
+      </node>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
index 699989c8e2..ea2645dfec 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface ITreeNodeContext {
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
index 32bf8ac65e..cfd07665b3 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
@@ -5,7 +5,6 @@
  * 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 React, { forwardRef, useContext } from 'react';
 
@@ -30,108 +29,98 @@ interface Props extends ITreeNodeState {
   children?: React.ReactNode;
 }
 
-export const TreeNodeControl = observer<Props & React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>(forwardRef(function TreeNodeControl({
-  title,
-  group,
-  disabled,
-  loading,
-  selected,
-  expanded,
-  externalExpanded,
-  leaf,
-  onClick,
-  onMouseDown,
-  className,
-  children,
-  big,
-  ...rest
-}, ref) {
-  const context = useContext(TreeNodeContext);
+export const TreeNodeControl = observer<Props & React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>(
+  forwardRef(function TreeNodeControl(
+    { title, group, disabled, loading, selected, expanded, externalExpanded, leaf, onClick, onMouseDown, className, children, big, ...rest },
+    ref,
+  ) {
+    const context = useContext(TreeNodeContext);
 
-  if (!context) {
-    throw new Error('Context not provided');
-  }
-
-  if (group !== undefined) {
-    context.group = group;
-  }
-
-  if (disabled !== undefined) {
-    context.disabled = disabled;
-  }
-
-  if (loading !== undefined) {
-    context.loading = loading;
-  }
-
-  if (selected !== undefined) {
-    context.selected = selected;
-  }
-
-  if (expanded !== undefined) {
-    context.expanded = expanded;
-  }
-
-  if (leaf !== undefined) {
-    context.leaf = leaf;
-  }
-
-  if (externalExpanded !== undefined) {
-    context.externalExpanded = externalExpanded;
-  }
-
-  async function handleEnter(event: React.KeyboardEvent<HTMLDivElement>) {
-    if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
-      return;
+    if (!context) {
+      throw new Error('Context not provided');
     }
 
-    EventContext.set(event, EventTreeNodeSelectFlag);
-    switch ((event as unknown as KeyboardEvent).code) {
-      case KEY.ENTER:
-        await context.select(event.ctrlKey || event.metaKey);
-        break;
-    }
-    return true;
-  }
-  async function handleClick(event: React.MouseEvent<HTMLDivElement>) {
-    if (onClick) {
-      onClick(event);
+    if (group !== undefined) {
+      context.group = group;
     }
 
-    if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
-      return;
+    if (disabled !== undefined) {
+      context.disabled = disabled;
     }
 
-    EventContext.set(event, EventTreeNodeClickFlag);
-
-    await context.click?.();
-  }
-  async function handleDbClick(event: React.MouseEvent<HTMLDivElement>) {
-    if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
-      return;
+    if (loading !== undefined) {
+      context.loading = loading;
     }
-    await context.open();
-  }
-  function handleMouseDown(event: React.MouseEvent<HTMLDivElement>) {
-    if (onMouseDown) {
-      onMouseDown(event);
-    }
-  }
 
-  return (
-    <div
-      ref={ref}
-      tabIndex={0}
-      title={title}
-      aria-selected={context.selected}
-      className={className}
-      onClick={handleClick}
-      onMouseDown={handleMouseDown}
-      onKeyDown={handleEnter}
-      onDoubleClick={handleDbClick}
-      {...rest}
-    >
-      {children}
-    </div>
-  );
-}));
+    if (selected !== undefined) {
+      context.selected = selected;
+    }
+
+    if (expanded !== undefined) {
+      context.expanded = expanded;
+    }
+
+    if (leaf !== undefined) {
+      context.leaf = leaf;
+    }
+
+    if (externalExpanded !== undefined) {
+      context.externalExpanded = externalExpanded;
+    }
+
+    async function handleEnter(event: React.KeyboardEvent<HTMLDivElement>) {
+      if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
+        return;
+      }
+
+      EventContext.set(event, EventTreeNodeSelectFlag);
+      switch ((event as unknown as KeyboardEvent).code) {
+        case KEY.ENTER:
+          await context.select(event.ctrlKey || event.metaKey);
+          break;
+      }
+      return true;
+    }
+    async function handleClick(event: React.MouseEvent<HTMLDivElement>) {
+      if (onClick) {
+        onClick(event);
+      }
+
+      if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
+        return;
+      }
+
+      EventContext.set(event, EventTreeNodeClickFlag);
+
+      await context.click?.();
+    }
+    async function handleDbClick(event: React.MouseEvent<HTMLDivElement>) {
+      if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventStopPropagationFlag)) {
+        return;
+      }
+      await context.open();
+    }
+    function handleMouseDown(event: React.MouseEvent<HTMLDivElement>) {
+      if (onMouseDown) {
+        onMouseDown(event);
+      }
+    }
+
+    return (
+      <div
+        ref={ref}
+        tabIndex={0}
+        title={title}
+        aria-selected={context.selected}
+        className={className}
+        onClick={handleClick}
+        onMouseDown={handleMouseDown}
+        onKeyDown={handleEnter}
+        onDoubleClick={handleDbClick}
+        {...rest}
+      >
+        {children}
+      </div>
+    );
+  }),
+);
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
index 24e74c2e63..6c2edc76dc 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled, { css } from 'reshadow';
@@ -35,13 +34,7 @@ interface Props {
   className?: string;
 }
 
-export const TreeNodeExpand = observer<Props>(function TreeNodeExpand({
-  leaf,
-  big,
-  filterActive,
-  disabled,
-  className,
-}) {
+export const TreeNodeExpand = observer<Props>(function TreeNodeExpand({ leaf, big, filterActive, disabled, className }) {
   const context = useContext(TreeNodeContext);
 
   if (!context) {
@@ -51,7 +44,10 @@ export const TreeNodeExpand = observer<Props>(function TreeNodeExpand({
   const showInFilter = context.showInFilter;
   disabled = getComputed(() => context.externalExpanded || context.disabled) || disabled;
   leaf = context.leaf || leaf;
-  const loading = useStateDelay(getComputed(() => context.loading || context.processing), 300);
+  const loading = useStateDelay(
+    getComputed(() => context.loading || context.processing),
+    300,
+  );
   const expandable = getComputed(() => !loading && (!leaf || context.externalExpanded));
 
   async function handleExpand(event: React.MouseEvent<HTMLDivElement>) {
@@ -98,6 +94,6 @@ export const TreeNodeExpand = observer<Props>(function TreeNodeExpand({
     <arrow className={className} onClick={handleExpand} onDoubleClick={handleDbClick}>
       {loading && <Loader small fullSize />}
       {expandable && <Icon name={iconName} viewBox={viewBox} />}
-    </arrow>
+    </arrow>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeIcon.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeIcon.tsx
index 496980b501..a7841dc780 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeIcon.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeIcon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -25,16 +24,11 @@ interface Props {
   className?: string;
 }
 
-export const TreeNodeIcon: React.FC<React.PropsWithChildren<Props>> = function TreeNodeIcon({
-  icon,
-  style,
-  className,
-  children,
-}) {
+export const TreeNodeIcon: React.FC<React.PropsWithChildren<Props>> = function TreeNodeIcon({ icon, style, className, children }) {
   return styled(useStyles(styles, style))(
     <icon className={className}>
       {icon && <StaticImage icon={icon} />}
       {children}
-    </icon>
+    </icon>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeName.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeName.tsx
index 60f42b9713..891ef816e0 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeName.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeName.tsx
@@ -10,10 +10,10 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
   className?: string;
 }
 
-export const TreeNodeName: React.FC<Props> = function TreeNodeName({
-  className,
-  children,
-  ...rest
-}) {
-  return <div className={className} {...rest}>{children}</div>;
+export const TreeNodeName: React.FC<Props> = function TreeNodeName({ className, children, ...rest }) {
+  return (
+    <div className={className} {...rest}>
+      {children}
+    </div>
+  );
 };
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNested.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNested.tsx
index ebb1346b42..8c15519db5 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNested.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNested.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 interface Props extends React.PropsWithChildren {
@@ -14,9 +13,10 @@ interface Props extends React.PropsWithChildren {
   className?: string;
 }
 
-export const TreeNodeNested = forwardRef<HTMLDivElement, Props>(function TreeNodeNested({
-  className,
-  children,
-}, ref) {
-  return <div ref={ref} className={className}>{children}</div>;
+export const TreeNodeNested = forwardRef<HTMLDivElement, Props>(function TreeNodeNested({ className, children }, ref) {
+  return (
+    <div ref={ref} className={className}>
+      {children}
+    </div>
+  );
 });
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
index 17bc047b7d..63bfe78446 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx
@@ -11,9 +11,6 @@ interface Props {
   className?: string;
 }
 
-export const TreeNodeNestedMessage: React.FC<React.PropsWithChildren<Props>> = function TreeNodeNestedMessage({
-  className,
-  children,
-}) {
+export const TreeNodeNestedMessage: React.FC<React.PropsWithChildren<Props>> = function TreeNodeNestedMessage({ className, children }) {
   return <div className={className}>{children}</div>;
 };
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
index 29ef8c1148..93f0b39737 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled, { css } from 'reshadow';
@@ -70,16 +69,7 @@ export const TreeNodeSelect = observer<Props>(function TreeNodeSelect({
 
   return styled(styles)(
     <div className={className} onClick={handleClick} onDoubleClick={handleDbClick}>
-      {loading
-        ? <Loader small />
-        : (
-          <Checkbox
-            checked={selected}
-            indeterminate={indeterminate}
-            disabled={disabled}
-            onChange={handleSelect}
-          />
-        )}
-    </div>
+      {loading ? <Loader small /> : <Checkbox checked={selected} indeterminate={indeterminate} disabled={disabled} onChange={handleSelect} />}
+    </div>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
index 9214ba3501..47e19c08d1 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts
@@ -5,174 +5,175 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const TREE_NODE_STYLES = css`
-    TreeNodeControl {
-      composes: theme-ripple theme-ripple-selectable from global;
-    }
-    TreeNodeNestedMessage {
-      composes: theme-text-text-hint-on-light from global;
-    }
-    node {
-      box-sizing: border-box;
-      width: inherit;
-      min-width: 100%;
+  TreeNodeControl {
+    composes: theme-ripple theme-ripple-selectable from global;
+  }
+  TreeNodeNestedMessage {
+    composes: theme-text-text-hint-on-light from global;
+  }
+  node {
+    box-sizing: border-box;
+    width: inherit;
+    min-width: 100%;
 
-      &[use|expanded] {
-        & > TreeNodeNested {
-          display: block;
-        }
-
-        & > TreeNodeControl > TreeNodeExpand {
-          transform: rotate(0deg);
-        }
-      }
-
-      & TreeNodeControl {
-        box-sizing: border-box;
-        height: 22px;
-        display: flex;
-        align-items: center;
-        padding: 2px 0 2px 0;
-        user-select: none;
-        white-space: nowrap;
-        position: initial;
-        outline: none;
-
-        &::before {
-          left: 0;
-          top: auto;
-          height: inherit;
-          width: 100%;
-        }
-
-        &[|dragging] {
-          opacity: 0.6;
-        }
-
-        &[|editing]::before {
-          display: none;
-        }
-
-        & > * {
-          margin-right: 0;
-          margin-left: 4px;
-        }
-      }
-    }
-
-    TreeNodeExpand {
-      display: flex;
-      box-sizing: border-box;
-      flex-shrink: 0;
-      opacity: 0.5;
-      width: 16px;
-      height: 16px;
-      transform: rotate(-90deg);
-      & [|size='small'] {
+    &[use|expanded] {
+      & > TreeNodeNested {
         display: block;
       }
 
-      & [|size='big'] {
-        display: none;
+      & > TreeNodeControl > TreeNodeExpand {
+        transform: rotate(0deg);
       }
     }
 
-    NavigationNode[dragging] {
-      opacity: 0.5!important;
-    }
-
-    TreeNodeIcon {
+    & TreeNodeControl {
       box-sizing: border-box;
-      flex-shrink: 0;
-      width: 16px;
-      height: 16px;
-    }
-
-    TreeNodeName {
-      box-sizing: border-box;
-      padding-right: 0;
+      height: 22px;
       display: flex;
       align-items: center;
-    }
+      padding: 2px 0 2px 0;
+      user-select: none;
+      white-space: nowrap;
+      position: initial;
+      outline: none;
 
-    TreeNodeFilter {
-      position: relative;
-      min-width: 24px;
-      min-height: 24px;
-      display: flex;
-      align-items: center;
-    }
-
-    TreeNodeIcon, TreeNodeExpand, TreeNodeName {
-      position: relative;
-    }
-
-    TreeNodeNested {
-      box-sizing: border-box;
-      padding-left: 8px;
-      display: none;
-
-      &[root] {
-        padding: 0;
-        display: block;
+      &::before {
+        left: 0;
+        top: auto;
+        height: inherit;
+        width: 100%;
       }
 
-      &[expanded] {
-        display: block;
-      }
-    }
-
-    TreeNodeNestedMessage {
-      composes: theme-typography--caption from global;
-      padding: 4px 12px;
-
-      &[big] {
-        padding: 4px 24px;
-      }
-    }
-
-    tree-box[|big] {
-      & TreeNodeNestedMessage {
-        padding: 4px 24px;
-      }
-    }
-
-    node TreeNodeControl[big] {
-      height: 46px;
-      padding: 2 16px;
-
-      & TreeNodeSelect {
-        margin: 3px;
-      }
-      & TreeNodeName {
-        margin: 0;
-        padding-right: 16px;
-        padding-left: 16px;
-      }
-      & TreeNodeIcon,
-      & TreeNodeExpand {
-        width: 24px;
-        height: 24px;
+      &[|dragging] {
+        opacity: 0.6;
       }
 
-      & TreeNodeExpand [|size='small'] {
+      &[|editing]::before {
         display: none;
       }
 
-      & TreeNodeExpand [|size='big'] {
-        display: block;
-      }
-
       & > * {
-        margin-right: 11px;
-        margin-left: 11px;
+        margin-right: 0;
+        margin-left: 4px;
       }
     }
+  }
 
-    node TreeNodeControl[big] + TreeNodeNested {
-      padding-left: 46px;
+  TreeNodeExpand {
+    display: flex;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    opacity: 0.5;
+    width: 16px;
+    height: 16px;
+    transform: rotate(-90deg);
+    & [|size='small'] {
+      display: block;
     }
+
+    & [|size='big'] {
+      display: none;
+    }
+  }
+
+  NavigationNode[dragging] {
+    opacity: 0.5 !important;
+  }
+
+  TreeNodeIcon {
+    box-sizing: border-box;
+    flex-shrink: 0;
+    width: 16px;
+    height: 16px;
+  }
+
+  TreeNodeName {
+    box-sizing: border-box;
+    padding-right: 0;
+    display: flex;
+    align-items: center;
+  }
+
+  TreeNodeFilter {
+    position: relative;
+    min-width: 24px;
+    min-height: 24px;
+    display: flex;
+    align-items: center;
+  }
+
+  TreeNodeIcon,
+  TreeNodeExpand,
+  TreeNodeName {
+    position: relative;
+  }
+
+  TreeNodeNested {
+    box-sizing: border-box;
+    padding-left: 8px;
+    display: none;
+
+    &[root] {
+      padding: 0;
+      display: block;
+    }
+
+    &[expanded] {
+      display: block;
+    }
+  }
+
+  TreeNodeNestedMessage {
+    composes: theme-typography--caption from global;
+    padding: 4px 12px;
+
+    &[big] {
+      padding: 4px 24px;
+    }
+  }
+
+  tree-box[|big] {
+    & TreeNodeNestedMessage {
+      padding: 4px 24px;
+    }
+  }
+
+  node TreeNodeControl[big] {
+    height: 46px;
+    padding: 2 16px;
+
+    & TreeNodeSelect {
+      margin: 3px;
+    }
+    & TreeNodeName {
+      margin: 0;
+      padding-right: 16px;
+      padding-left: 16px;
+    }
+    & TreeNodeIcon,
+    & TreeNodeExpand {
+      width: 24px;
+      height: 24px;
+    }
+
+    & TreeNodeExpand [|size='small'] {
+      display: none;
+    }
+
+    & TreeNodeExpand [|size='big'] {
+      display: block;
+    }
+
+    & > * {
+      margin-right: 11px;
+      margin-left: 11px;
+    }
+  }
+
+  node TreeNodeControl[big] + TreeNodeNested {
+    padding-left: 46px;
+  }
 `;
diff --git a/webapp/packages/core-blocks/src/UploadArea.tsx b/webapp/packages/core-blocks/src/UploadArea.tsx
index 897580beeb..ad7a7f00c0 100644
--- a/webapp/packages/core-blocks/src/UploadArea.tsx
+++ b/webapp/packages/core-blocks/src/UploadArea.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef, useLayoutEffect } from 'react';
 import styled, { css, use } from 'reshadow';
 
@@ -31,14 +30,10 @@ const styles = css`
   }
 `;
 
-export const UploadArea = forwardRef<HTMLInputElement, Props>(function UploadArea({
-  id = uuid(),
-  value,
-  reset,
-  children,
-  className,
-  ...rest
-}, refInherit) {
+export const UploadArea = forwardRef<HTMLInputElement, Props>(function UploadArea(
+  { id = uuid(), value, reset, children, className, ...rest },
+  refInherit,
+) {
   const ref = useRefInherit<HTMLInputElement>(refInherit);
 
   const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -60,10 +55,10 @@ export const UploadArea = forwardRef<HTMLInputElement, Props>(function UploadAre
 
   return styled(styles)(
     <>
-      <input ref={ref} {...rest} type='file' id={id} hidden onChange={handleChange} />
+      <input ref={ref} {...rest} type="file" id={id} hidden onChange={handleChange} />
       <label htmlFor={id} {...use({ disabled: rest.disabled })} className={className} title={rest.title}>
         {children}
       </label>
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/core-blocks/src/getComputed.ts b/webapp/packages/core-blocks/src/getComputed.ts
index 0b9c8d85e5..afe53141f1 100644
--- a/webapp/packages/core-blocks/src/getComputed.ts
+++ b/webapp/packages/core-blocks/src/getComputed.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 
 export function getComputed<T>(action: () => T, equals?: (a: T, b: T) => boolean): T {
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index fcc0a35386..371165db83 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -194,4 +194,4 @@ export * from './Snackbars/Snackbar';
 export * from './Snackbars/ActionSnackbar';
 export * from './Snackbars/ProcessSnackbar';
 export * from './useUserData';
-export * from './manifest';
\ No newline at end of file
+export * from './manifest';
diff --git a/webapp/packages/core-blocks/src/layout/AppLogo.tsx b/webapp/packages/core-blocks/src/layout/AppLogo.tsx
index b56b1c4ef4..693c43180a 100644
--- a/webapp/packages/core-blocks/src/layout/AppLogo.tsx
+++ b/webapp/packages/core-blocks/src/layout/AppLogo.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css, use } from 'reshadow';
 
 import { IconOrImage } from '../IconOrImage';
@@ -50,6 +49,6 @@ export const AppLogo: React.FC<Props> = function AppLogo({ title, onClick }) {
     <logo title={title} onClick={onClick}>
       <IconOrImage icon="/icons/logo.svg" {...use({ primary: true })} />
       <IconOrImage icon="/icons/logo_sm.svg" {...use({ small: true })} />
-    </logo>
+    </logo>,
   );
 };
diff --git a/webapp/packages/core-blocks/src/layout/BASE_LAYOUT_GRID_STYLES.ts b/webapp/packages/core-blocks/src/layout/BASE_LAYOUT_GRID_STYLES.ts
index ee1c4debbd..d18e1c8ee8 100644
--- a/webapp/packages/core-blocks/src/layout/BASE_LAYOUT_GRID_STYLES.ts
+++ b/webapp/packages/core-blocks/src/layout/BASE_LAYOUT_GRID_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BASE_LAYOUT_GRID_STYLES = css`
@@ -18,4 +17,4 @@ export const BASE_LAYOUT_GRID_STYLES = css`
   layout-grid-cell {
     composes: layout-grid__cell from global;
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/core-blocks/src/layout/TopAppBar.tsx b/webapp/packages/core-blocks/src/layout/TopAppBar.tsx
index d052f42784..9bc131a8ea 100644
--- a/webapp/packages/core-blocks/src/layout/TopAppBar.tsx
+++ b/webapp/packages/core-blocks/src/layout/TopAppBar.tsx
@@ -5,30 +5,25 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 export const topAppBarStyles = css`
-    header {
-      composes: theme-text-on-primary theme-typography--body2 from global;
-      display: flex;
-      align-items: center;
-      height: 48px;
-      padding: 0 8px;
-      background-color: #2A7CB4;
-      z-index: 1;
-      flex-shrink: 0;
-    }
-  `;
+  header {
+    composes: theme-text-on-primary theme-typography--body2 from global;
+    display: flex;
+    align-items: center;
+    height: 48px;
+    padding: 0 8px;
+    background-color: #2a7cb4;
+    z-index: 1;
+    flex-shrink: 0;
+  }
+`;
 
 interface Props extends React.PropsWithChildren {
   className?: string;
 }
 
 export const TopAppBar: React.FC<Props> = function TopAppBar({ children, className }) {
-  return styled(topAppBarStyles)(
-    <header className={className}>
-      {children}
-    </header>
-  );
+  return styled(topAppBarStyles)(<header className={className}>{children}</header>);
 };
diff --git a/webapp/packages/core-blocks/src/localization/Translate.tsx b/webapp/packages/core-blocks/src/localization/Translate.tsx
index 60d237cbee..25395dedb5 100644
--- a/webapp/packages/core-blocks/src/localization/Translate.tsx
+++ b/webapp/packages/core-blocks/src/localization/Translate.tsx
@@ -5,7 +5,6 @@
  * 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 type { TLocalizationToken } from '@cloudbeaver/core-localization';
diff --git a/webapp/packages/core-blocks/src/localization/useTranslate.ts b/webapp/packages/core-blocks/src/localization/useTranslate.ts
index b65c2ad514..0f4830da6a 100644
--- a/webapp/packages/core-blocks/src/localization/useTranslate.ts
+++ b/webapp/packages/core-blocks/src/localization/useTranslate.ts
@@ -5,15 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
-import { TLocalizationToken, LocalizationService } from '@cloudbeaver/core-localization';
+import { LocalizationService, TLocalizationToken } from '@cloudbeaver/core-localization';
 
-export function useTranslate(): (<T extends TLocalizationToken | undefined>(
-  token: T,
-  fallback?: T,
-  args?: Record<string | number, any>
-) => T) {
+export function useTranslate(): <T extends TLocalizationToken | undefined>(token: T, fallback?: T, args?: Record<string | number, any>) => T {
   const localizationService = useService(LocalizationService);
 
   return localizationService.translate;
diff --git a/webapp/packages/core-blocks/src/manifest.ts b/webapp/packages/core-blocks/src/manifest.ts
index a26b54ab8a..d1de5a6ad6 100644
--- a/webapp/packages/core-blocks/src/manifest.ts
+++ b/webapp/packages/core-blocks/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { BlocksLocaleService } from './BlocksLocaleService';
@@ -15,7 +14,5 @@ export const coreBlocksManifest: PluginManifest = {
     name: 'Core Blocks',
   },
 
-  providers: [
-    BlocksLocaleService,
-  ],
+  providers: [BlocksLocaleService],
 };
diff --git a/webapp/packages/core-blocks/src/preventFocusHandler.ts b/webapp/packages/core-blocks/src/preventFocusHandler.ts
index 5d7c3cd4db..8996a532dd 100644
--- a/webapp/packages/core-blocks/src/preventFocusHandler.ts
+++ b/webapp/packages/core-blocks/src/preventFocusHandler.ts
@@ -8,4 +8,4 @@
 
 export function preventFocusHandler(event: React.MouseEvent<HTMLElement>) {
   event.preventDefault();
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useActivationDelay.tsx b/webapp/packages/core-blocks/src/useActivationDelay.tsx
index 0fe80ba36e..166dd48d2b 100644
--- a/webapp/packages/core-blocks/src/useActivationDelay.tsx
+++ b/webapp/packages/core-blocks/src/useActivationDelay.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useRef, useState } from 'react';
 
 export function useActivationDelay(state: boolean, delay: number, callback?: () => void): boolean {
@@ -26,4 +25,4 @@ export function useActivationDelay(state: boolean, delay: number, callback?: ()
   }, [state, delayedState, delay]);
 
   return delayedState;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useAdministrationSettings.ts b/webapp/packages/core-blocks/src/useAdministrationSettings.ts
index 9e7b5cbc77..e27ad3bb8f 100644
--- a/webapp/packages/core-blocks/src/useAdministrationSettings.ts
+++ b/webapp/packages/core-blocks/src/useAdministrationSettings.ts
@@ -5,14 +5,12 @@
  * 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-authentication';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 
 import { useResource } from './ResourcesHooks/useResource';
 import { usePermission } from './usePermission';
 
-
 interface IAdministrationSettings {
   credentialsSavingEnabled: boolean;
 }
diff --git a/webapp/packages/core-blocks/src/useClickEvents.ts b/webapp/packages/core-blocks/src/useClickEvents.ts
index 71b714c567..97a47df9cf 100644
--- a/webapp/packages/core-blocks/src/useClickEvents.ts
+++ b/webapp/packages/core-blocks/src/useClickEvents.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from './useObjectRef';
 
 interface IOptions<T> {
@@ -19,25 +18,28 @@ interface IHandlers<T> {
 }
 
 export function useClickEvents<T>(options: IOptions<T>): IHandlers<T> {
-  return useObjectRef(() => ({
-    delayed: false,
-    onClick(event: React.MouseEvent<T>) {
-      if (this.delayed) {
-        return;
-      }
-
-      this.delayed = true;
-
-      setTimeout(() => {
+  return useObjectRef(
+    () => ({
+      delayed: false,
+      onClick(event: React.MouseEvent<T>) {
         if (this.delayed) {
-          this.options.onClick?.();
-          this.delayed = false;
+          return;
         }
-      }, 300);
-    },
-    onDoubleClick(event: React.MouseEvent<T>) {
-      this.delayed = false;
-      options.onDoubleClick?.(event);
-    },
-  }), { options });
+
+        this.delayed = true;
+
+        setTimeout(() => {
+          if (this.delayed) {
+            this.options.onClick?.();
+            this.delayed = false;
+          }
+        }, 300);
+      },
+      onDoubleClick(event: React.MouseEvent<T>) {
+        this.delayed = false;
+        options.onDoubleClick?.(event);
+      },
+    }),
+    { options },
+  );
 }
diff --git a/webapp/packages/core-blocks/src/useClipboard.ts b/webapp/packages/core-blocks/src/useClipboard.ts
index 6b11f19337..69cfcc9839 100644
--- a/webapp/packages/core-blocks/src/useClipboard.ts
+++ b/webapp/packages/core-blocks/src/useClipboard.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
@@ -15,16 +14,19 @@ import { copyToClipboard } from '@cloudbeaver/core-utils';
 export function useClipboard() {
   const notificationService = useService(NotificationService);
 
-  const copy = useCallback((value: string, notify = false) => {
-    try {
-      copyToClipboard(value);
-      if (notify) {
-        notificationService.notify({ title: 'ui_copy_to_clipboard_copied' }, ENotificationType.Success);
+  const copy = useCallback(
+    (value: string, notify = false) => {
+      try {
+        copyToClipboard(value);
+        if (notify) {
+          notificationService.notify({ title: 'ui_copy_to_clipboard_copied' }, ENotificationType.Success);
+        }
+      } catch (exception: any) {
+        notificationService.logException(exception, 'ui_copy_to_clipboard_failed_to_copy');
       }
-    } catch (exception: any) {
-      notificationService.logException(exception, 'ui_copy_to_clipboard_failed_to_copy');
-    }
-  }, [notificationService]);
+    },
+    [notificationService],
+  );
 
   return copy;
 }
diff --git a/webapp/packages/core-blocks/src/useCombinedHandler.ts b/webapp/packages/core-blocks/src/useCombinedHandler.ts
index cd4ca6c30f..316eb6698b 100644
--- a/webapp/packages/core-blocks/src/useCombinedHandler.ts
+++ b/webapp/packages/core-blocks/src/useCombinedHandler.ts
@@ -5,12 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from './useObjectRef';
 
-export function useCombinedHandler<T extends any[]>(
-  ...handlers: Array<((...args: T) => any) | undefined>
-): (...args: T) => void  {
+export function useCombinedHandler<T extends any[]>(...handlers: Array<((...args: T) => any) | undefined>): (...args: T) => void {
   const optionsRef = useObjectRef({ handlers });
   const state = useObjectRef(
     () => ({
diff --git a/webapp/packages/core-blocks/src/useCombinedRef.ts b/webapp/packages/core-blocks/src/useCombinedRef.ts
index c17ea083d9..df1699ac0a 100644
--- a/webapp/packages/core-blocks/src/useCombinedRef.ts
+++ b/webapp/packages/core-blocks/src/useCombinedRef.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 export function useCombinedRef<T>(...refs: React.ForwardedRef<T>[]) {
@@ -18,4 +17,4 @@ export function useCombinedRef<T>(...refs: React.ForwardedRef<T>[]) {
       }
     }
   }, refs);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useControlledScroll.ts b/webapp/packages/core-blocks/src/useControlledScroll.ts
index fd0f131f3b..de2a535b23 100644
--- a/webapp/packages/core-blocks/src/useControlledScroll.ts
+++ b/webapp/packages/core-blocks/src/useControlledScroll.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useLayoutEffect } from 'react';
 
 export interface IScrollState {
diff --git a/webapp/packages/core-blocks/src/useErrorDetails.tsx b/webapp/packages/core-blocks/src/useErrorDetails.tsx
index 5268f30434..5a4a053cc2 100644
--- a/webapp/packages/core-blocks/src/useErrorDetails.tsx
+++ b/webapp/packages/core-blocks/src/useErrorDetails.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
@@ -25,10 +24,12 @@ interface IErrorDetailsHook {
   refresh?: () => void;
 }
 
-type HookType = IErrorDetailsHook | ({
-  name: string;
-  error: Error;
-} & IErrorDetailsHook);
+type HookType =
+  | IErrorDetailsHook
+  | ({
+      name: string;
+      error: Error;
+    } & IErrorDetailsHook);
 
 export function useErrorDetails(error: Error | null): HookType {
   const service = useService(CommonDialogService);
diff --git a/webapp/packages/core-blocks/src/useExecutor.ts b/webapp/packages/core-blocks/src/useExecutor.ts
index 840eaba65e..472eb73cfc 100644
--- a/webapp/packages/core-blocks/src/useExecutor.ts
+++ b/webapp/packages/core-blocks/src/useExecutor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import type { IExecutor, IExecutorHandler, IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
diff --git a/webapp/packages/core-blocks/src/useFn.ts b/webapp/packages/core-blocks/src/useFn.ts
index 7a95a1b7c8..f7db771a28 100644
--- a/webapp/packages/core-blocks/src/useFn.ts
+++ b/webapp/packages/core-blocks/src/useFn.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback, useRef } from 'react';
 
 const noop: any[] = [];
@@ -15,4 +14,4 @@ export function useFn<TArgs extends any[], TValue>(fn: (...args: TArgs) => TValu
   ref.current = fn;
 
   return useCallback((...args: TArgs) => ref.current(...args), noop);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useFocus.ts b/webapp/packages/core-blocks/src/useFocus.ts
index 8bdd0986cb..0ee9724644 100644
--- a/webapp/packages/core-blocks/src/useFocus.ts
+++ b/webapp/packages/core-blocks/src/useFocus.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, observable } from 'mobx';
 import { useEffect } from 'react';
 
@@ -29,12 +28,7 @@ interface IState<T extends HTMLElement> {
   restoreFocus: () => void;
 }
 
-export function useFocus<T extends HTMLElement>({
-  autofocus,
-  focusFirstChild,
-  onFocus,
-  onBlur,
-}: FocusOptions): [(obj: T | null) => void, IState<T>] {
+export function useFocus<T extends HTMLElement>({ autofocus, focusFirstChild, onFocus, onBlur }: FocusOptions): [(obj: T | null) => void, IState<T>] {
   const optionsRef = useObjectRef({ autofocus, focusFirstChild, onFocus, onBlur });
   const state = useObservableRef<IState<T>>(
     () => ({
@@ -51,9 +45,9 @@ export function useFocus<T extends HTMLElement>({
       updateFocus() {
         if (this.reference) {
           if (
-            document.activeElement instanceof HTMLElement
-            && document.activeElement !== this.reference
-            && (optionsRef.autofocus || optionsRef.focusFirstChild)
+            document.activeElement instanceof HTMLElement &&
+            document.activeElement !== this.reference &&
+            (optionsRef.autofocus || optionsRef.focusFirstChild)
           ) {
             this.lastFocus = document.activeElement;
           }
@@ -69,8 +63,7 @@ export function useFocus<T extends HTMLElement>({
       },
       focusFirstChild() {
         if (this.reference !== null && optionsRef.focusFirstChild) {
-          const firstFocusable = this.reference
-            .querySelectorAll<T>(`
+          const firstFocusable = this.reference.querySelectorAll<T>(`
             button:not([disabled=disabled]), 
             [href], 
             input:not([disabled=disabled]):not([readonly=readonly]), 
@@ -112,7 +105,7 @@ export function useFocus<T extends HTMLElement>({
     },
     false,
     undefined,
-    'useFocus'
+    'useFocus',
   );
 
   useEffect(() => {
@@ -147,9 +140,12 @@ export function useFocus<T extends HTMLElement>({
     };
   }, [state.reference]);
 
-  useEffect(() => () => {
-    state.restoreFocus();
-  }, []);
+  useEffect(
+    () => () => {
+      state.restoreFocus();
+    },
+    [],
+  );
 
   return [state.setRef, state];
 }
diff --git a/webapp/packages/core-blocks/src/useFormValidator.ts b/webapp/packages/core-blocks/src/useFormValidator.ts
index 56e31b28e3..99a1c16948 100644
--- a/webapp/packages/core-blocks/src/useFormValidator.ts
+++ b/webapp/packages/core-blocks/src/useFormValidator.ts
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutor, IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
 
 import { useExecutor } from './useExecutor';
@@ -14,16 +12,18 @@ import { useExecutor } from './useExecutor';
 export function useFormValidator(
   validationTask: IExecutor<any> | IExecutorHandlersCollection<any>,
   ref: HTMLFormElement | null,
-  callback?: () => void
+  callback?: () => void,
 ): void {
   useExecutor({
     executor: validationTask,
-    postHandlers: [function validate() {
-      ref?.focus();
-      ref?.checkValidity();
-      ref?.reportValidity();
+    postHandlers: [
+      function validate() {
+        ref?.focus();
+        ref?.checkValidity();
+        ref?.reportValidity();
 
-      callback?.();
-    }],
+        callback?.();
+      },
+    ],
   });
 }
diff --git a/webapp/packages/core-blocks/src/useInterval.ts b/webapp/packages/core-blocks/src/useInterval.ts
index 87a6c461f3..c1c9f41d97 100644
--- a/webapp/packages/core-blocks/src/useInterval.ts
+++ b/webapp/packages/core-blocks/src/useInterval.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import { useObjectRef } from './useObjectRef';
@@ -25,4 +24,4 @@ export function useInterval(callback: () => void, delay: number | null) {
     const id = setInterval(tick, delay);
     return () => clearInterval(id);
   }, [delay]);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useMouse.ts b/webapp/packages/core-blocks/src/useMouse.ts
index 72b662600a..e4739dd26d 100644
--- a/webapp/packages/core-blocks/src/useMouse.ts
+++ b/webapp/packages/core-blocks/src/useMouse.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { useEffect, useState } from 'react';
 
@@ -39,15 +38,21 @@ export interface IMouseHook<T> {
 export function useMouse<T extends HTMLElement>(options: IOptions = {}): IMouseHook<T> {
   const handlersRef = useObjectRef(options);
   const [reference, setReference] = useState<T | null>(null);
-  const state = useObservableRef<IState>(() => ({
-    mouseEnter: false,
-    position: null,
-  }), {
-    mouseEnter: observable.ref,
-    position: observable,
-  }, false, 'useMouse');
+  const state = useObservableRef<IState>(
+    () => ({
+      mouseEnter: false,
+      position: null,
+    }),
+    {
+      mouseEnter: observable.ref,
+      position: observable,
+    },
+    false,
+    'useMouse',
+  );
 
-  useEffect(() => { // performance heavy
+  useEffect(() => {
+    // performance heavy
     state.mouseEnter = false;
 
     if (!reference) {
diff --git a/webapp/packages/core-blocks/src/useObjectRef.ts b/webapp/packages/core-blocks/src/useObjectRef.ts
index 3ca9512d52..daeafa8ad1 100644
--- a/webapp/packages/core-blocks/src/useObjectRef.ts
+++ b/webapp/packages/core-blocks/src/useObjectRef.ts
@@ -5,35 +5,25 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
-export function useObjectRef<T extends Record<any, any>>(
-  init: () => T & ThisType<T>,
-  update: false,
-  bind?: Array<keyof T>
-): T;
-export function useObjectRef<T extends Record<any, any>>(
-  init: () => T & ThisType<T>
-): T;
+export function useObjectRef<T extends Record<any, any>>(init: () => T & ThisType<T>, update: false, bind?: Array<keyof T>): T;
+export function useObjectRef<T extends Record<any, any>>(init: () => T & ThisType<T>): T;
 export function useObjectRef<T extends Record<any, any>, U extends Record<any, any>>(
-  init: () => (T & ThisType<T & U>),
+  init: () => T & ThisType<T & U>,
   update: U & ThisType<T & U>,
-  bind?: Array<keyof (T & U)>
+  bind?: Array<keyof (T & U)>,
 ): T & U;
-export function useObjectRef<T extends Record<any, any>>(
-  init: T & ThisType<T>,
-  bind?: Array<keyof T>
-): T;
+export function useObjectRef<T extends Record<any, any>>(init: T & ThisType<T>, bind?: Array<keyof T>): T;
 export function useObjectRef<T extends Record<any, any>>(
   init: () => Partial<T> & ThisType<T>,
   update: Partial<T> & ThisType<T>,
-  bind?: Array<keyof T>
+  bind?: Array<keyof T>,
 ): T;
 export function useObjectRef<T extends Record<any, any>, U extends Record<any, any>>(
-  init: (() => (T & ThisType<T & U>)) | (T & ThisType<T & U>),
+  init: (() => T & ThisType<T & U>) | (T & ThisType<T & U>),
   update?: (U & ThisType<T & U>) | Array<keyof (T & U)> | false,
-  bind?: Array<keyof (T & U)>
+  bind?: Array<keyof (T & U)>,
 ): T & U {
   if (Array.isArray(update)) {
     bind = update;
diff --git a/webapp/packages/core-blocks/src/useObservableRef.ts b/webapp/packages/core-blocks/src/useObservableRef.ts
index ee67b0093c..f0186eac4d 100644
--- a/webapp/packages/core-blocks/src/useObservableRef.ts
+++ b/webapp/packages/core-blocks/src/useObservableRef.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AnnotationsMap, makeObservable, runInAction, untracked } from 'mobx';
 import { useState } from 'react';
 
@@ -13,41 +12,41 @@ export function useObservableRef<T extends Record<any, any>>(
   init: () => T & ThisType<T>,
   observed: AnnotationsMap<T, never>,
   update: false,
-  name?: string
+  name?: string,
 ): T;
 export function useObservableRef<T extends Record<any, any>>(
   init: () => T & ThisType<T>,
   observed: AnnotationsMap<T, never>,
   update: false,
   bind?: Array<keyof T>,
-  name?: string
+  name?: string,
 ): T;
 export function useObservableRef<T extends Record<any, any>, U extends Record<any, any>>(
   init: () => T & ThisType<T & U>,
   observed: AnnotationsMap<T & U, never>,
   update: U & ThisType<T & U>,
   bind?: Array<keyof (T & U)>,
-  name?: string
+  name?: string,
 ): T & U;
 export function useObservableRef<T extends Record<any, any>>(
   init: T & ThisType<T>,
   observed: AnnotationsMap<T, never>,
   bind?: Array<keyof T>,
-  name?: string
+  name?: string,
 ): T;
 export function useObservableRef<T extends Record<any, any>>(
   init: () => Partial<T> & ThisType<T>,
   observed: AnnotationsMap<T, never>,
   update: Partial<T> & ThisType<T>,
   bind?: Array<keyof T>,
-  name?: string
+  name?: string,
 ): T;
 export function useObservableRef<T extends Record<any, any>>(
   init: T | (() => T),
   observed: AnnotationsMap<T, never>,
   update?: Array<keyof T> | T | false,
   bind?: Array<keyof T> | string,
-  name?: string
+  name?: string,
 ): T {
   if (typeof bind === 'string') {
     name = bind;
diff --git a/webapp/packages/core-blocks/src/usePermission.ts b/webapp/packages/core-blocks/src/usePermission.ts
index f7a0cf27bf..3622d5e4ef 100644
--- a/webapp/packages/core-blocks/src/usePermission.ts
+++ b/webapp/packages/core-blocks/src/usePermission.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 import { PermissionsService } from '@cloudbeaver/core-root';
 
diff --git a/webapp/packages/core-blocks/src/usePromiseState.ts b/webapp/packages/core-blocks/src/usePromiseState.ts
index cd056d073a..4cd28066ab 100644
--- a/webapp/packages/core-blocks/src/usePromiseState.ts
+++ b/webapp/packages/core-blocks/src/usePromiseState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 import { useEffect } from 'react';
 
@@ -14,42 +13,45 @@ import { ILoadableState, isContainsException } from '@cloudbeaver/core-utils';
 
 import { useObservableRef } from './useObservableRef';
 
-
 export function usePromiseState<T>(promise: Promise<T> | null): ILoadableState {
-  const state = useObservableRef(() => ({
-    exception: null,
-    loading: true,
-    get cancel() {
-      if (this.promise instanceof Task && this.promise.cancellable) {
-        return this.promise.cancel.bind(this.promise);
-      }
-      return undefined;
+  const state = useObservableRef(
+    () => ({
+      exception: null,
+      loading: true,
+      get cancel() {
+        if (this.promise instanceof Task && this.promise.cancellable) {
+          return this.promise.cancel.bind(this.promise);
+        }
+        return undefined;
+      },
+      isError() {
+        return isContainsException(this.exception);
+      },
+      isCancelled(): boolean {
+        if (this.promise instanceof Task) {
+          return this.promise.cancelled;
+        }
+        return false;
+      },
+      isLoading(): boolean {
+        if (this.promise instanceof Task) {
+          return this.promise.executing;
+        }
+        return this.promise !== null && this.loading;
+      },
+      isLoaded(): boolean {
+        return this.promise === null;
+      },
+      load() {},
+    }),
+    {
+      cancel: computed,
+      promise: observable.ref,
+      exception: observable.ref,
+      loading: observable.ref,
     },
-    isError() {
-      return isContainsException(this.exception);
-    },
-    isCancelled(): boolean {
-      if (this.promise instanceof Task) {
-        return this.promise.cancelled;
-      }
-      return false;
-    },
-    isLoading(): boolean {
-      if (this.promise instanceof Task) {
-        return this.promise.executing;
-      }
-      return this.promise !== null && this.loading;
-    },
-    isLoaded(): boolean {
-      return this.promise === null;
-    },
-    load() {},
-  }), {
-    cancel: computed,
-    promise: observable.ref,
-    exception: observable.ref,
-    loading: observable.ref,
-  }, { promise });
+    { promise },
+  );
 
   useEffect(() => {
     if (promise) {
@@ -71,4 +73,4 @@ export function usePromiseState<T>(promise: Promise<T> | null): ILoadableState {
   }, [promise]);
 
   return state;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useRefInherit.ts b/webapp/packages/core-blocks/src/useRefInherit.ts
index 21fc843188..f2dbc40d7f 100644
--- a/webapp/packages/core-blocks/src/useRefInherit.ts
+++ b/webapp/packages/core-blocks/src/useRefInherit.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from './useObjectRef';
 
 interface IPrivateRef<T> {
@@ -29,4 +28,4 @@ export function useRefInherit<T>(refInherit?: React.Ref<T>): React.RefObject<T>
       }
     },
   }));
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-blocks/src/useStateDelay.tsx b/webapp/packages/core-blocks/src/useStateDelay.tsx
index 15100d5f53..3cd4539ef3 100644
--- a/webapp/packages/core-blocks/src/useStateDelay.tsx
+++ b/webapp/packages/core-blocks/src/useStateDelay.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useRef, useState } from 'react';
 
 export function useStateDelay(state: boolean, delay: number, callback?: () => void): boolean {
diff --git a/webapp/packages/core-blocks/src/useStyles.ts b/webapp/packages/core-blocks/src/useStyles.ts
index d8508a9256..d32fafb864 100644
--- a/webapp/packages/core-blocks/src/useStyles.ts
+++ b/webapp/packages/core-blocks/src/useStyles.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useMemo, useRef, useState } from 'react';
 import { create } from 'reshadow';
 
 import { useService } from '@cloudbeaver/core-di';
-import { ComponentStyle, BaseStyles, Style, ThemeService } from '@cloudbeaver/core-theming';
+import { BaseStyles, ComponentStyle, Style, ThemeService } from '@cloudbeaver/core-theming';
 import { flat } from '@cloudbeaver/core-utils';
 
 import { useExecutor } from './useExecutor';
@@ -20,9 +19,7 @@ import { useExecutor } from './useExecutor';
  *
  * @param componentStyles styles array
  */
-export function useStyles(
-  ...componentStyles: ComponentStyle[]
-): Record<string, any> {
+export function useStyles(...componentStyles: ComponentStyle[]): Record<string, any> {
   // todo do you understand that we store ALL STYLES in each component that uses this hook?
 
   const stylesRef = useRef<ComponentStyle[]>([]);
@@ -36,11 +33,13 @@ export function useStyles(
 
   useExecutor({
     executor: themeService.onChange,
-    handlers: [function updateThemeId(theme) {
-      if (currentThemeId !== themeService.currentThemeId && trackTheme) {
-        setCurrentThemeId(theme.id);
-      }
-    }],
+    handlers: [
+      function updateThemeId(theme) {
+        if (currentThemeId !== themeService.currentThemeId && trackTheme) {
+          setCurrentThemeId(theme.id);
+        }
+      },
+    ],
   });
 
   let changed = lastThemeRef.current !== currentThemeId || filteredStyles.length !== stylesRef.current.length;
@@ -66,13 +65,10 @@ export function useStyles(
     loadedStyles.current = flat(staticStyles);
 
     if (themedStyles.length > 0) {
-      Promise
-        .all(themedStyles)
-        .then(styles => {
-          loadedStyles.current = flat([staticStyles, flat(styles)])
-            .filter(Boolean) as BaseStyles[];
-          forceUpdate(patch + 1);
-        });
+      Promise.all(themedStyles).then(styles => {
+        loadedStyles.current = flat([staticStyles, flat(styles)]).filter(Boolean) as BaseStyles[];
+        forceUpdate(patch + 1);
+      });
     }
   }
 
diff --git a/webapp/packages/core-blocks/src/useUserData.ts b/webapp/packages/core-blocks/src/useUserData.ts
index e2b6073a70..816b6908f0 100644
--- a/webapp/packages/core-blocks/src/useUserData.ts
+++ b/webapp/packages/core-blocks/src/useUserData.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useRef } from 'react';
 
 import { UserDataService, UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -18,7 +17,7 @@ export function useUserData<T extends Record<any, any>>(
   key: string,
   defaultValue: () => T,
   onUpdate?: (data: T) => void,
-  validate?: (data: T) => boolean
+  validate?: (data: T) => boolean,
 ): T {
   const optionsRef = useObjectRef({ defaultValue, onUpdate, validate });
   useResource(useUserData, UserInfoResource, undefined);
diff --git a/webapp/packages/core-bootstrap/src/bootstrap.ts b/webapp/packages/core-bootstrap/src/bootstrap.ts
index b339956f95..33a2d6adce 100644
--- a/webapp/packages/core-bootstrap/src/bootstrap.ts
+++ b/webapp/packages/core-bootstrap/src/bootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { configure } from 'mobx';
 
 import { App, PluginManifest } from '@cloudbeaver/core-di';
@@ -32,8 +31,6 @@ export function bootstrap(plugins: PluginManifest[]): App {
     }
   });
 
-  app
-    .start()
-    .catch();
+  app.start().catch();
   return app;
 }
diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts
index 01deebde27..3e0db115cd 100644
--- a/webapp/packages/core-bootstrap/src/manifest.ts
+++ b/webapp/packages/core-bootstrap/src/manifest.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { coreAdministrationManifest } from '@cloudbeaver/core-administration';
 import { coreAppManifest } from '@cloudbeaver/core-app';
 import { coreAuthenticationManifest } from '@cloudbeaver/core-authentication';
diff --git a/webapp/packages/core-bootstrap/src/renderLayout.tsx b/webapp/packages/core-bootstrap/src/renderLayout.tsx
index 3ae121aabf..5144166733 100644
--- a/webapp/packages/core-bootstrap/src/renderLayout.tsx
+++ b/webapp/packages/core-bootstrap/src/renderLayout.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Suspense } from 'react';
 import { createRoot, Root } from 'react-dom/client';
 import styled from 'reshadow';
@@ -46,8 +45,8 @@ export function renderLayout(serviceInjector: IServiceInjector): IRender {
       }
     },
     renderApp() {
-      this.initRoot()
-        .render(styled`
+      this.initRoot().render(
+        styled`
           Loader {
             height: 100vh;
           }
@@ -58,16 +57,16 @@ export function renderLayout(serviceInjector: IServiceInjector): IRender {
                 <Body />
               </Suspense>
             </ErrorBoundary>
-          </AppContext>
-        ));
+          </AppContext>,
+        ),
+      );
     },
     renderError(exception?: any) {
-      this.initRoot()
-        .render(
-          <AppContext app={serviceInjector}>
-            <DisplayError error={exception} root />
-          </AppContext>
-        );
+      this.initRoot().render(
+        <AppContext app={serviceInjector}>
+          <DisplayError error={exception} root />
+        </AppContext>,
+      );
     },
   };
 }
diff --git a/webapp/packages/core-browser/src/BrowserSettingsService.test.ts b/webapp/packages/core-browser/src/BrowserSettingsService.test.ts
index 3e68c75cf5..8fb921c957 100644
--- a/webapp/packages/core-browser/src/BrowserSettingsService.test.ts
+++ b/webapp/packages/core-browser/src/BrowserSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -16,15 +15,12 @@ import { mockAppInit } from '@cloudbeaver/core-root/mocks/mockAppInit';
 import { mockGraphQL } from '@cloudbeaver/core-root/mocks/mockGraphQL';
 import { mockServerConfig } from '@cloudbeaver/core-root/mocks/resolvers/mockServerConfig';
 
-import { CookiesSettings, DeprecatedCookiesSettings, BrowserSettingsService } from './BrowserSettingsService';
+import { BrowserSettingsService, CookiesSettings, DeprecatedCookiesSettings } from './BrowserSettingsService';
 
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -59,9 +55,7 @@ test.skip('New settings equal deprecated settings A', async () => {
   const settings = app.injector.getServiceByClass(BrowserSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigA)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigA)));
 
   await config.refresh();
 
@@ -73,12 +67,10 @@ test.skip('New settings equal deprecated settings B', async () => {
   const settings = app.injector.getServiceByClass(BrowserSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigB)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigB)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('cookies.disabled')).toBe(testValueB);
   expect(settings.deprecatedSettings.getValue('disabled')).toBe(testValueB);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-browser/src/BrowserSettingsService.ts b/webapp/packages/core-browser/src/BrowserSettingsService.ts
index 3fbd661bc9..53be27c832 100644
--- a/webapp/packages/core-browser/src/BrowserSettingsService.ts
+++ b/webapp/packages/core-browser/src/BrowserSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-browser/src/CookiesService.ts b/webapp/packages/core-browser/src/CookiesService.ts
index f9da4e1ea9..1eaf8b409d 100644
--- a/webapp/packages/core-browser/src/CookiesService.ts
+++ b/webapp/packages/core-browser/src/CookiesService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { BrowserSettingsService } from './BrowserSettingsService';
@@ -20,4 +19,4 @@ export class CookiesService {
   }
 
   constructor(private readonly browserSettingsService: BrowserSettingsService) {}
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-browser/src/IndexedDB/IndexedDB.ts b/webapp/packages/core-browser/src/IndexedDB/IndexedDB.ts
index 33092542a8..11d468a677 100644
--- a/webapp/packages/core-browser/src/IndexedDB/IndexedDB.ts
+++ b/webapp/packages/core-browser/src/IndexedDB/IndexedDB.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import IndexedDB, { Table as IndexedDBTable } from 'dexie';
 
-export { IndexedDB, type IndexedDBTable };
\ No newline at end of file
+export { IndexedDB, type IndexedDBTable };
diff --git a/webapp/packages/core-browser/src/IndexedDB/IndexedDBService.ts b/webapp/packages/core-browser/src/IndexedDB/IndexedDBService.ts
index 8621604aa0..bd939610a5 100644
--- a/webapp/packages/core-browser/src/IndexedDB/IndexedDBService.ts
+++ b/webapp/packages/core-browser/src/IndexedDB/IndexedDBService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import type { IndexedDB } from './IndexedDB';
@@ -16,4 +15,4 @@ export class IndexedDBService {
   register(db: IndexedDB): void {
     // TODO: implement
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-browser/src/ServiceWorkerBootstrap.ts b/webapp/packages/core-browser/src/ServiceWorkerBootstrap.ts
index 0187af8378..f89ee590ae 100644
--- a/webapp/packages/core-browser/src/ServiceWorkerBootstrap.ts
+++ b/webapp/packages/core-browser/src/ServiceWorkerBootstrap.ts
@@ -5,21 +5,17 @@
  * 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 { ServiceWorkerService } from './ServiceWorkerService';
 
 @injectable()
 export class ServiceWorkerBootstrap extends Bootstrap {
-  constructor(
-    private readonly serviceWorkerService: ServiceWorkerService
-  ) {
+  constructor(private readonly serviceWorkerService: ServiceWorkerService) {
     super();
   }
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
   load(): void | Promise<void> {
     this.serviceWorkerService.register();
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-browser/src/ServiceWorkerService.ts b/webapp/packages/core-browser/src/ServiceWorkerService.ts
index e43317db64..ee1960ea9e 100644
--- a/webapp/packages/core-browser/src/ServiceWorkerService.ts
+++ b/webapp/packages/core-browser/src/ServiceWorkerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Workbox } from 'workbox-window';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -30,7 +29,7 @@ export class ServiceWorkerService {
       if (process.env.NODE_ENV === 'development') {
         navigator.serviceWorker
           .getRegistration(this.workerURL)
-          .then(registration =>  registration?.unregister())
+          .then(registration => registration?.unregister())
           .catch();
       } else {
         this.workbox = new Workbox(this.workerURL);
@@ -47,7 +46,6 @@ export class ServiceWorkerService {
     return !ExecutorInterrupter.isInterrupted(contexts);
   }
 
-
   private registerSkipWaitingPrompt(workbox: Workbox): void {
     workbox.addEventListener('controlling', async event => {
       if (!event.isUpdate) {
@@ -65,4 +63,4 @@ export class ServiceWorkerService {
       workbox.messageSkipWaiting();
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-browser/src/index.ts b/webapp/packages/core-browser/src/index.ts
index 0e941cae55..635950874c 100644
--- a/webapp/packages/core-browser/src/index.ts
+++ b/webapp/packages/core-browser/src/index.ts
@@ -2,4 +2,4 @@ export * from './IndexedDB/IndexedDBService';
 export * from './IndexedDB/IndexedDB';
 export * from './CookiesService';
 export * from './manifest';
-export * from './ServiceWorkerService';
\ No newline at end of file
+export * from './ServiceWorkerService';
diff --git a/webapp/packages/core-browser/src/manifest.ts b/webapp/packages/core-browser/src/manifest.ts
index ff9d15d8b7..360cdb992d 100644
--- a/webapp/packages/core-browser/src/manifest.ts
+++ b/webapp/packages/core-browser/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { BrowserSettingsService } from './BrowserSettingsService';
@@ -19,11 +18,5 @@ export const coreBrowserManifest: PluginManifest = {
     name: 'Core Browser',
   },
 
-  providers: [
-    BrowserSettingsService,
-    CookiesService,
-    ServiceWorkerBootstrap,
-    ServiceWorkerService,
-    IndexedDBService,
-  ],
+  providers: [BrowserSettingsService, CookiesService, ServiceWorkerBootstrap, ServiceWorkerService, IndexedDBService],
 };
diff --git a/webapp/packages/core-browser/src/service-worker.ts b/webapp/packages/core-browser/src/service-worker.ts
index efb4894ec7..655a2f71f4 100644
--- a/webapp/packages/core-browser/src/service-worker.ts
+++ b/webapp/packages/core-browser/src/service-worker.ts
@@ -1,11 +1,11 @@
+import { clientsClaim } from 'workbox-core';
+import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching';
+
 /// <reference lib="WebWorker" />
 
 declare const self: ServiceWorkerGlobalScope;
 const manifest = self.__WB_MANIFEST;
 
-import { clientsClaim } from 'workbox-core';
-import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching';
-
 clientsClaim();
 cleanupOutdatedCaches();
 precacheAndRoute(manifest);
diff --git a/webapp/packages/core-cli/configs/__mocks__/fileMock.ts b/webapp/packages/core-cli/configs/__mocks__/fileMock.ts
index 0730cb2590..2c6ff51fef 100644
--- a/webapp/packages/core-cli/configs/__mocks__/fileMock.ts
+++ b/webapp/packages/core-cli/configs/__mocks__/fileMock.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export default 'test-file-stub';
\ No newline at end of file
+export default 'test-file-stub';
diff --git a/webapp/packages/core-cli/configs/__mocks__/styleMock.ts b/webapp/packages/core-cli/configs/__mocks__/styleMock.ts
index 78a34f3ee6..ee4a415467 100644
--- a/webapp/packages/core-cli/configs/__mocks__/styleMock.ts
+++ b/webapp/packages/core-cli/configs/__mocks__/styleMock.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export default {};
\ No newline at end of file
+export default {};
diff --git a/webapp/packages/core-cli/src/babel-plugins/TestingAttributes.ts b/webapp/packages/core-cli/src/babel-plugins/TestingAttributes.ts
index db5ab3a822..05b8b5c0ee 100644
--- a/webapp/packages/core-cli/src/babel-plugins/TestingAttributes.ts
+++ b/webapp/packages/core-cli/src/babel-plugins/TestingAttributes.ts
@@ -9,20 +9,13 @@
 /**
  * Based on https://github.com/akameco/babel-plugin-react-data-testid
  */
-
-import type { PluginObj, NodePath, Visitor } from '@babel/core';
+import type { NodePath, PluginObj, Visitor } from '@babel/core';
 import syntaxJsx from '@babel/plugin-syntax-jsx';
 import * as t from '@babel/types';
 
-type FunctionType =
-  | t.FunctionDeclaration
-  | t.FunctionExpression
-  | t.ArrowFunctionExpression;
+type FunctionType = t.FunctionDeclaration | t.FunctionExpression | t.ArrowFunctionExpression;
 
-function addTestIdAttribute(
-  node: t.JSXOpeningElement,
-  name: string
-): void {
+function addTestIdAttribute(node: t.JSXOpeningElement, name: string): void {
   if (!hasDataAttribute(node, DEFAULT_DATA_TESTID)) {
     const dataAttribute = createDataAttribute(name, DEFAULT_DATA_TESTID);
     const indexOf = node.attributes.findIndex(attribute => t.isJSXSpreadAttribute(attribute));
@@ -34,9 +27,7 @@ function addTestIdAttribute(
   }
 }
 
-function nameForReactComponent(
-  path: NodePath<FunctionType>
-): t.Identifier | null {
+function nameForReactComponent(path: NodePath<FunctionType>): t.Identifier | null {
   const { parentPath } = path;
   if (!t.isArrowFunctionExpression(path.node) && t.isIdentifier(path.node.id)) {
     return path.node.id;
@@ -54,15 +45,8 @@ function createDataAttribute(name: string, attributeName: string) {
   return t.jsxAttribute(t.jsxIdentifier(attributeName), t.stringLiteral(name));
 }
 
-function hasDataAttribute(
-  node: t.JSXOpeningElement,
-  attributeName: string
-): boolean {
-  return node.attributes.some(
-    attribute =>
-      t.isJSXAttribute(attribute)
-      && t.isJSXIdentifier(attribute.name, { name: attributeName })
-  );
+function hasDataAttribute(node: t.JSXOpeningElement, attributeName: string): boolean {
+  return node.attributes.some(attribute => t.isJSXAttribute(attribute) && t.isJSXIdentifier(attribute.name, { name: attributeName }));
 }
 
 type VisitorState = { name: string };
@@ -90,18 +74,15 @@ const functionVisitor: Visitor<VisitorState> = {
 };
 
 function getElementName(node: t.JSXOpeningElement['name']): string {
-  if (t.isJSXNamespacedName(node))
-  {return [
-    getElementName(node.namespace),
-    getElementName(node.name),
-  ].join(':');}
+  if (t.isJSXNamespacedName(node)) {
+    return [getElementName(node.namespace), getElementName(node.name)].join(':');
+  }
 
-  if (t.isJSXIdentifier(node)) {return node.name;}
+  if (t.isJSXIdentifier(node)) {
+    return node.name;
+  }
 
-  return [
-    getElementName(node.object),
-    getElementName(node.property),
-  ].join('.');
+  return [getElementName(node.object), getElementName(node.property)].join('.');
 }
 
 export default function plugin(): PluginObj {
@@ -109,9 +90,7 @@ export default function plugin(): PluginObj {
     name: 'cloudbeaver-data-testid',
     inherits: syntaxJsx,
     visitor: {
-      'FunctionExpression|ArrowFunctionExpression|FunctionDeclaration': (
-        p: NodePath<FunctionType>,
-      ) => {
+      'FunctionExpression|ArrowFunctionExpression|FunctionDeclaration': (p: NodePath<FunctionType>) => {
         const identifier = nameForReactComponent(p);
         if (!identifier) {
           return;
@@ -132,4 +111,4 @@ export default function plugin(): PluginObj {
       },
     },
   } as PluginObj;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-cli/tests/setup.ts b/webapp/packages/core-cli/tests/setup.ts
index a3a18911ea..291e2001c4 100644
--- a/webapp/packages/core-cli/tests/setup.ts
+++ b/webapp/packages/core-cli/tests/setup.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import 'reflect-metadata';
 import crypto from 'crypto';
+import 'reflect-metadata';
 
 Object.defineProperty(global.self, 'crypto', {
   value: {
@@ -15,11 +14,8 @@ Object.defineProperty(global.self, 'crypto', {
   },
 });
 
-class BroadcastChannel {
-
-}
+class BroadcastChannel {}
 
 Object.defineProperty(global.self, 'BroadcastChannel', {
   value: BroadcastChannel,
 });
-
diff --git a/webapp/packages/core-cli/tests/utils/createApp.ts b/webapp/packages/core-cli/tests/utils/createApp.ts
index 3e067d7caa..d2eb5fd0b4 100644
--- a/webapp/packages/core-cli/tests/utils/createApp.ts
+++ b/webapp/packages/core-cli/tests/utils/createApp.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { configure } from 'mobx';
 
 import coreManifests from '@cloudbeaver/core-bootstrap';
@@ -35,4 +34,4 @@ export function createApp(...plugins: PluginManifest[]): IApplication {
       await app.loadServices();
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-cli/tests/utils/getService.ts b/webapp/packages/core-cli/tests/utils/getService.ts
index a4db7e9909..5e7fd9401e 100644
--- a/webapp/packages/core-cli/tests/utils/getService.ts
+++ b/webapp/packages/core-cli/tests/utils/getService.ts
@@ -5,11 +5,10 @@
  * 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 type { IApplication } from './createApp';
 
 export function getService<T>(app: IApplication, ctor: IServiceConstructor<T>): T {
   return app.injector.getServiceByClass(ctor);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-cli/tests/utils/renderInApp.tsx b/webapp/packages/core-cli/tests/utils/renderInApp.tsx
index 37fb33bfd4..32998bc4a2 100644
--- a/webapp/packages/core-cli/tests/utils/renderInApp.tsx
+++ b/webapp/packages/core-cli/tests/utils/renderInApp.tsx
@@ -5,26 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { render, RenderOptions } from '@testing-library/react';
 
 import { AppContext, IServiceInjector } from '@cloudbeaver/core-di';
-import { render, RenderOptions } from '@testing-library/react';
 
 import type { IApplication } from './createApp';
 
 function ApplicationWrapper(serviceInjector: IServiceInjector): React.FC<React.PropsWithChildren> {
   return function render({ children }) {
-    return (
-      <AppContext app={serviceInjector}>
-        {children}
-      </AppContext>
-    );
+    return <AppContext app={serviceInjector}>{children}</AppContext>;
   };
 }
 
-export function renderInApp(
-  ui: React.ReactElement,
-  app: IApplication,
-  options?: Omit<RenderOptions, 'wrapper' | 'queries'>,
-) {
+export function renderInApp(ui: React.ReactElement, app: IApplication, options?: Omit<RenderOptions, 'wrapper' | 'queries'>) {
   return render(ui, { wrapper: ApplicationWrapper(app.injector), ...options });
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/ConnectionDialectResource.ts b/webapp/packages/core-connections/src/ConnectionDialectResource.ts
index 0a7babe036..b85688ad00 100644
--- a/webapp/packages/core-connections/src/ConnectionDialectResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionDialectResource.ts
@@ -5,14 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
 import { ProjectsService } from '@cloudbeaver/core-projects';
-import { GraphQLService, CachedMapResource, ResourceKey, ResourceKeyUtils, CachedMapAllKey, resourceKeyList, SqlDialectInfo, isResourceKeyList } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  isResourceKeyList,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyUtils,
+  SqlDialectInfo,
+} from '@cloudbeaver/core-sdk';
 
 import type { IConnectionExecutionContextInfo } from './ConnectionExecutionContext/IConnectionExecutionContextInfo';
-import { ConnectionInfoActiveProjectKey, ConnectionInfoProjectKey, ConnectionInfoResource, isConnectionInfoParamEqual } from './ConnectionInfoResource';
+import {
+  ConnectionInfoActiveProjectKey,
+  ConnectionInfoProjectKey,
+  ConnectionInfoResource,
+  isConnectionInfoParamEqual,
+} from './ConnectionInfoResource';
 import type { IConnectionInfoParams } from './IConnectionsResource';
 
 export type ConnectionDialect = SqlDialectInfo;
@@ -26,18 +39,12 @@ export class ConnectionDialectResource extends CachedMapResource<IConnectionInfo
   ) {
     super();
     this.sync(connectionInfoResource);
-    this.addAlias(
-      ConnectionInfoProjectKey,
-      param => resourceKeyList(
-        connectionInfoResource.keys.filter(key => param.options.projectIds.includes(key.projectId))
-      )
+    this.addAlias(ConnectionInfoProjectKey, param =>
+      resourceKeyList(connectionInfoResource.keys.filter(key => param.options.projectIds.includes(key.projectId))),
     );
 
-    this.addAlias(
-      ConnectionInfoActiveProjectKey,
-      () => resourceKeyList(
-        connectionInfoResource.keys.filter(key => projectsService.activeProjects.some(({ id }) => id === key.projectId))
-      )
+    this.addAlias(ConnectionInfoActiveProjectKey, () =>
+      resourceKeyList(connectionInfoResource.keys.filter(key => projectsService.activeProjects.some(({ id }) => id === key.projectId))),
     );
     this.replaceAlias(CachedMapAllKey, () => resourceKeyList(connectionInfoResource.keys));
     this.before(ExecutorInterrupter.interrupter(key => !connectionInfoResource.isConnected(key)));
@@ -55,7 +62,7 @@ export class ConnectionDialectResource extends CachedMapResource<IConnectionInfo
 
   protected async loader(
     originalKey: ResourceKey<IConnectionInfoParams>,
-    includes: string[]
+    includes: string[],
   ): Promise<Map<IConnectionInfoParams, ConnectionDialect>> {
     const dialects: ConnectionDialect[] = [];
     const keys = ResourceKeyUtils.toList(this.transformToKey(originalKey));
@@ -83,10 +90,6 @@ export class ConnectionDialectResource extends CachedMapResource<IConnectionInfo
   }
 
   protected validateKey(key: IConnectionInfoParams): boolean {
-    return (
-      typeof key === 'object'
-      && typeof key.projectId === 'string'
-      && ['string'].includes(typeof key.connectionId)
-    );
+    return typeof key === 'object' && typeof key.projectId === 'string' && ['string'].includes(typeof key.connectionId);
   }
 }
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
index ccd9f0a361..57605d5a06 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { ITask, TaskScheduler } from '@cloudbeaver/core-executor';
@@ -32,7 +31,7 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
   constructor(
     private readonly scheduler: TaskScheduler<string>,
     private readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
-    private readonly contextId: string
+    private readonly contextId: string,
   ) {
     this.currentTask = null;
     makeObservable<this, 'currentTask'>(this, {
@@ -43,11 +42,7 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
     });
   }
 
-  run<T>(
-    task: () => Promise<T>,
-    cancel?: () => Promise<any> | void,
-    end?: () => Promise<any> | void
-  ): ITask<T> {
+  run<T>(task: () => Promise<T>, cancel?: () => Promise<any> | void, end?: () => Promise<any> | void): ITask<T> {
     if (!this.context) {
       throw new Error('Execution Context not found');
     }
@@ -75,10 +70,7 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
     await this.connectionExecutionContextResource.destroy(this.contextId);
   }
 
-  async update(
-    defaultCatalog?: string,
-    defaultSchema?: string
-  ): Promise<IConnectionExecutionContextInfo> {
+  async update(defaultCatalog?: string, defaultSchema?: string): Promise<IConnectionExecutionContextInfo> {
     if (!this.context) {
       throw new Error('Execution Context not found');
     }
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
index a6192a3570..a38f0fba9f 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
@@ -5,22 +5,29 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, runInAction } from 'mobx';
 
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
-import { GraphQLService, CachedMapResource, resourceKeyList, ResourceKey, ResourceKeyUtils, SqlContextInfo, CachedMapAllKey, resourceKeyAliasFactory, ResourceKeySimple, isResourceAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  resourceKeyAliasFactory,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+  SqlContextInfo,
+} from '@cloudbeaver/core-sdk';
 import { flat } from '@cloudbeaver/core-utils';
 
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from '../ConnectionInfoResource';
 import type { IConnectionInfoParams } from '../IConnectionsResource';
 import type { IConnectionExecutionContextInfo } from './IConnectionExecutionContextInfo';
 
-export const ConnectionExecutionContextProjectKey = resourceKeyAliasFactory(
-  '@connection-folder/project',
-  (projectId: string) => ({ projectId })
-);
+export const ConnectionExecutionContextProjectKey = resourceKeyAliasFactory('@connection-folder/project', (projectId: string) => ({ projectId }));
 
 export const NOT_INITIALIZED_CONTEXT_ID = '-1';
 
@@ -32,15 +39,18 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
     appAuthService: AppAuthService,
   ) {
     super();
-    this.sync(connectionInfoResource, () => ConnectionInfoActiveProjectKey, () => CachedMapAllKey);
+    this.sync(
+      connectionInfoResource,
+      () => ConnectionInfoActiveProjectKey,
+      () => CachedMapAllKey,
+    );
 
-    this.addAlias(
-      ConnectionExecutionContextProjectKey,
-      param => resourceKeyList(
+    this.addAlias(ConnectionExecutionContextProjectKey, param =>
+      resourceKeyList(
         Array.from(this.data.entries())
           .filter(([key, context]) => context.projectId === param.options.projectId)
-          .map(([key]) => key)
-      )
+          .map(([key]) => key),
+      ),
     );
 
     appAuthService.requireAuthentication(this);
@@ -54,11 +64,7 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
     });
   }
 
-  async create(
-    key: IConnectionInfoParams,
-    defaultCatalog?: string,
-    defaultSchema?: string
-  ): Promise<IConnectionExecutionContextInfo> {
+  async create(key: IConnectionInfoParams, defaultCatalog?: string, defaultSchema?: string): Promise<IConnectionExecutionContextInfo> {
     return await this.performUpdate(getContextBaseId(key, ''), [], async () => {
       const { context } = await this.graphQLService.sdk.executionContextCreate({
         ...key,
@@ -77,11 +83,7 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
     });
   }
 
-  async update(
-    contextId: string,
-    defaultCatalog?: string,
-    defaultSchema?: string
-  ): Promise<IConnectionExecutionContextInfo> {
+  async update(contextId: string, defaultCatalog?: string, defaultSchema?: string): Promise<IConnectionExecutionContextInfo> {
     const context = this.get(contextId);
 
     if (!context) {
@@ -137,9 +139,7 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
     this.markOutdated(CachedMapAllKey);
   }
 
-  protected async loader(
-    originalKey: ResourceKey<string>
-  ): Promise<Map<string, IConnectionExecutionContextInfo>> {
+  protected async loader(originalKey: ResourceKey<string>): Promise<Map<string, IConnectionExecutionContextInfo>> {
     const contextsList: IConnectionExecutionContextInfo[] = [];
     let projectId: string | undefined;
     const all = this.isAlias(originalKey, CachedMapAllKey);
@@ -148,28 +148,26 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
       projectId = originalKey.options.projectId;
     }
 
-    await ResourceKeyUtils.forEachAsync(
-      originalKey,
-      async key => {
-        let contextId: string | undefined;
-        let connectionId: string | undefined;
+    await ResourceKeyUtils.forEachAsync(originalKey, async key => {
+      let contextId: string | undefined;
+      let connectionId: string | undefined;
 
-        if (!isResourceAlias(key)) {
-          const context = this.get(key);
-          contextId = key;
-          projectId = context?.projectId;
-          connectionId = context?.connectionId;
-        }
+      if (!isResourceAlias(key)) {
+        const context = this.get(key);
+        contextId = key;
+        projectId = context?.projectId;
+        connectionId = context?.connectionId;
+      }
 
-        const { contexts } = await this.graphQLService.sdk.executionContextList({
-          projectId,
-          connectionId,
-          contextId,
-        });
-
-        contextsList.push(...contexts);
+      const { contexts } = await this.graphQLService.sdk.executionContextList({
+        projectId,
+        connectionId,
+        contextId,
       });
 
+      contextsList.push(...contexts);
+    });
+
     runInAction(() => {
       const key = resourceKeyList(contextsList.map(context => context.id));
       if (all) {
@@ -185,32 +183,27 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
   private updateConnectionContexts(key: ResourceKeySimple<IConnectionInfoParams>): void {
     this.delete(
       resourceKeyList(
-        flat(ResourceKeyUtils.map(
-          key,
-          key => this.values.filter(context => {
-            const connection = this.connectionInfoResource.get(key);
-            return (
-              context.connectionId === key.connectionId
-              && context.projectId === key.projectId
-              && !connection?.connected
-            );
-          })
-        )).map(context => context.id)
-      )
+        flat(
+          ResourceKeyUtils.map(key, key =>
+            this.values.filter(context => {
+              const connection = this.connectionInfoResource.get(key);
+              return context.connectionId === key.connectionId && context.projectId === key.projectId && !connection?.connected;
+            }),
+          ),
+        ).map(context => context.id),
+      ),
     );
   }
 
   private deleteConnectionContexts(key: ResourceKeySimple<IConnectionInfoParams>): void {
     this.delete(
       resourceKeyList(
-        flat(ResourceKeyUtils.map(
-          key,
-          key => this.values.filter(context => (
-            context.connectionId === key.connectionId
-            && context.projectId === key.projectId
-          ))
-        )).map(context => context.id)
-      )
+        flat(
+          ResourceKeyUtils.map(key, key =>
+            this.values.filter(context => context.connectionId === key.connectionId && context.projectId === key.projectId),
+          ),
+        ).map(context => context.id),
+      ),
     );
   }
 
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
index 7dc3502475..f9c853e257 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { TaskScheduler } from '@cloudbeaver/core-executor';
 import { CachedMapAllKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
@@ -20,17 +19,11 @@ export class ConnectionExecutionContextService {
   private readonly contexts: MetadataMap<string, ConnectionExecutionContext>;
   protected scheduler: TaskScheduler<string>;
 
-  constructor(
-    readonly connectionExecutionContextResource: ConnectionExecutionContextResource
-  ) {
-    this.contexts = new MetadataMap(contextId => new ConnectionExecutionContext(
-      this.scheduler,
-      this.connectionExecutionContextResource,
-      contextId
-    ));
+  constructor(readonly connectionExecutionContextResource: ConnectionExecutionContextResource) {
+    this.contexts = new MetadataMap(contextId => new ConnectionExecutionContext(this.scheduler, this.connectionExecutionContextResource, contextId));
     this.scheduler = new TaskScheduler((a, b) => a === b);
-    this.connectionExecutionContextResource.onItemDelete.addHandler(
-      key => ResourceKeyUtils.forEach(key, contextId => this.contexts.delete(contextId))
+    this.connectionExecutionContextResource.onItemDelete.addHandler(key =>
+      ResourceKeyUtils.forEach(key, contextId => this.contexts.delete(contextId)),
     );
   }
 
@@ -45,11 +38,7 @@ export class ConnectionExecutionContextService {
     await this.connectionExecutionContextResource.load(CachedMapAllKey);
   }
 
-  async create(
-    connectionKey: IConnectionInfoParams,
-    defaultCatalog?: string,
-    defaultSchema?: string
-  ): Promise<ConnectionExecutionContext> {
+  async create(connectionKey: IConnectionInfoParams, defaultCatalog?: string, defaultSchema?: string): Promise<ConnectionExecutionContext> {
     const context = await this.connectionExecutionContextResource.create(connectionKey, defaultCatalog, defaultSchema);
 
     return this.contexts.get(context.id);
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContext.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContext.ts
index 78d2302028..e236ea263f 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContext.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITask } from '@cloudbeaver/core-executor';
 
 import type { IConnectionExecutionContextInfo } from './IConnectionExecutionContextInfo';
@@ -15,11 +14,7 @@ export interface IConnectionExecutionContext {
   readonly executing: boolean;
   readonly cancellable: boolean;
 
-  run: <T>(
-    task: () => Promise<T>,
-    cancel?: () => Promise<any> | void,
-    end?: () => Promise<any> | void
-  ) => ITask<T>;
+  run: <T>(task: () => Promise<T>, cancel?: () => Promise<any> | void, end?: () => Promise<any> | void) => ITask<T>;
   cancel: () => Promise<void>;
   destroy: () => Promise<void>;
   update: (defaultCatalog?: string, defaultSchema?: string) => Promise<IConnectionExecutionContextInfo>;
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContextInfo.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContextInfo.ts
index 8de9e760d6..f1a762ec41 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContextInfo.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/IConnectionExecutionContextInfo.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SqlContextInfo } from '@cloudbeaver/core-sdk';
 
 export type IConnectionExecutionContextInfo = SqlContextInfo & {
diff --git a/webapp/packages/core-connections/src/ConnectionFolderEventHandler.ts b/webapp/packages/core-connections/src/ConnectionFolderEventHandler.ts
index f1c3fecf05..3ed6c8056d 100644
--- a/webapp/packages/core-connections/src/ConnectionFolderEventHandler.ts
+++ b/webapp/packages/core-connections/src/ConnectionFolderEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic, TopicEventHandler } from '@cloudbeaver/core-root';
 import type { CbDatasourceFolderEvent as IConnectionFolderEvent } from '@cloudbeaver/core-sdk';
@@ -13,11 +12,8 @@ import type { CbDatasourceFolderEvent as IConnectionFolderEvent } from '@cloudbe
 export { IConnectionFolderEvent };
 
 @injectable()
-export class ConnectionFolderEventHandler
-  extends TopicEventHandler<IConnectionFolderEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+export class ConnectionFolderEventHandler extends TopicEventHandler<IConnectionFolderEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbDatasourceFolder, sessionEventSource);
   }
 
diff --git a/webapp/packages/core-connections/src/ConnectionFolderResource.ts b/webapp/packages/core-connections/src/ConnectionFolderResource.ts
index 05ca6e911f..6baf2c35e3 100644
--- a/webapp/packages/core-connections/src/ConnectionFolderResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionFolderResource.ts
@@ -5,13 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, runInAction } from 'mobx';
 
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { SessionDataResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, resourceKeyList, ResourceKeyUtils, CachedMapAllKey, ConnectionFolderInfoFragment, resourceKeyAliasFactory, ResourceKey, isResourceAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  ConnectionFolderInfoFragment,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  resourceKeyAliasFactory,
+  resourceKeyList,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import { createConnectionFolderParam } from './createConnectionFolderParam';
 import { getConnectionFolderIdFromNodeId } from './NavTree/getConnectionFolderIdFromNodeId';
@@ -25,27 +34,17 @@ export interface IConnectionFolderParam {
 
 export const CONNECTION_FOLDER_NAME_VALIDATION = /^(?!\.)[\p{L}\w\-$.\s()@]+$/u;
 
-export const ConnectionFolderProjectKey = resourceKeyAliasFactory(
-  '@connection-folder/project',
-  (projectId: string) => ({ projectId })
-);
+export const ConnectionFolderProjectKey = resourceKeyAliasFactory('@connection-folder/project', (projectId: string) => ({ projectId }));
 
 @injectable()
 export class ConnectionFolderResource extends CachedMapResource<IConnectionFolderParam, ConnectionFolder> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionDataResource: SessionDataResource,
-    appAuthService: AppAuthService
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionDataResource: SessionDataResource, appAuthService: AppAuthService) {
     super();
 
     appAuthService.requireAuthentication(this);
     sessionDataResource.outdateResource(this);
 
-    this.addAlias(
-      ConnectionFolderProjectKey,
-      param => resourceKeyList(this.keys.filter(key => key.projectId === param.options.projectId)),
-    );
+    this.addAlias(ConnectionFolderProjectKey, param => resourceKeyList(this.keys.filter(key => key.projectId === param.options.projectId)));
 
     makeObservable<this>(this, {
       create: action,
@@ -85,9 +84,7 @@ export class ConnectionFolderResource extends CachedMapResource<IConnectionFolde
     return undefined;
   }
 
-  protected async loader(
-    originalKey: ResourceKey<IConnectionFolderParam>
-  ): Promise<Map<IConnectionFolderParam, ConnectionFolder>> {
+  protected async loader(originalKey: ResourceKey<IConnectionFolderParam>): Promise<Map<IConnectionFolderParam, ConnectionFolder>> {
     const all = this.isAlias(originalKey, CachedMapAllKey);
     const isProjectFolders = this.isAlias(originalKey, ConnectionFolderProjectKey);
     const folderList: ConnectionFolder[] = [];
@@ -98,41 +95,32 @@ export class ConnectionFolderResource extends CachedMapResource<IConnectionFolde
       projectId = originalKey.options.projectId;
     }
 
-    await ResourceKeyUtils.forEachAsync(
-      originalKey,
-      async key => {
-        if (!isResourceAlias(key)) {
-          folderId = key.folderId;
-          projectId = key.projectId;
-        }
+    await ResourceKeyUtils.forEachAsync(originalKey, async key => {
+      if (!isResourceAlias(key)) {
+        folderId = key.folderId;
+        projectId = key.projectId;
+      }
 
-        const { folders } = await this.graphQLService.sdk.getConnectionFolders({
-          projectId,
-          path: folderId,
-        });
-        folderList.push(...folders);
+      const { folders } = await this.graphQLService.sdk.getConnectionFolders({
+        projectId,
+        path: folderId,
       });
+      folderList.push(...folders);
+    });
 
-    const key = resourceKeyList(folderList.map<IConnectionFolderParam>(folder => createConnectionFolderParam(
-      folder.projectId,
-      folder.id,
-    )));
+    const key = resourceKeyList(folderList.map<IConnectionFolderParam>(folder => createConnectionFolderParam(folder.projectId, folder.id)));
 
     runInAction(() => {
       if (all) {
         this.replace(key, folderList);
       } else {
         if (isProjectFolders) {
-          const removedFolders = this.keys
-            .filter(key => !folderList.some(f => (
-              key.projectId === projectId
-                && key.folderId === f.id
-            )));
+          const removedFolders = this.keys.filter(key => !folderList.some(f => key.projectId === projectId && key.folderId === f.id));
 
           this.delete(resourceKeyList(removedFolders));
         }
 
-        this.set(key,  folderList);
+        this.set(key, folderList);
       }
     });
 
@@ -140,17 +128,10 @@ export class ConnectionFolderResource extends CachedMapResource<IConnectionFolde
   }
 
   isKeyEqual(param: IConnectionFolderParam, second: IConnectionFolderParam): boolean {
-    return (
-      param.projectId === second.projectId
-      && param.folderId === second.folderId
-    );
+    return param.projectId === second.projectId && param.folderId === second.folderId;
   }
 
   protected validateKey(key: IConnectionFolderParam): boolean {
-    return (
-      typeof key === 'object'
-      && typeof key.projectId === 'string'
-      && ['string'].includes(typeof key.folderId)
-    );
+    return typeof key === 'object' && typeof key.projectId === 'string' && ['string'].includes(typeof key.folderId);
   }
 }
diff --git a/webapp/packages/core-connections/src/ConnectionInfoEventHandler.ts b/webapp/packages/core-connections/src/ConnectionInfoEventHandler.ts
index 2ad2b537ce..628fae3de2 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoEventHandler.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic, TopicEventHandler } from '@cloudbeaver/core-root';
 import type { CbDatasourceEvent as IConnectionInfoEvent } from '@cloudbeaver/core-sdk';
@@ -13,11 +12,8 @@ import type { CbDatasourceEvent as IConnectionInfoEvent } from '@cloudbeaver/cor
 export { IConnectionInfoEvent };
 
 @injectable()
-export class ConnectionInfoEventHandler
-  extends TopicEventHandler<IConnectionInfoEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+export class ConnectionInfoEventHandler extends TopicEventHandler<IConnectionInfoEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbDatasource, sessionEventSource);
   }
 
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index 8583b03525..32fb6e4389 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -5,15 +5,38 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable, runInAction } from 'mobx';
 
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
-import { SyncExecutor, ExecutorInterrupter, ISyncExecutor } from '@cloudbeaver/core-executor';
+import { ExecutorInterrupter, ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
-import { NavigatorViewSettings, SessionDataResource, DataSynchronizationService, ServerEventId } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, ConnectionConfig, UserConnectionAuthPropertiesFragment, resourceKeyList, InitConnectionMutationVariables, GetUserConnectionsQueryVariables, ResourceKey, ResourceKeyUtils, TestConnectionMutation, NavigatorSettingsInput, ResourceKeyList, CachedMapAllKey, CachedResourceIncludeArgs, AdminConnectionSearchInfo, AdminConnectionGrantInfo, isResourceKeyList, resourceKeyAlias, resourceKeyAliasFactory, isResourceKeyAlias, isResourceAlias, resourceKeyListAliasFactory, resourceKeyListAlias } from '@cloudbeaver/core-sdk';
+import { DataSynchronizationService, NavigatorViewSettings, ServerEventId, SessionDataResource } from '@cloudbeaver/core-root';
+import {
+  AdminConnectionGrantInfo,
+  AdminConnectionSearchInfo,
+  CachedMapAllKey,
+  CachedMapResource,
+  CachedResourceIncludeArgs,
+  ConnectionConfig,
+  GetUserConnectionsQueryVariables,
+  GraphQLService,
+  InitConnectionMutationVariables,
+  isResourceAlias,
+  isResourceKeyAlias,
+  isResourceKeyList,
+  NavigatorSettingsInput,
+  ResourceKey,
+  resourceKeyAlias,
+  resourceKeyAliasFactory,
+  resourceKeyList,
+  ResourceKeyList,
+  resourceKeyListAlias,
+  resourceKeyListAliasFactory,
+  ResourceKeyUtils,
+  TestConnectionMutation,
+  UserConnectionAuthPropertiesFragment,
+} from '@cloudbeaver/core-sdk';
 
 import { ConnectionInfoEventHandler, IConnectionInfoEvent } from './ConnectionInfoEventHandler';
 import type { DatabaseConnection } from './DatabaseConnection';
@@ -22,17 +45,25 @@ import type { IConnectionInfoParams } from './IConnectionsResource';
 export type Connection = DatabaseConnection & {
   authProperties?: UserConnectionAuthPropertiesFragment[];
 };
-export type ConnectionInitConfig = Omit<InitConnectionMutationVariables, 'includeOrigin' | 'customIncludeOriginDetails' | 'includeAuthProperties' | 'includeNetworkHandlersConfig' | 'includeAuthNeeded' | 'includeCredentialsSaved' | 'includeProperties' | 'includeProviderProperties' | 'customIncludeOptions'>;
+export type ConnectionInitConfig = Omit<
+  InitConnectionMutationVariables,
+  | 'includeOrigin'
+  | 'customIncludeOriginDetails'
+  | 'includeAuthProperties'
+  | 'includeNetworkHandlersConfig'
+  | 'includeAuthNeeded'
+  | 'includeCredentialsSaved'
+  | 'includeProperties'
+  | 'includeProviderProperties'
+  | 'customIncludeOptions'
+>;
 export type ConnectionInfoIncludes = Omit<GetUserConnectionsQueryVariables, 'id'>;
 
 export const NEW_CONNECTION_SYMBOL = Symbol('new-connection');
 
 export type NewConnection = Connection & { [NEW_CONNECTION_SYMBOL]: boolean; timestamp: number };
 
-export const ConnectionInfoProjectKey = resourceKeyListAliasFactory(
-  '@connection-info/projects',
-  (...projectIds: string[]) => ({ projectIds })
-);
+export const ConnectionInfoProjectKey = resourceKeyListAliasFactory('@connection-info/projects', (...projectIds: string[]) => ({ projectIds }));
 
 export const ConnectionInfoActiveProjectKey = resourceKeyListAlias('@connection-info/projects-active');
 
@@ -47,8 +78,7 @@ export const DEFAULT_NAVIGATOR_VIEW_SETTINGS: NavigatorSettingsInput = {
 };
 
 @injectable()
-export class ConnectionInfoResource
-  extends CachedMapResource<IConnectionInfoParams, Connection, ConnectionInfoIncludes> {
+export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoParams, Connection, ConnectionInfoIncludes> {
   readonly onConnectionCreate: ISyncExecutor<Connection>;
   readonly onConnectionClose: ISyncExecutor<Connection>;
 
@@ -70,16 +100,10 @@ export class ConnectionInfoResource
     this.sessionUpdate = false;
     this.nodeIdMap = new Map();
 
-    this.addAlias(
-      ConnectionInfoProjectKey,
-      param => resourceKeyList(this.keys.filter(key => param.options.projectIds.includes(key.projectId)))
-    );
+    this.addAlias(ConnectionInfoProjectKey, param => resourceKeyList(this.keys.filter(key => param.options.projectIds.includes(key.projectId))));
 
-    this.addAlias(
-      ConnectionInfoActiveProjectKey,
-      () => resourceKeyList(
-        this.keys.filter(key => projectsService.activeProjects.some(({ id }) => id === key.projectId))
-      )
+    this.addAlias(ConnectionInfoActiveProjectKey, () =>
+      resourceKeyList(this.keys.filter(key => projectsService.activeProjects.some(({ id }) => id === key.projectId))),
     );
 
     // in case when session was refreshed all data depended on connection info
@@ -90,7 +114,11 @@ export class ConnectionInfoResource
     this.onConnectionCreate.addHandler(ExecutorInterrupter.interrupter(() => this.sessionUpdate));
 
     appAuthService.requireAuthentication(this);
-    this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey);
+    this.sync(
+      this.projectInfoResource,
+      () => CachedMapAllKey,
+      () => CachedMapAllKey,
+    );
     this.projectsService.onActiveProjectChange.addHandler(data => {
       if (data.type === 'after') {
         this.markOutdated(ConnectionInfoActiveProjectKey);
@@ -111,11 +139,14 @@ export class ConnectionInfoResource
           this.onConnectionCreate.execute(connection);
         }
       },
-      data => resourceKeyList(data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
-        projectId: data.projectId,
-        connectionId,
-      }))),
-      this
+      data =>
+        resourceKeyList(
+          data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
+            projectId: data.projectId,
+            connectionId,
+          })),
+        ),
+      this,
     );
 
     connectionInfoEventHandler.onEvent<ResourceKeyList<IConnectionInfoParams>>(
@@ -135,20 +166,25 @@ export class ConnectionInfoResource
           this.markOutdated(key);
         }
       },
-      data => resourceKeyList(data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
-        projectId: data.projectId,
-        connectionId,
-      }))),
-      this
+      data =>
+        resourceKeyList(
+          data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
+            projectId: data.projectId,
+            connectionId,
+          })),
+        ),
+      this,
     );
 
     connectionInfoEventHandler.onEvent<IConnectionInfoEvent>(
       ServerEventId.CbDatasourceDeleted,
       data => {
-        const key = resourceKeyList(data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
-          projectId: data.projectId,
-          connectionId,
-        })));
+        const key = resourceKeyList(
+          data.dataSourceIds.map<IConnectionInfoParams>(connectionId => ({
+            projectId: data.projectId,
+            connectionId,
+          })),
+        );
 
         if (this.isConnected(key)) {
           const connection = this.get(key);
@@ -164,7 +200,7 @@ export class ConnectionInfoResource
         }
       },
       undefined,
-      this
+      this,
     );
 
     makeObservable<this, 'nodeIdMap'>(this, {
@@ -198,10 +234,7 @@ export class ConnectionInfoResource
     }
 
     const indexOfConnectionPart = nodeId.indexOf('/', 11);
-    const connectionPart = nodeId.slice(
-      0,
-      indexOfConnectionPart > -1 ? indexOfConnectionPart : nodeId.length
-    );
+    const connectionPart = nodeId.slice(0, indexOfConnectionPart > -1 ? indexOfConnectionPart : nodeId.length);
 
     const connectionId = this.nodeIdMap.get(connectionPart);
 
@@ -424,7 +457,7 @@ export class ConnectionInfoResource
   protected async loader(
     originalKey: ResourceKey<IConnectionInfoParams>,
     includes: CachedResourceIncludeArgs<Connection, ConnectionInfoIncludes>,
-    refresh: boolean
+    refresh: boolean,
   ): Promise<Map<IConnectionInfoParams, Connection>> {
     const connectionsList: Connection[] = [];
     let removedConnections: IConnectionInfoParams[] = [];
@@ -448,37 +481,33 @@ export class ConnectionInfoResource
       }
     }
 
-    await ResourceKeyUtils.forEachAsync(
-      originalKey,
-      async key => {
-        let connectionId: string | undefined;
-        if (!isResourceAlias(key)) {
-          projectId = key.projectId;
-          connectionId = key.connectionId;
-        }
+    await ResourceKeyUtils.forEachAsync(originalKey, async key => {
+      let connectionId: string | undefined;
+      if (!isResourceAlias(key)) {
+        projectId = key.projectId;
+        connectionId = key.connectionId;
+      }
 
-        const { connections } = await this.graphQLService.sdk.getUserConnections({
-          projectId,
-          connectionId,
-          projectIds,
-          ...this.getDefaultIncludes(),
-          ...this.getIncludesMap(key, includes),
-        });
-
-        if (connectionId && !connections.some(connection => connection.id === connectionId)) {
-          throw new Error(`Connection is not found (${connectionId})`);
-        }
-
-        connectionsList.push(...connections);
+      const { connections } = await this.graphQLService.sdk.getUserConnections({
+        projectId,
+        connectionId,
+        projectIds,
+        ...this.getDefaultIncludes(),
+        ...this.getIncludesMap(key, includes),
       });
 
+      if (connectionId && !connections.some(connection => connection.id === connectionId)) {
+        throw new Error(`Connection is not found (${connectionId})`);
+      }
+
+      connectionsList.push(...connections);
+    });
+
     runInAction(() => {
       if (isResourceAlias(originalKey)) {
-        removedConnections = ResourceKeyUtils.toList(this.transformToKey(originalKey))
-          .filter(key => !connectionsList.some(connection => isConnectionInfoParamEqual(
-            key,
-            createConnectionParam(connection)
-          )));
+        removedConnections = ResourceKeyUtils.toList(this.transformToKey(originalKey)).filter(
+          key => !connectionsList.some(connection => isConnectionInfoParamEqual(key, createConnectionParam(connection))),
+        );
       }
 
       this.delete(resourceKeyList(removedConnections));
@@ -526,19 +555,12 @@ export class ConnectionInfoResource
   }
 
   protected validateKey(key: IConnectionInfoParams): boolean {
-    return (
-      typeof key === 'object'
-      && typeof key.projectId === 'string'
-      && typeof key.connectionId === 'string'
-    );
+    return typeof key === 'object' && typeof key.projectId === 'string' && typeof key.connectionId === 'string';
   }
 }
 
 export function isConnectionInfoParamEqual(param: IConnectionInfoParams, second: IConnectionInfoParams): boolean {
-  return (
-    param.projectId === second.projectId
-    && param.connectionId === second.connectionId
-  );
+  return param.projectId === second.projectId && param.connectionId === second.connectionId;
 }
 
 export function serializeConnectionParam(key: IConnectionInfoParams): string {
@@ -569,17 +591,9 @@ export function compareNewConnectionsInfo(a: DatabaseConnection, b: DatabaseConn
   return 0;
 }
 
-export function createConnectionParam(
-  connection: Connection
-): IConnectionInfoParams;
-export function createConnectionParam(
-  projectId: string,
-  connectionId: string
-): IConnectionInfoParams;
-export function createConnectionParam(
-  projectIdOrConnection: string | Connection,
-  connectionId?: string
-): IConnectionInfoParams {
+export function createConnectionParam(connection: Connection): IConnectionInfoParams;
+export function createConnectionParam(projectId: string, connectionId: string): IConnectionInfoParams;
+export function createConnectionParam(projectIdOrConnection: string | Connection, connectionId?: string): IConnectionInfoParams {
   if (typeof projectIdOrConnection === 'object') {
     connectionId = projectIdOrConnection.id;
     projectIdOrConnection = projectIdOrConnection.projectId;
diff --git a/webapp/packages/core-connections/src/ConnectionsLocaleService.ts b/webapp/packages/core-connections/src/ConnectionsLocaleService.ts
index d92b254a14..7945dee7bf 100644
--- a/webapp/packages/core-connections/src/ConnectionsLocaleService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class ConnectionsLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-connections/src/ConnectionsManagerService.ts b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
index 5deedf75db..99d41c7d7c 100644
--- a/webapp/packages/core-connections/src/ConnectionsManagerService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { ProcessSnackbar } from '@cloudbeaver/core-blocks';
@@ -16,7 +15,7 @@ import { Executor, ExecutorInterrupter, IExecutor } from '@cloudbeaver/core-exec
 import { ProjectInfo, projectInfoSortByName, ProjectsService } from '@cloudbeaver/core-projects';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
-import { ConnectionInfoResource, Connection, createConnectionParam, isConnectionInfoParamEqual } from './ConnectionInfoResource';
+import { Connection, ConnectionInfoResource, createConnectionParam, isConnectionInfoParamEqual } from './ConnectionInfoResource';
 import { ContainerResource, IStructContainers, ObjectContainer } from './ContainerResource';
 import type { IConnectionInfoParams } from './IConnectionsResource';
 
@@ -28,13 +27,10 @@ export interface IConnectionExecutorData {
 @injectable()
 export class ConnectionsManagerService {
   get projectConnections(): Connection[] {
-    return this.connectionInfo.values
-      .filter(connection => this.projectsService.activeProjects.some(project => project.id === connection.projectId));
+    return this.connectionInfo.values.filter(connection => this.projectsService.activeProjects.some(project => project.id === connection.projectId));
   }
   get createConnectionProjects(): ProjectInfo[] {
-    return this.projectsService.activeProjects
-      .filter(project => project.canEditDataSources)
-      .sort(projectInfoSortByName);
+    return this.projectsService.activeProjects.filter(project => project.canEditDataSources).sort(projectInfoSortByName);
   }
   readonly connectionExecutor: IExecutor<IConnectionInfoParams>;
   readonly onDisconnect: IExecutor<IConnectionExecutorData>;
@@ -83,11 +79,7 @@ export class ConnectionsManagerService {
     this.connectionInfo.add(connection);
   }
 
-  getObjectContainerById(
-    connectionKey: IConnectionInfoParams,
-    objectCatalogId?: string,
-    objectSchemaId?: string
-  ): ObjectContainer | undefined {
+  getObjectContainerById(connectionKey: IConnectionInfoParams, objectCatalogId?: string, objectSchemaId?: string): ObjectContainer | undefined {
     if (objectCatalogId) {
       const objectContainers = this.containerContainers.getCatalogData(connectionKey, objectCatalogId);
 
@@ -99,9 +91,7 @@ export class ConnectionsManagerService {
         return objectContainers.catalog;
       }
 
-      return objectContainers.schemaList.find(
-        objectContainer => objectContainer.name === objectSchemaId
-      );
+      return objectContainers.schemaList.find(objectContainer => objectContainer.name === objectSchemaId);
     }
 
     if (objectSchemaId) {
@@ -153,7 +143,7 @@ export class ConnectionsManagerService {
 
   connectionContext() {
     return {
-      connection: null as (Connection | null),
+      connection: null as Connection | null,
     };
   }
 
diff --git a/webapp/packages/core-connections/src/ConnectionsSettingsService.ts b/webapp/packages/core-connections/src/ConnectionsSettingsService.ts
index bdf241f9b0..cdc9a37fd8 100644
--- a/webapp/packages/core-connections/src/ConnectionsSettingsService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-connections/src/ContainerResource.ts b/webapp/packages/core-connections/src/ContainerResource.ts
index 99459d4b9b..6ed080031e 100644
--- a/webapp/packages/core-connections/src/ContainerResource.ts
+++ b/webapp/packages/core-connections/src/ContainerResource.ts
@@ -5,11 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { GraphQLService, NavNodeInfoFragment, ResourceKeyUtils, CachedMapResource, ResourceKey, resourceKeyList, isResourceAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapResource,
+  GraphQLService,
+  isResourceAlias,
+  NavNodeInfoFragment,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from './ConnectionInfoResource';
 import type { IConnectionInfoParams } from './IConnectionsResource';
@@ -35,10 +42,7 @@ interface ObjectContainerParams {
 }
 
 @injectable()
-export class ContainerResource extends CachedMapResource<
-ObjectContainerParams,
-IStructContainers
-> {
+export class ContainerResource extends CachedMapResource<ObjectContainerParams, IStructContainers> {
   constructor(
     private readonly graphQLService: GraphQLService,
     private readonly connectionInfoResource: ConnectionInfoResource,
@@ -50,44 +54,33 @@ IStructContainers
     this.preloadResource(connectionInfoResource, () => ConnectionInfoActiveProjectKey);
     this.before(ExecutorInterrupter.interrupter(key => !connectionInfoResource.isConnected(key)));
 
-    this.connectionInfoResource.onItemDelete.addHandler(
-      key => ResourceKeyUtils.forEach(
-        key,
-        key => this.delete({ projectId: key.projectId, connectionId: key.connectionId })
-      )
+    this.connectionInfoResource.onItemDelete.addHandler(key =>
+      ResourceKeyUtils.forEach(key, key => this.delete({ projectId: key.projectId, connectionId: key.connectionId })),
     );
-    this.connectionInfoResource.onItemUpdate.addHandler(
-      key => ResourceKeyUtils.forEach(key, key => {
+    this.connectionInfoResource.onItemUpdate.addHandler(key =>
+      ResourceKeyUtils.forEach(key, key => {
         if (!this.connectionInfoResource.get(key)?.connected) {
           this.delete({ projectId: key.projectId, connectionId: key.connectionId });
         }
-      })
+      }),
     );
 
     this.connectionInfoResource.onClear.addHandler(() => this.clear());
   }
 
-  getSchema(
-    connectionKey: IConnectionInfoParams,
-    schemaId: string
-  ): ObjectContainer | undefined {
+  getSchema(connectionKey: IConnectionInfoParams, schemaId: string): ObjectContainer | undefined {
     const connectionData = this.get(connectionKey);
 
     return connectionData?.schemaList.find(schema => schema.name === schemaId);
   }
 
-  getCatalogData(
-    connectionKey: IConnectionInfoParams,
-    catalogId: string
-  ): ICatalogData | undefined {
+  getCatalogData(connectionKey: IConnectionInfoParams, catalogId: string): ICatalogData | undefined {
     const connectionData = this.get({ ...connectionKey, catalogId });
 
     return connectionData?.catalogList.find(catalog => catalog.catalog.name === catalogId);
   }
 
-  protected async loader(
-    originalKey: ResourceKey<ObjectContainerParams>
-  ): Promise<Map<ObjectContainerParams, IStructContainers>> {
+  protected async loader(originalKey: ResourceKey<ObjectContainerParams>): Promise<Map<ObjectContainerParams, IStructContainers>> {
     if (isResourceAlias(originalKey)) {
       throw new Error('Aliases not supported by this resource');
     }
@@ -102,13 +95,16 @@ IStructContainers
         withDetails: false,
       });
 
-      containers.set({ projectId, connectionId, catalogId }, {
-        catalogList: navGetStructContainers.catalogList,
-        schemaList: navGetStructContainers.schemaList,
-        supportsCatalogChange: navGetStructContainers.supportsCatalogChange,
-        supportsSchemaChange: navGetStructContainers.supportsSchemaChange,
-        activeCatalog: catalogId || undefined,
-      });
+      containers.set(
+        { projectId, connectionId, catalogId },
+        {
+          catalogList: navGetStructContainers.catalogList,
+          schemaList: navGetStructContainers.schemaList,
+          supportsCatalogChange: navGetStructContainers.supportsCatalogChange,
+          supportsSchemaChange: navGetStructContainers.supportsSchemaChange,
+          activeCatalog: catalogId || undefined,
+        },
+      );
     });
 
     this.set(resourceKeyList([...containers.keys()]), [...containers.values()]);
@@ -117,19 +113,15 @@ IStructContainers
   }
 
   isKeyEqual(param: ObjectContainerParams, second: ObjectContainerParams): boolean {
-    return (
-      param.projectId === second.projectId
-      && param.connectionId === second.connectionId
-      && param.catalogId === second.catalogId
-    );
+    return param.projectId === second.projectId && param.connectionId === second.connectionId && param.catalogId === second.catalogId;
   }
 
   protected validateKey(key: ObjectContainerParams): boolean {
     return (
-      typeof key === 'object'
-      && typeof key.projectId === 'string'
-      && ['string'].includes(typeof key.connectionId)
-      && ['string', 'undefined'].includes(typeof key.catalogId)
+      typeof key === 'object' &&
+      typeof key.projectId === 'string' &&
+      ['string'].includes(typeof key.connectionId) &&
+      ['string', 'undefined'].includes(typeof key.catalogId)
     );
   }
 }
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index d609a903cb..b63bd77978 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -5,13 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, ResourceKey, ResourceKeyUtils, DatabaseDriverFragment, DriverListQueryVariables, CachedMapAllKey, resourceKeyList, isResourceAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  DatabaseDriverFragment,
+  DriverListQueryVariables,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 export type DBDriver = DatabaseDriverFragment;
@@ -24,9 +33,7 @@ type DriverResourceIncludes = Omit<DriverListQueryVariables, 'driverId'>;
 @injectable()
 export class DBDriverResource extends CachedMapResource<string, DBDriver, DriverListQueryVariables> {
   get enabledDrivers() {
-    return this.values
-      .filter(driver => driver.enabled)
-      .sort(this.compare);
+    return this.values.filter(driver => driver.enabled).sort(this.compare);
   }
 
   constructor(
@@ -36,7 +43,11 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
   ) {
     super();
     appAuthService.requireAuthentication(this);
-    this.sync(this.serverConfigResource, () => { }, () => CachedMapAllKey);
+    this.sync(
+      this.serverConfigResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
 
     makeObservable(this, {
       enabledDrivers: computed<DBDriver[]>({
@@ -47,16 +58,13 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
 
   compare(driverA: DBDriver, driverB: DBDriver): number {
     if (driverA.promotedScore === driverB.promotedScore) {
-      return (driverA.name || '').localeCompare((driverB.name || ''));
+      return (driverA.name || '').localeCompare(driverB.name || '');
     }
 
     return (driverB.promotedScore || 0) - (driverA.promotedScore || 0);
   }
 
-  protected async loader(
-    originalKey: ResourceKey<string>,
-    includes?: ReadonlyArray<string>
-  ): Promise<Map<string, DBDriver>> {
+  protected async loader(originalKey: ResourceKey<string>, includes?: ReadonlyArray<string>): Promise<Map<string, DBDriver>> {
     const driversList: DBDriver[] = [];
     const all = this.isAlias(originalKey, CachedMapAllKey);
 
@@ -66,7 +74,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
       const { drivers } = await this.graphQLService.sdk.driverList({
         driverId,
         ...this.getDefaultIncludes(),
-        ...this.getIncludesMap(driverId, (all ? this.defaultIncludes : includes)),
+        ...this.getIncludesMap(driverId, all ? this.defaultIncludes : includes),
       });
 
       if (driverId && !drivers.some(driver => driver.id === driverId)) {
diff --git a/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts b/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
index 6df1c56d34..2a44c2786f 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
+++ b/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
@@ -5,19 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { DatabaseAuthModel, GraphQLService, CachedMapResource, resourceKeyList, CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import { CachedMapAllKey, CachedMapResource, DatabaseAuthModel, GraphQLService, resourceKeyList } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class DatabaseAuthModelsResource extends CachedMapResource<string, DatabaseAuthModel> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    serverConfigResource: ServerConfigResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, serverConfigResource: ServerConfigResource) {
     super();
-    this.sync(serverConfigResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
   }
 
   protected async loader(): Promise<Map<string, DatabaseAuthModel>> {
@@ -31,4 +31,4 @@ export class DatabaseAuthModelsResource extends CachedMapResource<string, Databa
   protected validateKey(key: string): boolean {
     return typeof key === 'string';
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/DatabaseConnection.ts b/webapp/packages/core-connections/src/DatabaseConnection.ts
index 9b250771ae..eb0bed01c4 100644
--- a/webapp/packages/core-connections/src/DatabaseConnection.ts
+++ b/webapp/packages/core-connections/src/DatabaseConnection.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import type { DatabaseConnectionFragment } from '@cloudbeaver/core-sdk';
 
diff --git a/webapp/packages/core-connections/src/EConnectionFeature.ts b/webapp/packages/core-connections/src/EConnectionFeature.ts
index 2fb15ac03c..7a846cf1eb 100644
--- a/webapp/packages/core-connections/src/EConnectionFeature.ts
+++ b/webapp/packages/core-connections/src/EConnectionFeature.ts
@@ -12,5 +12,5 @@ export enum EConnectionFeature {
   temporary = 'temporary',
   readOnly = 'readOnly',
   provided = 'provided',
-  manageable = 'manageable'
+  manageable = 'manageable',
 }
diff --git a/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts b/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
index 72406a7760..98a18ec526 100644
--- a/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
+++ b/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
@@ -5,15 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 
 import { Dependency, injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter, IAsyncContextLoader, IExecutionContextProvider } from '@cloudbeaver/core-executor';
-import { INodeNavigationData, NavigationType, NavNodeInfoResource, NavNodeManagerService, NavTreeResource, NodeManagerUtils } from '@cloudbeaver/core-navigation-tree';
+import {
+  INodeNavigationData,
+  NavigationType,
+  NavNodeInfoResource,
+  NavNodeManagerService,
+  NavTreeResource,
+  NodeManagerUtils,
+} from '@cloudbeaver/core-navigation-tree';
 import { getProjectNodeId } from '@cloudbeaver/core-projects';
 import { ServerEventId } from '@cloudbeaver/core-root';
-import { type ResourceKey, ResourceKeyUtils, resourceKeyList, isResourceAlias, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import { isResourceAlias, type ResourceKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 import { ConnectionFolderEventHandler, IConnectionFolderEvent } from '../ConnectionFolderEventHandler';
 import { Connection, ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam } from '../ConnectionInfoResource';
@@ -62,7 +68,7 @@ export class ConnectionNavNodeService extends Dependency {
         this.navTreeResource.markOutdated(resourceKeyList(parents));
       },
       undefined,
-      this.navTreeResource
+      this.navTreeResource,
     );
     this.connectionFolderEventHandler.onEvent<IConnectionFolderEvent>(
       ServerEventId.CbDatasourceFolderDeleted,
@@ -73,10 +79,13 @@ export class ConnectionNavNodeService extends Dependency {
           return parents[parents.length - 1];
         });
 
-        this.navTreeResource.deleteInNode(resourceKeyList(parents), data.nodePaths.map(value => [value]));
+        this.navTreeResource.deleteInNode(
+          resourceKeyList(parents),
+          data.nodePaths.map(value => [value]),
+        );
       },
       undefined,
-      this.navTreeResource
+      this.navTreeResource,
     );
     this.connectionFolderEventHandler.onEvent<IConnectionFolderEvent>(
       ServerEventId.CbDatasourceFolderUpdated,
@@ -84,26 +93,18 @@ export class ConnectionNavNodeService extends Dependency {
         this.navTreeResource.markOutdated(resourceKeyList(data.nodePaths));
       },
       undefined,
-      this.navTreeResource
+      this.navTreeResource,
     );
   }
 
-  navigationNavNodeConnectionContext: IAsyncContextLoader<Connection | undefined, INodeNavigationData> = async (
-    context,
-    {
-      nodeId,
-    }
-  ) => {
+  navigationNavNodeConnectionContext: IAsyncContextLoader<Connection | undefined, INodeNavigationData> = async (context, { nodeId }) => {
     await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
     const connection = this.connectionInfoResource.getConnectionForNode(nodeId);
 
     return connection;
   };
 
-  private async preloadConnectionInfo(
-    key: ResourceKey<string>,
-    context: IExecutionContextProvider<ResourceKey<string>>
-  ) {
+  private async preloadConnectionInfo(key: ResourceKey<string>, context: IExecutionContextProvider<ResourceKey<string>>) {
     if (isResourceAlias(key)) {
       return;
     }
@@ -132,7 +133,6 @@ export class ConnectionNavNodeService extends Dependency {
 
     connectionInfos = Array.isArray(connectionInfos) ? connectionInfos : [connectionInfos];
     for (const connectionInfo of connectionInfos) {
-
       if (!connectionInfo?.nodePath || connectionInfo.template) {
         return;
       }
@@ -181,10 +181,7 @@ export class ConnectionNavNodeService extends Dependency {
       const nodePath = connectionInfo.nodePath ?? NodeManagerUtils.connectionIdToConnectionNodeId(key.connectionId);
 
       const node = this.navNodeInfoResource.get(nodePath);
-      const folder = (
-        node?.parentId
-        ?? getProjectNodeId(key.projectId)
-      );
+      const folder = node?.parentId ?? getProjectNodeId(key.projectId);
 
       if (nodePath) {
         this.navTreeResource.deleteInNode(folder, [nodePath]);
@@ -235,13 +232,7 @@ export class ConnectionNavNodeService extends Dependency {
     this.navTreeResource.insertToNode(parentId, insertIndex, connection.nodePath);
   }
 
-  private async navigateHandler(
-    {
-      type,
-      nodeId,
-    }: INodeNavigationData,
-    contexts: IExecutionContextProvider<INodeNavigationData>
-  ): Promise<void> {
+  private async navigateHandler({ type, nodeId }: INodeNavigationData, contexts: IExecutionContextProvider<INodeNavigationData>): Promise<void> {
     if (type !== NavigationType.open) {
       return;
     }
@@ -249,13 +240,11 @@ export class ConnectionNavNodeService extends Dependency {
     let connection: Connection | undefined | null = await contexts.getContext(this.navigationNavNodeConnectionContext);
 
     if (NodeManagerUtils.isDatabaseObject(nodeId) && connection) {
-      connection = await this.connectionsManagerService.requireConnection(
-        createConnectionParam(connection)
-      );
+      connection = await this.connectionsManagerService.requireConnection(createConnectionParam(connection));
 
       if (!connection?.connected) {
         throw new Error('Connection not established');
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts b/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
index 24c6e3a460..bb53bf6c97 100644
--- a/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
+++ b/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import type { IExtension } from '@cloudbeaver/core-extensions';
 import { NavNodeInfoResource, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
@@ -17,7 +16,6 @@ import { objectCatalogProvider } from '../extensions/IObjectCatalogProvider';
 import { objectSchemaProvider } from '../extensions/IObjectSchemaProvider';
 import type { IConnectionInfoParams } from '../IConnectionsResource';
 
-
 @injectable()
 export class NavNodeExtensionsService {
   readonly extensions: Array<IExtension<string>>;
@@ -25,7 +23,7 @@ export class NavNodeExtensionsService {
   constructor(
     private readonly navNodeInfoResource: NavNodeInfoResource,
     private readonly navNodeManagerService: NavNodeManagerService,
-    private readonly connectionInfoResource: ConnectionInfoResource
+    private readonly connectionInfoResource: ConnectionInfoResource,
   ) {
     this.extensions = [
       projectProvider(this.getProject.bind(this)),
@@ -52,15 +50,13 @@ export class NavNodeExtensionsService {
   }
 
   getDBObjectCatalog(navNodeId: string) {
-    const nodeInfo = this.navNodeManagerService
-      .getNodeContainerInfo(navNodeId);
+    const nodeInfo = this.navNodeManagerService.getNodeContainerInfo(navNodeId);
 
     return nodeInfo.catalogId;
   }
 
   getDBObjectSchema(navNodeId: string) {
-    const nodeInfo = this.navNodeManagerService
-      .getNodeContainerInfo(navNodeId);
+    const nodeInfo = this.navNodeManagerService.getNodeContainerInfo(navNodeId);
 
     return nodeInfo.schemaId;
   }
diff --git a/webapp/packages/core-connections/src/NavTree/getConnectionFolderId.ts b/webapp/packages/core-connections/src/NavTree/getConnectionFolderId.ts
index 207dc805c3..8d029b8f8a 100644
--- a/webapp/packages/core-connections/src/NavTree/getConnectionFolderId.ts
+++ b/webapp/packages/core-connections/src/NavTree/getConnectionFolderId.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionFolderParam } from '../ConnectionFolderResource';
 
 export function getConnectionFolderId(key: IConnectionFolderParam): string {
   return `folder://${key.projectId}/${key.folderId}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NavTree/getConnectionFolderIdFromNodeId.ts b/webapp/packages/core-connections/src/NavTree/getConnectionFolderIdFromNodeId.ts
index 2d09b682bc..e8b2dd966a 100644
--- a/webapp/packages/core-connections/src/NavTree/getConnectionFolderIdFromNodeId.ts
+++ b/webapp/packages/core-connections/src/NavTree/getConnectionFolderIdFromNodeId.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionFolderParam } from '../ConnectionFolderResource';
 import { createConnectionFolderParam } from '../createConnectionFolderParam';
 
 export function getConnectionFolderIdFromNodeId(nodeId: string): IConnectionFolderParam | undefined {
-  const data = /^folder:\/\/(.*?)\/(.*)$/ig.exec(nodeId);
+  const data = /^folder:\/\/(.*?)\/(.*)$/gi.exec(nodeId);
 
   if (data) {
     const [t, projectId, folderId] = data;
@@ -18,4 +17,4 @@ export function getConnectionFolderIdFromNodeId(nodeId: string): IConnectionFold
   }
 
   return undefined;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NavTree/getConnectionParentId.ts b/webapp/packages/core-connections/src/NavTree/getConnectionParentId.ts
index bab5ea1391..11bd83c0b1 100644
--- a/webapp/packages/core-connections/src/NavTree/getConnectionParentId.ts
+++ b/webapp/packages/core-connections/src/NavTree/getConnectionParentId.ts
@@ -5,8 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import { getProjectNodeId } from '@cloudbeaver/core-projects';
 
 import { getConnectionFolderId } from './getConnectionFolderId';
@@ -17,5 +15,4 @@ export function getConnectionParentId(projectId: string, folderId?: string): str
   }
 
   return getConnectionFolderId({ projectId, folderId });
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NavTree/getFolderNodeParents.ts b/webapp/packages/core-connections/src/NavTree/getFolderNodeParents.ts
index 5f5e1e7f29..47ec81d939 100644
--- a/webapp/packages/core-connections/src/NavTree/getFolderNodeParents.ts
+++ b/webapp/packages/core-connections/src/NavTree/getFolderNodeParents.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getProjectNodeId } from '@cloudbeaver/core-projects';
 import { getPathParents } from '@cloudbeaver/core-utils';
 
@@ -19,4 +18,4 @@ export function getFolderNodeParents(nodeId: string): string[] {
   }
 
   return [];
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NavTree/isFolderNodeId.ts b/webapp/packages/core-connections/src/NavTree/isFolderNodeId.ts
index 5d086696ae..6cff839c73 100644
--- a/webapp/packages/core-connections/src/NavTree/isFolderNodeId.ts
+++ b/webapp/packages/core-connections/src/NavTree/isFolderNodeId.ts
@@ -8,4 +8,4 @@
 
 export function isFolderNodeId(nodeId: string): boolean {
   return nodeId.startsWith('folder://');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/NetworkHandlerResource.ts b/webapp/packages/core-connections/src/NetworkHandlerResource.ts
index b41d2c3b7b..9e3f2cb241 100644
--- a/webapp/packages/core-connections/src/NetworkHandlerResource.ts
+++ b/webapp/packages/core-connections/src/NetworkHandlerResource.ts
@@ -5,11 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { NetworkHandlerDescriptor, GraphQLService, CachedMapResource, resourceKeyList, NetworkHandlerConfigInput, CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  NetworkHandlerConfigInput,
+  NetworkHandlerDescriptor,
+  resourceKeyList,
+} from '@cloudbeaver/core-sdk';
 
 export const SSH_TUNNEL_ID = 'ssh_tunnel';
 
@@ -18,10 +24,14 @@ export class NetworkHandlerResource extends CachedMapResource<string, NetworkHan
   constructor(
     private readonly graphQLService: GraphQLService,
     private readonly notificationService: NotificationService,
-    serverConfigResource: ServerConfigResource
+    serverConfigResource: ServerConfigResource,
   ) {
     super();
-    this.sync(serverConfigResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
   }
 
   async test(config: NetworkHandlerConfigInput): Promise<void> {
diff --git a/webapp/packages/core-connections/src/USER_NAME_PROPERTY_ID.ts b/webapp/packages/core-connections/src/USER_NAME_PROPERTY_ID.ts
index efe85e8f57..9ec84264b1 100644
--- a/webapp/packages/core-connections/src/USER_NAME_PROPERTY_ID.ts
+++ b/webapp/packages/core-connections/src/USER_NAME_PROPERTY_ID.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const USER_NAME_PROPERTY_ID = 'userName';
\ No newline at end of file
+export const USER_NAME_PROPERTY_ID = 'userName';
diff --git a/webapp/packages/core-connections/src/createConnectionFolderParam.ts b/webapp/packages/core-connections/src/createConnectionFolderParam.ts
index 57eecbccc6..0725be8e8b 100644
--- a/webapp/packages/core-connections/src/createConnectionFolderParam.ts
+++ b/webapp/packages/core-connections/src/createConnectionFolderParam.ts
@@ -5,21 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ConnectionFolder, IConnectionFolderParam } from './ConnectionFolderResource';
 
-export function createConnectionFolderParam(
-  projectId: string,
-  folder: ConnectionFolder
-): IConnectionFolderParam;
-export function createConnectionFolderParam(
-  projectId: string,
-  folderId: string
-): IConnectionFolderParam;
-export function createConnectionFolderParam(
-  projectId: string,
-  folderIdOrFolder: string | ConnectionFolder
-): IConnectionFolderParam {
+export function createConnectionFolderParam(projectId: string, folder: ConnectionFolder): IConnectionFolderParam;
+export function createConnectionFolderParam(projectId: string, folderId: string): IConnectionFolderParam;
+export function createConnectionFolderParam(projectId: string, folderIdOrFolder: string | ConnectionFolder): IConnectionFolderParam {
   if (typeof folderIdOrFolder === 'object') {
     folderIdOrFolder = folderIdOrFolder.id;
   }
@@ -28,4 +18,4 @@ export function createConnectionFolderParam(
     projectId: projectId,
     folderId: folderIdOrFolder,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts b/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
index 93cfba51db..f23ddf5915 100644
--- a/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
+++ b/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 import type { IConnectionInfoParams } from '../IConnectionsResource';
 
diff --git a/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts b/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
index 8872f6fc97..085565638a 100644
--- a/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
+++ b/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 import type { IConnectionInfoParams } from '../IConnectionsResource';
 
 const connectionSetterSymbol = Symbol('@extension/ConnectionSetter');
 
-export type IConnectionSetter<T = never> = (
-  connectionKey: IConnectionInfoParams,
-  context: T
-) => Promise<boolean> | boolean;
+export type IConnectionSetter<T = never> = (connectionKey: IConnectionInfoParams, context: T) => Promise<boolean> | boolean;
 
 export function connectionSetter<T>(setter: IConnectionSetter<T>) {
   return createExtension<T>(setter, connectionSetterSymbol);
diff --git a/webapp/packages/core-connections/src/extensions/IObjectCatalogProvider.ts b/webapp/packages/core-connections/src/extensions/IObjectCatalogProvider.ts
index db8973e1a8..d512b4e32d 100644
--- a/webapp/packages/core-connections/src/extensions/IObjectCatalogProvider.ts
+++ b/webapp/packages/core-connections/src/extensions/IObjectCatalogProvider.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const objectCatalogProviderSymbol = Symbol('@extension/ObjectCatalogProvider');
 
diff --git a/webapp/packages/core-connections/src/extensions/IObjectCatalogSetter.ts b/webapp/packages/core-connections/src/extensions/IObjectCatalogSetter.ts
index 842e20aaa3..784fb740a5 100644
--- a/webapp/packages/core-connections/src/extensions/IObjectCatalogSetter.ts
+++ b/webapp/packages/core-connections/src/extensions/IObjectCatalogSetter.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const objectCatalogSetterSymbol = Symbol('@extension/ObjectCatalogSetter');
 
diff --git a/webapp/packages/core-connections/src/extensions/IObjectSchemaProvider.ts b/webapp/packages/core-connections/src/extensions/IObjectSchemaProvider.ts
index 136b82faa8..3835189e0d 100644
--- a/webapp/packages/core-connections/src/extensions/IObjectSchemaProvider.ts
+++ b/webapp/packages/core-connections/src/extensions/IObjectSchemaProvider.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const objectSchemaProviderSymbol = Symbol('@extension/ObjectSchemaProvider');
 
diff --git a/webapp/packages/core-connections/src/extensions/IObjectSchemaSetter.ts b/webapp/packages/core-connections/src/extensions/IObjectSchemaSetter.ts
index 7ab86aebbd..d2806abbb8 100644
--- a/webapp/packages/core-connections/src/extensions/IObjectSchemaSetter.ts
+++ b/webapp/packages/core-connections/src/extensions/IObjectSchemaSetter.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const objectSchemaSetterSymbol = Symbol('@extension/ObjectSchemaSetter');
 
diff --git a/webapp/packages/core-connections/src/isJDBCConnection.ts b/webapp/packages/core-connections/src/isJDBCConnection.ts
index 111238c68c..b192c2059d 100644
--- a/webapp/packages/core-connections/src/isJDBCConnection.ts
+++ b/webapp/packages/core-connections/src/isJDBCConnection.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DatabaseConnection } from './DatabaseConnection';
 import type { DBDriver } from './DBDriverResource';
 
diff --git a/webapp/packages/core-connections/src/locales/en.ts b/webapp/packages/core-connections/src/locales/en.ts
index 0035a8f19d..8c833785b4 100644
--- a/webapp/packages/core-connections/src/locales/en.ts
+++ b/webapp/packages/core-connections/src/locales/en.ts
@@ -1,7 +1,7 @@
 export default [
   ['connections_administration_item', 'Connection Management'],
   ['connections_administration_connection_create', 'Add Database'],
-  ['connections_administration_search_database_tip', 'Type your hosts here, e.g. \'localhost host1.myhost.com 192.168.0.1\' and press Enter'],
+  ['connections_administration_search_database_tip', "Type your hosts here, e.g. 'localhost host1.myhost.com 192.168.0.1' and press Enter"],
   ['connections_administration_new_connection', 'New connection'],
   ['connections_administration_connection_create_error', 'Create connection error'],
   ['connections_administration_connection_save_error', 'Save connection error'],
@@ -9,7 +9,10 @@ export default [
   ['connections_administration_configuration_wizard_step_title', 'Database connections'],
   ['connections_administration_configuration_wizard_step_description', 'Add database connections'],
   ['connections_administration_configuration_wizard_title', 'Add database connections'],
-  ['connections_administration_configuration_wizard_message', 'Here you can create database connections manually or using a database server search.\nYou can skip this step and configure the connections later.'],
+  [
+    'connections_administration_configuration_wizard_message',
+    'Here you can create database connections manually or using a database server search.\nYou can skip this step and configure the connections later.',
+  ],
   ['connections_administration_connection_no_information', 'No information available'],
   ['connections_administration_delete_confirmation', "You're going to delete these connections: "],
   ['connections_administration_tools_add_tooltip', 'Add new connection'],
@@ -71,5 +74,8 @@ export default [
   ['connections_driver_search_placeholder', 'Type driver name...'],
   ['connections_not_found', 'No database connections were found'],
 
-  ['cloud_connections_access_placeholder', 'Cloud connections are visible to all users. Access management can be configured in "AWS Management Console".'],
+  [
+    'cloud_connections_access_placeholder',
+    'Cloud connections are visible to all users. Access management can be configured in "AWS Management Console".',
+  ],
 ];
diff --git a/webapp/packages/core-connections/src/locales/it.ts b/webapp/packages/core-connections/src/locales/it.ts
index 5685f268e4..f45768c918 100644
--- a/webapp/packages/core-connections/src/locales/it.ts
+++ b/webapp/packages/core-connections/src/locales/it.ts
@@ -1,14 +1,17 @@
 export default [
   ['connections_administration_item', 'Gestione delle connessioni'],
   ['connections_administration_connection_create', 'Aggiungi Database'],
-  ['connections_administration_search_database_tip', 'Digita gli hosts qui, p.e. \'localhost host1.myhost.com 192.168.0.1\' e premi Invio'],
+  ['connections_administration_search_database_tip', "Digita gli hosts qui, p.e. 'localhost host1.myhost.com 192.168.0.1' e premi Invio"],
   ['connections_administration_new_connection', 'Nuova Connessione'],
   ['connections_administration_connection_create_error', 'Errore di creazione connessione'],
   ['connections_administration_connection_save_error', 'Errore di salvataggio connessione'],
   ['connections_administration_configuration_wizard_step_title', 'Connessioni ai Database'],
   ['connections_administration_configuration_wizard_step_description', 'Aggiungi connessione al database'],
   ['connections_administration_configuration_wizard_title', 'Aggiungi connessione al database'],
-  ['connections_administration_configuration_wizard_message', 'Qui puoi creare connessioni ai database manualmente oppure usando una ricerca di un database server.\nPuoi saltare questo step e configurare le connessioni dopo.'],
+  [
+    'connections_administration_configuration_wizard_message',
+    'Qui puoi creare connessioni ai database manualmente oppure usando una ricerca di un database server.\nPuoi saltare questo step e configurare le connessioni dopo.',
+  ],
   ['connections_administration_connection_no_information', 'Nessuna informazione disponibile'],
   ['connections_administration_tools_add_tooltip', 'Aggiungi una nuova connessione'],
   ['connections_administration_tools_refresh_tooltip', 'Ricarica la lista di connessioni'],
@@ -27,7 +30,7 @@ export default [
   ['connections_connection_credentials_provisioning_description', 'Devi compilare o confermare le credenziali per provare questa connessione'],
   ['connections_connection_edit_authentication', 'Autenticazione'],
   ['connections_connection_edit_access', 'Accesso'],
-  ['connections_connection_edit_access_load_failed', 'Errore al recupero dell\'accesso alla connessione'],
+  ['connections_connection_edit_access_load_failed', "Errore al recupero dell'accesso alla connessione"],
   ['connections_connection_edit_search', 'Cerca'],
   ['connections_connection_edit_search_hosts', 'Host names'],
   ['connections_connection_address', 'Indirizzo'],
@@ -69,5 +72,8 @@ export default [
   ['connections_driver_search_placeholder', 'Digita il nome del driver...'],
   ['connections_not_found', 'Nessuna connessione al database trovata'],
 
-  ['cloud_connections_access_placeholder', 'Connessioni Cloud sono visibili a tutti gli utenti. Il gestore degli accessi può essere configurato in "AWS Management Console".'],
+  [
+    'cloud_connections_access_placeholder',
+    'Connessioni Cloud sono visibili a tutti gli utenti. Il gestore degli accessi può essere configurato in "AWS Management Console".',
+  ],
 ];
diff --git a/webapp/packages/core-connections/src/locales/ru.ts b/webapp/packages/core-connections/src/locales/ru.ts
index deff940ef9..2ad5e28e0e 100644
--- a/webapp/packages/core-connections/src/locales/ru.ts
+++ b/webapp/packages/core-connections/src/locales/ru.ts
@@ -1,14 +1,17 @@
 export default [
   ['connections_administration_item', 'Подключения'],
   ['connections_administration_connection_create', 'Создание подключения'],
-  ['connections_administration_search_database_tip', 'Укажите ваши хосты, например \'localhost host1.myhost.com 192.168.0.1\' и нажмите Enter'],
+  ['connections_administration_search_database_tip', "Укажите ваши хосты, например 'localhost host1.myhost.com 192.168.0.1' и нажмите Enter"],
   ['connections_administration_new_connection', 'Создание подключения'],
   ['connections_administration_connection_create_error', 'Ошибка при создании подключения'],
   ['connections_administration_connection_save_error', 'Ошибка при сохранении подключения'],
   ['connections_administration_connection_access_empty', 'Нет доступных пользователей и подключений'],
   ['connections_administration_configuration_wizard_step_title', 'Подключения к базам'],
   ['connections_administration_configuration_wizard_step_description', 'Подключения к базам'],
-  ['connections_administration_configuration_wizard_message', 'Here you can create database connections manually or using a database server search.\nYou can skip this step and configure the connections later.'],
+  [
+    'connections_administration_configuration_wizard_message',
+    'Here you can create database connections manually or using a database server search.\nYou can skip this step and configure the connections later.',
+  ],
   ['connections_administration_connection_no_information', 'Нет доступной информации'],
   ['connections_administration_delete_confirmation', 'Вы собираетесь удалить следующие подключения: '],
   ['connections_administration_tools_add_tooltip', 'Добавить новое подключение'],
diff --git a/webapp/packages/core-connections/src/locales/zh.ts b/webapp/packages/core-connections/src/locales/zh.ts
index 8bec724a43..5cffc9cd2a 100644
--- a/webapp/packages/core-connections/src/locales/zh.ts
+++ b/webapp/packages/core-connections/src/locales/zh.ts
@@ -8,7 +8,10 @@ export default [
   ['connections_administration_configuration_wizard_step_title', '数据库连接'],
   ['connections_administration_configuration_wizard_step_description', '添加数据库连接'],
   ['connections_administration_configuration_wizard_title', '添加数据库连接'],
-  ['connections_administration_configuration_wizard_message', '您可以在此处手动创建数据库连接或使用数据库服务器搜索。您可以跳过此步骤并稍后配置连接。'],
+  [
+    'connections_administration_configuration_wizard_message',
+    '您可以在此处手动创建数据库连接或使用数据库服务器搜索。您可以跳过此步骤并稍后配置连接。',
+  ],
   ['connections_administration_connection_no_information', '没有可用信息'],
   ['connections_administration_delete_confirmation', '您将删除这些连接：'],
   ['connections_administration_tools_add_tooltip', '添加新连接'],
diff --git a/webapp/packages/core-connections/src/manifest.ts b/webapp/packages/core-connections/src/manifest.ts
index 0a8dbcbef5..3a89ccc9e1 100644
--- a/webapp/packages/core-connections/src/manifest.ts
+++ b/webapp/packages/core-connections/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionDialectResource } from './ConnectionDialectResource';
@@ -25,7 +24,6 @@ import { ConnectionNavNodeService } from './NavTree/ConnectionNavNodeService';
 import { NavNodeExtensionsService } from './NavTree/NavNodeExtensionsService';
 import { NetworkHandlerResource } from './NetworkHandlerResource';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Connections',
diff --git a/webapp/packages/core-connections/src/useConnectionInfo.ts b/webapp/packages/core-connections/src/useConnectionInfo.ts
index 25c8b0bedc..23551ad73e 100644
--- a/webapp/packages/core-connections/src/useConnectionInfo.ts
+++ b/webapp/packages/core-connections/src/useConnectionInfo.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -36,30 +35,35 @@ export function useConnectionInfo(key: IConnectionInfoParams): IPublic {
   const resource = useService(ConnectionInfoResource);
   key = resource.getKeyRef(key);
 
-  return useObservableRef<IPrivate>(() => ({
-    get connectionInfo(): Connection | undefined {
-      return this.resource.get(this.key);
+  return useObservableRef<IPrivate>(
+    () => ({
+      get connectionInfo(): Connection | undefined {
+        return this.resource.get(this.key);
+      },
+      isLoading() {
+        return this.resource.isLoading(this.key);
+      },
+      isLoaded() {
+        return this.resource.isLoaded(this.key);
+      },
+      isOutdated() {
+        return this.resource.isOutdated(this.key);
+      },
+      load() {
+        return this.resource.load(this.key);
+      },
+      refresh() {
+        return this.resource.refresh(this.key);
+      },
+      connect() {
+        return this.manager.requireConnection(this.key);
+      },
+    }),
+    {
+      connectionInfo: computed,
+      key: observable.ref,
     },
-    isLoading() {
-      return this.resource.isLoading(this.key);
-    },
-    isLoaded() {
-      return this.resource.isLoaded(this.key);
-    },
-    isOutdated() {
-      return this.resource.isOutdated(this.key);
-    },
-    load() {
-      return this.resource.load(this.key);
-    },
-    refresh() {
-      return this.resource.refresh(this.key);
-    },
-    connect() {
-      return this.manager.requireConnection(this.key);
-    },
-  }), {
-    connectionInfo: computed,
-    key: observable.ref,
-  }, { manager, resource, key }, ['isLoading', 'isLoaded', 'isOutdated', 'load', 'refresh', 'connect']);
+    { manager, resource, key },
+    ['isLoading', 'isLoaded', 'isOutdated', 'load', 'refresh', 'connect'],
+  );
 }
diff --git a/webapp/packages/core-connections/src/useDBDriver.ts b/webapp/packages/core-connections/src/useDBDriver.ts
index e8c34fc9eb..1bc1ecaa8d 100644
--- a/webapp/packages/core-connections/src/useDBDriver.ts
+++ b/webapp/packages/core-connections/src/useDBDriver.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/core-di/src/App.ts b/webapp/packages/core-di/src/App.ts
index 2a3bd4cb3b..a924a100c9 100644
--- a/webapp/packages/core-di/src/App.ts
+++ b/webapp/packages/core-di/src/App.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { flat } from '@cloudbeaver/core-utils';
 
@@ -64,8 +63,7 @@ export class App {
   private registerServices(): void {
     this.diWrapper.collection.unbindAll();
 
-    this.getServiceCollection()
-      .addServiceByClass(App, this);
+    this.getServiceCollection().addServiceByClass(App, this);
 
     for (const service of this.getServices()) {
       // console.log('provider', provider.name);
diff --git a/webapp/packages/core-di/src/AppContext.tsx b/webapp/packages/core-di/src/AppContext.tsx
index d17e6d4849..610056a148 100644
--- a/webapp/packages/core-di/src/AppContext.tsx
+++ b/webapp/packages/core-di/src/AppContext.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext, StrictMode } from 'react';
 
 import type { IServiceInjector } from './IApp';
diff --git a/webapp/packages/core-di/src/Bootstrap.ts b/webapp/packages/core-di/src/Bootstrap.ts
index c5faa810a1..92376d49e1 100644
--- a/webapp/packages/core-di/src/Bootstrap.ts
+++ b/webapp/packages/core-di/src/Bootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from './injectable';
 
 @injectable()
diff --git a/webapp/packages/core-di/src/DIContainer.ts b/webapp/packages/core-di/src/DIContainer.ts
index 93acadb50f..4ad455774f 100644
--- a/webapp/packages/core-di/src/DIContainer.ts
+++ b/webapp/packages/core-di/src/DIContainer.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { interfaces, Container } from 'inversify';
+import { Container, interfaces } from 'inversify';
 
 import type { IServiceCollection, IServiceConstructor, IServiceInjector } from './IApp';
 import type { InjectionToken } from './InjectionToken';
@@ -27,12 +26,10 @@ function logger(planAndResolve: interfaces.Next): interfaces.Next {
         throw exception;
       }
 
-      let serviceName = (
-        typeof args.serviceIdentifier === 'function'
-        && 'name' in args.serviceIdentifier
+      let serviceName =
+        typeof args.serviceIdentifier === 'function' && 'name' in args.serviceIdentifier
           ? args.serviceIdentifier.name
-          : args.serviceIdentifier.toString()
-      );
+          : args.serviceIdentifier.toString();
 
       let notFoundElement = dep;
 
@@ -44,21 +41,20 @@ function logger(planAndResolve: interfaces.Next): interfaces.Next {
         index = metadata.indexOf(notFoundElement);
       }
 
-
       function getName(element: any | (() => void)) {
-        return (
-          typeof element === 'function'
-          && 'name' in element
-            ? element.name
-            : String(element)
-        );
+        return typeof element === 'function' && 'name' in element ? element.name : String(element);
       }
 
       const notFoundServiceName = getName(notFoundElement);
 
       const dependenciesList = metadata.map((value, i) => `${i} - ${getName(value)}`);
 
-      throw new Error(`Can't find dependency ${notFoundServiceName}(${index}) \n\rin ${serviceName}(\n\r  ${dependenciesList.join(', \n\r  ')}\n\r)\r\n${exception.message}`, { cause: exception });
+      throw new Error(
+        `Can't find dependency ${notFoundServiceName}(${index}) \n\rin ${serviceName}(\n\r  ${dependenciesList.join(', \n\r  ')}\n\r)\r\n${
+          exception.message
+        }`,
+        { cause: exception },
+      );
     }
   };
 }
@@ -116,9 +112,7 @@ export class DIContainer implements IServiceInjector, IServiceCollection {
     }
   }
 
-  addServiceByToken<T extends Record<string, any>>(
-    token: InjectionToken<T>, value: T | IServiceConstructor<T>
-  ): void {
+  addServiceByToken<T extends Record<string, any>>(token: InjectionToken<T>, value: T | IServiceConstructor<T>): void {
     if (isConstructor(value)) {
       this.container.bind(token).to(value as IServiceConstructor<T>);
     } else {
diff --git a/webapp/packages/core-di/src/DIService.ts b/webapp/packages/core-di/src/DIService.ts
index cf9ee9b2d2..449ff0cb34 100644
--- a/webapp/packages/core-di/src/DIService.ts
+++ b/webapp/packages/core-di/src/DIService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutorHandlersCollection, ISyncContextLoader } from '@cloudbeaver/core-executor';
 
 import { App } from './App';
@@ -19,15 +18,12 @@ export class DIService {
     return this.app.getServiceInjector();
   }
 
-  constructor(
-    private readonly app: App
-  ) { }
+  constructor(private readonly app: App) {}
 
   addDIContext(context: IExecutorHandlersCollection<any>): void {
     context.addContextCreator(dependencyInjectorContext, this.dependencyInjectorContext);
   }
 
-  private readonly dependencyInjectorContext: ISyncContextLoader<<T>(ctor: IServiceConstructor<T>) => T> = (
-    () => this.serviceInjector.getServiceByClass.bind(this)
-  );
-}
\ No newline at end of file
+  private readonly dependencyInjectorContext: ISyncContextLoader<<T>(ctor: IServiceConstructor<T>) => T> = () =>
+    this.serviceInjector.getServiceByClass.bind(this);
+}
diff --git a/webapp/packages/core-di/src/Dependency.ts b/webapp/packages/core-di/src/Dependency.ts
index 41b12aea73..1c15bc00ed 100644
--- a/webapp/packages/core-di/src/Dependency.ts
+++ b/webapp/packages/core-di/src/Dependency.ts
@@ -5,9 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from './injectable';
 
 @injectable()
-export abstract class Dependency {
-}
+export abstract class Dependency {}
diff --git a/webapp/packages/core-di/src/IApp.ts b/webapp/packages/core-di/src/IApp.ts
index 196d6603ec..91a6b9d1c3 100644
--- a/webapp/packages/core-di/src/IApp.ts
+++ b/webapp/packages/core-di/src/IApp.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ValueToken } from './InjectionToken';
 import type { ITypedConstructor } from './ITypedConstructor';
 
diff --git a/webapp/packages/core-di/src/InjectionToken.ts b/webapp/packages/core-di/src/InjectionToken.ts
index fbbc50c3a8..c5e197c8fc 100644
--- a/webapp/packages/core-di/src/InjectionToken.ts
+++ b/webapp/packages/core-di/src/InjectionToken.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITypedConstructor } from './ITypedConstructor';
 
 /**
@@ -18,9 +17,7 @@ export type ValueToken<T> = () => T;
  */
 export type InjectionToken<T> = ITypedConstructor<T> | ValueToken<T>;
 
-export function createValueToken<T extends Record<string, any>>(
-  obj: string | ITypedConstructor<T> | T
-): ValueToken<T> {
+export function createValueToken<T extends Record<string, any>>(obj: string | ITypedConstructor<T> | T): ValueToken<T> {
   // just fake function to keep type T
   const token = () => null as unknown as T;
   const name = getName(obj);
diff --git a/webapp/packages/core-di/src/PluginManifest.ts b/webapp/packages/core-di/src/PluginManifest.ts
index 98ac2def8b..3153321252 100644
--- a/webapp/packages/core-di/src/PluginManifest.ts
+++ b/webapp/packages/core-di/src/PluginManifest.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IServiceConstructor } from './IApp';
 
 export interface PluginManifest {
diff --git a/webapp/packages/core-di/src/dependencyInjectorContext.ts b/webapp/packages/core-di/src/dependencyInjectorContext.ts
index 124beeec96..9f21523fad 100644
--- a/webapp/packages/core-di/src/dependencyInjectorContext.ts
+++ b/webapp/packages/core-di/src/dependencyInjectorContext.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncContextLoader } from '@cloudbeaver/core-executor';
 
 import type { IServiceConstructor } from './IApp';
 
 export const dependencyInjectorContext: ISyncContextLoader<<T>(ctor: IServiceConstructor<T>) => T> = function dependencyInjectorContext() {
   throw new Error('Implementation not provided \n Use addContextCreator to add addDIContext implementation to context');
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-di/src/entities/ServiceInjectorToken.ts b/webapp/packages/core-di/src/entities/ServiceInjectorToken.ts
index f06e33c80c..79dd819c7d 100644
--- a/webapp/packages/core-di/src/entities/ServiceInjectorToken.ts
+++ b/webapp/packages/core-di/src/entities/ServiceInjectorToken.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IServiceInjector } from '../IApp';
 import { createValueToken } from '../InjectionToken';
 
diff --git a/webapp/packages/core-di/src/injectable.ts b/webapp/packages/core-di/src/injectable.ts
index 896a936f99..cf03fea1d2 100644
--- a/webapp/packages/core-di/src/injectable.ts
+++ b/webapp/packages/core-di/src/injectable.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable as inversifyInjectable, inject as inversifyInject } from 'inversify';
+import { inject as inversifyInject, injectable as inversifyInjectable } from 'inversify';
 import type { DecoratorTarget } from 'inversify/lib/annotation/decorator_utils';
 
 import type { ValueToken } from './InjectionToken';
@@ -15,8 +14,6 @@ export function injectable(): (target: any) => any {
   return inversifyInjectable();
 }
 
-export function inject<T>(
-  token: ValueToken<T>
-): (target: DecoratorTarget<T>, targetKey: string, index?: number) => void {
+export function inject<T>(token: ValueToken<T>): (target: DecoratorTarget<T>, targetKey: string, index?: number) => void {
   return inversifyInject<T>(token);
 }
diff --git a/webapp/packages/core-di/src/inversifyWrapper.ts b/webapp/packages/core-di/src/inversifyWrapper.ts
index 6991d440ed..9e77947d90 100644
--- a/webapp/packages/core-di/src/inversifyWrapper.ts
+++ b/webapp/packages/core-di/src/inversifyWrapper.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { DIContainer } from './DIContainer';
 import type { IServiceCollection, IServiceConstructor, IServiceInjector } from './IApp';
 import type { ValueToken } from './InjectionToken';
@@ -36,10 +35,7 @@ export const inversifyWrapper: IDiWrapper = {
       mainContainer.addServiceByClass(Ctor, value);
     },
 
-    addServiceByToken<T extends Record<string, unknown>>(
-      token: ValueToken<T> | IServiceConstructor<T>,
-      value: T
-    ): void {
+    addServiceByToken<T extends Record<string, unknown>>(token: ValueToken<T> | IServiceConstructor<T>, value: T): void {
       mainContainer.addServiceByToken(token, value);
     },
     unbindAll() {
@@ -50,5 +46,4 @@ export const inversifyWrapper: IDiWrapper = {
   registerChildContainer(container: DIContainer): void {
     container.bindWithParent(mainContainer);
   },
-
 };
diff --git a/webapp/packages/core-di/src/isConstructor.ts b/webapp/packages/core-di/src/isConstructor.ts
index 0344ae4588..c1b98ab7b8 100644
--- a/webapp/packages/core-di/src/isConstructor.ts
+++ b/webapp/packages/core-di/src/isConstructor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITypedConstructor } from './ITypedConstructor';
 
 /**
diff --git a/webapp/packages/core-di/src/manifest.ts b/webapp/packages/core-di/src/manifest.ts
index a5e6a4d438..2b53993181 100644
--- a/webapp/packages/core-di/src/manifest.ts
+++ b/webapp/packages/core-di/src/manifest.ts
@@ -5,8 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import { DIService } from './DIService';
 import type { PluginManifest } from './PluginManifest';
 
@@ -15,7 +13,5 @@ export const manifest: PluginManifest = {
     name: 'Core DI',
   },
 
-  providers: [
-    DIService,
-  ],
+  providers: [DIService],
 };
diff --git a/webapp/packages/core-di/src/tests/app-init/TestBootstrap.ts b/webapp/packages/core-di/src/tests/app-init/TestBootstrap.ts
index c33b5e8c9c..099efcb79b 100644
--- a/webapp/packages/core-di/src/tests/app-init/TestBootstrap.ts
+++ b/webapp/packages/core-di/src/tests/app-init/TestBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap } from '../../Bootstrap';
 import { injectable } from '../../injectable';
 import { TestService } from './TestService';
@@ -16,9 +15,7 @@ export class TestBootstrap extends Bootstrap {
   registered: boolean;
   sum: number;
 
-  constructor(
-    readonly testService: TestService
-  ) {
+  constructor(readonly testService: TestService) {
     super();
     this.loaded = false;
     this.registered = false;
@@ -38,5 +35,4 @@ export class TestBootstrap extends Bootstrap {
       }, 5);
     });
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-di/src/tests/app-init/TestService.ts b/webapp/packages/core-di/src/tests/app-init/TestService.ts
index 94df8e6164..e581a7f3c6 100644
--- a/webapp/packages/core-di/src/tests/app-init/TestService.ts
+++ b/webapp/packages/core-di/src/tests/app-init/TestService.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '../../injectable';
 
 @injectable()
 export class TestService {
-  sum(a:number, b:number): number {
+  sum(a: number, b: number): number {
     return a + b;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-di/src/tests/app-init/app-init.test.ts b/webapp/packages/core-di/src/tests/app-init/app-init.test.ts
index c67bae0853..0077b0a597 100644
--- a/webapp/packages/core-di/src/tests/app-init/app-init.test.ts
+++ b/webapp/packages/core-di/src/tests/app-init/app-init.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { App } from '../../App';
 import { manifest } from './manifest';
 import { TestBootstrap } from './TestBootstrap';
@@ -34,5 +33,4 @@ test('App Initialization', async () => {
   await (app as any).loadServices();
   expect(bootstrap.loaded).toBe(true);
   expect(bootstrap.sum).toBe(3);
-
 });
diff --git a/webapp/packages/core-di/src/tests/app-init/manifest.ts b/webapp/packages/core-di/src/tests/app-init/manifest.ts
index bb1464751d..8ccecdd0a0 100644
--- a/webapp/packages/core-di/src/tests/app-init/manifest.ts
+++ b/webapp/packages/core-di/src/tests/app-init/manifest.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { PluginManifest } from '../../PluginManifest';
 import { TestBootstrap } from './TestBootstrap';
 import { TestService } from './TestService';
@@ -14,8 +13,5 @@ export const manifest: PluginManifest = {
   info: {
     name: 'Sample Manifest',
   },
-  providers: [
-    TestService,
-    TestBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [TestService, TestBootstrap],
+};
diff --git a/webapp/packages/core-di/src/useController.ts b/webapp/packages/core-di/src/useController.ts
index 4a34fbb8c7..0927c1b586 100644
--- a/webapp/packages/core-di/src/useController.ts
+++ b/webapp/packages/core-di/src/useController.ts
@@ -5,20 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import {
-  useContext, useEffect, useRef, useMemo
-} from 'react';
+import { useContext, useEffect, useMemo, useRef } from 'react';
 
 import { appContext } from './AppContext';
-import type {
-  IServiceConstructor, IInitializableController, IDestructibleController, ExtractInitArgs
-} from './IApp';
+import type { ExtractInitArgs, IDestructibleController, IInitializableController, IServiceConstructor } from './IApp';
 
-export function useController<T extends IInitializableController>(
-  ctor: IServiceConstructor<T>,
-  ...args: ExtractInitArgs<T>
-): T;
+export function useController<T extends IInitializableController>(ctor: IServiceConstructor<T>, ...args: ExtractInitArgs<T>): T;
 export function useController<T>(ctor: IServiceConstructor<T>): T;
 export function useController<T>(ctor: IServiceConstructor<T>, ...args: any[]): T {
   const app = useContext(appContext);
@@ -39,11 +31,14 @@ export function useController<T>(ctor: IServiceConstructor<T>, ...args: any[]):
   /* we put dynamic array length as the dependency because of preact bug,
      otherwise useMemo will not be triggered on array change */
 
-  useEffect(() => () => {
-    if (isDestructibleController(controllerRef.current)) {
-      controllerRef.current.destruct();
-    }
-  }, []);
+  useEffect(
+    () => () => {
+      if (isDestructibleController(controllerRef.current)) {
+        controllerRef.current.destruct();
+      }
+    },
+    [],
+  );
 
   return controllerRef.current!;
 }
diff --git a/webapp/packages/core-di/src/useService.ts b/webapp/packages/core-di/src/useService.ts
index c2e7c9fd68..f803030053 100644
--- a/webapp/packages/core-di/src/useService.ts
+++ b/webapp/packages/core-di/src/useService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import { appContext } from './AppContext';
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogBody.tsx b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogBody.tsx
index c8dcfb1b5b..178275a055 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogBody.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogBody.tsx
@@ -5,7 +5,6 @@
  * 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, { use } from 'reshadow';
 
@@ -23,22 +22,13 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const CommonDialogBody = observer<Props>(function CommonDialogBody({
-  noBodyPadding,
-  noOverflow,
-  className,
-  children,
-  style,
-}) {
-
+export const CommonDialogBody = observer<Props>(function CommonDialogBody({ noBodyPadding, noOverflow, className, children, style }) {
   return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(
     <dialog-body className={className} {...use({ 'no-padding': noBodyPadding, 'no-overflow': noOverflow })}>
       <dialog-body-overflow-box>
-        <dialog-body-content>
-          {children}
-        </dialog-body-content>
+        <dialog-body-content>{children}</dialog-body-content>
         {!noOverflow && <dialog-body-overflow />}
       </dialog-body-overflow-box>
-    </dialog-body>
+    </dialog-body>,
   );
 });
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogFooter.tsx b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogFooter.tsx
index 8398dd832e..ca7c9a0cd0 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogFooter.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogFooter.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -21,14 +20,6 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const CommonDialogFooter = observer<Props>(function CommonDialogFooter({
-  children,
-  className,
-  style,
-}) {
-  return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(
-    <footer className={className}>
-      {children}
-    </footer>
-  );
+export const CommonDialogFooter = observer<Props>(function CommonDialogFooter({ children, className, style }) {
+  return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(<footer className={className}>{children}</footer>);
 });
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogHeader.tsx b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogHeader.tsx
index bbdc43f77d..cd537bdcc9 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogHeader.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogHeader.tsx
@@ -5,11 +5,10 @@
  * 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, { use } from 'reshadow';
 
-import { Icon, IconOrImage, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Icon, IconOrImage, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { dialogStyles } from '../styles';
@@ -40,9 +39,7 @@ export const CommonDialogHeader = observer<Props>(function CommonDialogHeader({
 
   return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(
     <header className={className}>
-      <icon-container>
-        {icon && <IconOrImage {...use({ bigIcon })} icon={icon} viewBox={viewBox} />}
-      </icon-container>
+      <icon-container>{icon && <IconOrImage {...use({ bigIcon })} icon={icon} viewBox={viewBox} />}</icon-container>
       <header-title>
         <h3>{translate(title)}</h3>
         {onReject && (
@@ -52,6 +49,6 @@ export const CommonDialogHeader = observer<Props>(function CommonDialogHeader({
         )}
       </header-title>
       {subTitle && <sub-title>{typeof subTitle === 'string' ? translate(subTitle) : subTitle}</sub-title>}
-    </header>
+    </header>,
   );
 });
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
index 8e2ae9f551..194f3ec171 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
@@ -5,13 +5,12 @@
  * 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 { forwardRef, useContext, useEffect } from 'react';
 import { Dialog, useDialogState } from 'reakit/Dialog';
 import styled, { use } from 'reshadow';
 
-import { useStyles, Loader } from '@cloudbeaver/core-blocks';
+import { Loader, useStyles } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { DialogContext } from '../DialogContext';
@@ -28,38 +27,23 @@ export interface CommonDialogWrapperProps {
   style?: ComponentStyle;
 }
 
-export const CommonDialogWrapper = observer<CommonDialogWrapperProps, HTMLDivElement>(forwardRef(function CommonDialogWrapper({
-  size = 'medium',
-  fixedSize,
-  fixedWidth,
-  'aria-label': ariaLabel,
-  className,
-  children,
-  style,
-}, ref) {
-  const context = useContext(DialogContext);
-  const dialogState = useDialogState({ visible: true });
+export const CommonDialogWrapper = observer<CommonDialogWrapperProps, HTMLDivElement>(
+  forwardRef(function CommonDialogWrapper({ size = 'medium', fixedSize, fixedWidth, 'aria-label': ariaLabel, className, children, style }, ref) {
+    const context = useContext(DialogContext);
+    const dialogState = useDialogState({ visible: true });
 
-  useEffect(() => {
-    if (!dialogState.visible && !context.dialog.options?.persistent) {
-      context.reject();
-    }
-  });
+    useEffect(() => {
+      if (!dialogState.visible && !context.dialog.options?.persistent) {
+        context.reject();
+      }
+    });
 
-  return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(
-    <Dialog
-      {...dialogState}
-      ref={ref}
-      aria-label={ariaLabel}
-      visible={context.visible}
-      hideOnClickOutside={false}
-      modal={false}
-    >
-      <dialog className={className} {...use({ size, fixedSize, fixedWidth })}>
-        <Loader suspense>
-          {children}
-        </Loader>
-      </dialog>
-    </Dialog>
-  );
-}));
+    return styled(useStyles(commonDialogThemeStyle, commonDialogBaseStyle, dialogStyles, style))(
+      <Dialog {...dialogState} ref={ref} aria-label={ariaLabel} visible={context.visible} hideOnClickOutside={false} modal={false}>
+        <dialog className={className} {...use({ size, fixedSize, fixedWidth })}>
+          <Loader suspense>{children}</Loader>
+        </dialog>
+      </Dialog>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/styles.ts b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/styles.ts
index e3329803c9..4a6f3cc023 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/styles.ts
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/styles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 import type { ThemeSelector } from '@cloudbeaver/core-theming';
@@ -26,180 +25,186 @@ export const commonDialogThemeStyle: ThemeSelector = async theme => {
 };
 
 export const commonDialogContainerStyles = css`
-  error, dialog {
+  error,
+  dialog {
     composes: theme-background-surface theme-text-on-surface theme-elevation-z10 from global;
     border-radius: 0.25rem;
   }
 `;
 
-export const commonDialogBaseStyle = [commonDialogContainerStyles, css`
-  dialog {
-    display: flex;
-    flex-direction: column;
-    position: relative;
-    overflow: hidden;
-    margin: 0;
-    border: none;
-    height: auto;
-    max-height: 100%;
-    max-width: 748px;
-    padding: 0px;
-    
-    &[|size=small] {
-      min-width: 404px;
-      min-height: 262px;
-      max-height: max(100vh - 48px, 262px);
-      
-      &[|fixedSize] {
-        width: 404px;
-        height: 262px;
-      }
-      &[|fixedWidth] {
-        width: 404px;
-      }
-    }
-    &[|size=medium] {
-      min-width: 576px;
-      min-height: 374px;
-      max-height: max(100vh - 48px, 374px);
-      
-      &[|fixedSize] {
-        width: 576px;
-        height: 374px;
-      }
-      &[|fixedWidth] {
-        width: 576px;
-      }
-    }
-    &[|size=large] {
-      min-width: 720px;
-      min-height: 468px;
-      max-height: max(100vh - 48px, 468px);
-      
-      &[|fixedSize] {
-        width: 720px;
-        height: 468px;
-      }
-      &[|fixedWidth] {
-        width: 720px;
-      }
-    }
-  }
-  header, dialog-body, footer {
-    flex-shrink: 0;
-    padding: 24px;
-    
-    &[|no-padding] {
+export const commonDialogBaseStyle = [
+  commonDialogContainerStyles,
+  css`
+    dialog {
+      display: flex;
+      flex-direction: column;
+      position: relative;
+      overflow: hidden;
+      margin: 0;
+      border: none;
+      height: auto;
+      max-height: 100%;
+      max-width: 748px;
       padding: 0px;
+
+      &[|size='small'] {
+        min-width: 404px;
+        min-height: 262px;
+        max-height: max(100vh - 48px, 262px);
+
+        &[|fixedSize] {
+          width: 404px;
+          height: 262px;
+        }
+        &[|fixedWidth] {
+          width: 404px;
+        }
+      }
+      &[|size='medium'] {
+        min-width: 576px;
+        min-height: 374px;
+        max-height: max(100vh - 48px, 374px);
+
+        &[|fixedSize] {
+          width: 576px;
+          height: 374px;
+        }
+        &[|fixedWidth] {
+          width: 576px;
+        }
+      }
+      &[|size='large'] {
+        min-width: 720px;
+        min-height: 468px;
+        max-height: max(100vh - 48px, 468px);
+
+        &[|fixedSize] {
+          width: 720px;
+          height: 468px;
+        }
+        &[|fixedWidth] {
+          width: 720px;
+        }
+      }
     }
-  }
-  dialog-body {
-    padding-top: 0px;
-    padding-right: 0px;
-  }
-  footer {
-    padding-top: 0px;
-  }
-  header {
-    position: relative;
-    display: grid;
-    grid-template-columns: max-content 1fr;
-  }
-  header-title {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-    min-height: 24px;
-    overflow: hidden;
-  }
-  icon-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  IconOrImage {
-    width: 24px;
-    height: 24px;
-    margin-right: 16px;
-    &[|bigIcon] {
-      width: 40px;
-      height: 40px;
+    header,
+    dialog-body,
+    footer {
+      flex-shrink: 0;
+      padding: 24px;
+
+      &[|no-padding] {
+        padding: 0px;
+      }
     }
-  }
-  dialog-body {
-    flex: 1;
-    box-sizing: content-box;
-    display: flex;
-    max-height: 100%;
-    overflow: auto;
-  }
-  dialog-body-overflow-box {
-    position: relative;
-    flex: 1;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-    word-break: break-word;
-    white-space: pre-wrap;
-    padding-right: 24px;
-  }
-  dialog-body-content {
-    flex: 1;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-  }
-  Loader {
-    height: 100%;
-  }
-  dialog-body[|no-padding] + footer {
-    padding-top: 24px;
-  }
-  dialog-body[|no-padding] dialog-body-overflow-box {
-    padding-right: 0;
-  }
-  dialog-body[|no-overflow] dialog-body-content {
-    overflow: auto;
-  }
-  dialog-body-overflow {
-    composes: branding-overflow from global;
-    position: sticky;
-    bottom: 0;
-    left: 0;
-    flex-shrink: 0;
-    width: 100%;
-    height: 24px;
-    pointer-events: none;
-  }
-  h3 {
-    margin: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  sub-title {
-    composes: theme-typography--caption from global;
-    grid-column: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  reject {
-    cursor: pointer;
-    width: 18px;
-    height: 18px;
-    flex-shrink: 0;
-  }
-  footer {
-    display: flex;
-    z-index: 0;
-    box-sizing: border-box;
-    
-    &:empty {
-      display: none;
+    dialog-body {
+      padding-top: 0px;
+      padding-right: 0px;
     }
-  }
-`];
+    footer {
+      padding-top: 0px;
+    }
+    header {
+      position: relative;
+      display: grid;
+      grid-template-columns: max-content 1fr;
+    }
+    header-title {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      position: relative;
+      min-height: 24px;
+      overflow: hidden;
+    }
+    icon-container {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    IconOrImage {
+      width: 24px;
+      height: 24px;
+      margin-right: 16px;
+      &[|bigIcon] {
+        width: 40px;
+        height: 40px;
+      }
+    }
+    dialog-body {
+      flex: 1;
+      box-sizing: content-box;
+      display: flex;
+      max-height: 100%;
+      overflow: auto;
+    }
+    dialog-body-overflow-box {
+      position: relative;
+      flex: 1;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: column;
+      overflow: auto;
+      word-break: break-word;
+      white-space: pre-wrap;
+      padding-right: 24px;
+    }
+    dialog-body-content {
+      flex: 1;
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      box-sizing: border-box;
+    }
+    Loader {
+      height: 100%;
+    }
+    dialog-body[|no-padding] + footer {
+      padding-top: 24px;
+    }
+    dialog-body[|no-padding] dialog-body-overflow-box {
+      padding-right: 0;
+    }
+    dialog-body[|no-overflow] dialog-body-content {
+      overflow: auto;
+    }
+    dialog-body-overflow {
+      composes: branding-overflow from global;
+      position: sticky;
+      bottom: 0;
+      left: 0;
+      flex-shrink: 0;
+      width: 100%;
+      height: 24px;
+      pointer-events: none;
+    }
+    h3 {
+      margin: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    sub-title {
+      composes: theme-typography--caption from global;
+      grid-column: 2;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    reject {
+      cursor: pointer;
+      width: 18px;
+      height: 18px;
+      flex-shrink: 0;
+    }
+    footer {
+      display: flex;
+      z-index: 0;
+      box-sizing: border-box;
+
+      &:empty {
+        display: none;
+      }
+    }
+  `,
+];
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
index 30a44889cc..277d52945d 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable, runInAction } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -24,13 +23,11 @@ export interface DialogComponentProps<TPayload, TResult = DialogueStateResult> {
   className?: string;
 }
 
-export type DialogComponent<TPayload, TResult = DialogueStateResult> = React.FC<
-DialogComponentProps<TPayload, TResult>
->;
+export type DialogComponent<TPayload, TResult = DialogueStateResult> = React.FC<DialogComponentProps<TPayload, TResult>>;
 
 export enum DialogueStateResult {
   Resolved,
-  Rejected
+  Rejected,
 }
 
 export interface DialogInternal<TResult> {
@@ -50,7 +47,7 @@ export class CommonDialogService {
   open<TPayload, TResult>(
     component: DialogComponent<TPayload, TResult>,
     payload: TPayload,
-    options?: DialogOptions
+    options?: DialogOptions,
   ): Promise<TResult | DialogueStateResult> {
     let _resolve: (value: TResult | DialogueStateResult) => void;
     let _reject: (reason?: any) => void;
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialog.tsx b/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialog.tsx
index 4c71635bed..1db91e26ca 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialog.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialog.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Button, Translate, useFocus, useStyles } from '@cloudbeaver/core-blocks';
@@ -51,44 +50,25 @@ export const ConfirmationDialog: DialogComponent<ConfirmationDialogPayload, Dial
   const { icon, title, subTitle, bigIcon, viewBox, message, confirmActionText, cancelActionText } = payload;
 
   return styled(useStyles(style))(
-    <CommonDialogWrapper ref={focusedRef} size='small' className={className} fixedWidth>
-      <CommonDialogHeader
-        title={title}
-        subTitle={subTitle}
-        icon={icon}
-        viewBox={viewBox}
-        bigIcon={bigIcon}
-        onReject={rejectDialog}
-      />
+    <CommonDialogWrapper ref={focusedRef} size="small" className={className} fixedWidth>
+      <CommonDialogHeader title={title} subTitle={subTitle} icon={icon} viewBox={viewBox} bigIcon={bigIcon} onReject={rejectDialog} />
       <CommonDialogBody>
         <Translate token={message} />
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['outlined']}
-          onClick={rejectDialog}
-        >
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
           <Translate token={cancelActionText || 'ui_processing_cancel'} />
         </Button>
         <fill />
         {payload.extraStatus !== undefined && (
-          <Button
-            type="button"
-            mod={['outlined']}
-            onClick={() => resolveDialog(payload.extraStatus)}
-          >
+          <Button type="button" mod={['outlined']} onClick={() => resolveDialog(payload.extraStatus)}>
             <Translate token={cancelActionText || 'ui_no'} />
           </Button>
         )}
-        <Button
-          type="button"
-          mod={['unelevated']}
-          onClick={() => resolveDialog()}
-        >
+        <Button type="button" mod={['unelevated']} onClick={() => resolveDialog()}>
           <Translate token={confirmActionText || 'ui_processing_ok'} />
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 };
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialogDelete.tsx b/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialogDelete.tsx
index 7f7159edd8..bdc781d486 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialogDelete.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/ConfirmationDialogDelete.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DialogComponent, DialogueStateResult } from '../CommonDialog/CommonDialogService';
 import { ConfirmationDialog } from '../CommonDialog/ConfirmationDialog';
 import type { ConfirmationDialogPayload } from '../CommonDialog/ConfirmationDialog';
@@ -14,10 +13,5 @@ export const ConfirmationDialogDelete: DialogComponent<ConfirmationDialogPayload
   payload,
   ...rest
 }) {
-  return (
-    <ConfirmationDialog
-      payload={{ ...payload, icon: '/icons/error_icon.svg', bigIcon: true }}
-      {...rest}
-    />
-  );
+  return <ConfirmationDialog payload={{ ...payload, icon: '/icons/error_icon.svg', bigIcon: true }} {...rest} />;
 };
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/DialogContext.ts b/webapp/packages/core-dialogs/src/CommonDialog/DialogContext.ts
index be26f531c6..15c197859e 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/DialogContext.ts
+++ b/webapp/packages/core-dialogs/src/CommonDialog/DialogContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { DialogInternal } from './CommonDialogService';
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx b/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
index 8292b7b977..53adecf4ae 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
@@ -5,7 +5,6 @@
  * 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 { useLayoutEffect, useMemo, useRef } from 'react';
 import { DialogBackdrop } from 'reakit/Dialog';
@@ -14,7 +13,6 @@ import styled from 'reshadow';
 import { ErrorBoundary, Loader, useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { commonDialogContainerStyles } from './CommonDialog/styles';
 import { CommonDialogService, DialogInternal } from './CommonDialogService';
 import { DialogContext, IDialogContext } from './DialogContext';
@@ -31,30 +29,34 @@ export const DialogsPortal = observer(function DialogsPortal() {
     activeDialog = commonDialogService.dialogs[commonDialogService.dialogs.length - 1];
   }
 
-  const state = useObjectRef(() => ({
-    reject() {
-      if (this.dialog) {
-        commonDialogService.rejectDialog(this.dialog.promise);
-      }
-    },
-    resolve(result: any) {
-      if (this.dialog) {
-        commonDialogService.resolveDialog(this.dialog.promise, result);
-      }
-    },
-    backdropClick(e: React.MouseEvent<HTMLDivElement>) {
-      if (e.target !== e.currentTarget) {
-        return;
-      }
+  const state = useObjectRef(
+    () => ({
+      reject() {
+        if (this.dialog) {
+          commonDialogService.rejectDialog(this.dialog.promise);
+        }
+      },
+      resolve(result: any) {
+        if (this.dialog) {
+          commonDialogService.resolveDialog(this.dialog.promise, result);
+        }
+      },
+      backdropClick(e: React.MouseEvent<HTMLDivElement>) {
+        if (e.target !== e.currentTarget) {
+          return;
+        }
 
-      e.preventDefault(); // prevent focus loss
-      if (!this.dialog?.options?.persistent && e.currentTarget.isEqualNode(e.target as HTMLElement)) {
-        this.reject();
-      }
+        e.preventDefault(); // prevent focus loss
+        if (!this.dialog?.options?.persistent && e.currentTarget.isEqualNode(e.target as HTMLElement)) {
+          this.reject();
+        }
+      },
+    }),
+    {
+      dialog: activeDialog,
     },
-  }), {
-    dialog: activeDialog,
-  }, ['reject', 'resolve', 'backdropClick']);
+    ['reject', 'resolve', 'backdropClick'],
+  );
 
   useMemo(() => {
     if (!activeDialog) {
@@ -84,12 +86,7 @@ export const DialogsPortal = observer(function DialogsPortal() {
       <DialogBackdrop visible={!!activeDialog} onMouseDown={state.backdropClick}>
         <inner-box>
           {commonDialogService.dialogs.map((dialog, i, arr) => (
-            <ErrorBoundary
-              key={dialog.id}
-              styles={commonDialogContainerStyles}
-              remount
-              onClose={state.reject}
-            >
+            <ErrorBoundary key={dialog.id} styles={commonDialogContainerStyles} remount onClose={state.reject}>
               <NestedDialog
                 key={dialog.id}
                 visible={i === arr.length - 1}
@@ -101,7 +98,7 @@ export const DialogsPortal = observer(function DialogsPortal() {
           ))}
         </inner-box>
       </DialogBackdrop>
-    </Loader>
+    </Loader>,
   );
 });
 
@@ -112,19 +109,17 @@ interface NestedDialogType {
   visible: boolean;
 }
 
-const NestedDialog: React.FC<NestedDialogType> = function NestedDialog({
-  dialog,
-  resolveDialog,
-  rejectDialog,
-  visible,
-}) {
+const NestedDialog: React.FC<NestedDialogType> = function NestedDialog({ dialog, resolveDialog, rejectDialog, visible }) {
   const DialogComponent = dialog.component;
 
-  const context = useMemo<IDialogContext>(() => ({
-    dialog,
-    visible,
-    reject: rejectDialog,
-  }), [dialog, visible, rejectDialog]);
+  const context = useMemo<IDialogContext>(
+    () => ({
+      dialog,
+      visible,
+      reject: rejectDialog,
+    }),
+    [dialog, visible, rejectDialog],
+  );
 
   return (
     <DialogContext.Provider value={context}>
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx b/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
index c63f205e9f..3ed8a38665 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
@@ -5,13 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Button, Container, InputField, SubmittingForm, useFocus, useObservableRef, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  Button,
+  Container,
+  InputField,
+  SubmittingForm,
+  useFocus,
+  useObservableRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { throttleAsync } from '@cloudbeaver/core-utils';
 
 import { CommonDialogBody } from './CommonDialog/CommonDialogBody';
@@ -74,27 +83,28 @@ export const RenameDialog: DialogComponent<RenameDialogPayload, string> = observ
     title += ` ${translate(objectName)}`;
   }
 
-  const state = useObservableRef<IRenameDialogState>(() => ({
-    value,
-    message: undefined,
-    valid: true,
-    validate: throttleAsync(async () => {
-      state.message = undefined;
-      state.valid = (await state.payload.validation?.(
-        state.value,
-        state.setMessage.bind(state)
-      )) ?? true;
-    }, 300),
-    setMessage(message) {
-      this.message = message;
+  const state = useObservableRef<IRenameDialogState>(
+    () => ({
+      value,
+      message: undefined,
+      valid: true,
+      validate: throttleAsync(async () => {
+        state.message = undefined;
+        state.valid = (await state.payload.validation?.(state.value, state.setMessage.bind(state))) ?? true;
+      }, 300),
+      setMessage(message) {
+        this.message = message;
+      },
+    }),
+    {
+      value: observable.ref,
+      valid: observable.ref,
+      message: observable.ref,
     },
-  }), {
-    value: observable.ref,
-    valid: observable.ref,
-    message: observable.ref,
-  }, {
-    payload,
-  });
+    {
+      payload,
+    },
+  );
 
   useEffect(() => {
     state.validate();
@@ -103,48 +113,26 @@ export const RenameDialog: DialogComponent<RenameDialogPayload, string> = observ
   const errorMessage = state.valid ? ' ' : translate(state.message ?? 'ui_rename_taken_or_invalid');
 
   return styled(useStyles(style, BASE_CONTAINERS_STYLES))(
-    <CommonDialogWrapper size='small' className={className} fixedWidth>
-      <CommonDialogHeader
-        title={title}
-        subTitle={subTitle}
-        icon={icon}
-        viewBox={viewBox}
-        bigIcon={bigIcon}
-        onReject={rejectDialog}
-      />
+    <CommonDialogWrapper size="small" className={className} fixedWidth>
+      <CommonDialogHeader title={title} subTitle={subTitle} icon={icon} viewBox={viewBox} bigIcon={bigIcon} onReject={rejectDialog} />
       <CommonDialogBody>
         <SubmittingForm ref={focusedRef} onSubmit={() => resolveDialog(state.value)}>
           <Container center>
-            <InputField
-              name='value'
-              state={state}
-              error={!state.valid}
-              description={errorMessage}
-              onChange={() => state.validate()}
-            >
+            <InputField name="value" state={state} error={!state.valid} description={errorMessage} onChange={() => state.validate()}>
               {translate('ui_name') + ':'}
             </InputField>
           </Container>
         </SubmittingForm>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['outlined']}
-          onClick={rejectDialog}
-        >
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
           {translate('ui_processing_cancel')}
         </Button>
         <fill />
-        <Button
-          type="button"
-          mod={['unelevated']}
-          disabled={!state.valid}
-          onClick={() => resolveDialog(state.value)}
-        >
+        <Button type="button" mod={['unelevated']} disabled={!state.valid} onClick={() => resolveDialog(state.value)}>
           {translate(confirmActionText || (create ? 'ui_create' : 'ui_rename'))}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/styles.ts b/webapp/packages/core-dialogs/src/CommonDialog/styles.ts
index 69de67f1c9..4e02b53727 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/styles.ts
+++ b/webapp/packages/core-dialogs/src/CommonDialog/styles.ts
@@ -5,40 +5,39 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const dialogStyles = css`
-    DialogBackdrop {
-      box-sizing: border-box;
-      background-color: rgba(0,0,0,0.48);
-      /*backdrop-filter: blur(4px);
+  DialogBackdrop {
+    box-sizing: border-box;
+    background-color: rgba(0, 0, 0, 0.48);
+    /*backdrop-filter: blur(4px);
       background-color: rgba(221, 221, 221, 0.25);*/
-      position: fixed;
-      top: 0px;
-      right: 0px;
-      bottom: 0px;
-      left: 0px;
-      z-index: 999;
-      display: flex;
-      overflow: auto;
-    }
+    position: fixed;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+    z-index: 999;
+    display: flex;
+    overflow: auto;
+  }
 
-    inner-box {
-      display: flex;
-      margin: auto;
-      padding: 24px;
-      flex-direction: column;
-      align-items: center;
-      
-      & > :not(:last-child) {
-        display: none;
-      }
-    }
+  inner-box {
+    display: flex;
+    margin: auto;
+    padding: 24px;
+    flex-direction: column;
+    align-items: center;
 
-    Dialog {
-      box-sizing: border-box;
-      display: flex;
-      outline: none;
+    & > :not(:last-child) {
+      display: none;
     }
-  `;
+  }
+
+  Dialog {
+    box-sizing: border-box;
+    display: flex;
+    outline: none;
+  }
+`;
diff --git a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
index 8498ba9d6e..4dc08de783 100644
--- a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
+++ b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import { uuid } from '@cloudbeaver/core-utils';
 
@@ -41,10 +40,7 @@ export class ContextMenu {
     return this.constructMenuPanelWithContext(panelId, context);
   }
 
-  private constructMenuItemWithContext<T>(
-    params: IContextMenuItem<T>,
-    context: IMenuContext<T>
-  ): ComputedMenuItemModel {
+  private constructMenuItemWithContext<T>(params: IContextMenuItem<T>, context: IMenuContext<T>): ComputedMenuItemModel {
     // depends on context
     const modelOptions = new ComputedMenuItemOptionsWithContext(params, context);
     const model = new ComputedMenuItemModel(modelOptions);
@@ -53,30 +49,20 @@ export class ContextMenu {
       model.panel = this.constructMenuPanelWithContext<T>(params.id, context);
     } else if (params.panel instanceof ComputedContextMenuModel) {
       const basePanel = params.panel;
-      model.panel = new ContextMenuPanel(
-        `${params.panel.id}-${context.contextId!}-panel`,
-        () => this.constructMenuItems(basePanel.options.menuItemsGetter(context), context),
+      model.panel = new ContextMenuPanel(`${params.panel.id}-${context.contextId!}-panel`, () =>
+        this.constructMenuItems(basePanel.options.menuItemsGetter(context), context),
       );
     }
 
     return model;
   }
 
-  private constructMenuPanelWithContext<T>(
-    panelId: string,
-    context: IMenuContext<T>
-  ): IMenuPanel {
+  private constructMenuPanelWithContext<T>(panelId: string, context: IMenuContext<T>): IMenuPanel {
     const panel = this.menuStore.getPanel(panelId);
-    return new ContextMenuPanel(
-      `${panelId}-${context.contextId!}-panel`,
-      () => this.constructMenuItems(panel.menuItems.values, context)
-    );
+    return new ContextMenuPanel(`${panelId}-${context.contextId!}-panel`, () => this.constructMenuItems(panel.menuItems.values, context));
   }
 
-  private constructMenuItems<T>(
-    menuItems: Array<IContextMenuItem<any>>,
-    context: IMenuContext<T>
-  ): ComputedMenuItemModel[] {
+  private constructMenuItems<T>(menuItems: Array<IContextMenuItem<any>>, context: IMenuContext<T>): ComputedMenuItemModel[] {
     return menuItems
       .filter(item => item.isPresent(context)) // show menu items based on context
       .map(item => this.constructMenuItemWithContext(item, context));
@@ -107,8 +93,7 @@ class ComputedMenuItemOptionsWithContext<T> implements IComputedMenuItemOptions
   keepMenuOpen?: boolean;
   iconGetter?: () => string | undefined;
 
-  constructor(private readonly options: IContextMenuItem<T>,
-    private readonly context: IMenuContext<T>) {
+  constructor(private readonly options: IContextMenuItem<T>, private readonly context: IMenuContext<T>) {
     // doesn't depend on context
     this.title = options.title;
     this.tooltip = options.tooltip;
@@ -158,7 +143,5 @@ class ContextMenuPanel implements IMenuPanel {
 
   private items?: ComputedMenuItemModel[];
 
-  constructor(public id: string,
-    private readonly itemsGetter: () => ComputedMenuItemModel[]) {
-  }
+  constructor(public id: string, private readonly itemsGetter: () => ComputedMenuItemModel[]) {}
 }
diff --git a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenuService.ts b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenuService.ts
index 1ec043b14f..cb31faaa10 100644
--- a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenuService.ts
+++ b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenuService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import type { IMenuPanel } from '../IMenuPanel';
diff --git a/webapp/packages/core-dialogs/src/Menu/ContextMenu/IContextMenuItem.ts b/webapp/packages/core-dialogs/src/Menu/ContextMenu/IContextMenuItem.ts
index 94449532ff..1f64b1b431 100644
--- a/webapp/packages/core-dialogs/src/Menu/ContextMenu/IContextMenuItem.ts
+++ b/webapp/packages/core-dialogs/src/Menu/ContextMenu/IContextMenuItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 
 import type { IMenuItemOptions } from '../models/MenuOptionsStore';
diff --git a/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts b/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts
index 22bf25c61b..c46a97aae2 100644
--- a/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts
+++ b/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 
 import type { MenuItemType } from './models/MenuOptionsStore';
diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx
index 67545c61b5..5ce04d7bc5 100644
--- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx
+++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx
@@ -5,11 +5,10 @@
  * 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, { use } from 'reshadow';
 
-import { Checkbox, Icon, IconOrImage, Loader, Radio, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Checkbox, Icon, IconOrImage, Loader, Radio, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import type { IMenuItem } from '../IMenuPanel';
@@ -20,10 +19,7 @@ interface MenuPanelItemProps {
   style?: ComponentStyle;
 }
 
-export const MenuPanelItem = observer<MenuPanelItemProps>(function MenuPanelItem({
-  menuItem,
-  style = [],
-}) {
+export const MenuPanelItem = observer<MenuPanelItemProps>(function MenuPanelItem({ menuItem, style = [] }) {
   const translate = useTranslate();
 
   const title = translate(menuItem.title);
@@ -37,20 +33,11 @@ export const MenuPanelItem = observer<MenuPanelItemProps>(function MenuPanelItem
 
   return styled(useStyles(menuPanelStyles, style))(
     <menu-panel-item {...use({ separator: menuItem.separator })}>
+      <menu-item-content>{menuItem.icon ? <IconOrImage icon={menuItem.icon} /> : control}</menu-item-content>
+      <menu-item-text title={title}>{title}</menu-item-text>
       <menu-item-content>
-        {menuItem.icon ? (
-          <IconOrImage icon={menuItem.icon} />
-        ) : control}
+        {menuItem.panel && (menuItem.isProcessing ? <Loader small fullSize /> : <Icon name="arrow" viewBox="0 0 16 16" />)}
       </menu-item-content>
-      <menu-item-text title={title}>
-        {title}
-      </menu-item-text>
-      <menu-item-content>
-        {menuItem.panel && (
-          menuItem.isProcessing ? <Loader small fullSize /> : <Icon name="arrow" viewBox="0 0 16 16" />
-        )}
-      </menu-item-content>
-    </menu-panel-item>
-
+    </menu-panel-item>,
   );
 });
diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
index ebecc5cbbc..bb5ec9a03e 100644
--- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
+++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
@@ -5,22 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import React, { ButtonHTMLAttributes, forwardRef, useCallback, useEffect, useMemo } from 'react';
-import {
-  MenuButton, Menu, MenuItem, MenuStateReturn, useMenuState,
-  MenuItemCheckbox, MenuItemRadio, MenuInitialState
-} from 'reakit/Menu';
+import { Menu, MenuButton, MenuInitialState, MenuItem, MenuItemCheckbox, MenuItemRadio, MenuStateReturn, useMenuState } from 'reakit/Menu';
 import styled, { use } from 'reshadow';
 
 import { useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
-import type {
-  IMenuItem, IMenuPanel
-} from '../IMenuPanel';
+import type { IMenuItem, IMenuPanel } from '../IMenuPanel';
 import { MenuPanelItem } from './MenuPanelItem';
 import { menuPanelStyles } from './menuPanelStyles';
 
@@ -51,20 +45,10 @@ interface IMenuTriggerProps extends IMenuTriggerBaseProps {
   getPanel?: () => IMenuPanel;
 }
 
-export const MenuTrigger = React.forwardRef<ButtonHTMLAttributes<any>, IMenuTriggerProps | IMenuTriggerLazyProps>(function MenuTrigger({
-  panel,
-  menuRef,
-  getPanel,
-  disclosure,
-  children,
-  style,
-  placement,
-  visible,
-  onVisibleSwitch,
-  modal,
-  rtl,
-  ...props
-}, ref) {
+export const MenuTrigger = React.forwardRef<ButtonHTMLAttributes<any>, IMenuTriggerProps | IMenuTriggerLazyProps>(function MenuTrigger(
+  { panel, menuRef, getPanel, disclosure, children, style, placement, visible, onVisibleSwitch, modal, rtl, ...props },
+  ref,
+) {
   const propsRef = useObjectRef({ onVisibleSwitch, visible });
   const menu = useMenuState({ modal, placement, visible, rtl });
   const styles = useStyles(menuPanelStyles, style);
@@ -103,7 +87,7 @@ export const MenuTrigger = React.forwardRef<ButtonHTMLAttributes<any>, IMenuTrig
         <box>{children}</box>
       </MenuButton>
       {panel && <MenuPanel panel={panel} menu={menu} style={style} rtl={rtl} onItemClose={handleItemClose} />}
-    </>
+    </>,
   );
 });
 
@@ -120,14 +104,7 @@ interface MenuPanelProps {
   style?: ComponentStyle;
 }
 
-const MenuPanel = observer<MenuPanelProps>(function MenuPanel({
-  panel,
-  menu,
-  panelAvailable,
-  rtl,
-  onItemClose,
-  style,
-}) {
+const MenuPanel = observer<MenuPanelProps>(function MenuPanel({ panel, menu, panelAvailable, rtl, onItemClose, style }) {
   const styles = useStyles(menuPanelStyles, style);
 
   if (!menu.visible) {
@@ -141,7 +118,7 @@ const MenuPanel = observer<MenuPanelProps>(function MenuPanel({
           <MenuPanelElement key={item.id} item={item} menu={menu} style={style} onItemClose={onItemClose} />
         ))}
       </menu-box>
-    </Menu>
+    </Menu>,
   );
 });
 
@@ -156,9 +133,7 @@ interface IMenuPanelElementProps extends Omit<React.ButtonHTMLAttributes<any>, '
   style?: ComponentStyle;
 }
 
-const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElement({
-  item, menu, onItemClose, style,
-}) {
+const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElement({ item, menu, onItemClose, style }) {
   const styles = useStyles(menuPanelStyles, style);
   const onClick = useCallback(() => {
     if (item.onClick) {
@@ -169,9 +144,7 @@ const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElem
     }
   }, [item, menu, onItemClose]);
 
-  const hidden = useMemo(() => computed(
-    () => item.panel?.menuItems.every(item => item.isHidden)
-  ), [item.panel]);
+  const hidden = useMemo(() => computed(() => item.panel?.menuItems.every(item => item.isHidden)), [item.panel]);
 
   if (hidden.get() && item.isPanelAvailable === undefined) {
     return null;
@@ -189,7 +162,7 @@ const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElem
         onItemClose={onItemClose}
         onClick={onClick}
         {...{ as: MenuInnerTrigger }}
-      />
+      />,
     );
   }
 
@@ -206,8 +179,7 @@ const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElem
         onClick={onClick}
       >
         <MenuPanelItem menuItem={item} style={style} />
-      </MenuItemRadio>
-
+      </MenuItemRadio>,
     );
   }
 
@@ -224,20 +196,14 @@ const MenuPanelElement = observer<IMenuPanelElementProps>(function MenuPanelElem
         onClick={onClick}
       >
         <MenuPanelItem menuItem={item} style={style} />
-      </MenuItemCheckbox>
+      </MenuItemCheckbox>,
     );
   }
 
   return styled(styles)(
-    <MenuItem
-      {...menu}
-      {...use({ hidden: item.isHidden })}
-      aria-label={item.id}
-      disabled={item.isDisabled}
-      onClick={onClick}
-    >
+    <MenuItem {...menu} {...use({ hidden: item.isHidden })} aria-label={item.id} disabled={item.isDisabled} onClick={onClick}>
       <MenuPanelItem menuItem={item} style={style} />
-    </MenuItem>
+    </MenuItem>,
   );
 });
 
@@ -251,11 +217,8 @@ interface IMenuInnerTriggerProps extends Omit<React.ButtonHTMLAttributes<any>, '
   style?: ComponentStyle;
 }
 
-export const MenuInnerTrigger = observer<IMenuInnerTriggerProps, HTMLButtonElement>(forwardRef(
-  function MenuInnerTrigger(
-    props,
-    ref
-  ) {
+export const MenuInnerTrigger = observer<IMenuInnerTriggerProps, HTMLButtonElement>(
+  forwardRef(function MenuInnerTrigger(props, ref) {
     const { menuItem, style, onItemClose, ...rest } = props;
     const menu = useMenuState();
 
@@ -277,13 +240,8 @@ export const MenuInnerTrigger = observer<IMenuInnerTriggerProps, HTMLButtonEleme
             </box>
           </MenuButton>
         </menu-panel-button-wrapper>
-        <MenuPanel
-          panel={menuItem.panel!}
-          menu={menu}
-          style={style}
-          panelAvailable={menuItem.isPanelAvailable}
-          onItemClose={handleItemClose}
-        />
-      </>
+        <MenuPanel panel={menuItem.panel!} menu={menu} style={style} panelAvailable={menuItem.isPanelAvailable} onItemClose={handleItemClose} />
+      </>,
     );
-  }));
+  }),
+);
diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/menuPanelStyles.ts b/webapp/packages/core-dialogs/src/Menu/MenuPanel/menuPanelStyles.ts
index 14c255266b..55f23094e4 100644
--- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/menuPanelStyles.ts
+++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/menuPanelStyles.ts
@@ -5,113 +5,116 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const menuPanelStyles = css`
-    menu-box {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    MenuItem,
-    MenuItemCheckbox,
-    MenuItemRadio,
-    MenuButton {
-      composes: theme-ripple from global;
-    }
-    MenuItemElement {
-      composes: theme-ripple from global;
-    }
-    menu-panel-item {
-      composes: theme-border-color-background from global;
-    }
-    MenuButton {
-      background: none;
-      border: none;
-      outline: none !important;
-      color: inherit;
-      cursor: pointer;
-      & box {
-        display: flex;
-        align-items: center;
-        flex: 1;
-        height: inherit;
-      }
-    }
-    Menu {
-      outline: none;
-      z-index: 999;
-    }
-    menu-box {
-      composes: theme-typography--body2 theme-elevation-z5 from global;
-      min-width: 140px;
-      padding: 12px 0;
-
-      & menu-box {
-        margin-top: -12px;
-      }
-    }
-    menu-box, menu-panel-button-wrapper {
-      display: flex;
-      flex-direction: column;
-    }
-    MenuItem, MenuItemCheckbox, MenuItemRadio {
+  menu-box {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  MenuItem,
+  MenuItemCheckbox,
+  MenuItemRadio,
+  MenuButton {
+    composes: theme-ripple from global;
+  }
+  MenuItemElement {
+    composes: theme-ripple from global;
+  }
+  menu-panel-item {
+    composes: theme-border-color-background from global;
+  }
+  MenuButton {
+    background: none;
+    border: none;
+    outline: none !important;
+    color: inherit;
+    cursor: pointer;
+    & box {
       display: flex;
       align-items: center;
-      border: none;
-      padding: 0;
-      background: none;
-      text-align: left;
-      outline: none;
-      color: inherit;
-      cursor: pointer;
-      white-space: nowrap;
-      
-      &[use|hidden] {
-        display: none;
-      }
-
-      &:hover, &:global([aria-expanded="true"]) {
-        & Icon {
-          opacity: 1;
-        }
-      }
-    }
-
-    menu-panel-item {
       flex: 1;
-      display: flex;
-      align-items: center;
-      height: 30px;
-      padding: 0 4px;
-      &[|separator] {
-        border-bottom: 1px solid;
-      }
-      & menu-item-text  {
-        display: block;
-        padding: 0 4px;
-        flex: 1;
-      }
-      & menu-item-content {
-        width: 24px;
-        height: 24px;
-        overflow: hidden;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
+      height: inherit;
+    }
+  }
+  Menu {
+    outline: none;
+    z-index: 999;
+  }
+  menu-box {
+    composes: theme-typography--body2 theme-elevation-z5 from global;
+    min-width: 140px;
+    padding: 12px 0;
+
+    & menu-box {
+      margin-top: -12px;
+    }
+  }
+  menu-box,
+  menu-panel-button-wrapper {
+    display: flex;
+    flex-direction: column;
+  }
+  MenuItem,
+  MenuItemCheckbox,
+  MenuItemRadio {
+    display: flex;
+    align-items: center;
+    border: none;
+    padding: 0;
+    background: none;
+    text-align: left;
+    outline: none;
+    color: inherit;
+    cursor: pointer;
+    white-space: nowrap;
+
+    &[use|hidden] {
+      display: none;
+    }
+
+    &:hover,
+    &:global([aria-expanded='true']) {
       & Icon {
-        width: 16px;
-        height: 16px;
-        opacity: 0.5;
-        transform: rotate(-90deg);
-      }
-      & IconOrImage {
-        width: 16px;
-        height: 16px;
-        object-fit: contain;
-      }
-      & Loader {
-        width: 16px;
+        opacity: 1;
       }
     }
-  `;
+  }
+
+  menu-panel-item {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    height: 30px;
+    padding: 0 4px;
+    &[|separator] {
+      border-bottom: 1px solid;
+    }
+    & menu-item-text {
+      display: block;
+      padding: 0 4px;
+      flex: 1;
+    }
+    & menu-item-content {
+      width: 24px;
+      height: 24px;
+      overflow: hidden;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    & Icon {
+      width: 16px;
+      height: 16px;
+      opacity: 0.5;
+      transform: rotate(-90deg);
+    }
+    & IconOrImage {
+      width: 16px;
+      height: 16px;
+      object-fit: contain;
+    }
+    & Loader {
+      width: 16px;
+    }
+  }
+`;
diff --git a/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts b/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
index 96deb38981..1f3c7ea4ff 100644
--- a/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
+++ b/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
@@ -5,11 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuPanel } from '../IMenuPanel';
-import {
-  ComputedMenuItemModel, IComputedMenuItemOptions
-} from '../models/ComputedMenuItemModel';
+import { ComputedMenuItemModel, IComputedMenuItemOptions } from '../models/ComputedMenuItemModel';
 import { ComputedMenuPanelModel } from '../models/ComputedMenuPanelModel';
 import { MenuOptionsStore } from '../models/MenuOptionsStore';
 
diff --git a/webapp/packages/core-dialogs/src/Menu/models/ComputedContextMenuModel.ts b/webapp/packages/core-dialogs/src/Menu/models/ComputedContextMenuModel.ts
index d5654060cb..8185dadd6f 100644
--- a/webapp/packages/core-dialogs/src/Menu/models/ComputedContextMenuModel.ts
+++ b/webapp/packages/core-dialogs/src/Menu/models/ComputedContextMenuModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IContextMenuItem } from '../ContextMenu/IContextMenuItem';
 import type { IMenuContext } from '../ContextMenu/IMenuContext';
 import type { IMenuPanel } from '../IMenuPanel';
diff --git a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts
index c03f54207f..3d957825e6 100644
--- a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts
+++ b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
diff --git a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
index ff355f36fd..98f0db8ec6 100644
--- a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
+++ b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import type { IMenuItem, IMenuPanel } from '../IMenuPanel';
diff --git a/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts b/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts
index 315a2a2ad5..8ccd015e49 100644
--- a/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts
+++ b/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import { OrderedMap } from '@cloudbeaver/core-utils';
 
diff --git a/webapp/packages/core-dialogs/src/manifest.ts b/webapp/packages/core-dialogs/src/manifest.ts
index c25e206054..fbdc320d20 100644
--- a/webapp/packages/core-dialogs/src/manifest.ts
+++ b/webapp/packages/core-dialogs/src/manifest.ts
@@ -5,20 +5,15 @@
  * 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 { CommonDialogService } from './CommonDialog/CommonDialogService';
 import { ContextMenuService } from './Menu/ContextMenu/ContextMenuService';
 
-
 export const codeDialogsManifest: PluginManifest = {
   info: {
     name: 'Core Dialogs',
   },
 
-  providers: [
-    CommonDialogService,
-    ContextMenuService,
-  ],
+  providers: [CommonDialogService, ContextMenuService],
 };
diff --git a/webapp/packages/core-events/src/EventContext/EventContext.ts b/webapp/packages/core-events/src/EventContext/EventContext.ts
index 901827cc89..729ac08e14 100644
--- a/webapp/packages/core-events/src/EventContext/EventContext.ts
+++ b/webapp/packages/core-events/src/EventContext/EventContext.ts
@@ -24,24 +24,14 @@ interface IEventWithContext {
 }
 
 interface IEventContext {
-  set: <TEvent, TContext= void>(
-    event: TEvent | IEventWithContext,
-    flag: IEventFlag<TContext>,
-    context?: TContext
-  ) => IEventContext;
-  has: <TEvent>(
-    event: TEvent | IEventWithContext,
-    ...flags: Array<IEventFlag<any>>
-  ) => boolean;
-  get: <TEvent, TContext>(
-    event: TEvent | IEventWithContext,
-    flag: IEventFlag<TContext>
-  ) => TContext | undefined;
+  set: <TEvent, TContext = void>(event: TEvent | IEventWithContext, flag: IEventFlag<TContext>, context?: TContext) => IEventContext;
+  has: <TEvent>(event: TEvent | IEventWithContext, ...flags: Array<IEventFlag<any>>) => boolean;
+  get: <TEvent, TContext>(event: TEvent | IEventWithContext, flag: IEventFlag<TContext>) => TContext | undefined;
   create: <T = void>(name: string) => IEventFlag<T>;
 }
 
 export const EventContext: IEventContext = {
-  set<TEvent, TContext= void>(event: TEvent | IEventWithContext, flag: IEventFlag<TContext>, context: TContext) {
+  set<TEvent, TContext = void>(event: TEvent | IEventWithContext, flag: IEventFlag<TContext>, context: TContext) {
     event = addContextToEvent(event);
 
     const mark = event[eventContext].find(mark => mark.flag === flag);
diff --git a/webapp/packages/core-events/src/EventContext/EventStopPropagationFlag.ts b/webapp/packages/core-events/src/EventContext/EventStopPropagationFlag.ts
index c39d464277..a32fc677c8 100644
--- a/webapp/packages/core-events/src/EventContext/EventStopPropagationFlag.ts
+++ b/webapp/packages/core-events/src/EventContext/EventStopPropagationFlag.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EventContext } from './EventContext';
 
 export const EventStopPropagationFlag = EventContext.create('stopPropagation');
diff --git a/webapp/packages/core-events/src/EventsSettingsService.test.ts b/webapp/packages/core-events/src/EventsSettingsService.test.ts
index a141f4bdad..77d6095c5a 100644
--- a/webapp/packages/core-events/src/EventsSettingsService.test.ts
+++ b/webapp/packages/core-events/src/EventsSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -21,10 +20,7 @@ import { EventsSettings, EventsSettingsService } from './EventsSettingsService';
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -34,7 +30,7 @@ const equalConfig = {
     maxPersistentAllow: 2,
   } as EventsSettings,
   plugin: {
-    'notifications': {
+    notifications: {
       notificationsPool: 1,
       maxPersistentAllow: 2,
     } as EventsSettings,
@@ -45,9 +41,7 @@ test('New settings equal deprecated settings', async () => {
   const settings = app.injector.getServiceByClass(EventsSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
@@ -55,4 +49,4 @@ test('New settings equal deprecated settings', async () => {
   expect(settings.settings.getValue('maxPersistentAllow')).toBe(2);
   expect(settings.deprecatedSettings.getValue('notificationsPool')).toBe(1);
   expect(settings.deprecatedSettings.getValue('maxPersistentAllow')).toBe(2);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-events/src/EventsSettingsService.ts b/webapp/packages/core-events/src/EventsSettingsService.ts
index 3b97c5a59a..7019707eb0 100644
--- a/webapp/packages/core-events/src/EventsSettingsService.ts
+++ b/webapp/packages/core-events/src/EventsSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-events/src/ExceptionsCatcherService.ts b/webapp/packages/core-events/src/ExceptionsCatcherService.ts
index f6b228fc2d..d7ec27ae3d 100644
--- a/webapp/packages/core-events/src/ExceptionsCatcherService.ts
+++ b/webapp/packages/core-events/src/ExceptionsCatcherService.ts
@@ -5,7 +5,6 @@
  * 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 { NotificationService } from './NotificationService';
@@ -36,13 +35,7 @@ export class ExceptionsCatcherService extends Bootstrap {
     this.ignored.push(message);
   }
 
-  private readonly catcher = (
-    event: Event | string,
-    source?: string,
-    lineno?: number,
-    colno?: number,
-    _error?: Error
-  ) => {
+  private readonly catcher = (event: Event | string, source?: string, lineno?: number, colno?: number, _error?: Error) => {
     if (_error) {
       this.notificationService.logException(_error, this.messageTitle);
     } else {
diff --git a/webapp/packages/core-events/src/INotification.ts b/webapp/packages/core-events/src/INotification.ts
index 149c2a75b5..cee5197b84 100644
--- a/webapp/packages/core-events/src/INotification.ts
+++ b/webapp/packages/core-events/src/INotification.ts
@@ -21,7 +21,7 @@ export enum ENotificationType {
   Error = 'Error',
   Success = 'Success',
   Loading = 'Loading',
-  Custom = ' Custom'
+  Custom = ' Custom',
 }
 
 export interface INotificationExtraProps<T = never> {
@@ -36,15 +36,13 @@ export interface IProcessNotificationContainer<TProps extends INotificationExtra
   notification: INotification<TProps>;
 }
 
-export type NotificationComponentProps<
-  TProps extends INotificationExtraProps<any> = INotificationExtraProps
-> = TProps & {
+export type NotificationComponentProps<TProps extends INotificationExtraProps<any> = INotificationExtraProps> = TProps & {
   notification: INotification<TProps>;
 };
 
-export type NotificationComponent<
-  TProps extends INotificationExtraProps<any> = INotificationExtraProps,
-> = React.FunctionComponent<NotificationComponentProps<TProps>>;
+export type NotificationComponent<TProps extends INotificationExtraProps<any> = INotificationExtraProps> = React.FunctionComponent<
+  NotificationComponentProps<TProps>
+>;
 
 export interface INotification<TProps extends INotificationExtraProps<any> = INotificationExtraProps> {
   readonly id: number;
diff --git a/webapp/packages/core-events/src/NotificationService.ts b/webapp/packages/core-events/src/NotificationService.ts
index 698943925b..5c95e8f0e0 100644
--- a/webapp/packages/core-events/src/NotificationService.ts
+++ b/webapp/packages/core-events/src/NotificationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -19,9 +18,9 @@ import {
   INotification,
   INotificationExtraProps,
   INotificationOptions,
-  NotificationComponent,
   INotificationProcessExtraProps,
-  IProcessNotificationContainer
+  IProcessNotificationContainer,
+  NotificationComponent,
 } from './INotification';
 import { ProcessNotificationController } from './ProcessNotificationController';
 
@@ -38,16 +37,15 @@ export class NotificationService {
     return this.notificationList.values.filter(notification => !notification.isSilent);
   }
 
-  constructor(
-    private readonly settings: EventsSettingsService
-  ) {
+  constructor(private readonly settings: EventsSettingsService) {
     this.notificationList = new OrderedMap<number, INotification<any>>(({ id }) => id);
     this.closeTask = new Executor();
     this.notificationNextId = 0;
   }
 
   notify<TProps extends INotificationExtraProps<any> = INotificationExtraProps>(
-    options: INotificationOptions<TProps>, type: ENotificationType
+    options: INotificationOptions<TProps>,
+    type: ENotificationType,
   ): INotification<TProps> {
     if (options.persistent) {
       const persistentNotifications = this.notificationList.values.filter(value => value.persistent);
@@ -79,7 +77,7 @@ export class NotificationService {
       details: options.details,
       isSilent: !!options.isSilent,
       customComponent: options.customComponent,
-      extraProps: options.extraProps || {} as TProps,
+      extraProps: options.extraProps || ({} as TProps),
       autoClose: options.autoClose,
       persistent: options.persistent,
       state: observable({ deleteDelay: 0 }),
@@ -111,35 +109,38 @@ export class NotificationService {
     return notification;
   }
 
-  customNotification<
-    TProps extends INotificationExtraProps<any> = INotificationExtraProps
-  >(
+  customNotification<TProps extends INotificationExtraProps<any> = INotificationExtraProps>(
     component: () => NotificationComponent<TProps>,
     props?: TProps extends any ? TProps : never, // some magic
-    options?: INotificationOptions<TProps> & { type?: ENotificationType }
+    options?: INotificationOptions<TProps> & { type?: ENotificationType },
   ): INotification<TProps> {
-    return this.notify({
-      title: '',
-      ...options,
-      customComponent: component,
-      extraProps: props || {} as TProps,
-    }, options?.type ?? ENotificationType.Custom);
+    return this.notify(
+      {
+        title: '',
+        ...options,
+        customComponent: component,
+        extraProps: props || ({} as TProps),
+      },
+      options?.type ?? ENotificationType.Custom,
+    );
   }
 
-  processNotification<
-    TProps extends INotificationProcessExtraProps<any> = INotificationExtraProps>(
+  processNotification<TProps extends INotificationProcessExtraProps<any> = INotificationExtraProps>(
     component: () => NotificationComponent<TProps>,
     props?: TProps extends any ? TProps : never, // some magic,
-    options?: INotificationOptions<TProps>
+    options?: INotificationOptions<TProps>,
   ): IProcessNotificationContainer<TProps> {
     const processController = props?.state || new ProcessNotificationController();
 
-    const notification = this.notify({
-      title: '',
-      ...options,
-      extraProps: { ...props, state: processController } as TProps,
-      customComponent: component,
-    }, ENotificationType.Custom);
+    const notification = this.notify(
+      {
+        title: '',
+        ...options,
+        extraProps: { ...props, state: processController } as TProps,
+        customComponent: component,
+      },
+      ENotificationType.Custom,
+    );
 
     processController.init(notification.title, notification.message);
     return { controller: processController, notification };
@@ -157,12 +158,7 @@ export class NotificationService {
     return this.notify(notification, ENotificationType.Error);
   }
 
-  logException(
-    exception: Error | GQLError | undefined | null,
-    title?: string,
-    message?: string,
-    silent?: boolean
-  ): void {
+  logException(exception: Error | GQLError | undefined | null, title?: string, message?: string, silent?: boolean): void {
     const errorDetails = errorOf(exception, DetailsError);
 
     if (!silent) {
diff --git a/webapp/packages/core-events/src/ProcessNotificationController.ts b/webapp/packages/core-events/src/ProcessNotificationController.ts
index ad690f796e..3f7e928bbc 100644
--- a/webapp/packages/core-events/src/ProcessNotificationController.ts
+++ b/webapp/packages/core-events/src/ProcessNotificationController.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { DetailsError, GQLError } from '@cloudbeaver/core-sdk';
 import { errorOf } from '@cloudbeaver/core-utils';
diff --git a/webapp/packages/core-events/src/manifest.ts b/webapp/packages/core-events/src/manifest.ts
index acb4fbeff0..80fb0581e0 100644
--- a/webapp/packages/core-events/src/manifest.ts
+++ b/webapp/packages/core-events/src/manifest.ts
@@ -5,23 +5,16 @@
  * 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 { EventsSettingsService } from './EventsSettingsService';
 import { ExceptionsCatcherService } from './ExceptionsCatcherService';
 import { NotificationService } from './NotificationService';
 
-
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Events',
   },
 
-  providers: [
-    NotificationService,
-    ExceptionsCatcherService,
-    EventsSettingsService,
-  ],
+  providers: [NotificationService, ExceptionsCatcherService, EventsSettingsService],
 };
diff --git a/webapp/packages/core-executor/src/ExecutionContext.ts b/webapp/packages/core-executor/src/ExecutionContext.ts
index b6c2c9472e..b7175233e1 100644
--- a/webapp/packages/core-executor/src/ExecutionContext.ts
+++ b/webapp/packages/core-executor/src/ExecutionContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAsyncContextLoader, IContextLoader, IExecutionContext, ISyncContextLoader } from './IExecutionContext';
 
 export class ExecutionContext<TData> implements IExecutionContext<TData> {
@@ -17,9 +16,7 @@ export class ExecutionContext<TData> implements IExecutionContext<TData> {
     this.contextCreators = context?.contextCreators ?? new Map();
   }
 
-  addContextCreators(
-    creators: [IContextLoader<any, TData>, IContextLoader<any, TData>][]
-  ): void {
+  addContextCreators(creators: [IContextLoader<any, TData>, IContextLoader<any, TData>][]): void {
     for (const [key, value] of creators) {
       this.contextCreators.set(key, value);
     }
diff --git a/webapp/packages/core-executor/src/Executor.ts b/webapp/packages/core-executor/src/Executor.ts
index 2626565b0a..41b50f7463 100644
--- a/webapp/packages/core-executor/src/Executor.ts
+++ b/webapp/packages/core-executor/src/Executor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { flat } from '@cloudbeaver/core-utils';
 
 import { ExecutionContext } from './ExecutionContext';
@@ -25,10 +24,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
 
   private readonly scheduler: TaskScheduler<T>;
 
-  constructor(
-    private readonly defaultData: T | null = null,
-    isBlocked: BlockedExecution<T> | null = null
-  ) {
+  constructor(private readonly defaultData: T | null = null, isBlocked: BlockedExecution<T> | null = null) {
     super();
     this.scheduler = new TaskScheduler(isBlocked);
   }
@@ -36,7 +32,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
   async execute(
     data: T,
     context?: IExecutionContext<T>,
-    scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>
+    scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>,
   ): Promise<IExecutionContextProvider<T>> {
     if (context && ExecutorInterrupter.isInterrupted(context)) {
       return context;
@@ -48,14 +44,14 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
       if (!context) {
         context = new ExecutionContext(data);
       }
-      return this.executeHandlersCollection<T>(this, data, context, flat([(scope || [])]));
+      return this.executeHandlersCollection<T>(this, data, context, flat([scope || []]));
     });
   }
 
   async executeScope(
     data: T,
     scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>,
-    context?: IExecutionContext<T>
+    context?: IExecutionContext<T>,
   ): Promise<IExecutionContextProvider<T>> {
     if (context && ExecutorInterrupter.isInterrupted(context)) {
       return context;
@@ -67,7 +63,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
       if (!context) {
         context = new ExecutionContext(data);
       }
-      return this.executeHandlersCollection<T>(this, data, context, flat([(scope || [])]));
+      return this.executeHandlersCollection<T>(this, data, context, flat([scope || []]));
     });
   }
 
@@ -75,7 +71,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
     collection: IExecutorHandlersCollection<T>,
     data: T,
     context: IExecutionContext<T>,
-    scoped: Array<IExecutorHandlersCollection<T>>
+    scoped: Array<IExecutorHandlersCollection<T>>,
   ): Promise<IExecutionContextProvider<T>> {
     scoped = [...collection.collections, ...scoped];
 
@@ -103,7 +99,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
       const exceptionContext = context.getContext(executionExceptionContext);
       exceptionContext.setException(exception);
       throw exception;
-    }  finally {
+    } finally {
       await this.executeHandlers(data, context, collection.postHandlers);
 
       for (const scope of scoped) {
@@ -123,7 +119,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
     collection: IExecutorHandlersCollection<T>,
     data: T,
     context: IExecutionContext<T>,
-    type: ChainLinkType
+    type: ChainLinkType,
   ): Promise<void> {
     const interrupter = context.getContext(ExecutorInterrupter.interruptContext);
 
@@ -139,12 +135,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
       const mappedData = link.map ? link.map(data, context) : data;
       const chainedContext = new ExecutionContext(mappedData, context);
 
-      await this.executeHandlersCollection(
-        link.executor,
-        mappedData,
-        chainedContext,
-        flat([(collection.getLinkHandlers(link.executor) || [])])
-      );
+      await this.executeHandlersCollection(link.executor, mappedData, chainedContext, flat([collection.getLinkHandlers(link.executor) || []]));
     }
   }
 
@@ -152,7 +143,7 @@ export class Executor<T = void> extends ExecutorHandlersCollection<T> implements
     data: T,
     context: IExecutionContext<T>,
     handlers: Array<IExecutorHandler<any>>,
-    interrupter?: IExecutorInterrupter
+    interrupter?: IExecutorInterrupter,
   ): Promise<void> {
     for (const handler of handlers) {
       if (interrupter?.interrupted) {
diff --git a/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts b/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
index 5bd16bc651..53530a3357 100644
--- a/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
+++ b/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
@@ -5,15 +5,13 @@
  * 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 type { IContextLoader, ISyncContextLoader, IAsyncContextLoader } from './IExecutionContext';
+import type { IAsyncContextLoader, IContextLoader, ISyncContextLoader } from './IExecutionContext';
 import type { IExecutorHandler } from './IExecutorHandler';
 import type { ExecutorDataFilter, ExecutorDataMap, IChainLink, IExecutorHandlersCollection } from './IExecutorHandlersCollection';
 
-export class ExecutorHandlersCollection<T = unknown, TResult = any | Promise<any>>
-implements IExecutorHandlersCollection<T, TResult> {
+export class ExecutorHandlersCollection<T = unknown, TResult = any | Promise<any>> implements IExecutorHandlersCollection<T, TResult> {
   handlers: Array<IExecutorHandler<T, TResult>> = [];
   postHandlers: Array<IExecutorHandler<T, TResult>> = [];
   chain: Array<IChainLink<T, TResult>> = [];
@@ -37,18 +35,9 @@ implements IExecutorHandlersCollection<T, TResult> {
     });
   }
 
-  addContextCreator<TContext>(
-    context: ISyncContextLoader<TContext, T>,
-    creator: ISyncContextLoader<TContext, T>
-  ): this;
-  addContextCreator<TContext>(
-    context: IAsyncContextLoader<TContext, T>,
-    creator: IAsyncContextLoader<TContext, T>
-  ): this;
-  addContextCreator<TContext>(
-    context: IContextLoader<TContext, T>,
-    creator: IContextLoader<TContext, T>
-  ): this {
+  addContextCreator<TContext>(context: ISyncContextLoader<TContext, T>, creator: ISyncContextLoader<TContext, T>): this;
+  addContextCreator<TContext>(context: IAsyncContextLoader<TContext, T>, creator: IAsyncContextLoader<TContext, T>): this;
+  addContextCreator<TContext>(context: IContextLoader<TContext, T>, creator: IContextLoader<TContext, T>): this {
     this.contextCreators.set(context, creator);
     return this;
   }
@@ -71,17 +60,11 @@ implements IExecutorHandlersCollection<T, TResult> {
     return this.links.get(link)!;
   }
 
-  getLinkHandlers(
-    link: IExecutorHandlersCollection<any, TResult>
-  ): IExecutorHandlersCollection<T, TResult> | undefined {
+  getLinkHandlers(link: IExecutorHandlersCollection<any, TResult>): IExecutorHandlersCollection<T, TResult> | undefined {
     return this.links.get(link);
   }
 
-  before<TNext>(
-    executor: IExecutorHandlersCollection<TNext, TResult>,
-    map?: ExecutorDataMap<T, TNext>,
-    filter?: ExecutorDataFilter<T>
-  ): this {
+  before<TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>, filter?: ExecutorDataFilter<T>): this {
     this.chain.push({
       executor,
       map,
@@ -91,11 +74,7 @@ implements IExecutorHandlersCollection<T, TResult> {
     return this;
   }
 
-  next<TNext>(
-    executor: IExecutorHandlersCollection<TNext, TResult>,
-    map?: ExecutorDataMap<T, TNext>,
-    filter?: ExecutorDataFilter<T>
-  ): this {
+  next<TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>, filter?: ExecutorDataFilter<T>): this {
     this.chain.push({
       executor,
       map,
diff --git a/webapp/packages/core-executor/src/ExecutorInterrupter.ts b/webapp/packages/core-executor/src/ExecutorInterrupter.ts
index 4168cb451e..8c0ee16f9a 100644
--- a/webapp/packages/core-executor/src/ExecutorInterrupter.ts
+++ b/webapp/packages/core-executor/src/ExecutorInterrupter.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from './IExecutionContext';
 
 export interface IExecutorInterrupter {
@@ -39,7 +38,7 @@ export const ExecutorInterrupter = {
     return async (data: T, contexts: IExecutionContextProvider<T>): Promise<void> => {
       const interrupt = contexts.getContext(ExecutorInterrupter.interruptContext);
 
-      if ((await flag(data, contexts))) {
+      if (await flag(data, contexts)) {
         interrupt.interrupt();
       }
     };
diff --git a/webapp/packages/core-executor/src/IExecutionContext.ts b/webapp/packages/core-executor/src/IExecutionContext.ts
index 1b5ab87a3e..ffa0852975 100644
--- a/webapp/packages/core-executor/src/IExecutionContext.ts
+++ b/webapp/packages/core-executor/src/IExecutionContext.ts
@@ -21,19 +21,11 @@ export interface IExecutionContext<TData> extends IExecutionContextProvider<TDat
   readonly contexts: Map<IContextLoader<any, TData>, any>;
   readonly contextCreators: Map<IContextLoader<any, TData>, IContextLoader<any, TData>>;
 
-  addContextCreators(
-    creators: [IContextLoader<any, TData>, IContextLoader<any, TData>][]
-  ): void;
+  addContextCreators(creators: [IContextLoader<any, TData>, IContextLoader<any, TData>][]): void;
 }
 
-export type IAsyncContextLoader<T = any, TData = any> = (
-  contexts: IExecutionContextProvider<TData>,
-  data: TData
-) => Promise<T>;
+export type IAsyncContextLoader<T = any, TData = any> = (contexts: IExecutionContextProvider<TData>, data: TData) => Promise<T>;
 
-export type ISyncContextLoader<T = any, TData = any> = (
-  contexts: IExecutionContextProvider<TData>,
-  data: TData
-) => T;
+export type ISyncContextLoader<T = any, TData = any> = (contexts: IExecutionContextProvider<TData>, data: TData) => T;
 
 export type IContextLoader<T = any, TData = any> = IAsyncContextLoader<T, TData> | ISyncContextLoader<T, TData>;
diff --git a/webapp/packages/core-executor/src/IExecutor.ts b/webapp/packages/core-executor/src/IExecutor.ts
index c0c09435bf..cf2b880aa7 100644
--- a/webapp/packages/core-executor/src/IExecutor.ts
+++ b/webapp/packages/core-executor/src/IExecutor.ts
@@ -5,22 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContext, IExecutionContextProvider } from './IExecutionContext';
 import type { IExecutorHandlersCollection } from './IExecutorHandlersCollection';
 
 export interface IExecutor<T = void> extends IExecutorHandlersCollection<T> {
   readonly executing: boolean;
 
-  execute: (
-    data: T,
-    context?: IExecutionContext<T>,
-    scope?: IExecutorHandlersCollection<T>
-  ) => Promise<IExecutionContextProvider<T>>;
+  execute: (data: T, context?: IExecutionContext<T>, scope?: IExecutorHandlersCollection<T>) => Promise<IExecutionContextProvider<T>>;
 
-  executeScope: (
-    data: T,
-    scope?: IExecutorHandlersCollection<T>,
-    context?: IExecutionContext<T>
-  ) => Promise<IExecutionContextProvider<T>>;
+  executeScope: (data: T, scope?: IExecutorHandlersCollection<T>, context?: IExecutionContext<T>) => Promise<IExecutionContextProvider<T>>;
 }
diff --git a/webapp/packages/core-executor/src/IExecutorHandler.ts b/webapp/packages/core-executor/src/IExecutorHandler.ts
index 4555f6cf6e..040b3506db 100644
--- a/webapp/packages/core-executor/src/IExecutorHandler.ts
+++ b/webapp/packages/core-executor/src/IExecutorHandler.ts
@@ -5,10 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from './IExecutionContext';
 
-export type IExecutorHandler<T, TResult = any | Promise<any>> = (
-  data: T,
-  contexts: IExecutionContextProvider<T>
-) => TResult;
+export type IExecutorHandler<T, TResult = any | Promise<any>> = (data: T, contexts: IExecutionContextProvider<T>) => TResult;
diff --git a/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts b/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
index 21f521bfa5..f756c5fa51 100644
--- a/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
+++ b/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAsyncContextLoader, IContextLoader, IExecutionContextProvider, ISyncContextLoader } from './IExecutionContext';
 import type { IExecutorHandler } from './IExecutorHandler';
 
@@ -29,14 +28,8 @@ export interface IExecutorHandlersCollection<T = unknown, TResult = any | Promis
 
   setInitialDataGetter(getter: () => T): this;
 
-  addContextCreator<TContext>(
-    context: ISyncContextLoader<TContext, T>,
-    creator: ISyncContextLoader<TContext, T>
-  ): this;
-  addContextCreator<TContext>(
-    context: IAsyncContextLoader<TContext, T>,
-    creator: IAsyncContextLoader<TContext, T>
-  ): this;
+  addContextCreator<TContext>(context: ISyncContextLoader<TContext, T>, creator: ISyncContextLoader<TContext, T>): this;
+  addContextCreator<TContext>(context: IAsyncContextLoader<TContext, T>, creator: IAsyncContextLoader<TContext, T>): this;
 
   before: <TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>) => this;
   next: <TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>) => this;
@@ -48,7 +41,5 @@ export interface IExecutorHandlersCollection<T = unknown, TResult = any | Promis
   removePostHandler: (handler: IExecutorHandler<T, TResult>) => void;
 
   for: (link: IExecutorHandlersCollection<any, TResult>) => IExecutorHandlersCollection<T, TResult>;
-  getLinkHandlers: (
-    link: IExecutorHandlersCollection<any, TResult>
-  ) => IExecutorHandlersCollection<T, TResult> | undefined;
+  getLinkHandlers: (link: IExecutorHandlersCollection<any, TResult>) => IExecutorHandlersCollection<T, TResult> | undefined;
 }
diff --git a/webapp/packages/core-executor/src/ISyncExecutor.ts b/webapp/packages/core-executor/src/ISyncExecutor.ts
index fec2ca7d54..189a65c6a0 100644
--- a/webapp/packages/core-executor/src/ISyncExecutor.ts
+++ b/webapp/packages/core-executor/src/ISyncExecutor.ts
@@ -5,20 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContext, IExecutionContextProvider } from './IExecutionContext';
 import type { IExecutorHandlersCollection } from './IExecutorHandlersCollection';
 
 export interface ISyncExecutor<T = void> extends IExecutorHandlersCollection<T> {
-  execute: (
-    data: T,
-    context?: IExecutionContext<T>,
-    scope?: IExecutorHandlersCollection<T>
-  ) => IExecutionContextProvider<T>;
+  execute: (data: T, context?: IExecutionContext<T>, scope?: IExecutorHandlersCollection<T>) => IExecutionContextProvider<T>;
 
-  executeScope: (
-    data: T,
-    scope?: IExecutorHandlersCollection<T>,
-    context?: IExecutionContext<T>
-  ) => IExecutionContextProvider<T>;
+  executeScope: (data: T, scope?: IExecutorHandlersCollection<T>, context?: IExecutionContext<T>) => IExecutionContextProvider<T>;
 }
diff --git a/webapp/packages/core-executor/src/SyncExecutor.ts b/webapp/packages/core-executor/src/SyncExecutor.ts
index 6045299595..f355c6c0c3 100644
--- a/webapp/packages/core-executor/src/SyncExecutor.ts
+++ b/webapp/packages/core-executor/src/SyncExecutor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { flat } from '@cloudbeaver/core-utils';
 
 import { ExecutionContext } from './ExecutionContext';
@@ -18,16 +17,14 @@ import type { ChainLinkType, IExecutorHandlersCollection } from './IExecutorHand
 import type { ISyncExecutor } from './ISyncExecutor';
 
 export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implements ISyncExecutor<T> {
-  constructor(
-    private readonly defaultData: T | null = null
-  ) {
+  constructor(private readonly defaultData: T | null = null) {
     super();
   }
 
   execute(
     data: T,
     context?: IExecutionContext<T>,
-    scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>
+    scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>,
   ): IExecutionContextProvider<T> {
     if (context && ExecutorInterrupter.isInterrupted(context)) {
       return context;
@@ -38,13 +35,13 @@ export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implem
     if (!context) {
       context = new ExecutionContext(data);
     }
-    return this.executeHandlersCollection<T>(this, data, context, flat([(scope || [])]));
+    return this.executeHandlersCollection<T>(this, data, context, flat([scope || []]));
   }
 
   executeScope(
     data: T,
     scope?: IExecutorHandlersCollection<T> | Array<IExecutorHandlersCollection<T>>,
-    context?: IExecutionContext<T>
+    context?: IExecutionContext<T>,
   ): IExecutionContextProvider<T> {
     if (context && ExecutorInterrupter.isInterrupted(context)) {
       return context;
@@ -55,14 +52,14 @@ export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implem
     if (!context) {
       context = new ExecutionContext(data);
     }
-    return this.executeHandlersCollection<T>(this, data, context, flat([(scope || [])]));
+    return this.executeHandlersCollection<T>(this, data, context, flat([scope || []]));
   }
 
   private executeHandlersCollection<T>(
     collection: IExecutorHandlersCollection<T>,
     data: T,
     context: IExecutionContext<T>,
-    scoped: Array<IExecutorHandlersCollection<T>>
+    scoped: Array<IExecutorHandlersCollection<T>>,
   ): IExecutionContextProvider<T> {
     scoped = [...collection.collections, ...scoped];
 
@@ -106,12 +103,7 @@ export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implem
     return context;
   }
 
-  private executeChain<T>(
-    collection: IExecutorHandlersCollection<T>,
-    data: T,
-    context: IExecutionContext<T>,
-    type: ChainLinkType
-  ): void {
+  private executeChain<T>(collection: IExecutorHandlersCollection<T>, data: T, context: IExecutionContext<T>, type: ChainLinkType): void {
     const interrupter = context.getContext(ExecutorInterrupter.interruptContext);
 
     for (const link of collection.chain.filter(link => link.type === type)) {
@@ -126,12 +118,7 @@ export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implem
       const mappedData = link.map ? link.map(data, context) : data;
       const chainedContext = new ExecutionContext(mappedData, context);
 
-      this.executeHandlersCollection(
-        link.executor,
-        mappedData,
-        chainedContext,
-        flat([(collection.getLinkHandlers(link.executor) || [])])
-      );
+      this.executeHandlersCollection(link.executor, mappedData, chainedContext, flat([collection.getLinkHandlers(link.executor) || []]));
     }
   }
 
@@ -139,7 +126,7 @@ export class SyncExecutor<T = void> extends ExecutorHandlersCollection<T> implem
     data: T,
     context: IExecutionContext<T>,
     handlers: Array<IExecutorHandler<any>>,
-    interrupter?: IExecutorInterrupter
+    interrupter?: IExecutorInterrupter,
   ): void {
     for (const handler of handlers) {
       if (interrupter?.interrupted) {
diff --git a/webapp/packages/core-executor/src/TaskScheduler/AutoRunningTask.ts b/webapp/packages/core-executor/src/TaskScheduler/AutoRunningTask.ts
index 1f1da36d1d..36808c819c 100644
--- a/webapp/packages/core-executor/src/TaskScheduler/AutoRunningTask.ts
+++ b/webapp/packages/core-executor/src/TaskScheduler/AutoRunningTask.ts
@@ -5,15 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITask } from './ITask';
 import { Task } from './Task';
 
 export class AutoRunningTask<TValue> extends Task<TValue> {
-  constructor(
-    task: () => Promise<TValue>,
-    externalCancel?: () => Promise<void> | void
-  ) {
+  constructor(task: () => Promise<TValue>, externalCancel?: () => Promise<void> | void) {
     super(task, externalCancel);
     this.run();
   }
@@ -25,4 +21,4 @@ export class AutoRunningTask<TValue> extends Task<TValue> {
   static reject<TValue>(exception: any): ITask<TValue> {
     return new AutoRunningTask(() => Promise.reject(exception));
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-executor/src/TaskScheduler/ITask.ts b/webapp/packages/core-executor/src/TaskScheduler/ITask.ts
index afc7694298..621a2bd33a 100644
--- a/webapp/packages/core-executor/src/TaskScheduler/ITask.ts
+++ b/webapp/packages/core-executor/src/TaskScheduler/ITask.ts
@@ -15,10 +15,8 @@ export interface ITask<TValue> extends Promise<TValue> {
 
   then: <TResult1 = TValue, TResult2 = never>(
     onfulfilled?: ((value: TValue) => TResult1 | PromiseLike<TResult1>) | null,
-    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
+    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null,
   ) => ITask<TResult1 | TResult2>;
-  catch: <TResult = never>(
-    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-  ) => ITask<TValue | TResult>;
+  catch: <TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null) => ITask<TValue | TResult>;
   finally: (onfinally?: (() => void) | null) => ITask<TValue>;
 }
diff --git a/webapp/packages/core-executor/src/TaskScheduler/Task.ts b/webapp/packages/core-executor/src/TaskScheduler/Task.ts
index fdcb76a499..2e418224a9 100644
--- a/webapp/packages/core-executor/src/TaskScheduler/Task.ts
+++ b/webapp/packages/core-executor/src/TaskScheduler/Task.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { ITask } from './ITask';
@@ -15,10 +14,7 @@ export class Task<TValue> implements ITask<TValue> {
   executing: boolean;
 
   get cancellable(): boolean {
-    if (
-      this.cancelled
-      || (this.externalCancel === undefined && this.executing)
-    ) {
+    if (this.cancelled || (this.externalCancel === undefined && this.executing)) {
       return false;
     }
 
@@ -42,10 +38,7 @@ export class Task<TValue> implements ITask<TValue> {
     return 'Task';
   }
 
-  constructor(
-    readonly task: () => Promise<TValue>,
-    private readonly externalCancel?: () => Promise<void> | void
-  ) {
+  constructor(readonly task: () => Promise<TValue>, private readonly externalCancel?: () => Promise<void> | void) {
     this.innerPromise = new Promise((resolve, reject) => {
       this.reject = reject;
       this.resolve = resolve;
@@ -64,51 +57,58 @@ export class Task<TValue> implements ITask<TValue> {
 
   then<TResult1 = TValue, TResult2 = never>(
     onfulfilled?: ((value: TValue) => TResult1 | PromiseLike<TResult1>) | null,
-    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
+    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null,
   ): ITask<TResult1 | TResult2> {
     let cancel = this.cancel.bind(this);
 
-    return new Task(async () => {
-      const value = await this.innerPromise;
+    return new Task(
+      async () => {
+        const value = await this.innerPromise;
 
-      const task = onfulfilled?.(value);
+        const task = onfulfilled?.(value);
 
-      if (task instanceof Task) {
-        cancel = async () => {
-          await task.cancel();
-          await this.cancel();
-        };
-      }
+        if (task instanceof Task) {
+          cancel = async () => {
+            await task.cancel();
+            await this.cancel();
+          };
+        }
 
-      return await task as TResult1;
-    }, () => cancel())
+        return (await task) as TResult1;
+      },
+      () => cancel(),
+    )
       .run()
       .catch(onrejected);
   }
 
-  catch<TResult = never>(
-    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-  ): ITask<TValue | TResult> {
-    return new Task(async () => {
-      try {
-        return await this.innerPromise;
-      } catch (exception: any) {
-        if (onrejected) {
-          return await onrejected(exception);
+  catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): ITask<TValue | TResult> {
+    return new Task(
+      async () => {
+        try {
+          return await this.innerPromise;
+        } catch (exception: any) {
+          if (onrejected) {
+            return await onrejected(exception);
+          }
+          throw exception;
         }
-        throw exception;
-      }
-    }, () => this.cancel()).run();
+      },
+      () => this.cancel(),
+    ).run();
   }
 
   finally(onfinally?: (() => void) | null): ITask<TValue> {
-    return new Task(async () => {
-      try {
-        return await this.innerPromise;
-      } finally {
-        onfinally?.();
-      }
-    }, () => this.cancel()).run();
+    return new Task(
+      async () => {
+        try {
+          return await this.innerPromise;
+        } finally {
+          onfinally?.();
+        }
+      },
+      () => this.cancel(),
+    ).run();
   }
 
   run(): this {
diff --git a/webapp/packages/core-executor/src/TaskScheduler/TaskScheduler.ts b/webapp/packages/core-executor/src/TaskScheduler/TaskScheduler.ts
index 6a958693b2..4634f93d9b 100644
--- a/webapp/packages/core-executor/src/TaskScheduler/TaskScheduler.ts
+++ b/webapp/packages/core-executor/src/TaskScheduler/TaskScheduler.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { computed, observable, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import type { ITask } from './ITask';
 import { Task } from './Task';
@@ -71,11 +70,7 @@ export class TaskScheduler<TIdentifier = void> {
     }
   }
 
-  schedule<T>(
-    id: TIdentifier,
-    promise: () => Promise<T>,
-    options?: IScheduleOptions,
-  ): ITask<T> {
+  schedule<T>(id: TIdentifier, promise: () => Promise<T>, options?: IScheduleOptions): ITask<T> {
     if (this.queue.length > queueLimit) {
       throw new Error('Execution queue limit is reached');
     }
@@ -120,11 +115,7 @@ export class TaskScheduler<TIdentifier = void> {
 
   private async execute<T>(container: ITaskContainer<TIdentifier, T>) {
     if (this.isBlocked) {
-      const queueList = this.queue.filter(
-        active =>
-          active !== container
-            && this.isBlocked!(active.id, container.id)
-      );
+      const queueList = this.queue.filter(active => active !== container && this.isBlocked!(active.id, container.id));
 
       for (const _container of queueList) {
         if (container.task.cancelled) {
diff --git a/webapp/packages/core-executor/src/executionExceptionContext.ts b/webapp/packages/core-executor/src/executionExceptionContext.ts
index 84af5ab935..31e06c679e 100644
--- a/webapp/packages/core-executor/src/executionExceptionContext.ts
+++ b/webapp/packages/core-executor/src/executionExceptionContext.ts
@@ -13,4 +13,4 @@ export function executionExceptionContext() {
       this.exception = exception;
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-executor/src/executorHandlerFilter.ts b/webapp/packages/core-executor/src/executorHandlerFilter.ts
index da295dc514..1d3bf2940d 100644
--- a/webapp/packages/core-executor/src/executorHandlerFilter.ts
+++ b/webapp/packages/core-executor/src/executorHandlerFilter.ts
@@ -5,18 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from './IExecutionContext';
 import type { IExecutorHandler } from './IExecutorHandler';
 
-export type IExecutorHandlerFilter<T> = (
-  data: T,
-  contexts: IExecutionContextProvider<T>
-) => boolean;
+export type IExecutorHandlerFilter<T> = (data: T, contexts: IExecutionContextProvider<T>) => boolean;
 
 export function executorHandlerFilter<T, TResult = any | Promise<any>>(
   filter: IExecutorHandlerFilter<T>,
-  handler: IExecutorHandler<T, TResult>
+  handler: IExecutorHandler<T, TResult>,
 ): IExecutorHandler<T, TResult | undefined> {
   return (data, context) => {
     if (filter(data, context)) {
@@ -24,4 +20,4 @@ export function executorHandlerFilter<T, TResult = any | Promise<any>>(
     }
     return undefined;
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-executor/src/whileTask.ts b/webapp/packages/core-executor/src/whileTask.ts
index 9030563660..fbf986f6e0 100644
--- a/webapp/packages/core-executor/src/whileTask.ts
+++ b/webapp/packages/core-executor/src/whileTask.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AutoRunningTask } from './TaskScheduler/AutoRunningTask';
 import type { ITask } from './TaskScheduler/ITask';
 import { Task } from './TaskScheduler/Task';
@@ -14,7 +13,7 @@ export function whileTask<T>(
   callback: (value: T) => Promise<boolean> | boolean,
   task: () => Promise<T>,
   interval: number,
-  cancelMessage?: string
+  cancelMessage?: string,
 ): ITask<T> {
   let resolve: (value: T | PromiseLike<T>) => void;
   let reject: (reason?: any) => void;
@@ -68,6 +67,6 @@ export function whileTask<T>(
       runTask();
       return lockPromise;
     },
-    () => cancelTask(new Error(cancelMessage ?? 'Task was cancelled'))
+    () => cancelTask(new Error(cancelMessage ?? 'Task was cancelled')),
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-extensions/src/ExtensionUtils.ts b/webapp/packages/core-extensions/src/ExtensionUtils.ts
index 77f6c575be..54e06a3306 100644
--- a/webapp/packages/core-extensions/src/ExtensionUtils.ts
+++ b/webapp/packages/core-extensions/src/ExtensionUtils.ts
@@ -5,24 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExtension } from './IExtension';
 
 interface ExtensionExecutor {
-  on: <T extends IExtension<any>>(
-    predicate: (extension: IExtension<any>) => extension is T,
-    action: (extension: T) => void
-  ) => this;
-  has: <T extends IExtension<any>> (isProvider: (extension: IExtension<any>) => extension is T) => boolean;
+  on: <T extends IExtension<any>>(predicate: (extension: IExtension<any>) => extension is T, action: (extension: T) => void) => this;
+  has: <T extends IExtension<any>>(isProvider: (extension: IExtension<any>) => extension is T) => boolean;
 }
 
 export const ExtensionUtils = {
   from(extensions: Array<IExtension<any>>): ExtensionExecutor {
     return {
-      on<T extends IExtension<any>>(
-        predicate: (extension: IExtension<any>) => extension is T,
-        action: (extension: T) => void
-      ) {
+      on<T extends IExtension<any>>(predicate: (extension: IExtension<any>) => extension is T, action: (extension: T) => void) {
         for (const extension of extensions) {
           if (predicate(extension)) {
             action(extension);
diff --git a/webapp/packages/core-extensions/src/IExtension.ts b/webapp/packages/core-extensions/src/IExtension.ts
index 8af4fa35dc..d61e757548 100644
--- a/webapp/packages/core-extensions/src/IExtension.ts
+++ b/webapp/packages/core-extensions/src/IExtension.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EXTENSION_SYMBOL, EXTENSION_TYPE_SYMBOL } from './constants';
 
 export interface IExtension<T> {
diff --git a/webapp/packages/core-extensions/src/createExtension.ts b/webapp/packages/core-extensions/src/createExtension.ts
index f1f7820699..d8a23a4ea7 100644
--- a/webapp/packages/core-extensions/src/createExtension.ts
+++ b/webapp/packages/core-extensions/src/createExtension.ts
@@ -5,21 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { EXTENSION_SYMBOL } from './constants';
 import type { IExtension } from './IExtension';
 
-export function createExtension<T>(
-  extension: Record<string, any>,
-  key: symbol
-): IExtension<T> {
+export function createExtension<T>(extension: Record<string, any>, key: symbol): IExtension<T> {
   return Object.assign(extension, { [EXTENSION_SYMBOL]: key });
 }
 
-export function isExtension<T>(
-  obj: Record<any, any> | IExtension<T>,
-  key?: symbol
-): obj is IExtension<T> {
+export function isExtension<T>(obj: Record<any, any> | IExtension<T>, key?: symbol): obj is IExtension<T> {
   if (!(EXTENSION_SYMBOL in obj)) {
     return false;
   }
diff --git a/webapp/packages/core-localization/src/Locale.ts b/webapp/packages/core-localization/src/Locale.ts
index 437ef3539c..f92c707cc6 100644
--- a/webapp/packages/core-localization/src/Locale.ts
+++ b/webapp/packages/core-localization/src/Locale.ts
@@ -6,4 +6,6 @@
  * you may not use this file except in compliance with the License.
  */
 
-export interface Locale { [key: string]: string }
+export interface Locale {
+  [key: string]: string;
+}
diff --git a/webapp/packages/core-localization/src/LocalizationService.test.ts b/webapp/packages/core-localization/src/LocalizationService.test.ts
index cb96b306d2..e487d40922 100644
--- a/webapp/packages/core-localization/src/LocalizationService.test.ts
+++ b/webapp/packages/core-localization/src/LocalizationService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -21,10 +20,7 @@ import { ILocalizationSettings, LocalizationService } from './LocalizationServic
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -45,12 +41,10 @@ test('New settings equal deprecated settings', async () => {
   const settings = app.injector.getServiceByClass(LocalizationService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
   expect(settings.pluginSettings.getValue('defaultLanguage')).toBe(testValue);
   expect(settings.deprecatedPluginSettings.getValue('defaultLanguage')).toBe(testValue);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-localization/src/LocalizationService.ts b/webapp/packages/core-localization/src/LocalizationService.ts
index ce876fd8cc..7758b0bfc2 100644
--- a/webapp/packages/core-localization/src/LocalizationService.ts
+++ b/webapp/packages/core-localization/src/LocalizationService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { action, observable, makeObservable, computed } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -66,7 +65,7 @@ export class LocalizationService extends Bootstrap {
     private readonly sessionResource: SessionResource,
     private readonly pluginManagerService: PluginManagerService,
     private readonly serverConfigResource: ServerConfigResource,
-    private readonly settingsService: SettingsService
+    private readonly settingsService: SettingsService,
   ) {
     super();
 
@@ -93,29 +92,21 @@ export class LocalizationService extends Bootstrap {
     this.localeProviders.push(provider);
   }
 
-  readonly translate = <T extends TLocalizationToken | undefined>(
-    token: T,
-    fallback?: T,
-    args: Record<string | number, any> = {}
-  ): T => {
+  readonly translate = <T extends TLocalizationToken | undefined>(token: T, fallback?: T, args: Record<string | number, any> = {}): T => {
     if (token === undefined) {
       return undefined as T;
     }
 
-    let translation = this.localeMap
-      .get(this.currentLanguage)
-      ?.get(token as TLocalizationToken);
+    let translation = this.localeMap.get(this.currentLanguage)?.get(token as TLocalizationToken);
 
     if (!translation) {
-      translation = this.localeMap
-        .get(DEFAULT_LOCALE_NAME)
-        ?.get(token as TLocalizationToken);
+      translation = this.localeMap.get(DEFAULT_LOCALE_NAME)?.get(token as TLocalizationToken);
     }
 
     if (typeof translation === 'string') {
       translation = Object.entries(args).reduce<string>(
         (translation, [key, value]) => translation.replace(`{arg:${key}}`, value),
-        translation
+        translation,
       ) as string;
 
       translation = translation.replace(/({alias:(\w*?)})/g, (substr, group1, group2) => this.translate(group2));
@@ -137,11 +128,7 @@ export class LocalizationService extends Bootstrap {
   async load(): Promise<void> {
     await this.serverConfigResource.load();
     this.setCurrentLocale(this.defaultLanguage); // set default app locale
-    this.settingsService.registerSettings(
-      LANG_SETTINGS_KEY,
-      this.settings,
-      getDefaultLocalizationSettings
-    ); // load user state locale
+    this.settingsService.registerSettings(LANG_SETTINGS_KEY, this.settings, getDefaultLocalizationSettings); // load user state locale
     this.sessionResource.setDefaultLocale(this.currentLanguage);
     await this.loadLocaleAsync(DEFAULT_LOCALE_NAME);
     await this.loadLocaleAsync(this.currentLanguage);
@@ -184,7 +171,7 @@ export class LocalizationService extends Bootstrap {
     const config = await this.serverConfigResource.load();
 
     if (!config) {
-      throw new Error('Can\'t get server settings');
+      throw new Error("Can't get server settings");
     }
 
     if (!config.supportedLanguages.some(lang => lang.isoCode === key)) {
@@ -208,10 +195,7 @@ export class LocalizationService extends Bootstrap {
           locale.set(key, value);
         }
       }
-      this.localeMap.set(
-        localeKey,
-        locale
-      );
+      this.localeMap.set(localeKey, locale);
     } catch (error: any) {
       this.notificationService.logException(error, 'Locale is not found', '', true);
     }
@@ -222,4 +206,4 @@ function getDefaultLocalizationSettings(): ISettings {
   return {
     language: DEFAULT_LOCALE_NAME,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts
index e3cf1b7e47..c47bb17d5d 100644
--- a/webapp/packages/core-localization/src/locales/it.ts
+++ b/webapp/packages/core-localization/src/locales/it.ts
@@ -45,7 +45,7 @@ export default [
   ['ui_copy_to_clipboard_copied', 'Copiato'],
   ['ui_copy_to_clipboard_failed_to_copy', 'Fallimento della copia'],
   ['ui_clipboard_access_denied_title', 'Accesso negato agli appunti'],
-  ['ui_clipboard_access_denied_message', 'Devi autorizzare l\'accesso agli appunti per utilizzare alcune feature dell\'app'],
+  ['ui_clipboard_access_denied_message', "Devi autorizzare l'accesso agli appunti per utilizzare alcune feature dell'app"],
   ['ui_reveal_password', 'Mostra o nascondi la password'],
   ['ui_capslock_on', 'Caps Lock is on'],
   ['ui_page_not_found', 'Pagina non trovata'],
@@ -88,5 +88,5 @@ export default [
   ['app_root_session_expire_warning_button', 'Sono qua'],
   ['app_root_session_expired_title', 'Sessione scaduta'],
   ['app_root_session_expired_message', 'La sessione è scaduta. Vuoi ricaricare?'],
-  ['core_eventsLog_dbeaverErrorDetails', 'Dettagli dell\'errore'],
+  ['core_eventsLog_dbeaverErrorDetails', "Dettagli dell'errore"],
 ];
diff --git a/webapp/packages/core-localization/src/manifest.ts b/webapp/packages/core-localization/src/manifest.ts
index 55b3f5ba4a..2282af3f2c 100644
--- a/webapp/packages/core-localization/src/manifest.ts
+++ b/webapp/packages/core-localization/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocalizationService } from './LocalizationService';
@@ -15,7 +14,5 @@ export const manifest: PluginManifest = {
     name: 'Core Localization',
   },
 
-  providers: [
-    LocalizationService,
-  ],
+  providers: [LocalizationService],
 };
diff --git a/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.test.ts b/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.test.ts
index 2f0cb45aad..a481cfdf9b 100644
--- a/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.test.ts
+++ b/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { CoreSettingsService } from '@cloudbeaver/core-app';
@@ -22,16 +21,13 @@ import { NavTreeSettings, NavTreeSettingsService } from './NavTreeSettingsServic
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
 const equalConfig = {
   core: {
-    app:{
+    app: {
       navigationTree: {
         childrenLimit: 1,
       },
@@ -53,9 +49,7 @@ test('New settings equal deprecated settings', async () => {
   const coreSettings = app.injector.getServiceByClass(CoreSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
@@ -65,4 +59,4 @@ test('New settings equal deprecated settings', async () => {
   expect(coreSettings.settings.getValue('app.navigationTree.childrenLimit')).toBe(1);
   expect(coreSettings.settings.getValue('app.metadata.editing')).toBe(false);
   expect(coreSettings.settings.getValue('app.metadata.deleting')).toBe(false);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.ts b/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.ts
index fc30b08891..cb9aa4f9b7 100644
--- a/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.ts
+++ b/webapp/packages/core-navigation-tree/src/NavTreeSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_ACTIVE_NODE.ts b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_ACTIVE_NODE.ts
index b6b1557699..ad5ff55ae1 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_ACTIVE_NODE.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_ACTIVE_NODE.ts
@@ -5,7 +5,6 @@
  * 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 interface IDataContextActiveNode {
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODE.ts b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODE.ts
index aef6f19eb6..4f4ee682b6 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODE.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODE.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { NavNode } from './EntityTypes';
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODES.ts b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODES.ts
index d91d7bef38..d81609c253 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODES.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/DATA_CONTEXT_NAV_NODES.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { NavNode } from './EntityTypes';
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
index f3d5a3e045..d0b35ee993 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
@@ -5,33 +5,35 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { GraphQLService, CachedMapResource, ResourceKey, resourceKeyList, ResourceKeyUtils, DetailsError, isResourceAlias, resourceKeyListAliasFactory } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapResource,
+  DetailsError,
+  GraphQLService,
+  isResourceAlias,
+  ResourceKey,
+  resourceKeyList,
+  resourceKeyListAliasFactory,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 
 import type { DBObject } from './EntityTypes';
 import { NavNodeInfoResource } from './NavNodeInfoResource';
 import { NavTreeResource } from './NavTreeResource';
 
-export const DBObjectParentKey = resourceKeyListAliasFactory(
-  '@db-object/parent',
-  (parentId: string) => ({ parentId })
-);
+export const DBObjectParentKey = resourceKeyListAliasFactory('@db-object/parent', (parentId: string) => ({ parentId }));
 
 @injectable()
 export class DBObjectResource extends CachedMapResource<string, DBObject> {
   constructor(
     private readonly graphQLService: GraphQLService,
     private readonly navNodeInfoResource: NavNodeInfoResource,
-    private readonly navTreeResource: NavTreeResource
+    private readonly navTreeResource: NavTreeResource,
   ) {
     super();
 
-    this.addAlias(
-      DBObjectParentKey,
-      param => resourceKeyList(navTreeResource.get(param.options.parentId) || [])
-    );
+    this.addAlias(DBObjectParentKey, param => resourceKeyList(navTreeResource.get(param.options.parentId) || []));
     // this.preloadResource(this.navNodeInfoResource);
     this.navNodeInfoResource.outdateResource(this);
     this.navNodeInfoResource.deleteInResource(this);
@@ -52,10 +54,11 @@ export class DBObjectResource extends CachedMapResource<string, DBObject> {
       }
 
       const key = ResourceKeyUtils.toList(this.transformToKey(originalKey));
-      const parents = [...new Set(
-        key.map(nodeId => this.navNodeInfoResource.get(nodeId)?.parentId)
-          .filter<string>((nodeId): nodeId is string => nodeId !== undefined)
-      )];
+      const parents = [
+        ...new Set(
+          key.map(nodeId => this.navNodeInfoResource.get(nodeId)?.parentId).filter<string>((nodeId): nodeId is string => nodeId !== undefined),
+        ),
+      ];
 
       await this.navTreeResource.load(resourceKeyList(parents));
 
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/ENodeFeature.ts b/webapp/packages/core-navigation-tree/src/NodesManager/ENodeFeature.ts
index 968789b304..4bace2d80e 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/ENodeFeature.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/ENodeFeature.ts
@@ -17,5 +17,5 @@ export enum ENodeFeature {
   'leaf' = 'leaf',
   'canDelete' = 'canDelete',
   'canRename' = 'canRename',
-  'shared' = 'shared'
+  'shared' = 'shared',
 }
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/EObjectFeature.ts b/webapp/packages/core-navigation-tree/src/NodesManager/EObjectFeature.ts
index 319f10d23e..811e55c22e 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/EObjectFeature.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/EObjectFeature.ts
@@ -19,5 +19,5 @@ export enum EObjectFeature {
   'dataSourceTemporary' = 'dataSourceTemporary',
   'dataSourceConnected' = 'dataSourceConnected',
   'entityContainer' = 'entityContainer',
-  'supportsDataFilter' = 'supportsDataFilter'
+  'supportsDataFilter' = 'supportsDataFilter',
 }
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/EntityTypes.ts b/webapp/packages/core-navigation-tree/src/NodesManager/EntityTypes.ts
index e3638c978a..9c7b6b99cb 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/EntityTypes.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/EntityTypes.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavigatorNodeInfo, NavNodeDbObjectInfoFragment } from '@cloudbeaver/core-sdk';
 
 export type NavNodeInfo = NavigatorNodeInfo;
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_FOLDER.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_FOLDER.ts
index 475d1cd3a2..21bf9f734b 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_FOLDER.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_FOLDER.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_FOLDER = 'folder';
\ No newline at end of file
+export const NAV_NODE_TYPE_FOLDER = 'folder';
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_ROOT.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_ROOT.ts
index 850410a745..18562e1dd1 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_ROOT.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NAV_NODE_TYPE_ROOT.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_ROOT = 'Root';
\ No newline at end of file
+export const NAV_NODE_TYPE_ROOT = 'Root';
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeInfoResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeInfoResource.ts
index ce0b4c4f8e..54a180b546 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeInfoResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeInfoResource.ts
@@ -5,12 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable, runInAction } from 'mobx';
 
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
-import { GraphQLService, CachedMapResource, ResourceKey, NavNodeInfoFragment, ResourceKeyUtils, ICachedResourceMetadata, ResourceKeyList, resourceKeyList, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapResource,
+  GraphQLService,
+  ICachedResourceMetadata,
+  NavNodeInfoFragment,
+  ResourceKey,
+  ResourceKeyList,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 import { getPathParents, MetadataMap } from '@cloudbeaver/core-utils';
 
 import type { NavNode } from './EntityTypes';
@@ -25,10 +34,7 @@ interface INodeMetadata extends ICachedResourceMetadata {
 
 @injectable()
 export class NavNodeInfoResource extends CachedMapResource<string, NavNode, Record<string, unknown>, INodeMetadata> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    appAuthService: AppAuthService,
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, appAuthService: AppAuthService) {
     super();
 
     makeObservable(this, {
@@ -149,27 +155,21 @@ export class NavNodeInfoResource extends CachedMapResource<string, NavNode, Reco
     return runInAction(() => {
       const navNode = this.navNodeInfoToNavNode(node, parents[0]?.id);
 
-      this.set(
-        resourceKeyList([...parents.map(node => node.id), navNode.id]),
-        [
-          ...parents.reduce((list, node, index, array) => {
-            list.push(this.navNodeInfoToNavNode(node, array[index + 1]?.id));
-            return list;
-          }, [] as NavNode[]),
-          navNode,
-        ]
-      );
+      this.set(resourceKeyList([...parents.map(node => node.id), navNode.id]), [
+        ...parents.reduce((list, node, index, array) => {
+          list.push(this.navNodeInfoToNavNode(node, array[index + 1]?.id));
+          return list;
+        }, [] as NavNode[]),
+        navNode,
+      ]);
       return navNode;
     });
   }
 
   protected getDefaultMetadata(key: string, metadata: MetadataMap<string, INodeMetadata>): INodeMetadata {
-    return Object.assign(
-      super.getDefaultMetadata(key, metadata),
-      {
-        withDetails: false,
-      }
-    );
+    return Object.assign(super.getDefaultMetadata(key, metadata), {
+      withDetails: false,
+    });
   }
 
   protected dataSet(key: string, value: NavNode): void {
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
index ab6081659e..f0017da1e1 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
@@ -5,17 +5,16 @@
  * 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, Bootstrap } from '@cloudbeaver/core-di';
-import { IExecutor, Executor, IExecutionContextProvider, ISyncContextLoader } from '@cloudbeaver/core-executor';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { Executor, IExecutionContextProvider, IExecutor, ISyncContextLoader } from '@cloudbeaver/core-executor';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { NavigationService } from '@cloudbeaver/core-ui';
 import type { IDataContextProvider } from '@cloudbeaver/core-view';
 
 import { ENodeFeature } from './ENodeFeature';
-import type { NavNodeInfo, NavNode } from './EntityTypes';
+import type { NavNode, NavNodeInfo } from './EntityTypes';
 import { EObjectFeature } from './EObjectFeature';
 import { NavNodeInfoResource, ROOT_NODE_PATH } from './NavNodeInfoResource';
 import { navNodeMoveContext } from './navNodeMoveContext';
@@ -25,7 +24,7 @@ import { ProjectsNavNodeService } from './ProjectsNavNodeService';
 
 export enum NavigationType {
   open,
-  canOpen
+  canOpen,
 }
 
 export interface NavNodeKey {
@@ -91,7 +90,7 @@ export interface INodeNavigationData {
 
 export enum ENodeMoveType {
   CanDrop,
-  Drop
+  Drop,
 }
 
 export interface INodeMoveData {
@@ -105,7 +104,6 @@ export interface INavNodeCache {
   canMove: boolean;
 }
 
-
 @injectable()
 export class NavNodeManagerService extends Bootstrap {
   readonly syncNodeInfoCache: Map<string, INavNodeCache>;
@@ -117,25 +115,18 @@ export class NavNodeManagerService extends Bootstrap {
     readonly navTree: NavTreeResource,
     readonly navNodeInfoResource: NavNodeInfoResource,
     private readonly projectsNavNodeService: ProjectsNavNodeService,
-    navigationService: NavigationService
+    navigationService: NavigationService,
   ) {
     super();
     this.syncNodeInfoCache = new Map();
-    this.onMove = new Executor<INodeMoveData>(null, (current, next) => (
-      current.type === next.type
-      && current.targetNode === next.targetNode
-    ));
+    this.onMove = new Executor<INodeMoveData>(null, (current, next) => current.type === next.type && current.targetNode === next.targetNode);
     this.navigator = new Executor<INodeNavigationData>(
       {
         type: NavigationType.open,
         nodeId: ROOT_NODE_PATH,
         parentId: ROOT_NODE_PATH,
       },
-      (active, current) => (
-        active.projectId === current.projectId
-        && active.nodeId === current.nodeId
-        && active.type === current.type
-      )
+      (active, current) => active.projectId === current.projectId && active.nodeId === current.nodeId && active.type === current.type,
     )
       .before(navigationService.navigationTask, undefined, data => data.type === NavigationType.open)
       .addHandler(this.navigateHandler.bind(this));
@@ -145,9 +136,9 @@ export class NavNodeManagerService extends Bootstrap {
     });
   }
 
-  register(): void { }
+  register(): void {}
 
-  load(): void { }
+  load(): void {}
 
   getNavNodeCache(nodeId: string): INavNodeCache {
     return this.syncNodeInfoCache.get(nodeId) || { canOpen: false, canMove: false };
@@ -287,10 +278,7 @@ export class NavNodeManagerService extends Bootstrap {
       return false;
     }
 
-    return (
-      node.objectFeatures.includes(ENodeFeature.dataContainer)
-      || node.objectFeatures.includes(ENodeFeature.container)
-    );
+    return node.objectFeatures.includes(ENodeFeature.dataContainer) || node.objectFeatures.includes(ENodeFeature.container);
   }
 
   async getNodeDatabaseAlias(nodeId: string): Promise<string> {
@@ -308,8 +296,7 @@ export class NavNodeManagerService extends Bootstrap {
   getNodeContainerInfo(nodeId: string): INodeContainerInfo {
     const initial: INodeContainerInfo = {};
 
-    const scanParents = (res: INodeContainerInfo,
-      nodeId?: string): INodeContainerInfo => {
+    const scanParents = (res: INodeContainerInfo, nodeId?: string): INodeContainerInfo => {
       if (!nodeId) {
         return res;
       }
@@ -339,10 +326,7 @@ export class NavNodeManagerService extends Bootstrap {
     return scanParents(initial, nodeId);
   }
 
-  navigationNavNodeContext: ISyncContextLoader<INodeNavigationContext, INodeNavigationData> = (
-    contexts,
-    data
-  ) => {
+  navigationNavNodeContext: ISyncContextLoader<INodeNavigationContext, INodeNavigationData> = (contexts, data) => {
     let nodeId = data.nodeId;
     let projectId = data.projectId;
     let parentId = data.parentId;
@@ -417,7 +401,7 @@ export class NavNodeManagerService extends Bootstrap {
 
   private async navigateHandler(
     data: INodeNavigationData,
-    contexts: IExecutionContextProvider<INodeNavigationData>
+    contexts: IExecutionContextProvider<INodeNavigationData>,
     // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   ): Promise<void> {
     if (data.type !== NavigationType.open) {
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
index 9021d4c724..443b60683f 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, runInAction } from 'mobx';
 
 import { CoreSettingsService } from '@cloudbeaver/core-app';
@@ -14,7 +13,21 @@ import { injectable } from '@cloudbeaver/core-di';
 import { Executor, ExecutorInterrupter, IExecutionContext, IExecutor } from '@cloudbeaver/core-executor';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { SessionDataResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, ResourceKey, isResourceKeyList, ResourceKeyList, resourceKeyList, NavNodeChildrenQuery as fake, ResourceKeyUtils, ICachedResourceMetadata, CachedMapAllKey, ResourceError, DetailsError, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  DetailsError,
+  NavNodeChildrenQuery as fake,
+  GraphQLService,
+  ICachedResourceMetadata,
+  isResourceKeyList,
+  ResourceError,
+  ResourceKey,
+  ResourceKeyList,
+  resourceKeyList,
+  ResourceKeySimple,
+  ResourceKeyUtils,
+} from '@cloudbeaver/core-sdk';
 import { flat, isDefined, isUndefined, MetadataMap } from '@cloudbeaver/core-utils';
 
 import { NavTreeSettingsService } from '../NavTreeSettingsService';
@@ -51,11 +64,9 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
   readonly onNodeMove: IExecutor<INavNodeMoveData>;
 
   get childrenLimit(): number {
-    return (
-      this.navTreeSettingsService.settings.isValueDefault('childrenLimit')
-        ? this.coreSettingsService.settings.getValue('app.navigationTree.childrenLimit')
-        : this.navTreeSettingsService.settings.getValue('childrenLimit')
-    );
+    return this.navTreeSettingsService.settings.isValueDefault('childrenLimit')
+      ? this.coreSettingsService.settings.getValue('app.navigationTree.childrenLimit')
+      : this.navTreeSettingsService.settings.getValue('childrenLimit');
   }
 
   constructor(
@@ -93,18 +104,21 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
     navNodeInfoResource.connect(this);
     this.outdateResource(navNodeInfoResource);
     this.updateResource(navNodeInfoResource);
-    this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey);
+    this.sync(
+      this.projectInfoResource,
+      () => CachedMapAllKey,
+      () => CachedMapAllKey,
+    );
     this.sessionDataResource.onDataOutdated.addHandler(() => this.markTreeOutdated(resourceKeyList(this.keys)));
-    this.userInfoResource.onUserChange.addHandler(action(() => {
-      this.clear();
-      this.navNodeInfoResource.clear(); // TODO: need more convenient way
-    }));
+    this.userInfoResource.onUserChange.addHandler(
+      action(() => {
+        this.clear();
+        this.navNodeInfoResource.clear(); // TODO: need more convenient way
+      }),
+    );
   }
 
-  async preloadNodeParents(
-    parents: string[],
-    nextNode?: string
-  ): Promise<boolean> {
+  async preloadNodeParents(parents: string[], nextNode?: string): Promise<boolean> {
     if (parents.length === 0) {
       return true;
     }
@@ -212,11 +226,7 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
   }
 
   async moveTo(key: ResourceKeySimple<string>, target: string): Promise<void> {
-    const parents = Array.from(new Set(
-      ResourceKeyUtils
-        .mapArray(key, key => this.navNodeInfoResource.get(key)?.parentId)
-        .filter(isDefined)
-    ));
+    const parents = Array.from(new Set(ResourceKeyUtils.mapArray(key, key => this.navNodeInfoResource.get(key)?.parentId).filter(isDefined)));
 
     await this.performUpdate(resourceKeyList(parents), [], async () => {
       this.markLoading(target, true);
@@ -368,10 +378,9 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
       children.push(...flat(valueObject));
 
       const oldChildren = flat(this.get(keyObject));
-      childrenToRemove.push(...oldChildren.filter<string>((navNodeId): navNodeId is string => (
-        navNodeId !== undefined
-        && !children.includes(navNodeId)
-      )));
+      childrenToRemove.push(
+        ...oldChildren.filter<string>((navNodeId): navNodeId is string => navNodeId !== undefined && !children.includes(navNodeId)),
+      );
     } else {
       valueObject = valueObject as string[];
       children.push(...valueObject);
@@ -399,10 +408,7 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
     this.navNodeInfoResource.delete(items.exclude(key));
   }
 
-  protected async preLoadData(
-    key: ResourceKey<string>,
-    contexts: IExecutionContext<ResourceKey<string>>
-  ): Promise<void> {
+  protected async preLoadData(key: ResourceKey<string>, contexts: IExecutionContext<ResourceKey<string>>): Promise<void> {
     await ResourceKeyUtils.forEachAsync(key, async nodeId => {
       if (this.isAlias(nodeId)) {
         return;
@@ -469,56 +475,39 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
       for (const node of data) {
         const metadata = this.metadata.get(node.parentPath);
 
-        this.setDetails(resourceKeyList([
-          node.navNodeInfo.id,
-          ...node.navNodeChildren.map(node => node.id),
-        ]), metadata.withDetails);
+        this.setDetails(resourceKeyList([node.navNodeInfo.id, ...node.navNodeChildren.map(node => node.id)]), metadata.withDetails);
       }
 
       this.navNodeInfoResource.set(
-        resourceKeyList([
-          ...data.map(data => data.parentPath),
-          ...data.map(data => data.navNodeChildren.map(node => node.id)).flat(),
-        ]), [
+        resourceKeyList([...data.map(data => data.parentPath), ...data.map(data => data.navNodeChildren.map(node => node.id)).flat()]),
+        [
           ...data.map(data => this.navNodeInfoResource.navNodeInfoToNavNode(data.navNodeInfo)).flat(),
-          ...data.map(
-            data => data.navNodeChildren.map(
-              node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath)
-            )
-          ).flat(),
-        ]);
+          ...data.map(data => data.navNodeChildren.map(node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath))).flat(),
+        ],
+      );
 
       this.set(
         resourceKeyList(data.map(data => data.parentPath)),
-        data.map(data => data.navNodeChildren.map(node => node.id))
+        data.map(data => data.navNodeChildren.map(node => node.id)),
       );
     } else {
       const metadata = this.metadata.get(data.parentPath);
 
-      this.setDetails(resourceKeyList([
-        data.navNodeInfo.id,
-        ...data.navNodeChildren.map(node => node.id),
-      ]), metadata.withDetails);
+      this.setDetails(resourceKeyList([data.navNodeInfo.id, ...data.navNodeChildren.map(node => node.id)]), metadata.withDetails);
 
-      this.navNodeInfoResource.set(
-        resourceKeyList([
-          data.parentPath,
-          ...data.navNodeChildren.map(node => node.id),
-        ]), [
-          this.navNodeInfoResource.navNodeInfoToNavNode(data.navNodeInfo),
-          ...data.navNodeChildren.map(node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath)),
-        ]
+      this.navNodeInfoResource.set(resourceKeyList([data.parentPath, ...data.navNodeChildren.map(node => node.id)]), [
+        this.navNodeInfoResource.navNodeInfoToNavNode(data.navNodeInfo),
+        ...data.navNodeChildren.map(node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath)),
+      ]);
+
+      this.set(
+        data.parentPath,
+        data.navNodeChildren.map(node => node.id),
       );
-
-      this.set(data.parentPath, data.navNodeChildren.map(node => node.id));
     }
   }
 
-  private async loadNodeChildren(
-    parentPath: string,
-    offset: number,
-    limit: number
-  ): Promise<NavNodeChildrenQuery> {
+  private async loadNodeChildren(parentPath: string, offset: number, limit: number): Promise<NavNodeChildrenQuery> {
     const metadata = this.metadata.get(parentPath);
     const { navNodeChildren, navNodeInfo } = await this.graphQLService.sdk.navNodeChildren({
       parentPath,
@@ -531,12 +520,9 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
   }
 
   protected getDefaultMetadata(key: string, metadata: MetadataMap<string, INodeMetadata>): INodeMetadata {
-    return Object.assign(
-      super.getDefaultMetadata(key, metadata),
-      {
-        withDetails: false,
-      }
-    );
+    return Object.assign(super.getDefaultMetadata(key, metadata), {
+      withDetails: false,
+    });
   }
 
   protected validateKey(key: string): boolean {
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/ProjectsNavNodeService.ts b/webapp/packages/core-navigation-tree/src/NodesManager/ProjectsNavNodeService.ts
index bcd9cac93f..bbf7a4e0e1 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/ProjectsNavNodeService.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/ProjectsNavNodeService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NAV_NODE_TYPE_PROJECT, ProjectInfo, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
@@ -17,10 +16,7 @@ export class ProjectsNavNodeService {
   projectTypes: string[];
   projectPrefixes: string[];
 
-  constructor(
-    private readonly navNodeInfoResource: NavNodeInfoResource,
-    private readonly projectInfoResource: ProjectInfoResource
-  ) {
+  constructor(private readonly navNodeInfoResource: NavNodeInfoResource, private readonly projectInfoResource: ProjectInfoResource) {
     this.projectTypes = [NAV_NODE_TYPE_PROJECT];
     this.projectPrefixes = ['resource://'];
   }
@@ -47,8 +43,6 @@ export class ProjectsNavNodeService {
   }
 
   getByNodeId(nodeId: string): ProjectInfo | undefined {
-    return this.projectInfoResource.get(
-      this.projectPrefixes.reduce((nodeId, prefix) => nodeId.replace(prefix, ''), nodeId)
-    );
+    return this.projectInfoResource.get(this.projectPrefixes.reduce((nodeId, prefix) => nodeId.replace(prefix, ''), nodeId));
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/extensions/IObjectNavNodeProvider.ts b/webapp/packages/core-navigation-tree/src/NodesManager/extensions/IObjectNavNodeProvider.ts
index 50b4b53b7f..02ebb231e5 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/extensions/IObjectNavNodeProvider.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/extensions/IObjectNavNodeProvider.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 import type { IDataContextActiveNode } from '../DATA_CONTEXT_ACTIVE_NODE';
 
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/getNodesFromContext.ts b/webapp/packages/core-navigation-tree/src/NodesManager/getNodesFromContext.ts
index bfaefe2474..1606b8b8cf 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/getNodesFromContext.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/getNodesFromContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDataContextProvider } from '@cloudbeaver/core-view';
 
 import { DATA_CONTEXT_NAV_NODE } from './DATA_CONTEXT_NAV_NODE';
@@ -26,4 +25,4 @@ export function getNodesFromContext(context: IDataContextProvider): NavNode[] {
   }
 
   return nodes;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/navNodeMoveContext.ts b/webapp/packages/core-navigation-tree/src/NodesManager/navNodeMoveContext.ts
index f740195102..a1ed01f312 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/navNodeMoveContext.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/navNodeMoveContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 
 import type { INodeMoveData } from './NavNodeManagerService';
@@ -15,14 +14,11 @@ interface INavNodeMoveContext {
   setCanMove(value: boolean): void;
 }
 
-export function navNodeMoveContext(
-  contexts: IExecutionContextProvider<INodeMoveData>,
-  data: INodeMoveData
-): INavNodeMoveContext {
+export function navNodeMoveContext(contexts: IExecutionContextProvider<INodeMoveData>, data: INodeMoveData): INavNodeMoveContext {
   return {
     canMove: false,
     setCanMove(value) {
       this.canMove = value;
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/nodeDeleteContext.ts b/webapp/packages/core-navigation-tree/src/NodesManager/nodeDeleteContext.ts
index 04db903780..366b402c14 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/nodeDeleteContext.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/nodeDeleteContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import type { ResourceKey } from '@cloudbeaver/core-sdk';
 
@@ -14,14 +13,11 @@ export interface INodeDeleteContext {
   confirm(): void;
 }
 
-export function nodeDeleteContext(
-  contexts: IExecutionContextProvider<ResourceKey<string>>,
-  data: ResourceKey<string>
-): INodeDeleteContext {
+export function nodeDeleteContext(contexts: IExecutionContextProvider<ResourceKey<string>>, data: ResourceKey<string>): INodeDeleteContext {
   return {
     confirmed: false,
     confirm() {
       this.confirmed = true;
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-navigation-tree/src/index.ts b/webapp/packages/core-navigation-tree/src/index.ts
index ef7945ba01..c76f59c59d 100644
--- a/webapp/packages/core-navigation-tree/src/index.ts
+++ b/webapp/packages/core-navigation-tree/src/index.ts
@@ -22,4 +22,4 @@ export * from './NodesManager/INodeActions';
 
 export * from './NodesManager/NodeManagerUtils';
 export * from './NodesManager/EntityTypes';
-export * from './NodesManager/ProjectsNavNodeService';
\ No newline at end of file
+export * from './NodesManager/ProjectsNavNodeService';
diff --git a/webapp/packages/core-navigation-tree/src/manifest.ts b/webapp/packages/core-navigation-tree/src/manifest.ts
index 6462aee266..38b1081d1f 100644
--- a/webapp/packages/core-navigation-tree/src/manifest.ts
+++ b/webapp/packages/core-navigation-tree/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { NavTreeSettingsService } from './NavTreeSettingsService';
@@ -20,12 +19,5 @@ export const coreNavigationTree: PluginManifest = {
     name: 'Core Navigation Tree',
   },
 
-  providers: [
-    NavTreeSettingsService,
-    NavNodeManagerService,
-    DBObjectResource,
-    NavNodeInfoResource,
-    NavTreeResource,
-    ProjectsNavNodeService,
-  ],
+  providers: [NavTreeSettingsService, NavNodeManagerService, DBObjectResource, NavNodeInfoResource, NavTreeResource, ProjectsNavNodeService],
 };
diff --git a/webapp/packages/core-notifications/src/Notifications.tsx b/webapp/packages/core-notifications/src/Notifications.tsx
index d3dda1619a..e031e4e6d9 100644
--- a/webapp/packages/core-notifications/src/Notifications.tsx
+++ b/webapp/packages/core-notifications/src/Notifications.tsx
@@ -5,7 +5,6 @@
  * 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 { Portal } from 'reakit/Portal';
 import styled, { css } from 'reshadow';
@@ -13,18 +12,17 @@ import styled, { css } from 'reshadow';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 
-
 import { NotificationsItem } from './NotificationsItem/NotificationsItem';
 
 const styles = css`
-    notifications {
-      composes: theme-typography from global;
-      position: absolute;
-      bottom:0;
-      left: 0;
-      z-index: 1000; /* modal dialogs is 999, but more correct way is place notifications after dialogs in the dom */
-    }
- `;
+  notifications {
+    composes: theme-typography from global;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 1000; /* modal dialogs is 999, but more correct way is place notifications after dialogs in the dom */
+  }
+`;
 
 export const Notifications = observer(function Notifications() {
   const notificationService = useService(NotificationService);
@@ -36,6 +34,6 @@ export const Notifications = observer(function Notifications() {
           <NotificationsItem key={notification.id} notification={notification} />
         ))}
       </notifications>
-    </Portal>
+    </Portal>,
   );
 });
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx
index 1a63531c3a..dea16631ce 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx
+++ b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx
@@ -5,12 +5,11 @@
  * 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 from 'reshadow';
 
-import { useClipboard, Button, Iframe, Textarea, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Button, Iframe, Textarea, useClipboard, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 
 import { ErrorModel, IErrorInfo } from './ErrorModel';
@@ -19,63 +18,45 @@ import { styles } from './styles';
 function DisplayErrorInfo({ error }: { error: IErrorInfo }) {
   return styled(useStyles(styles))(
     <>
-      <property>
-        {error.isHtml ? (
-          <Iframe srcDoc={error.message} />
-        ) : (
-          <message>
-            {error.message}
-          </message>
-        )}
-      </property>
+      <property>{error.isHtml ? <Iframe srcDoc={error.message} /> : <message>{error.message}</message>}</property>
       {error.stackTrace && (
         <property>
           <Textarea value={error.stackTrace} style={styles} readOnly embedded />
         </property>
       )}
-    </>
+    </>,
   );
 }
 
 export const ErrorDetailsDialog: DialogComponent<Error | string, null> = observer(function ErrorDetailsDialog(props) {
   const translate = useTranslate();
 
-  const error = useMemo(
-    () => new ErrorModel({ error: props.payload }),
-    [props.payload]
-  );
+  const error = useMemo(() => new ErrorModel({ error: props.payload }), [props.payload]);
 
   const copy = useClipboard();
-  const copyHandler = useCallback(
-    () => copy(error.textToCopy, true),
-    [error, copy]
-  );
+  const copyHandler = useCallback(() => copy(error.textToCopy, true), [error, copy]);
 
   return styled(useStyles(styles))(
-    <CommonDialogWrapper size='large'>
-      <CommonDialogHeader
-        title="core_eventsLog_dbeaverErrorDetails"
-        icon='/icons/error_icon.svg'
-        bigIcon
-        onReject={props.rejectDialog}
-      />
+    <CommonDialogWrapper size="large">
+      <CommonDialogHeader title="core_eventsLog_dbeaverErrorDetails" icon="/icons/error_icon.svg" bigIcon onReject={props.rejectDialog} />
       <CommonDialogBody>
-        {error.errors.map(
-          (error, id) => (
-            <div key={id}>
-              {id > 0 && <hr />}
-              <DisplayErrorInfo error={error} />
-            </div>
-          )
-        )}
+        {error.errors.map((error, id) => (
+          <div key={id}>
+            {id > 0 && <hr />}
+            <DisplayErrorInfo error={error} />
+          </div>
+        ))}
       </CommonDialogBody>
       <CommonDialogFooter>
         {error.textToCopy && (
-          <Button type="button" mod={['outlined']} onClick={copyHandler}>{translate('ui_copy_to_clipboard')}</Button>
+          <Button type="button" mod={['outlined']} onClick={copyHandler}>
+            {translate('ui_copy_to_clipboard')}
+          </Button>
         )}
-        <Button type="button" mod={['unelevated']} onClick={props.rejectDialog}>{translate('ui_close')}</Button>
+        <Button type="button" mod={['unelevated']} onClick={props.rejectDialog}>
+          {translate('ui_close')}
+        </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-}
-);
+});
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
index 6d142a8d51..b7b1dee628 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
+++ b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { DetailsError, GQLError } from '@cloudbeaver/core-sdk';
 import { errorOf } from '@cloudbeaver/core-utils';
 
@@ -22,9 +21,7 @@ export interface IErrorModelOptions {
 export class ErrorModel {
   errors: IErrorInfo[] = [];
   get textToCopy(): string {
-    return this.errors
-      .map(error => `${error.message}\n${error.stackTrace}`)
-      .join('------------------\n');
+    return this.errors.map(error => `${error.message}\n${error.stackTrace}`).join('------------------\n');
   }
 
   constructor({ error }: IErrorModelOptions) {
@@ -32,12 +29,14 @@ export class ErrorModel {
     const detailsError = errorOf(error, DetailsError);
     // text error
     if (typeof error === 'string') {
-      this.errors = [{
-        message: error,
-      }];
-    } else if (gqlError) { // GQL Error
-      this.errors = (gqlError.response.errors || [])
-        .map<IErrorInfo>(error => ({
+      this.errors = [
+        {
+          message: error,
+        },
+      ];
+    } else if (gqlError) {
+      // GQL Error
+      this.errors = (gqlError.response.errors || []).map<IErrorInfo>(error => ({
         message: error.message,
         stackTrace: error.extensions.stackTrace || '',
       }));
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/styles.ts b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/styles.ts
index 1c5a41400e..6c3815b8dd 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/styles.ts
+++ b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/styles.ts
@@ -5,11 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const styles = css`
-  code, message {
+  code,
+  message {
     display: block;
     white-space: pre-wrap;
   }
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts b/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
index a9beb4f597..244e685e68 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
+++ b/webapp/packages/core-notifications/src/NotificationsItem/NotificationItemController.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
@@ -35,11 +34,7 @@ export class NotificationItemController implements IInitializableController {
       this.handleShowDetails = this.showDetails.bind(this);
     }
 
-    if (
-      notification.type !== ENotificationType.Error
-      && !notification.persistent
-      && notification.autoClose !== false
-    ) {
+    if (notification.type !== ENotificationType.Error && !notification.persistent && notification.autoClose !== false) {
       this.closeAfter = FadeTimeout;
     }
   }
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/NotificationsItem.tsx b/webapp/packages/core-notifications/src/NotificationsItem/NotificationsItem.tsx
index 697f3d7233..252039bf0f 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/NotificationsItem.tsx
+++ b/webapp/packages/core-notifications/src/NotificationsItem/NotificationsItem.tsx
@@ -5,7 +5,6 @@
  * 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 { Snackbar } from '@cloudbeaver/core-blocks';
diff --git a/webapp/packages/core-plugin/src/PluginManagerService.ts b/webapp/packages/core-plugin/src/PluginManagerService.ts
index a31652568c..9bdfa81256 100644
--- a/webapp/packages/core-plugin/src/PluginManagerService.ts
+++ b/webapp/packages/core-plugin/src/PluginManagerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ProductManagerService } from '@cloudbeaver/core-product';
 
@@ -13,7 +12,7 @@ import { PluginSettings } from './PluginSettings';
 
 @injectable()
 export class PluginManagerService {
-  constructor(private readonly productManagerService: ProductManagerService) { }
+  constructor(private readonly productManagerService: ProductManagerService) {}
 
   getCoreSettings<T>(scope: string, defaults: T) {
     return new PluginSettings(this.productManagerService.settings, 'core.' + scope, defaults);
diff --git a/webapp/packages/core-plugin/src/PluginSettings.ts b/webapp/packages/core-plugin/src/PluginSettings.ts
index 423bd212e7..3ae963e245 100644
--- a/webapp/packages/core-plugin/src/PluginSettings.ts
+++ b/webapp/packages/core-plugin/src/PluginSettings.ts
@@ -5,15 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ISettingsSource, SettingsResolverSource } from '@cloudbeaver/core-settings';
 
 export class PluginSettings<T> extends SettingsResolverSource implements ISettingsSource {
-  constructor(
-    private readonly source: ISettingsSource,
-    private readonly scope: string,
-    private readonly defaults: T
-  ) {
+  constructor(private readonly source: ISettingsSource, private readonly scope: string, private readonly defaults: T) {
     super();
   }
 
diff --git a/webapp/packages/core-plugin/src/manifest.ts b/webapp/packages/core-plugin/src/manifest.ts
index 12ed85cf1a..a0b6935874 100644
--- a/webapp/packages/core-plugin/src/manifest.ts
+++ b/webapp/packages/core-plugin/src/manifest.ts
@@ -5,18 +5,14 @@
  * 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 { PluginManagerService } from './PluginManagerService';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Plugin',
   },
 
-  providers: [
-    PluginManagerService,
-  ],
+  providers: [PluginManagerService],
 };
diff --git a/webapp/packages/core-product/src/ProductManagerService.ts b/webapp/packages/core-product/src/ProductManagerService.ts
index 434ed3dd0d..9a514ef64a 100644
--- a/webapp/packages/core-product/src/ProductManagerService.ts
+++ b/webapp/packages/core-product/src/ProductManagerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerService } from '@cloudbeaver/core-root';
 import { parseJSONFlat } from '@cloudbeaver/core-utils';
@@ -21,10 +20,6 @@ export class ProductManagerService {
   }
 
   setSettings(object: any) {
-    parseJSONFlat(
-      object,
-      this.settings.setSelfValue.bind(this.settings),
-      undefined
-    );
+    parseJSONFlat(object, this.settings.setSelfValue.bind(this.settings), undefined);
   }
 }
diff --git a/webapp/packages/core-product/src/ProductSettingsService.ts b/webapp/packages/core-product/src/ProductSettingsService.ts
index 04a9815955..545fb0a351 100644
--- a/webapp/packages/core-product/src/ProductSettingsService.ts
+++ b/webapp/packages/core-product/src/ProductSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SettingsSource } from '@cloudbeaver/core-settings';
 
diff --git a/webapp/packages/core-product/src/manifest.ts b/webapp/packages/core-product/src/manifest.ts
index 3a2112cdf0..9aa0158c52 100644
--- a/webapp/packages/core-product/src/manifest.ts
+++ b/webapp/packages/core-product/src/manifest.ts
@@ -5,21 +5,15 @@
  * 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 { ProductManagerService } from './ProductManagerService';
 import { ProductSettingsService } from './ProductSettingsService';
 
-
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Product',
   },
 
-  providers: [
-    ProductManagerService,
-    ProductSettingsService,
-  ],
+  providers: [ProductManagerService, ProductSettingsService],
 };
diff --git a/webapp/packages/core-projects/src/LocaleService.ts b/webapp/packages/core-projects/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/core-projects/src/LocaleService.ts
+++ b/webapp/packages/core-projects/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-projects/src/NAV_NODE_TYPE_PROJECT.ts b/webapp/packages/core-projects/src/NAV_NODE_TYPE_PROJECT.ts
index ed15b1f341..a0a78ee13b 100644
--- a/webapp/packages/core-projects/src/NAV_NODE_TYPE_PROJECT.ts
+++ b/webapp/packages/core-projects/src/NAV_NODE_TYPE_PROJECT.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_PROJECT = 'project';
\ No newline at end of file
+export const NAV_NODE_TYPE_PROJECT = 'project';
diff --git a/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts b/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts
index c0a1ae1795..11e0c71393 100644
--- a/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts
+++ b/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts
@@ -8,4 +8,4 @@
 
 export function getProjectNodeId(projectId: string): string {
   return `resource://${projectId}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-projects/src/ProjectInfoEventHandler.ts b/webapp/packages/core-projects/src/ProjectInfoEventHandler.ts
index e047f716be..e82e142d59 100644
--- a/webapp/packages/core-projects/src/ProjectInfoEventHandler.ts
+++ b/webapp/packages/core-projects/src/ProjectInfoEventHandler.ts
@@ -5,22 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { SessionEventSource, TopicEventHandler, ISessionEvent, ClientEventId, SessionEventTopic, SessionEventId } from '@cloudbeaver/core-root';
+import { ClientEventId, ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic, TopicEventHandler } from '@cloudbeaver/core-root';
 import type { CbProjectsActiveEvent, CbProjectUpdateEvent as IProjectInfoEvent } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 export { IProjectInfoEvent };
 
 @injectable()
-export class ProjectInfoEventHandler
-  extends TopicEventHandler<IProjectInfoEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+export class ProjectInfoEventHandler extends TopicEventHandler<IProjectInfoEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
   private lastActiveProjects: string[];
 
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbProjects, sessionEventSource);
     this.lastActiveProjects = [];
 
diff --git a/webapp/packages/core-projects/src/ProjectInfoResource.ts b/webapp/packages/core-projects/src/ProjectInfoResource.ts
index 021e499855..5ce6fa6ba9 100644
--- a/webapp/packages/core-projects/src/ProjectInfoResource.ts
+++ b/webapp/packages/core-projects/src/ProjectInfoResource.ts
@@ -5,11 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppAuthService, UserInfoResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { GraphQLService, ProjectInfo as SchemaProjectInfo, CachedMapResource, CachedMapAllKey, resourceKeyList, RmResourceType } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  resourceKeyList,
+  RmResourceType,
+  ProjectInfo as SchemaProjectInfo,
+} from '@cloudbeaver/core-sdk';
 
 export type ProjectInfo = SchemaProjectInfo;
 export type ProjectInfoResourceType = RmResourceType;
@@ -24,7 +30,11 @@ export class ProjectInfoResource extends CachedMapResource<string, ProjectInfo>
   ) {
     super(() => new Map(), []);
 
-    this.sync(this.userInfoResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      this.userInfoResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
     appAuthService.requireAuthentication(this);
     serverConfigResource.requirePublic(this);
     this.userInfoResource.onUserChange.addPostHandler(() => {
@@ -77,4 +87,4 @@ export function isGlobalProject(obj?: ProjectInfo): obj is ProjectInfo {
 
 export function isSharedProject(obj?: ProjectInfo): obj is ProjectInfo {
   return obj?.shared === true;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-projects/src/ProjectsService.ts b/webapp/packages/core-projects/src/ProjectsService.ts
index 27c7bb02ba..8b30461c74 100644
--- a/webapp/packages/core-projects/src/ProjectsService.ts
+++ b/webapp/packages/core-projects/src/ProjectsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { UserDataService, UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -47,9 +46,7 @@ export class ProjectsService extends Dependency {
     let activeProjects: ProjectInfo[] = [];
 
     if (this.activeProjectIds.length > 0) {
-      activeProjects = this.projectInfoResource
-        .get(resourceKeyList(this.activeProjectIds))
-        .filter(Boolean) as ProjectInfo[];
+      activeProjects = this.projectInfoResource.get(resourceKeyList(this.activeProjectIds)).filter(Boolean) as ProjectInfo[];
     }
 
     if (activeProjects.length === 0) {
@@ -87,9 +84,13 @@ export class ProjectsService extends Dependency {
   }
 
   get userProjectsSettings(): IProjectsUserSettings {
-    return this.userDataService.getUserData('projects-settings', () => ({
-      activeProjectIds: [],
-    }), data => Array.isArray(data.activeProjectIds));
+    return this.userDataService.getUserData(
+      'projects-settings',
+      () => ({
+        activeProjectIds: [],
+      }),
+      data => Array.isArray(data.activeProjectIds),
+    );
   }
 
   readonly onActiveProjectChange: IExecutor<IActiveProjectData>;
@@ -102,7 +103,7 @@ export class ProjectsService extends Dependency {
     private readonly userDataService: UserDataService,
     private readonly projectInfoEventHandler: ProjectInfoEventHandler,
     private readonly dataSynchronizationService: DataSynchronizationService,
-    navigationService: NavigationService
+    navigationService: NavigationService,
   ) {
     super();
     this.getActiveProjectTask = new SyncExecutor();
@@ -142,25 +143,33 @@ export class ProjectsService extends Dependency {
       }
     });
 
-    this.projectInfoEventHandler.onEvent<IProjectInfoEvent>(ServerEventId.CbRmProjectAdded, () => {
-      this.projectInfoResource.markOutdated();
-    }, undefined, this.projectInfoResource);
+    this.projectInfoEventHandler.onEvent<IProjectInfoEvent>(
+      ServerEventId.CbRmProjectAdded,
+      () => {
+        this.projectInfoResource.markOutdated();
+      },
+      undefined,
+      this.projectInfoResource,
+    );
 
-    this.projectInfoEventHandler.onEvent<IProjectInfoEvent>(ServerEventId.CbRmProjectRemoved, key => {
-      if (this.activeProjectIds.includes(key.projectId)) {
-        const project = this.projectInfoResource.get(key.projectId);
+    this.projectInfoEventHandler.onEvent<IProjectInfoEvent>(
+      ServerEventId.CbRmProjectRemoved,
+      key => {
+        if (this.activeProjectIds.includes(key.projectId)) {
+          const project = this.projectInfoResource.get(key.projectId);
 
-        this.dataSynchronizationService
-          .requestSynchronization('project', project?.name ?? '')
-          .then(state => {
+          this.dataSynchronizationService.requestSynchronization('project', project?.name ?? '').then(state => {
             if (state) {
               this.projectInfoResource.delete(key.projectId);
             }
           });
-      } else {
-        this.projectInfoResource.delete(key.projectId);
-      }
-    }, undefined, this.projectInfoResource);
+        } else {
+          this.projectInfoResource.delete(key.projectId);
+        }
+      },
+      undefined,
+      this.projectInfoResource,
+    );
 
     makeObservable(this, {
       userProject: computed,
@@ -199,4 +208,4 @@ export class ProjectsService extends Dependency {
   async load(): Promise<void> {
     await this.projectInfoResource.load(CachedMapAllKey);
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-projects/src/activeProjectsContext.ts b/webapp/packages/core-projects/src/activeProjectsContext.ts
index 8bf97d1720..59a8975405 100644
--- a/webapp/packages/core-projects/src/activeProjectsContext.ts
+++ b/webapp/packages/core-projects/src/activeProjectsContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ProjectInfo } from './ProjectInfoResource';
 
 interface IActiveProjectsContext {
@@ -13,11 +12,11 @@ interface IActiveProjectsContext {
   setActiveProjects(projects: ProjectInfo[]): void;
 }
 
-export function activeProjectsContext():IActiveProjectsContext {
+export function activeProjectsContext(): IActiveProjectsContext {
   return {
     activeProjects: [],
     setActiveProjects(projects) {
       this.activeProjects = projects;
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-projects/src/createResourceOfType.ts b/webapp/packages/core-projects/src/createResourceOfType.ts
index cb9e6340aa..a8a3adc34d 100644
--- a/webapp/packages/core-projects/src/createResourceOfType.ts
+++ b/webapp/packages/core-projects/src/createResourceOfType.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ProjectInfoResourceType } from './ProjectInfoResource';
 
 export function createResourceOfType(resourceType: ProjectInfoResourceType, name: string): string {
   const extension = resourceType.fileExtensions[0];
   return `${name}${extension ? '.' + extension : ''}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-projects/src/extensions/IProjectProvider.ts b/webapp/packages/core-projects/src/extensions/IProjectProvider.ts
index f68bc0c07d..011aa5deb1 100644
--- a/webapp/packages/core-projects/src/extensions/IProjectProvider.ts
+++ b/webapp/packages/core-projects/src/extensions/IProjectProvider.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const projectProviderSymbol = Symbol('@extension/ProjectProvider');
 
diff --git a/webapp/packages/core-projects/src/extensions/IProjectSetter.ts b/webapp/packages/core-projects/src/extensions/IProjectSetter.ts
index 94a73339b1..e9d25feedb 100644
--- a/webapp/packages/core-projects/src/extensions/IProjectSetter.ts
+++ b/webapp/packages/core-projects/src/extensions/IProjectSetter.ts
@@ -5,16 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
-
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const projectSetterSymbol = Symbol('@extension/ProjectSetter');
 
-export type IProjectSetter<T = never> = (
-  projectId: string | null,
-  context: T
-) => Promise<boolean> | boolean;
+export type IProjectSetter<T = never> = (projectId: string | null, context: T) => Promise<boolean> | boolean;
 
 export function projectSetter<T>(setter: IProjectSetter<T>) {
   return createExtension<T>(setter, projectSetterSymbol);
diff --git a/webapp/packages/core-projects/src/extensions/IProjectSetterState.ts b/webapp/packages/core-projects/src/extensions/IProjectSetterState.ts
index 1f4df1190b..8d4108c6b1 100644
--- a/webapp/packages/core-projects/src/extensions/IProjectSetterState.ts
+++ b/webapp/packages/core-projects/src/extensions/IProjectSetterState.ts
@@ -5,9 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { createExtension, isExtension, IExtension } from '@cloudbeaver/core-extensions';
-
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
 const projectSetterStateSymbol = Symbol('@extension/ProjectSetterState');
 
diff --git a/webapp/packages/core-projects/src/isResourceOfType.ts b/webapp/packages/core-projects/src/isResourceOfType.ts
index c7130ef311..2e9f076aba 100644
--- a/webapp/packages/core-projects/src/isResourceOfType.ts
+++ b/webapp/packages/core-projects/src/isResourceOfType.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ProjectInfoResourceType } from './ProjectInfoResource';
 
 export function isResourceOfType(resourceType: ProjectInfoResourceType, name: string): boolean {
-  return resourceType.fileExtensions
-    .some(type => name.endsWith(`.${type}`));
-}
\ No newline at end of file
+  return resourceType.fileExtensions.some(type => name.endsWith(`.${type}`));
+}
diff --git a/webapp/packages/core-projects/src/locales/en.ts b/webapp/packages/core-projects/src/locales/en.ts
index ee2c78c4e3..85fd8b598d 100644
--- a/webapp/packages/core-projects/src/locales/en.ts
+++ b/webapp/packages/core-projects/src/locales/en.ts
@@ -1,3 +1 @@
-export default [
-  ['core_projects_no_default_project', 'Project is not found'],
-];
+export default [['core_projects_no_default_project', 'Project is not found']];
diff --git a/webapp/packages/core-projects/src/locales/it.ts b/webapp/packages/core-projects/src/locales/it.ts
index ee2c78c4e3..85fd8b598d 100644
--- a/webapp/packages/core-projects/src/locales/it.ts
+++ b/webapp/packages/core-projects/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-  ['core_projects_no_default_project', 'Project is not found'],
-];
+export default [['core_projects_no_default_project', 'Project is not found']];
diff --git a/webapp/packages/core-projects/src/locales/ru.ts b/webapp/packages/core-projects/src/locales/ru.ts
index 04eb92e69d..b851ce8bb5 100644
--- a/webapp/packages/core-projects/src/locales/ru.ts
+++ b/webapp/packages/core-projects/src/locales/ru.ts
@@ -1,3 +1 @@
-export default [
-  ['core_projects_no_default_project', 'Проект не найден'],
-];
+export default [['core_projects_no_default_project', 'Проект не найден']];
diff --git a/webapp/packages/core-projects/src/locales/zh.ts b/webapp/packages/core-projects/src/locales/zh.ts
index ee2c78c4e3..85fd8b598d 100644
--- a/webapp/packages/core-projects/src/locales/zh.ts
+++ b/webapp/packages/core-projects/src/locales/zh.ts
@@ -1,3 +1 @@
-export default [
-  ['core_projects_no_default_project', 'Project is not found'],
-];
+export default [['core_projects_no_default_project', 'Project is not found']];
diff --git a/webapp/packages/core-projects/src/manifest.ts b/webapp/packages/core-projects/src/manifest.ts
index 8bc12121e5..30b0f361fd 100644
--- a/webapp/packages/core-projects/src/manifest.ts
+++ b/webapp/packages/core-projects/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -18,10 +17,5 @@ export const manifest: PluginManifest = {
     name: 'Core Projects',
   },
 
-  providers: [
-    ProjectInfoResource,
-    ProjectsService,
-    LocaleService,
-    ProjectInfoEventHandler,
-  ],
+  providers: [ProjectInfoResource, ProjectsService, LocaleService, ProjectInfoEventHandler],
 };
diff --git a/webapp/packages/core-resource-manager/src/EProjectPermission.ts b/webapp/packages/core-resource-manager/src/EProjectPermission.ts
index 7c71ad71cf..dbf3ecad9f 100644
--- a/webapp/packages/core-resource-manager/src/EProjectPermission.ts
+++ b/webapp/packages/core-resource-manager/src/EProjectPermission.ts
@@ -10,5 +10,5 @@ export enum EProjectPermission {
   ConnectionRead = 'project-datasource-view',
   ConnectionEdit = 'project-datasource-edit',
   ResourceRead = 'project-resource-view',
-  ResourceEdit = 'project-resource-edit'
-}
\ No newline at end of file
+  ResourceEdit = 'project-resource-edit',
+}
diff --git a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_FOLDER.ts b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_FOLDER.ts
index 3ec12fc6a3..46b374f289 100644
--- a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_FOLDER.ts
+++ b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_FOLDER.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_RM_FOLDER = 'rm.folder';
\ No newline at end of file
+export const NAV_NODE_TYPE_RM_FOLDER = 'rm.folder';
diff --git a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_PROJECT.ts b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_PROJECT.ts
index 957e80a746..5e290baa23 100644
--- a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_PROJECT.ts
+++ b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_PROJECT.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_RM_PROJECT = 'rm.project';
\ No newline at end of file
+export const NAV_NODE_TYPE_RM_PROJECT = 'rm.project';
diff --git a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_RESOURCE.ts b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_RESOURCE.ts
index ab5150e114..adf228ee9f 100644
--- a/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_RESOURCE.ts
+++ b/webapp/packages/core-resource-manager/src/NAV_NODE_TYPE_RM_RESOURCE.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_RM_RESOURCE = 'rm.resource';
\ No newline at end of file
+export const NAV_NODE_TYPE_RM_RESOURCE = 'rm.resource';
diff --git a/webapp/packages/core-resource-manager/src/PluginBootstrap.ts b/webapp/packages/core-resource-manager/src/PluginBootstrap.ts
index c739ac4941..4201961ca3 100644
--- a/webapp/packages/core-resource-manager/src/PluginBootstrap.ts
+++ b/webapp/packages/core-resource-manager/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 
@@ -14,21 +13,17 @@ import { RESOURCES_NODE_PATH } from './RESOURCES_NODE_PATH';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly projectsNavNodeService: ProjectsNavNodeService
-  ) {
+  constructor(private readonly projectsNavNodeService: ProjectsNavNodeService) {
     super();
   }
 
   register(): void | Promise<void> {
     this.addRmProjectIds();
   }
-  load(): void | Promise<void> {
-  }
+  load(): void | Promise<void> {}
 
   private addRmProjectIds() {
     this.projectsNavNodeService.addProjectType(NAV_NODE_TYPE_RM_PROJECT);
     this.projectsNavNodeService.addProjectPrefix(RESOURCES_NODE_PATH + '/');
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-resource-manager/src/ProjectPermissionsResource.ts b/webapp/packages/core-resource-manager/src/ProjectPermissionsResource.ts
index bca7ce3039..16b0e60f6a 100644
--- a/webapp/packages/core-resource-manager/src/ProjectPermissionsResource.ts
+++ b/webapp/packages/core-resource-manager/src/ProjectPermissionsResource.ts
@@ -5,21 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { PermissionInfo } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedDataResource } from '@cloudbeaver/core-sdk';
+import { CachedDataResource, GraphQLService } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class ProjectPermissionsResource extends CachedDataResource<PermissionInfo[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    serverConfigResource: ServerConfigResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, serverConfigResource: ServerConfigResource) {
     super(() => []);
 
-    this.sync(serverConfigResource, () => {}, () => {});
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => {},
+    );
   }
 
   protected async loader(): Promise<PermissionInfo[]> {
diff --git a/webapp/packages/core-resource-manager/src/RESOURCES_NODE_PATH.ts b/webapp/packages/core-resource-manager/src/RESOURCES_NODE_PATH.ts
index 7c697c78a4..cb66fe024f 100644
--- a/webapp/packages/core-resource-manager/src/RESOURCES_NODE_PATH.ts
+++ b/webapp/packages/core-resource-manager/src/RESOURCES_NODE_PATH.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const RESOURCES_NODE_PATH = 'ext://resources';
\ No newline at end of file
+export const RESOURCES_NODE_PATH = 'ext://resources';
diff --git a/webapp/packages/core-resource-manager/src/ResourceManagerEventHandler.ts b/webapp/packages/core-resource-manager/src/ResourceManagerEventHandler.ts
index 292339b8e1..f2f0cce733 100644
--- a/webapp/packages/core-resource-manager/src/ResourceManagerEventHandler.ts
+++ b/webapp/packages/core-resource-manager/src/ResourceManagerEventHandler.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { ISessionEvent, SessionEventSource, TopicEventHandler, SessionEventTopic, SessionEventId } from '@cloudbeaver/core-root';
+import { ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic, TopicEventHandler } from '@cloudbeaver/core-root';
 import type { CbrmEvent as IResourceManagerEvent } from '@cloudbeaver/core-sdk';
 
 @injectable()
-export class ResourceManagerEventHandler
-  extends TopicEventHandler<IResourceManagerEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+export class ResourceManagerEventHandler extends TopicEventHandler<IResourceManagerEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbScripts, sessionEventSource);
   }
 
diff --git a/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts b/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
index c49ecec3c4..a67ccfdcdf 100644
--- a/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
+++ b/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
@@ -5,12 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import { DataSynchronizationService, ServerEventId } from '@cloudbeaver/core-root';
-import { CachedResourceIncludeArgs, CachedTreeChildrenKey, CachedTreeResource, DetailsError, GetResourceListQueryVariables, GraphQLService, ResourceKey, resourceKeyList, ResourceKeyUtils, RmResource } from '@cloudbeaver/core-sdk';
+import {
+  CachedResourceIncludeArgs,
+  CachedTreeChildrenKey,
+  CachedTreeResource,
+  DetailsError,
+  GetResourceListQueryVariables,
+  GraphQLService,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyUtils,
+  RmResource,
+} from '@cloudbeaver/core-sdk';
 import { createPath, getPathParent, getPathParts } from '@cloudbeaver/core-utils';
 
 import { ResourceManagerEventHandler } from './ResourceManagerEventHandler';
@@ -48,13 +58,11 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
         const parent = getPathParent(key);
 
         if (this.isInUse(key)) {
-          dataSynchronizationService
-            .requestSynchronization('resource', key)
-            .then(async state => {
-              if (state && !this.isOutdated(parent)) {
-                await this.load(key);
-              }
-            });
+          dataSynchronizationService.requestSynchronization('resource', key).then(async state => {
+            if (state && !this.isOutdated(parent)) {
+              await this.load(key);
+            }
+          });
         } else {
           if (!this.isOutdated(parent)) {
             await this.load(key);
@@ -62,49 +70,45 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
         }
       },
       data => getRmResourcePath(data.projectId, data.resourcePath),
-      this
+      this,
     );
 
     resourceManagerEventHandler.onEvent<string>(
       ServerEventId.CbRmResourceUpdated,
       key => {
         if (this.isInUse(key)) {
-          dataSynchronizationService
-            .requestSynchronization('resource', key)
-            .then(state => {
-              if (state) {
-                this.onDataUpdate.execute(key);
-                this.markOutdated(key);
-              }
-            });
+          dataSynchronizationService.requestSynchronization('resource', key).then(state => {
+            if (state) {
+              this.onDataUpdate.execute(key);
+              this.markOutdated(key);
+            }
+          });
         } else {
           this.onDataUpdate.execute(key);
           this.markOutdated(key);
         }
       },
       data => getRmResourcePath(data.projectId, data.resourcePath),
-      this
+      this,
     );
 
     resourceManagerEventHandler.onEvent<string>(
       ServerEventId.CbRmResourceDeleted,
       key => {
         if (this.isInUse(key)) {
-          dataSynchronizationService
-            .requestSynchronization('resource', key)
-            .then(state => {
-              if (state) {
-                this.delete(key);
-                this.onDataUpdate.execute(key);
-              }
-            });
+          dataSynchronizationService.requestSynchronization('resource', key).then(state => {
+            if (state) {
+              this.delete(key);
+              this.onDataUpdate.execute(key);
+            }
+          });
         } else {
           this.delete(key);
           this.onDataUpdate.execute(key);
         }
       },
       data => getRmResourcePath(data.projectId, data.resourcePath),
-      this
+      this,
     );
   }
 
@@ -125,10 +129,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
     await this.load(to);
   }
 
-  async setProperties(
-    key: string,
-    diff: Record<string, any>
-  ): Promise<Record<string, any>> {
+  async setProperties(key: string, diff: Record<string, any>): Promise<Record<string, any>> {
     const propertiesPatch: Record<string, any> = {};
     const elements = await this.load(key, ['includeProperties']);
     const properties = elements.properties;
@@ -136,10 +137,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
 
     await this.performUpdate(key, undefined, async () => {
       for (const [name, value] of Object.entries(diff)) {
-        if (
-          properties[name] === value
-        || (value === null && !(name in properties))
-        ) {
+        if (properties[name] === value || (value === null && !(name in properties))) {
           continue;
         }
 
@@ -208,10 +206,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
     });
   }
 
-  protected async loader(
-    key: ResourceKey<string>,
-    includes: CachedResourceIncludeArgs<RmResourceInfo, ResourceInfoIncludes>
-  ) {
+  protected async loader(key: ResourceKey<string>, includes: CachedResourceIncludeArgs<RmResourceInfo, ResourceInfoIncludes>) {
     const resourcesList = new Map<string, RmResourceInfo>();
 
     await ResourceKeyUtils.forEachAsync(key, async key => {
@@ -251,7 +246,6 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
 
         resourcesList.set(key, resources[0]);
       }
-
     });
 
     this.set(resourceKeyList([...resourcesList.keys()]), [...resourcesList.values()]);
diff --git a/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts b/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
index 2c27970b0f..02231e9cf2 100644
--- a/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
+++ b/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { runInAction } from 'mobx';
 
 import type { AdminObjectGrantInfo } from '@cloudbeaver/core-administration';
@@ -13,7 +12,19 @@ import { EAdminPermission } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { SessionPermissionsResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, CachedMapAllKey, ResourceKey, ResourceKeyUtils, resourceKeyList, RmProject, ResourceKeyList, RmProjectPermissions, RmSubjectProjectPermissions, isResourceKeyAlias } from '@cloudbeaver/core-sdk';
+import {
+  CachedMapAllKey,
+  CachedMapResource,
+  GraphQLService,
+  isResourceKeyAlias,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyList,
+  ResourceKeyUtils,
+  RmProject,
+  RmProjectPermissions,
+  RmSubjectProjectPermissions,
+} from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 const newSymbol = Symbol('new-project');
@@ -38,8 +49,7 @@ export class SharedProjectsResource extends CachedMapResource<string, SharedProj
   ) {
     super(() => new Map(), []);
 
-    sessionPermissionsResource
-      .require(this, EAdminPermission.admin);
+    sessionPermissionsResource.require(this, EAdminPermission.admin);
     this.sync(sessionPermissionsResource, () => {});
 
     this.connect(projectInfoResource);
@@ -165,9 +175,9 @@ export class SharedProjectsResource extends CachedMapResource<string, SharedProj
 
 export function isEqualSharedProjectGrantInfo(a: AdminObjectGrantInfo, b: AdminObjectGrantInfo): boolean {
   return (
-    a.subjectId === b.subjectId
-    && a.subjectType === b.subjectType
-    && a.objectPermissions.objectId === b.objectPermissions.objectId
-    && isArraysEqual(a.objectPermissions.permissions, b.objectPermissions.permissions)
+    a.subjectId === b.subjectId &&
+    a.subjectType === b.subjectType &&
+    a.objectPermissions.objectId === b.objectPermissions.objectId &&
+    isArraysEqual(a.objectPermissions.permissions, b.objectPermissions.permissions)
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-resource-manager/src/isRMNavNode.ts b/webapp/packages/core-resource-manager/src/isRMNavNode.ts
index 7943452f4a..30e2e3b2c8 100644
--- a/webapp/packages/core-resource-manager/src/isRMNavNode.ts
+++ b/webapp/packages/core-resource-manager/src/isRMNavNode.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { RESOURCES_NODE_PATH } from './RESOURCES_NODE_PATH';
 
 export function isRMNavNode(nodeId: string): boolean {
   return nodeId.startsWith(RESOURCES_NODE_PATH);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-resource-manager/src/manifest.ts b/webapp/packages/core-resource-manager/src/manifest.ts
index 1ec605ec65..43b7e7c71a 100644
--- a/webapp/packages/core-resource-manager/src/manifest.ts
+++ b/webapp/packages/core-resource-manager/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
@@ -14,17 +13,10 @@ import { ResourceManagerEventHandler } from './ResourceManagerEventHandler';
 import { ResourceManagerResource } from './ResourceManagerResource';
 import { SharedProjectsResource } from './SharedProjectsResource';
 
-
 export const resourceManagerManifest: PluginManifest = {
   info: {
     name: 'Resource Manager Core',
   },
 
-  providers: [
-    PluginBootstrap,
-    SharedProjectsResource,
-    ProjectPermissionsResource,
-    ResourceManagerEventHandler,
-    ResourceManagerResource,
-  ],
+  providers: [PluginBootstrap, SharedProjectsResource, ProjectPermissionsResource, ResourceManagerEventHandler, ResourceManagerResource],
 };
diff --git a/webapp/packages/core-root/mocks/createGQLEndpoint.ts b/webapp/packages/core-root/mocks/createGQLEndpoint.ts
index d56e0f427b..40fbcc877a 100644
--- a/webapp/packages/core-root/mocks/createGQLEndpoint.ts
+++ b/webapp/packages/core-root/mocks/createGQLEndpoint.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { graphql } from 'msw';
 
 export function createGQLEndpoint(): ReturnType<typeof graphql.link> {
   return graphql.link('http://localhost/api/gql');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/mocks/createWebsocketEndpoint.ts b/webapp/packages/core-root/mocks/createWebsocketEndpoint.ts
index 135cf37d1c..fcda7076cd 100644
--- a/webapp/packages/core-root/mocks/createWebsocketEndpoint.ts
+++ b/webapp/packages/core-root/mocks/createWebsocketEndpoint.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { rest } from 'msw';
 
 // TODO: use new msw API https://github.com/mswjs/msw/issues/156
 export function createWebsocketEndpoint(): ReturnType<typeof rest.get> {
   return rest.get('http://localhost/api/ws', (req, res, ctx) => res(ctx.status(404)));
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/mocks/data/defaultProductConfiguration.ts b/webapp/packages/core-root/mocks/data/defaultProductConfiguration.ts
index c45c63eac6..63a88b8877 100644
--- a/webapp/packages/core-root/mocks/data/defaultProductConfiguration.ts
+++ b/webapp/packages/core-root/mocks/data/defaultProductConfiguration.ts
@@ -7,30 +7,30 @@
  */
 
 export const defaultProductConfiguration: Record<string, any> = {
-  'core_events': {
-    'notificationsPool': 5.0,
+  core_events: {
+    notificationsPool: 5.0,
   },
-  'core': {
-    'user': {
-      'defaultTheme': 'light',
-      'defaultLanguage': 'en',
+  core: {
+    user: {
+      defaultTheme: 'light',
+      defaultLanguage: 'en',
     },
-    'app': {
-      'logViewer': {
-        'refreshTimeout': 3000.0,
-        'logBatchSize': 1000.0,
-        'maxLogRecords': 2000.0,
-        'maxFailedRequests': 3.0,
+    app: {
+      logViewer: {
+        refreshTimeout: 3000.0,
+        logBatchSize: 1000.0,
+        maxLogRecords: 2000.0,
+        maxFailedRequests: 3.0,
       },
     },
-    'authentication': {
-      'primaryAuthProvider': 'local',
+    authentication: {
+      primaryAuthProvider: 'local',
     },
   },
-  'plugin_data_export': {
-    'disabled': false,
+  plugin_data_export: {
+    disabled: false,
   },
-  'plugin_data_spreadsheet_new': {
-    'hidden': false,
+  plugin_data_spreadsheet_new: {
+    hidden: false,
   },
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/core-root/mocks/data/defaultServerConfig.ts b/webapp/packages/core-root/mocks/data/defaultServerConfig.ts
index 31e9c6dc72..1a2128065b 100644
--- a/webapp/packages/core-root/mocks/data/defaultServerConfig.ts
+++ b/webapp/packages/core-root/mocks/data/defaultServerConfig.ts
@@ -5,121 +5,118 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ServerConfigQuery } from '@cloudbeaver/core-sdk';
 
 import { defaultProductConfiguration } from './defaultProductConfiguration';
 
 export const defaultServerConfig: (productConfiguration?: Record<string, any>) => ServerConfigQuery = (
-  productConfiguration = defaultProductConfiguration
+  productConfiguration = defaultProductConfiguration,
 ) => ({
-  'serverConfig': {
-    'name': 'CloudBeaver CE Server',
-    'version': '22.1.2.202207140640',
-    'workspaceId': 'D14DGNGYNPI71M',
-    'serverURL': 'https://test.ce.cloudbeaver.io',
-    'rootURI': '/',
-    'containerId': '931cdabfc0b3',
-    'productConfiguration': productConfiguration,
-    'supportsCustomConnections': true,
-    'supportsConnectionBrowser': false,
-    'supportsWorkspaces': false,
-    'sessionExpireTime': 6000000,
-    'anonymousAccessEnabled': true,
-    'adminCredentialsSaveEnabled': true,
-    'publicCredentialsSaveEnabled': true,
-    'resourceManagerEnabled': true,
-    'licenseRequired': false,
-    'licenseValid': false,
-    'configurationMode': false,
-    'developmentMode': false,
-    'redirectOnFederatedAuth': false,
-    'enabledFeatures': [],
-    'enabledAuthProviders': [
-      'local',
-    ],
-    'supportedLanguages': [
+  serverConfig: {
+    name: 'CloudBeaver CE Server',
+    version: '22.1.2.202207140640',
+    workspaceId: 'D14DGNGYNPI71M',
+    serverURL: 'https://test.ce.cloudbeaver.io',
+    rootURI: '/',
+    containerId: '931cdabfc0b3',
+    productConfiguration: productConfiguration,
+    supportsCustomConnections: true,
+    supportsConnectionBrowser: false,
+    supportsWorkspaces: false,
+    sessionExpireTime: 6000000,
+    anonymousAccessEnabled: true,
+    adminCredentialsSaveEnabled: true,
+    publicCredentialsSaveEnabled: true,
+    resourceManagerEnabled: true,
+    licenseRequired: false,
+    licenseValid: false,
+    configurationMode: false,
+    developmentMode: false,
+    redirectOnFederatedAuth: false,
+    enabledFeatures: [],
+    enabledAuthProviders: ['local'],
+    supportedLanguages: [
       {
-        'isoCode': 'en',
-        'displayName': 'English',
-        'nativeName': 'English',
+        isoCode: 'en',
+        displayName: 'English',
+        nativeName: 'English',
       },
       {
-        'isoCode': 'zh',
-        'displayName': 'Simplified chinese',
-        'nativeName': '简体中文',
+        isoCode: 'zh',
+        displayName: 'Simplified chinese',
+        nativeName: '简体中文',
       },
       {
-        'isoCode': 'ru',
-        'displayName': 'Russian',
-        'nativeName': 'Русский',
+        isoCode: 'ru',
+        displayName: 'Russian',
+        nativeName: 'Русский',
       },
       {
-        'isoCode': 'fr',
-        'displayName': 'French',
-        'nativeName': 'Français',
+        isoCode: 'fr',
+        displayName: 'French',
+        nativeName: 'Français',
       },
       {
-        'isoCode': 'de',
-        'displayName': 'German',
-        'nativeName': 'Deutsch',
+        isoCode: 'de',
+        displayName: 'German',
+        nativeName: 'Deutsch',
       },
       {
-        'isoCode': 'it',
-        'displayName': 'Italian',
-        'nativeName': 'Italiano',
+        isoCode: 'it',
+        displayName: 'Italian',
+        nativeName: 'Italiano',
       },
       {
-        'isoCode': 'ja',
-        'displayName': 'Japanese',
-        'nativeName': 'Japanese',
+        isoCode: 'ja',
+        displayName: 'Japanese',
+        nativeName: 'Japanese',
       },
       {
-        'isoCode': 'es',
-        'displayName': 'Spanish',
-        'nativeName': 'Spanish',
+        isoCode: 'es',
+        displayName: 'Spanish',
+        nativeName: 'Spanish',
       },
       {
-        'isoCode': 'pt_BR',
-        'displayName': 'Portuguese (BR)',
-        'nativeName': 'Português Brasil',
+        isoCode: 'pt_BR',
+        displayName: 'Portuguese (BR)',
+        nativeName: 'Português Brasil',
       },
       {
-        'isoCode': 'ko',
-        'displayName': 'Korean',
-        'nativeName': '한국어',
+        isoCode: 'ko',
+        displayName: 'Korean',
+        nativeName: '한국어',
       },
       {
-        'isoCode': 'tw',
-        'displayName': 'Traditional chinese',
-        'nativeName': '繁体中文',
+        isoCode: 'tw',
+        displayName: 'Traditional chinese',
+        nativeName: '繁体中文',
       },
     ],
-    'defaultNavigatorSettings': {
-      'showSystemObjects': true,
-      'showUtilityObjects': false,
-      'showOnlyEntities': false,
-      'mergeEntities': false,
-      'hideFolders': false,
-      'hideSchemas': false,
-      'hideVirtualModel': false,
+    defaultNavigatorSettings: {
+      showSystemObjects: true,
+      showUtilityObjects: false,
+      showOnlyEntities: false,
+      mergeEntities: false,
+      hideFolders: false,
+      hideSchemas: false,
+      hideVirtualModel: false,
     },
-    'resourceQuotas': {
-      'dataExportFileSizeLimit': 1.0E7,
-      'sqlMaxRunningQueries': 3.0,
-      'sqlResultSetRowsLimit': 100000.0,
-      'sqlResultSetMemoryLimit': 2000000.0,
+    resourceQuotas: {
+      dataExportFileSizeLimit: 1.0e7,
+      sqlMaxRunningQueries: 3.0,
+      sqlResultSetRowsLimit: 100000.0,
+      sqlResultSetMemoryLimit: 2000000.0,
     },
-    'disabledDrivers': [],
-    'productInfo': {
-      'id': 'io.cloudbeaver.product.ce.product',
-      'version': '22.1.2.202207140640',
-      'latestVersionInfo': 'https://dbeaver.com/product/cloudbeaver-ce-version.json',
-      'name': 'CloudBeaver CE Server',
-      'description': 'Cloudbeaver Web UI Application',
-      'buildTime': 'July 14, 2022',
-      'releaseTime': 'July 11, 2022',
-      'licenseInfo': '',
+    disabledDrivers: [],
+    productInfo: {
+      id: 'io.cloudbeaver.product.ce.product',
+      version: '22.1.2.202207140640',
+      latestVersionInfo: 'https://dbeaver.com/product/cloudbeaver-ce-version.json',
+      name: 'CloudBeaver CE Server',
+      description: 'Cloudbeaver Web UI Application',
+      buildTime: 'July 14, 2022',
+      releaseTime: 'July 11, 2022',
+      licenseInfo: '',
     },
   },
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-root/mocks/mockAppInit.ts b/webapp/packages/core-root/mocks/mockAppInit.ts
index f07d03f904..437a39a510 100644
--- a/webapp/packages/core-root/mocks/mockAppInit.ts
+++ b/webapp/packages/core-root/mocks/mockAppInit.ts
@@ -5,15 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { graphql } from 'msw';
 
 import { mockOpenSession } from './resolvers/mockOpenSession';
 import { mockServerConfig } from './resolvers/mockServerConfig';
 
 export function mockAppInit(endpoint: ReturnType<typeof graphql.link>, productConfiguration?: Record<string, any>) {
-  return [
-    endpoint.query('serverConfig', mockServerConfig(productConfiguration)),
-    endpoint.mutation('openSession', mockOpenSession),
-  ];
-}
\ No newline at end of file
+  return [endpoint.query('serverConfig', mockServerConfig(productConfiguration)), endpoint.mutation('openSession', mockOpenSession)];
+}
diff --git a/webapp/packages/core-root/mocks/mockGraphQL.ts b/webapp/packages/core-root/mocks/mockGraphQL.ts
index ab5f5d2aba..f4e91dc32c 100644
--- a/webapp/packages/core-root/mocks/mockGraphQL.ts
+++ b/webapp/packages/core-root/mocks/mockGraphQL.ts
@@ -5,24 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { GraphQLRequest, RequestHandler } from 'msw';
 import { setupServer } from 'msw/node';
 
 import { createWebsocketEndpoint } from './createWebsocketEndpoint';
 
-export function mockGraphQL(
-  ...requestHandlers: RequestHandler<any, GraphQLRequest<any>, any, GraphQLRequest<any>>[]
-) {
-
-  const server = setupServer(
-    ...requestHandlers,
-    createWebsocketEndpoint()
-  );
+export function mockGraphQL(...requestHandlers: RequestHandler<any, GraphQLRequest<any>, any, GraphQLRequest<any>>[]) {
+  const server = setupServer(...requestHandlers, createWebsocketEndpoint());
 
   beforeAll(() => server.listen());
   afterEach(() => server.resetHandlers());
   afterAll(() => server.close());
 
   return server;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/mocks/resolvers/mockOpenSession.ts b/webapp/packages/core-root/mocks/resolvers/mockOpenSession.ts
index 7698ff8cf1..fb20965486 100644
--- a/webapp/packages/core-root/mocks/resolvers/mockOpenSession.ts
+++ b/webapp/packages/core-root/mocks/resolvers/mockOpenSession.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { GraphQLContext, GraphQLRequest, ResponseComposition } from 'msw';
 
 import type { OpenSessionMutation, OpenSessionMutationVariables } from '@cloudbeaver/core-sdk';
@@ -13,17 +12,17 @@ import type { OpenSessionMutation, OpenSessionMutationVariables } from '@cloudbe
 export function mockOpenSession(
   req: GraphQLRequest<OpenSessionMutationVariables>,
   res: ResponseComposition<OpenSessionMutation>,
-  ctx: GraphQLContext<OpenSessionMutation>
+  ctx: GraphQLContext<OpenSessionMutation>,
 ) {
-  const date = (new Date()).toISOString();
+  const date = new Date().toISOString();
   return res(
     ctx.data({
-      'session': {
-        'createTime': date,
-        'lastAccessTime': date,
-        'cacheExpired': false,
-        'locale': req.variables.defaultLocale ?? 'en',
-        'actionParameters': null,
+      session: {
+        createTime: date,
+        lastAccessTime: date,
+        cacheExpired: false,
+        locale: req.variables.defaultLocale ?? 'en',
+        actionParameters: null,
       },
     }),
   );
diff --git a/webapp/packages/core-root/mocks/resolvers/mockServerConfig.ts b/webapp/packages/core-root/mocks/resolvers/mockServerConfig.ts
index cf2d06d71d..ef83ea16f7 100644
--- a/webapp/packages/core-root/mocks/resolvers/mockServerConfig.ts
+++ b/webapp/packages/core-root/mocks/resolvers/mockServerConfig.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { GraphQLContext, GraphQLRequest, ResponseComposition } from 'msw';
 
 import type { ServerConfigQuery, ServerConfigQueryVariables } from '@cloudbeaver/core-sdk';
@@ -16,10 +15,8 @@ export function mockServerConfig(productConfiguration?: Record<string, any>) {
   return function mockServerConfig(
     req: GraphQLRequest<ServerConfigQueryVariables>,
     res: ResponseComposition<ServerConfigQuery>,
-    ctx: GraphQLContext<ServerConfigQuery>
+    ctx: GraphQLContext<ServerConfigQuery>,
   ) {
-    return res(
-      ctx.data(defaultServerConfig(productConfiguration)),
-    );
+    return res(ctx.data(defaultServerConfig(productConfiguration)));
   };
 }
diff --git a/webapp/packages/core-root/src/ConnectionNavigatorViewSettings.ts b/webapp/packages/core-root/src/ConnectionNavigatorViewSettings.ts
index 6dc63f4b6b..5f3c34fd7d 100644
--- a/webapp/packages/core-root/src/ConnectionNavigatorViewSettings.ts
+++ b/webapp/packages/core-root/src/ConnectionNavigatorViewSettings.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavigatorSettingsInput } from '@cloudbeaver/core-sdk';
 
 export type NavigatorView = 'simple' | 'advanced';
@@ -30,9 +29,6 @@ export const CONNECTION_NAVIGATOR_VIEW_SETTINGS: Record<NavigatorView, Navigator
   },
 };
 
-export function isNavigatorViewSettingsEqual(
-  settings: NavigatorSettingsInput, settingsToCompare: NavigatorViewSettings
-): boolean {
-  return !(Object.keys(settingsToCompare) as Array<keyof NavigatorSettingsInput>)
-    .some(key => settings[key] !== settingsToCompare[key]);
+export function isNavigatorViewSettingsEqual(settings: NavigatorSettingsInput, settingsToCompare: NavigatorViewSettings): boolean {
+  return !(Object.keys(settingsToCompare) as Array<keyof NavigatorSettingsInput>).some(key => settings[key] !== settingsToCompare[key]);
 }
diff --git a/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationQueue.ts b/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationQueue.ts
index 68613c7eb7..45bd2088b0 100644
--- a/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationQueue.ts
+++ b/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationQueue.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISynchronizationMessage, ISynchronizationMessageResolveCallback } from './ISynchronizationMessage';
 
 export class DataSynchronizationQueue {
@@ -29,4 +28,4 @@ export class DataSynchronizationQueue {
       this.onResolve(state);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationService.ts b/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationService.ts
index 4d4b5591f8..c93e61b0f7 100644
--- a/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationService.ts
+++ b/webapp/packages/core-root/src/DataSynchronization/DataSynchronizationService.ts
@@ -5,11 +5,10 @@
  * 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 { SyncExecutor, ISyncExecutor } from '@cloudbeaver/core-executor';
+import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 
 import type { ISynchronizationMessage, ISynchronizationMessageResolveCallback } from './ISynchronizationMessage';
 import { SynchronizationMessage } from './SynchronizationMessage';
@@ -28,11 +27,7 @@ export class DataSynchronizationService {
     });
   }
 
-  requestSynchronization(
-    label: string,
-    message: string,
-    onResolve?: ISynchronizationMessageResolveCallback
-  ): ISynchronizationMessage {
+  requestSynchronization(label: string, message: string, onResolve?: ISynchronizationMessageResolveCallback): ISynchronizationMessage {
     const synchronizationMessage = new SynchronizationMessage(label, message);
 
     if (onResolve) {
diff --git a/webapp/packages/core-root/src/DataSynchronization/ISynchronizationMessage.ts b/webapp/packages/core-root/src/DataSynchronization/ISynchronizationMessage.ts
index 37d949549d..97f194c554 100644
--- a/webapp/packages/core-root/src/DataSynchronization/ISynchronizationMessage.ts
+++ b/webapp/packages/core-root/src/DataSynchronization/ISynchronizationMessage.ts
@@ -15,4 +15,4 @@ export interface ISynchronizationMessage {
   readonly resolver: Promise<boolean>;
   resolve(state: boolean): void;
   readonly then: (handler: ISynchronizationMessageResolveCallback) => void;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/DataSynchronization/SynchronizationMessage.ts b/webapp/packages/core-root/src/DataSynchronization/SynchronizationMessage.ts
index 9a5901c83d..d0302b0bc5 100644
--- a/webapp/packages/core-root/src/DataSynchronization/SynchronizationMessage.ts
+++ b/webapp/packages/core-root/src/DataSynchronization/SynchronizationMessage.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { uuid } from '@cloudbeaver/core-utils';
 
 import type { ISynchronizationMessage, ISynchronizationMessageResolveCallback } from './ISynchronizationMessage';
@@ -35,4 +34,4 @@ export class SynchronizationMessage implements ISynchronizationMessage {
   resolve(state: boolean): void {
     this.promiseResolve(state);
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/FeaturesResource.ts b/webapp/packages/core-root/src/FeaturesResource.ts
index eb2762d89b..1122738ee2 100644
--- a/webapp/packages/core-root/src/FeaturesResource.ts
+++ b/webapp/packages/core-root/src/FeaturesResource.ts
@@ -5,13 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import {
-  GraphQLService,
-  CachedDataResource,
-  WebFeatureSet
-} from '@cloudbeaver/core-sdk';
+import { CachedDataResource, GraphQLService, WebFeatureSet } from '@cloudbeaver/core-sdk';
 
 import { ServerConfigResource } from './ServerConfigResource';
 
@@ -19,13 +14,14 @@ export type ApplicationFeature = WebFeatureSet;
 
 @injectable()
 export class FeaturesResource extends CachedDataResource<ApplicationFeature[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    serverConfigResource: ServerConfigResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, serverConfigResource: ServerConfigResource) {
     super(() => []);
 
-    this.sync(serverConfigResource, () => {}, () => {});
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => {},
+    );
   }
 
   protected async loader(): Promise<ApplicationFeature[]> {
diff --git a/webapp/packages/core-root/src/NetworkError.ts b/webapp/packages/core-root/src/NetworkError.ts
index 4ea46fd3a8..2564cbedd4 100644
--- a/webapp/packages/core-root/src/NetworkError.ts
+++ b/webapp/packages/core-root/src/NetworkError.ts
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
diff --git a/webapp/packages/core-root/src/NetworkStateService.ts b/webapp/packages/core-root/src/NetworkStateService.ts
index 587fe1d069..a0c3223a14 100644
--- a/webapp/packages/core-root/src/NetworkStateService.ts
+++ b/webapp/packages/core-root/src/NetworkStateService.ts
@@ -5,7 +5,6 @@
  * 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 { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -24,9 +23,7 @@ export class NetworkStateService extends Bootstrap {
   readonly networkStateExecutor: IExecutor<boolean>;
   private networkState: boolean;
 
-  constructor(
-    private readonly graphQLService: GraphQLService
-  ) {
+  constructor(private readonly graphQLService: GraphQLService) {
     super();
 
     this.networkState = true;
@@ -69,10 +66,7 @@ export class NetworkStateService extends Bootstrap {
     try {
       return await request;
     } catch (exception: any) {
-      if (
-        exception instanceof TypeError
-        && exception.message === 'Failed to fetch'
-      ) {
+      if (exception instanceof TypeError && exception.message === 'Failed to fetch') {
         throw new NetworkError('Error while processing request', { cause: exception });
       }
       throw exception;
diff --git a/webapp/packages/core-root/src/PermissionsService.ts b/webapp/packages/core-root/src/PermissionsService.ts
index 6e98ba67cc..6e2c17be46 100644
--- a/webapp/packages/core-root/src/PermissionsService.ts
+++ b/webapp/packages/core-root/src/PermissionsService.ts
@@ -5,20 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { SessionPermissionsResource } from './SessionPermissionsResource';
 
-export enum EPermission {
-}
+export enum EPermission {}
 
 @injectable()
 export class PermissionsService {
-  constructor(
-    private readonly permissions: SessionPermissionsResource
-  ) {
-  }
+  constructor(private readonly permissions: SessionPermissionsResource) {}
 
   has(id: string): boolean {
     return this.permissions.has(id);
diff --git a/webapp/packages/core-root/src/QuotasService.ts b/webapp/packages/core-root/src/QuotasService.ts
index 6c3d649895..32f98c13a4 100644
--- a/webapp/packages/core-root/src/QuotasService.ts
+++ b/webapp/packages/core-root/src/QuotasService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { ServerConfigResource } from './ServerConfigResource';
@@ -22,7 +21,7 @@ interface IQuotas {
 type QuotaKey = keyof IQuotas;
 
 const DEFAULT_QUOTAS: IQuotas = {
-  dataExportFileSizeLimit: 1.0E7,
+  dataExportFileSizeLimit: 1.0e7,
   sqlMaxRunningQueries: 100,
   sqlResultSetRowsLimit: 100000,
   sqlResultSetMemoryLimit: 2000000,
@@ -47,7 +46,7 @@ export class QuotasService {
     };
   }
 
-  constructor(private readonly serverConfigResource: ServerConfigResource) { }
+  constructor(private readonly serverConfigResource: ServerConfigResource) {}
 
   getQuota(key: QuotaKey) {
     const serverQuota = this.serverConfigResource.data?.resourceQuotas[key];
@@ -58,4 +57,4 @@ export class QuotasService {
 
     return DEFAULT_QUOTAS[key];
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/ServerConfigEventHandler.ts b/webapp/packages/core-root/src/ServerConfigEventHandler.ts
index 766c6526a7..1bc1a22f18 100644
--- a/webapp/packages/core-root/src/ServerConfigEventHandler.ts
+++ b/webapp/packages/core-root/src/ServerConfigEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import type { CbConfigEvent as IServerConfigEvent } from '@cloudbeaver/core-sdk';
 
@@ -16,9 +15,7 @@ export { type IServerConfigEvent };
 
 @injectable()
 export class ServerConfigEventHandler extends TopicEventHandler<IServerConfigEvent, ISessionEvent> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbConfig, sessionEventSource);
   }
 
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index 9567225bb6..3a95905818 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { GraphQLService, CachedDataResource, ServerConfig, ServerConfigInput, NavigatorSettingsInput, CachedResource } from '@cloudbeaver/core-sdk';
+import { CachedDataResource, CachedResource, GraphQLService, NavigatorSettingsInput, ServerConfig, ServerConfigInput } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 import { isNavigatorViewSettingsEqual } from './ConnectionNavigatorViewSettings';
@@ -55,20 +54,18 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
       syncUpdateData: action,
     });
 
-    serverConfigEventHandler.on(() => {
-      this.syncQueue.add(
-        this.dataSynchronizationService.requestSynchronization('server-config', 'Server Configuration')
-      );
-    }, () => undefined, undefined, this);
+    serverConfigEventHandler.on(
+      () => {
+        this.syncQueue.add(this.dataSynchronizationService.requestSynchronization('server-config', 'Server Configuration'));
+      },
+      () => undefined,
+      undefined,
+      this,
+    );
   }
 
-  requirePublic<T>(
-    resource: CachedResource<any, any, T, any, any>,
-    map?: (param: void) => T
-  ): this {
-    resource
-      .preloadResource(this, () => {})
-      .before(ExecutorInterrupter.interrupter(() => this.publicDisabled));
+  requirePublic<T>(resource: CachedResource<any, any, T, any, any>, map?: (param: void) => T): this {
+    resource.preloadResource(this, () => {}).before(ExecutorInterrupter.interrupter(() => this.publicDisabled));
 
     this.outdateResource<T>(resource, map as any);
 
@@ -104,10 +101,7 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
   }
 
   get publicDisabled(): boolean {
-    if (
-      this.configurationMode
-      || (this.data?.licenseRequired && !this.data.licenseValid)
-    ) {
+    if (this.configurationMode || (this.data?.licenseRequired && !this.data.licenseValid)) {
       return true;
     }
 
@@ -171,21 +165,17 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     }
 
     return (
-      this.update.serverName !== this.data.name
-      || this.update.serverURL !== this.data.serverURL
-      || this.update.sessionExpireTime !== this.data.sessionExpireTime
-
-      || this.update.anonymousAccessEnabled !== this.data.anonymousAccessEnabled
-
-      || this.update.resourceManagerEnabled !== this.data.resourceManagerEnabled
-
-      || this.update.adminCredentialsSaveEnabled !== this.data.adminCredentialsSaveEnabled
-      || this.update.publicCredentialsSaveEnabled !== this.data.publicCredentialsSaveEnabled
-
-      || this.update.customConnectionsEnabled !== this.data.supportsCustomConnections
-      || !isArraysEqual(this.update.enabledAuthProviders || [], this.data.enabledAuthProviders)
-      || !isArraysEqual(this.update.enabledFeatures || [], this.data.enabledFeatures)
-      || !isArraysEqual(this.update.disabledDrivers || [], this.data.disabledDrivers)
+      this.update.serverName !== this.data.name ||
+      this.update.serverURL !== this.data.serverURL ||
+      this.update.sessionExpireTime !== this.data.sessionExpireTime ||
+      this.update.anonymousAccessEnabled !== this.data.anonymousAccessEnabled ||
+      this.update.resourceManagerEnabled !== this.data.resourceManagerEnabled ||
+      this.update.adminCredentialsSaveEnabled !== this.data.adminCredentialsSaveEnabled ||
+      this.update.publicCredentialsSaveEnabled !== this.data.publicCredentialsSaveEnabled ||
+      this.update.customConnectionsEnabled !== this.data.supportsCustomConnections ||
+      !isArraysEqual(this.update.enabledAuthProviders || [], this.data.enabledAuthProviders) ||
+      !isArraysEqual(this.update.enabledFeatures || [], this.data.enabledFeatures) ||
+      !isArraysEqual(this.update.disabledDrivers || [], this.data.disabledDrivers)
     );
   }
 
@@ -230,34 +220,44 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
   }
 
   async save(skipConfigUpdate = false): Promise<void> {
-    await this.performUpdate(undefined, undefined, async () => {
-      if (this.isNavigatorSettingsChanged()) {
-        await this.graphQLService.sdk.setDefaultNavigatorSettings({ settings: this.navigatorSettingsUpdate });
+    await this.performUpdate(
+      undefined,
+      undefined,
+      async () => {
+        if (this.isNavigatorSettingsChanged()) {
+          await this.graphQLService.sdk.setDefaultNavigatorSettings({ settings: this.navigatorSettingsUpdate });
 
-        if (this.data) {
-          this.data.defaultNavigatorSettings = { ...this.navigatorSettingsUpdate };
-        } else {
+          if (this.data) {
+            this.data.defaultNavigatorSettings = { ...this.navigatorSettingsUpdate };
+          } else {
+            this.setData(await this.loader());
+          }
+        }
+
+        if (this.isChanged() && !skipConfigUpdate) {
+          await this.graphQLService.sdk.configureServer({
+            configuration: this.update,
+          });
           this.setData(await this.loader());
         }
-      }
-
-      if (this.isChanged() && !skipConfigUpdate) {
-        await this.graphQLService.sdk.configureServer({
-          configuration: this.update,
-        });
-        this.setData(await this.loader());
-      }
-    }, () => !this.isNavigatorSettingsChanged() && (!this.isChanged() || skipConfigUpdate));
+      },
+      () => !this.isNavigatorSettingsChanged() && (!this.isChanged() || skipConfigUpdate),
+    );
   }
 
   async finishConfiguration(onlyRestart = false): Promise<void> {
-    await this.performUpdate(undefined, undefined, async () => {
-      await this.graphQLService.sdk.configureServer({
-        configuration: !this.isChanged() && onlyRestart ? {} : this.update,
-      });
+    await this.performUpdate(
+      undefined,
+      undefined,
+      async () => {
+        await this.graphQLService.sdk.configureServer({
+          configuration: !this.isChanged() && onlyRestart ? {} : this.update,
+        });
 
-      this.setData(await this.loader());
-    }, () => !this.isChanged() && !onlyRestart);
+        this.setData(await this.loader());
+      },
+      () => !this.isChanged() && !onlyRestart,
+    );
   }
 
   protected async loader(): Promise<ServerConfig> {
diff --git a/webapp/packages/core-root/src/ServerEventEmitter/IServerEventEmitter.ts b/webapp/packages/core-root/src/ServerEventEmitter/IServerEventEmitter.ts
index 068695b7cb..7dc44db2ce 100644
--- a/webapp/packages/core-root/src/ServerEventEmitter/IServerEventEmitter.ts
+++ b/webapp/packages/core-root/src/ServerEventEmitter/IServerEventEmitter.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Observable } from 'rxjs';
 
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
@@ -22,26 +21,15 @@ export interface IServerEventEmitter<
   TEvent extends IBaseServerEvent<TEventID, TTopic>,
   TSourceEvent extends IBaseServerEvent<TEventID, TTopic> = TEvent,
   TEventID extends string = string,
-  TTopic extends string = string
+  TTopic extends string = string,
 > {
   readonly onInit: ISyncExecutor;
 
-  onEvent<T = TEvent>(
-    id: TEventID,
-    callback: IServerEventCallback<T>,
-    mapTo?: (event: TEvent) => T,
-  ): Subscription;
+  onEvent<T = TEvent>(id: TEventID, callback: IServerEventCallback<T>, mapTo?: (event: TEvent) => T): Subscription;
 
-  on<T = TEvent>(
-    callback: IServerEventCallback<T>,
-    mapTo?: (event: TEvent) => T,
-    filter?: (event: TEvent) => boolean,
-  ): Subscription;
+  on<T = TEvent>(callback: IServerEventCallback<T>, mapTo?: (event: TEvent) => T, filter?: (event: TEvent) => boolean): Subscription;
 
-  multiplex<T = TEvent>(
-    topicId: TTopic,
-    mapTo?: (event: TEvent) => T,
-  ): Observable<T>;
+  multiplex<T = TEvent>(topicId: TTopic, mapTo?: (event: TEvent) => T): Observable<T>;
 
   emit(event: TSourceEvent): this;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/ServerEventEmitter/TopicEventHandler.ts b/webapp/packages/core-root/src/ServerEventEmitter/TopicEventHandler.ts
index bad7ad392d..3cc85d282c 100644
--- a/webapp/packages/core-root/src/ServerEventEmitter/TopicEventHandler.ts
+++ b/webapp/packages/core-root/src/ServerEventEmitter/TopicEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Connectable, connectable, filter, map, merge, Observable, Subject } from 'rxjs';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -23,9 +22,9 @@ export abstract class TopicEventHandler<
   TEvent extends IBaseServerEvent<TEventID, TTopic>,
   SourceEvent extends IBaseServerEvent<TEventID, TTopic>,
   TEventID extends string = string,
-  TTopic extends string = string
->
-implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic> {
+  TTopic extends string = string,
+> implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic>
+{
   readonly onInit: ISyncExecutor;
   readonly eventsSubject: Connectable<TEvent>;
 
@@ -34,35 +33,23 @@ implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic> {
   private readonly subscribedResources: Map<CachedResource<any, any, any, any, any>, ISubscribedResourceInfo>;
   private readonly serverSubject?: Observable<TEvent>;
   private readonly subject: Subject<TEvent>;
-  constructor(
-    private readonly topic: string,
-    private readonly emitter: IServerEventEmitter<SourceEvent>
-  ) {
+  constructor(private readonly topic: string, private readonly emitter: IServerEventEmitter<SourceEvent>) {
     this.onInit = new SyncExecutor();
     this.subject = new Subject();
     this.activeResources = [];
     this.subscribedResources = new Map();
     this.subscription = null;
     this.serverSubject = this.emitter.multiplex(topic, this.map);
-    this.eventsSubject = connectable(
-      merge(this.subject, this.serverSubject),
-      {
-        connector: () => new Subject(),
-        resetOnDisconnect: false, // used because subscribers won't receive events after reconnect otherwise
-      }
-    );
+    this.eventsSubject = connectable(merge(this.subject, this.serverSubject), {
+      connector: () => new Subject(),
+      resetOnDisconnect: false, // used because subscribers won't receive events after reconnect otherwise
+    });
 
     this.emitter.onInit.next(this.onInit);
   }
 
-  multiplex<T = TEvent>(
-    topicId: TTopic,
-    mapTo: ((event: TEvent) => T) = event => event as unknown as T,
-  ): Observable<T> {
-    return this.emitter.multiplex(
-      topicId,
-      compose(mapTo, this.map) as unknown as (event: SourceEvent) => T
-    );
+  multiplex<T = TEvent>(topicId: TTopic, mapTo: (event: TEvent) => T = event => event as unknown as T): Observable<T> {
+    return this.emitter.multiplex(topicId, compose(mapTo, this.map) as unknown as (event: SourceEvent) => T);
   }
 
   onEvent<T = TEvent>(
@@ -76,7 +63,10 @@ implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic> {
     }
 
     const sub = this.eventsSubject
-      .pipe(filter(e => e.id === id), map(mapTo))
+      .pipe(
+        filter(e => e.id === id),
+        map(mapTo),
+      )
       .subscribe(callback);
 
     return () => {
@@ -94,14 +84,11 @@ implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic> {
     filterFn: (param: TEvent) => boolean = () => true,
     resource?: CachedResource<any, any, any, any, any>,
   ): Subscription {
-
     if (resource) {
       this.registerResource(resource);
     }
 
-    const sub = this.eventsSubject
-      .pipe(filter(filterFn), map(mapTo))
-      .subscribe(callback);
+    const sub = this.eventsSubject.pipe(filter(filterFn), map(mapTo)).subscribe(callback);
 
     return () => {
       sub.unsubscribe();
@@ -179,4 +166,4 @@ implements IServerEventEmitter<TEvent, SourceEvent, TEventID, TTopic> {
   }
 
   protected abstract map(event: SourceEvent): TEvent;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/ServerNodeError.ts b/webapp/packages/core-root/src/ServerNodeError.ts
index 706a84b7db..31469d5b21 100644
--- a/webapp/packages/core-root/src/ServerNodeError.ts
+++ b/webapp/packages/core-root/src/ServerNodeError.ts
@@ -11,4 +11,4 @@ export class ServerNodeError extends Error {
     super(message, options);
     this.name = 'Server Node Error';
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-root/src/ServerNodeService.ts b/webapp/packages/core-root/src/ServerNodeService.ts
index ba84463398..f2dc5593da 100644
--- a/webapp/packages/core-root/src/ServerNodeService.ts
+++ b/webapp/packages/core-root/src/ServerNodeService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Dependency, injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { GraphQLService, WsSocketConnectedEvent } from '@cloudbeaver/core-sdk';
@@ -17,10 +16,7 @@ import { ServerEventId, SessionEventSource } from './SessionEventSource';
 export class ServerNodeService extends Dependency {
   private applicationRunId: string | null;
   onApplicationRunIdChange: IExecutor;
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    private readonly sessionEventSource: SessionEventSource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly sessionEventSource: SessionEventSource) {
     super();
     this.onApplicationRunIdChange = new Executor();
     this.applicationRunId = null;
diff --git a/webapp/packages/core-root/src/ServerService.ts b/webapp/packages/core-root/src/ServerService.ts
index 5983017746..d3c756d97b 100644
--- a/webapp/packages/core-root/src/ServerService.ts
+++ b/webapp/packages/core-root/src/ServerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { parseJSONFlat } from '@cloudbeaver/core-utils';
 
@@ -18,11 +17,8 @@ export class ServerService {
   readonly settings: ServerSettingsService;
 
   private lastConfig: any = null;
-  constructor(
-    readonly config: ServerConfigResource,
-    private readonly sessionService: SessionService
-  ) {
-    this.settings =  new ServerSettingsService(this.sessionService.settings);
+  constructor(readonly config: ServerConfigResource, private readonly sessionService: SessionService) {
+    this.settings = new ServerSettingsService(this.sessionService.settings);
     this.config.onDataUpdate.addHandler(this.refreshConfig.bind(this));
   }
 
@@ -34,10 +30,7 @@ export class ServerService {
     if (this.config.data.productConfiguration !== this.lastConfig) {
       this.lastConfig = this.config.data.productConfiguration;
       this.settings.clear();
-      parseJSONFlat(
-        this.config.data.productConfiguration,
-        this.settings.setSelfValue.bind(this.settings)
-      );
+      parseJSONFlat(this.config.data.productConfiguration, this.settings.setSelfValue.bind(this.settings));
     }
   }
 }
diff --git a/webapp/packages/core-root/src/ServerSettingsService.ts b/webapp/packages/core-root/src/ServerSettingsService.ts
index c2d1c87654..444e08771d 100644
--- a/webapp/packages/core-root/src/ServerSettingsService.ts
+++ b/webapp/packages/core-root/src/ServerSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SettingsSource } from '@cloudbeaver/core-settings';
 
diff --git a/webapp/packages/core-root/src/SessionActionService.ts b/webapp/packages/core-root/src/SessionActionService.ts
index 24be95718a..7d2cd025c9 100644
--- a/webapp/packages/core-root/src/SessionActionService.ts
+++ b/webapp/packages/core-root/src/SessionActionService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor, ISyncContextLoader } from '@cloudbeaver/core-executor';
 
@@ -21,9 +20,7 @@ export class SessionActionService {
   private actionToProcess: ISessionAction | null;
   readonly onAction: IExecutor<ISessionAction | null>;
 
-  constructor(
-    readonly session: SessionResource
-  ) {
+  constructor(readonly session: SessionResource) {
     this.actionToProcess = session.processAction();
     this.onAction = new Executor<ISessionAction | null>(undefined, (a, b) => a === b);
     this.onAction
diff --git a/webapp/packages/core-root/src/SessionDataResource.ts b/webapp/packages/core-root/src/SessionDataResource.ts
index 9605027d9b..0c246753c8 100644
--- a/webapp/packages/core-root/src/SessionDataResource.ts
+++ b/webapp/packages/core-root/src/SessionDataResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { CachedDataResource } from '@cloudbeaver/core-sdk';
 
@@ -13,12 +12,14 @@ import { SessionResource } from './SessionResource';
 
 @injectable()
 export class SessionDataResource extends CachedDataResource<null> {
-  constructor(
-    sessionResource: SessionResource
-  ) {
+  constructor(sessionResource: SessionResource) {
     super(() => null);
 
-    this.sync(sessionResource, () => {}, () => {});
+    this.sync(
+      sessionResource,
+      () => {},
+      () => {},
+    );
   }
 
   protected async loader(): Promise<null> {
diff --git a/webapp/packages/core-root/src/SessionEventSource.ts b/webapp/packages/core-root/src/SessionEventSource.ts
index ceb7d380ca..ba522fbad8 100644
--- a/webapp/packages/core-root/src/SessionEventSource.ts
+++ b/webapp/packages/core-root/src/SessionEventSource.ts
@@ -5,19 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { catchError, debounceTime, filter, interval, map, merge, Observable, repeat, retry, share, Subject, throwError } from 'rxjs';
 import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import {
-  GraphQLService,
-  EnvironmentService,
-  CbEventTopic as SessionEventTopic,
-  CbServerEventId as ServerEventId,
   CbClientEventId as ClientEventId,
+  EnvironmentService,
+  GraphQLService,
+  CbServerEventId as ServerEventId,
   ServiceError,
+  CbEventTopic as SessionEventTopic,
 } from '@cloudbeaver/core-sdk';
 
 import { NetworkStateService } from './NetworkStateService';
@@ -42,12 +41,10 @@ export interface ITopicSubEvent extends ISessionEvent {
 const RETRY_INTERVAL = 30 * 1000;
 
 @injectable()
-export class SessionEventSource
-implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+export class SessionEventSource implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
   readonly eventsSubject: Observable<ISessionEvent>;
   readonly onInit: ISyncExecutor;
 
-
   private readonly closeSubject: Subject<CloseEvent>;
   private readonly openSubject: Subject<Event>;
   private readonly errorSubject: Subject<Error>;
@@ -60,7 +57,7 @@ implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, Ses
     private readonly networkStateService: NetworkStateService,
     private readonly sessionExpireService: SessionExpireService,
     private readonly environmentService: EnvironmentService,
-    private readonly graphQLService: GraphQLService
+    private readonly graphQLService: GraphQLService,
   ) {
     this.onInit = new SyncExecutor();
     this.oldEventsSubject = new Subject();
@@ -68,10 +65,9 @@ implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, Ses
     this.openSubject = new Subject();
     this.errorSubject = new Subject();
     this.disconnected = false;
-    this.retryTimer = interval(RETRY_INTERVAL)
-      .pipe(
-        filter(() => !this.sessionExpireService.expired && networkStateService.state && !this.disconnected)
-      );
+    this.retryTimer = interval(RETRY_INTERVAL).pipe(
+      filter(() => !this.sessionExpireService.expired && networkStateService.state && !this.disconnected),
+    );
     this.subject = webSocket({
       url: environmentService.wsEndpoint,
       closeObserver: this.closeSubject,
@@ -88,25 +84,19 @@ implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, Ses
 
     this.eventsSubject = merge(this.oldEventsSubject, this.subject);
 
-    this.errorSubject
-      .pipe(debounceTime(1000))
-      .subscribe(error => {
-        console.error(error);
-      });
+    this.errorSubject.pipe(debounceTime(1000)).subscribe(error => {
+      console.error(error);
+    });
 
     this.errorHandler = this.errorHandler.bind(this);
   }
 
-  onEvent<T = ISessionEvent>(
-    id: SessionEventId,
-    callback: IServerEventCallback<T>,
-    mapTo: (event: ISessionEvent) => T = e => e as T,
-  ): Subscription {
+  onEvent<T = ISessionEvent>(id: SessionEventId, callback: IServerEventCallback<T>, mapTo: (event: ISessionEvent) => T = e => e as T): Subscription {
     const sub = this.eventsSubject
       .pipe(
         this.handleErrors(),
         filter(event => event.id === id),
-        map(mapTo)
+        map(mapTo),
       )
       .subscribe(callback);
 
@@ -120,35 +110,22 @@ implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, Ses
     mapTo: (event: ISessionEvent) => T = e => e as T,
     filterFn: (event: ISessionEvent) => boolean = () => true,
   ): Subscription {
-    const sub = this.eventsSubject
-      .pipe(
-        this.handleErrors(),
-        filter(filterFn),
-        map(mapTo)
-      )
-      .subscribe(callback);
+    const sub = this.eventsSubject.pipe(this.handleErrors(), filter(filterFn), map(mapTo)).subscribe(callback);
 
     return () => {
       sub.unsubscribe();
     };
   }
 
-  multiplex<T = ISessionEvent>(
-    topicId: SessionEventTopic,
-    mapTo: ((event: ISessionEvent) => T)  = e => e as T
-  ): Observable<T> {
+  multiplex<T = ISessionEvent>(topicId: SessionEventTopic, mapTo: (event: ISessionEvent) => T = e => e as T): Observable<T> {
     return merge(
       this.subject.multiplex(
         () => ({ id: ClientEventId.CbClientTopicSubscribe, topicId } as ITopicSubEvent),
         () => ({ id: ClientEventId.CbClientTopicUnsubscribe, topicId } as ITopicSubEvent),
-        event => event.topicId === topicId
+        event => event.topicId === topicId,
       ),
       this.oldEventsSubject,
-    )
-      .pipe(
-        this.handleErrors(),
-        map(mapTo)
-      );
+    ).pipe(this.handleErrors(), map(mapTo));
   }
 
   emit(event: ISessionEvent): this {
@@ -161,12 +138,8 @@ implements IServerEventEmitter<ISessionEvent, ISessionEvent, SessionEventId, Ses
   }
 
   private handleErrors() {
-    return (source: Observable<ISessionEvent>):Observable<ISessionEvent> =>  source.pipe(
-      share(),
-      catchError(this.errorHandler),
-      retry({ delay: () =>  this.retryTimer }),
-      repeat({ delay: () =>  this.retryTimer }),
-    );
+    return (source: Observable<ISessionEvent>): Observable<ISessionEvent> =>
+      source.pipe(share(), catchError(this.errorHandler), retry({ delay: () => this.retryTimer }), repeat({ delay: () => this.retryTimer }));
   }
 
   private errorHandler(error: any, caught: Observable<ISessionEvent>): Observable<ISessionEvent> {
diff --git a/webapp/packages/core-root/src/SessionExpireEventService.ts b/webapp/packages/core-root/src/SessionExpireEventService.ts
index 478f34737f..33bf1fbf5f 100644
--- a/webapp/packages/core-root/src/SessionExpireEventService.ts
+++ b/webapp/packages/core-root/src/SessionExpireEventService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Dependency, injectable } from '@cloudbeaver/core-di';
 import type { WsSessionExpiredEvent } from '@cloudbeaver/core-sdk';
 
@@ -14,10 +13,7 @@ import { SessionExpireService } from './SessionExpireService';
 
 @injectable()
 export class SessionExpireEventService extends Dependency {
-  constructor(
-    private readonly sessionEventSource: SessionEventSource,
-    private readonly sessionExpireService: SessionExpireService,
-  ) {
+  constructor(private readonly sessionEventSource: SessionEventSource, private readonly sessionExpireService: SessionExpireService) {
     super();
     this.sessionEventSource.onEvent<WsSessionExpiredEvent>(ServerEventId.CbSessionExpired, () => {
       this.onSessionExpireEvent();
diff --git a/webapp/packages/core-root/src/SessionExpireService.ts b/webapp/packages/core-root/src/SessionExpireService.ts
index 8752b73214..12bacaae9f 100644
--- a/webapp/packages/core-root/src/SessionExpireService.ts
+++ b/webapp/packages/core-root/src/SessionExpireService.ts
@@ -5,10 +5,9 @@
  * 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 { Executor, IExecutor } from '@cloudbeaver/core-executor';
-import { GQLError, GraphQLService, EServerErrorCode } from '@cloudbeaver/core-sdk';
+import { EServerErrorCode, GQLError, GraphQLService } from '@cloudbeaver/core-sdk';
 import { errorOf } from '@cloudbeaver/core-utils';
 
 import { SessionError } from './SessionError';
@@ -18,9 +17,7 @@ export class SessionExpireService extends Bootstrap {
   expired = false;
 
   onSessionExpire: IExecutor;
-  constructor(
-    private readonly graphQLService: GraphQLService,
-  ) {
+  constructor(private readonly graphQLService: GraphQLService) {
     super();
     this.onSessionExpire = new Executor();
   }
@@ -29,7 +26,7 @@ export class SessionExpireService extends Bootstrap {
     this.graphQLService.registerInterceptor(this.sessionExpiredInterceptor.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
   sessionExpired(): void {
     if (this.expired) {
diff --git a/webapp/packages/core-root/src/SessionInfoEventHandler.ts b/webapp/packages/core-root/src/SessionInfoEventHandler.ts
index 1f11c7fb7e..8d5290c6da 100644
--- a/webapp/packages/core-root/src/SessionInfoEventHandler.ts
+++ b/webapp/packages/core-root/src/SessionInfoEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import type { WsSessionStateEvent as ISessionStateEvent } from '@cloudbeaver/core-sdk';
 
@@ -15,11 +14,8 @@ import { ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic }
 export { type ISessionStateEvent };
 
 @injectable()
-export class SessionInfoEventHandler
-  extends TopicEventHandler<ISessionStateEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+export class SessionInfoEventHandler extends TopicEventHandler<ISessionStateEvent, ISessionEvent, SessionEventId, SessionEventTopic> {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbSession, sessionEventSource);
   }
 
diff --git a/webapp/packages/core-root/src/SessionPermissionsResource.ts b/webapp/packages/core-root/src/SessionPermissionsResource.ts
index a3d938e3ca..1c3623795a 100644
--- a/webapp/packages/core-root/src/SessionPermissionsResource.ts
+++ b/webapp/packages/core-root/src/SessionPermissionsResource.ts
@@ -5,28 +5,26 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { GraphQLService, CachedDataResource, CachedResource } from '@cloudbeaver/core-sdk';
+import { CachedDataResource, CachedResource, GraphQLService } from '@cloudbeaver/core-sdk';
 
 import { SessionDataResource } from './SessionDataResource';
 
 @injectable()
 export class SessionPermissionsResource extends CachedDataResource<Set<string>> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    sessionDataResource: SessionDataResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, sessionDataResource: SessionDataResource) {
     super(() => new Set());
 
-    this.sync(sessionDataResource, () => {}, () => {});
+    this.sync(
+      sessionDataResource,
+      () => {},
+      () => {},
+    );
   }
 
   require(resource: CachedResource<any, any, any, any, any>, ...permissions: string[]): this {
-    resource
-      .preloadResource(this, () => undefined)
-      .before(ExecutorInterrupter.interrupter(() => !this.has(...permissions)));
+    resource.preloadResource(this, () => undefined).before(ExecutorInterrupter.interrupter(() => !this.has(...permissions)));
 
     return this;
   }
diff --git a/webapp/packages/core-root/src/SessionResource.ts b/webapp/packages/core-root/src/SessionResource.ts
index ae79d06541..4ccef39a06 100644
--- a/webapp/packages/core-root/src/SessionResource.ts
+++ b/webapp/packages/core-root/src/SessionResource.ts
@@ -5,14 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
-import {
-  GraphQLService,
-  CachedDataResource,
-  SessionStateFragment
-} from '@cloudbeaver/core-sdk';
+import { CachedDataResource, GraphQLService, SessionStateFragment } from '@cloudbeaver/core-sdk';
 
 import { ServerConfigResource } from './ServerConfigResource';
 import { ServerEventId } from './SessionEventSource';
@@ -38,17 +33,26 @@ export class SessionResource extends CachedDataResource<SessionState | null> {
   constructor(
     private readonly graphQLService: GraphQLService,
     sessionInfoEventHandler: SessionInfoEventHandler,
-    serverConfigResource: ServerConfigResource
+    serverConfigResource: ServerConfigResource,
   ) {
     super(() => null);
 
     this.onStatusUpdate = new SyncExecutor();
-    sessionInfoEventHandler.onEvent(ServerEventId.CbSessionState, event => {
-      this.onStatusUpdate.execute(event);
-    }, undefined, this);
+    sessionInfoEventHandler.onEvent(
+      ServerEventId.CbSessionState,
+      event => {
+        this.onStatusUpdate.execute(event);
+      },
+      undefined,
+      this,
+    );
 
     this.action = null;
-    this.sync(serverConfigResource, () => {}, () => {});
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => {},
+    );
   }
 
   processAction(): ISessionAction | null {
diff --git a/webapp/packages/core-root/src/SessionService.ts b/webapp/packages/core-root/src/SessionService.ts
index 224e389790..38b7f65d31 100644
--- a/webapp/packages/core-root/src/SessionService.ts
+++ b/webapp/packages/core-root/src/SessionService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { SessionResource } from './SessionResource';
@@ -15,10 +14,7 @@ import { SessionSettingsService } from './SessionSettingsService';
 export class SessionService {
   readonly settings = new SessionSettingsService('session_settings');
 
-  constructor(
-    readonly session: SessionResource
-  ) {
-  }
+  constructor(readonly session: SessionResource) {}
 
   async update(): Promise<void> {
     await this.session.refresh();
diff --git a/webapp/packages/core-root/src/SessionSettingsService.ts b/webapp/packages/core-root/src/SessionSettingsService.ts
index 22241545c6..14d0ae88af 100644
--- a/webapp/packages/core-root/src/SessionSettingsService.ts
+++ b/webapp/packages/core-root/src/SessionSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SettingsSource } from '@cloudbeaver/core-settings';
 
diff --git a/webapp/packages/core-root/src/WindowEventsService.ts b/webapp/packages/core-root/src/WindowEventsService.ts
index 59e8df5c3b..ab08799ca4 100644
--- a/webapp/packages/core-root/src/WindowEventsService.ts
+++ b/webapp/packages/core-root/src/WindowEventsService.ts
@@ -5,7 +5,6 @@
  * 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 { Executor, IExecutor } from '@cloudbeaver/core-executor';
 
@@ -23,5 +22,5 @@ export class WindowEventsService extends Bootstrap {
     window.addEventListener('blur', () => this.onFocusChange.execute(false));
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/core-root/src/manifest.ts b/webapp/packages/core-root/src/manifest.ts
index 114eda3ebc..ed8d489c2d 100644
--- a/webapp/packages/core-root/src/manifest.ts
+++ b/webapp/packages/core-root/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DataSynchronizationService } from './DataSynchronization/DataSynchronizationService';
@@ -30,7 +29,6 @@ import { SessionService } from './SessionService';
 import { SessionSettingsService } from './SessionSettingsService';
 import { WindowEventsService } from './WindowEventsService';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Root',
diff --git a/webapp/packages/core-routing/src/RouterService.ts b/webapp/packages/core-routing/src/RouterService.ts
index 434ecae71b..008cf1b03e 100644
--- a/webapp/packages/core-routing/src/RouterService.ts
+++ b/webapp/packages/core-routing/src/RouterService.ts
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, runInAction } from 'mobx';
-import createRouter, {
-  State, Router, SubscribeFn, SubscribeState
-} from 'router5';
+import { makeObservable, observable, runInAction } from 'mobx';
+import createRouter, { Router, State, SubscribeFn, SubscribeState } from 'router5';
 import browserPlugin from 'router5-plugin-browser';
 import type { DoneFn } from 'router5/dist/types/base';
 
-import { injectable, Bootstrap, App } from '@cloudbeaver/core-di';
+import { App, Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { Executor, ExecutorInterrupter, IExecutor } from '@cloudbeaver/core-executor';
 import { GlobalConstants } from '@cloudbeaver/core-utils';
 
@@ -46,9 +43,7 @@ export class RouterService extends Bootstrap {
   private currentRoute = '';
   private currentParams: Record<string, any> = {};
 
-  constructor(
-    private readonly app: App
-  ) {
+  constructor(private readonly app: App) {
     super();
 
     this.transitionTask = new Executor();
@@ -72,7 +67,7 @@ export class RouterService extends Bootstrap {
     return this.router.subscribe(subscriber);
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
   load(): void | Promise<void> {
     this.start();
   }
@@ -94,17 +89,15 @@ export class RouterService extends Bootstrap {
       root = root + '/';
     }
 
-    this.router.usePlugin(browserPlugin({
-      useHash: true,
-      base: root,
-    }));
+    this.router.usePlugin(
+      browserPlugin({
+        useHash: true,
+        base: root,
+      }),
+    );
 
     this.router.subscribe(this.onRouteChange.bind(this));
-    this.router.useMiddleware(() => async (
-      fromState,
-      toState,
-      done
-    ) => {
+    this.router.useMiddleware(() => async (fromState, toState, done) => {
       const contexts = await this.transitionTask.execute({ fromState: toState, toState: fromState, done });
 
       if (ExecutorInterrupter.isInterrupted(contexts)) {
@@ -113,8 +106,7 @@ export class RouterService extends Bootstrap {
       }
 
       return Promise.resolve();
-    }
-    );
+    });
   }
 
   private onRouteChange(state: SubscribeState) {
diff --git a/webapp/packages/core-routing/src/Screen/IScreen.ts b/webapp/packages/core-routing/src/Screen/IScreen.ts
index c823f366b0..b8a49f6058 100644
--- a/webapp/packages/core-routing/src/Screen/IScreen.ts
+++ b/webapp/packages/core-routing/src/Screen/IScreen.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Route, State as RouterState } from 'router5';
 
 export type ScreenRoute = Omit<Route, 'children'>;
diff --git a/webapp/packages/core-routing/src/Screen/ScreenService.ts b/webapp/packages/core-routing/src/Screen/ScreenService.ts
index 8913f95d07..70e05cbead 100644
--- a/webapp/packages/core-routing/src/Screen/ScreenService.ts
+++ b/webapp/packages/core-routing/src/Screen/ScreenService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 import type { SubscribeState } from 'router5';
 
@@ -26,9 +25,7 @@ export class ScreenService {
   private readonly screens: Map<string, IScreen<any>>;
   private readonly routeScreenMap: Map<string, string>;
 
-  constructor(
-    readonly routerService: RouterService
-  ) {
+  constructor(readonly routerService: RouterService) {
     this.routeChange = new Executor();
     this.screens = new Map<string, IScreen<any>>();
     this.routeScreenMap = new Map<string, string>();
@@ -41,8 +38,7 @@ export class ScreenService {
   }
 
   navigateToRoot(): void {
-    const screen = Array.from(this.screens.values())
-      .find(screen => screen.root);
+    const screen = Array.from(this.screens.values()).find(screen => screen.root);
 
     if (screen) {
       this.routerService.router.navigate(screen.name);
@@ -97,10 +93,7 @@ export class ScreenService {
     return this.screens.get(screen);
   }
 
-  private async routeTransition(
-    data: RouterTransitionData,
-    contexts: IExecutionContextProvider<RouterTransitionData>
-  ): Promise<void> {
+  private async routeTransition(data: RouterTransitionData, contexts: IExecutionContextProvider<RouterTransitionData>): Promise<void> {
     if (!data.fromState) {
       return;
     }
diff --git a/webapp/packages/core-routing/src/WindowsService.ts b/webapp/packages/core-routing/src/WindowsService.ts
index a39fecf7b4..6f104ccfa5 100644
--- a/webapp/packages/core-routing/src/WindowsService.ts
+++ b/webapp/packages/core-routing/src/WindowsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { IWindowOptions, openCenteredPopup } from '@cloudbeaver/core-utils';
 
@@ -25,11 +24,7 @@ export class WindowsService {
     this.windows = new Map();
   }
 
-  open(
-    id: string,
-    options: IWindowOptions,
-    onClose?: () => void
-  ): Window | null {
+  open(id: string, options: IWindowOptions, onClose?: () => void): Window | null {
     const current = this.windows.get(id);
 
     if (current) {
@@ -61,15 +56,13 @@ export class WindowsService {
   }
 
   close(window: Window) {
-    const current = Array.from(this.windows.values())
-      .find(info => info.window === window);
+    const current = Array.from(this.windows.values()).find(info => info.window === window);
 
     current?.window.close();
   }
 
   async waitWindowsClose(window: Window): Promise<void> {
-    const current = Array.from(this.windows.values())
-      .find(info => info.window === window);
+    const current = Array.from(this.windows.values()).find(info => info.window === window);
 
     await current?.promise;
   }
@@ -78,8 +71,7 @@ export class WindowsService {
     if (this.windows.size > 0) {
       if (!this.trackWindowClose) {
         this.trackWindowClose = setInterval(() => {
-          const closedWindows = Array.from(this.windows.values())
-            .filter(info => info.window.closed);
+          const closedWindows = Array.from(this.windows.values()).filter(info => info.window.closed);
 
           for (const info of closedWindows) {
             info.onClose?.();
@@ -94,4 +86,4 @@ export class WindowsService {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-routing/src/manifest.ts b/webapp/packages/core-routing/src/manifest.ts
index 3f45975e25..36e9e2fcb9 100644
--- a/webapp/packages/core-routing/src/manifest.ts
+++ b/webapp/packages/core-routing/src/manifest.ts
@@ -5,22 +5,16 @@
  * 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 { RouterService } from './RouterService';
 import { ScreenService } from './Screen/ScreenService';
 import { WindowsService } from './WindowsService';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Routing',
   },
 
-  providers: [
-    ScreenService,
-    RouterService,
-    WindowsService,
-  ],
+  providers: [ScreenService, RouterService, WindowsService],
 };
diff --git a/webapp/packages/core-sdk/src/AsyncTask/AsyncTask.ts b/webapp/packages/core-sdk/src/AsyncTask/AsyncTask.ts
index f4b7019a56..e73d42afe3 100644
--- a/webapp/packages/core-sdk/src/AsyncTask/AsyncTask.ts
+++ b/webapp/packages/core-sdk/src/AsyncTask/AsyncTask.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import { uuid } from '@cloudbeaver/core-utils';
@@ -42,10 +41,7 @@ export class AsyncTask {
   private readonly cancel: (info: AsyncTaskInfo) => Promise<void>;
   private initPromise: Promise<void> | null;
 
-  constructor(
-    init: () => Promise<AsyncTaskInfo>,
-    cancel: (info: AsyncTaskInfo) => Promise<void>
-  ) {
+  constructor(init: () => Promise<AsyncTaskInfo>, cancel: (info: AsyncTaskInfo) => Promise<void>) {
     this.id = uuid();
     this.init = init;
     this.cancel = cancel;
@@ -107,7 +103,7 @@ export class AsyncTask {
     }
 
     if (!this.pending) {
-      throw new Error('Can\'t cancel finished task');
+      throw new Error("Can't cancel finished task");
     }
 
     this._cancelled = true;
diff --git a/webapp/packages/core-sdk/src/AsyncTask/AsyncTaskInfoService.ts b/webapp/packages/core-sdk/src/AsyncTask/AsyncTaskInfoService.ts
index 782e5b3c07..8a4907545c 100644
--- a/webapp/packages/core-sdk/src/AsyncTask/AsyncTaskInfoService.ts
+++ b/webapp/packages/core-sdk/src/AsyncTask/AsyncTaskInfoService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { cancellableTimeout } from '@cloudbeaver/core-utils';
 
@@ -19,9 +18,7 @@ const DELAY_BETWEEN_TRIES = 250;
 export class AsyncTaskInfoService {
   private readonly tasks: Map<string, AsyncTask>;
 
-  constructor(
-    private readonly graphQLService: GraphQLService,
-  ) {
+  constructor(private readonly graphQLService: GraphQLService) {
     this.tasks = new Map();
   }
 
diff --git a/webapp/packages/core-sdk/src/CustomGraphQLClient.ts b/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
index 21149b03cc..1e1c53dbb7 100644
--- a/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
+++ b/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import axios, { AxiosProgressEvent, AxiosResponse, isAxiosError } from 'axios';
-import { GraphQLClient, ClientError, resolveRequestDocument } from 'graphql-request';
+import { ClientError, GraphQLClient, resolveRequestDocument } from 'graphql-request';
 import { parseRequestArgs } from 'graphql-request/dist/parseArgs';
 import type { RequestDocument, RequestOptions, Variables } from 'graphql-request/dist/types';
 import type * as Dom from 'graphql-request/dist/types.dom';
@@ -19,12 +18,11 @@ import { ServerInternalError } from './ServerInternalError';
 
 export type UploadProgressEvent = AxiosProgressEvent;
 
-type GqlResponse = (
-  { data: object; errors: undefined }[]
+type GqlResponse =
+  | { data: object; errors: undefined }[]
   | { data: object; errors: undefined }
   | { data: undefined; errors: object }
-  | { data: undefined; errors: object[] }
-);
+  | { data: undefined; errors: object[] };
 
 export class CustomGraphQLClient extends GraphQLClient {
   get blockReason(): Error | string | null {
@@ -40,11 +38,11 @@ export class CustomGraphQLClient extends GraphQLClient {
     files: FileList,
     query?: string,
     variables?: V,
-    onUploadProgress?: (event: UploadProgressEvent) => void
+    onUploadProgress?: (event: UploadProgressEvent) => void,
   ): Promise<T> {
     return this.interceptors.reduce(
       (accumulator, interceptor) => interceptor(accumulator),
-      this.overrideFileUpload<T, V>(url, files, query, variables, onUploadProgress)
+      this.overrideFileUpload<T, V>(url, files, query, variables, onUploadProgress),
     );
   }
 
@@ -57,11 +55,11 @@ export class CustomGraphQLClient extends GraphQLClient {
   request<T = any, V extends Variables = Variables>(
     document: RequestDocument | RequestOptions<V>,
     variables?: V,
-    requestHeaders?: Dom.RequestInit['headers']
+    requestHeaders?: Dom.RequestInit['headers'],
   ): Promise<T> {
     return this.interceptors.reduce(
       (accumulator, interceptor) => interceptor(accumulator),
-      this.overrideRequest<T, V>(document, variables, requestHeaders)
+      this.overrideRequest<T, V>(document, variables, requestHeaders),
     );
   }
 
@@ -88,7 +86,7 @@ export class CustomGraphQLClient extends GraphQLClient {
   private async overrideRequest<T, V extends Variables = Variables>(
     documentOrOptions: RequestDocument | RequestOptions<V>,
     variables?: V,
-    requestHeaders?: Dom.RequestInit['headers']
+    requestHeaders?: Dom.RequestInit['headers'],
   ): Promise<T> {
     this.blockRequestsReasonHandler();
     try {
@@ -117,21 +115,25 @@ export class CustomGraphQLClient extends GraphQLClient {
     files: FileList,
     query?: string,
     variables?: V,
-    onUploadProgress?: (event: UploadProgressEvent) => void
+    onUploadProgress?: (event: UploadProgressEvent) => void,
   ): Promise<T> {
     this.blockRequestsReasonHandler();
     try {
       const { operationName } = resolveRequestDocument(query ?? '');
       // TODO: we don't support GQL response right now
-      const response = await axios.postForm/*<GqlResponse>*/<T>(url, {
-        operationName,
-        query,
-        variables: JSON.stringify(variables),
-        'files[]': files,
-      }, {
-        onUploadProgress,
-        responseType: 'json',
-      });
+      const response = await axios.postForm/*<GqlResponse>*/ <T>(
+        url,
+        {
+          operationName,
+          query,
+          variables: JSON.stringify(variables),
+          'files[]': files,
+        },
+        {
+          onUploadProgress,
+          responseType: 'json',
+        },
+      );
 
       // TODO: we don't support GQL response right now
       // TODO: seems here can be undefined
@@ -155,20 +157,12 @@ export class CustomGraphQLClient extends GraphQLClient {
     }
   }
 
-  private parseGQLResponse<T>(
-    response: AxiosResponse<GqlResponse>,
-    query: string,
-    variables?: Variables,
-  ): T {
+  private parseGQLResponse<T>(response: AxiosResponse<GqlResponse>, query: string, variables?: Variables): T {
     const result = response.data;
 
-    const successfullyReceivedData = Array.isArray(result)
-      ? !result.some(({ data }) => !data)
-      : Boolean(result.data);
+    const successfullyReceivedData = Array.isArray(result) ? !result.some(({ data }) => !data) : Boolean(result.data);
 
-    const successfullyPassedErrorPolicy = Array.isArray(result)
-      || !result.errors
-      || (Array.isArray(result.errors) && !result.errors.length);
+    const successfullyPassedErrorPolicy = Array.isArray(result) || !result.errors || (Array.isArray(result.errors) && !result.errors.length);
 
     if (response.status === 200 && successfullyPassedErrorPolicy && successfullyReceivedData) {
       const data = result;
@@ -181,16 +175,16 @@ export class CustomGraphQLClient extends GraphQLClient {
         status: response.status,
       };
     } else {
-      const errorResult
-      = typeof result === 'string'
-        ? {
-          error: result,
-        }
-        : result;
+      const errorResult =
+        typeof result === 'string'
+          ? {
+              error: result,
+            }
+          : result;
       throw new ClientError(
-      // @ts-expect-error TODO
+        // @ts-expect-error TODO
         { ...errorResult, status: response.status, headers: response.headers },
-        { query, variables }
+        { query, variables },
       );
     }
   }
diff --git a/webapp/packages/core-sdk/src/EServerErrorCode.ts b/webapp/packages/core-sdk/src/EServerErrorCode.ts
index 7744ee86f1..6a484fd983 100644
--- a/webapp/packages/core-sdk/src/EServerErrorCode.ts
+++ b/webapp/packages/core-sdk/src/EServerErrorCode.ts
@@ -8,5 +8,5 @@
 
 export enum EServerErrorCode {
   'sessionExpired' = 'sessionExpired',
-  'licenseRequired' = 'licenseRequired'
+  'licenseRequired' = 'licenseRequired',
 }
diff --git a/webapp/packages/core-sdk/src/EnvironmentService.ts b/webapp/packages/core-sdk/src/EnvironmentService.ts
index 53555c3080..2aa34c0b8a 100644
--- a/webapp/packages/core-sdk/src/EnvironmentService.ts
+++ b/webapp/packages/core-sdk/src/EnvironmentService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { GlobalConstants } from '@cloudbeaver/core-utils';
 
diff --git a/webapp/packages/core-sdk/src/Extensions/uploadDriverLibraryExtension.ts b/webapp/packages/core-sdk/src/Extensions/uploadDriverLibraryExtension.ts
index 5733dee9a1..7a239f6bf8 100644
--- a/webapp/packages/core-sdk/src/Extensions/uploadDriverLibraryExtension.ts
+++ b/webapp/packages/core-sdk/src/Extensions/uploadDriverLibraryExtension.ts
@@ -5,34 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { GlobalConstants } from '@cloudbeaver/core-utils';
 
 import type { CustomGraphQLClient, UploadProgressEvent } from '../CustomGraphQLClient';
 
 export interface IUploadDriverLibraryExtension {
-  uploadDriverLibrary: (
-    driverId: string,
-    files: FileList,
-    onUploadProgress?: (event: UploadProgressEvent) => void
-  ) => Promise<void>;
+  uploadDriverLibrary: (driverId: string, files: FileList, onUploadProgress?: (event: UploadProgressEvent) => void) => Promise<void>;
 }
 
 export function uploadDriverLibraryExtension(client: CustomGraphQLClient): IUploadDriverLibraryExtension {
   return {
-    uploadDriverLibrary(
-      driverId: string,
-      files: FileList,
-      onUploadProgress?: (event: UploadProgressEvent) => void
-    ): Promise<void> {
-
-      return client.uploadFile(
-        GlobalConstants.absoluteServiceUrl('drivers', 'library'),
-        files,
-        undefined,
-        { driverId },
-        onUploadProgress
-      );
+    uploadDriverLibrary(driverId: string, files: FileList, onUploadProgress?: (event: UploadProgressEvent) => void): Promise<void> {
+      return client.uploadFile(GlobalConstants.absoluteServiceUrl('drivers', 'library'), files, undefined, { driverId }, onUploadProgress);
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/GQLError.ts b/webapp/packages/core-sdk/src/GQLError.ts
index 3e75d4fe38..7a91579543 100644
--- a/webapp/packages/core-sdk/src/GQLError.ts
+++ b/webapp/packages/core-sdk/src/GQLError.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="types.d.ts" />
-
 import type { ClientError, GraphQLRequestContext, GraphQLResponse } from 'graphql-request/dist/types';
 
 import { DetailsError } from './DetailsError';
@@ -25,9 +23,7 @@ export class GQLError extends DetailsError {
     if (typeof clientError.response.error === 'string') {
       message = clientError.response.error;
     } else if (clientError.response.errors && clientError.response.errors.length > 0) {
-      message = clientError.response.errors
-        .map(e => e.message)
-        .join('\n');
+      message = clientError.response.errors.map(e => e.message).join('\n');
     } else {
       message = 'Unknown error';
     }
diff --git a/webapp/packages/core-sdk/src/GQLErrorCatcher.ts b/webapp/packages/core-sdk/src/GQLErrorCatcher.ts
index 3b320b0713..355ec0672d 100644
--- a/webapp/packages/core-sdk/src/GQLErrorCatcher.ts
+++ b/webapp/packages/core-sdk/src/GQLErrorCatcher.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, action, makeObservable } from 'mobx';
+import { action, makeObservable, observable } from 'mobx';
 
 import { errorOf } from '@cloudbeaver/core-utils';
 
diff --git a/webapp/packages/core-sdk/src/GraphQLService.ts b/webapp/packages/core-sdk/src/GraphQLService.ts
index c8d78789dd..07cdc795ae 100644
--- a/webapp/packages/core-sdk/src/GraphQLService.ts
+++ b/webapp/packages/core-sdk/src/GraphQLService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { CustomGraphQLClient } from './CustomGraphQLClient';
diff --git a/webapp/packages/core-sdk/src/PlainGQLError.ts b/webapp/packages/core-sdk/src/PlainGQLError.ts
index 1ba8619ead..5075420be6 100644
--- a/webapp/packages/core-sdk/src/PlainGQLError.ts
+++ b/webapp/packages/core-sdk/src/PlainGQLError.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ClientError } from 'graphql-request';
 import type { GraphQLRequestContext, GraphQLResponse } from 'graphql-request/dist/types';
 
@@ -32,4 +31,4 @@ export class PlainGQLError extends DetailsError {
   hasDetails(): boolean {
     return false;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts b/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
index 6f62a2398d..b1de833bbb 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
@@ -5,52 +5,33 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ILoadableState, isContainsException } from '@cloudbeaver/core-utils';
 
 import { CachedResource, CachedResourceParamKey, ICachedResourceMetadata } from './CachedResource';
 import type { CachedResourceIncludeArgs, CachedResourceValueIncludes } from './CachedResourceIncludes';
 
-export type CachedDataResourceData<TResource> = TResource extends CachedDataResource<infer T, any, any>
-  ? T
-  : never;
-export type CachedDataResourceKey<TResource> = TResource extends CachedDataResource<any, infer T, any>
-  ? T
-  : never;
+export type CachedDataResourceData<TResource> = TResource extends CachedDataResource<infer T, any, any> ? T : never;
+export type CachedDataResourceKey<TResource> = TResource extends CachedDataResource<any, infer T, any> ? T : never;
 
-export type CachedDataResourceGetter<
-  TValue,
-  TIncludes
-> = (
-  TValue extends null
-    ? CachedResourceValueIncludes<TValue, TIncludes> | null
-    : CachedResourceValueIncludes<TValue, TIncludes>
-);
+export type CachedDataResourceGetter<TValue, TIncludes> = TValue extends null
+  ? CachedResourceValueIncludes<TValue, TIncludes> | null
+  : CachedResourceValueIncludes<TValue, TIncludes>;
 
 export abstract class CachedDataResource<
   TData,
   TKey = void,
   TContext extends Record<string, any> = Record<string, never>,
   TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata,
-> extends CachedResource<
-  TData,
-  TData,
-  TKey,
-  CachedResourceIncludeArgs<TData, TContext>,
-  TMetadata
-  > {
+> extends CachedResource<TData, TData, TKey, CachedResourceIncludeArgs<TData, TContext>, TMetadata> {
   constructor(
     defaultValue: () => TData,
     defaultKey: TKey = undefined as TKey,
-    defaultIncludes: CachedResourceIncludeArgs<TData, TContext> = [] as any
+    defaultIncludes: CachedResourceIncludeArgs<TData, TContext> = [] as any,
   ) {
     super(defaultKey, defaultValue, defaultIncludes);
   }
 
-  async refresh<T extends CachedResourceIncludeArgs<TData, TContext> = []>(
-    param: TKey,
-    context?: T
-  ): Promise<CachedResourceValueIncludes<TData, T>> {
+  async refresh<T extends CachedResourceIncludeArgs<TData, TContext> = []>(param: TKey, context?: T): Promise<CachedResourceValueIncludes<TData, T>> {
     if (param === undefined) {
       param = CachedResourceParamKey as TKey;
     }
@@ -58,10 +39,7 @@ export abstract class CachedDataResource<
     return this.data as CachedResourceValueIncludes<TData, T>;
   }
 
-  async load<T extends CachedResourceIncludeArgs<TData, TContext> = []>(
-    param: TKey,
-    context?: T
-  ): Promise<CachedResourceValueIncludes<TData, T>> {
+  async load<T extends CachedResourceIncludeArgs<TData, TContext> = []>(param: TKey, context?: T): Promise<CachedResourceValueIncludes<TData, T>> {
     if (param === undefined) {
       param = CachedResourceParamKey as TKey;
     }
@@ -74,15 +52,11 @@ export abstract class CachedDataResource<
   }
 }
 
-export function getCachedDataResourceLoaderState<
-  TData,
-  TKey = void,
-  TContext extends Record<string, any> = Record<string, never>,
->(
+export function getCachedDataResourceLoaderState<TData, TKey = void, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedDataResource<TData, TKey, TContext>,
   param: TKey,
   context?: CachedResourceIncludeArgs<TData, TContext>,
-  lazy?: boolean
+  lazy?: boolean,
 ): ILoadableState {
   return {
     lazy,
@@ -108,4 +82,4 @@ export function getCachedDataResourceLoaderState<
       return resource.refresh(param, context);
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
index cb943edcdd..af040f0bac 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable } from 'mobx';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -20,29 +19,14 @@ import { ResourceKeyListAlias, resourceKeyListAlias } from './ResourceKeyListAli
 import { ResourceKeyUtils } from './ResourceKeyUtils';
 
 export type CachedMapResourceKey<TResource> = CachedResourceKey<TResource>;
-export type CachedMapResourceValue<TResource> = TResource extends CachedResource<Map<any, infer T>, any, any, any, any>
-  ? T
-  : never;
-export type CachedMapResourceArguments<TResource> = TResource extends CachedMapResource<any, any, infer T, any>
-  ? T
-  : never;
+export type CachedMapResourceValue<TResource> = TResource extends CachedResource<Map<any, infer T>, any, any, any, any> ? T : never;
+export type CachedMapResourceArguments<TResource> = TResource extends CachedMapResource<any, any, infer T, any> ? T : never;
 
-export type CachedMapResourceListGetter<
-  TValue,
-  TIncludes
-> = Array<CachedMapResourceGetter<TValue, TIncludes>>;
+export type CachedMapResourceListGetter<TValue, TIncludes> = Array<CachedMapResourceGetter<TValue, TIncludes>>;
 
-export type CachedMapResourceGetter<
-  TValue,
-  TIncludes
-> = CachedResourceValueIncludes<TValue, TIncludes> | undefined;
+export type CachedMapResourceGetter<TValue, TIncludes> = CachedResourceValueIncludes<TValue, TIncludes> | undefined;
 
-export type CachedMapResourceLoader<
-  TRealKey,
-  TKey,
-  TValue,
-  TIncludes
-> = TRealKey extends ResourceKeyList<TKey>
+export type CachedMapResourceLoader<TRealKey, TKey, TValue, TIncludes> = TRealKey extends ResourceKeyList<TKey>
   ? Array<CachedResourceValueIncludes<TValue, TIncludes>>
   : CachedResourceValueIncludes<TValue, TIncludes>;
 
@@ -54,13 +38,7 @@ export abstract class CachedMapResource<
   TValue,
   TContext extends Record<string, any> = Record<string, never>,
   TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata,
-> extends CachedResource<
-  Map<TKey, TValue>,
-  TValue,
-  TKey,
-  CachedResourceIncludeArgs<TValue, TContext>,
-  TMetadata
-  > {
+> extends CachedResource<Map<TKey, TValue>, TValue, TKey, CachedResourceIncludeArgs<TValue, TContext>, TMetadata> {
   readonly onItemUpdate: ISyncExecutor<ResourceKeySimple<TKey>>;
   readonly onItemDelete: ISyncExecutor<ResourceKeySimple<TKey>>;
 
@@ -72,10 +50,7 @@ export abstract class CachedMapResource<
     return Array.from(this.data.keys());
   }
 
-  constructor(
-    defaultValue?: () => Map<TKey, TValue>,
-    defaultIncludes?: CachedResourceIncludeArgs<TValue, TContext>
-  ) {
+  constructor(defaultValue?: () => Map<TKey, TValue>, defaultIncludes?: CachedResourceIncludeArgs<TValue, TContext>) {
     super(CachedMapAllKey, defaultValue || (() => new Map()), defaultIncludes);
     this.onItemUpdate = new SyncExecutor<ResourceKeySimple<TKey>>(null);
     this.onItemDelete = new SyncExecutor<ResourceKeySimple<TKey>>(null);
@@ -97,10 +72,7 @@ export abstract class CachedMapResource<
     });
   }
 
-  deleteInResource<T = TKey>(
-    resource: CachedMapResource<T, any, any>,
-    map?: (key: ResourceKey<TKey>) => ResourceKey<T>
-  ): this {
+  deleteInResource<T = TKey>(resource: CachedMapResource<T, any, any>, map?: (key: ResourceKey<TKey>) => ResourceKey<T>): this {
     this.onItemDelete.addHandler(param => {
       try {
         if (this.logActivity) {
@@ -123,10 +95,7 @@ export abstract class CachedMapResource<
   }
 
   has(key: ResourceKey<TKey>): boolean {
-    if (
-      this.isAlias(key)
-       && (!this.hasMetadata(key) || this.isLoaded(key))
-    ) {
+    if (this.isAlias(key) && (!this.hasMetadata(key) || this.isLoaded(key))) {
       return false;
     }
 
@@ -188,19 +157,19 @@ export abstract class CachedMapResource<
 
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: TKey | ResourceKeyAlias<TKey, any>,
-    includes?: T
+    includes?: T,
   ): Promise<CachedResourceValueIncludes<TValue, T>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKeyList<TKey> | ResourceKeyListAlias<TKey, any> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: ResourceKey<TKey>,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKey<TKey> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>> {
     if (key === undefined) {
       key = CachedMapAllKey;
@@ -211,19 +180,19 @@ export abstract class CachedMapResource<
 
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: TKey | ResourceKeyAlias<TKey, any>,
-    includes?: T
+    includes?: T,
   ): Promise<CachedResourceValueIncludes<TValue, T>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKeyList<TKey> | ResourceKeyListAlias<TKey, any> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: ResourceKey<TKey>,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKey<TKey> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>> {
     if (key === undefined) {
       key = CachedMapAllKey;
@@ -287,15 +256,11 @@ export abstract class CachedMapResource<
   }
 }
 
-export function getCachedMapResourceLoaderState<
-  TKey,
-  TValue,
-  TContext extends Record<string, any> = Record<string, never>
->(
+export function getCachedMapResourceLoaderState<TKey, TValue, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedMapResource<TKey, TValue, TContext>,
   key: ResourceKey<TKey>,
   includes?: CachedResourceIncludeArgs<TValue, TContext> | undefined,
-  lazy?: boolean
+  lazy?: boolean,
 ): ILoadableState {
   return {
     lazy,
diff --git a/webapp/packages/core-sdk/src/Resource/CachedResource.ts b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
index 1756f300c6..4e6d54ffb2 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedResource.ts
@@ -5,11 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, action, computed, toJS } from 'mobx';
+import { action, computed, makeObservable, observable, toJS } from 'mobx';
 
 import { Dependency } from '@cloudbeaver/core-di';
-import { ExecutionContext, Executor, ExecutorInterrupter, IExecutor, IExecutorHandler, IExecutionContextProvider, ISyncExecutor, SyncExecutor, TaskScheduler } from '@cloudbeaver/core-executor';
+import {
+  ExecutionContext,
+  Executor,
+  ExecutorInterrupter,
+  IExecutionContextProvider,
+  IExecutor,
+  IExecutorHandler,
+  ISyncExecutor,
+  SyncExecutor,
+  TaskScheduler,
+} from '@cloudbeaver/core-executor';
 import { isPrimitive, MetadataMap, uuid } from '@cloudbeaver/core-utils';
 
 import { isResourceAlias, ResourceAlias, ResourceAliasFactory, ResourceAliasOptions } from './ResourceAlias';
@@ -49,11 +58,7 @@ export type CachedResourceData<TResource> = TResource extends CachedResource<inf
 export type CachedResourceValue<TResource> = TResource extends CachedResource<any, infer T, any, any, any> ? T : never;
 export type CachedResourceKey<TResource> = TResource extends CachedResource<any, any, infer T, any, any> ? T : never;
 export type CachedResourceContext<TResource> = TResource extends CachedResource<any, any, any, infer T, any> ? T : void;
-export type CachedResourceMetadata<TResource> = (
-  TResource extends CachedResource<any, any, any, any, infer T>
-    ? T
-    : void
-);
+export type CachedResourceMetadata<TResource> = TResource extends CachedResource<any, any, any, any, infer T> ? T : void;
 
 export const CachedResourceParamKey = resourceKeyAlias('@cached-resource/param-default');
 
@@ -67,8 +72,7 @@ export abstract class CachedResource<
   data: TData;
 
   get isResourceInUse(): boolean {
-    return this.getAllMetadata()
-      .some(metadata => metadata.dependencies.length > 0);
+    return this.getAllMetadata().some(metadata => metadata.dependencies.length > 0);
   }
 
   readonly onClear: ISyncExecutor;
@@ -92,11 +96,7 @@ export abstract class CachedResource<
 
   private readonly typescriptHack: TValue;
 
-  constructor(
-    defaultKey: ResourceKey<TKey>,
-    private readonly defaultValue: () => TData,
-    defaultIncludes: TInclude = [] as any
-  ) {
+  constructor(defaultKey: ResourceKey<TKey>, private readonly defaultValue: () => TData, defaultIncludes: TInclude = [] as any) {
     super();
 
     this.isKeyEqual = this.isKeyEqual.bind(this);
@@ -109,10 +109,7 @@ export abstract class CachedResource<
     this.defaultIncludes = defaultIncludes;
     this.paramAliases = [];
     this.outdateWaitList = [];
-    this.metadata = new MetadataMap((key, metadata) => (observable(this.getDefaultMetadata(
-      key,
-      metadata
-    ) as TMetadata, undefined, { deep: false })));
+    this.metadata = new MetadataMap((key, metadata) => observable(this.getDefaultMetadata(key, metadata) as TMetadata, undefined, { deep: false }));
     this.scheduler = new TaskScheduler(this.isIntersect);
     this.data = defaultValue();
     this.beforeLoad = new Executor(null, this.isIntersect);
@@ -132,10 +129,7 @@ export abstract class CachedResource<
       this.spy(this.onDataError, 'onDataError');
     }
 
-    makeObservable<
-    this,
-    'loader' | 'commitIncludes' | 'resetIncludes' | 'markOutdatedSync'
-    >(this, {
+    makeObservable<this, 'loader' | 'commitIncludes' | 'resetIncludes' | 'markOutdatedSync'>(this, {
       data: observable,
       isResourceInUse: computed,
       loader: action,
@@ -168,9 +162,7 @@ export abstract class CachedResource<
    * Mark resource as in use when {@link resource} is in use
    * @param resource resource to depend on
    */
-  connect(
-    resource: CachedResource<any, any, any, any, any>
-  ): void {
+  connect(resource: CachedResource<any, any, any, any, any>): void {
     let subscription: string | null = null;
 
     const subscriptionHandler = () => {
@@ -193,7 +185,7 @@ export abstract class CachedResource<
   sync<T = TKey>(
     resource: CachedResource<any, any, T, any, any>,
     mapTo?: (param: ResourceKey<TKey>) => ResourceKey<T>,
-    mapOut?: (param: ResourceKey<T>) => ResourceKey<TKey>
+    mapOut?: (param: ResourceKey<T>) => ResourceKey<TKey>,
   ): void {
     // TODO: do we want to sync "Clean" action?
     resource.outdateResource(this, mapOut);
@@ -211,10 +203,7 @@ export abstract class CachedResource<
     this.preloadResource(resource, mapTo);
   }
 
-  updateResource<T = TKey>(
-    resource: CachedResource<any, any, T, any, any>,
-    map?: (param: ResourceKey<TKey>) => ResourceKey<T>
-  ): this {
+  updateResource<T = TKey>(resource: CachedResource<any, any, T, any, any>, map?: (param: ResourceKey<TKey>) => ResourceKey<T>): this {
     this.onDataUpdate.addHandler(param => {
       try {
         if (this.logActivity) {
@@ -236,10 +225,7 @@ export abstract class CachedResource<
     return this;
   }
 
-  outdateResource<T = TKey>(
-    resource: CachedResource<any, any, T, any, any>,
-    map?: (param: ResourceKey<TKey>) => ResourceKey<T>
-  ): this {
+  outdateResource<T = TKey>(resource: CachedResource<any, any, T, any, any>, map?: (param: ResourceKey<TKey>) => ResourceKey<T>): this {
     this.onDataOutdated.addHandler(param => {
       try {
         if (this.logActivity) {
@@ -261,10 +247,7 @@ export abstract class CachedResource<
     return this;
   }
 
-  preloadResource<T = TKey>(
-    resource: CachedResource<any, any, T, any, any>,
-    map?: (param: ResourceKey<TKey>) => ResourceKey<T>
-  ): this {
+  preloadResource<T = TKey>(resource: CachedResource<any, any, T, any, any>, map?: (param: ResourceKey<TKey>) => ResourceKey<T>): this {
     resource.connect(this);
 
     this.beforeLoad.addHandler(async param => {
@@ -353,10 +336,7 @@ export abstract class CachedResource<
       return false;
     }
 
-    return (
-      this.everyMetadata(param, metadata => metadata.loaded)
-      && (!includes || this.isIncludes(param, includes))
-    );
+    return this.everyMetadata(param, metadata => metadata.loaded) && (!includes || this.isIncludes(param, includes));
   }
 
   isLoadable(param?: ResourceKey<TKey>, context?: TInclude): boolean {
@@ -372,15 +352,12 @@ export abstract class CachedResource<
 
   isAlias<TOptions extends ResourceAliasOptions = any>(
     key: ResourceKey<TKey>,
-    aliasToCompare?: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions>
+    aliasToCompare?: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions>,
   ): key is ResourceKeyAlias<TKey, TOptions> | ResourceKeyListAlias<TKey, TOptions> {
     if (isResourceAlias(key)) {
       key = this.transformToAlias(key);
       if (this.hasAlias(key)) {
-        return (
-          aliasToCompare === undefined
-          || aliasToCompare.id === key.id
-        );
+        return aliasToCompare === undefined || aliasToCompare.id === key.id;
       }
       throw new Error(`Alias ${key.toString()} is not registered in ${this.getName()}`);
     }
@@ -411,10 +388,7 @@ export abstract class CachedResource<
     return this.metadata.has(this.getMetadataKeyRef(key));
   }
 
-  everyMetadata(
-    param: ResourceKey<TKey>,
-    predicate: (metadata: TMetadata) => boolean
-  ): boolean {
+  everyMetadata(param: ResourceKey<TKey>, predicate: (metadata: TMetadata) => boolean): boolean {
     if (!this.hasMetadata(param)) {
       return false;
     }
@@ -422,10 +396,7 @@ export abstract class CachedResource<
     return !this.someMetadata(param, key => !predicate(key));
   }
 
-  someMetadata(
-    param: ResourceKey<TKey>,
-    predicate: (metadata: TMetadata) => boolean
-  ): boolean {
+  someMetadata(param: ResourceKey<TKey>, predicate: (metadata: TMetadata) => boolean): boolean {
     if (!this.hasMetadata(param)) {
       return false;
     }
@@ -453,22 +424,10 @@ export abstract class CachedResource<
     return result;
   }
 
-  mapMetadata<TValue>(
-    param: ResourceKeyFlat<TKey>,
-    map: (metadata: TMetadata | undefined) => TValue
-  ): TValue;
-  mapMetadata<TValue>(
-    param: ResourceKeyList<TKey>,
-    map: (metadata: TMetadata | undefined) => TValue
-  ): TValue[];
-  mapMetadata<TValue>(
-    param: ResourceKey<TKey>,
-    map: (metadata: TMetadata | undefined) => TValue
-  ): TValue | TValue[];
-  mapMetadata<TValue>(
-    param: ResourceKey<TKey>,
-    map: (metadata: TMetadata | undefined) => TValue
-  ): TValue | TValue[] {
+  mapMetadata<TValue>(param: ResourceKeyFlat<TKey>, map: (metadata: TMetadata | undefined) => TValue): TValue;
+  mapMetadata<TValue>(param: ResourceKeyList<TKey>, map: (metadata: TMetadata | undefined) => TValue): TValue[];
+  mapMetadata<TValue>(param: ResourceKey<TKey>, map: (metadata: TMetadata | undefined) => TValue): TValue | TValue[];
+  mapMetadata<TValue>(param: ResourceKey<TKey>, map: (metadata: TMetadata | undefined) => TValue): TValue | TValue[] {
     const callback = (key: ResourceKeyFlat<TKey>) => {
       if (!this.hasMetadata(key)) {
         return map(undefined);
@@ -532,8 +491,7 @@ export abstract class CachedResource<
   getException(param: ResourceKey<TKey>): Error[] | Error | null;
   getException(param: ResourceKey<TKey>): Error[] | Error | null {
     if (isResourceKeyList(param)) {
-      return this.mapMetadata(param, metadata => metadata?.exception || null)
-        .filter<Error>((exception): exception is Error => exception !== null);
+      return this.mapMetadata(param, metadata => metadata?.exception || null).filter<Error>((exception): exception is Error => exception !== null);
     }
 
     return this.mapMetadata(param, metadata => metadata?.exception || null);
@@ -600,11 +558,7 @@ export abstract class CachedResource<
       param = CachedResourceParamKey;
     }
 
-    const isKeyExecuting = (
-      param === CachedResourceParamKey
-        ? this.scheduler.executing
-        : this.scheduler.isExecuting(param)
-    );
+    const isKeyExecuting = param === CachedResourceParamKey ? this.scheduler.executing : this.scheduler.isExecuting(param);
 
     if (isKeyExecuting && !this.outdateWaitList.some(key => this.isIntersect(param!, key))) {
       this.outdateWaitList.push(param);
@@ -638,14 +592,14 @@ export abstract class CachedResource<
 
   addAlias<TOptions extends ResourceAliasOptions>(
     param: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions>,
-    getAlias: (param: ResourceAlias<TKey, TOptions>) => ResourceKey<TKey>
+    getAlias: (param: ResourceAlias<TKey, TOptions>) => ResourceKey<TKey>,
   ): void {
     this.paramAliases.push({ id: param.id, getAlias });
   }
 
   replaceAlias<TOptions extends ResourceAliasOptions>(
     param: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions>,
-    getAlias: (param: ResourceAlias<TKey, TOptions>) => ResourceKey<TKey>
+    getAlias: (param: ResourceAlias<TKey, TOptions>) => ResourceKey<TKey>,
   ): void {
     const indexOf = this.paramAliases.findIndex(aliasInfo => aliasInfo.id === param.id);
 
@@ -692,7 +646,6 @@ export abstract class CachedResource<
     this.onDataUpdate.execute(this.transformToAlias(CachedResourceParamKey));
   }
 
-
   /**
    * Converts array of includes to map
    * ```
@@ -705,10 +658,7 @@ export abstract class CachedResource<
    * @param includes - Base includes
    * @returns {Object} Object where key is include name and value is true
    */
-  getIncludesMap(
-    key?: ResourceKeyFlat<TKey>,
-    includes: ReadonlyArray<string> = this.defaultIncludes
-  ): Record<string, any> {
+  getIncludesMap(key?: ResourceKeyFlat<TKey>, includes: ReadonlyArray<string> = this.defaultIncludes): Record<string, any> {
     const keyIncludes = this.getIncludes(key);
     return ['customIncludeBase', ...includes, ...keyIncludes].reduce<any>((map, key) => {
       map[key] = true;
@@ -765,16 +715,14 @@ export abstract class CachedResource<
    */
   protected getMetadataKeyRef(key: ResourceKeyFlat<TKey>): TKey {
     if (isResourceAlias(key)) {
-      return this.transformToAlias(key)
-        .toString() as TKey;
+      return this.transformToAlias(key).toString() as TKey;
     }
 
     if (isPrimitive(key)) {
       return key;
     }
 
-    const ref = Array.from(this.metadata.keys())
-      .find(k => this.isKeyEqual(k, key));
+    const ref = Array.from(this.metadata.keys()).find(k => this.isKeyEqual(k, key));
 
     if (ref) {
       return ref;
@@ -822,13 +770,11 @@ export abstract class CachedResource<
 
   // TODO: add information about original alias for debugging
   protected transformToAlias(
-    key: ResourceKeyAlias<TKey, any> | ResourceKeyListAlias<TKey, any>
+    key: ResourceKeyAlias<TKey, any> | ResourceKeyListAlias<TKey, any>,
   ): ResourceKeyAlias<TKey, any> | ResourceKeyListAlias<TKey, any> {
     let deep = 0;
     // eslint-disable-next-line no-labels
-    transform:
-
-    if (deep < 10) {
+    transform: if (deep < 10) {
       if (!this.validateResourceKey(key)) {
         let paramString = JSON.stringify(toJS(key));
 
@@ -864,10 +810,7 @@ export abstract class CachedResource<
     }
 
     if (isResourceKeyList(param)) {
-      return (
-        param.length === 0
-        || param.every(this.validateKey.bind(this))
-      );
+      return param.length === 0 || param.every(this.validateKey.bind(this));
     }
     return this.validateKey(param);
   }
@@ -910,20 +853,17 @@ export abstract class CachedResource<
   }
 
   protected getInitialOnUseData(): IUseData<TKey> {
-    return ({
+    return {
       id: undefined,
       param: CachedResourceParamKey,
       isInUse: false,
-    });
+    };
   }
   /**
    * Use to extend metadata
    * @returns {Record<string, any>} Object Map
    */
-  protected getDefaultMetadata(
-    key: TKey,
-    metadata: MetadataMap<TKey, TMetadata>
-  ): ICachedResourceMetadata {
+  protected getDefaultMetadata(key: TKey, metadata: MetadataMap<TKey, TMetadata>): ICachedResourceMetadata {
     return {
       loaded: false,
       outdated: true,
@@ -939,13 +879,9 @@ export abstract class CachedResource<
     contexts: IExecutionContextProvider<ResourceKey<TKey>>,
     refresh: boolean,
     context?: TInclude,
-  ): Promise<void> { }
+  ): Promise<void> {}
 
-  protected abstract loader(
-    param: ResourceKey<TKey>,
-    include: ReadonlyArray<string> | undefined,
-    refresh: boolean
-  ): Promise<TData>;
+  protected abstract loader(param: ResourceKey<TKey>, include: ReadonlyArray<string> | undefined, refresh: boolean): Promise<TData>;
 
   //TODO must be protected
   async performUpdate<T>(
@@ -957,13 +893,13 @@ export abstract class CachedResource<
     key: ResourceKey<TKey>,
     include: TInclude | undefined,
     update: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => Promise<T>,
-    exitCheck: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => boolean
+    exitCheck: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => boolean,
   ): Promise<T | undefined>;
   async performUpdate<T>(
     key: ResourceKey<TKey>,
     include: TInclude | undefined,
     update: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => Promise<T>,
-    exitCheck?: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => boolean
+    exitCheck?: (key: ResourceKey<TKey>, context?: ReadonlyArray<string>) => boolean,
   ): Promise<T | undefined> {
     if (isResourceAlias(key)) {
       key = this.transformToAlias(key);
@@ -1010,14 +946,11 @@ export abstract class CachedResource<
           }
         },
         error: exception => this.markError(exception, key, include),
-      });
+      },
+    );
   }
 
-  protected async loadData(
-    key: ResourceKey<TKey>,
-    refresh: boolean,
-    include?: TInclude
-  ): Promise<void> {
+  protected async loadData(key: ResourceKey<TKey>, refresh: boolean, include?: TInclude): Promise<void> {
     if (isResourceAlias(key)) {
       key = this.transformToAlias(key);
     }
@@ -1072,14 +1005,11 @@ export abstract class CachedResource<
           }
         },
         error: exception => this.markError(exception, key, include),
-      });
+      },
+    );
   }
 
-  private async loadingTask(
-    param: ResourceKey<TKey>,
-    context: ReadonlyArray<string> | undefined,
-    refresh: boolean
-  ) {
+  private async loadingTask(param: ResourceKey<TKey>, context: ReadonlyArray<string> | undefined, refresh: boolean) {
     this.setData(await this.loader(param, context, refresh));
   }
 
@@ -1087,11 +1017,7 @@ export abstract class CachedResource<
     param: ResourceKey<TKey>,
     context: ReadonlyArray<string> | undefined,
     refresh: boolean,
-    promise: (
-      param: ResourceKey<TKey>,
-      context: ReadonlyArray<string> | undefined,
-      refresh: boolean
-    ) => Promise<T>
+    promise: (param: ResourceKey<TKey>, context: ReadonlyArray<string> | undefined, refresh: boolean) => Promise<T>,
   ) {
     if (this.logActivity) {
       console.log(this.getActionPrefixedName('loading'));
@@ -1116,27 +1042,31 @@ export abstract class CachedResource<
     return this.constructor.name;
   }
 
-  protected logLock = (action: string): IExecutorHandler<any> => () => {
-    console.log(this.getActionPrefixedName(action));
-  };
+  protected logLock =
+    (action: string): IExecutorHandler<any> =>
+    () => {
+      console.log(this.getActionPrefixedName(action));
+    };
 
-  private readonly logName = (action: string): IExecutorHandler<any> => () => {
-    console.log(this.getActionPrefixedName(action));
-  };
+  private readonly logName =
+    (action: string): IExecutorHandler<any> =>
+    () => {
+      console.log(this.getActionPrefixedName(action));
+    };
 
   protected getActionPrefixedName(action: string): string {
     return this.getName() + ': ' + action;
   }
 
-  private readonly logInterrupted = (action: string): IExecutorHandler<any> => (data, contexts) => {
-    if (ExecutorInterrupter.isInterrupted(contexts)) {
-      console.log(this.getActionPrefixedName(action) + 'interrupted');
-    }
-  };
+  private readonly logInterrupted =
+    (action: string): IExecutorHandler<any> =>
+    (data, contexts) => {
+      if (ExecutorInterrupter.isInterrupted(contexts)) {
+        console.log(this.getActionPrefixedName(action) + 'interrupted');
+      }
+    };
 
   private spy(executor: ISyncExecutor<any>, action: string): void {
-    executor
-      .addHandler(this.logName(action))
-      .addPostHandler(this.logInterrupted(action));
+    executor.addHandler(this.logName(action)).addPostHandler(this.logInterrupted(action));
   }
 }
diff --git a/webapp/packages/core-sdk/src/Resource/CachedResourceIncludes.ts b/webapp/packages/core-sdk/src/Resource/CachedResourceIncludes.ts
index 390a64b379..d39e82aa8c 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedResourceIncludes.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedResourceIncludes.ts
@@ -10,56 +10,42 @@ export type CachedResourceIncludeTemplate<TValue> = `include${Capitalize<string
 
 type ExtractElementType<T> = T extends readonly unknown[] ? ArrayElement<T> : T;
 
-type ArrayElement<ArrayType extends readonly unknown[]> =
-  ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
 
 export type CachedResourceIncludeFlags<TValue, TArgs> = {
-  [P in keyof TArgs as P extends CachedResourceIncludeTemplate<TValue> ? P : never]?: boolean
+  [P in keyof TArgs as P extends CachedResourceIncludeTemplate<TValue> ? P : never]?: boolean;
 };
 
 export type CachedResourceIncludeList<TValue> = Array<CachedResourceIncludeTemplate<TValue>>;
-export type CachedResourceIncludeToKey<TKey> = TKey extends ReadonlyArray<`include${infer T}` | `customInclude${Capitalize<string>}`> ? Uncapitalize<T> : unknown;
-export type CachedResourceIncludeArgs<TValue, TArguments> = (
-  TArguments extends Record<string, never>
-    ? string[]
-    : (
-      Array<
-      Exclude<
-      keyof CachedResourceIncludeFlags<Exclude<ExtractElementType<TValue>, undefined | null>, TArguments>,
-      number | symbol
-      >
-      >
-    )
-) | [];
+export type CachedResourceIncludeToKey<TKey> = TKey extends ReadonlyArray<`include${infer T}` | `customInclude${Capitalize<string>}`>
+  ? Uncapitalize<T>
+  : unknown;
+export type CachedResourceIncludeArgs<TValue, TArguments> =
+  | (TArguments extends Record<string, never>
+      ? string[]
+      : Array<Exclude<keyof CachedResourceIncludeFlags<Exclude<ExtractElementType<TValue>, undefined | null>, TArguments>, number | symbol>>)
+  | [];
 
 export type ApplyIncludes<TValue, TKeys> = TValue extends null | undefined
   ? TValue
-  : TValue & ({
-    [P in Extract<CachedResourceIncludeToKey<TKeys>, keyof TValue>]-?: Required<TValue>[P] extends undefined
-      ? TValue[P]
-      : NonNullable<TValue[P]>;
-  });
+  : TValue & {
+      [P in Extract<CachedResourceIncludeToKey<TKeys>, keyof TValue>]-?: Required<TValue>[P] extends undefined ? TValue[P] : NonNullable<TValue[P]>;
+    };
 
 export type CachedResourceValueElementIncludes<TValue, TKeys> = TValue extends any
-  ? (
-    TValue extends Array<infer TElement>
-      ? TElement extends Record<any, any>
-        ? Array<ApplyIncludes<TElement, TKeys>>
-        : ApplyIncludes<TValue, TKeys>
+  ? TValue extends Array<infer TElement>
+    ? TElement extends Record<any, any>
+      ? Array<ApplyIncludes<TElement, TKeys>>
       : ApplyIncludes<TValue, TKeys>
-  )
+    : ApplyIncludes<TValue, TKeys>
   : undefined;
 
 export type CachedResourceValueIncludes<TValue, TKeys> = TValue extends any
-  ? (
-    TKeys extends []
-      ? TValue
-      : (
-        TValue extends Array<infer TElement>
-          ? TElement extends Record<any, any>
-            ? Array<ApplyIncludes<TElement, TKeys>>
-            : ApplyIncludes<TValue, TKeys>
-          : ApplyIncludes<TValue, TKeys>
-      )
-  )
+  ? TKeys extends []
+    ? TValue
+    : TValue extends Array<infer TElement>
+    ? TElement extends Record<any, any>
+      ? Array<ApplyIncludes<TElement, TKeys>>
+      : ApplyIncludes<TValue, TKeys>
+    : ApplyIncludes<TValue, TKeys>
   : undefined;
diff --git a/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts b/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
index ea4e57e1ed..af35e42b8e 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -28,47 +27,38 @@ export interface ICachedTreeElement<TValue, TMetadata extends ICachedResourceMet
   children: Record<string, ICachedTreeElement<TValue, TMetadata> | undefined>;
 }
 
-export type ICachedTreeData<
-  TValue,
-  TMetadata extends ICachedResourceMetadata
-> = ICachedTreeElement<TValue, TMetadata>;
+export type ICachedTreeData<TValue, TMetadata extends ICachedResourceMetadata> = ICachedTreeElement<TValue, TMetadata>;
 
 export const CachedTreeRootValueKey = resourceKeyAlias('@cached-tree-resource/root-value');
 export const CachedTreeRootChildrenKey = resourceKeyListAlias('@cached-tree-resource/root-children');
-export const CachedTreeChildrenKey = resourceKeyListAliasFactory(
-  '@cached-tree-resource/children',
-  (path: string) => ({ path })
-);
+export const CachedTreeChildrenKey = resourceKeyListAliasFactory('@cached-tree-resource/children', (path: string) => ({ path }));
 
 export abstract class CachedTreeResource<
   TValue,
   TContext extends Record<string, any> = Record<string, never>,
   TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata,
-> extends CachedResource<
-  ICachedTreeData<TValue, TMetadata>,
-  TValue,
-  string,
-  CachedResourceIncludeArgs<TValue, TContext>,
-  TMetadata
-  > {
+> extends CachedResource<ICachedTreeData<TValue, TMetadata>, TValue, string, CachedResourceIncludeArgs<TValue, TContext>, TMetadata> {
   readonly onItemUpdate: ISyncExecutor<ResourceKeySimple<string>>;
   readonly onItemDelete: ISyncExecutor<ResourceKeySimple<string>>;
 
-  constructor(
-    defaultValue?: () => ICachedTreeData<TValue, TMetadata>,
-    defaultIncludes?: CachedResourceIncludeArgs<TValue, TContext>
-  ) {
-    super(CachedTreeRootChildrenKey, defaultValue || (() => ({
-      children:{},
-      metadata: {
-        dependencies: [],
-        exception: null,
-        includes: [],
-        loaded: false,
-        loading: false,
-        outdated: false,
-      },
-    }) as any as ICachedTreeData<TValue, TMetadata>), defaultIncludes);
+  constructor(defaultValue?: () => ICachedTreeData<TValue, TMetadata>, defaultIncludes?: CachedResourceIncludeArgs<TValue, TContext>) {
+    super(
+      CachedTreeRootChildrenKey,
+      defaultValue ||
+        (() =>
+          ({
+            children: {},
+            metadata: {
+              dependencies: [],
+              exception: null,
+              includes: [],
+              loaded: false,
+              loading: false,
+              outdated: false,
+            },
+          } as any as ICachedTreeData<TValue, TMetadata>)),
+      defaultIncludes,
+    );
     this.onItemUpdate = new SyncExecutor<ResourceKeySimple<string>>(null);
     this.onItemDelete = new SyncExecutor<ResourceKeySimple<string>>(null);
 
@@ -84,10 +74,7 @@ export abstract class CachedTreeResource<
     });
   }
 
-  deleteInResource(
-    resource: CachedTreeResource<string, any, any>,
-    map?: (key: ResourceKey<string>) => ResourceKey<string>
-  ): this {
+  deleteInResource(resource: CachedTreeResource<string, any, any>, map?: (key: ResourceKey<string>) => ResourceKey<string>): this {
     this.onItemDelete.addHandler(param => {
       try {
         if (this.logActivity) {
@@ -110,8 +97,7 @@ export abstract class CachedTreeResource<
   }
 
   use(param: ResourceKey<string>, id = uuid()): string {
-    const transformedList = resourceKeyList(flat(ResourceKeyUtils.toList(this.transformToKey(param))
-      .map(getPathParents)));
+    const transformedList = resourceKeyList(flat(ResourceKeyUtils.toList(this.transformToKey(param)).map(getPathParents)));
 
     this.updateMetadata(transformedList, metadata => {
       metadata.dependencies.push(id);
@@ -121,8 +107,7 @@ export abstract class CachedTreeResource<
   }
 
   free(param: ResourceKey<string>, id: string): void {
-    const transformedList = resourceKeyList(flat(ResourceKeyUtils.toList(this.transformToKey(param))
-      .map(getPathParents)));
+    const transformedList = resourceKeyList(flat(ResourceKeyUtils.toList(this.transformToKey(param)).map(getPathParents)));
     this.updateMetadata(transformedList, metadata => {
       if (metadata.dependencies.length > 0) {
         metadata.dependencies = metadata.dependencies.filter(v => v !== id);
@@ -132,10 +117,7 @@ export abstract class CachedTreeResource<
   }
 
   has(key: ResourceKey<string>): boolean {
-    if (
-      this.isAlias(key)
-       && (!this.hasMetadata(key) || this.isLoaded(key))
-    ) {
+    if (this.isAlias(key) && (!this.hasMetadata(key) || this.isLoaded(key))) {
       return false;
     }
 
@@ -155,11 +137,8 @@ export abstract class CachedTreeResource<
   set(key: ResourceKeyList<string> | ResourceKeyListAlias<string, any>, value: TValue[]): void;
   set(key: ResourceKey<string>, value: TValue | TValue[]): void;
   set(originalKey: ResourceKey<string>, value: TValue | TValue[]): void {
-    if (
-      this.isAlias(originalKey, CachedTreeChildrenKey)
-      || this.isAlias(originalKey, CachedTreeRootChildrenKey)
-    ) {
-      throw new Error('Children can\'t be set with alias');
+    if (this.isAlias(originalKey, CachedTreeChildrenKey) || this.isAlias(originalKey, CachedTreeRootChildrenKey)) {
+      throw new Error("Children can't be set with alias");
     }
     const key = this.transformToKey(originalKey);
 
@@ -213,11 +192,7 @@ export abstract class CachedTreeResource<
    */
 
   getAllMetadata(): TMetadata[] {
-    return [
-      ...this.metadata.values(),
-      ...getAllValues(this.data)
-        .map(value => value.metadata),
-    ];
+    return [...this.metadata.values(), ...getAllValues(this.data).map(value => value.metadata)];
   }
 
   /**
@@ -256,19 +231,19 @@ export abstract class CachedTreeResource<
 
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: string | ResourceKeyAlias<string, any>,
-    includes?: T
+    includes?: T,
   ): Promise<CachedResourceValueIncludes<TValue, T>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKeyList<string> | ResourceKeyListAlias<string, any> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: ResourceKey<string>,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>>;
   async refresh<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKey<string> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>> {
     if (key === undefined) {
       key = CachedTreeRootChildrenKey;
@@ -279,19 +254,19 @@ export abstract class CachedTreeResource<
 
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: string | ResourceKeyAlias<string, any>,
-    includes?: T
+    includes?: T,
   ): Promise<CachedResourceValueIncludes<TValue, T>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKeyList<string> | ResourceKeyListAlias<string, any> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key: ResourceKey<string>,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>>;
   async load<T extends CachedResourceIncludeArgs<TValue, TContext> = []>(
     key?: ResourceKey<string> | void,
-    includes?: T
+    includes?: T,
   ): Promise<Array<CachedResourceValueIncludes<TValue, T>> | CachedResourceValueIncludes<TValue, T>> {
     if (key === undefined) {
       key = CachedTreeRootChildrenKey;
@@ -400,7 +375,7 @@ export abstract class CachedTreeResource<
 }
 
 function getAllValues<TValue, TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata>(
-  data: ICachedTreeElement<TValue, TMetadata>
+  data: ICachedTreeElement<TValue, TMetadata>,
 ): ICachedTreeElement<TValue, TMetadata>[] {
   const elementsToScan = [data];
   const values: ICachedTreeElement<TValue, TMetadata>[] = [];
@@ -408,7 +383,7 @@ function getAllValues<TValue, TMetadata extends ICachedResourceMetadata = ICache
   while (elementsToScan.length) {
     const current = elementsToScan.shift()!;
     values.push(current);
-    elementsToScan.push(...Object.values(current.children).filter(Boolean) as any);
+    elementsToScan.push(...(Object.values(current.children).filter(Boolean) as any));
   }
 
   return values;
@@ -417,7 +392,7 @@ function getAllValues<TValue, TMetadata extends ICachedResourceMetadata = ICache
 function getValue<TValue, TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata>(
   data: ICachedTreeElement<TValue, TMetadata>,
   path: string,
-  getDefault: (path: string) => ICachedTreeElement<TValue, TMetadata>
+  getDefault: (path: string) => ICachedTreeElement<TValue, TMetadata>,
 ): ICachedTreeElement<TValue, TMetadata>;
 function getValue<TValue, TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata>(
   data: ICachedTreeElement<TValue, TMetadata>,
@@ -426,7 +401,7 @@ function getValue<TValue, TMetadata extends ICachedResourceMetadata = ICachedRes
 function getValue<TValue, TMetadata extends ICachedResourceMetadata = ICachedResourceMetadata>(
   data: ICachedTreeElement<TValue, TMetadata>,
   path: string,
-  getDefault?: (path: string) => ICachedTreeElement<TValue, TMetadata>
+  getDefault?: (path: string) => ICachedTreeElement<TValue, TMetadata>,
 ): ICachedTreeElement<TValue, TMetadata> | undefined {
   if (!path) {
     return data;
@@ -475,13 +450,10 @@ function deleteValue<TValue, TMetadata extends ICachedResourceMetadata = ICached
   delete current.children[paths[paths.length - 1]];
 }
 
-export function getCachedTreeResourceLoaderState<
-  TValue,
-  TContext extends Record<string, any> = Record<string, never>
->(
+export function getCachedTreeResourceLoaderState<TValue, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedTreeResource<TValue, TContext>,
   key: ResourceKey<string>,
-  includes?: CachedResourceIncludeArgs<TValue, TContext> | undefined
+  includes?: CachedResourceIncludeArgs<TValue, TContext> | undefined,
 ): ILoadableState {
   return {
     get exception() {
diff --git a/webapp/packages/core-sdk/src/Resource/LocalResource.ts b/webapp/packages/core-sdk/src/Resource/LocalResource.ts
index 7c68be9c5d..2521289ec6 100644
--- a/webapp/packages/core-sdk/src/Resource/LocalResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/LocalResource.ts
@@ -5,15 +5,11 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { Executor, IExecutor, TaskScheduler } from '@cloudbeaver/core-executor';
 
-export abstract class LocalResource<
-  TData,
-  TParam,
-> {
+export abstract class LocalResource<TData, TParam> {
   data: TData;
 
   readonly onDataOutdated: IExecutor<TParam>;
@@ -90,21 +86,10 @@ export abstract class LocalResource<
 
   protected abstract loader(param: TParam): Promise<TData>;
 
-  protected async performUpdate<T>(
-    param: TParam,
-    update: (param: TParam) => Promise<T>,
-  ): Promise<T>;
-  protected async performUpdate<T>(
-    param: TParam,
-    update: (param: TParam) => Promise<T>,
-    exitCheck: () => boolean
-  ): Promise<T | undefined>;
+  protected async performUpdate<T>(param: TParam, update: (param: TParam) => Promise<T>): Promise<T>;
+  protected async performUpdate<T>(param: TParam, update: (param: TParam) => Promise<T>, exitCheck: () => boolean): Promise<T | undefined>;
 
-  protected async performUpdate<T>(
-    param: TParam,
-    update: (param: TParam) => Promise<T>,
-    exitCheck?: () => boolean
-  ): Promise<T | undefined> {
+  protected async performUpdate<T>(param: TParam, update: (param: TParam) => Promise<T>, exitCheck?: () => boolean): Promise<T | undefined> {
     if (exitCheck?.()) {
       return;
     }
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceAlias.ts b/webapp/packages/core-sdk/src/Resource/ResourceAlias.ts
index 0bec1cceb0..399289f6df 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceAlias.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceAlias.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isObjectsEqual } from '@cloudbeaver/core-utils';
 
 export type ResourceAliasOptionsKey = string | number;
@@ -24,12 +23,9 @@ export abstract class ResourceAlias<TKey, TOptions extends ResourceAliasOptions>
     this.options = options;
   }
 
-  isEqual(key: ResourceAlias<TKey, any>): boolean  {
+  isEqual(key: ResourceAlias<TKey, any>): boolean {
     if (isResourceAlias(key)) {
-      return (
-        key.id === this.id
-        && isObjectsEqual(this.options, key.options)
-      );
+      return key.id === this.id && isObjectsEqual(this.options, key.options);
     }
 
     return true;
@@ -47,27 +43,25 @@ export interface ResourceAliasFactory<TKey, TOptions extends ResourceAliasOption
   readonly [options]: TOptions;
 }
 
+export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(data: any): data is ResourceAlias<TKey, TOptions>;
 export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
+  id: string,
 ): data is ResourceAlias<TKey, TOptions>;
 export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  id: string
+  alias: ResourceAlias<TKey, TOptions>,
 ): data is ResourceAlias<TKey, TOptions>;
 export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  alias: ResourceAlias<TKey, TOptions>
+  factory: ResourceAliasFactory<TKey, TOptions>,
 ): data is ResourceAlias<TKey, TOptions>;
 export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  factory: ResourceAliasFactory<TKey, TOptions>
-): data is ResourceAlias<TKey, TOptions>;
-export function isResourceAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
-  data: any,
-  id?: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions> | string
+  id?: ResourceAlias<TKey, TOptions> | ResourceAliasFactory<TKey, TOptions> | string,
 ): data is ResourceAlias<TKey, TOptions> {
   if (!id || typeof id === 'string') {
     return data instanceof ResourceAlias && (!id || data.id === id);
   }
   return data instanceof ResourceAlias && data.id === id.id;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceError.ts b/webapp/packages/core-sdk/src/Resource/ResourceError.ts
index 170b00902e..3b4c2a7d34 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceError.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceError.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { LoadingError } from '@cloudbeaver/core-utils';
 
 import type { CachedResource } from './CachedResource';
@@ -16,14 +15,14 @@ export class ResourceError extends LoadingError {
     private readonly key: any,
     private readonly context: any,
     message?: string,
-    options?: ErrorOptions
+    options?: ErrorOptions,
   ) {
     super(
       () => {
         this.resource.markOutdated(this.key);
       },
       message,
-      options
+      options,
     );
     this.name = 'Resource Error';
   }
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKey.ts b/webapp/packages/core-sdk/src/Resource/ResourceKey.ts
index c1a64857cf..5ae8cc1284 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKey.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKey.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ResourceKeyAlias } from './ResourceKeyAlias';
 import type { ResourceKeyList } from './ResourceKeyList';
 import type { ResourceKeyListAlias } from './ResourceKeyListAlias';
@@ -13,4 +12,4 @@ import type { ResourceKeyListAlias } from './ResourceKeyListAlias';
 export type ResourceKey<TKey> = ResourceKeyList<TKey> | ResourceKeyFlat<TKey>;
 export type ResourceKeyFlat<TKey> = TKey | ResourceKeyAlias<TKey, any> | ResourceKeyListAlias<TKey, any>;
 export type ResourceKeySimple<TKey> = TKey | ResourceKeyList<TKey>;
-export type ResourceKeyType<TKey> = TKey extends ResourceKeyList<infer I> ? I : TKey;
\ No newline at end of file
+export type ResourceKeyType<TKey> = TKey extends ResourceKeyList<infer I> ? I : TKey;
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKeyAlias.ts b/webapp/packages/core-sdk/src/Resource/ResourceKeyAlias.ts
index ae6d1ae27f..18144cd1d3 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKeyAlias.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKeyAlias.ts
@@ -5,31 +5,28 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ResourceAlias, ResourceAliasFactory, ResourceAliasOptions } from './ResourceAlias';
 
 export class ResourceKeyAlias<TKey, TOptions extends ResourceAliasOptions> extends ResourceAlias<TKey, TOptions> {
   readonly name = 'ResourceKeyAlias';
 }
 
+export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(data: any): data is ResourceKeyAlias<TKey, TOptions>;
 export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
+  id: string,
 ): data is ResourceKeyAlias<TKey, TOptions>;
 export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  id: string
+  alias: ResourceKeyAlias<TKey, TOptions>,
 ): data is ResourceKeyAlias<TKey, TOptions>;
 export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  alias: ResourceKeyAlias<TKey, TOptions>
+  factory: ResourceKeyAliasFactory<TKey, any, TOptions>,
 ): data is ResourceKeyAlias<TKey, TOptions>;
 export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  factory: ResourceKeyAliasFactory<TKey, any, TOptions>
-): data is ResourceKeyAlias<TKey, TOptions>;
-export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
-  data: any,
-  id?: ResourceKeyAlias<TKey, TOptions> | ResourceKeyAliasFactory<TKey, any, TOptions> | string
+  id?: ResourceKeyAlias<TKey, TOptions> | ResourceKeyAliasFactory<TKey, any, TOptions> | string,
 ): data is ResourceKeyAlias<TKey, TOptions> {
   if (!id || typeof id === 'string') {
     return data instanceof ResourceKeyAlias && (!id || data.id === id);
@@ -39,26 +36,19 @@ export function isResourceKeyAlias<TKey = any, TOptions extends ResourceAliasOpt
 
 export function resourceKeyAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   id: string,
-  options?: TOptions
+  options?: TOptions,
 ): ResourceKeyAlias<TKey, TOptions> {
   return new ResourceKeyAlias(id, options!);
 }
 
-export interface ResourceKeyAliasFactory<
-  TKey,
-  TArgs extends any[],
-  TOptions extends ResourceAliasOptions,
-> extends ResourceAliasFactory<TKey, TOptions> {
+export interface ResourceKeyAliasFactory<TKey, TArgs extends any[], TOptions extends ResourceAliasOptions>
+  extends ResourceAliasFactory<TKey, TOptions> {
   (...args: TArgs): ResourceKeyAlias<TKey, TOptions>;
 }
 
-export function resourceKeyAliasFactory<
-  TKey = any,
-  TArgs extends any[] = any[],
-  TOptions extends ResourceAliasOptions = any,
->(
+export function resourceKeyAliasFactory<TKey = any, TArgs extends any[] = any[], TOptions extends ResourceAliasOptions = any>(
   id: string,
-  optionsGetter: (...args: TArgs) => TOptions
+  optionsGetter: (...args: TArgs) => TOptions,
 ): ResourceKeyAliasFactory<TKey, TArgs, TOptions> {
   function factory(...args: TArgs) {
     return resourceKeyAlias(id, optionsGetter(...args));
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts b/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
index 3c4585a603..d719183b9f 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKeyList.ts
@@ -11,23 +11,11 @@ export class ResourceKeyList<TKey> extends Array<TKey> {
     return Array;
   }
 
-  includes(
-    key: TKey,
-    fromIndex?: number
-  ): boolean;
+  includes(key: TKey, fromIndex?: number): boolean;
   includes(key: TKey | ResourceKeyList<TKey>): boolean;
-  includes(
-    key: TKey | ResourceKeyList<TKey>,
-    isEqual: (keyA: TKey, keyB: TKey) => boolean
-  ): boolean;
-  includes(
-    key: TKey | ResourceKeyList<TKey>,
-    dynamic?: number | ((keyA: TKey, keyB: TKey) => boolean)
-  ): boolean;
-  includes(
-    key: TKey | ResourceKeyList<TKey>,
-    dynamic?: number | ((keyA: TKey, keyB: TKey) => boolean)
-  ): boolean {
+  includes(key: TKey | ResourceKeyList<TKey>, isEqual: (keyA: TKey, keyB: TKey) => boolean): boolean;
+  includes(key: TKey | ResourceKeyList<TKey>, dynamic?: number | ((keyA: TKey, keyB: TKey) => boolean)): boolean;
+  includes(key: TKey | ResourceKeyList<TKey>, dynamic?: number | ((keyA: TKey, keyB: TKey) => boolean)): boolean {
     let fromIndex = 0;
     let isEqual = (keyA: TKey, keyB: TKey) => keyA === keyB;
 
@@ -44,7 +32,7 @@ export class ResourceKeyList<TKey> extends Array<TKey> {
       return key.some(key => this.includes(key, dynamic));
     }
 
-    return this.some((current, index) => (index >= fromIndex && isEqual(current, key)));
+    return this.some((current, index) => index >= fromIndex && isEqual(current, key));
   }
 
   exclude(key: TKey | ResourceKeyList<TKey>): ResourceKeyList<TKey> {
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKeyListAlias.ts b/webapp/packages/core-sdk/src/Resource/ResourceKeyListAlias.ts
index 5190ec18d3..67f6523dd4 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKeyListAlias.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKeyListAlias.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ResourceAlias, ResourceAliasFactory, ResourceAliasOptions } from './ResourceAlias';
 
 export class ResourceKeyListAlias<TKey, TOptions extends ResourceAliasOptions> extends ResourceAlias<TKey, TOptions> {
@@ -17,19 +16,19 @@ export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAlia
 ): data is ResourceKeyListAlias<TKey, TOptions>;
 export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  id: string
+  id: string,
 ): data is ResourceKeyListAlias<TKey, TOptions>;
 export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  alias: ResourceKeyListAlias<TKey, TOptions>
+  alias: ResourceKeyListAlias<TKey, TOptions>,
 ): data is ResourceKeyListAlias<TKey, TOptions>;
 export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  factory: ResourceKeyListAliasFactory<TKey, any, TOptions>
+  factory: ResourceKeyListAliasFactory<TKey, any, TOptions>,
 ): data is ResourceKeyListAlias<TKey, TOptions>;
 export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   data: any,
-  id?: ResourceKeyListAlias<TKey, TOptions> | ResourceKeyListAliasFactory<TKey, any, TOptions> | string
+  id?: ResourceKeyListAlias<TKey, TOptions> | ResourceKeyListAliasFactory<TKey, any, TOptions> | string,
 ): data is ResourceKeyListAlias<TKey, TOptions> {
   if (!id || typeof id === 'string') {
     return data instanceof ResourceKeyListAlias && (!id || data.id === id);
@@ -39,26 +38,19 @@ export function isResourceKeyListAlias<TKey = any, TOptions extends ResourceAlia
 
 export function resourceKeyListAlias<TKey = any, TOptions extends ResourceAliasOptions = any>(
   id: string,
-  options?: TOptions
+  options?: TOptions,
 ): ResourceKeyListAlias<TKey, TOptions> {
   return new ResourceKeyListAlias(id, options!);
 }
 
-export interface ResourceKeyListAliasFactory<
-  TKey,
-  TArgs extends any[],
-  TOptions extends ResourceAliasOptions,
-> extends ResourceAliasFactory<TKey, TOptions> {
+export interface ResourceKeyListAliasFactory<TKey, TArgs extends any[], TOptions extends ResourceAliasOptions>
+  extends ResourceAliasFactory<TKey, TOptions> {
   (...args: TArgs): ResourceKeyListAlias<TKey, TOptions>;
 }
 
-export function resourceKeyListAliasFactory<
-  TKey = any,
-  TArgs extends any[] = any[],
-  TOptions extends ResourceAliasOptions = any,
->(
+export function resourceKeyListAliasFactory<TKey = any, TArgs extends any[] = any[], TOptions extends ResourceAliasOptions = any>(
   id: string,
-  optionsGetter: (...args: TArgs) => TOptions
+  optionsGetter: (...args: TArgs) => TOptions,
 ): ResourceKeyListAliasFactory<TKey, TArgs, TOptions> {
   function factory(...args: TArgs) {
     return resourceKeyListAlias(id, optionsGetter(...args));
diff --git a/webapp/packages/core-sdk/src/Resource/ResourceKeyUtils.ts b/webapp/packages/core-sdk/src/Resource/ResourceKeyUtils.ts
index 50c0986875..dda9d6590a 100644
--- a/webapp/packages/core-sdk/src/Resource/ResourceKeyUtils.ts
+++ b/webapp/packages/core-sdk/src/Resource/ResourceKeyUtils.ts
@@ -5,50 +5,37 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ResourceKey } from './ResourceKey';
-import { type ResourceKeyList, isResourceKeyList, resourceKeyList } from './ResourceKeyList';
+import { isResourceKeyList, type ResourceKeyList, resourceKeyList } from './ResourceKeyList';
 
 interface MapFnc {
   <TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue): TValue | TValue[];
   <TKey, TValue>(key: ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue): TValue[];
-  <TKey, TValue>(
-    key: TKey,
-    selector: (key: TKey, index: number) => TValue
-  ): TValue;
+  <TKey, TValue>(key: TKey, selector: (key: TKey, index: number) => TValue): TValue;
 }
 
 export interface ResourceKeyUtils {
-  forEach: <TKey extends ResourceKey<unknown>>(
-    key: TKey,
-    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any
-  ) => void;
+  forEach: <TKey extends ResourceKey<unknown>>(key: TKey, action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any) => void;
   forEachAsync: <TKey extends ResourceKey<unknown>>(
     key: TKey,
-    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => Promise<any>
+    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => Promise<any>,
   ) => Promise<void>;
   some: <TKey extends ResourceKey<unknown>>(
     key: TKey,
-    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean
+    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean,
   ) => boolean;
   every: <TKey extends ResourceKey<unknown>>(
     key: TKey,
-    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean
+    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean,
   ) => boolean;
   map: MapFnc;
   filter: <TKey>(key: TKey | ResourceKeyList<TKey>, filter: (key: TKey) => boolean) => TKey[];
-  mapKey: <TKey, TValue>(
-    key: TKey | ResourceKeyList<TKey>,
-    selector: (key: TKey, index: number) => TValue
-  ) => ResourceKey<TValue>;
-  mapArray: <TKey, TValue>(
-    key: TKey | ResourceKeyList<TKey>,
-    selector: (key: TKey, index: number) => TValue
-  ) => TValue[];
+  mapKey: <TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue) => ResourceKey<TValue>;
+  mapArray: <TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue) => TValue[];
   isIntersect: <TKey>(
     first: TKey | ResourceKeyList<TKey>,
     second: TKey | ResourceKeyList<TKey>,
-    isEqual?: (keyA: TKey, keyB: TKey) => boolean
+    isEqual?: (keyA: TKey, keyB: TKey) => boolean,
   ) => boolean;
   join: <TKey>(...keys: Array<TKey | ResourceKeyList<TKey>>) => ResourceKeyList<TKey>;
   toArray: <TKey>(key: TKey | ResourceKeyList<TKey>) => TKey[];
@@ -59,7 +46,7 @@ export interface ResourceKeyUtils {
 export const ResourceKeyUtils: ResourceKeyUtils = {
   forEach<TKey extends ResourceKey<unknown>>(
     key: TKey,
-    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any | Promise<any>
+    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any | Promise<any>,
   ): void {
     if (isResourceKeyList(key)) {
       for (let i = 0; i < key.length; i++) {
@@ -71,7 +58,7 @@ export const ResourceKeyUtils: ResourceKeyUtils = {
   },
   async forEachAsync<TKey extends ResourceKey<unknown>>(
     key: TKey,
-    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any | Promise<any>
+    action: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => any | Promise<any>,
   ): Promise<void> {
     if (isResourceKeyList(key)) {
       for (let i = 0; i < key.length; i++) {
@@ -81,20 +68,14 @@ export const ResourceKeyUtils: ResourceKeyUtils = {
       await action(key as Exclude<TKey, ResourceKeyList<unknown>>, -1);
     }
   },
-  some<TKey extends ResourceKey<unknown>>(
-    key: TKey,
-    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean
-  ): boolean {
+  some<TKey extends ResourceKey<unknown>>(key: TKey, predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean): boolean {
     if (isResourceKeyList<Exclude<TKey, ResourceKeyList<unknown>>>(key)) {
       return key.some(predicate);
     } else {
       return predicate(key as Exclude<TKey, ResourceKeyList<unknown>>, -1);
     }
   },
-  every<TKey extends ResourceKey<unknown>>(
-    key: TKey,
-    predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean
-  ): boolean {
+  every<TKey extends ResourceKey<unknown>>(key: TKey, predicate: (key: Exclude<TKey, ResourceKeyList<unknown>>, index: number) => boolean): boolean {
     if (isResourceKeyList<Exclude<TKey, ResourceKeyList<unknown>>>(key)) {
       return key.every(predicate);
     } else {
@@ -104,30 +85,21 @@ export const ResourceKeyUtils: ResourceKeyUtils = {
   filter<TKey>(key: TKey | ResourceKeyList<TKey>, filter: (key: TKey) => boolean): TKey[] {
     return this.toArray(key).filter(filter);
   },
-  mapKey<TKey, TValue>(
-    key: TKey | ResourceKeyList<TKey>,
-    selector: (key: TKey, index: number) => TValue
-  ): ResourceKey<TValue> {
+  mapKey<TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue): ResourceKey<TValue> {
     if (isResourceKeyList(key)) {
       return resourceKeyList(key.map(selector));
     } else {
       return selector(key, -1);
     }
   },
-  map<TKey, TValue>(
-    key: TKey | ResourceKeyList<TKey>,
-    selector: (key: TKey, index: number) => TValue
-  ): TValue | TValue[] {
+  map<TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue): TValue | TValue[] {
     if (isResourceKeyList(key)) {
       return key.map(selector);
     } else {
       return selector(key, -1);
     }
   },
-  mapArray<TKey, TValue>(
-    key: TKey | ResourceKeyList<TKey>,
-    selector: (key: TKey, index: number) => TValue
-  ): TValue[] {
+  mapArray<TKey, TValue>(key: TKey | ResourceKeyList<TKey>, selector: (key: TKey, index: number) => TValue): TValue[] {
     if (isResourceKeyList(key)) {
       return key.map(selector);
     } else {
@@ -137,7 +109,7 @@ export const ResourceKeyUtils: ResourceKeyUtils = {
   isIntersect<TKey>(
     param: TKey | ResourceKeyList<TKey>,
     key: TKey | ResourceKeyList<TKey>,
-    isEqual = (keyA: TKey, keyB: TKey) => keyA === keyB
+    isEqual = (keyA: TKey, keyB: TKey) => keyA === keyB,
   ): boolean {
     if (param === key) {
       return true;
diff --git a/webapp/packages/core-sdk/src/ServerInternalError.ts b/webapp/packages/core-sdk/src/ServerInternalError.ts
index f5052f514a..0ac8e7af7c 100644
--- a/webapp/packages/core-sdk/src/ServerInternalError.ts
+++ b/webapp/packages/core-sdk/src/ServerInternalError.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { DetailsError } from './DetailsError';
 import type { ServerError } from './sdk';
 
 export enum ServerErrorType {
-  'QUOTE_EXCEEDED' = 'quotaExceeded'
+  'QUOTE_EXCEEDED' = 'quotaExceeded',
 }
 
 export class ServerInternalError extends DetailsError implements ServerError {
@@ -28,10 +27,6 @@ export class ServerInternalError extends DetailsError implements ServerError {
   }
 
   hasDetails(): boolean {
-    return (
-      this.stack !== undefined
-      && this.stack.length > 0
-      && this.errorType !== ServerErrorType.QUOTE_EXCEEDED
-    );
+    return this.stack !== undefined && this.stack.length > 0 && this.errorType !== ServerErrorType.QUOTE_EXCEEDED;
   }
 }
diff --git a/webapp/packages/core-sdk/src/getGQLResponse.ts b/webapp/packages/core-sdk/src/getGQLResponse.ts
index fef7985c08..85a256407c 100644
--- a/webapp/packages/core-sdk/src/getGQLResponse.ts
+++ b/webapp/packages/core-sdk/src/getGQLResponse.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { errorOf } from '@cloudbeaver/core-utils';
 
 import { GQLError } from './GQLError';
 
-interface IGraphQLResponse<T>{
+interface IGraphQLResponse<T> {
   data: T | null;
   error?: Error;
 }
diff --git a/webapp/packages/core-sdk/src/isObjectPropertyInfoStateEqual.ts b/webapp/packages/core-sdk/src/isObjectPropertyInfoStateEqual.ts
index b3a8ba2d06..b13490c254 100644
--- a/webapp/packages/core-sdk/src/isObjectPropertyInfoStateEqual.ts
+++ b/webapp/packages/core-sdk/src/isObjectPropertyInfoStateEqual.ts
@@ -5,29 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isValuesEqual } from '@cloudbeaver/core-utils';
 
 import type { ObjectPropertyInfo } from './sdk';
 
 type RequiredObjectPropertyInfoFields = Pick<ObjectPropertyInfo, 'id' | 'defaultValue'>;
 
-export function isObjectPropertyInfoStateEqual<T>(
-  properties: RequiredObjectPropertyInfoFields[],
-  first: T,
-  second: T
-): boolean {
-  if (
-    first === null
-    || second === null
-    || typeof first !== 'object'
-    || typeof second !== 'object'
-  ) {
+export function isObjectPropertyInfoStateEqual<T>(properties: RequiredObjectPropertyInfoFields[], first: T, second: T): boolean {
+  if (first === null || second === null || typeof first !== 'object' || typeof second !== 'object') {
     return false;
   }
 
-  const customKeys = [...Object.keys(first), ...Object.keys(second)]
-    .filter(key => !properties.some(property => key === property.id));
+  const customKeys = [...Object.keys(first), ...Object.keys(second)].filter(key => !properties.some(property => key === property.id));
 
   for (const property of properties) {
     if (!property.id) {
diff --git a/webapp/packages/core-sdk/src/manifest.ts b/webapp/packages/core-sdk/src/manifest.ts
index d446997123..a42b9b913b 100644
--- a/webapp/packages/core-sdk/src/manifest.ts
+++ b/webapp/packages/core-sdk/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AsyncTaskInfoService } from './AsyncTask/AsyncTaskInfoService';
@@ -17,9 +16,5 @@ export const manifest: PluginManifest = {
     name: 'Core SDK',
   },
 
-  providers: [
-    AsyncTaskInfoService,
-    EnvironmentService,
-    GraphQLService,
-  ],
+  providers: [AsyncTaskInfoService, EnvironmentService, GraphQLService],
 };
diff --git a/webapp/packages/core-sdk/src/sdk.ts b/webapp/packages/core-sdk/src/sdk.ts
index d9c0567158..a64f42d212 100644
--- a/webapp/packages/core-sdk/src/sdk.ts
+++ b/webapp/packages/core-sdk/src/sdk.ts
@@ -1,6 +1,7 @@
 /* eslint-disable */
 import type { GraphQLClient } from 'graphql-request';
 import type * as Dom from 'graphql-request/dist/types.dom';
+
 export type Maybe<T> = T;
 export type InputMaybe<T> = T;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
@@ -68,7 +69,7 @@ export interface AdminPermissionInfo {
 
 export enum AdminSubjectType {
   Team = 'team',
-  User = 'user'
+  User = 'user',
 }
 
 export interface AdminTeamInfo {
@@ -107,7 +108,7 @@ export interface AsyncTaskInfo {
 export enum AuthCredentialEncryption {
   Hash = 'hash',
   None = 'none',
-  Plain = 'plain'
+  Plain = 'plain',
 }
 
 export interface AuthCredentialInfo {
@@ -163,7 +164,7 @@ export interface AuthProviderInfo {
 export enum AuthStatus {
   Error = 'ERROR',
   InProgress = 'IN_PROGRESS',
-  Success = 'SUCCESS'
+  Success = 'SUCCESS',
 }
 
 export type CbClientEvent = {
@@ -174,7 +175,7 @@ export type CbClientEvent = {
 export enum CbClientEventId {
   CbClientProjectsActive = 'cb_client_projects_active',
   CbClientTopicSubscribe = 'cb_client_topic_subscribe',
-  CbClientTopicUnsubscribe = 'cb_client_topic_unsubscribe'
+  CbClientTopicUnsubscribe = 'cb_client_topic_unsubscribe',
 }
 
 export interface CbConfigEvent extends CbServerEvent {
@@ -203,7 +204,7 @@ export enum CbEventTopic {
   CbProjects = 'cb_projects',
   CbScripts = 'cb_scripts',
   CbSession = 'cb_session',
-  CbSessionLog = 'cb_session_log'
+  CbSessionLog = 'cb_session_log',
 }
 
 export interface CbProjectEvent extends CbClientEvent {
@@ -252,7 +253,7 @@ export enum CbServerEventId {
   CbSessionExpired = 'cb_session_expired',
   CbSessionLogUpdated = 'cb_session_log_updated',
   CbSessionState = 'cb_session_state',
-  CbSessionWebsocketConnected = 'cb_session_websocket_connected'
+  CbSessionWebsocketConnected = 'cb_session_websocket_connected',
 }
 
 export interface CbSessionLogEvent extends CbServerEvent {
@@ -421,7 +422,6 @@ export interface DatabaseObjectInfo {
   uniqueName?: Maybe<Scalars['String']>;
 }
 
-
 export interface DatabaseObjectInfoPropertiesArgs {
   filter?: InputMaybe<ObjectPropertyFilter>;
 }
@@ -435,7 +435,7 @@ export interface DatabaseStructContainers {
 
 export enum DriverConfigurationType {
   Manual = 'MANUAL',
-  Url = 'URL'
+  Url = 'URL',
 }
 
 export interface DriverInfo {
@@ -534,7 +534,6 @@ export interface Mutation {
   updateResultsDataBatchScript: Scalars['String'];
 }
 
-
 export interface MutationAsyncReadDataFromContainerArgs {
   connectionId: Scalars['ID'];
   containerNodePath: Scalars['ID'];
@@ -545,7 +544,6 @@ export interface MutationAsyncReadDataFromContainerArgs {
   resultId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationAsyncSqlExecuteQueryArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -556,12 +554,10 @@ export interface MutationAsyncSqlExecuteQueryArgs {
   sql: Scalars['String'];
 }
 
-
 export interface MutationAsyncSqlExecuteResultsArgs {
   taskId: Scalars['ID'];
 }
 
-
 export interface MutationAsyncSqlExplainExecutionPlanArgs {
   configuration: Scalars['Object'];
   connectionId: Scalars['ID'];
@@ -570,73 +566,61 @@ export interface MutationAsyncSqlExplainExecutionPlanArgs {
   query: Scalars['String'];
 }
 
-
 export interface MutationAsyncSqlExplainExecutionPlanResultArgs {
   taskId: Scalars['ID'];
 }
 
-
 export interface MutationAsyncTaskCancelArgs {
   id: Scalars['String'];
 }
 
-
 export interface MutationAsyncTaskInfoArgs {
   id: Scalars['String'];
   removeOnFinish: Scalars['Boolean'];
 }
 
-
 export interface MutationChangeSessionLanguageArgs {
   locale?: InputMaybe<Scalars['String']>;
 }
 
-
 export interface MutationCloseConnectionArgs {
   id: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationCopyConnectionFromNodeArgs {
   config?: InputMaybe<ConnectionConfig>;
   nodePath: Scalars['String'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationCreateConnectionArgs {
   config: ConnectionConfig;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationCreateConnectionFolderArgs {
   folderName: Scalars['String'];
   parentFolderPath?: InputMaybe<Scalars['ID']>;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationCreateConnectionFromTemplateArgs {
   connectionName?: InputMaybe<Scalars['String']>;
   projectId: Scalars['ID'];
   templateId: Scalars['ID'];
 }
 
-
 export interface MutationDeleteConnectionArgs {
   id: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationDeleteConnectionFolderArgs {
   folderPath: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationInitConnectionArgs {
   credentials?: InputMaybe<Scalars['Object']>;
   id: Scalars['ID'];
@@ -646,29 +630,24 @@ export interface MutationInitConnectionArgs {
   sharedCredentials?: InputMaybe<Scalars['Boolean']>;
 }
 
-
 export interface MutationNavDeleteNodesArgs {
   nodePaths: Array<Scalars['ID']>;
 }
 
-
 export interface MutationNavMoveNodesToFolderArgs {
   folderPath: Scalars['ID'];
   nodePaths: Array<Scalars['ID']>;
 }
 
-
 export interface MutationNavRenameNodeArgs {
   newName: Scalars['String'];
   nodePath: Scalars['ID'];
 }
 
-
 export interface MutationOpenSessionArgs {
   defaultLocale?: InputMaybe<Scalars['String']>;
 }
 
-
 export interface MutationReadLobValueArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -678,46 +657,39 @@ export interface MutationReadLobValueArgs {
   row: Array<SqlResultRow>;
 }
 
-
 export interface MutationRmCreateProjectArgs {
   description?: InputMaybe<Scalars['String']>;
   projectId?: InputMaybe<Scalars['ID']>;
   projectName: Scalars['String'];
 }
 
-
 export interface MutationRmCreateResourceArgs {
   isFolder: Scalars['Boolean'];
   projectId: Scalars['String'];
   resourcePath: Scalars['String'];
 }
 
-
 export interface MutationRmDeleteProjectArgs {
   projectId: Scalars['ID'];
 }
 
-
 export interface MutationRmDeleteResourceArgs {
   projectId: Scalars['String'];
   recursive: Scalars['Boolean'];
   resourcePath: Scalars['String'];
 }
 
-
 export interface MutationRmMoveResourceArgs {
   newResourcePath?: InputMaybe<Scalars['String']>;
   oldResourcePath: Scalars['String'];
   projectId: Scalars['String'];
 }
 
-
 export interface MutationRmSetProjectPermissionsArgs {
   permissions: Array<RmSubjectProjectPermissions>;
   projectId: Scalars['String'];
 }
 
-
 export interface MutationRmSetResourcePropertyArgs {
   name: Scalars['ID'];
   projectId: Scalars['String'];
@@ -725,13 +697,11 @@ export interface MutationRmSetResourcePropertyArgs {
   value?: InputMaybe<Scalars['String']>;
 }
 
-
 export interface MutationRmSetSubjectProjectPermissionsArgs {
   permissions: Array<RmProjectPermissions>;
   subjectId: Scalars['String'];
 }
 
-
 export interface MutationRmWriteResourceStringContentArgs {
   data: Scalars['String'];
   forceOverwrite: Scalars['Boolean'];
@@ -739,20 +709,17 @@ export interface MutationRmWriteResourceStringContentArgs {
   resourcePath: Scalars['String'];
 }
 
-
 export interface MutationSetConnectionNavigatorSettingsArgs {
   id: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
   settings: NavigatorSettingsInput;
 }
 
-
 export interface MutationSetUserConfigurationParameterArgs {
   name: Scalars['String'];
   value?: InputMaybe<Scalars['Object']>;
 }
 
-
 export interface MutationSqlContextCreateArgs {
   connectionId: Scalars['ID'];
   defaultCatalog?: InputMaybe<Scalars['String']>;
@@ -760,14 +727,12 @@ export interface MutationSqlContextCreateArgs {
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationSqlContextDestroyArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationSqlContextSetDefaultsArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -776,7 +741,6 @@ export interface MutationSqlContextSetDefaultsArgs {
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationSqlResultCloseArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -784,24 +748,20 @@ export interface MutationSqlResultCloseArgs {
   resultId: Scalars['ID'];
 }
 
-
 export interface MutationTestConnectionArgs {
   config: ConnectionConfig;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationTestNetworkHandlerArgs {
   config: NetworkHandlerConfigInput;
 }
 
-
 export interface MutationUpdateConnectionArgs {
   config: ConnectionConfig;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface MutationUpdateResultsDataBatchArgs {
   addedRows?: InputMaybe<Array<SqlResultRow>>;
   connectionId: Scalars['ID'];
@@ -812,7 +772,6 @@ export interface MutationUpdateResultsDataBatchArgs {
   updatedRows?: InputMaybe<Array<SqlResultRow>>;
 }
 
-
 export interface MutationUpdateResultsDataBatchScriptArgs {
   addedRows?: InputMaybe<Array<SqlResultRow>>;
   connectionId: Scalars['ID'];
@@ -869,7 +828,7 @@ export interface NetworkEndpointInfo {
 export enum NetworkHandlerAuthType {
   Agent = 'AGENT',
   Password = 'PASSWORD',
-  PublicKey = 'PUBLIC_KEY'
+  PublicKey = 'PUBLIC_KEY',
 }
 
 export interface NetworkHandlerConfig {
@@ -907,7 +866,7 @@ export interface NetworkHandlerDescriptor {
 export enum NetworkHandlerType {
   Config = 'CONFIG',
   Proxy = 'PROXY',
-  Tunnel = 'TUNNEL'
+  Tunnel = 'TUNNEL',
 }
 
 export interface ObjectDescriptor {
@@ -962,7 +921,7 @@ export enum ObjectPropertyLength {
   Medium = 'MEDIUM',
   Multiline = 'MULTILINE',
   Short = 'SHORT',
-  Tiny = 'TINY'
+  Tiny = 'TINY',
 }
 
 export interface ProductInfo {
@@ -1074,13 +1033,11 @@ export interface Query {
   userConnections: Array<ConnectionInfo>;
 }
 
-
 export interface QueryAuthChangeLocalPasswordArgs {
   newPassword: Scalars['String'];
   oldPassword: Scalars['String'];
 }
 
-
 export interface QueryAuthLoginArgs {
   configuration?: InputMaybe<Scalars['ID']>;
   credentials?: InputMaybe<Scalars['Object']>;
@@ -1088,50 +1045,42 @@ export interface QueryAuthLoginArgs {
   provider: Scalars['ID'];
 }
 
-
 export interface QueryAuthLogoutArgs {
   configuration?: InputMaybe<Scalars['ID']>;
   provider?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryAuthUpdateStatusArgs {
   authId: Scalars['ID'];
   linkUser?: InputMaybe<Scalars['Boolean']>;
 }
 
-
 export interface QueryConfigureServerArgs {
   configuration: ServerConfigInput;
 }
 
-
 export interface QueryConnectionFoldersArgs {
   path?: InputMaybe<Scalars['ID']>;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryConnectionInfoArgs {
   id: Scalars['ID'];
   projectId: Scalars['ID'];
 }
 
-
 export interface QueryCreateTeamArgs {
   description?: InputMaybe<Scalars['String']>;
   teamId: Scalars['ID'];
   teamName?: InputMaybe<Scalars['String']>;
 }
 
-
 export interface QueryCreateUserArgs {
   authRole?: InputMaybe<Scalars['String']>;
   enabled: Scalars['Boolean'];
   userId: Scalars['ID'];
 }
 
-
 export interface QueryDataTransferExportDataFromContainerArgs {
   connectionId: Scalars['ID'];
   containerNodePath: Scalars['ID'];
@@ -1139,7 +1088,6 @@ export interface QueryDataTransferExportDataFromContainerArgs {
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryDataTransferExportDataFromResultsArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -1148,91 +1096,74 @@ export interface QueryDataTransferExportDataFromResultsArgs {
   resultsId: Scalars['ID'];
 }
 
-
 export interface QueryDataTransferRemoveDataFileArgs {
   dataFileId: Scalars['String'];
 }
 
-
 export interface QueryDeleteAuthProviderConfigurationArgs {
   id: Scalars['ID'];
 }
 
-
 export interface QueryDeleteTeamArgs {
   teamId: Scalars['ID'];
 }
 
-
 export interface QueryDeleteUserArgs {
   userId: Scalars['ID'];
 }
 
-
 export interface QueryDeleteUserMetaParameterArgs {
   id: Scalars['ID'];
 }
 
-
 export interface QueryDriverListArgs {
   id?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryEnableUserArgs {
   enabled: Scalars['Boolean'];
   userId: Scalars['ID'];
 }
 
-
 export interface QueryGetConnectionSubjectAccessArgs {
   connectionId?: InputMaybe<Scalars['ID']>;
   projectId: Scalars['ID'];
 }
 
-
 export interface QueryGetSubjectConnectionAccessArgs {
   subjectId: Scalars['ID'];
 }
 
-
 export interface QueryGrantUserTeamArgs {
   teamId: Scalars['ID'];
   userId: Scalars['ID'];
 }
 
-
 export interface QueryListAuthProviderConfigurationParametersArgs {
   providerId: Scalars['ID'];
 }
 
-
 export interface QueryListAuthProviderConfigurationsArgs {
   providerId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryListTeamsArgs {
   teamId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryListUsersArgs {
   userId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryMetadataGetNodeDdlArgs {
   nodeId: Scalars['ID'];
   options?: InputMaybe<Scalars['Object']>;
 }
 
-
 export interface QueryMetadataGetNodeExtendedDdlArgs {
   nodeId: Scalars['ID'];
 }
 
-
 export interface QueryNavGetStructContainersArgs {
   catalog?: InputMaybe<Scalars['ID']>;
   connectionId: Scalars['ID'];
@@ -1240,7 +1171,6 @@ export interface QueryNavGetStructContainersArgs {
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryNavNodeChildrenArgs {
   limit?: InputMaybe<Scalars['Int']>;
   offset?: InputMaybe<Scalars['Int']>;
@@ -1248,39 +1178,32 @@ export interface QueryNavNodeChildrenArgs {
   parentPath: Scalars['ID'];
 }
 
-
 export interface QueryNavNodeInfoArgs {
   nodePath: Scalars['ID'];
 }
 
-
 export interface QueryNavNodeParentsArgs {
   nodePath: Scalars['ID'];
 }
 
-
 export interface QueryNavRefreshNodeArgs {
   nodePath: Scalars['ID'];
 }
 
-
 export interface QueryReadSessionLogArgs {
   clearEntries?: InputMaybe<Scalars['Boolean']>;
   maxEntries?: InputMaybe<Scalars['Int']>;
 }
 
-
 export interface QueryRevokeUserTeamArgs {
   teamId: Scalars['ID'];
   userId: Scalars['ID'];
 }
 
-
 export interface QueryRmListProjectGrantedPermissionsArgs {
   projectId: Scalars['String'];
 }
 
-
 export interface QueryRmListResourcesArgs {
   folder?: InputMaybe<Scalars['String']>;
   nameMask?: InputMaybe<Scalars['String']>;
@@ -1289,23 +1212,19 @@ export interface QueryRmListResourcesArgs {
   readProperties?: InputMaybe<Scalars['Boolean']>;
 }
 
-
 export interface QueryRmListSubjectProjectsPermissionGrantsArgs {
   subjectId: Scalars['String'];
 }
 
-
 export interface QueryRmProjectArgs {
   projectId: Scalars['String'];
 }
 
-
 export interface QueryRmReadResourceAsStringArgs {
   projectId: Scalars['String'];
   resourcePath: Scalars['String'];
 }
 
-
 export interface QuerySaveAuthProviderConfigurationArgs {
   description?: InputMaybe<Scalars['String']>;
   disabled?: InputMaybe<Scalars['Boolean']>;
@@ -1316,7 +1235,6 @@ export interface QuerySaveAuthProviderConfigurationArgs {
   providerId: Scalars['ID'];
 }
 
-
 export interface QuerySaveUserMetaParameterArgs {
   description?: InputMaybe<Scalars['String']>;
   displayName: Scalars['String'];
@@ -1324,61 +1242,51 @@ export interface QuerySaveUserMetaParameterArgs {
   required: Scalars['Boolean'];
 }
 
-
 export interface QuerySearchConnectionsArgs {
   hostNames: Array<Scalars['String']>;
 }
 
-
 export interface QuerySetConnectionSubjectAccessArgs {
   connectionId: Scalars['ID'];
   projectId: Scalars['ID'];
   subjects: Array<Scalars['ID']>;
 }
 
-
 export interface QuerySetDefaultNavigatorSettingsArgs {
   settings: NavigatorSettingsInput;
 }
 
-
 export interface QuerySetSubjectConnectionAccessArgs {
   connections: Array<Scalars['ID']>;
   subjectId: Scalars['ID'];
 }
 
-
 export interface QuerySetSubjectPermissionsArgs {
   permissions: Array<Scalars['ID']>;
   subjectId: Scalars['ID'];
 }
 
-
 export interface QuerySetTeamMetaParameterValuesArgs {
   parameters: Scalars['Object'];
   teamId: Scalars['ID'];
 }
 
-
 export interface QuerySetUserAuthRoleArgs {
   authRole?: InputMaybe<Scalars['String']>;
   userId: Scalars['ID'];
 }
 
-
 export interface QuerySetUserCredentialsArgs {
   credentials: Scalars['Object'];
   providerId: Scalars['ID'];
   userId: Scalars['ID'];
 }
 
-
 export interface QuerySetUserMetaParameterValuesArgs {
   parameters: Scalars['Object'];
   userId: Scalars['ID'];
 }
 
-
 export interface QuerySqlCompletionProposalsArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -1389,18 +1297,15 @@ export interface QuerySqlCompletionProposalsArgs {
   simpleMode?: InputMaybe<Scalars['Boolean']>;
 }
 
-
 export interface QuerySqlDialectInfoArgs {
   connectionId: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QuerySqlEntityQueryGeneratorsArgs {
   nodePathList: Array<Scalars['String']>;
 }
 
-
 export interface QuerySqlFormatQueryArgs {
   connectionId: Scalars['ID'];
   contextId: Scalars['ID'];
@@ -1408,14 +1313,12 @@ export interface QuerySqlFormatQueryArgs {
   query: Scalars['String'];
 }
 
-
 export interface QuerySqlGenerateEntityQueryArgs {
   generatorId: Scalars['String'];
   nodePathList: Array<Scalars['String']>;
   options: Scalars['Object'];
 }
 
-
 export interface QuerySqlGenerateGroupingQueryArgs {
   columnNames?: InputMaybe<Array<Scalars['String']>>;
   connectionId: Scalars['ID'];
@@ -1424,14 +1327,12 @@ export interface QuerySqlGenerateGroupingQueryArgs {
   resultsId: Scalars['ID'];
 }
 
-
 export interface QuerySqlListContextsArgs {
   connectionId?: InputMaybe<Scalars['ID']>;
   contextId?: InputMaybe<Scalars['ID']>;
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QuerySqlParseQueryArgs {
   connectionId: Scalars['ID'];
   position: Scalars['Int'];
@@ -1439,14 +1340,12 @@ export interface QuerySqlParseQueryArgs {
   script: Scalars['String'];
 }
 
-
 export interface QuerySqlParseScriptArgs {
   connectionId: Scalars['ID'];
   projectId?: InputMaybe<Scalars['ID']>;
   script: Scalars['String'];
 }
 
-
 export interface QuerySqlSupportedOperationsArgs {
   attributeIndex: Scalars['Int'];
   connectionId: Scalars['ID'];
@@ -1455,19 +1354,16 @@ export interface QuerySqlSupportedOperationsArgs {
   resultsId: Scalars['ID'];
 }
 
-
 export interface QueryTemplateConnectionsArgs {
   projectId?: InputMaybe<Scalars['ID']>;
 }
 
-
 export interface QueryUpdateTeamArgs {
   description?: InputMaybe<Scalars['String']>;
   teamId: Scalars['ID'];
   teamName?: InputMaybe<Scalars['String']>;
 }
 
-
 export interface QueryUserConnectionsArgs {
   id?: InputMaybe<Scalars['ID']>;
   projectId?: InputMaybe<Scalars['ID']>;
@@ -1515,7 +1411,7 @@ export enum ResultDataFormat {
   Document = 'document',
   Graph = 'graph',
   Resultset = 'resultset',
-  Timeseries = 'timeseries'
+  Timeseries = 'timeseries',
 }
 
 export interface SqlCompletionProposal {
@@ -1785,24 +1681,21 @@ export interface WebServiceConfig {
   name: Scalars['String'];
 }
 
-export type GetPermissionsListQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetPermissionsListQueryVariables = Exact<{ [key: string]: never }>;
 
-
-export type GetPermissionsListQuery = { permissions: Array<{ id: string, label?: string, description?: string, category?: string }> };
+export type GetPermissionsListQuery = { permissions: Array<{ id: string; label?: string; description?: string; category?: string }> };
 
 export type SetSubjectPermissionsQueryVariables = Exact<{
   subjectId: Scalars['ID'];
   permissions: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
-
-export type SetSubjectPermissionsQuery = { permissions: Array<{ id: string, label?: string, description?: string, category?: string }> };
+export type SetSubjectPermissionsQuery = { permissions: Array<{ id: string; label?: string; description?: string; category?: string }> };
 
 export type AsyncTaskCancelMutationVariables = Exact<{
   taskId: Scalars['String'];
 }>;
 
-
 export type AsyncTaskCancelMutation = { result?: boolean };
 
 export type AuthChangeLocalPasswordQueryVariables = Exact<{
@@ -1810,7 +1703,6 @@ export type AuthChangeLocalPasswordQueryVariables = Exact<{
   newPassword: Scalars['String'];
 }>;
 
-
 export type AuthChangeLocalPasswordQuery = { authChangeLocalPassword: boolean };
 
 export type AuthLoginQueryVariables = Exact<{
@@ -1821,22 +1713,50 @@ export type AuthLoginQueryVariables = Exact<{
   customIncludeOriginDetails: Scalars['Boolean'];
 }>;
 
-
-export type AuthLoginQuery = { authInfo: { redirectLink?: string, authId?: string, authStatus: AuthStatus, userTokens?: Array<{ authProvider: string, authConfiguration?: string, loginTime: any, message?: string, origin: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> } }> } };
+export type AuthLoginQuery = {
+  authInfo: {
+    redirectLink?: string;
+    authId?: string;
+    authStatus: AuthStatus;
+    userTokens?: Array<{
+      authProvider: string;
+      authConfiguration?: string;
+      loginTime: any;
+      message?: string;
+      origin: {
+        type: string;
+        subType?: string;
+        displayName: string;
+        icon?: string;
+        details?: Array<{
+          id?: string;
+          displayName?: string;
+          description?: string;
+          category?: string;
+          dataType?: string;
+          defaultValue?: any;
+          validValues?: Array<any>;
+          value?: any;
+          length: ObjectPropertyLength;
+          features: Array<string>;
+          order: number;
+        }>;
+      };
+    }>;
+  };
+};
 
 export type AuthLogoutQueryVariables = Exact<{
   provider?: InputMaybe<Scalars['ID']>;
   configuration?: InputMaybe<Scalars['ID']>;
 }>;
 
-
 export type AuthLogoutQuery = { authLogout?: boolean };
 
 export type DeleteAuthProviderConfigurationQueryVariables = Exact<{
   id: Scalars['ID'];
 }>;
 
-
 export type DeleteAuthProviderConfigurationQuery = { deleteAuthProviderConfiguration: boolean };
 
 export type GetActiveUserQueryVariables = Exact<{
@@ -1845,30 +1765,123 @@ export type GetActiveUserQueryVariables = Exact<{
   customIncludeOriginDetails: Scalars['Boolean'];
 }>;
 
-
-export type GetActiveUserQuery = { user?: { userId: string, displayName?: string, authRole?: string, linkedAuthProviders: Array<string>, metaParameters?: any, configurationParameters?: any, authTokens: Array<{ authProvider: string, authConfiguration?: string, loginTime: any, message?: string, origin: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> } }> } };
+export type GetActiveUserQuery = {
+  user?: {
+    userId: string;
+    displayName?: string;
+    authRole?: string;
+    linkedAuthProviders: Array<string>;
+    metaParameters?: any;
+    configurationParameters?: any;
+    authTokens: Array<{
+      authProvider: string;
+      authConfiguration?: string;
+      loginTime: any;
+      message?: string;
+      origin: {
+        type: string;
+        subType?: string;
+        displayName: string;
+        icon?: string;
+        details?: Array<{
+          id?: string;
+          displayName?: string;
+          description?: string;
+          category?: string;
+          dataType?: string;
+          defaultValue?: any;
+          validValues?: Array<any>;
+          value?: any;
+          length: ObjectPropertyLength;
+          features: Array<string>;
+          order: number;
+        }>;
+      };
+    }>;
+  };
+};
 
 export type GetAuthProviderConfigurationParametersQueryVariables = Exact<{
   providerId: Scalars['ID'];
 }>;
 
-
-export type GetAuthProviderConfigurationParametersQuery = { parameters: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> };
+export type GetAuthProviderConfigurationParametersQuery = {
+  parameters: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    value?: any;
+    validValues?: Array<any>;
+    defaultValue?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  }>;
+};
 
 export type GetAuthProviderConfigurationsQueryVariables = Exact<{
   providerId?: InputMaybe<Scalars['ID']>;
 }>;
 
+export type GetAuthProviderConfigurationsQuery = {
+  configurations: Array<{
+    providerId: string;
+    id: string;
+    displayName: string;
+    disabled: boolean;
+    iconURL?: string;
+    description?: string;
+    parameters: any;
+    signInLink?: string;
+    signOutLink?: string;
+    redirectLink?: string;
+    metadataLink?: string;
+  }>;
+};
 
-export type GetAuthProviderConfigurationsQuery = { configurations: Array<{ providerId: string, id: string, displayName: string, disabled: boolean, iconURL?: string, description?: string, parameters: any, signInLink?: string, signOutLink?: string, redirectLink?: string, metadataLink?: string }> };
+export type GetAuthProvidersQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetAuthProvidersQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetAuthProvidersQuery = { providers: Array<{ id: string, label: string, icon?: string, description?: string, defaultProvider: boolean, trusted: boolean, private: boolean, configurable: boolean, requiredFeatures: Array<string>, configurations?: Array<{ id: string, displayName: string, iconURL?: string, description?: string, signInLink?: string, signOutLink?: string, metadataLink?: string }>, credentialProfiles: Array<{ id?: string, label?: string, description?: string, credentialParameters: Array<{ id: string, displayName: string, description?: string, admin: boolean, user: boolean, identifying: boolean, possibleValues?: Array<string>, encryption?: AuthCredentialEncryption }> }> }> };
-
-export type GetAuthRolesQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetAuthProvidersQuery = {
+  providers: Array<{
+    id: string;
+    label: string;
+    icon?: string;
+    description?: string;
+    defaultProvider: boolean;
+    trusted: boolean;
+    private: boolean;
+    configurable: boolean;
+    requiredFeatures: Array<string>;
+    configurations?: Array<{
+      id: string;
+      displayName: string;
+      iconURL?: string;
+      description?: string;
+      signInLink?: string;
+      signOutLink?: string;
+      metadataLink?: string;
+    }>;
+    credentialProfiles: Array<{
+      id?: string;
+      label?: string;
+      description?: string;
+      credentialParameters: Array<{
+        id: string;
+        displayName: string;
+        description?: string;
+        admin: boolean;
+        user: boolean;
+        identifying: boolean;
+        possibleValues?: Array<string>;
+        encryption?: AuthCredentialEncryption;
+      }>;
+    }>;
+  }>;
+};
 
+export type GetAuthRolesQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetAuthRolesQuery = { roles: Array<string> };
 
@@ -1878,13 +1891,56 @@ export type GetAuthStatusQueryVariables = Exact<{
   customIncludeOriginDetails: Scalars['Boolean'];
 }>;
 
+export type GetAuthStatusQuery = {
+  authInfo: {
+    redirectLink?: string;
+    authId?: string;
+    authStatus: AuthStatus;
+    userTokens?: Array<{
+      authProvider: string;
+      authConfiguration?: string;
+      loginTime: any;
+      message?: string;
+      origin: {
+        type: string;
+        subType?: string;
+        displayName: string;
+        icon?: string;
+        details?: Array<{
+          id?: string;
+          displayName?: string;
+          description?: string;
+          category?: string;
+          dataType?: string;
+          defaultValue?: any;
+          validValues?: Array<any>;
+          value?: any;
+          length: ObjectPropertyLength;
+          features: Array<string>;
+          order: number;
+        }>;
+      };
+    }>;
+  };
+};
 
-export type GetAuthStatusQuery = { authInfo: { redirectLink?: string, authId?: string, authStatus: AuthStatus, userTokens?: Array<{ authProvider: string, authConfiguration?: string, loginTime: any, message?: string, origin: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> } }> } };
+export type GetUserProfilePropertiesQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetUserProfilePropertiesQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetUserProfilePropertiesQuery = { properties: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> };
+export type GetUserProfilePropertiesQuery = {
+  properties: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    value?: any;
+    validValues?: Array<any>;
+    defaultValue?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  }>;
+};
 
 export type SaveAuthProviderConfigurationQueryVariables = Exact<{
   providerId: Scalars['ID'];
@@ -1896,15 +1952,27 @@ export type SaveAuthProviderConfigurationQueryVariables = Exact<{
   parameters?: InputMaybe<Scalars['Object']>;
 }>;
 
-
-export type SaveAuthProviderConfigurationQuery = { configuration: { providerId: string, id: string, displayName: string, disabled: boolean, iconURL?: string, description?: string, parameters: any, signInLink?: string, signOutLink?: string, redirectLink?: string, metadataLink?: string } };
+export type SaveAuthProviderConfigurationQuery = {
+  configuration: {
+    providerId: string;
+    id: string;
+    displayName: string;
+    disabled: boolean;
+    iconURL?: string;
+    description?: string;
+    parameters: any;
+    signInLink?: string;
+    signOutLink?: string;
+    redirectLink?: string;
+    metadataLink?: string;
+  };
+};
 
 export type SaveUserMetaParametersQueryVariables = Exact<{
   userId: Scalars['ID'];
   parameters: Scalars['Object'];
 }>;
 
-
 export type SaveUserMetaParametersQuery = { setUserMetaParameterValues: boolean };
 
 export type CreateTeamQueryVariables = Exact<{
@@ -1914,42 +1982,54 @@ export type CreateTeamQueryVariables = Exact<{
   includeMetaParameters: Scalars['Boolean'];
 }>;
 
-
-export type CreateTeamQuery = { team: { teamId: string, teamName?: string, description?: string, teamPermissions: Array<string>, metaParameters?: any } };
+export type CreateTeamQuery = {
+  team: { teamId: string; teamName?: string; description?: string; teamPermissions: Array<string>; metaParameters?: any };
+};
 
 export type DeleteTeamQueryVariables = Exact<{
   teamId: Scalars['ID'];
 }>;
 
-
 export type DeleteTeamQuery = { deleteTeam?: boolean };
 
 export type GetTeamGrantedUsersQueryVariables = Exact<{
   teamId: Scalars['ID'];
 }>;
 
-
 export type GetTeamGrantedUsersQuery = { team: Array<{ grantedUsers: Array<string> }> };
 
-export type GetTeamMetaParametersQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetTeamMetaParametersQueryVariables = Exact<{ [key: string]: never }>;
 
-
-export type GetTeamMetaParametersQuery = { parameters: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> };
+export type GetTeamMetaParametersQuery = {
+  parameters: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    value?: any;
+    validValues?: Array<any>;
+    defaultValue?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  }>;
+};
 
 export type GetTeamsListQueryVariables = Exact<{
   teamId?: InputMaybe<Scalars['ID']>;
   includeMetaParameters: Scalars['Boolean'];
 }>;
 
-
-export type GetTeamsListQuery = { teams: Array<{ teamId: string, teamName?: string, description?: string, teamPermissions: Array<string>, metaParameters?: any }> };
+export type GetTeamsListQuery = {
+  teams: Array<{ teamId: string; teamName?: string; description?: string; teamPermissions: Array<string>; metaParameters?: any }>;
+};
 
 export type SaveTeamMetaParametersQueryVariables = Exact<{
   teamId: Scalars['ID'];
   parameters: Scalars['Object'];
 }>;
 
-
 export type SaveTeamMetaParametersQuery = { setTeamMetaParameterValues: boolean };
 
 export type UpdateTeamQueryVariables = Exact<{
@@ -1959,8 +2039,9 @@ export type UpdateTeamQueryVariables = Exact<{
   includeMetaParameters: Scalars['Boolean'];
 }>;
 
-
-export type UpdateTeamQuery = { team: { teamId: string, teamName?: string, description?: string, teamPermissions: Array<string>, metaParameters?: any } };
+export type UpdateTeamQuery = {
+  team: { teamId: string; teamName?: string; description?: string; teamPermissions: Array<string>; metaParameters?: any };
+};
 
 export type CreateUserQueryVariables = Exact<{
   userId: Scalars['ID'];
@@ -1970,21 +2051,46 @@ export type CreateUserQueryVariables = Exact<{
   customIncludeOriginDetails: Scalars['Boolean'];
 }>;
 
-
-export type CreateUserQuery = { user: { userId: string, grantedTeams: Array<string>, linkedAuthProviders: Array<string>, metaParameters?: any, enabled: boolean, authRole?: string, origins: Array<{ type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }> } };
+export type CreateUserQuery = {
+  user: {
+    userId: string;
+    grantedTeams: Array<string>;
+    linkedAuthProviders: Array<string>;
+    metaParameters?: any;
+    enabled: boolean;
+    authRole?: string;
+    origins: Array<{
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    }>;
+  };
+};
 
 export type DeleteUserQueryVariables = Exact<{
   userId: Scalars['ID'];
 }>;
 
-
 export type DeleteUserQuery = { deleteUser?: boolean };
 
 export type DeleteUserMetaParameterQueryVariables = Exact<{
   id: Scalars['ID'];
 }>;
 
-
 export type DeleteUserMetaParameterQuery = { state: boolean };
 
 export type EnableUserQueryVariables = Exact<{
@@ -1992,15 +2098,15 @@ export type EnableUserQueryVariables = Exact<{
   enabled: Scalars['Boolean'];
 }>;
 
-
 export type EnableUserQuery = { enableUser?: boolean };
 
 export type GetUserGrantedConnectionsQueryVariables = Exact<{
   userId: Scalars['ID'];
 }>;
 
-
-export type GetUserGrantedConnectionsQuery = { grantedConnections: Array<{ connectionId: string, dataSourceId: string, subjectId: string, subjectType: AdminSubjectType }> };
+export type GetUserGrantedConnectionsQuery = {
+  grantedConnections: Array<{ connectionId: string; dataSourceId: string; subjectId: string; subjectType: AdminSubjectType }>;
+};
 
 export type GetUsersListQueryVariables = Exact<{
   userId?: InputMaybe<Scalars['ID']>;
@@ -2008,15 +2114,41 @@ export type GetUsersListQueryVariables = Exact<{
   customIncludeOriginDetails: Scalars['Boolean'];
 }>;
 
-
-export type GetUsersListQuery = { users: Array<{ userId: string, grantedTeams: Array<string>, linkedAuthProviders: Array<string>, metaParameters?: any, enabled: boolean, authRole?: string, origins: Array<{ type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }> }> };
+export type GetUsersListQuery = {
+  users: Array<{
+    userId: string;
+    grantedTeams: Array<string>;
+    linkedAuthProviders: Array<string>;
+    metaParameters?: any;
+    enabled: boolean;
+    authRole?: string;
+    origins: Array<{
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    }>;
+  }>;
+};
 
 export type GrantUserTeamQueryVariables = Exact<{
   userId: Scalars['ID'];
   teamId: Scalars['ID'];
 }>;
 
-
 export type GrantUserTeamQuery = { grantUserTeam?: boolean };
 
 export type RevokeUserTeamQueryVariables = Exact<{
@@ -2024,7 +2156,6 @@ export type RevokeUserTeamQueryVariables = Exact<{
   teamId: Scalars['ID'];
 }>;
 
-
 export type RevokeUserTeamQuery = { revokeUserTeam?: boolean };
 
 export type SetConnectionsQueryVariables = Exact<{
@@ -2032,7 +2163,6 @@ export type SetConnectionsQueryVariables = Exact<{
   connections: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
-
 export type SetConnectionsQuery = { grantedConnections?: boolean };
 
 export type SetUserAuthRoleQueryVariables = Exact<{
@@ -2040,7 +2170,6 @@ export type SetUserAuthRoleQueryVariables = Exact<{
   authRole?: InputMaybe<Scalars['String']>;
 }>;
 
-
 export type SetUserAuthRoleQuery = { setUserAuthRole?: boolean };
 
 export type SetUserConfigurationParameterMutationVariables = Exact<{
@@ -2048,7 +2177,6 @@ export type SetUserConfigurationParameterMutationVariables = Exact<{
   value?: InputMaybe<Scalars['Object']>;
 }>;
 
-
 export type SetUserConfigurationParameterMutation = { setUserConfigurationParameter: boolean };
 
 export type SetUserCredentialsQueryVariables = Exact<{
@@ -2057,7 +2185,6 @@ export type SetUserCredentialsQueryVariables = Exact<{
   credentials: Scalars['Object'];
 }>;
 
-
 export type SetUserCredentialsQuery = { setUserCredentials?: boolean };
 
 export type SetUserMetaParameterQueryVariables = Exact<{
@@ -2067,15 +2194,27 @@ export type SetUserMetaParameterQueryVariables = Exact<{
   required: Scalars['Boolean'];
 }>;
 
-
-export type SetUserMetaParameterQuery = { parameter: { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number } };
+export type SetUserMetaParameterQuery = {
+  parameter: {
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    value?: any;
+    validValues?: Array<any>;
+    defaultValue?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  };
+};
 
 export type UpdateUserProfilePropertiesQueryVariables = Exact<{
   userId: Scalars['ID'];
   parameters: Scalars['Object'];
 }>;
 
-
 export type UpdateUserProfilePropertiesQuery = { state: boolean };
 
 export type GetConnectionAccessQueryVariables = Exact<{
@@ -2083,22 +2222,25 @@ export type GetConnectionAccessQueryVariables = Exact<{
   connectionId: Scalars['ID'];
 }>;
 
-
-export type GetConnectionAccessQuery = { subjects: Array<{ connectionId: string, dataSourceId: string, subjectId: string, subjectType: AdminSubjectType }> };
+export type GetConnectionAccessQuery = {
+  subjects: Array<{ connectionId: string; dataSourceId: string; subjectId: string; subjectType: AdminSubjectType }>;
+};
 
 export type GetSubjectConnectionAccessQueryVariables = Exact<{
   subjectId: Scalars['ID'];
 }>;
 
-
-export type GetSubjectConnectionAccessQuery = { grantInfo: Array<{ connectionId: string, dataSourceId: string, subjectId: string, subjectType: AdminSubjectType }> };
+export type GetSubjectConnectionAccessQuery = {
+  grantInfo: Array<{ connectionId: string; dataSourceId: string; subjectId: string; subjectType: AdminSubjectType }>;
+};
 
 export type SearchDatabasesQueryVariables = Exact<{
   hosts: Array<Scalars['String']> | Scalars['String'];
 }>;
 
-
-export type SearchDatabasesQuery = { databases: Array<{ displayName: string, host: string, port: number, possibleDrivers: Array<string>, defaultDriver: string }> };
+export type SearchDatabasesQuery = {
+  databases: Array<{ displayName: string; host: string; port: number; possibleDrivers: Array<string>; defaultDriver: string }>;
+};
 
 export type SetConnectionAccessQueryVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2106,7 +2248,6 @@ export type SetConnectionAccessQueryVariables = Exact<{
   subjects: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
-
 export type SetConnectionAccessQuery = { setConnectionSubjectAccess?: boolean };
 
 export type SetSubjectConnectionAccessQueryVariables = Exact<{
@@ -2114,7 +2255,6 @@ export type SetSubjectConnectionAccessQueryVariables = Exact<{
   connections: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
-
 export type SetSubjectConnectionAccessQuery = { setSubjectConnectionAccess?: boolean };
 
 export type CloseConnectionMutationVariables = Exact<{
@@ -2131,8 +2271,91 @@ export type CloseConnectionMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type CloseConnectionMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type CloseConnectionMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type CreateConnectionMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2148,8 +2371,91 @@ export type CreateConnectionMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type CreateConnectionMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type CreateConnectionMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type CreateConnectionFolderMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2157,8 +2463,7 @@ export type CreateConnectionFolderMutationVariables = Exact<{
   folderName: Scalars['String'];
 }>;
 
-
-export type CreateConnectionFolderMutation = { folder: { id: string, projectId: string, description?: string } };
+export type CreateConnectionFolderMutation = { folder: { id: string; projectId: string; description?: string } };
 
 export type CreateConnectionFromNodeMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2175,8 +2480,91 @@ export type CreateConnectionFromNodeMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type CreateConnectionFromNodeMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type CreateConnectionFromNodeMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type CreateConnectionFromTemplateMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2193,15 +2581,97 @@ export type CreateConnectionFromTemplateMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type CreateConnectionFromTemplateMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type CreateConnectionFromTemplateMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type DeleteConnectionMutationVariables = Exact<{
   projectId: Scalars['ID'];
   connectionId: Scalars['ID'];
 }>;
 
-
 export type DeleteConnectionMutation = { deleteConnection: boolean };
 
 export type DeleteConnectionFolderMutationVariables = Exact<{
@@ -2209,7 +2679,6 @@ export type DeleteConnectionFolderMutationVariables = Exact<{
   folderPath: Scalars['ID'];
 }>;
 
-
 export type DeleteConnectionFolderMutation = { deleteConnectionFolder: boolean };
 
 export type DriverListQueryVariables = Exact<{
@@ -2220,8 +2689,55 @@ export type DriverListQueryVariables = Exact<{
   includeDriverLibraries: Scalars['Boolean'];
 }>;
 
-
-export type DriverListQuery = { drivers: Array<{ id: string, name?: string, icon?: string, description?: string, defaultPort?: string, defaultDatabase?: string, defaultServer?: string, defaultUser?: string, sampleURL?: string, embedded?: boolean, enabled: boolean, requiresServerName?: boolean, anonymousAccess?: boolean, promotedScore?: number, providerId?: string, driverClassName?: string, custom?: boolean, defaultAuthModel: string, applicableAuthModels: Array<string>, applicableNetworkHandlers: Array<string>, configurationTypes: Array<DriverConfigurationType>, driverParameters?: any, providerProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, length: ObjectPropertyLength, features: Array<string>, order: number, supportedConfigurationTypes?: Array<string> }>, driverProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any> }>, driverLibraries?: Array<{ id: string, name: string, icon: string }> }> };
+export type DriverListQuery = {
+  drivers: Array<{
+    id: string;
+    name?: string;
+    icon?: string;
+    description?: string;
+    defaultPort?: string;
+    defaultDatabase?: string;
+    defaultServer?: string;
+    defaultUser?: string;
+    sampleURL?: string;
+    embedded?: boolean;
+    enabled: boolean;
+    requiresServerName?: boolean;
+    anonymousAccess?: boolean;
+    promotedScore?: number;
+    providerId?: string;
+    driverClassName?: string;
+    custom?: boolean;
+    defaultAuthModel: string;
+    applicableAuthModels: Array<string>;
+    applicableNetworkHandlers: Array<string>;
+    configurationTypes: Array<DriverConfigurationType>;
+    driverParameters?: any;
+    providerProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+      supportedConfigurationTypes?: Array<string>;
+    }>;
+    driverProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+    }>;
+    driverLibraries?: Array<{ id: string; name: string; icon: string }>;
+  }>;
+};
 
 export type ExecutionContextCreateMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2230,8 +2746,9 @@ export type ExecutionContextCreateMutationVariables = Exact<{
   defaultSchema?: InputMaybe<Scalars['String']>;
 }>;
 
-
-export type ExecutionContextCreateMutation = { context: { id: string, projectId: string, connectionId: string, defaultCatalog?: string, defaultSchema?: string } };
+export type ExecutionContextCreateMutation = {
+  context: { id: string; projectId: string; connectionId: string; defaultCatalog?: string; defaultSchema?: string };
+};
 
 export type ExecutionContextDestroyMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2239,7 +2756,6 @@ export type ExecutionContextDestroyMutationVariables = Exact<{
   contextId: Scalars['ID'];
 }>;
 
-
 export type ExecutionContextDestroyMutation = { sqlContextDestroy: boolean };
 
 export type ExecutionContextListQueryVariables = Exact<{
@@ -2248,8 +2764,9 @@ export type ExecutionContextListQueryVariables = Exact<{
   contextId?: InputMaybe<Scalars['ID']>;
 }>;
 
-
-export type ExecutionContextListQuery = { contexts: Array<{ id: string, projectId: string, connectionId: string, defaultCatalog?: string, defaultSchema?: string }> };
+export type ExecutionContextListQuery = {
+  contexts: Array<{ id: string; projectId: string; connectionId: string; defaultCatalog?: string; defaultSchema?: string }>;
+};
 
 export type ExecutionContextUpdateMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2259,21 +2776,39 @@ export type ExecutionContextUpdateMutationVariables = Exact<{
   defaultSchema?: InputMaybe<Scalars['ID']>;
 }>;
 
-
 export type ExecutionContextUpdateMutation = { context: boolean };
 
-export type GetAuthModelsQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetAuthModelsQueryVariables = Exact<{ [key: string]: never }>;
 
-
-export type GetAuthModelsQuery = { models: Array<{ id: string, displayName: string, description?: string, icon?: string, requiresLocalConfiguration?: boolean, requiredAuth?: string, properties: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }> };
+export type GetAuthModelsQuery = {
+  models: Array<{
+    id: string;
+    displayName: string;
+    description?: string;
+    icon?: string;
+    requiresLocalConfiguration?: boolean;
+    requiredAuth?: string;
+    properties: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+  }>;
+};
 
 export type GetConnectionFoldersQueryVariables = Exact<{
   projectId?: InputMaybe<Scalars['ID']>;
   path?: InputMaybe<Scalars['ID']>;
 }>;
 
-
-export type GetConnectionFoldersQuery = { folders: Array<{ id: string, projectId: string, description?: string }> };
+export type GetConnectionFoldersQuery = { folders: Array<{ id: string; projectId: string; description?: string }> };
 
 export type GetTemplateConnectionsQueryVariables = Exact<{
   projectId?: InputMaybe<Scalars['ID']>;
@@ -2288,8 +2823,91 @@ export type GetTemplateConnectionsQueryVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type GetTemplateConnectionsQuery = { connections: Array<{ id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } }> };
+export type GetTemplateConnectionsQuery = {
+  connections: Array<{
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  }>;
+};
 
 export type GetUserConnectionsQueryVariables = Exact<{
   projectId?: InputMaybe<Scalars['ID']>;
@@ -2306,8 +2924,91 @@ export type GetUserConnectionsQueryVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type GetUserConnectionsQuery = { connections: Array<{ id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } }> };
+export type GetUserConnectionsQuery = {
+  connections: Array<{
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  }>;
+};
 
 export type InitConnectionMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2327,11 +3028,93 @@ export type InitConnectionMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
+export type InitConnectionMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
-export type InitConnectionMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
-
-export type RefreshSessionConnectionsMutationVariables = Exact<{ [key: string]: never; }>;
-
+export type RefreshSessionConnectionsMutationVariables = Exact<{ [key: string]: never }>;
 
 export type RefreshSessionConnectionsMutation = { refreshSessionConnections?: boolean };
 
@@ -2350,23 +3133,112 @@ export type SetConnectionNavigatorSettingsMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type SetConnectionNavigatorSettingsMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type SetConnectionNavigatorSettingsMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type TestConnectionMutationVariables = Exact<{
   projectId: Scalars['ID'];
   config: ConnectionConfig;
 }>;
 
-
-export type TestConnectionMutation = { connection: { id: string, connectTime?: string, serverVersion?: string, clientVersion?: string, connectionError?: { message?: string, errorCode?: string, stackTrace?: string } } };
+export type TestConnectionMutation = {
+  connection: {
+    id: string;
+    connectTime?: string;
+    serverVersion?: string;
+    clientVersion?: string;
+    connectionError?: { message?: string; errorCode?: string; stackTrace?: string };
+  };
+};
 
 export type TestNetworkHandlerMutationVariables = Exact<{
   config: NetworkHandlerConfigInput;
 }>;
 
-
-export type TestNetworkHandlerMutation = { info: { message?: string, clientVersion?: string, serverVersion?: string } };
+export type TestNetworkHandlerMutation = { info: { message?: string; clientVersion?: string; serverVersion?: string } };
 
 export type UpdateConnectionMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2382,8 +3254,91 @@ export type UpdateConnectionMutationVariables = Exact<{
   customIncludeOptions: Scalars['Boolean'];
 }>;
 
-
-export type UpdateConnectionMutation = { connection: { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } } };
+export type UpdateConnectionMutation = {
+  connection: {
+    id: string;
+    projectId: string;
+    name: string;
+    description?: string;
+    driverId: string;
+    template: boolean;
+    connected: boolean;
+    readOnly: boolean;
+    saveCredentials: boolean;
+    credentialsSaved?: boolean;
+    sharedCredentials: boolean;
+    folder?: string;
+    nodePath?: string;
+    configurationType?: DriverConfigurationType;
+    useUrl?: boolean;
+    host?: string;
+    port?: string;
+    serverName?: string;
+    databaseName?: string;
+    url?: string;
+    properties?: any;
+    providerProperties?: any;
+    requiredAuth?: string;
+    features: Array<string>;
+    supportedDataFormats: Array<ResultDataFormat>;
+    authNeeded?: boolean;
+    authModel?: string;
+    canViewSettings: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    origin?: {
+      type: string;
+      subType?: string;
+      displayName: string;
+      icon?: string;
+      details?: Array<{
+        id?: string;
+        displayName?: string;
+        description?: string;
+        category?: string;
+        dataType?: string;
+        defaultValue?: any;
+        validValues?: Array<any>;
+        value?: any;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        order: number;
+      }>;
+    };
+    authProperties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+    networkHandlersConfig?: Array<{
+      id: string;
+      enabled: boolean;
+      authType: NetworkHandlerAuthType;
+      userName?: string;
+      password?: string;
+      key?: string;
+      savePassword: boolean;
+      properties: any;
+    }>;
+    navigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+  };
+};
 
 export type ExportDataFromContainerQueryVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2392,8 +3347,16 @@ export type ExportDataFromContainerQueryVariables = Exact<{
   parameters: DataTransferParameters;
 }>;
 
-
-export type ExportDataFromContainerQuery = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } } };
+export type ExportDataFromContainerQuery = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+  };
+};
 
 export type ExportDataFromResultsQueryVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2403,24 +3366,56 @@ export type ExportDataFromResultsQueryVariables = Exact<{
   parameters: DataTransferParameters;
 }>;
 
+export type ExportDataFromResultsQuery = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+  };
+};
 
-export type ExportDataFromResultsQuery = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } } };
+export type GetDataTransferDefaultParametersQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetDataTransferDefaultParametersQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetDataTransferDefaultParametersQuery = {
+  settings: { supportedEncodings: Array<string>; outputSettings: { insertBom: boolean; encoding: string; timestampPattern: string } };
+};
 
+export type GetDataTransferProcessorsQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetDataTransferDefaultParametersQuery = { settings: { supportedEncodings: Array<string>, outputSettings: { insertBom: boolean, encoding: string, timestampPattern: string } } };
-
-export type GetDataTransferProcessorsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetDataTransferProcessorsQuery = { processors: Array<{ id: string, name?: string, description?: string, fileExtension?: string, appFileExtension?: string, appName?: string, order: number, icon?: string, isBinary?: boolean, isHTML?: boolean, properties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, length: ObjectPropertyLength, features: Array<string>, order: number }> }> };
+export type GetDataTransferProcessorsQuery = {
+  processors: Array<{
+    id: string;
+    name?: string;
+    description?: string;
+    fileExtension?: string;
+    appFileExtension?: string;
+    appName?: string;
+    order: number;
+    icon?: string;
+    isBinary?: boolean;
+    isHTML?: boolean;
+    properties?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+  }>;
+};
 
 export type RemoveDataTransferFileQueryVariables = Exact<{
   dataFileId: Scalars['String'];
 }>;
 
-
 export type RemoveDataTransferFileQuery = { result?: boolean };
 
 export type NavGetStructContainersQueryVariables = Exact<{
@@ -2430,73 +3425,563 @@ export type NavGetStructContainersQueryVariables = Exact<{
   withDetails: Scalars['Boolean'];
 }>;
 
+export type NavGetStructContainersQuery = {
+  navGetStructContainers: {
+    supportsCatalogChange: boolean;
+    supportsSchemaChange: boolean;
+    catalogList: Array<{
+      catalog: {
+        id: string;
+        name?: string;
+        hasChildren?: boolean;
+        nodeType?: string;
+        icon?: string;
+        folder?: boolean;
+        inline?: boolean;
+        navigable?: boolean;
+        features?: Array<string>;
+        projectId?: string;
+        object?: { features?: Array<string> };
+        nodeDetails?: Array<{
+          id?: string;
+          category?: string;
+          dataType?: string;
+          description?: string;
+          displayName?: string;
+          length: ObjectPropertyLength;
+          features: Array<string>;
+          value?: any;
+          order: number;
+        }>;
+      };
+      schemaList: Array<{
+        id: string;
+        name?: string;
+        hasChildren?: boolean;
+        nodeType?: string;
+        icon?: string;
+        folder?: boolean;
+        inline?: boolean;
+        navigable?: boolean;
+        features?: Array<string>;
+        projectId?: string;
+        object?: { features?: Array<string> };
+        nodeDetails?: Array<{
+          id?: string;
+          category?: string;
+          dataType?: string;
+          description?: string;
+          displayName?: string;
+          length: ObjectPropertyLength;
+          features: Array<string>;
+          value?: any;
+          order: number;
+        }>;
+      }>;
+    }>;
+    schemaList: Array<{
+      id: string;
+      name?: string;
+      hasChildren?: boolean;
+      nodeType?: string;
+      icon?: string;
+      folder?: boolean;
+      inline?: boolean;
+      navigable?: boolean;
+      features?: Array<string>;
+      projectId?: string;
+      object?: { features?: Array<string> };
+      nodeDetails?: Array<{
+        id?: string;
+        category?: string;
+        dataType?: string;
+        description?: string;
+        displayName?: string;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        value?: any;
+        order: number;
+      }>;
+    }>;
+  };
+};
 
-export type NavGetStructContainersQuery = { navGetStructContainers: { supportsCatalogChange: boolean, supportsSchemaChange: boolean, catalogList: Array<{ catalog: { id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }, schemaList: Array<{ id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }> }>, schemaList: Array<{ id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }> } };
+export type AdminObjectGrantInfoFragment = {
+  subjectId: string;
+  subjectType: AdminSubjectType;
+  objectPermissions: { objectId: string; permissions: Array<string> };
+};
 
-export type AdminObjectGrantInfoFragment = { subjectId: string, subjectType: AdminSubjectType, objectPermissions: { objectId: string, permissions: Array<string> } };
+export type AdminPermissionInfoFragment = { id: string; label?: string; description?: string; category?: string };
 
-export type AdminPermissionInfoFragment = { id: string, label?: string, description?: string, category?: string };
+export type AdminTeamInfoFragment = { teamId: string; teamName?: string; description?: string; teamPermissions: Array<string>; metaParameters?: any };
 
-export type AdminTeamInfoFragment = { teamId: string, teamName?: string, description?: string, teamPermissions: Array<string>, metaParameters?: any };
+export type AdminUserInfoFragment = {
+  userId: string;
+  grantedTeams: Array<string>;
+  linkedAuthProviders: Array<string>;
+  metaParameters?: any;
+  enabled: boolean;
+  authRole?: string;
+  origins: Array<{
+    type: string;
+    subType?: string;
+    displayName: string;
+    icon?: string;
+    details?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+      value?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+  }>;
+};
 
-export type AdminUserInfoFragment = { userId: string, grantedTeams: Array<string>, linkedAuthProviders: Array<string>, metaParameters?: any, enabled: boolean, authRole?: string, origins: Array<{ type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }> };
+export type AllNavigatorSettingsFragment = {
+  showSystemObjects: boolean;
+  showUtilityObjects: boolean;
+  showOnlyEntities: boolean;
+  mergeEntities: boolean;
+  hideFolders: boolean;
+  hideSchemas: boolean;
+  hideVirtualModel: boolean;
+};
 
-export type AllNavigatorSettingsFragment = { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean };
+export type AsyncTaskInfoFragment = {
+  id: string;
+  name?: string;
+  running: boolean;
+  status?: string;
+  taskResult?: any;
+  error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+};
 
-export type AsyncTaskInfoFragment = { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } };
+export type AuthProviderConfigurationInfoFragment = {
+  id: string;
+  displayName: string;
+  iconURL?: string;
+  description?: string;
+  signInLink?: string;
+  signOutLink?: string;
+  metadataLink?: string;
+};
 
-export type AuthProviderConfigurationInfoFragment = { id: string, displayName: string, iconURL?: string, description?: string, signInLink?: string, signOutLink?: string, metadataLink?: string };
+export type AuthProviderConfigurationParametersFragment = {
+  id?: string;
+  displayName?: string;
+  description?: string;
+  category?: string;
+  dataType?: string;
+  value?: any;
+  validValues?: Array<any>;
+  defaultValue?: any;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+  order: number;
+};
 
-export type AuthProviderConfigurationParametersFragment = { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number };
+export type AuthProviderInfoFragment = {
+  id: string;
+  label: string;
+  icon?: string;
+  description?: string;
+  defaultProvider: boolean;
+  trusted: boolean;
+  private: boolean;
+  configurable: boolean;
+  requiredFeatures: Array<string>;
+  configurations?: Array<{
+    id: string;
+    displayName: string;
+    iconURL?: string;
+    description?: string;
+    signInLink?: string;
+    signOutLink?: string;
+    metadataLink?: string;
+  }>;
+  credentialProfiles: Array<{
+    id?: string;
+    label?: string;
+    description?: string;
+    credentialParameters: Array<{
+      id: string;
+      displayName: string;
+      description?: string;
+      admin: boolean;
+      user: boolean;
+      identifying: boolean;
+      possibleValues?: Array<string>;
+      encryption?: AuthCredentialEncryption;
+    }>;
+  }>;
+};
 
-export type AuthProviderInfoFragment = { id: string, label: string, icon?: string, description?: string, defaultProvider: boolean, trusted: boolean, private: boolean, configurable: boolean, requiredFeatures: Array<string>, configurations?: Array<{ id: string, displayName: string, iconURL?: string, description?: string, signInLink?: string, signOutLink?: string, metadataLink?: string }>, credentialProfiles: Array<{ id?: string, label?: string, description?: string, credentialParameters: Array<{ id: string, displayName: string, description?: string, admin: boolean, user: boolean, identifying: boolean, possibleValues?: Array<string>, encryption?: AuthCredentialEncryption }> }> };
+export type AuthTokenFragment = {
+  authProvider: string;
+  authConfiguration?: string;
+  loginTime: any;
+  message?: string;
+  origin: {
+    type: string;
+    subType?: string;
+    displayName: string;
+    icon?: string;
+    details?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+      value?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+  };
+};
 
-export type AuthTokenFragment = { authProvider: string, authConfiguration?: string, loginTime: any, message?: string, origin: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> } };
+export type ConnectionFolderInfoFragment = { id: string; projectId: string; description?: string };
 
-export type ConnectionFolderInfoFragment = { id: string, projectId: string, description?: string };
+export type DatabaseConnectionFragment = {
+  id: string;
+  projectId: string;
+  name: string;
+  description?: string;
+  driverId: string;
+  template: boolean;
+  connected: boolean;
+  readOnly: boolean;
+  saveCredentials: boolean;
+  credentialsSaved?: boolean;
+  sharedCredentials: boolean;
+  folder?: string;
+  nodePath?: string;
+  configurationType?: DriverConfigurationType;
+  useUrl?: boolean;
+  host?: string;
+  port?: string;
+  serverName?: string;
+  databaseName?: string;
+  url?: string;
+  properties?: any;
+  providerProperties?: any;
+  requiredAuth?: string;
+  features: Array<string>;
+  supportedDataFormats: Array<ResultDataFormat>;
+  authNeeded?: boolean;
+  authModel?: string;
+  canViewSettings: boolean;
+  canEdit: boolean;
+  canDelete: boolean;
+  origin?: {
+    type: string;
+    subType?: string;
+    displayName: string;
+    icon?: string;
+    details?: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      defaultValue?: any;
+      validValues?: Array<any>;
+      value?: any;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      order: number;
+    }>;
+  };
+  authProperties?: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    value?: any;
+    validValues?: Array<any>;
+    defaultValue?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  }>;
+  networkHandlersConfig?: Array<{
+    id: string;
+    enabled: boolean;
+    authType: NetworkHandlerAuthType;
+    userName?: string;
+    password?: string;
+    key?: string;
+    savePassword: boolean;
+    properties: any;
+  }>;
+  navigatorSettings: {
+    showSystemObjects: boolean;
+    showUtilityObjects: boolean;
+    showOnlyEntities: boolean;
+    mergeEntities: boolean;
+    hideFolders: boolean;
+    hideSchemas: boolean;
+    hideVirtualModel: boolean;
+  };
+};
 
-export type DatabaseConnectionFragment = { id: string, projectId: string, name: string, description?: string, driverId: string, template: boolean, connected: boolean, readOnly: boolean, saveCredentials: boolean, credentialsSaved?: boolean, sharedCredentials: boolean, folder?: string, nodePath?: string, configurationType?: DriverConfigurationType, useUrl?: boolean, host?: string, port?: string, serverName?: string, databaseName?: string, url?: string, properties?: any, providerProperties?: any, requiredAuth?: string, features: Array<string>, supportedDataFormats: Array<ResultDataFormat>, authNeeded?: boolean, authModel?: string, canViewSettings: boolean, canEdit: boolean, canDelete: boolean, origin?: { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> }, authProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number }>, networkHandlersConfig?: Array<{ id: string, enabled: boolean, authType: NetworkHandlerAuthType, userName?: string, password?: string, key?: string, savePassword: boolean, properties: any }>, navigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean } };
+export type DatabaseDriverFragment = {
+  id: string;
+  name?: string;
+  icon?: string;
+  description?: string;
+  defaultPort?: string;
+  defaultDatabase?: string;
+  defaultServer?: string;
+  defaultUser?: string;
+  sampleURL?: string;
+  embedded?: boolean;
+  enabled: boolean;
+  requiresServerName?: boolean;
+  anonymousAccess?: boolean;
+  promotedScore?: number;
+  providerId?: string;
+  driverClassName?: string;
+  custom?: boolean;
+  defaultAuthModel: string;
+  applicableAuthModels: Array<string>;
+  applicableNetworkHandlers: Array<string>;
+  configurationTypes: Array<DriverConfigurationType>;
+  driverParameters?: any;
+  providerProperties?: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    defaultValue?: any;
+    validValues?: Array<any>;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+    supportedConfigurationTypes?: Array<string>;
+  }>;
+  driverProperties?: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    defaultValue?: any;
+    validValues?: Array<any>;
+  }>;
+  driverLibraries?: Array<{ id: string; name: string; icon: string }>;
+};
 
-export type DatabaseDriverFragment = { id: string, name?: string, icon?: string, description?: string, defaultPort?: string, defaultDatabase?: string, defaultServer?: string, defaultUser?: string, sampleURL?: string, embedded?: boolean, enabled: boolean, requiresServerName?: boolean, anonymousAccess?: boolean, promotedScore?: number, providerId?: string, driverClassName?: string, custom?: boolean, defaultAuthModel: string, applicableAuthModels: Array<string>, applicableNetworkHandlers: Array<string>, configurationTypes: Array<DriverConfigurationType>, driverParameters?: any, providerProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, length: ObjectPropertyLength, features: Array<string>, order: number, supportedConfigurationTypes?: Array<string> }>, driverProperties?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any> }>, driverLibraries?: Array<{ id: string, name: string, icon: string }> };
+export type DriverProviderPropertyInfoFragment = {
+  id?: string;
+  displayName?: string;
+  description?: string;
+  category?: string;
+  dataType?: string;
+  defaultValue?: any;
+  validValues?: Array<any>;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+  order: number;
+  supportedConfigurationTypes?: Array<string>;
+};
 
-export type DriverProviderPropertyInfoFragment = { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, length: ObjectPropertyLength, features: Array<string>, order: number, supportedConfigurationTypes?: Array<string> };
+export type ExecutionContextInfoFragment = { id: string; projectId: string; connectionId: string; defaultCatalog?: string; defaultSchema?: string };
 
-export type ExecutionContextInfoFragment = { id: string, projectId: string, connectionId: string, defaultCatalog?: string, defaultSchema?: string };
+export type NavNodeDbObjectInfoFragment = {
+  id: string;
+  object?: {
+    type?: string;
+    features?: Array<string>;
+    properties?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  };
+};
 
-export type NavNodeDbObjectInfoFragment = { id: string, object?: { type?: string, features?: Array<string>, properties?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> } };
+export type NavNodeInfoFragment = {
+  id: string;
+  name?: string;
+  hasChildren?: boolean;
+  nodeType?: string;
+  icon?: string;
+  folder?: boolean;
+  inline?: boolean;
+  navigable?: boolean;
+  features?: Array<string>;
+  projectId?: string;
+  object?: { features?: Array<string> };
+  nodeDetails?: Array<{
+    id?: string;
+    category?: string;
+    dataType?: string;
+    description?: string;
+    displayName?: string;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    value?: any;
+    order: number;
+  }>;
+};
 
-export type NavNodeInfoFragment = { id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> };
+export type NavNodePropertiesFragment = {
+  id?: string;
+  category?: string;
+  dataType?: string;
+  description?: string;
+  displayName?: string;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+  value?: any;
+  order: number;
+};
 
-export type NavNodePropertiesFragment = { id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number };
+export type ObjectOriginInfoFragment = {
+  type: string;
+  subType?: string;
+  displayName: string;
+  icon?: string;
+  details?: Array<{
+    id?: string;
+    displayName?: string;
+    description?: string;
+    category?: string;
+    dataType?: string;
+    defaultValue?: any;
+    validValues?: Array<any>;
+    value?: any;
+    length: ObjectPropertyLength;
+    features: Array<string>;
+    order: number;
+  }>;
+};
 
-export type ObjectOriginInfoFragment = { type: string, subType?: string, displayName: string, icon?: string, details?: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, defaultValue?: any, validValues?: Array<any>, value?: any, length: ObjectPropertyLength, features: Array<string>, order: number }> };
+export type ObjectPropertyInfoFragment = {
+  id?: string;
+  displayName?: string;
+  description?: string;
+  category?: string;
+  dataType?: string;
+  value?: any;
+  validValues?: Array<any>;
+  defaultValue?: any;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+  order: number;
+};
 
-export type ObjectPropertyInfoFragment = { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number };
+export type ResourceTypeFragment = { id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string };
 
-export type ResourceTypeFragment = { id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string };
+export type SqlScriptInfoFragment = { queries: Array<{ start: number; end: number }> };
 
-export type SqlScriptInfoFragment = { queries: Array<{ start: number, end: number }> };
+export type SessionStateFragment = {
+  createTime: string;
+  lastAccessTime: string;
+  cacheExpired: boolean;
+  locale: string;
+  actionParameters?: any;
+  valid: boolean;
+  remainingTime: number;
+};
 
-export type SessionStateFragment = { createTime: string, lastAccessTime: string, cacheExpired: boolean, locale: string, actionParameters?: any, valid: boolean, remainingTime: number };
+export type SharedProjectFragment = {
+  id: string;
+  name: string;
+  shared: boolean;
+  global: boolean;
+  description?: string;
+  projectPermissions: Array<string>;
+  resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+};
 
-export type SharedProjectFragment = { id: string, name: string, shared: boolean, global: boolean, description?: string, projectPermissions: Array<string>, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> };
+export type UserConnectionAuthPropertiesFragment = {
+  id?: string;
+  displayName?: string;
+  description?: string;
+  category?: string;
+  dataType?: string;
+  value?: any;
+  validValues?: Array<any>;
+  defaultValue?: any;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+  order: number;
+};
 
-export type UserConnectionAuthPropertiesFragment = { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, length: ObjectPropertyLength, features: Array<string>, order: number };
-
-export type UserConnectionNetworkHandlerPropertiesFragment = { id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, order: number, length: ObjectPropertyLength, features: Array<string> };
+export type UserConnectionNetworkHandlerPropertiesFragment = {
+  id?: string;
+  displayName?: string;
+  description?: string;
+  category?: string;
+  dataType?: string;
+  value?: any;
+  validValues?: Array<any>;
+  defaultValue?: any;
+  order: number;
+  length: ObjectPropertyLength;
+  features: Array<string>;
+};
 
 export type GetAsyncTaskInfoMutationVariables = Exact<{
   taskId: Scalars['String'];
   removeOnFinish: Scalars['Boolean'];
 }>;
 
+export type GetAsyncTaskInfoMutation = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+  };
+};
 
-export type GetAsyncTaskInfoMutation = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } } };
+export type GetNetworkHandlersQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetNetworkHandlersQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetNetworkHandlersQuery = { handlers: Array<{ id: string, codeName: string, label: string, description?: string, secured: boolean, type?: NetworkHandlerType, properties: Array<{ id?: string, displayName?: string, description?: string, category?: string, dataType?: string, value?: any, validValues?: Array<any>, defaultValue?: any, order: number, length: ObjectPropertyLength, features: Array<string> }> }> };
+export type GetNetworkHandlersQuery = {
+  handlers: Array<{
+    id: string;
+    codeName: string;
+    label: string;
+    description?: string;
+    secured: boolean;
+    type?: NetworkHandlerType;
+    properties: Array<{
+      id?: string;
+      displayName?: string;
+      description?: string;
+      category?: string;
+      dataType?: string;
+      value?: any;
+      validValues?: Array<any>;
+      defaultValue?: any;
+      order: number;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+    }>;
+  }>;
+};
 
 export type AsyncReadDataFromContainerMutationVariables = Exact<{
   connectionId: Scalars['ID'];
@@ -2507,8 +3992,16 @@ export type AsyncReadDataFromContainerMutationVariables = Exact<{
   dataFormat?: InputMaybe<ResultDataFormat>;
 }>;
 
-
-export type AsyncReadDataFromContainerMutation = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } } };
+export type AsyncReadDataFromContainerMutation = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+  };
+};
 
 export type AsyncSqlExecuteQueryMutationVariables = Exact<{
   connectionId: Scalars['ID'];
@@ -2519,8 +4012,16 @@ export type AsyncSqlExecuteQueryMutationVariables = Exact<{
   dataFormat?: InputMaybe<ResultDataFormat>;
 }>;
 
-
-export type AsyncSqlExecuteQueryMutation = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, errorType?: string, stackTrace?: string } } };
+export type AsyncSqlExecuteQueryMutation = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; errorType?: string; stackTrace?: string };
+  };
+};
 
 export type AsyncSqlExplainExecutionPlanMutationVariables = Exact<{
   connectionId: Scalars['ID'];
@@ -2529,8 +4030,16 @@ export type AsyncSqlExplainExecutionPlanMutationVariables = Exact<{
   configuration: Scalars['Object'];
 }>;
 
-
-export type AsyncSqlExplainExecutionPlanMutation = { taskInfo: { id: string, name?: string, running: boolean, status?: string, taskResult?: any, error?: { message?: string, errorCode?: string, stackTrace?: string } } };
+export type AsyncSqlExplainExecutionPlanMutation = {
+  taskInfo: {
+    id: string;
+    name?: string;
+    running: boolean;
+    status?: string;
+    taskResult?: any;
+    error?: { message?: string; errorCode?: string; stackTrace?: string };
+  };
+};
 
 export type CloseResultMutationVariables = Exact<{
   connectionId: Scalars['ID'];
@@ -2538,7 +4047,6 @@ export type CloseResultMutationVariables = Exact<{
   resultId: Scalars['ID'];
 }>;
 
-
 export type CloseResultMutation = { result: boolean };
 
 export type GetResultsetDataUrlMutationVariables = Exact<{
@@ -2549,7 +4057,6 @@ export type GetResultsetDataUrlMutationVariables = Exact<{
   row: Array<SqlResultRow> | SqlResultRow;
 }>;
 
-
 export type GetResultsetDataUrlMutation = { url: string };
 
 export type GetResultsetGroupingQueryQueryVariables = Exact<{
@@ -2560,22 +4067,80 @@ export type GetResultsetGroupingQueryQueryVariables = Exact<{
   columnNames: Array<Scalars['String']> | Scalars['String'];
 }>;
 
-
 export type GetResultsetGroupingQueryQuery = { query: string };
 
 export type GetSqlExecuteTaskResultsMutationVariables = Exact<{
   taskId: Scalars['ID'];
 }>;
 
-
-export type GetSqlExecuteTaskResultsMutation = { result: { duration: number, statusMessage?: string, filterText?: string, fullQuery?: string, results: Array<{ title?: string, updateRowCount?: number, sourceQuery?: string, dataFormat?: ResultDataFormat, resultSet?: { id: string, rows?: Array<Array<any>>, singleEntity: boolean, hasMoreData: boolean, hasRowIdentifier: boolean, columns?: Array<{ dataKind?: string, entityName?: string, fullTypeName?: string, icon?: string, label?: string, maxLength?: number, name?: string, position: number, precision?: number, required: boolean, readOnly: boolean, readOnlyStatus?: string, scale?: number, typeName?: string, supportedOperations: Array<{ id: string, expression: string, argumentCount?: number }> }> } }> } };
+export type GetSqlExecuteTaskResultsMutation = {
+  result: {
+    duration: number;
+    statusMessage?: string;
+    filterText?: string;
+    fullQuery?: string;
+    results: Array<{
+      title?: string;
+      updateRowCount?: number;
+      sourceQuery?: string;
+      dataFormat?: ResultDataFormat;
+      resultSet?: {
+        id: string;
+        rows?: Array<Array<any>>;
+        singleEntity: boolean;
+        hasMoreData: boolean;
+        hasRowIdentifier: boolean;
+        columns?: Array<{
+          dataKind?: string;
+          entityName?: string;
+          fullTypeName?: string;
+          icon?: string;
+          label?: string;
+          maxLength?: number;
+          name?: string;
+          position: number;
+          precision?: number;
+          required: boolean;
+          readOnly: boolean;
+          readOnlyStatus?: string;
+          scale?: number;
+          typeName?: string;
+          supportedOperations: Array<{ id: string; expression: string; argumentCount?: number }>;
+        }>;
+      };
+    }>;
+  };
+};
 
 export type GetSqlExecutionPlanResultMutationVariables = Exact<{
   taskId: Scalars['ID'];
 }>;
 
-
-export type GetSqlExecutionPlanResultMutation = { result: { query: string, nodes: Array<{ id: string, parentId?: string, kind: string, name?: string, type: string, condition?: string, description?: string, properties: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }> } };
+export type GetSqlExecutionPlanResultMutation = {
+  result: {
+    query: string;
+    nodes: Array<{
+      id: string;
+      parentId?: string;
+      kind: string;
+      name?: string;
+      type: string;
+      condition?: string;
+      description?: string;
+      properties: Array<{
+        id?: string;
+        category?: string;
+        dataType?: string;
+        description?: string;
+        displayName?: string;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        value?: any;
+        order: number;
+      }>;
+    }>;
+  };
+};
 
 export type UpdateResultsDataBatchMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2587,8 +4152,16 @@ export type UpdateResultsDataBatchMutationVariables = Exact<{
   addedRows?: InputMaybe<Array<SqlResultRow> | SqlResultRow>;
 }>;
 
-
-export type UpdateResultsDataBatchMutation = { result: { duration: number, filterText?: string, results: Array<{ updateRowCount?: number, resultSet?: { id: string, rows?: Array<Array<any>>, singleEntity: boolean, hasMoreData: boolean, hasRowIdentifier: boolean } }> } };
+export type UpdateResultsDataBatchMutation = {
+  result: {
+    duration: number;
+    filterText?: string;
+    results: Array<{
+      updateRowCount?: number;
+      resultSet?: { id: string; rows?: Array<Array<any>>; singleEntity: boolean; hasMoreData: boolean; hasRowIdentifier: boolean };
+    }>;
+  };
+};
 
 export type UpdateResultsDataBatchScriptMutationVariables = Exact<{
   projectId: Scalars['ID'];
@@ -2600,21 +4173,18 @@ export type UpdateResultsDataBatchScriptMutationVariables = Exact<{
   addedRows?: InputMaybe<Array<SqlResultRow> | SqlResultRow>;
 }>;
 
-
 export type UpdateResultsDataBatchScriptMutation = { result: string };
 
 export type MetadataGetNodeDdlQueryVariables = Exact<{
   nodeId: Scalars['ID'];
 }>;
 
-
 export type MetadataGetNodeDdlQuery = { metadataGetNodeDDL?: string };
 
 export type MetadataGetNodeExtendedDdlQueryVariables = Exact<{
   nodeId: Scalars['ID'];
 }>;
 
-
 export type MetadataGetNodeExtendedDdlQuery = { metadataGetNodeExtendedDDL?: string };
 
 export type GetChildrenDbObjectInfoQueryVariables = Exact<{
@@ -2624,22 +4194,57 @@ export type GetChildrenDbObjectInfoQueryVariables = Exact<{
   filter?: InputMaybe<ObjectPropertyFilter>;
 }>;
 
-
-export type GetChildrenDbObjectInfoQuery = { dbObjects: Array<{ id: string, object?: { type?: string, features?: Array<string>, properties?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> } }> };
+export type GetChildrenDbObjectInfoQuery = {
+  dbObjects: Array<{
+    id: string;
+    object?: {
+      type?: string;
+      features?: Array<string>;
+      properties?: Array<{
+        id?: string;
+        category?: string;
+        dataType?: string;
+        description?: string;
+        displayName?: string;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        value?: any;
+        order: number;
+      }>;
+    };
+  }>;
+};
 
 export type GetDbObjectInfoQueryVariables = Exact<{
   navNodeId: Scalars['ID'];
   filter?: InputMaybe<ObjectPropertyFilter>;
 }>;
 
-
-export type GetDbObjectInfoQuery = { objectInfo: { id: string, object?: { type?: string, features?: Array<string>, properties?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> } } };
+export type GetDbObjectInfoQuery = {
+  objectInfo: {
+    id: string;
+    object?: {
+      type?: string;
+      features?: Array<string>;
+      properties?: Array<{
+        id?: string;
+        category?: string;
+        dataType?: string;
+        description?: string;
+        displayName?: string;
+        length: ObjectPropertyLength;
+        features: Array<string>;
+        value?: any;
+        order: number;
+      }>;
+    };
+  };
+};
 
 export type GetNavNodeFullNameQueryVariables = Exact<{
   nodePath: Scalars['ID'];
 }>;
 
-
 export type GetNavNodeFullNameQuery = { navNodeInfo: { fullName?: string } };
 
 export type GetNodeParentsQueryVariables = Exact<{
@@ -2647,14 +4252,61 @@ export type GetNodeParentsQueryVariables = Exact<{
   withDetails: Scalars['Boolean'];
 }>;
 
-
-export type GetNodeParentsQuery = { node: { id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }, parents: Array<{ id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }> };
+export type GetNodeParentsQuery = {
+  node: {
+    id: string;
+    name?: string;
+    hasChildren?: boolean;
+    nodeType?: string;
+    icon?: string;
+    folder?: boolean;
+    inline?: boolean;
+    navigable?: boolean;
+    features?: Array<string>;
+    projectId?: string;
+    object?: { features?: Array<string> };
+    nodeDetails?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  };
+  parents: Array<{
+    id: string;
+    name?: string;
+    hasChildren?: boolean;
+    nodeType?: string;
+    icon?: string;
+    folder?: boolean;
+    inline?: boolean;
+    navigable?: boolean;
+    features?: Array<string>;
+    projectId?: string;
+    object?: { features?: Array<string> };
+    nodeDetails?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  }>;
+};
 
 export type NavDeleteNodesMutationVariables = Exact<{
   nodePaths: Array<Scalars['ID']> | Scalars['ID'];
 }>;
 
-
 export type NavDeleteNodesMutation = { navDeleteNodes?: number };
 
 export type NavMoveToMutationVariables = Exact<{
@@ -2662,7 +4314,6 @@ export type NavMoveToMutationVariables = Exact<{
   folderPath: Scalars['ID'];
 }>;
 
-
 export type NavMoveToMutation = { navMoveNodesToFolder?: boolean };
 
 export type NavNodeChildrenQueryVariables = Exact<{
@@ -2672,22 +4323,93 @@ export type NavNodeChildrenQueryVariables = Exact<{
   withDetails: Scalars['Boolean'];
 }>;
 
-
-export type NavNodeChildrenQuery = { navNodeChildren: Array<{ id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> }>, navNodeInfo: { id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> } };
+export type NavNodeChildrenQuery = {
+  navNodeChildren: Array<{
+    id: string;
+    name?: string;
+    hasChildren?: boolean;
+    nodeType?: string;
+    icon?: string;
+    folder?: boolean;
+    inline?: boolean;
+    navigable?: boolean;
+    features?: Array<string>;
+    projectId?: string;
+    object?: { features?: Array<string> };
+    nodeDetails?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  }>;
+  navNodeInfo: {
+    id: string;
+    name?: string;
+    hasChildren?: boolean;
+    nodeType?: string;
+    icon?: string;
+    folder?: boolean;
+    inline?: boolean;
+    navigable?: boolean;
+    features?: Array<string>;
+    projectId?: string;
+    object?: { features?: Array<string> };
+    nodeDetails?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  };
+};
 
 export type NavNodeInfoQueryVariables = Exact<{
   nodePath: Scalars['ID'];
   withDetails: Scalars['Boolean'];
 }>;
 
-
-export type NavNodeInfoQuery = { navNodeInfo: { id: string, name?: string, hasChildren?: boolean, nodeType?: string, icon?: string, folder?: boolean, inline?: boolean, navigable?: boolean, features?: Array<string>, projectId?: string, object?: { features?: Array<string> }, nodeDetails?: Array<{ id?: string, category?: string, dataType?: string, description?: string, displayName?: string, length: ObjectPropertyLength, features: Array<string>, value?: any, order: number }> } };
+export type NavNodeInfoQuery = {
+  navNodeInfo: {
+    id: string;
+    name?: string;
+    hasChildren?: boolean;
+    nodeType?: string;
+    icon?: string;
+    folder?: boolean;
+    inline?: boolean;
+    navigable?: boolean;
+    features?: Array<string>;
+    projectId?: string;
+    object?: { features?: Array<string> };
+    nodeDetails?: Array<{
+      id?: string;
+      category?: string;
+      dataType?: string;
+      description?: string;
+      displayName?: string;
+      length: ObjectPropertyLength;
+      features: Array<string>;
+      value?: any;
+      order: number;
+    }>;
+  };
+};
 
 export type NavRefreshNodeQueryVariables = Exact<{
   nodePath: Scalars['ID'];
 }>;
 
-
 export type NavRefreshNodeQuery = { navRefreshNode?: boolean };
 
 export type NavRenameNodeMutationVariables = Exact<{
@@ -2695,13 +4417,24 @@ export type NavRenameNodeMutationVariables = Exact<{
   newName: Scalars['String'];
 }>;
 
-
 export type NavRenameNodeMutation = { navRenameNode?: string };
 
-export type GetProjectListQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetProjectListQueryVariables = Exact<{ [key: string]: never }>;
 
-
-export type GetProjectListQuery = { projects: Array<{ id: string, shared: boolean, global: boolean, name: string, description?: string, canEditDataSources: boolean, canViewDataSources: boolean, canEditResources: boolean, canViewResources: boolean, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> }> };
+export type GetProjectListQuery = {
+  projects: Array<{
+    id: string;
+    shared: boolean;
+    global: boolean;
+    name: string;
+    description?: string;
+    canEditDataSources: boolean;
+    canViewDataSources: boolean;
+    canEditResources: boolean;
+    canViewResources: boolean;
+    resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+  }>;
+};
 
 export type CreateProjectMutationVariables = Exact<{
   projectId?: InputMaybe<Scalars['ID']>;
@@ -2709,8 +4442,17 @@ export type CreateProjectMutationVariables = Exact<{
   description?: InputMaybe<Scalars['String']>;
 }>;
 
-
-export type CreateProjectMutation = { project: { id: string, name: string, shared: boolean, global: boolean, description?: string, projectPermissions: Array<string>, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> } };
+export type CreateProjectMutation = {
+  project: {
+    id: string;
+    name: string;
+    shared: boolean;
+    global: boolean;
+    description?: string;
+    projectPermissions: Array<string>;
+    resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+  };
+};
 
 export type CreateResourceMutationVariables = Exact<{
   projectId: Scalars['String'];
@@ -2718,14 +4460,12 @@ export type CreateResourceMutationVariables = Exact<{
   isFolder: Scalars['Boolean'];
 }>;
 
-
 export type CreateResourceMutation = { rmCreateResource: string };
 
 export type DeleteProjectMutationVariables = Exact<{
   projectId: Scalars['ID'];
 }>;
 
-
 export type DeleteProjectMutation = { rmDeleteProject: boolean };
 
 export type DeleteResourceMutationVariables = Exact<{
@@ -2734,27 +4474,39 @@ export type DeleteResourceMutationVariables = Exact<{
   recursive: Scalars['Boolean'];
 }>;
 
-
 export type DeleteResourceMutation = { rmDeleteResource?: boolean };
 
 export type GetProjectQueryVariables = Exact<{
   projectId: Scalars['String'];
 }>;
 
-
-export type GetProjectQuery = { project: { id: string, name: string, shared: boolean, global: boolean, description?: string, projectPermissions: Array<string>, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> } };
+export type GetProjectQuery = {
+  project: {
+    id: string;
+    name: string;
+    shared: boolean;
+    global: boolean;
+    description?: string;
+    projectPermissions: Array<string>;
+    resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+  };
+};
 
 export type GetProjectGrantedPermissionsQueryVariables = Exact<{
   projectId: Scalars['String'];
 }>;
 
+export type GetProjectGrantedPermissionsQuery = {
+  grantedPermissions: Array<{
+    subjectId: string;
+    subjectType: AdminSubjectType;
+    objectPermissions: { objectId: string; permissions: Array<string> };
+  }>;
+};
 
-export type GetProjectGrantedPermissionsQuery = { grantedPermissions: Array<{ subjectId: string, subjectType: AdminSubjectType, objectPermissions: { objectId: string, permissions: Array<string> } }> };
+export type GetProjectPermissionsListQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetProjectPermissionsListQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetProjectPermissionsListQuery = { permissions: Array<{ id: string, label?: string, description?: string, category?: string }> };
+export type GetProjectPermissionsListQuery = { permissions: Array<{ id: string; label?: string; description?: string; category?: string }> };
 
 export type GetResourceListQueryVariables = Exact<{
   projectId: Scalars['String'];
@@ -2764,25 +4516,47 @@ export type GetResourceListQueryVariables = Exact<{
   readHistory?: InputMaybe<Scalars['Boolean']>;
 }>;
 
+export type GetResourceListQuery = { resources: Array<{ name: string; folder: boolean; length: number; properties?: any }> };
 
-export type GetResourceListQuery = { resources: Array<{ name: string, folder: boolean, length: number, properties?: any }> };
+export type GetResourceProjectListQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetResourceProjectListQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetResourceProjectListQuery = {
+  projects: Array<{
+    id: string;
+    name: string;
+    shared: boolean;
+    global: boolean;
+    description?: string;
+    projectPermissions: Array<string>;
+    resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+  }>;
+};
 
+export type GetSharedProjectsQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GetResourceProjectListQuery = { projects: Array<{ id: string, name: string, shared: boolean, global: boolean, description?: string, projectPermissions: Array<string>, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> }> };
-
-export type GetSharedProjectsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetSharedProjectsQuery = { projects: Array<{ id: string, name: string, shared: boolean, global: boolean, description?: string, projectPermissions: Array<string>, resourceTypes: Array<{ id: string, displayName: string, icon?: string, fileExtensions: Array<string>, rootFolder?: string }> }> };
+export type GetSharedProjectsQuery = {
+  projects: Array<{
+    id: string;
+    name: string;
+    shared: boolean;
+    global: boolean;
+    description?: string;
+    projectPermissions: Array<string>;
+    resourceTypes: Array<{ id: string; displayName: string; icon?: string; fileExtensions: Array<string>; rootFolder?: string }>;
+  }>;
+};
 
 export type GetSubjectProjectsPermissionsQueryVariables = Exact<{
   subjectId: Scalars['String'];
 }>;
 
-
-export type GetSubjectProjectsPermissionsQuery = { grantedPermissions: Array<{ subjectId: string, subjectType: AdminSubjectType, objectPermissions: { objectId: string, permissions: Array<string> } }> };
+export type GetSubjectProjectsPermissionsQuery = {
+  grantedPermissions: Array<{
+    subjectId: string;
+    subjectType: AdminSubjectType;
+    objectPermissions: { objectId: string; permissions: Array<string> };
+  }>;
+};
 
 export type MoveResourceMutationVariables = Exact<{
   projectId: Scalars['String'];
@@ -2790,7 +4564,6 @@ export type MoveResourceMutationVariables = Exact<{
   newPath: Scalars['String'];
 }>;
 
-
 export type MoveResourceMutation = { rmMoveResource: string };
 
 export type ReadResourceQueryVariables = Exact<{
@@ -2798,7 +4571,6 @@ export type ReadResourceQueryVariables = Exact<{
   resourcePath: Scalars['String'];
 }>;
 
-
 export type ReadResourceQuery = { value: string };
 
 export type SetProjectPermissionsMutationVariables = Exact<{
@@ -2806,7 +4578,6 @@ export type SetProjectPermissionsMutationVariables = Exact<{
   permissions: Array<RmSubjectProjectPermissions> | RmSubjectProjectPermissions;
 }>;
 
-
 export type SetProjectPermissionsMutation = { rmSetProjectPermissions: boolean };
 
 export type SetResourcePropertyMutationVariables = Exact<{
@@ -2816,7 +4587,6 @@ export type SetResourcePropertyMutationVariables = Exact<{
   value?: InputMaybe<Scalars['String']>;
 }>;
 
-
 export type SetResourcePropertyMutation = { properties: boolean };
 
 export type SetSubjectProjectsPermissionsMutationVariables = Exact<{
@@ -2824,7 +4594,6 @@ export type SetSubjectProjectsPermissionsMutationVariables = Exact<{
   permissions: Array<RmProjectPermissions> | RmProjectPermissions;
 }>;
 
-
 export type SetSubjectProjectsPermissionsMutation = { rmSetSubjectProjectPermissions: boolean };
 
 export type WriteResourceContentMutationVariables = Exact<{
@@ -2834,67 +4603,125 @@ export type WriteResourceContentMutationVariables = Exact<{
   forceOverwrite: Scalars['Boolean'];
 }>;
 
-
 export type WriteResourceContentMutation = { rmWriteResourceStringContent: string };
 
 export type ConfigureServerQueryVariables = Exact<{
   configuration: ServerConfigInput;
 }>;
 
-
 export type ConfigureServerQuery = { configureServer: boolean };
 
-export type ListFeatureSetsQueryVariables = Exact<{ [key: string]: never; }>;
+export type ListFeatureSetsQueryVariables = Exact<{ [key: string]: never }>;
 
-
-export type ListFeatureSetsQuery = { features: Array<{ id: string, label: string, description?: string, icon?: string, enabled: boolean }> };
+export type ListFeatureSetsQuery = { features: Array<{ id: string; label: string; description?: string; icon?: string; enabled: boolean }> };
 
 export type SetDefaultNavigatorSettingsQueryVariables = Exact<{
   settings: NavigatorSettingsInput;
 }>;
 
-
 export type SetDefaultNavigatorSettingsQuery = { setDefaultNavigatorSettings: boolean };
 
 export type ChangeSessionLanguageMutationVariables = Exact<{
   locale: Scalars['String'];
 }>;
 
-
 export type ChangeSessionLanguageMutation = { changeSessionLanguage?: boolean };
 
 export type OpenSessionMutationVariables = Exact<{
   defaultLocale?: InputMaybe<Scalars['String']>;
 }>;
 
-
-export type OpenSessionMutation = { session: { createTime: string, lastAccessTime: string, cacheExpired: boolean, locale: string, actionParameters?: any, valid: boolean, remainingTime: number } };
+export type OpenSessionMutation = {
+  session: {
+    createTime: string;
+    lastAccessTime: string;
+    cacheExpired: boolean;
+    locale: string;
+    actionParameters?: any;
+    valid: boolean;
+    remainingTime: number;
+  };
+};
 
 export type ReadSessionLogQueryVariables = Exact<{
   maxEntries: Scalars['Int'];
   clearEntries: Scalars['Boolean'];
 }>;
 
+export type ReadSessionLogQuery = { log: Array<{ time?: any; type: string; message?: string; stackTrace?: string }> };
 
-export type ReadSessionLogQuery = { log: Array<{ time?: any, type: string, message?: string, stackTrace?: string }> };
+export type ServerConfigQueryVariables = Exact<{ [key: string]: never }>;
 
-export type ServerConfigQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type ServerConfigQuery = { serverConfig: { name: string, version: string, workspaceId: string, serverURL: string, rootURI: string, containerId: string, defaultAuthRole?: string, productConfiguration: any, supportsCustomConnections: boolean, supportsConnectionBrowser: boolean, supportsWorkspaces: boolean, sessionExpireTime: number, anonymousAccessEnabled: boolean, adminCredentialsSaveEnabled: boolean, publicCredentialsSaveEnabled: boolean, resourceManagerEnabled: boolean, licenseRequired: boolean, licenseValid: boolean, configurationMode: boolean, developmentMode: boolean, redirectOnFederatedAuth: boolean, distributed: boolean, enabledFeatures: Array<string>, enabledAuthProviders: Array<string>, resourceQuotas: any, disabledDrivers: Array<string>, supportedLanguages: Array<{ isoCode: string, displayName?: string, nativeName?: string }>, defaultNavigatorSettings: { showSystemObjects: boolean, showUtilityObjects: boolean, showOnlyEntities: boolean, mergeEntities: boolean, hideFolders: boolean, hideSchemas: boolean, hideVirtualModel: boolean }, productInfo: { id: string, version: string, latestVersionInfo?: string, name: string, description?: string, buildTime: string, releaseTime: string, licenseInfo?: string } } };
-
-export type SessionPermissionsQueryVariables = Exact<{ [key: string]: never; }>;
+export type ServerConfigQuery = {
+  serverConfig: {
+    name: string;
+    version: string;
+    workspaceId: string;
+    serverURL: string;
+    rootURI: string;
+    containerId: string;
+    defaultAuthRole?: string;
+    productConfiguration: any;
+    supportsCustomConnections: boolean;
+    supportsConnectionBrowser: boolean;
+    supportsWorkspaces: boolean;
+    sessionExpireTime: number;
+    anonymousAccessEnabled: boolean;
+    adminCredentialsSaveEnabled: boolean;
+    publicCredentialsSaveEnabled: boolean;
+    resourceManagerEnabled: boolean;
+    licenseRequired: boolean;
+    licenseValid: boolean;
+    configurationMode: boolean;
+    developmentMode: boolean;
+    redirectOnFederatedAuth: boolean;
+    distributed: boolean;
+    enabledFeatures: Array<string>;
+    enabledAuthProviders: Array<string>;
+    resourceQuotas: any;
+    disabledDrivers: Array<string>;
+    supportedLanguages: Array<{ isoCode: string; displayName?: string; nativeName?: string }>;
+    defaultNavigatorSettings: {
+      showSystemObjects: boolean;
+      showUtilityObjects: boolean;
+      showOnlyEntities: boolean;
+      mergeEntities: boolean;
+      hideFolders: boolean;
+      hideSchemas: boolean;
+      hideVirtualModel: boolean;
+    };
+    productInfo: {
+      id: string;
+      version: string;
+      latestVersionInfo?: string;
+      name: string;
+      description?: string;
+      buildTime: string;
+      releaseTime: string;
+      licenseInfo?: string;
+    };
+  };
+};
 
+export type SessionPermissionsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type SessionPermissionsQuery = { permissions: Array<string> };
 
-export type SessionStateQueryVariables = Exact<{ [key: string]: never; }>;
+export type SessionStateQueryVariables = Exact<{ [key: string]: never }>;
 
+export type SessionStateQuery = {
+  sessionState: {
+    createTime: string;
+    lastAccessTime: string;
+    cacheExpired: boolean;
+    locale: string;
+    actionParameters?: any;
+    valid: boolean;
+    remainingTime: number;
+  };
+};
 
-export type SessionStateQuery = { sessionState: { createTime: string, lastAccessTime: string, cacheExpired: boolean, locale: string, actionParameters?: any, valid: boolean, remainingTime: number } };
-
-export type TouchSessionMutationVariables = Exact<{ [key: string]: never; }>;
-
+export type TouchSessionMutationVariables = Exact<{ [key: string]: never }>;
 
 export type TouchSessionMutation = { touchSession?: boolean };
 
@@ -2904,7 +4731,6 @@ export type FormatSqlQueryQueryVariables = Exact<{
   query: Scalars['String'];
 }>;
 
-
 export type FormatSqlQueryQuery = { query: string };
 
 export type ParseSqlQueryQueryVariables = Exact<{
@@ -2913,16 +4739,14 @@ export type ParseSqlQueryQueryVariables = Exact<{
   position: Scalars['Int'];
 }>;
 
-
-export type ParseSqlQueryQuery = { queryInfo: { start: number, end: number } };
+export type ParseSqlQueryQuery = { queryInfo: { start: number; end: number } };
 
 export type ParseSqlScriptQueryVariables = Exact<{
   connectionId: Scalars['ID'];
   script: Scalars['String'];
 }>;
 
-
-export type ParseSqlScriptQuery = { scriptInfo: { queries: Array<{ start: number, end: number }> } };
+export type ParseSqlScriptQuery = { scriptInfo: { queries: Array<{ start: number; end: number }> } };
 
 export type QuerySqlCompletionProposalsQueryVariables = Exact<{
   connectionId: Scalars['ID'];
@@ -2933,22 +4757,47 @@ export type QuerySqlCompletionProposalsQueryVariables = Exact<{
   maxResults?: InputMaybe<Scalars['Int']>;
 }>;
 
-
-export type QuerySqlCompletionProposalsQuery = { proposals?: Array<{ cursorPosition?: number, displayString: string, icon?: string, nodePath?: string, replacementLength: number, replacementOffset: number, replacementString: string, score?: number, type: string }> };
+export type QuerySqlCompletionProposalsQuery = {
+  proposals?: Array<{
+    cursorPosition?: number;
+    displayString: string;
+    icon?: string;
+    nodePath?: string;
+    replacementLength: number;
+    replacementOffset: number;
+    replacementString: string;
+    score?: number;
+    type: string;
+  }>;
+};
 
 export type QuerySqlDialectInfoQueryVariables = Exact<{
   connectionId: Scalars['ID'];
 }>;
 
-
-export type QuerySqlDialectInfoQuery = { dialect?: { name: string, dataTypes: Array<string>, functions: Array<string>, reservedWords: Array<string>, quoteStrings: Array<Array<string>>, singleLineComments: Array<string>, multiLineComments: Array<Array<string>>, catalogSeparator?: string, structSeparator?: string, scriptDelimiter?: string, supportsExplainExecutionPlan: boolean } };
+export type QuerySqlDialectInfoQuery = {
+  dialect?: {
+    name: string;
+    dataTypes: Array<string>;
+    functions: Array<string>;
+    reservedWords: Array<string>;
+    quoteStrings: Array<Array<string>>;
+    singleLineComments: Array<string>;
+    multiLineComments: Array<Array<string>>;
+    catalogSeparator?: string;
+    structSeparator?: string;
+    scriptDelimiter?: string;
+    supportsExplainExecutionPlan: boolean;
+  };
+};
 
 export type SqlEntityQueryGeneratorsQueryVariables = Exact<{
   nodePathList: Array<Scalars['String']> | Scalars['String'];
 }>;
 
-
-export type SqlEntityQueryGeneratorsQuery = { generators: Array<{ id: string, label: string, description?: string, order: number, multiObject: boolean }> };
+export type SqlEntityQueryGeneratorsQuery = {
+  generators: Array<{ id: string; label: string; description?: string; order: number; multiObject: boolean }>;
+};
 
 export type SqlGenerateEntityQueryQueryVariables = Exact<{
   generatorId: Scalars['String'];
@@ -2956,7 +4805,6 @@ export type SqlGenerateEntityQueryQueryVariables = Exact<{
   nodePathList: Array<Scalars['String']> | Scalars['String'];
 }>;
 
-
 export type SqlGenerateEntityQueryQuery = { sqlGenerateEntityQuery: string };
 
 export const AdminObjectGrantInfoFragmentDoc = `
@@ -4690,400 +6538,1307 @@ export const SqlGenerateEntityQueryDocument = `
 }
     `;
 
-export type SdkFunctionWrapper = <T>(action: (requestHeaders?:Record<string, string>) => Promise<T>, operationName: string, operationType?: string) => Promise<T>;
-
+export type SdkFunctionWrapper = <T>(
+  action: (requestHeaders?: Record<string, string>) => Promise<T>,
+  operationName: string,
+  operationType?: string,
+) => Promise<T>;
 
 const defaultWrapper: SdkFunctionWrapper = (action, _operationName, _operationType) => action();
 
 export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper = defaultWrapper) {
   return {
-    getPermissionsList(variables?: GetPermissionsListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetPermissionsListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetPermissionsListQuery>(GetPermissionsListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getPermissionsList', 'query');
+    getPermissionsList(variables?: GetPermissionsListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetPermissionsListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetPermissionsListQuery>(GetPermissionsListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getPermissionsList',
+        'query',
+      );
+    },
+    setSubjectPermissions(
+      variables: SetSubjectPermissionsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetSubjectPermissionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetSubjectPermissionsQuery>(SetSubjectPermissionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setSubjectPermissions',
+        'query',
+      );
+    },
+    asyncTaskCancel(variables: AsyncTaskCancelMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<AsyncTaskCancelMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<AsyncTaskCancelMutation>(AsyncTaskCancelDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'asyncTaskCancel',
+        'mutation',
+      );
+    },
+    authChangeLocalPassword(
+      variables: AuthChangeLocalPasswordQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<AuthChangeLocalPasswordQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<AuthChangeLocalPasswordQuery>(AuthChangeLocalPasswordDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'authChangeLocalPassword',
+        'query',
+      );
+    },
+    authLogin(variables: AuthLoginQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<AuthLoginQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<AuthLoginQuery>(AuthLoginDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'authLogin',
+        'query',
+      );
+    },
+    authLogout(variables?: AuthLogoutQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<AuthLogoutQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<AuthLogoutQuery>(AuthLogoutDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'authLogout',
+        'query',
+      );
+    },
+    deleteAuthProviderConfiguration(
+      variables: DeleteAuthProviderConfigurationQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<DeleteAuthProviderConfigurationQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteAuthProviderConfigurationQuery>(DeleteAuthProviderConfigurationDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'deleteAuthProviderConfiguration',
+        'query',
+      );
+    },
+    getActiveUser(variables: GetActiveUserQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetActiveUserQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetActiveUserQuery>(GetActiveUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getActiveUser',
+        'query',
+      );
+    },
+    getAuthProviderConfigurationParameters(
+      variables: GetAuthProviderConfigurationParametersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetAuthProviderConfigurationParametersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAuthProviderConfigurationParametersQuery>(GetAuthProviderConfigurationParametersDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getAuthProviderConfigurationParameters',
+        'query',
+      );
+    },
+    getAuthProviderConfigurations(
+      variables?: GetAuthProviderConfigurationsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetAuthProviderConfigurationsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAuthProviderConfigurationsQuery>(GetAuthProviderConfigurationsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getAuthProviderConfigurations',
+        'query',
+      );
+    },
+    getAuthProviders(variables?: GetAuthProvidersQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetAuthProvidersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAuthProvidersQuery>(GetAuthProvidersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getAuthProviders',
+        'query',
+      );
+    },
+    getAuthRoles(variables?: GetAuthRolesQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetAuthRolesQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<GetAuthRolesQuery>(GetAuthRolesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getAuthRoles',
+        'query',
+      );
+    },
+    getAuthStatus(variables: GetAuthStatusQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetAuthStatusQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAuthStatusQuery>(GetAuthStatusDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getAuthStatus',
+        'query',
+      );
+    },
+    getUserProfileProperties(
+      variables?: GetUserProfilePropertiesQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetUserProfilePropertiesQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetUserProfilePropertiesQuery>(GetUserProfilePropertiesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getUserProfileProperties',
+        'query',
+      );
+    },
+    saveAuthProviderConfiguration(
+      variables: SaveAuthProviderConfigurationQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SaveAuthProviderConfigurationQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SaveAuthProviderConfigurationQuery>(SaveAuthProviderConfigurationDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'saveAuthProviderConfiguration',
+        'query',
+      );
+    },
+    saveUserMetaParameters(
+      variables: SaveUserMetaParametersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SaveUserMetaParametersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SaveUserMetaParametersQuery>(SaveUserMetaParametersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'saveUserMetaParameters',
+        'query',
+      );
+    },
+    createTeam(variables: CreateTeamQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CreateTeamQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<CreateTeamQuery>(CreateTeamDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createTeam',
+        'query',
+      );
+    },
+    deleteTeam(variables: DeleteTeamQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DeleteTeamQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<DeleteTeamQuery>(DeleteTeamDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteTeam',
+        'query',
+      );
+    },
+    getTeamGrantedUsers(
+      variables: GetTeamGrantedUsersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetTeamGrantedUsersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetTeamGrantedUsersQuery>(GetTeamGrantedUsersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getTeamGrantedUsers',
+        'query',
+      );
+    },
+    getTeamMetaParameters(
+      variables?: GetTeamMetaParametersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetTeamMetaParametersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetTeamMetaParametersQuery>(GetTeamMetaParametersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getTeamMetaParameters',
+        'query',
+      );
+    },
+    getTeamsList(variables: GetTeamsListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetTeamsListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<GetTeamsListQuery>(GetTeamsListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getTeamsList',
+        'query',
+      );
+    },
+    saveTeamMetaParameters(
+      variables: SaveTeamMetaParametersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SaveTeamMetaParametersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SaveTeamMetaParametersQuery>(SaveTeamMetaParametersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'saveTeamMetaParameters',
+        'query',
+      );
+    },
+    updateTeam(variables: UpdateTeamQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<UpdateTeamQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<UpdateTeamQuery>(UpdateTeamDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'updateTeam',
+        'query',
+      );
+    },
+    createUser(variables: CreateUserQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CreateUserQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<CreateUserQuery>(CreateUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createUser',
+        'query',
+      );
+    },
+    deleteUser(variables: DeleteUserQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DeleteUserQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<DeleteUserQuery>(DeleteUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteUser',
+        'query',
+      );
+    },
+    deleteUserMetaParameter(
+      variables: DeleteUserMetaParameterQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<DeleteUserMetaParameterQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteUserMetaParameterQuery>(DeleteUserMetaParameterDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteUserMetaParameter',
+        'query',
+      );
+    },
+    enableUser(variables: EnableUserQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<EnableUserQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<EnableUserQuery>(EnableUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'enableUser',
+        'query',
+      );
+    },
+    getUserGrantedConnections(
+      variables: GetUserGrantedConnectionsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetUserGrantedConnectionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetUserGrantedConnectionsQuery>(GetUserGrantedConnectionsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getUserGrantedConnections',
+        'query',
+      );
+    },
+    getUsersList(variables: GetUsersListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetUsersListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<GetUsersListQuery>(GetUsersListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getUsersList',
+        'query',
+      );
+    },
+    grantUserTeam(variables: GrantUserTeamQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GrantUserTeamQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GrantUserTeamQuery>(GrantUserTeamDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'grantUserTeam',
+        'query',
+      );
+    },
+    revokeUserTeam(variables: RevokeUserTeamQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<RevokeUserTeamQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<RevokeUserTeamQuery>(RevokeUserTeamDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'revokeUserTeam',
+        'query',
+      );
+    },
+    setConnections(variables: SetConnectionsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SetConnectionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetConnectionsQuery>(SetConnectionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setConnections',
+        'query',
+      );
+    },
+    setUserAuthRole(variables: SetUserAuthRoleQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SetUserAuthRoleQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetUserAuthRoleQuery>(SetUserAuthRoleDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setUserAuthRole',
+        'query',
+      );
+    },
+    setUserConfigurationParameter(
+      variables: SetUserConfigurationParameterMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetUserConfigurationParameterMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetUserConfigurationParameterMutation>(SetUserConfigurationParameterDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'setUserConfigurationParameter',
+        'mutation',
+      );
+    },
+    setUserCredentials(variables: SetUserCredentialsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SetUserCredentialsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetUserCredentialsQuery>(SetUserCredentialsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setUserCredentials',
+        'query',
+      );
+    },
+    setUserMetaParameter(
+      variables: SetUserMetaParameterQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetUserMetaParameterQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetUserMetaParameterQuery>(SetUserMetaParameterDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setUserMetaParameter',
+        'query',
+      );
+    },
+    updateUserProfileProperties(
+      variables: UpdateUserProfilePropertiesQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<UpdateUserProfilePropertiesQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<UpdateUserProfilePropertiesQuery>(UpdateUserProfilePropertiesDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'updateUserProfileProperties',
+        'query',
+      );
+    },
+    getConnectionAccess(
+      variables: GetConnectionAccessQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetConnectionAccessQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetConnectionAccessQuery>(GetConnectionAccessDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getConnectionAccess',
+        'query',
+      );
+    },
+    getSubjectConnectionAccess(
+      variables: GetSubjectConnectionAccessQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetSubjectConnectionAccessQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetSubjectConnectionAccessQuery>(GetSubjectConnectionAccessDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getSubjectConnectionAccess',
+        'query',
+      );
+    },
+    searchDatabases(variables: SearchDatabasesQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SearchDatabasesQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SearchDatabasesQuery>(SearchDatabasesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'searchDatabases',
+        'query',
+      );
+    },
+    setConnectionAccess(
+      variables: SetConnectionAccessQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetConnectionAccessQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetConnectionAccessQuery>(SetConnectionAccessDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setConnectionAccess',
+        'query',
+      );
+    },
+    setSubjectConnectionAccess(
+      variables: SetSubjectConnectionAccessQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetSubjectConnectionAccessQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetSubjectConnectionAccessQuery>(SetSubjectConnectionAccessDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'setSubjectConnectionAccess',
+        'query',
+      );
+    },
+    closeConnection(variables: CloseConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CloseConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CloseConnectionMutation>(CloseConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'closeConnection',
+        'mutation',
+      );
+    },
+    createConnection(variables: CreateConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CreateConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateConnectionMutation>(CreateConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createConnection',
+        'mutation',
+      );
+    },
+    createConnectionFolder(
+      variables: CreateConnectionFolderMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<CreateConnectionFolderMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateConnectionFolderMutation>(CreateConnectionFolderDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createConnectionFolder',
+        'mutation',
+      );
+    },
+    createConnectionFromNode(
+      variables: CreateConnectionFromNodeMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<CreateConnectionFromNodeMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateConnectionFromNodeMutation>(CreateConnectionFromNodeDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'createConnectionFromNode',
+        'mutation',
+      );
+    },
+    createConnectionFromTemplate(
+      variables: CreateConnectionFromTemplateMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<CreateConnectionFromTemplateMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateConnectionFromTemplateMutation>(CreateConnectionFromTemplateDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'createConnectionFromTemplate',
+        'mutation',
+      );
+    },
+    deleteConnection(variables: DeleteConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DeleteConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteConnectionMutation>(DeleteConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteConnection',
+        'mutation',
+      );
+    },
+    deleteConnectionFolder(
+      variables: DeleteConnectionFolderMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<DeleteConnectionFolderMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteConnectionFolderMutation>(DeleteConnectionFolderDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteConnectionFolder',
+        'mutation',
+      );
+    },
+    driverList(variables: DriverListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DriverListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<DriverListQuery>(DriverListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'driverList',
+        'query',
+      );
+    },
+    executionContextCreate(
+      variables: ExecutionContextCreateMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExecutionContextCreateMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExecutionContextCreateMutation>(ExecutionContextCreateDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'executionContextCreate',
+        'mutation',
+      );
+    },
+    executionContextDestroy(
+      variables: ExecutionContextDestroyMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExecutionContextDestroyMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExecutionContextDestroyMutation>(ExecutionContextDestroyDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'executionContextDestroy',
+        'mutation',
+      );
+    },
+    executionContextList(
+      variables?: ExecutionContextListQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExecutionContextListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExecutionContextListQuery>(ExecutionContextListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'executionContextList',
+        'query',
+      );
+    },
+    executionContextUpdate(
+      variables: ExecutionContextUpdateMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExecutionContextUpdateMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExecutionContextUpdateMutation>(ExecutionContextUpdateDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'executionContextUpdate',
+        'mutation',
+      );
+    },
+    getAuthModels(variables?: GetAuthModelsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetAuthModelsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAuthModelsQuery>(GetAuthModelsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getAuthModels',
+        'query',
+      );
+    },
+    getConnectionFolders(
+      variables?: GetConnectionFoldersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetConnectionFoldersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetConnectionFoldersQuery>(GetConnectionFoldersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getConnectionFolders',
+        'query',
+      );
+    },
+    getTemplateConnections(
+      variables: GetTemplateConnectionsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetTemplateConnectionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetTemplateConnectionsQuery>(GetTemplateConnectionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getTemplateConnections',
+        'query',
+      );
+    },
+    getUserConnections(variables: GetUserConnectionsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetUserConnectionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetUserConnectionsQuery>(GetUserConnectionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getUserConnections',
+        'query',
+      );
+    },
+    initConnection(variables: InitConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<InitConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<InitConnectionMutation>(InitConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'initConnection',
+        'mutation',
+      );
+    },
+    refreshSessionConnections(
+      variables?: RefreshSessionConnectionsMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<RefreshSessionConnectionsMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<RefreshSessionConnectionsMutation>(RefreshSessionConnectionsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'refreshSessionConnections',
+        'mutation',
+      );
+    },
+    setConnectionNavigatorSettings(
+      variables: SetConnectionNavigatorSettingsMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetConnectionNavigatorSettingsMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetConnectionNavigatorSettingsMutation>(SetConnectionNavigatorSettingsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'setConnectionNavigatorSettings',
+        'mutation',
+      );
+    },
+    testConnection(variables: TestConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<TestConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<TestConnectionMutation>(TestConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'testConnection',
+        'mutation',
+      );
+    },
+    testNetworkHandler(
+      variables: TestNetworkHandlerMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<TestNetworkHandlerMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<TestNetworkHandlerMutation>(TestNetworkHandlerDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'testNetworkHandler',
+        'mutation',
+      );
+    },
+    updateConnection(variables: UpdateConnectionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<UpdateConnectionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<UpdateConnectionMutation>(UpdateConnectionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'updateConnection',
+        'mutation',
+      );
+    },
+    exportDataFromContainer(
+      variables: ExportDataFromContainerQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExportDataFromContainerQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExportDataFromContainerQuery>(ExportDataFromContainerDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'exportDataFromContainer',
+        'query',
+      );
+    },
+    exportDataFromResults(
+      variables: ExportDataFromResultsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ExportDataFromResultsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ExportDataFromResultsQuery>(ExportDataFromResultsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'exportDataFromResults',
+        'query',
+      );
+    },
+    getDataTransferDefaultParameters(
+      variables?: GetDataTransferDefaultParametersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetDataTransferDefaultParametersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetDataTransferDefaultParametersQuery>(GetDataTransferDefaultParametersDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getDataTransferDefaultParameters',
+        'query',
+      );
+    },
+    getDataTransferProcessors(
+      variables?: GetDataTransferProcessorsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetDataTransferProcessorsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetDataTransferProcessorsQuery>(GetDataTransferProcessorsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getDataTransferProcessors',
+        'query',
+      );
+    },
+    removeDataTransferFile(
+      variables: RemoveDataTransferFileQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<RemoveDataTransferFileQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<RemoveDataTransferFileQuery>(RemoveDataTransferFileDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'removeDataTransferFile',
+        'query',
+      );
+    },
+    navGetStructContainers(
+      variables: NavGetStructContainersQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<NavGetStructContainersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<NavGetStructContainersQuery>(NavGetStructContainersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navGetStructContainers',
+        'query',
+      );
+    },
+    getAsyncTaskInfo(variables: GetAsyncTaskInfoMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetAsyncTaskInfoMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetAsyncTaskInfoMutation>(GetAsyncTaskInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getAsyncTaskInfo',
+        'mutation',
+      );
+    },
+    getNetworkHandlers(variables?: GetNetworkHandlersQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetNetworkHandlersQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetNetworkHandlersQuery>(GetNetworkHandlersDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getNetworkHandlers',
+        'query',
+      );
+    },
+    asyncReadDataFromContainer(
+      variables: AsyncReadDataFromContainerMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<AsyncReadDataFromContainerMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<AsyncReadDataFromContainerMutation>(AsyncReadDataFromContainerDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'asyncReadDataFromContainer',
+        'mutation',
+      );
+    },
+    asyncSqlExecuteQuery(
+      variables: AsyncSqlExecuteQueryMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<AsyncSqlExecuteQueryMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<AsyncSqlExecuteQueryMutation>(AsyncSqlExecuteQueryDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'asyncSqlExecuteQuery',
+        'mutation',
+      );
+    },
+    asyncSqlExplainExecutionPlan(
+      variables: AsyncSqlExplainExecutionPlanMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<AsyncSqlExplainExecutionPlanMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<AsyncSqlExplainExecutionPlanMutation>(AsyncSqlExplainExecutionPlanDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'asyncSqlExplainExecutionPlan',
+        'mutation',
+      );
+    },
+    closeResult(variables: CloseResultMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CloseResultMutation> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<CloseResultMutation>(CloseResultDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'closeResult',
+        'mutation',
+      );
+    },
+    getResultsetDataURL(
+      variables: GetResultsetDataUrlMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetResultsetDataUrlMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetResultsetDataUrlMutation>(GetResultsetDataUrlDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getResultsetDataURL',
+        'mutation',
+      );
+    },
+    getResultsetGroupingQuery(
+      variables: GetResultsetGroupingQueryQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetResultsetGroupingQueryQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetResultsetGroupingQueryQuery>(GetResultsetGroupingQueryDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getResultsetGroupingQuery',
+        'query',
+      );
+    },
+    getSqlExecuteTaskResults(
+      variables: GetSqlExecuteTaskResultsMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetSqlExecuteTaskResultsMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetSqlExecuteTaskResultsMutation>(GetSqlExecuteTaskResultsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getSqlExecuteTaskResults',
+        'mutation',
+      );
+    },
+    getSqlExecutionPlanResult(
+      variables: GetSqlExecutionPlanResultMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetSqlExecutionPlanResultMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetSqlExecutionPlanResultMutation>(GetSqlExecutionPlanResultDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getSqlExecutionPlanResult',
+        'mutation',
+      );
+    },
+    updateResultsDataBatch(
+      variables: UpdateResultsDataBatchMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<UpdateResultsDataBatchMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<UpdateResultsDataBatchMutation>(UpdateResultsDataBatchDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'updateResultsDataBatch',
+        'mutation',
+      );
+    },
+    updateResultsDataBatchScript(
+      variables: UpdateResultsDataBatchScriptMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<UpdateResultsDataBatchScriptMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<UpdateResultsDataBatchScriptMutation>(UpdateResultsDataBatchScriptDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'updateResultsDataBatchScript',
+        'mutation',
+      );
+    },
+    metadataGetNodeDDL(variables: MetadataGetNodeDdlQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<MetadataGetNodeDdlQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<MetadataGetNodeDdlQuery>(MetadataGetNodeDdlDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'metadataGetNodeDDL',
+        'query',
+      );
+    },
+    metadataGetNodeExtendedDDL(
+      variables: MetadataGetNodeExtendedDdlQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<MetadataGetNodeExtendedDdlQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<MetadataGetNodeExtendedDdlQuery>(MetadataGetNodeExtendedDdlDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'metadataGetNodeExtendedDDL',
+        'query',
+      );
+    },
+    getChildrenDBObjectInfo(
+      variables: GetChildrenDbObjectInfoQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetChildrenDbObjectInfoQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetChildrenDbObjectInfoQuery>(GetChildrenDbObjectInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getChildrenDBObjectInfo',
+        'query',
+      );
+    },
+    getDBObjectInfo(variables: GetDbObjectInfoQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetDbObjectInfoQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetDbObjectInfoQuery>(GetDbObjectInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getDBObjectInfo',
+        'query',
+      );
+    },
+    getNavNodeFullName(variables: GetNavNodeFullNameQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetNavNodeFullNameQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetNavNodeFullNameQuery>(GetNavNodeFullNameDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getNavNodeFullName',
+        'query',
+      );
+    },
+    getNodeParents(variables: GetNodeParentsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetNodeParentsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetNodeParentsQuery>(GetNodeParentsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getNodeParents',
+        'query',
+      );
+    },
+    navDeleteNodes(variables: NavDeleteNodesMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavDeleteNodesMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<NavDeleteNodesMutation>(NavDeleteNodesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navDeleteNodes',
+        'mutation',
+      );
+    },
+    navMoveTo(variables: NavMoveToMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavMoveToMutation> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<NavMoveToMutation>(NavMoveToDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navMoveTo',
+        'mutation',
+      );
+    },
+    navNodeChildren(variables: NavNodeChildrenQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavNodeChildrenQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<NavNodeChildrenQuery>(NavNodeChildrenDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navNodeChildren',
+        'query',
+      );
+    },
+    navNodeInfo(variables: NavNodeInfoQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavNodeInfoQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<NavNodeInfoQuery>(NavNodeInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navNodeInfo',
+        'query',
+      );
+    },
+    navRefreshNode(variables: NavRefreshNodeQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavRefreshNodeQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<NavRefreshNodeQuery>(NavRefreshNodeDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navRefreshNode',
+        'query',
+      );
+    },
+    navRenameNode(variables: NavRenameNodeMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<NavRenameNodeMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<NavRenameNodeMutation>(NavRenameNodeDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'navRenameNode',
+        'mutation',
+      );
+    },
+    getProjectList(variables?: GetProjectListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetProjectListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetProjectListQuery>(GetProjectListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getProjectList',
+        'query',
+      );
+    },
+    createProject(variables: CreateProjectMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CreateProjectMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateProjectMutation>(CreateProjectDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createProject',
+        'mutation',
+      );
+    },
+    createResource(variables: CreateResourceMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<CreateResourceMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<CreateResourceMutation>(CreateResourceDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'createResource',
+        'mutation',
+      );
+    },
+    deleteProject(variables: DeleteProjectMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DeleteProjectMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteProjectMutation>(DeleteProjectDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteProject',
+        'mutation',
+      );
+    },
+    deleteResource(variables: DeleteResourceMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<DeleteResourceMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<DeleteResourceMutation>(DeleteResourceDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'deleteResource',
+        'mutation',
+      );
+    },
+    getProject(variables: GetProjectQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetProjectQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<GetProjectQuery>(GetProjectDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getProject',
+        'query',
+      );
+    },
+    getProjectGrantedPermissions(
+      variables: GetProjectGrantedPermissionsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetProjectGrantedPermissionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetProjectGrantedPermissionsQuery>(GetProjectGrantedPermissionsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getProjectGrantedPermissions',
+        'query',
+      );
+    },
+    getProjectPermissionsList(
+      variables?: GetProjectPermissionsListQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetProjectPermissionsListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetProjectPermissionsListQuery>(GetProjectPermissionsListDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getProjectPermissionsList',
+        'query',
+      );
+    },
+    getResourceList(variables: GetResourceListQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetResourceListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetResourceListQuery>(GetResourceListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getResourceList',
+        'query',
+      );
+    },
+    getResourceProjectList(
+      variables?: GetResourceProjectListQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetResourceProjectListQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetResourceProjectListQuery>(GetResourceProjectListDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getResourceProjectList',
+        'query',
+      );
+    },
+    getSharedProjects(variables?: GetSharedProjectsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<GetSharedProjectsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetSharedProjectsQuery>(GetSharedProjectsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'getSharedProjects',
+        'query',
+      );
+    },
+    getSubjectProjectsPermissions(
+      variables: GetSubjectProjectsPermissionsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<GetSubjectProjectsPermissionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<GetSubjectProjectsPermissionsQuery>(GetSubjectProjectsPermissionsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'getSubjectProjectsPermissions',
+        'query',
+      );
+    },
+    moveResource(variables: MoveResourceMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<MoveResourceMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<MoveResourceMutation>(MoveResourceDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'moveResource',
+        'mutation',
+      );
+    },
+    readResource(variables: ReadResourceQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ReadResourceQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<ReadResourceQuery>(ReadResourceDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'readResource',
+        'query',
+      );
+    },
+    setProjectPermissions(
+      variables: SetProjectPermissionsMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetProjectPermissionsMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetProjectPermissionsMutation>(SetProjectPermissionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setProjectPermissions',
+        'mutation',
+      );
+    },
+    setResourceProperty(
+      variables: SetResourcePropertyMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetResourcePropertyMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetResourcePropertyMutation>(SetResourcePropertyDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'setResourceProperty',
+        'mutation',
+      );
+    },
+    setSubjectProjectsPermissions(
+      variables: SetSubjectProjectsPermissionsMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetSubjectProjectsPermissionsMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetSubjectProjectsPermissionsMutation>(SetSubjectProjectsPermissionsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'setSubjectProjectsPermissions',
+        'mutation',
+      );
+    },
+    writeResourceContent(
+      variables: WriteResourceContentMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<WriteResourceContentMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<WriteResourceContentMutation>(WriteResourceContentDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'writeResourceContent',
+        'mutation',
+      );
+    },
+    configureServer(variables: ConfigureServerQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ConfigureServerQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ConfigureServerQuery>(ConfigureServerDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'configureServer',
+        'query',
+      );
+    },
+    listFeatureSets(variables?: ListFeatureSetsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ListFeatureSetsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ListFeatureSetsQuery>(ListFeatureSetsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'listFeatureSets',
+        'query',
+      );
+    },
+    setDefaultNavigatorSettings(
+      variables: SetDefaultNavigatorSettingsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SetDefaultNavigatorSettingsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SetDefaultNavigatorSettingsQuery>(SetDefaultNavigatorSettingsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'setDefaultNavigatorSettings',
+        'query',
+      );
+    },
+    changeSessionLanguage(
+      variables: ChangeSessionLanguageMutationVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<ChangeSessionLanguageMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ChangeSessionLanguageMutation>(ChangeSessionLanguageDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'changeSessionLanguage',
+        'mutation',
+      );
+    },
+    openSession(variables?: OpenSessionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<OpenSessionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<OpenSessionMutation>(OpenSessionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'openSession',
+        'mutation',
+      );
+    },
+    readSessionLog(variables: ReadSessionLogQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ReadSessionLogQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ReadSessionLogQuery>(ReadSessionLogDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'readSessionLog',
+        'query',
+      );
+    },
+    serverConfig(variables?: ServerConfigQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ServerConfigQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<ServerConfigQuery>(ServerConfigDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'serverConfig',
+        'query',
+      );
+    },
+    sessionPermissions(variables?: SessionPermissionsQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SessionPermissionsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SessionPermissionsQuery>(SessionPermissionsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'sessionPermissions',
+        'query',
+      );
+    },
+    sessionState(variables?: SessionStateQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<SessionStateQuery> {
+      return withWrapper(
+        wrappedRequestHeaders => client.request<SessionStateQuery>(SessionStateDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'sessionState',
+        'query',
+      );
+    },
+    touchSession(variables?: TouchSessionMutationVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<TouchSessionMutation> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<TouchSessionMutation>(TouchSessionDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'touchSession',
+        'mutation',
+      );
+    },
+    formatSqlQuery(variables: FormatSqlQueryQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<FormatSqlQueryQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<FormatSqlQueryQuery>(FormatSqlQueryDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'formatSqlQuery',
+        'query',
+      );
+    },
+    parseSQLQuery(variables: ParseSqlQueryQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ParseSqlQueryQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ParseSqlQueryQuery>(ParseSqlQueryDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'parseSQLQuery',
+        'query',
+      );
+    },
+    parseSQLScript(variables: ParseSqlScriptQueryVariables, requestHeaders?: Dom.RequestInit['headers']): Promise<ParseSqlScriptQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<ParseSqlScriptQuery>(ParseSqlScriptDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'parseSQLScript',
+        'query',
+      );
+    },
+    querySqlCompletionProposals(
+      variables: QuerySqlCompletionProposalsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<QuerySqlCompletionProposalsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<QuerySqlCompletionProposalsQuery>(QuerySqlCompletionProposalsDocument, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        'querySqlCompletionProposals',
+        'query',
+      );
+    },
+    querySqlDialectInfo(
+      variables: QuerySqlDialectInfoQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<QuerySqlDialectInfoQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<QuerySqlDialectInfoQuery>(QuerySqlDialectInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'querySqlDialectInfo',
+        'query',
+      );
+    },
+    sqlEntityQueryGenerators(
+      variables: SqlEntityQueryGeneratorsQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SqlEntityQueryGeneratorsQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SqlEntityQueryGeneratorsQuery>(SqlEntityQueryGeneratorsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'sqlEntityQueryGenerators',
+        'query',
+      );
+    },
+    sqlGenerateEntityQuery(
+      variables: SqlGenerateEntityQueryQueryVariables,
+      requestHeaders?: Dom.RequestInit['headers'],
+    ): Promise<SqlGenerateEntityQueryQuery> {
+      return withWrapper(
+        wrappedRequestHeaders =>
+          client.request<SqlGenerateEntityQueryQuery>(SqlGenerateEntityQueryDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }),
+        'sqlGenerateEntityQuery',
+        'query',
+      );
     },
-    setSubjectPermissions(variables: SetSubjectPermissionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetSubjectPermissionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetSubjectPermissionsQuery>(SetSubjectPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setSubjectPermissions', 'query');
-    },
-    asyncTaskCancel(variables: AsyncTaskCancelMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AsyncTaskCancelMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AsyncTaskCancelMutation>(AsyncTaskCancelDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'asyncTaskCancel', 'mutation');
-    },
-    authChangeLocalPassword(variables: AuthChangeLocalPasswordQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AuthChangeLocalPasswordQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AuthChangeLocalPasswordQuery>(AuthChangeLocalPasswordDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'authChangeLocalPassword', 'query');
-    },
-    authLogin(variables: AuthLoginQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AuthLoginQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AuthLoginQuery>(AuthLoginDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'authLogin', 'query');
-    },
-    authLogout(variables?: AuthLogoutQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AuthLogoutQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AuthLogoutQuery>(AuthLogoutDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'authLogout', 'query');
-    },
-    deleteAuthProviderConfiguration(variables: DeleteAuthProviderConfigurationQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteAuthProviderConfigurationQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteAuthProviderConfigurationQuery>(DeleteAuthProviderConfigurationDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteAuthProviderConfiguration', 'query');
-    },
-    getActiveUser(variables: GetActiveUserQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetActiveUserQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetActiveUserQuery>(GetActiveUserDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getActiveUser', 'query');
-    },
-    getAuthProviderConfigurationParameters(variables: GetAuthProviderConfigurationParametersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthProviderConfigurationParametersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthProviderConfigurationParametersQuery>(GetAuthProviderConfigurationParametersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthProviderConfigurationParameters', 'query');
-    },
-    getAuthProviderConfigurations(variables?: GetAuthProviderConfigurationsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthProviderConfigurationsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthProviderConfigurationsQuery>(GetAuthProviderConfigurationsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthProviderConfigurations', 'query');
-    },
-    getAuthProviders(variables?: GetAuthProvidersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthProvidersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthProvidersQuery>(GetAuthProvidersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthProviders', 'query');
-    },
-    getAuthRoles(variables?: GetAuthRolesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthRolesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthRolesQuery>(GetAuthRolesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthRoles', 'query');
-    },
-    getAuthStatus(variables: GetAuthStatusQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthStatusQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthStatusQuery>(GetAuthStatusDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthStatus', 'query');
-    },
-    getUserProfileProperties(variables?: GetUserProfilePropertiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetUserProfilePropertiesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetUserProfilePropertiesQuery>(GetUserProfilePropertiesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUserProfileProperties', 'query');
-    },
-    saveAuthProviderConfiguration(variables: SaveAuthProviderConfigurationQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SaveAuthProviderConfigurationQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SaveAuthProviderConfigurationQuery>(SaveAuthProviderConfigurationDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'saveAuthProviderConfiguration', 'query');
-    },
-    saveUserMetaParameters(variables: SaveUserMetaParametersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SaveUserMetaParametersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SaveUserMetaParametersQuery>(SaveUserMetaParametersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'saveUserMetaParameters', 'query');
-    },
-    createTeam(variables: CreateTeamQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateTeamQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateTeamQuery>(CreateTeamDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createTeam', 'query');
-    },
-    deleteTeam(variables: DeleteTeamQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteTeamQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteTeamQuery>(DeleteTeamDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteTeam', 'query');
-    },
-    getTeamGrantedUsers(variables: GetTeamGrantedUsersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetTeamGrantedUsersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetTeamGrantedUsersQuery>(GetTeamGrantedUsersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTeamGrantedUsers', 'query');
-    },
-    getTeamMetaParameters(variables?: GetTeamMetaParametersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetTeamMetaParametersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetTeamMetaParametersQuery>(GetTeamMetaParametersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTeamMetaParameters', 'query');
-    },
-    getTeamsList(variables: GetTeamsListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetTeamsListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetTeamsListQuery>(GetTeamsListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTeamsList', 'query');
-    },
-    saveTeamMetaParameters(variables: SaveTeamMetaParametersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SaveTeamMetaParametersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SaveTeamMetaParametersQuery>(SaveTeamMetaParametersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'saveTeamMetaParameters', 'query');
-    },
-    updateTeam(variables: UpdateTeamQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<UpdateTeamQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<UpdateTeamQuery>(UpdateTeamDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'updateTeam', 'query');
-    },
-    createUser(variables: CreateUserQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateUserQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateUserQuery>(CreateUserDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createUser', 'query');
-    },
-    deleteUser(variables: DeleteUserQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteUserQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteUserQuery>(DeleteUserDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteUser', 'query');
-    },
-    deleteUserMetaParameter(variables: DeleteUserMetaParameterQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteUserMetaParameterQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteUserMetaParameterQuery>(DeleteUserMetaParameterDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteUserMetaParameter', 'query');
-    },
-    enableUser(variables: EnableUserQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<EnableUserQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<EnableUserQuery>(EnableUserDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'enableUser', 'query');
-    },
-    getUserGrantedConnections(variables: GetUserGrantedConnectionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetUserGrantedConnectionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetUserGrantedConnectionsQuery>(GetUserGrantedConnectionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUserGrantedConnections', 'query');
-    },
-    getUsersList(variables: GetUsersListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetUsersListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetUsersListQuery>(GetUsersListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUsersList', 'query');
-    },
-    grantUserTeam(variables: GrantUserTeamQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GrantUserTeamQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GrantUserTeamQuery>(GrantUserTeamDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'grantUserTeam', 'query');
-    },
-    revokeUserTeam(variables: RevokeUserTeamQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<RevokeUserTeamQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<RevokeUserTeamQuery>(RevokeUserTeamDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'revokeUserTeam', 'query');
-    },
-    setConnections(variables: SetConnectionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetConnectionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetConnectionsQuery>(SetConnectionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setConnections', 'query');
-    },
-    setUserAuthRole(variables: SetUserAuthRoleQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetUserAuthRoleQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetUserAuthRoleQuery>(SetUserAuthRoleDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setUserAuthRole', 'query');
-    },
-    setUserConfigurationParameter(variables: SetUserConfigurationParameterMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetUserConfigurationParameterMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetUserConfigurationParameterMutation>(SetUserConfigurationParameterDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setUserConfigurationParameter', 'mutation');
-    },
-    setUserCredentials(variables: SetUserCredentialsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetUserCredentialsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetUserCredentialsQuery>(SetUserCredentialsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setUserCredentials', 'query');
-    },
-    setUserMetaParameter(variables: SetUserMetaParameterQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetUserMetaParameterQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetUserMetaParameterQuery>(SetUserMetaParameterDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setUserMetaParameter', 'query');
-    },
-    updateUserProfileProperties(variables: UpdateUserProfilePropertiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<UpdateUserProfilePropertiesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<UpdateUserProfilePropertiesQuery>(UpdateUserProfilePropertiesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'updateUserProfileProperties', 'query');
-    },
-    getConnectionAccess(variables: GetConnectionAccessQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetConnectionAccessQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetConnectionAccessQuery>(GetConnectionAccessDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getConnectionAccess', 'query');
-    },
-    getSubjectConnectionAccess(variables: GetSubjectConnectionAccessQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetSubjectConnectionAccessQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetSubjectConnectionAccessQuery>(GetSubjectConnectionAccessDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getSubjectConnectionAccess', 'query');
-    },
-    searchDatabases(variables: SearchDatabasesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SearchDatabasesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SearchDatabasesQuery>(SearchDatabasesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'searchDatabases', 'query');
-    },
-    setConnectionAccess(variables: SetConnectionAccessQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetConnectionAccessQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetConnectionAccessQuery>(SetConnectionAccessDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setConnectionAccess', 'query');
-    },
-    setSubjectConnectionAccess(variables: SetSubjectConnectionAccessQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetSubjectConnectionAccessQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetSubjectConnectionAccessQuery>(SetSubjectConnectionAccessDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setSubjectConnectionAccess', 'query');
-    },
-    closeConnection(variables: CloseConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CloseConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CloseConnectionMutation>(CloseConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'closeConnection', 'mutation');
-    },
-    createConnection(variables: CreateConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateConnectionMutation>(CreateConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createConnection', 'mutation');
-    },
-    createConnectionFolder(variables: CreateConnectionFolderMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateConnectionFolderMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateConnectionFolderMutation>(CreateConnectionFolderDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createConnectionFolder', 'mutation');
-    },
-    createConnectionFromNode(variables: CreateConnectionFromNodeMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateConnectionFromNodeMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateConnectionFromNodeMutation>(CreateConnectionFromNodeDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createConnectionFromNode', 'mutation');
-    },
-    createConnectionFromTemplate(variables: CreateConnectionFromTemplateMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateConnectionFromTemplateMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateConnectionFromTemplateMutation>(CreateConnectionFromTemplateDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createConnectionFromTemplate', 'mutation');
-    },
-    deleteConnection(variables: DeleteConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteConnectionMutation>(DeleteConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteConnection', 'mutation');
-    },
-    deleteConnectionFolder(variables: DeleteConnectionFolderMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteConnectionFolderMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteConnectionFolderMutation>(DeleteConnectionFolderDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteConnectionFolder', 'mutation');
-    },
-    driverList(variables: DriverListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DriverListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DriverListQuery>(DriverListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'driverList', 'query');
-    },
-    executionContextCreate(variables: ExecutionContextCreateMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExecutionContextCreateMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExecutionContextCreateMutation>(ExecutionContextCreateDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'executionContextCreate', 'mutation');
-    },
-    executionContextDestroy(variables: ExecutionContextDestroyMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExecutionContextDestroyMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExecutionContextDestroyMutation>(ExecutionContextDestroyDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'executionContextDestroy', 'mutation');
-    },
-    executionContextList(variables?: ExecutionContextListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExecutionContextListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExecutionContextListQuery>(ExecutionContextListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'executionContextList', 'query');
-    },
-    executionContextUpdate(variables: ExecutionContextUpdateMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExecutionContextUpdateMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExecutionContextUpdateMutation>(ExecutionContextUpdateDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'executionContextUpdate', 'mutation');
-    },
-    getAuthModels(variables?: GetAuthModelsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAuthModelsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAuthModelsQuery>(GetAuthModelsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAuthModels', 'query');
-    },
-    getConnectionFolders(variables?: GetConnectionFoldersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetConnectionFoldersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetConnectionFoldersQuery>(GetConnectionFoldersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getConnectionFolders', 'query');
-    },
-    getTemplateConnections(variables: GetTemplateConnectionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetTemplateConnectionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetTemplateConnectionsQuery>(GetTemplateConnectionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTemplateConnections', 'query');
-    },
-    getUserConnections(variables: GetUserConnectionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetUserConnectionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetUserConnectionsQuery>(GetUserConnectionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUserConnections', 'query');
-    },
-    initConnection(variables: InitConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<InitConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<InitConnectionMutation>(InitConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'initConnection', 'mutation');
-    },
-    refreshSessionConnections(variables?: RefreshSessionConnectionsMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<RefreshSessionConnectionsMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<RefreshSessionConnectionsMutation>(RefreshSessionConnectionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'refreshSessionConnections', 'mutation');
-    },
-    setConnectionNavigatorSettings(variables: SetConnectionNavigatorSettingsMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetConnectionNavigatorSettingsMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetConnectionNavigatorSettingsMutation>(SetConnectionNavigatorSettingsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setConnectionNavigatorSettings', 'mutation');
-    },
-    testConnection(variables: TestConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<TestConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<TestConnectionMutation>(TestConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'testConnection', 'mutation');
-    },
-    testNetworkHandler(variables: TestNetworkHandlerMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<TestNetworkHandlerMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<TestNetworkHandlerMutation>(TestNetworkHandlerDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'testNetworkHandler', 'mutation');
-    },
-    updateConnection(variables: UpdateConnectionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<UpdateConnectionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<UpdateConnectionMutation>(UpdateConnectionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'updateConnection', 'mutation');
-    },
-    exportDataFromContainer(variables: ExportDataFromContainerQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExportDataFromContainerQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExportDataFromContainerQuery>(ExportDataFromContainerDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'exportDataFromContainer', 'query');
-    },
-    exportDataFromResults(variables: ExportDataFromResultsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ExportDataFromResultsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ExportDataFromResultsQuery>(ExportDataFromResultsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'exportDataFromResults', 'query');
-    },
-    getDataTransferDefaultParameters(variables?: GetDataTransferDefaultParametersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetDataTransferDefaultParametersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetDataTransferDefaultParametersQuery>(GetDataTransferDefaultParametersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getDataTransferDefaultParameters', 'query');
-    },
-    getDataTransferProcessors(variables?: GetDataTransferProcessorsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetDataTransferProcessorsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetDataTransferProcessorsQuery>(GetDataTransferProcessorsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getDataTransferProcessors', 'query');
-    },
-    removeDataTransferFile(variables: RemoveDataTransferFileQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<RemoveDataTransferFileQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<RemoveDataTransferFileQuery>(RemoveDataTransferFileDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'removeDataTransferFile', 'query');
-    },
-    navGetStructContainers(variables: NavGetStructContainersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavGetStructContainersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavGetStructContainersQuery>(NavGetStructContainersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navGetStructContainers', 'query');
-    },
-    getAsyncTaskInfo(variables: GetAsyncTaskInfoMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetAsyncTaskInfoMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetAsyncTaskInfoMutation>(GetAsyncTaskInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAsyncTaskInfo', 'mutation');
-    },
-    getNetworkHandlers(variables?: GetNetworkHandlersQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetNetworkHandlersQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetNetworkHandlersQuery>(GetNetworkHandlersDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getNetworkHandlers', 'query');
-    },
-    asyncReadDataFromContainer(variables: AsyncReadDataFromContainerMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AsyncReadDataFromContainerMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AsyncReadDataFromContainerMutation>(AsyncReadDataFromContainerDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'asyncReadDataFromContainer', 'mutation');
-    },
-    asyncSqlExecuteQuery(variables: AsyncSqlExecuteQueryMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AsyncSqlExecuteQueryMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AsyncSqlExecuteQueryMutation>(AsyncSqlExecuteQueryDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'asyncSqlExecuteQuery', 'mutation');
-    },
-    asyncSqlExplainExecutionPlan(variables: AsyncSqlExplainExecutionPlanMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<AsyncSqlExplainExecutionPlanMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<AsyncSqlExplainExecutionPlanMutation>(AsyncSqlExplainExecutionPlanDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'asyncSqlExplainExecutionPlan', 'mutation');
-    },
-    closeResult(variables: CloseResultMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CloseResultMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CloseResultMutation>(CloseResultDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'closeResult', 'mutation');
-    },
-    getResultsetDataURL(variables: GetResultsetDataUrlMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetResultsetDataUrlMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetResultsetDataUrlMutation>(GetResultsetDataUrlDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getResultsetDataURL', 'mutation');
-    },
-    getResultsetGroupingQuery(variables: GetResultsetGroupingQueryQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetResultsetGroupingQueryQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetResultsetGroupingQueryQuery>(GetResultsetGroupingQueryDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getResultsetGroupingQuery', 'query');
-    },
-    getSqlExecuteTaskResults(variables: GetSqlExecuteTaskResultsMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetSqlExecuteTaskResultsMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetSqlExecuteTaskResultsMutation>(GetSqlExecuteTaskResultsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getSqlExecuteTaskResults', 'mutation');
-    },
-    getSqlExecutionPlanResult(variables: GetSqlExecutionPlanResultMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetSqlExecutionPlanResultMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetSqlExecutionPlanResultMutation>(GetSqlExecutionPlanResultDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getSqlExecutionPlanResult', 'mutation');
-    },
-    updateResultsDataBatch(variables: UpdateResultsDataBatchMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<UpdateResultsDataBatchMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<UpdateResultsDataBatchMutation>(UpdateResultsDataBatchDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'updateResultsDataBatch', 'mutation');
-    },
-    updateResultsDataBatchScript(variables: UpdateResultsDataBatchScriptMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<UpdateResultsDataBatchScriptMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<UpdateResultsDataBatchScriptMutation>(UpdateResultsDataBatchScriptDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'updateResultsDataBatchScript', 'mutation');
-    },
-    metadataGetNodeDDL(variables: MetadataGetNodeDdlQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<MetadataGetNodeDdlQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<MetadataGetNodeDdlQuery>(MetadataGetNodeDdlDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'metadataGetNodeDDL', 'query');
-    },
-    metadataGetNodeExtendedDDL(variables: MetadataGetNodeExtendedDdlQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<MetadataGetNodeExtendedDdlQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<MetadataGetNodeExtendedDdlQuery>(MetadataGetNodeExtendedDdlDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'metadataGetNodeExtendedDDL', 'query');
-    },
-    getChildrenDBObjectInfo(variables: GetChildrenDbObjectInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetChildrenDbObjectInfoQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetChildrenDbObjectInfoQuery>(GetChildrenDbObjectInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getChildrenDBObjectInfo', 'query');
-    },
-    getDBObjectInfo(variables: GetDbObjectInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetDbObjectInfoQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetDbObjectInfoQuery>(GetDbObjectInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getDBObjectInfo', 'query');
-    },
-    getNavNodeFullName(variables: GetNavNodeFullNameQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetNavNodeFullNameQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetNavNodeFullNameQuery>(GetNavNodeFullNameDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getNavNodeFullName', 'query');
-    },
-    getNodeParents(variables: GetNodeParentsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetNodeParentsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetNodeParentsQuery>(GetNodeParentsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getNodeParents', 'query');
-    },
-    navDeleteNodes(variables: NavDeleteNodesMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavDeleteNodesMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavDeleteNodesMutation>(NavDeleteNodesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navDeleteNodes', 'mutation');
-    },
-    navMoveTo(variables: NavMoveToMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavMoveToMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavMoveToMutation>(NavMoveToDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navMoveTo', 'mutation');
-    },
-    navNodeChildren(variables: NavNodeChildrenQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavNodeChildrenQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavNodeChildrenQuery>(NavNodeChildrenDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navNodeChildren', 'query');
-    },
-    navNodeInfo(variables: NavNodeInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavNodeInfoQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavNodeInfoQuery>(NavNodeInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navNodeInfo', 'query');
-    },
-    navRefreshNode(variables: NavRefreshNodeQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavRefreshNodeQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavRefreshNodeQuery>(NavRefreshNodeDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navRefreshNode', 'query');
-    },
-    navRenameNode(variables: NavRenameNodeMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<NavRenameNodeMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<NavRenameNodeMutation>(NavRenameNodeDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'navRenameNode', 'mutation');
-    },
-    getProjectList(variables?: GetProjectListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetProjectListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetProjectListQuery>(GetProjectListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getProjectList', 'query');
-    },
-    createProject(variables: CreateProjectMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateProjectMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateProjectMutation>(CreateProjectDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createProject', 'mutation');
-    },
-    createResource(variables: CreateResourceMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<CreateResourceMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateResourceMutation>(CreateResourceDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'createResource', 'mutation');
-    },
-    deleteProject(variables: DeleteProjectMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteProjectMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteProjectMutation>(DeleteProjectDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteProject', 'mutation');
-    },
-    deleteResource(variables: DeleteResourceMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<DeleteResourceMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<DeleteResourceMutation>(DeleteResourceDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'deleteResource', 'mutation');
-    },
-    getProject(variables: GetProjectQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetProjectQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetProjectQuery>(GetProjectDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getProject', 'query');
-    },
-    getProjectGrantedPermissions(variables: GetProjectGrantedPermissionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetProjectGrantedPermissionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetProjectGrantedPermissionsQuery>(GetProjectGrantedPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getProjectGrantedPermissions', 'query');
-    },
-    getProjectPermissionsList(variables?: GetProjectPermissionsListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetProjectPermissionsListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetProjectPermissionsListQuery>(GetProjectPermissionsListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getProjectPermissionsList', 'query');
-    },
-    getResourceList(variables: GetResourceListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetResourceListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetResourceListQuery>(GetResourceListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getResourceList', 'query');
-    },
-    getResourceProjectList(variables?: GetResourceProjectListQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetResourceProjectListQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetResourceProjectListQuery>(GetResourceProjectListDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getResourceProjectList', 'query');
-    },
-    getSharedProjects(variables?: GetSharedProjectsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetSharedProjectsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetSharedProjectsQuery>(GetSharedProjectsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getSharedProjects', 'query');
-    },
-    getSubjectProjectsPermissions(variables: GetSubjectProjectsPermissionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<GetSubjectProjectsPermissionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<GetSubjectProjectsPermissionsQuery>(GetSubjectProjectsPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getSubjectProjectsPermissions', 'query');
-    },
-    moveResource(variables: MoveResourceMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<MoveResourceMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<MoveResourceMutation>(MoveResourceDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'moveResource', 'mutation');
-    },
-    readResource(variables: ReadResourceQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ReadResourceQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ReadResourceQuery>(ReadResourceDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'readResource', 'query');
-    },
-    setProjectPermissions(variables: SetProjectPermissionsMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetProjectPermissionsMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetProjectPermissionsMutation>(SetProjectPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setProjectPermissions', 'mutation');
-    },
-    setResourceProperty(variables: SetResourcePropertyMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetResourcePropertyMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetResourcePropertyMutation>(SetResourcePropertyDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setResourceProperty', 'mutation');
-    },
-    setSubjectProjectsPermissions(variables: SetSubjectProjectsPermissionsMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetSubjectProjectsPermissionsMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetSubjectProjectsPermissionsMutation>(SetSubjectProjectsPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setSubjectProjectsPermissions', 'mutation');
-    },
-    writeResourceContent(variables: WriteResourceContentMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<WriteResourceContentMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<WriteResourceContentMutation>(WriteResourceContentDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'writeResourceContent', 'mutation');
-    },
-    configureServer(variables: ConfigureServerQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ConfigureServerQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ConfigureServerQuery>(ConfigureServerDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'configureServer', 'query');
-    },
-    listFeatureSets(variables?: ListFeatureSetsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ListFeatureSetsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ListFeatureSetsQuery>(ListFeatureSetsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'listFeatureSets', 'query');
-    },
-    setDefaultNavigatorSettings(variables: SetDefaultNavigatorSettingsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SetDefaultNavigatorSettingsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SetDefaultNavigatorSettingsQuery>(SetDefaultNavigatorSettingsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'setDefaultNavigatorSettings', 'query');
-    },
-    changeSessionLanguage(variables: ChangeSessionLanguageMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ChangeSessionLanguageMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ChangeSessionLanguageMutation>(ChangeSessionLanguageDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'changeSessionLanguage', 'mutation');
-    },
-    openSession(variables?: OpenSessionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<OpenSessionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<OpenSessionMutation>(OpenSessionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'openSession', 'mutation');
-    },
-    readSessionLog(variables: ReadSessionLogQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ReadSessionLogQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ReadSessionLogQuery>(ReadSessionLogDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'readSessionLog', 'query');
-    },
-    serverConfig(variables?: ServerConfigQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ServerConfigQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ServerConfigQuery>(ServerConfigDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'serverConfig', 'query');
-    },
-    sessionPermissions(variables?: SessionPermissionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SessionPermissionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SessionPermissionsQuery>(SessionPermissionsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'sessionPermissions', 'query');
-    },
-    sessionState(variables?: SessionStateQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SessionStateQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SessionStateQuery>(SessionStateDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'sessionState', 'query');
-    },
-    touchSession(variables?: TouchSessionMutationVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<TouchSessionMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<TouchSessionMutation>(TouchSessionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'touchSession', 'mutation');
-    },
-    formatSqlQuery(variables: FormatSqlQueryQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<FormatSqlQueryQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<FormatSqlQueryQuery>(FormatSqlQueryDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'formatSqlQuery', 'query');
-    },
-    parseSQLQuery(variables: ParseSqlQueryQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ParseSqlQueryQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ParseSqlQueryQuery>(ParseSqlQueryDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'parseSQLQuery', 'query');
-    },
-    parseSQLScript(variables: ParseSqlScriptQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<ParseSqlScriptQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<ParseSqlScriptQuery>(ParseSqlScriptDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'parseSQLScript', 'query');
-    },
-    querySqlCompletionProposals(variables: QuerySqlCompletionProposalsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<QuerySqlCompletionProposalsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<QuerySqlCompletionProposalsQuery>(QuerySqlCompletionProposalsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'querySqlCompletionProposals', 'query');
-    },
-    querySqlDialectInfo(variables: QuerySqlDialectInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<QuerySqlDialectInfoQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<QuerySqlDialectInfoQuery>(QuerySqlDialectInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'querySqlDialectInfo', 'query');
-    },
-    sqlEntityQueryGenerators(variables: SqlEntityQueryGeneratorsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SqlEntityQueryGeneratorsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SqlEntityQueryGeneratorsQuery>(SqlEntityQueryGeneratorsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'sqlEntityQueryGenerators', 'query');
-    },
-    sqlGenerateEntityQuery(variables: SqlGenerateEntityQueryQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<SqlGenerateEntityQueryQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<SqlGenerateEntityQueryQuery>(SqlGenerateEntityQueryDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'sqlGenerateEntityQuery', 'query');
-    }
   };
 }
-export type Sdk = ReturnType<typeof getSdk>;
\ No newline at end of file
+export type Sdk = ReturnType<typeof getSdk>;
diff --git a/webapp/packages/core-settings/src/ISettingsResolverSource.ts b/webapp/packages/core-settings/src/ISettingsResolverSource.ts
index f752b003bc..20a6545f62 100644
--- a/webapp/packages/core-settings/src/ISettingsResolverSource.ts
+++ b/webapp/packages/core-settings/src/ISettingsResolverSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISettingsSource } from './ISettingsSource';
 
 export interface ISettingsResolverSource extends ISettingsSource {
diff --git a/webapp/packages/core-settings/src/LocalStorageSaveService.ts b/webapp/packages/core-settings/src/LocalStorageSaveService.ts
index 9d29885428..b4743763c1 100644
--- a/webapp/packages/core-settings/src/LocalStorageSaveService.ts
+++ b/webapp/packages/core-settings/src/LocalStorageSaveService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { entries, IReactionDisposer, keys, observable, ObservableMap, reaction, remove, runInAction, set, toJS } from 'mobx';
 
 import { IndexedDB, IndexedDBService, IndexedDBTable } from '@cloudbeaver/core-browser';
@@ -40,9 +39,7 @@ export class LocalStorageSaveService {
   private storageType: LocalStorageType;
   private readonly indexedDBStore: LocalStorageIndexedDB;
 
-  constructor(
-    private readonly indexedDBService: IndexedDBService,
-  ) {
+  constructor(private readonly indexedDBService: IndexedDBService) {
     this.storageType = 'local';
     this.broadcastChannel = new BroadcastChannel('local-storage');
     this.storages = new Map();
@@ -93,20 +90,13 @@ export class LocalStorageSaveService {
     defaultValue: () => T extends any ? T : never,
     remap?: (savedStore: T) => T,
     onUpdate?: () => void,
-    storageType?: LocalStorageType
+    storageType?: LocalStorageType,
   ): void {
     if (this.storages.has(storeId)) {
       return;
     }
 
-    this.storages.set(storeId, new DataStorage(
-      this.getStorage(storageType),
-      storeId,
-      store,
-      defaultValue,
-      remap,
-      onUpdate
-    ));
+    this.storages.set(storeId, new DataStorage(this.getStorage(storageType), storeId, store, defaultValue, remap, onUpdate));
   }
 
   updateStorage(storageType: LocalStorageType): void {
@@ -195,7 +185,7 @@ class DataStorage<T extends Record<any, any> | Map<any, any>> implements ILocalS
     readonly store: T,
     readonly defaultValue: () => T,
     readonly remap?: (savedStore: T) => T,
-    readonly onUpdate?: () => void
+    readonly onUpdate?: () => void,
   ) {
     this.firstRun = true;
     this.mobxSub = undefined;
@@ -256,15 +246,9 @@ class DataStorage<T extends Record<any, any> | Map<any, any>> implements ILocalS
     }
     try {
       if (this.storage instanceof LocalStorageIndexedDB) {
-        await this.storage.setItem(
-          this.storeId,
-          this.serializeData(store)
-        );
+        await this.storage.setItem(this.storeId, this.serializeData(store));
       } else {
-        this.storage.setItem(
-          this.storeId,
-          this.serializeData(store)
-        );
+        this.storage.setItem(this.storeId, this.serializeData(store));
       }
     } catch (e: any) {
       console.error('Error when saving local storage value', e);
@@ -279,7 +263,7 @@ class DataStorage<T extends Record<any, any> | Map<any, any>> implements ILocalS
       {
         fireImmediately: true,
         delay: 500,
-      }
+      },
     );
   }
 
@@ -300,8 +284,7 @@ class DataStorage<T extends Record<any, any> | Map<any, any>> implements ILocalS
     }
 
     if (store instanceof ObservableMap) {
-      data = Array.from((data as Map<any, any>).entries())
-        .reduce<{
+      data = Array.from((data as Map<any, any>).entries()).reduce<{
         [key: string]: any;
       }>((obj, [key, value]) => {
         obj[key] = value;
diff --git a/webapp/packages/core-settings/src/SettingsResolverSource.ts b/webapp/packages/core-settings/src/SettingsResolverSource.ts
index c635f7d183..d7096f4e7e 100644
--- a/webapp/packages/core-settings/src/SettingsResolverSource.ts
+++ b/webapp/packages/core-settings/src/SettingsResolverSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { ISettingsResolverSource } from './ISettingsResolverSource';
@@ -53,8 +52,7 @@ export abstract class SettingsResolverSource implements ISettingsResolverSource
   }
 
   getValue(key: any): any {
-    return this.resolvers.find(r => r.has(key))
-      ?.getValue(key);
+    return this.resolvers.find(r => r.has(key))?.getValue(key);
   }
 
   setValue(key: any, value: any): void {
diff --git a/webapp/packages/core-settings/src/SettingsService.ts b/webapp/packages/core-settings/src/SettingsService.ts
index 5beca13b1d..ccf8ed6efa 100644
--- a/webapp/packages/core-settings/src/SettingsService.ts
+++ b/webapp/packages/core-settings/src/SettingsService.ts
@@ -5,26 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { LocalStorageSaveService } from './LocalStorageSaveService';
 
 @injectable()
 export class SettingsService {
-  constructor(private readonly localStorageSaveService: LocalStorageSaveService) { }
+  constructor(private readonly localStorageSaveService: LocalStorageSaveService) {}
 
   /**
    * if autosaved value exits the settings object will be populated with this value
    * @param key
    * @param settings - observable object expected
    */
-  registerSettings<T extends Record<any, any>>(
-    key: string,
-    settings: T,
-    defaultValue: () => T,
-    onUpdate?: () => void,
-  ): void {
+  registerSettings<T extends Record<any, any>>(key: string, settings: T, defaultValue: () => T, onUpdate?: () => void): void {
     this.localStorageSaveService.withAutoSave(key, settings, defaultValue, undefined, onUpdate);
   }
 }
diff --git a/webapp/packages/core-settings/src/SettingsSource.ts b/webapp/packages/core-settings/src/SettingsSource.ts
index 454eef31f5..4d609cee74 100644
--- a/webapp/packages/core-settings/src/SettingsSource.ts
+++ b/webapp/packages/core-settings/src/SettingsSource.ts
@@ -5,7 +5,6 @@
  * 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 type { ISettingsSource } from './ISettingsSource';
diff --git a/webapp/packages/core-settings/src/manifest.ts b/webapp/packages/core-settings/src/manifest.ts
index e53936ce2e..06eb8c8cbe 100644
--- a/webapp/packages/core-settings/src/manifest.ts
+++ b/webapp/packages/core-settings/src/manifest.ts
@@ -5,20 +5,15 @@
  * 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 { LocalStorageSaveService } from './LocalStorageSaveService';
 import { SettingsService } from './SettingsService';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Settings',
   },
 
-  providers: [
-    SettingsService,
-    LocalStorageSaveService,
-  ],
+  providers: [SettingsService, LocalStorageSaveService],
 };
diff --git a/webapp/packages/core-theming/src/ComponentStyle.ts b/webapp/packages/core-theming/src/ComponentStyle.ts
index dbf4b03287..7b190dae06 100644
--- a/webapp/packages/core-theming/src/ComponentStyle.ts
+++ b/webapp/packages/core-theming/src/ComponentStyle.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ClassCollection } from './themeUtils';
 
 export type BaseStyles = ClassCollection;
 export type ThemeSelector = (theme: string) => Promise<undefined | BaseStyles | BaseStyles[]>;
 export type Style = BaseStyles | ThemeSelector;
 export type DynamicStyle = Style | boolean | undefined;
-export type ComponentStyle = DynamicStyle | DynamicStyle[] | DynamicStyle[][];
\ No newline at end of file
+export type ComponentStyle = DynamicStyle | DynamicStyle[] | DynamicStyle[][];
diff --git a/webapp/packages/core-theming/src/ThemeService.ts b/webapp/packages/core-theming/src/ThemeService.ts
index b391673b8e..f2164fa6fc 100644
--- a/webapp/packages/core-theming/src/ThemeService.ts
+++ b/webapp/packages/core-theming/src/ThemeService.ts
@@ -5,21 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { action, computed, makeObservable, observable } from 'mobx';
 
-import { action, computed, observable, makeObservable } from 'mobx';
-
-import './styles/main/normalize.pure.css';
-import './styles/main/base.pure.css';
-import './styles/main/fonts.pure.css';
-import './styles/main/elevation.pure.scss';
-import './styles/main/typography.pure.scss';
-import './styles/main/color.pure.scss';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
-import { UIError, NotificationService } from '@cloudbeaver/core-events';
+import { NotificationService, UIError } from '@cloudbeaver/core-events';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { SettingsService } from '@cloudbeaver/core-settings';
 
+import './styles/main/base.pure.css';
+import './styles/main/color.pure.scss';
+import './styles/main/elevation.pure.scss';
+import './styles/main/fonts.pure.css';
+import './styles/main/normalize.pure.css';
+import './styles/main/typography.pure.scss';
 import { themes } from './themes';
 import { defaultThemeSettings, ThemeSettingsService } from './ThemeSettingsService';
 import type { ClassCollection } from './themeUtils';
@@ -75,7 +74,7 @@ export class ThemeService extends Bootstrap {
     private readonly serverConfigResource: ServerConfigResource,
     private readonly notificationService: NotificationService,
     private readonly settingsService: SettingsService,
-    private readonly themeSettingsService: ThemeSettingsService
+    private readonly themeSettingsService: ThemeSettingsService,
   ) {
     super();
 
@@ -99,12 +98,7 @@ export class ThemeService extends Bootstrap {
   async load(): Promise<void> {
     await this.serverConfigResource.load();
     this.setCurrentThemeId(this.defaultThemeId); // set default app theme
-    this.settingsService.registerSettings(
-      THEME_SETTINGS_KEY,
-      this.settings,
-      getDefaultThemeSettings,
-      () => this.setTheme(this.currentThemeId)
-    ); // load user state theme
+    this.settingsService.registerSettings(THEME_SETTINGS_KEY, this.settings, getDefaultThemeSettings, () => this.setTheme(this.currentThemeId)); // load user state theme
     await this.setTheme(this.currentThemeId);
   }
 
@@ -169,4 +163,4 @@ function getDefaultThemeSettings(): ISettings {
   return {
     currentThemeId: defaultThemeSettings.defaultTheme,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-theming/src/ThemeSettingsService.test.ts b/webapp/packages/core-theming/src/ThemeSettingsService.test.ts
index b0f2d89a86..191e85d874 100644
--- a/webapp/packages/core-theming/src/ThemeSettingsService.test.ts
+++ b/webapp/packages/core-theming/src/ThemeSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -21,10 +20,7 @@ import { IThemeSettings, ThemeSettingsService } from './ThemeSettingsService';
 const endpoint = createGQLEndpoint();
 const app = createApp();
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -57,9 +53,7 @@ test('New settings equal deprecated settings "light"', async () => {
   const settings = app.injector.getServiceByClass(ThemeSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigA)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigA)));
 
   await config.refresh();
 
@@ -71,12 +65,10 @@ test('New settings equal deprecated settings "dark"', async () => {
   const settings = app.injector.getServiceByClass(ThemeSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigB)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigB)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('defaultTheme')).toBe(testValueB);
   expect(settings.deprecatedSettings.getValue('defaultTheme')).toBe(testValueB);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-theming/src/ThemeSettingsService.ts b/webapp/packages/core-theming/src/ThemeSettingsService.ts
index a195e364ed..9ea9444c13 100644
--- a/webapp/packages/core-theming/src/ThemeSettingsService.ts
+++ b/webapp/packages/core-theming/src/ThemeSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/core-theming/src/manifest.ts b/webapp/packages/core-theming/src/manifest.ts
index da467fd401..d4813a9aa0 100644
--- a/webapp/packages/core-theming/src/manifest.ts
+++ b/webapp/packages/core-theming/src/manifest.ts
@@ -5,20 +5,15 @@
  * 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 { ThemeService } from './ThemeService';
 import { ThemeSettingsService } from './ThemeSettingsService';
 
-
 export const manifest: PluginManifest = {
   info: {
     name: 'Core Theming',
   },
 
-  providers: [
-    ThemeService,
-    ThemeSettingsService,
-  ],
+  providers: [ThemeService, ThemeSettingsService],
 };
diff --git a/webapp/packages/core-theming/src/themeUtils.ts b/webapp/packages/core-theming/src/themeUtils.ts
index ed0e324f89..1a3b569801 100644
--- a/webapp/packages/core-theming/src/themeUtils.ts
+++ b/webapp/packages/core-theming/src/themeUtils.ts
@@ -46,8 +46,8 @@ export function applyComposes(mixed: Array<Composes | ClassCollection>) {
 
   return [
     ...styles,
-    ...composes.map(compose => Object.entries(compose.composes).reduce<ClassCollection>(
-      (map, [key, value]) => {
+    ...composes.map(compose =>
+      Object.entries(compose.composes).reduce<ClassCollection>((map, [key, value]) => {
         const classes = value.split(' ');
         const classnames: string[] = [];
 
@@ -66,8 +66,7 @@ export function applyComposes(mixed: Array<Composes | ClassCollection>) {
         // eslint-disable-next-line no-param-reassign
         map[key] = classnames.join(' ');
         return map;
-      },
-      {}
-    )),
+      }, {}),
+    ),
   ];
 }
diff --git a/webapp/packages/core-theming/src/themes.ts b/webapp/packages/core-theming/src/themes.ts
index 5392e6579a..7dd6ec22d5 100644
--- a/webapp/packages/core-theming/src/themes.ts
+++ b/webapp/packages/core-theming/src/themes.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITheme } from './ThemeService';
 
 const emptyTheme = {};
diff --git a/webapp/packages/core-ui/src/AuthenticationProvider.tsx b/webapp/packages/core-ui/src/AuthenticationProvider.tsx
index a2f3b06950..46988720eb 100644
--- a/webapp/packages/core-ui/src/AuthenticationProvider.tsx
+++ b/webapp/packages/core-ui/src/AuthenticationProvider.tsx
@@ -5,11 +5,10 @@
  * 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 { BASE_CONTAINERS_STYLES, Button, Container, GroupItem, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Button, Container, GroupItem, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 import { useAuthenticationAction } from './useAuthenticationAction';
 
@@ -34,24 +33,17 @@ export const AuthenticationProvider = observer<Props>(function AuthenticationPro
   const action = useAuthenticationAction(props);
 
   if (action.authorized) {
-    return props.children?.() as null || null;
+    return (props.children?.() as null) || null;
   }
 
   return styled(style)(
     <Container className={props.className} gap vertical>
+      <GroupItem keepSize>{translate('authentication_request_token')}</GroupItem>
       <GroupItem keepSize>
-        {translate('authentication_request_token')}
-      </GroupItem>
-      <GroupItem keepSize>
-        <Button
-          type='button'
-          mod={['unelevated']}
-          loading={action.authenticating}
-          onClick={action.auth}
-        >
+        <Button type="button" mod={['unelevated']} loading={action.authenticating} onClick={action.auth}>
           {translate('authentication_authenticate')}
         </Button>
       </GroupItem>
-    </Container>
+    </Container>,
   );
 });
diff --git a/webapp/packages/core-ui/src/Clipboard/ClipboardBootstrap.ts b/webapp/packages/core-ui/src/Clipboard/ClipboardBootstrap.ts
index eefa961b42..46a2ea3804 100644
--- a/webapp/packages/core-ui/src/Clipboard/ClipboardBootstrap.ts
+++ b/webapp/packages/core-ui/src/Clipboard/ClipboardBootstrap.ts
@@ -5,20 +5,17 @@
  * 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 { ClipboardService } from './ClipboardService';
 
 @injectable()
 export class ClipboardBootstrap extends Bootstrap {
-  constructor(
-    private readonly clipboardService: ClipboardService,
-  ) {
+  constructor(private readonly clipboardService: ClipboardService) {
     super();
   }
 
-  register(): void { }
+  register(): void {}
 
   async load(): Promise<void> {
     await this.clipboardService.tryActivateClipboard();
diff --git a/webapp/packages/core-ui/src/Clipboard/ClipboardService.ts b/webapp/packages/core-ui/src/Clipboard/ClipboardService.ts
index 1f7a0d0ac1..2fdae54aad 100644
--- a/webapp/packages/core-ui/src/Clipboard/ClipboardService.ts
+++ b/webapp/packages/core-ui/src/Clipboard/ClipboardService.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -27,9 +26,7 @@ export class ClipboardService {
     return 'prompt';
   }
 
-  constructor(
-    private readonly notificationService: NotificationService
-  ) {
+  constructor(private readonly notificationService: NotificationService) {
     makeObservable<ClipboardService, 'permissionUpdate'>(this, {
       clipboardValue: observable,
       permissionUpdate: observable,
diff --git a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
index 077c2d5dab..22bcc2ea3b 100644
--- a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx
@@ -5,13 +5,22 @@
  * 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 { ButtonHTMLAttributes, forwardRef, useRef, useState } from 'react';
 import type { MenuInitialState } from 'reakit/Menu';
 import styled from 'reshadow';
 
-import { getComputed, IMenuState, Menu, menuPanelStyles, useObjectRef, useTranslate, useStyles, useAutoLoad, IMouseContextMenu } from '@cloudbeaver/core-blocks';
+import {
+  getComputed,
+  IMenuState,
+  IMouseContextMenu,
+  Menu,
+  menuPanelStyles,
+  useAutoLoad,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { IMenuData, MenuActionItem } from '@cloudbeaver/core-view';
 
@@ -37,95 +46,89 @@ interface IContextMenuProps extends Omit<ButtonHTMLAttributes<any>, 'style' | 'c
   onVisibleSwitch?: (visible: boolean) => void;
 }
 
-export const ContextMenu = observer<IContextMenuProps, HTMLButtonElement>(forwardRef(function ContextMenu({
-  mouseContextMenu,
-  menu: menuData,
-  disclosure,
-  children,
-  style,
-  placement,
-  visible,
-  onVisibleSwitch,
-  modal,
-  rtl,
-  ...props
-}, ref) {
-  const translate = useTranslate();
-  const [menuVisible, setMenuVisible] = useState(false);
+export const ContextMenu = observer<IContextMenuProps, HTMLButtonElement>(
+  forwardRef(function ContextMenu(
+    { mouseContextMenu, menu: menuData, disclosure, children, style, placement, visible, onVisibleSwitch, modal, rtl, ...props },
+    ref,
+  ) {
+    const translate = useTranslate();
+    const [menuVisible, setMenuVisible] = useState(false);
 
-  const handler = menuData.handler;
-  const hidden = getComputed(() => handler?.isHidden?.(menuData.context) || false);
-  const loading = getComputed(() => (
-    handler?.isLoading?.(menuData.context)
-    || menuData.loaders.some(loader => loader.isLoading())
-    || false
-  ));
-  const disabled = getComputed(() => loading || handler?.isDisabled?.(menuData.context) || false);
-  const lazy = getComputed(() => !menuData.available || hidden);
+    const handler = menuData.handler;
+    const hidden = getComputed(() => handler?.isHidden?.(menuData.context) || false);
+    const loading = getComputed(() => handler?.isLoading?.(menuData.context) || menuData.loaders.some(loader => loader.isLoading()) || false);
+    const disabled = getComputed(() => loading || handler?.isDisabled?.(menuData.context) || false);
+    const lazy = getComputed(() => !menuData.available || hidden);
 
-  const menu = useRef<IMenuState>();
-  const styles = useStyles(menuPanelStyles, style);
+    const menu = useRef<IMenuState>();
+    const styles = useStyles(menuPanelStyles, style);
 
-  useAutoLoad(menuData.loaders, !lazy, menuVisible);
+    useAutoLoad(menuData.loaders, !lazy, menuVisible);
 
-  const handlers = useObjectRef(() => ({
-    handleItemClose() {
-      menu.current?.hide();
-    },
-    hasBindings() {
-      return this.menuData.items.some(
-        item => item instanceof MenuActionItem && item.action.binding !== null
-      );
-    },
-    handleVisibleSwitch(visible: boolean) {
-      setMenuVisible(visible);
-      this.onVisibleSwitch?.(visible);
+    const handlers = useObjectRef(
+      () => ({
+        handleItemClose() {
+          menu.current?.hide();
+        },
+        hasBindings() {
+          return this.menuData.items.some(item => item instanceof MenuActionItem && item.action.binding !== null);
+        },
+        handleVisibleSwitch(visible: boolean) {
+          setMenuVisible(visible);
+          this.onVisibleSwitch?.(visible);
 
-      if (visible) {
-        this.handler?.handler?.(this.menuData.context);
-      }
-    },
-  }), { menuData, handler, onVisibleSwitch }, ['handleItemClose', 'hasBindings', 'handleVisibleSwitch']);
+          if (visible) {
+            this.handler?.handler?.(this.menuData.context);
+          }
+        },
+      }),
+      { menuData, handler, onVisibleSwitch },
+      ['handleItemClose', 'hasBindings', 'handleVisibleSwitch'],
+    );
 
-  if (lazy) {
-    return null;
-  }
+    if (lazy) {
+      return null;
+    }
 
-  const renderingChildren: React.ReactNode  = typeof children === 'function'
-    ? children({ loading, disabled })
-    : children;
+    const renderingChildren: React.ReactNode = typeof children === 'function' ? children({ loading, disabled }) : children;
 
-  return styled(styles)(
-    <Menu
-      ref={ref}
-      label={translate(menuData.menu.label)}
-      title={translate(menuData.menu.tooltip)}
-      items={() => menuData.items.map(item => menu.current && (
-        <MenuItemRenderer
-          key={item.id}
-          item={item}
-          menuData={menuData}
-          rtl={rtl}
-          menu={menu.current}
-          modal={modal}
-          style={style}
-          onItemClose={handlers.handleItemClose}
-        />
-      ))}
-      rtl={rtl}
-      menuRef={menu}
-      modal={modal}
-      visible={visible}
-      mouseContextMenu={mouseContextMenu}
-      placement={placement}
-      disabled={disabled}
-      disclosure={disclosure}
-      style={style}
-      getHasBindings={handlers.hasBindings}
-      onVisibleSwitch={handlers.handleVisibleSwitch}
-      {...props}
-    >
-      {renderingChildren}
-    </Menu>
-  );
-}));
+    return styled(styles)(
+      <Menu
+        ref={ref}
+        label={translate(menuData.menu.label)}
+        title={translate(menuData.menu.tooltip)}
+        items={() =>
+          menuData.items.map(
+            item =>
+              menu.current && (
+                <MenuItemRenderer
+                  key={item.id}
+                  item={item}
+                  menuData={menuData}
+                  rtl={rtl}
+                  menu={menu.current}
+                  modal={modal}
+                  style={style}
+                  onItemClose={handlers.handleItemClose}
+                />
+              ),
+          )
+        }
+        rtl={rtl}
+        menuRef={menu}
+        modal={modal}
+        visible={visible}
+        mouseContextMenu={mouseContextMenu}
+        placement={placement}
+        disabled={disabled}
+        disclosure={disclosure}
+        style={style}
+        getHasBindings={handlers.hasBindings}
+        onVisibleSwitch={handlers.handleVisibleSwitch}
+        {...props}
+      >
+        {renderingChildren}
+      </Menu>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts b/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
index 996f009aa7..961876f42b 100644
--- a/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
+++ b/webapp/packages/core-ui/src/ContextMenu/IContextMenuItemProps.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -17,4 +16,4 @@ export interface IContextMenuItemProps {
   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 e56f09ecc6..4f2aab420f 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
@@ -5,7 +5,6 @@
  * 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 React from 'react';
 import { MenuItem, MenuItemCheckbox, MenuItemRadio } from 'reakit/Menu';
@@ -20,12 +19,7 @@ interface IMenuActionElementProps extends IContextMenuItemProps {
   item: IMenuActionItem;
 }
 
-export const MenuActionElement = observer<IMenuActionElementProps>(function MenuActionElement({
-  item,
-  menu,
-  style,
-  onClick,
-}) {
+export const MenuActionElement = observer<IMenuActionElementProps>(function MenuActionElement({ item, menu, style, onClick }) {
   const styles = useStyles(menuPanelStyles, style);
   const actionInfo = item.action.actionInfo;
   const loading = item.action.isLoading();
@@ -56,7 +50,7 @@ export const MenuActionElement = observer<IMenuActionElementProps>(function Menu
           loading={loading}
           style={style}
         />
-      </MenuItemRadio>
+      </MenuItemRadio>,
     );
   }
 
@@ -81,19 +75,12 @@ export const MenuActionElement = observer<IMenuActionElementProps>(function Menu
           loading={loading}
           style={style}
         />
-      </MenuItemCheckbox>
+      </MenuItemCheckbox>,
     );
   }
 
   return styled(styles)(
-    <MenuItem
-      {...menu}
-      {...use({ hidden: item.hidden })}
-      id={item.id}
-      aria-label={actionInfo.label}
-      disabled={item.disabled}
-      onClick={handleClick}
-    >
+    <MenuItem {...menu} {...use({ hidden: item.hidden })} id={item.id} aria-label={actionInfo.label} disabled={item.disabled} onClick={handleClick}>
       <MenuItemElement
         label={actionInfo.label}
         icon={actionInfo.icon}
@@ -102,6 +89,6 @@ export const MenuActionElement = observer<IMenuActionElementProps>(function Menu
         loading={loading}
         style={style}
       />
-    </MenuItem>
+    </MenuItem>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_DEFAULT_STYLES.ts b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_DEFAULT_STYLES.ts
index da31986d53..882f28b156 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_DEFAULT_STYLES.ts
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_DEFAULT_STYLES.ts
@@ -5,65 +5,66 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const MENU_BAR_DEFAULT_STYLES = css`
-    menu-bar {
-      composes: theme-background-secondary theme-text-on-secondary theme-border-color-background theme-typography--body2 from global;
-      height: 48px;
+  menu-bar {
+    composes: theme-background-secondary theme-text-on-secondary theme-border-color-background theme-typography--body2 from global;
+    height: 48px;
+    display: flex;
+  }
+
+  menu-bar-item {
+    composes: theme-ripple from global;
+    padding: 0 16px;
+    cursor: pointer;
+    background: transparent;
+    outline: none;
+    color: inherit;
+
+    & menu-bar-item-box {
       display: flex;
-    }
-    
-    menu-bar-item {
-      composes: theme-ripple from global;
-      padding: 0 16px;
-      cursor: pointer;
-      background: transparent;
-      outline: none;
-      color: inherit;
-
-      & menu-bar-item-box {
-        display: flex;
-        align-items: center;
-      }
-
-      &[use|hidden] {
-        display: none;
-      }
-
-      & menu-bar-item-icon {
-        display: flex;
-        width: 24px;
-      }
-
-      & Loader, & IconOrImage {
-        width: 24px;
-      }
-
-      & menu-bar-item-label {
-          display: block;
-          text-transform: uppercase;
-          font-weight: 700;
-      }
-
-      & menu-bar-item-icon + menu-bar-item-label {
-          padding-left: 8px
-      }
-      
-      & menu-bar-item-mark {
-        display: none;
-      }
+      align-items: center;
     }
 
-    MenuSeparator {
-      composes: theme-border-color-background from global;
-      height: 100%;
-      margin: 0;
-      border: 1px solid !important;
-
-      &:first-child, &:last-child {
-        display: none;
-      }
+    &[use|hidden] {
+      display: none;
     }
-  `;
+
+    & menu-bar-item-icon {
+      display: flex;
+      width: 24px;
+    }
+
+    & Loader,
+    & IconOrImage {
+      width: 24px;
+    }
+
+    & menu-bar-item-label {
+      display: block;
+      text-transform: uppercase;
+      font-weight: 700;
+    }
+
+    & menu-bar-item-icon + menu-bar-item-label {
+      padding-left: 8px;
+    }
+
+    & menu-bar-item-mark {
+      display: none;
+    }
+  }
+
+  MenuSeparator {
+    composes: theme-border-color-background from global;
+    height: 100%;
+    margin: 0;
+    border: 1px solid !important;
+
+    &:first-child,
+    &:last-child {
+      display: none;
+    }
+  }
+`;
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_SMALL_STYLES.ts b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_SMALL_STYLES.ts
index e109d16dd1..02883a757c 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_SMALL_STYLES.ts
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MENU_BAR_SMALL_STYLES.ts
@@ -5,27 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const MENU_BAR_SMALL_STYLES = css`
-    menu-bar-item {
-      padding: 0 12px;
+  menu-bar-item {
+    padding: 0 12px;
 
-      & menu-bar-item-icon {
-        display: flex;
-        width: 16px;
-      }
-
-      & menu-bar-item-label {
-        font-size: 12px;
-      }
-
-      & Loader, & IconOrImage {
-        width: 16px;
-      }
+    & menu-bar-item-icon {
+      display: flex;
+      width: 16px;
     }
-    menu-bar {
-      height: 32px;
+
+    & menu-bar-item-label {
+      font-size: 12px;
     }
-  `;
+
+    & Loader,
+    & IconOrImage {
+      width: 16px;
+    }
+  }
+  menu-bar {
+    height: 32px;
+  }
+`;
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
index 97a8def6a1..739be1e7c6 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef, useCallback } from 'react';
 import { MenuInitialState, MenuSeparator } from 'reakit';
@@ -13,7 +12,18 @@ import styled, { use } from 'reshadow';
 
 import { getComputed, Loader, useAutoLoad, useStyles } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { DATA_CONTEXT_MENU_NESTED, DATA_CONTEXT_SUBMENU_ITEM, IMenuActionItem, IMenuData, IMenuItem, MenuActionItem, MenuBaseItem, MenuSeparatorItem, MenuSubMenuItem, useMenu } from '@cloudbeaver/core-view';
+import {
+  DATA_CONTEXT_MENU_NESTED,
+  DATA_CONTEXT_SUBMENU_ITEM,
+  IMenuActionItem,
+  IMenuData,
+  IMenuItem,
+  MenuActionItem,
+  MenuBaseItem,
+  MenuSeparatorItem,
+  MenuSubMenuItem,
+  useMenu,
+} from '@cloudbeaver/core-view';
 
 import { ContextMenu } from '../ContextMenu';
 import { MenuBarItem } from './MenuBarItem';
@@ -29,36 +39,25 @@ interface IMenuBarProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'styl
   rtl?: boolean;
 }
 
-export const MenuBar = observer<IMenuBarProps, HTMLDivElement>(forwardRef(function MenuBar({
-  menu,
-  nestedMenuSettings,
-  style,
-  rtl,
-  ...props
-}, ref) {
-  const styles = useStyles(style);
-  const items = menu.items;
-  useAutoLoad(menu.loaders);
+export const MenuBar = observer<IMenuBarProps, HTMLDivElement>(
+  forwardRef(function MenuBar({ menu, nestedMenuSettings, style, rtl, ...props }, ref) {
+    const styles = useStyles(style);
+    const items = menu.items;
+    useAutoLoad(menu.loaders);
 
-  if (!items.length) {
-    return null;
-  }
+    if (!items.length) {
+      return null;
+    }
 
-  return styled(styles)(
-    <menu-bar ref={ref} as='div' {...props}>
-      {items.map(item => (
-        <MenuBarElement
-          key={item.id}
-          item={item}
-          menuData={menu}
-          nestedMenuSettings={nestedMenuSettings}
-          rtl={rtl}
-          style={style}
-        />
-      ))}
-    </menu-bar>
-  );
-}));
+    return styled(styles)(
+      <menu-bar ref={ref} as="div" {...props}>
+        {items.map(item => (
+          <MenuBarElement key={item.id} item={item} menuData={menu} nestedMenuSettings={nestedMenuSettings} rtl={rtl} style={style} />
+        ))}
+      </menu-bar>,
+    );
+  }),
+);
 
 interface IMenuBarElementProps {
   item: IMenuItem;
@@ -69,14 +68,7 @@ interface IMenuBarElementProps {
   style?: ComponentStyle;
 }
 
-const MenuBarElement = observer<IMenuBarElementProps>(function MenuBarElement({
-  item,
-  menuData,
-  nestedMenuSettings,
-  className,
-  rtl,
-  style,
-}) {
+const MenuBarElement = observer<IMenuBarElementProps>(function MenuBarElement({ item, menuData, nestedMenuSettings, className, rtl, style }) {
   const styles = useStyles(style);
 
   const onClick = useCallback(() => {
@@ -89,32 +81,16 @@ const MenuBarElement = observer<IMenuBarElementProps>(function MenuBarElement({
 
   if (item instanceof MenuSubMenuItem) {
     return styled(styles)(
-      <SubMenuItem
-        item={item}
-        menuData={menuData}
-        style={style}
-        className={className}
-        rtl={rtl}
-        nestedMenuSettings={nestedMenuSettings}
-      />
+      <SubMenuItem item={item} menuData={menuData} style={style} className={className} rtl={rtl} nestedMenuSettings={nestedMenuSettings} />,
     );
   }
 
   if (item instanceof MenuSeparatorItem) {
-    return styled(styles)(
-      <MenuSeparator className={className} />
-    );
+    return styled(styles)(<MenuSeparator className={className} />);
   }
 
   if (item instanceof MenuActionItem) {
-    return styled(styles)(
-      <MenuBarAction
-        item={item}
-        style={style}
-        className={className}
-        onClick={onClick}
-      />
-    );
+    return styled(styles)(<MenuBarAction item={item} style={style} className={className} onClick={onClick} />);
   }
 
   if (item instanceof MenuBaseItem) {
@@ -130,7 +106,7 @@ const MenuBarElement = observer<IMenuBarElementProps>(function MenuBarElement({
         className={className}
         onClick={onClick}
         {...use({ hidden: item.hidden })}
-      />
+      />,
     );
   }
 
@@ -172,7 +148,7 @@ const MenuBarAction = observer<IMenuBarActionProps>(function MenuBarAction({ ite
       className={className}
       onClick={handleClick}
       {...use({ hidden: item.hidden })}
-    />
+    />,
   );
 });
 
@@ -185,14 +161,7 @@ interface ISubMenuItemProps {
   style?: ComponentStyle;
 }
 
-const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({
-  item,
-  menuData,
-  nestedMenuSettings,
-  className,
-  rtl,
-  style,
-}) {
+const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({ item, menuData, nestedMenuSettings, className, rtl, style }) {
   const styles = useStyles(style);
   const subMenuData = useMenu({ menu: item.menu, context: menuData.context });
 
@@ -208,7 +177,7 @@ const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({
   }
 
   const IconComponent = handler?.iconComponent?.() ?? item.iconComponent?.();
-  const extraProps = handler?.getExtraProps?.() ?? item.getExtraProps?.() as any;
+  const extraProps = handler?.getExtraProps?.() ?? (item.getExtraProps?.() as any);
   /** @deprecated must be refactored (#1)*/
   const displayLabel = getComputed(() => handler?.isLabelVisible?.(subMenuData.context, subMenuData.menu) ?? true);
   // TODO: seems like we don't need this, it's was used in panelAvailable to display > arrow in menu bar
@@ -218,32 +187,25 @@ const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({
   const label = info?.label ?? item.label ?? item.menu.label;
   const icon = info?.icon ?? item.icon ?? item.menu.icon;
   const tooltip = info?.tooltip ?? item.tooltip ?? item.menu.tooltip;
-  const panelAvailable =  subMenuData.itemCreators.length > 0;
+  const panelAvailable = subMenuData.itemCreators.length > 0;
 
   return styled(styles)(
-    <ContextMenu
-      menu={subMenuData}
-      style={style}
-      className={className}
-      rtl={rtl}
-      disclosure
-      {...nestedMenuSettings}
-    >
+    <ContextMenu menu={subMenuData} style={style} className={className} rtl={rtl} disclosure {...nestedMenuSettings}>
       {({ loading, disabled }) => (
         <MenuBarItem
           id={item.id}
           aria-label={item.menu.label}
           label={label}
           displayLabel={displayLabel}
-          icon={IconComponent ? styled(styles)(
-            <Loader suspense small fullSize>
-              <IconComponent
-                item={item}
-                style={style}
-                {...extraProps}
-              />
-            </Loader>
-          ) : icon}
+          icon={
+            IconComponent
+              ? styled(styles)(
+                  <Loader suspense small fullSize>
+                    <IconComponent item={item} style={style} {...extraProps} />
+                  </Loader>,
+                )
+              : icon
+          }
           title={tooltip}
           loading={loading}
           disabled={disabled}
@@ -252,6 +214,6 @@ const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({
           {...use({ hidden: item.hidden })}
         />
       )}
-    </ContextMenu>
+    </ContextMenu>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
index 56258fba55..15cd96fb6c 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
@@ -5,12 +5,11 @@
  * 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 { ButtonHTMLAttributes, forwardRef } from 'react';
 import styled from 'reshadow';
 
-import { IconOrImage, Loader, useStateDelay, useTranslate, useStyles, Icon } from '@cloudbeaver/core-blocks';
+import { Icon, IconOrImage, Loader, useStateDelay, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 interface Props extends Omit<React.DetailedHTMLProps<ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, 'style'> {
@@ -24,35 +23,33 @@ interface Props extends Omit<React.DetailedHTMLProps<ButtonHTMLAttributes<HTMLBu
   style?: ComponentStyle;
 }
 
-export const MenuBarItem = observer<Props, HTMLButtonElement>(forwardRef(function MenuBarItem({
-  label,
-  displayLabel = true,
-  loading = false,
-  icon,
-  displaySubmenuMark,
-  viewBox = '0 0 24 24',
-  style = [],
-  ...rest
-}, ref) {
-  const translate = useTranslate();
-  loading = useStateDelay(loading, 100);
+export const MenuBarItem = observer<Props, HTMLButtonElement>(
+  forwardRef(function MenuBarItem(
+    { label, displayLabel = true, loading = false, icon, displaySubmenuMark, viewBox = '0 0 24 24', style = [], ...rest },
+    ref,
+  ) {
+    const translate = useTranslate();
+    loading = useStateDelay(loading, 100);
 
-  const title = translate(rest.title);
-  return styled(useStyles(style))(
-    <menu-bar-item ref={ref} as='button' {...rest} title={title} aria-label={title}>
-      <menu-bar-item-box>
-        {loading ? (
-          <menu-bar-item-icon><Loader small fullSize /></menu-bar-item-icon>
-        ) : icon && (
-          <menu-bar-item-icon>
-            {typeof icon === 'string' ? <IconOrImage icon={icon} viewBox={viewBox} /> : icon}
-          </menu-bar-item-icon>
-        )}
-        {label && displayLabel ? (
-          <menu-bar-item-label>{translate(label)}</menu-bar-item-label>
-        ) : (<padding />)}
-        {displaySubmenuMark && <menu-bar-item-mark><Icon name="angle" viewBox="0 0 15 8" /></menu-bar-item-mark>}
-      </menu-bar-item-box>
-    </menu-bar-item>
-  );
-}));
+    const title = translate(rest.title);
+    return styled(useStyles(style))(
+      <menu-bar-item ref={ref} as="button" {...rest} title={title} aria-label={title}>
+        <menu-bar-item-box>
+          {loading ? (
+            <menu-bar-item-icon>
+              <Loader small fullSize />
+            </menu-bar-item-icon>
+          ) : (
+            icon && <menu-bar-item-icon>{typeof icon === 'string' ? <IconOrImage icon={icon} viewBox={viewBox} /> : icon}</menu-bar-item-icon>
+          )}
+          {label && displayLabel ? <menu-bar-item-label>{translate(label)}</menu-bar-item-label> : <padding />}
+          {displaySubmenuMark && (
+            <menu-bar-item-mark>
+              <Icon name="angle" viewBox="0 0 15 8" />
+            </menu-bar-item-mark>
+          )}
+        </menu-bar-item-box>
+      </menu-bar-item>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
index e736c6705c..ef90cdfc13 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx
@@ -5,7 +5,6 @@
  * 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 React, { useCallback } from 'react';
 import { MenuItem, MenuItemCheckbox, MenuSeparator, MenuStateReturn } from 'reakit/Menu';
@@ -13,12 +12,20 @@ import styled, { use } from 'reshadow';
 
 import { Checkbox, joinStyles, Loader, MenuItemElement, menuPanelStyles, useStyles } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { IMenuItem, IMenuData, MenuSubMenuItem, MenuSeparatorItem, MenuActionItem, MenuBaseItem, MenuCustomItem, MenuCheckboxItem } from '@cloudbeaver/core-view';
+import {
+  IMenuData,
+  IMenuItem,
+  MenuActionItem,
+  MenuBaseItem,
+  MenuCheckboxItem,
+  MenuCustomItem,
+  MenuSeparatorItem,
+  MenuSubMenuItem,
+} from '@cloudbeaver/core-view';
 
 import { MenuActionElement } from './MenuActionElement';
 import { SubMenuElement } from './SubMenuElement';
 
-
 export interface IMenuItemRendererProps extends Omit<React.ButtonHTMLAttributes<any>, 'style'> {
   item: IMenuItem;
   menuData: IMenuData;
@@ -29,30 +36,23 @@ export interface IMenuItemRendererProps extends Omit<React.ButtonHTMLAttributes<
   style?: ComponentStyle;
 }
 
-export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuItemRenderer({
-  item, modal, rtl, menuData, menu, onItemClose, style,
-}) {
+export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuItemRenderer({ item, modal, rtl, menuData, menu, onItemClose, style }) {
   const styles = useStyles(menuPanelStyles, style);
-  const onClick = useCallback((keepMenuOpen = true) => {
-    item.events?.onSelect?.();
+  const onClick = useCallback(
+    (keepMenuOpen = true) => {
+      item.events?.onSelect?.();
 
-    if (!(item instanceof MenuSubMenuItem) && keepMenuOpen) {
-      onItemClose?.();
-    }
-  }, [item, onItemClose]);
+      if (!(item instanceof MenuSubMenuItem) && keepMenuOpen) {
+        onItemClose?.();
+      }
+    },
+    [item, onItemClose],
+  );
 
   if (item instanceof MenuCustomItem) {
     const CustomMenuItem = item.getComponent();
 
-    return styled(styles)(
-      <CustomMenuItem
-        item={item}
-        menu={menu}
-        menuData={menuData}
-        style={style}
-        onClick={onClick}
-      />
-    );
+    return styled(styles)(<CustomMenuItem item={item} menu={menu} menuData={menuData} style={style} onClick={onClick} />);
   }
 
   if (item instanceof MenuSubMenuItem) {
@@ -71,7 +71,7 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
         style={style}
         onItemClose={onItemClose}
         onClick={() => onClick()}
-      />
+      />,
     );
   }
 
@@ -80,15 +80,7 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
   }
 
   if (item instanceof MenuActionItem) {
-    return (
-      <MenuActionElement
-        item={item}
-        menu={menu}
-        menuData={menuData}
-        style={style}
-        onClick={onClick}
-      />
-    );
+    return <MenuActionElement item={item} menu={menu} menuData={menuData} style={style} onClick={onClick} />;
   }
 
   if (item instanceof MenuCheckboxItem) {
@@ -110,7 +102,7 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
           tooltip={item.tooltip}
           style={style}
         />
-      </MenuItemCheckbox>
+      </MenuItemCheckbox>,
     );
   }
 
@@ -130,21 +122,21 @@ export const MenuItemRenderer = observer<IMenuItemRendererProps>(function MenuIt
       >
         <MenuItemElement
           label={item.label}
-          icon={IconComponent ? styled(styles)(
-            <Loader suspense inline fullSize>
-              <IconComponent
-                item={item}
-                style={joinStyles(menuPanelStyles, style)}
-                {...extraProps}
-              />
-            </Loader>
-          ) : item.icon}
+          icon={
+            IconComponent
+              ? styled(styles)(
+                  <Loader suspense inline fullSize>
+                    <IconComponent item={item} style={joinStyles(menuPanelStyles, style)} {...extraProps} />
+                  </Loader>,
+                )
+              : item.icon
+          }
           tooltip={item.tooltip}
           style={style}
         />
-      </MenuItem>
+      </MenuItem>,
     );
   }
 
   return null;
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
index 929e7ef8f6..2573f62ca1 100644
--- a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx
@@ -5,12 +5,22 @@
  * 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 { forwardRef, useRef, useState } from 'react';
 import styled from 'reshadow';
 
-import { getComputed, IMenuState, joinStyles, Loader, Menu, MenuItemElement, menuPanelStyles, useAutoLoad, useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  getComputed,
+  IMenuState,
+  joinStyles,
+  Loader,
+  Menu,
+  MenuItemElement,
+  menuPanelStyles,
+  useAutoLoad,
+  useObjectRef,
+  useStyles,
+} from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { DATA_CONTEXT_MENU_NESTED, DATA_CONTEXT_SUBMENU_ITEM, IMenuData, IMenuSubMenuItem, MenuActionItem, useMenu } from '@cloudbeaver/core-view';
 
@@ -26,118 +36,111 @@ interface ISubMenuElementProps extends Omit<React.ButtonHTMLAttributes<any>, 'st
   style?: ComponentStyle;
 }
 
-export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(forwardRef(function SubMenuElement(
-  {
-    menuData,
-    subMenu,
-    itemRenderer,
-    style,
-    menuModal: modal,
-    menuRtl: rtl,
-    onItemClose,
-    ...rest
-  },
-  ref
-) {
-  const menu = useRef<IMenuState>();
-  const styles = useStyles(menuPanelStyles, style);
-  const subMenuData = useMenu({ menu: subMenu.menu, context: menuData.context });
-  const [visible, setVisible] = useState(false);
-  subMenuData.context.set(DATA_CONTEXT_MENU_NESTED, true);
-  subMenuData.context.set(DATA_CONTEXT_SUBMENU_ITEM, subMenu);
+export const SubMenuElement = observer<ISubMenuElementProps, HTMLButtonElement>(
+  forwardRef(function SubMenuElement({ menuData, subMenu, itemRenderer, style, menuModal: modal, menuRtl: rtl, onItemClose, ...rest }, ref) {
+    const menu = useRef<IMenuState>();
+    const styles = useStyles(menuPanelStyles, style);
+    const subMenuData = useMenu({ menu: subMenu.menu, context: menuData.context });
+    const [visible, setVisible] = useState(false);
+    subMenuData.context.set(DATA_CONTEXT_MENU_NESTED, true);
+    subMenuData.context.set(DATA_CONTEXT_SUBMENU_ITEM, subMenu);
 
-  const handler = subMenuData.handler;
-  const hidden = getComputed(() => handler?.isHidden?.(subMenuData.context));
-  useAutoLoad(subMenuData.loaders, !hidden, visible);
+    const handler = subMenuData.handler;
+    const hidden = getComputed(() => handler?.isHidden?.(subMenuData.context));
+    useAutoLoad(subMenuData.loaders, !hidden, visible);
 
-  const handlers = useObjectRef(() => ({
-    handleItemClose() {
-      menu.current?.hide();
-      this.onItemClose?.();
-    },
-    hasBindings() {
-      return this.subMenuData.items.some(
-        item => item instanceof MenuActionItem && item.action.binding !== null
-      );
-    },
-    handleVisibleSwitch(visible: boolean) {
-      setVisible(visible);
-      if (visible) {
-        this.subMenu.events?.onOpen?.();
-        this.handler?.handler?.(this.subMenuData.context);
-      }
-    },
-  }), { subMenuData, menuData, handler, subMenu, onItemClose }, ['handleItemClose', 'hasBindings', 'handleVisibleSwitch']);
+    const handlers = useObjectRef(
+      () => ({
+        handleItemClose() {
+          menu.current?.hide();
+          this.onItemClose?.();
+        },
+        hasBindings() {
+          return this.subMenuData.items.some(item => item instanceof MenuActionItem && item.action.binding !== null);
+        },
+        handleVisibleSwitch(visible: boolean) {
+          setVisible(visible);
+          if (visible) {
+            this.subMenu.events?.onOpen?.();
+            this.handler?.handler?.(this.subMenuData.context);
+          }
+        },
+      }),
+      { subMenuData, menuData, handler, subMenu, onItemClose },
+      ['handleItemClose', 'hasBindings', 'handleVisibleSwitch'],
+    );
 
-  if (hidden) {
-    return null;
-  }
+    if (hidden) {
+      return null;
+    }
 
-  const IconComponent = handler?.iconComponent?.() ?? subMenu.iconComponent?.();
-  const extraProps = handler?.getExtraProps?.() ?? subMenu.getExtraProps?.() as any;
-  const loading = getComputed(() => (
-    handler?.isLoading?.(subMenuData.context)
-    || subMenuData.loaders.some(loader => loader.isLoading())
-    || false
-  ));
-  /** @deprecated must be refactored (#1)*/
-  const displayLabel = getComputed(() => handler?.isLabelVisible?.(subMenuData.context, subMenuData.menu) ?? true);
-  const disabled = getComputed(() => handler?.isDisabled?.(subMenuData.context));
-  const loaded = getComputed(() => !subMenuData.loaders.some(loader => !loader.isLoaded()));
-  const info = handler?.getInfo?.(subMenuData.context, subMenuData.menu);
-  const label = info?.label ?? subMenu.label ?? subMenu.menu.label;
-  const icon = info?.icon ?? subMenu.icon ?? subMenu.menu.icon;
+    const IconComponent = handler?.iconComponent?.() ?? subMenu.iconComponent?.();
+    const extraProps = handler?.getExtraProps?.() ?? (subMenu.getExtraProps?.() as any);
+    const loading = getComputed(() => handler?.isLoading?.(subMenuData.context) || subMenuData.loaders.some(loader => loader.isLoading()) || false);
+    /** @deprecated must be refactored (#1)*/
+    const displayLabel = getComputed(() => handler?.isLabelVisible?.(subMenuData.context, subMenuData.menu) ?? true);
+    const disabled = getComputed(() => handler?.isDisabled?.(subMenuData.context));
+    const loaded = getComputed(() => !subMenuData.loaders.some(loader => !loader.isLoaded()));
+    const info = handler?.getInfo?.(subMenuData.context, subMenuData.menu);
+    const label = info?.label ?? subMenu.label ?? subMenu.menu.label;
+    const icon = info?.icon ?? subMenu.icon ?? subMenu.menu.icon;
 
-  const tooltip = info?.tooltip ?? subMenu.tooltip ?? subMenu.menu.tooltip;
-  const MenuItemRenderer = itemRenderer;
-  const panelAvailable = subMenuData.available || !loaded;
+    const tooltip = info?.tooltip ?? subMenu.tooltip ?? subMenu.menu.tooltip;
+    const MenuItemRenderer = itemRenderer;
+    const panelAvailable = subMenuData.available || !loaded;
 
-  return styled(styles)(
-    <Menu
-      ref={ref}
-      menuRef={menu}
-      label={subMenuData.menu.label}
-      items={() => subMenuData.items.map(item => menu.current &&  (
-        <MenuItemRenderer
-          key={item.id}
-          item={item}
-          menuData={subMenuData}
-          menu={menu.current}
-          rtl={rtl}
-          modal={modal}
-          style={style}
-          onItemClose={handlers.handleItemClose}
-        />
-      ))}
-      rtl={rtl}
-      modal={modal}
-      style={style}
-      placement={rtl ? 'left-start' : 'right-start'}
-      panelAvailable={panelAvailable}
-      disabled={disabled}
-      getHasBindings={handlers.hasBindings}
-      submenu
-      onVisibleSwitch={handlers.handleVisibleSwitch}
-      {...rest}
-    >
-      <MenuItemElement
-        label={label}
-        displayLabel={displayLabel}
-        icon={IconComponent ? styled(styles)(
-          <Loader suspense small fullSize>
-            <IconComponent
-              item={subMenu}
-              style={joinStyles(menuPanelStyles, style)}
-              {...extraProps}
-            />
-          </Loader>
-        ) : icon}
-        tooltip={tooltip}
-        panelAvailable={panelAvailable}
-        loading={loading}
+    return styled(styles)(
+      <Menu
+        ref={ref}
+        menuRef={menu}
+        label={subMenuData.menu.label}
+        items={() =>
+          subMenuData.items.map(
+            item =>
+              menu.current && (
+                <MenuItemRenderer
+                  key={item.id}
+                  item={item}
+                  menuData={subMenuData}
+                  menu={menu.current}
+                  rtl={rtl}
+                  modal={modal}
+                  style={style}
+                  onItemClose={handlers.handleItemClose}
+                />
+              ),
+          )
+        }
+        rtl={rtl}
+        modal={modal}
         style={style}
-        menu
-      />
-    </Menu>
-  );
-}));
\ No newline at end of file
+        placement={rtl ? 'left-start' : 'right-start'}
+        panelAvailable={panelAvailable}
+        disabled={disabled}
+        getHasBindings={handlers.hasBindings}
+        submenu
+        onVisibleSwitch={handlers.handleVisibleSwitch}
+        {...rest}
+      >
+        <MenuItemElement
+          label={label}
+          displayLabel={displayLabel}
+          icon={
+            IconComponent
+              ? styled(styles)(
+                  <Loader suspense small fullSize>
+                    <IconComponent item={subMenu} style={joinStyles(menuPanelStyles, style)} {...extraProps} />
+                  </Loader>,
+                )
+              : icon
+          }
+          tooltip={tooltip}
+          panelAvailable={panelAvailable}
+          loading={loading}
+          style={style}
+          menu
+        />
+      </Menu>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-ui/src/DragAndDrop/DNDAcceptType.ts b/webapp/packages/core-ui/src/DragAndDrop/DNDAcceptType.ts
index 0a176fcee9..931ff90987 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/DNDAcceptType.ts
+++ b/webapp/packages/core-ui/src/DragAndDrop/DNDAcceptType.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DND_ELEMENT_TYPE } from './DND_ELEMENT_TYPE';
 import type { DND_NATIVE_TYPE } from './DND_NATIVE_TYPE';
 
 type AcceptType = typeof DND_NATIVE_TYPE | typeof DND_ELEMENT_TYPE;
 
-export type DNDAcceptType = AcceptType | AcceptType[];
\ No newline at end of file
+export type DNDAcceptType = AcceptType | AcceptType[];
diff --git a/webapp/packages/core-ui/src/DragAndDrop/DNDPreview.tsx b/webapp/packages/core-ui/src/DragAndDrop/DNDPreview.tsx
index 31716432bc..d82c0f438f 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/DNDPreview.tsx
+++ b/webapp/packages/core-ui/src/DragAndDrop/DNDPreview.tsx
@@ -5,7 +5,6 @@
  * 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 { ConnectDragPreview, DragPreviewImage } from 'react-dnd';
 
@@ -17,6 +16,5 @@ interface Props {
 }
 
 export const DNDPreview = observer<Props>(function DNDPreview({ src, data }) {
-
-  return (<DragPreviewImage connect={data.setPreviewRef as ConnectDragPreview} src={src} />);
-});
\ No newline at end of file
+  return <DragPreviewImage connect={data.setPreviewRef as ConnectDragPreview} src={src} />;
+});
diff --git a/webapp/packages/core-ui/src/DragAndDrop/DNDProvider.tsx b/webapp/packages/core-ui/src/DragAndDrop/DNDProvider.tsx
index 7296854054..1e285ac231 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/DNDProvider.tsx
+++ b/webapp/packages/core-ui/src/DragAndDrop/DNDProvider.tsx
@@ -5,14 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 
 export const DNDProvider: React.FC<React.PropsWithChildren> = function DNDProvider({ children }) {
-  return (
-    <DndProvider backend={HTML5Backend}>
-      {children}
-    </DndProvider>
-  );
-};
\ No newline at end of file
+  return <DndProvider backend={HTML5Backend}>{children}</DndProvider>;
+};
diff --git a/webapp/packages/core-ui/src/DragAndDrop/DND_ELEMENT_TYPE.ts b/webapp/packages/core-ui/src/DragAndDrop/DND_ELEMENT_TYPE.ts
index 96f3014c31..9f6ba89dbc 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/DND_ELEMENT_TYPE.ts
+++ b/webapp/packages/core-ui/src/DragAndDrop/DND_ELEMENT_TYPE.ts
@@ -5,4 +5,4 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export const DND_ELEMENT_TYPE = '@dnd';
\ No newline at end of file
+export const DND_ELEMENT_TYPE = '@dnd';
diff --git a/webapp/packages/core-ui/src/DragAndDrop/DND_NATIVE_TYPE.ts b/webapp/packages/core-ui/src/DragAndDrop/DND_NATIVE_TYPE.ts
index 91793b6b60..efe4f974ca 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/DND_NATIVE_TYPE.ts
+++ b/webapp/packages/core-ui/src/DragAndDrop/DND_NATIVE_TYPE.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { NativeTypes } from 'react-dnd-html5-backend';
 
-export const DND_NATIVE_TYPE = NativeTypes;
\ No newline at end of file
+export const DND_NATIVE_TYPE = NativeTypes;
diff --git a/webapp/packages/core-ui/src/DragAndDrop/useDNDBox.ts b/webapp/packages/core-ui/src/DragAndDrop/useDNDBox.ts
index 4015bc84fb..3bb8b8d178 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/useDNDBox.ts
+++ b/webapp/packages/core-ui/src/DragAndDrop/useDNDBox.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable, runInAction } from 'mobx';
 import React, { useRef } from 'react';
 import { useDrop } from 'react-dnd';
@@ -49,49 +48,60 @@ export function useDNDBox(options: IOptions): IDNDBox {
 
   const ref = useRef<React.ReactElement | Element | null>(null);
 
-  const state = useObservableRef<IState>(() => ({
-    isOver: false,
-    isOverCurrent: false,
-    canDrop: false,
-    context: null,
-  }), {
-    isOver: observable.ref,
-    isOverCurrent: observable.ref,
-    canDrop: observable.ref,
-    context: observable.ref,
-  }, false);
+  const state = useObservableRef<IState>(
+    () => ({
+      isOver: false,
+      isOverCurrent: false,
+      canDrop: false,
+      context: null,
+    }),
+    {
+      isOver: observable.ref,
+      isOverCurrent: observable.ref,
+      canDrop: observable.ref,
+      context: observable.ref,
+    },
+    false,
+  );
 
-  const [, setTargetRef] = useDrop<IDataContextProvider, void, void>(() => ({
-    accept: options.type as string | string[],
-    drop: (item, monitor) => {
-      if (monitor.didDrop() || !monitor.isOver({ shallow: true })) {
-        return;
-      }
+  const [, setTargetRef] = useDrop<IDataContextProvider, void, void>(
+    () => ({
+      accept: options.type as string | string[],
+      drop: (item, monitor) => {
+        if (monitor.didDrop() || !monitor.isOver({ shallow: true })) {
+          return;
+        }
 
-      options.onDrop?.(item, monitor.getClientOffset());
-    },
-    hover: (item, monitor) => {
-      if (monitor.canDrop()) {
-        options.onHover?.(item, monitor.getClientOffset());
-      }
-    },
-    canDrop: (context, monitor) => (options.canDrop?.(context, monitor.isOver({ shallow: true })) ?? true),
-    collect: monitor => {
-      runInAction(() => {
-        state.isOver = monitor.isOver();
-        state.isOverCurrent = monitor.isOver({ shallow: true });
-        state.canDrop = monitor.canDrop();
-        state.context = monitor.getItem();
-      });
-    },
-  }), [options]);
+        options.onDrop?.(item, monitor.getClientOffset());
+      },
+      hover: (item, monitor) => {
+        if (monitor.canDrop()) {
+          options.onHover?.(item, monitor.getClientOffset());
+        }
+      },
+      canDrop: (context, monitor) => options.canDrop?.(context, monitor.isOver({ shallow: true })) ?? true,
+      collect: monitor => {
+        runInAction(() => {
+          state.isOver = monitor.isOver();
+          state.isOverCurrent = monitor.isOver({ shallow: true });
+          state.canDrop = monitor.canDrop();
+          state.context = monitor.getItem();
+        });
+      },
+    }),
+    [options],
+  );
 
-  return useObjectRef(() => ({
-    ref,
-    state,
-    setRef(element: React.ReactElement | Element | null) {
-      this.setTargetRef(element);
-      ref.current = element;
-    },
-  }), { setTargetRef }, ['setRef']);
-}
\ No newline at end of file
+  return useObjectRef(
+    () => ({
+      ref,
+      state,
+      setRef(element: React.ReactElement | Element | null) {
+        this.setTargetRef(element);
+        ref.current = element;
+      },
+    }),
+    { setTargetRef },
+    ['setRef'],
+  );
+}
diff --git a/webapp/packages/core-ui/src/DragAndDrop/useDNDData.ts b/webapp/packages/core-ui/src/DragAndDrop/useDNDData.ts
index 465fb93d42..6f77c35a7c 100644
--- a/webapp/packages/core-ui/src/DragAndDrop/useDNDData.ts
+++ b/webapp/packages/core-ui/src/DragAndDrop/useDNDData.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { useDrag } from 'react-dnd';
 
@@ -37,11 +36,15 @@ interface IOptions {
 }
 
 export function useDNDData(context: IDataContextProvider, options: IOptions = {}): IDNDData {
-  const state = useObservableRef<IState>(() => ({
-    isDragging: false,
-  }), {
-    isDragging: observable.ref,
-  }, false);
+  const state = useObservableRef<IState>(
+    () => ({
+      isDragging: false,
+    }),
+    {
+      isDragging: observable.ref,
+    },
+    false,
+  );
   options = useObjectRef(options);
 
   const [, setTarget, setPreview] = useDrag<IDataContextProvider, void, void>(() => ({
@@ -69,14 +72,19 @@ export function useDNDData(context: IDataContextProvider, options: IOptions = {}
     },
   }));
 
-  return useObservableRef<IDNDDataPrivate>(() => ({
-    state,
-    context,
-    setTargetRef(element) {
-      this.setTarget(element);
-    },
-    setPreviewRef(element) {
-      this.setPreview(element);
-    },
-  }), { context: observable.ref }, { context, setTarget, setPreview }, ['setTargetRef', 'setPreviewRef']);
-}
\ No newline at end of file
+  return useObservableRef<IDNDDataPrivate>(
+    () => ({
+      state,
+      context,
+      setTargetRef(element) {
+        this.setTarget(element);
+      },
+      setPreviewRef(element) {
+        this.setPreview(element);
+      },
+    }),
+    { context: observable.ref },
+    { context, setTarget, setPreview },
+    ['setTargetRef', 'setPreviewRef'],
+  );
+}
diff --git a/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx b/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx
index 9537d5167a..46aa7d758d 100644
--- a/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx
+++ b/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx
@@ -5,15 +5,19 @@
  * 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 {
-  useState, useCallback, ChangeEvent, useRef, useEffect
-} from 'react';
+import { ChangeEvent, useCallback, useEffect, useRef, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
-import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent, DialogComponentProps } from '@cloudbeaver/core-dialogs';
+import { Button, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  CommonDialogBody,
+  CommonDialogFooter,
+  CommonDialogHeader,
+  CommonDialogWrapper,
+  DialogComponent,
+  DialogComponentProps,
+} from '@cloudbeaver/core-dialogs';
 
 const styles = css`
   textarea {
@@ -28,37 +32,35 @@ const styles = css`
   }
 `;
 
-export const EditorDialog: DialogComponent<string, string> = observer(
-  function EditorDialog({
-    payload,
-    resolveDialog,
-    rejectDialog,
-  }: DialogComponentProps<string, string>) {
-    const textareaRef = useRef<HTMLTextAreaElement>(null);
-    const [value, setValue] = useState(payload);
-    const handleChange = useCallback((event: ChangeEvent<HTMLTextAreaElement>) => setValue(event.target.value), []);
-    const handleApply = useCallback(() => resolveDialog(value), [value, resolveDialog]);
-    const translate = useTranslate();
+export const EditorDialog: DialogComponent<string, string> = observer(function EditorDialog({
+  payload,
+  resolveDialog,
+  rejectDialog,
+}: DialogComponentProps<string, string>) {
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  const [value, setValue] = useState(payload);
+  const handleChange = useCallback((event: ChangeEvent<HTMLTextAreaElement>) => setValue(event.target.value), []);
+  const handleApply = useCallback(() => resolveDialog(value), [value, resolveDialog]);
+  const translate = useTranslate();
 
-    useEffect(() => {
-      setTimeout(() => textareaRef.current?.focus(), 100);
-    }, []);
+  useEffect(() => {
+    setTimeout(() => textareaRef.current?.focus(), 100);
+  }, []);
 
-    return styled(useStyles(styles))(
-      <CommonDialogWrapper>
-        <CommonDialogHeader title="app_shared_inlineEditor_dialog_title" onReject={rejectDialog} />
-        <CommonDialogBody>
-          <textarea ref={textareaRef} value={value} onChange={handleChange} />
-        </CommonDialogBody>
-        <CommonDialogFooter>
-          <Button type="button" mod={['outlined']} onClick={rejectDialog}>
-            {translate('app_shared_inlineEditor_dialog_cancel')}
-          </Button>
-          <Button type="button" mod={['unelevated']} onClick={handleApply}>
-            {translate('app_shared_inlineEditor_dialog_apply')}
-          </Button>
-        </CommonDialogFooter>
-      </CommonDialogWrapper>
-    );
-  }
-);
+  return styled(useStyles(styles))(
+    <CommonDialogWrapper>
+      <CommonDialogHeader title="app_shared_inlineEditor_dialog_title" onReject={rejectDialog} />
+      <CommonDialogBody>
+        <textarea ref={textareaRef} value={value} onChange={handleChange} />
+      </CommonDialogBody>
+      <CommonDialogFooter>
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
+          {translate('app_shared_inlineEditor_dialog_cancel')}
+        </Button>
+        <Button type="button" mod={['unelevated']} onClick={handleApply}>
+          {translate('app_shared_inlineEditor_dialog_apply')}
+        </Button>
+      </CommonDialogFooter>
+    </CommonDialogWrapper>,
+  );
+});
diff --git a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
index 9177620225..38bf61e298 100644
--- a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
+++ b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
@@ -5,11 +5,8 @@
  * 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 {
-  useEffect, useRef, useCallback, ChangeEvent, useImperativeHandle, forwardRef
-} from 'react';
+import { ChangeEvent, forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
 import styled, { use } from 'reshadow';
 
 import { Icon, IconOrImage, Loader, useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
@@ -43,127 +40,116 @@ export interface InlineEditorProps extends Omit<React.InputHTMLAttributes<HTMLIn
   className?: string;
 }
 
-export const InlineEditor = observer<InlineEditorProps, HTMLInputElement>(forwardRef(function InlineEditor({
-  value,
-  controlsPosition = 'right',
-  simple,
-  hideSave,
-  hideCancel,
-  disableSave,
-  edited = false,
-  autofocus,
-  active,
-  loading,
-  disabled,
-  style,
-  onChange,
-  onSave,
-  onUndo,
-  onReject,
-  onClick,
-  onDoubleClick,
-  className,
-  ...rest
-}, ref) {
-  const props = useObjectRef({
-    onChange,
-    onReject,
-    onSave,
-    value,
-    disableSave,
-  });
+export const InlineEditor = observer<InlineEditorProps, HTMLInputElement>(
+  forwardRef(function InlineEditor(
+    {
+      value,
+      controlsPosition = 'right',
+      simple,
+      hideSave,
+      hideCancel,
+      disableSave,
+      edited = false,
+      autofocus,
+      active,
+      loading,
+      disabled,
+      style,
+      onChange,
+      onSave,
+      onUndo,
+      onReject,
+      onClick,
+      onDoubleClick,
+      className,
+      ...rest
+    },
+    ref,
+  ) {
+    const props = useObjectRef({
+      onChange,
+      onReject,
+      onSave,
+      value,
+      disableSave,
+    });
 
-  const commonDialogService = useService(CommonDialogService);
+    const commonDialogService = useService(CommonDialogService);
 
-  const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
-    props.onChange(event.target.value);
-  }, []);
+    const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
+      props.onChange(event.target.value);
+    }, []);
 
-  const handlePopup = useCallback(async () => {
-    const newValue = await commonDialogService.open(EditorDialog, props.value);
-    if (newValue === DialogueStateResult.Rejected || newValue === DialogueStateResult.Resolved) {
-      props.onReject?.();
-    } else {
-      props.onChange(newValue);
-      props.onSave?.();
-    }
-  }, []);
-
-  const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLInputElement>) => {
-    switch (event.key) {
-      case 'Enter':
-        if (!props.disableSave && props.onSave) {
-          props.onSave();
-        }
-        break;
-      case 'Escape':
+    const handlePopup = useCallback(async () => {
+      const newValue = await commonDialogService.open(EditorDialog, props.value);
+      if (newValue === DialogueStateResult.Rejected || newValue === DialogueStateResult.Resolved) {
         props.onReject?.();
-        break;
-    }
-  }, []);
+      } else {
+        props.onChange(newValue);
+        props.onSave?.();
+      }
+    }, []);
 
-  const inputRef = useRef<HTMLInputElement>(null);
+    const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLInputElement>) => {
+      switch (event.key) {
+        case 'Enter':
+          if (!props.disableSave && props.onSave) {
+            props.onSave();
+          }
+          break;
+        case 'Escape':
+          props.onReject?.();
+          break;
+      }
+    }, []);
 
-  useEffect(() => {
-    if (autofocus) {
-      setTimeout(() => inputRef.current?.focus(), 100);
-    }
-  }, []);
+    const inputRef = useRef<HTMLInputElement>(null);
 
-  useImperativeHandle(ref, () => inputRef.current!);
+    useEffect(() => {
+      if (autofocus) {
+        setTimeout(() => inputRef.current?.focus(), 100);
+      }
+    }, []);
 
-  return styled(useStyles(InlineEditorStyles, style))(
-    <editor className={className} {...use({ active })} onClick={onClick} onDoubleClick={onDoubleClick}>
-      <editor-container>
-        <input
-          ref={inputRef}
-          lang="en"
-          value={value}
-          autoComplete="off"
-          disabled={disabled}
-          onChange={handleChange}
-          onKeyDown={handleKeyDown}
-          {...rest}
-        />
-      </editor-container>
-      <editor-actions as="div" {...use({ position: controlsPosition })} onMouseDown={e => e.preventDefault()}>
-        {!hideSave && (
-          <editor-action
-            as="button"
-            disabled={disabled || disableSave}
-            onClick={onSave}
-          >
-            {loading ? <Loader small fullSize /> : <Icon name="apply" viewBox="0 0 12 10" />}
-          </editor-action>
-        )}
-        {!hideCancel && onReject && (
-          <editor-action
-            as="button"
+    useImperativeHandle(ref, () => inputRef.current!);
+
+    return styled(useStyles(InlineEditorStyles, style))(
+      <editor className={className} {...use({ active })} onClick={onClick} onDoubleClick={onDoubleClick}>
+        <editor-container>
+          <input
+            ref={inputRef}
+            lang="en"
+            value={value}
+            autoComplete="off"
             disabled={disabled}
-            onClick={onReject}
-          >
-            <Icon name="reject" viewBox="0 0 11 11" />
-          </editor-action>
-        )}
-        {onUndo && (
-          <editor-action
-            as="button"
-            disabled={!edited || disabled}
-            onClick={edited ? onUndo : undefined}
-          >
-            <IconOrImage icon="/icons/data_revert.svg" />
-          </editor-action>
-        )}
-        {!simple && (
-          <editor-action
-            as="button"
-            disabled={disabled}
-            onClick={handlePopup}
-          >
-            <Icon name="edit" viewBox="0 0 13 13" />
-          </editor-action>
-        )}
-      </editor-actions>
-    </editor>
-  );
-}));
+            onChange={handleChange}
+            onKeyDown={handleKeyDown}
+            {...rest}
+          />
+        </editor-container>
+        <editor-actions as="div" {...use({ position: controlsPosition })} onMouseDown={e => e.preventDefault()}>
+          {!hideSave && (
+            <editor-action as="button" disabled={disabled || disableSave} onClick={onSave}>
+              {loading ? <Loader small fullSize /> : <Icon name="apply" viewBox="0 0 12 10" />}
+            </editor-action>
+          )}
+          {!hideCancel && onReject && (
+            <editor-action as="button" disabled={disabled} onClick={onReject}>
+              <Icon name="reject" viewBox="0 0 11 11" />
+            </editor-action>
+          )}
+          {onUndo && (
+            <editor-action as="button" disabled={!edited || disabled} onClick={edited ? onUndo : undefined}>
+              <IconOrImage icon="/icons/data_revert.svg" />
+            </editor-action>
+          )}
+          {!simple && (
+            <editor-action as="button" disabled={disabled} onClick={handlePopup}>
+              <Icon name="edit" viewBox="0 0 13 13" />
+            </editor-action>
+          )}
+        </editor-actions>
+      </editor>,
+    );
+  }),
+);
diff --git a/webapp/packages/core-ui/src/InlineEditor/styles.ts b/webapp/packages/core-ui/src/InlineEditor/styles.ts
index 1f1610ce11..202f2e06ee 100644
--- a/webapp/packages/core-ui/src/InlineEditor/styles.ts
+++ b/webapp/packages/core-ui/src/InlineEditor/styles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const InlineEditorStyles = css`
@@ -24,7 +23,8 @@ export const InlineEditorStyles = css`
     border: solid 1px;
   }
 
-  editor:focus-within, editor[|active] {
+  editor:focus-within,
+  editor[|active] {
     border-color: #52c41a !important;
   }
 
@@ -35,7 +35,9 @@ export const InlineEditorStyles = css`
     display: flex;
     box-sizing: border-box;
 
-    & input, & input[disabled], & input[readonly] {
+    & input,
+    & input[disabled],
+    & input[readonly] {
       border: none;
       border-radius: unset;
       width: 100%;
@@ -44,7 +46,7 @@ export const InlineEditorStyles = css`
       padding: 0 8px;
     }
   }
-  
+
   editor-actions {
     composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
     position: absolute;
@@ -61,15 +63,16 @@ export const InlineEditorStyles = css`
     }
   }
 
-  editor:focus-within, editor[|active] {
+  editor:focus-within,
+  editor[|active] {
     & editor-actions {
-      border-top-color:  #52c41a !important;
+      border-top-color: #52c41a !important;
       border-right-color: #52c41a !important;
       border-bottom-color: #52c41a !important;
     }
   }
 
-  editor-actions[|position=inside] {
+  editor-actions[|position='inside'] {
     position: relative;
     flex: 0 0 auto;
     top: 0;
@@ -79,24 +82,25 @@ export const InlineEditorStyles = css`
     border-bottom: none;
   }
 
-  editor-actions[|position=bottom],
-  editor-actions[|position=top] {
+  editor-actions[|position='bottom'],
+  editor-actions[|position='top'] {
     right: -1px;
     left: auto;
   }
 
-  editor:focus-within, editor[|active] {
-    & editor-actions[|position=bottom],
-    & editor-actions[|position=top] {
+  editor:focus-within,
+  editor[|active] {
+    & editor-actions[|position='bottom'],
+    & editor-actions[|position='top'] {
       border-left-color: #52c41a !important;
     }
   }
 
-  editor-actions[|position=bottom] {
+  editor-actions[|position='bottom'] {
     top: 100%;
   }
 
-  editor-actions[|position=top] {
+  editor-actions[|position='top'] {
     bottom: 100%;
     top: auto;
   }
diff --git a/webapp/packages/core-ui/src/LocaleService.ts b/webapp/packages/core-ui/src/LocaleService.ts
index 5e84af109b..937dc42ad0 100644
--- a/webapp/packages/core-ui/src/LocaleService.ts
+++ b/webapp/packages/core-ui/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
diff --git a/webapp/packages/core-ui/src/Screens/AppScreen/NavigationService.ts b/webapp/packages/core-ui/src/Screens/AppScreen/NavigationService.ts
index 9a6f9047a0..2ebfce094e 100644
--- a/webapp/packages/core-ui/src/Screens/AppScreen/NavigationService.ts
+++ b/webapp/packages/core-ui/src/Screens/AppScreen/NavigationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { RouterService } from '@cloudbeaver/core-routing';
@@ -14,9 +13,7 @@ import { RouterService } from '@cloudbeaver/core-routing';
 export class NavigationService {
   readonly navigationTask: IExecutor<any>;
 
-  constructor(
-    routerService: RouterService
-  ) {
+  constructor(routerService: RouterService) {
     this.navigationTask = new Executor();
     routerService.transitionTask.before(this.navigationTask);
   }
diff --git a/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts b/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
index fc112c8a4e..8efc478a08 100644
--- a/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
+++ b/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -21,9 +20,7 @@ export class OptionsPanelService {
   panelComponent: (() => React.FC) | null;
   private basePanelComponent: (() => React.FC) | null;
 
-  constructor(
-    private readonly navigationService: NavigationService
-  ) {
+  constructor(private readonly navigationService: NavigationService) {
     makeObservable(this, {
       active: observable,
       panelComponent: observable,
diff --git a/webapp/packages/core-ui/src/SideBarPanel/LeftBarPanelService.ts b/webapp/packages/core-ui/src/SideBarPanel/LeftBarPanelService.ts
index 2e0555e722..3944a6198d 100644
--- a/webapp/packages/core-ui/src/SideBarPanel/LeftBarPanelService.ts
+++ b/webapp/packages/core-ui/src/SideBarPanel/LeftBarPanelService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { TabsContainer } from '../Tabs/TabsContainer/TabsContainer';
@@ -17,4 +16,4 @@ export class LeftBarPanelService {
   constructor() {
     this.tabsContainer = new TabsContainer('Left Side Bar');
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx
index 42e3d5800e..5ec06545ca 100644
--- a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx
+++ b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -27,7 +26,7 @@ const tabsStyles = css`
     overflow: auto;
   }
   Tab {
-    height: 36px!important;
+    height: 36px !important;
     font-weight: 500 !important;
   }
   TabPanel {
@@ -74,6 +73,6 @@ export const SideBarPanel = observer<Props>(function SideBarPanel({ container })
           <TabPanelList style={tabStyle} />
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts
index cd04237e6d..092b97713f 100644
--- a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts
+++ b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { TabsContainer } from '../Tabs/TabsContainer/TabsContainer';
@@ -17,4 +16,4 @@ export class SideBarPanelService {
   constructor() {
     this.tabsContainer = new TabsContainer('Right Side Bar');
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE.ts b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE.ts
index fb7e234bab..32ce1da79e 100644
--- a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE.ts
+++ b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE.ts
@@ -5,10 +5,9 @@
  * 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_TAB_CLOSE = createAction('tab-close', {
   label: 'ui_close',
   tooltip: 'ui_close',
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL.ts b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL.ts
index 8b2946ca9c..1ff45bb696 100644
--- a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL.ts
+++ b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL.ts
@@ -5,7 +5,6 @@
  * 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_TAB_CLOSE_ALL = createAction('tab-close-all', {
diff --git a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_LEFT.ts b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_LEFT.ts
index ec6513e2e2..41333b4e24 100644
--- a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_LEFT.ts
+++ b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_LEFT.ts
@@ -5,7 +5,6 @@
  * 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_TAB_CLOSE_ALL_TO_THE_LEFT = createAction('tab-close-all-to-the-left', {
diff --git a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_RIGHT.ts b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_RIGHT.ts
index 229b872082..cea4b95a78 100644
--- a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_RIGHT.ts
+++ b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_ALL_TO_THE_RIGHT.ts
@@ -5,7 +5,6 @@
  * 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_TAB_CLOSE_ALL_TO_THE_RIGHT = createAction('tab-close-all-to-the-right', {
diff --git a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_OTHERS.ts b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_OTHERS.ts
index e9ab8cb102..2702f36a40 100644
--- a/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_OTHERS.ts
+++ b/webapp/packages/core-ui/src/Tabs/Actions/ACTION_TAB_CLOSE_OTHERS.ts
@@ -5,7 +5,6 @@
  * 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_TAB_CLOSE_OTHERS = createAction('tab-close-others', {
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/BASE_TAB_STYLES.ts b/webapp/packages/core-ui/src/Tabs/Tab/BASE_TAB_STYLES.ts
index 8f119cdfb5..41c14ab4dd 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/BASE_TAB_STYLES.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/BASE_TAB_STYLES.ts
@@ -5,103 +5,102 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BASE_TAB_STYLES = css`
-placeholder {
-  composes: placeholder from global;
-}
-BaseTab {
-  position: relative;
-  outline: none;
-  font-weight: normal;
-  cursor: pointer;
-  padding: 0;
-  white-space: nowrap;
+  placeholder {
+    composes: placeholder from global;
+  }
+  BaseTab {
+    position: relative;
+    outline: none;
+    font-weight: normal;
+    cursor: pointer;
+    padding: 0;
+    white-space: nowrap;
 
-  height: 48px;
-  border-top: solid 2px transparent;
+    height: 48px;
+    border-top: solid 2px transparent;
 
-  &:global([aria-selected="true"]) {
-    font-weight: 500;
-    cursor: auto;
-    border-top-color: var(--theme-negative);
-    opacity: 1;
+    &:global([aria-selected='true']) {
+      font-weight: 500;
+      cursor: auto;
+      border-top-color: var(--theme-negative);
+      opacity: 1;
 
-    &:before {
-      display: none;
+      &:before {
+        display: none;
+      }
+    }
+
+    &:not(:global([aria-selected='true'])) {
+      background-color: transparent !important;
     }
   }
 
-  &:not(:global([aria-selected="true"])) {
-    background-color: transparent !important;
+  tab-inner {
+    composes: theme-typography--body2 tab from global;
+    display: grid;
+    position: relative;
   }
-}
 
-tab-inner {
-  composes: theme-typography--body2 tab from global;
-  display: grid;
-  position: relative;
-}
+  tab-inner[|selected] portal,
+  tab-inner portal[|menuOpened],
+  tab-inner:hover portal,
+  tab-inner:focus-within portal,
+  tab-inner[|selected] tab-action,
+  tab-inner:hover tab-action,
+  tab-inner:focus-within tab-action {
+    visibility: visible;
+  }
 
-tab-inner[|selected] portal,
-tab-inner portal[|menuOpened],
-tab-inner:hover portal,
-tab-inner:focus-within portal,
-tab-inner[|selected] tab-action,
-tab-inner:hover tab-action,
-tab-inner:focus-within tab-action {
-  visibility: visible;
-}
+  tab-container {
+    max-width: 240px;
+    height: 100%;
+    display: flex;
+    flex-shrink: 0;
+    text-align: left;
+    align-items: center;
 
-tab-container {
-  max-width: 240px;
-  height: 100%;
-  display: flex;
-  flex-shrink: 0;
-  text-align: left;
-  align-items: center;
-
-  & tab-icon {
-    height: 24px;
-    padding-left: 12px;
-
-    & StaticImage,
-    & IconOrImage,
-    & img {
-      width: 24px;
-    }
-
-    & placeholder {
-      width: 24px;
+    & tab-icon {
       height: 24px;
+      padding-left: 12px;
+
+      & StaticImage,
+      & IconOrImage,
+      & img {
+        width: 24px;
+      }
+
+      & placeholder {
+        width: 24px;
+        height: 24px;
+      }
+    }
+
+    & tab-title {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      padding: 0 12px;
+    }
+
+    & tab-title placeholder {
+      width: 80px;
+      height: 16px;
     }
   }
 
-  & tab-title {
+  TabList {
+    box-sizing: border-box;
+  }
+
+  TabPanel {
+    flex: 1;
+    display: flex;
     overflow: hidden;
-    text-overflow: ellipsis;
-    padding: 0 12px;
+    outline: none;
+    position: relative;
   }
-
-  & tab-title placeholder {
-    width: 80px;
-    height: 16px;
-  }
-}
-
-TabList {
-  box-sizing: border-box;
-}
-
-TabPanel {
-  flex: 1;
-  display: flex;
-  overflow: hidden;
-  outline: none;
-  position: relative;
-}
 `;
 
 export const BASE_TAB_ACTION_STYLES = css`
@@ -140,7 +139,7 @@ export const BASE_TAB_ACTION_STYLES = css`
     }
 
     &:before {
-      content: "";
+      content: '';
       display: block;
       left: -4px;
       top: 0;
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/BorderTabStyles.ts b/webapp/packages/core-ui/src/Tabs/Tab/BorderTabStyles.ts
index a3983a17d8..81cebd556b 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/BorderTabStyles.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/BorderTabStyles.ts
@@ -5,35 +5,33 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const BORDER_TAB_STYLES = css`
-    TabList {
-      align-items: center;
-      box-sizing: border-box;
-      display: inline-flex;
-      width: 100%;
-      padding-left: 24px;
-      outline: none;
+  TabList {
+    align-items: center;
+    box-sizing: border-box;
+    display: inline-flex;
+    width: 100%;
+    padding-left: 24px;
+    outline: none;
+  }
+
+  TabPanel {
+    overflow: auto !important;
+  }
+
+  Tab {
+    composes: theme-typography--body2 from global;
+    text-transform: uppercase;
+    font-weight: normal;
+
+    &:global([aria-selected='true']) {
+      font-weight: normal !important;
     }
 
-    TabPanel {
-      overflow: auto !important;
+    & TabTitle {
+      padding: 0 24px !important;
     }
-
-    Tab {
-      composes: theme-typography--body2 from global;
-      text-transform: uppercase;
-      font-weight: normal;
-
-      &:global([aria-selected=true]) {
-        font-weight: normal !important;
-      }
-
-      & TabTitle {
-        padding: 0 24px !important;
-      }
-    }
-  `
-;
+  }
+`;
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TABS_CONTEXT.ts b/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TABS_CONTEXT.ts
index a720442bdc..7040ecca13 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TABS_CONTEXT.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TABS_CONTEXT.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { ITabsContext } from '../TabsContext';
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TAB_ID.ts b/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TAB_ID.ts
index fe3e769cbd..9badc95978 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TAB_ID.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/DATA_CONTEXT_TAB_ID.ts
@@ -5,7 +5,6 @@
  * 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_TAB_ID = createDataContext<string>('tab-id');
\ No newline at end of file
+export const DATA_CONTEXT_TAB_ID = createDataContext<string>('tab-id');
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/MENU_TAB.ts b/webapp/packages/core-ui/src/Tabs/Tab/MENU_TAB.ts
index 0e06065412..e7938a41bc 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/MENU_TAB.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/MENU_TAB.ts
@@ -5,7 +5,6 @@
  * 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_TAB = createMenu('tab', 'Tab menu');
\ No newline at end of file
+export const MENU_TAB = createMenu('tab', 'Tab menu');
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
index 99929e594a..47ec172016 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
@@ -5,13 +5,12 @@
  * 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 { useMemo, useState } from 'react';
 import { Tab as BaseTab } from 'reakit/Tab';
 import styled, { use } from 'reshadow';
 
-import { getComputed, Icon, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { getComputed, Icon, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { IDataContext, useMenu } from '@cloudbeaver/core-view';
 
@@ -25,18 +24,7 @@ import { MENU_TAB } from './MENU_TAB';
 import type { TabProps } from './TabProps';
 import { useTab } from './useTab';
 
-export const Tab = observer<TabProps>(function Tab({
-  tabId,
-  title,
-  menuContext,
-  disabled,
-  className,
-  children,
-  style,
-  onOpen,
-  onClose,
-  onClick,
-}) {
+export const Tab = observer<TabProps>(function Tab({ tabId, title, menuContext, disabled, className, children, style, onOpen, onClose, onClick }) {
   const translate = useTranslate();
   const tabContext = useMemo(() => ({ tabId }), [tabId]);
   const tab = useTab(tabId, onOpen, onClose, onClick);
@@ -54,12 +42,7 @@ export const Tab = observer<TabProps>(function Tab({
                 <Icon name="cross-bold" viewBox="0 0 7 8" />
               </tab-action>
             )}
-            <TabMenu
-              tabId={tabId}
-              state={tab.state}
-              menuContext={menuContext}
-              style={style}
-            />
+            <TabMenu tabId={tabId} state={tab.state} menuContext={menuContext} style={style} />
           </tab-actions>
           <BaseTab
             {...tab.state.state}
@@ -70,13 +53,11 @@ export const Tab = observer<TabProps>(function Tab({
             disabled={disabled}
             onClick={tab.handleOpen}
           >
-            <tab-container>
-              {children}
-            </tab-container>
+            <tab-container>{children}</tab-container>
           </BaseTab>
         </tab-inner>
       </tab-outer>
-    </TabContext.Provider>
+    </TabContext.Provider>,
   );
 });
 
@@ -87,12 +68,7 @@ interface TabMenuProps {
   style?: ComponentStyle;
 }
 
-const TabMenu = observer<TabMenuProps>(function TabMenu({
-  tabId,
-  state,
-  menuContext,
-  style,
-}) {
+const TabMenu = observer<TabMenuProps>(function TabMenu({ tabId, state, menuContext, style }) {
   const styles = useStyles(BASE_TAB_STYLES, BASE_TAB_ACTION_STYLES, style);
 
   const [menuOpened, switchState] = useState(false);
@@ -112,11 +88,11 @@ const TabMenu = observer<TabMenuProps>(function TabMenu({
 
   return styled(styles)(
     <portal {...use({ menuOpened })}>
-      <ContextMenu menu={menu} placement='bottom-start' modal disclosure onVisibleSwitch={switchState}>
+      <ContextMenu menu={menu} placement="bottom-start" modal disclosure onVisibleSwitch={switchState}>
         <tab-action>
           <Icon name="dots" viewBox="0 0 32 32" />
         </tab-action>
       </ContextMenu>
-    </portal>
+    </portal>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
index 78edb69b2a..4b77468d74 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
@@ -5,11 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useMemo } from 'react';
 import styled from 'reshadow';
 
-
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -67,7 +65,11 @@ export function TabDefault<T = Record<string, any>>({
   return styled(styles)(
     <Tab tabId={tabId} className={className} style={style} disabled={disabled} onOpen={onOpen} onClose={onClose}>
       {icon && <TabIcon icon={icon} />}
-      {name && <TabTitle><Translate token={name} /></TabTitle>}
-    </Tab>
+      {name && (
+        <TabTitle>
+          <Translate token={name} />
+        </TabTitle>
+      )}
+    </Tab>,
   );
 }
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx
index 33d8078a99..6251001535 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { IconOrImage, useStyles } from '@cloudbeaver/core-blocks';
@@ -20,8 +19,6 @@ interface IProps {
 
 export const TabIcon: React.FC<IProps> = function TabIcon({ icon, viewBox, className }) {
   return styled(useStyles(BASE_TAB_STYLES))(
-    <tab-icon className={className}>
-      {icon ? <IconOrImage icon={icon} viewBox={viewBox} /> : <placeholder />}
-    </tab-icon>
+    <tab-icon className={className}>{icon ? <IconOrImage icon={icon} viewBox={viewBox} /> : <placeholder />}</tab-icon>,
   );
 };
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts b/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
index 98cce52884..2c3c0f0d6b 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { PropsWithChildren } from 'react';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx
index 39fa82314e..6ed3a64079 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { BASE_TAB_STYLES } from './BASE_TAB_STYLES';
@@ -15,9 +14,5 @@ interface IProps {
 }
 
 export const TabTitle: React.FC<React.PropsWithChildren<IProps>> = function TabTitle({ children, className }) {
-  return styled(BASE_TAB_STYLES)(
-    <tab-title className={className}>
-      {children || <placeholder />}
-    </tab-title>
-  );
+  return styled(BASE_TAB_STYLES)(<tab-title className={className}>{children || <placeholder />}</tab-title>);
 };
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/UnderlineTabStyles.ts b/webapp/packages/core-ui/src/Tabs/Tab/UnderlineTabStyles.ts
index 92a507b211..f9b5f4ec59 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/UnderlineTabStyles.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/UnderlineTabStyles.ts
@@ -5,38 +5,37 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const UNDERLINE_TAB_STYLES = css`
-    TabList {
-      display: flex;
+  TabList {
+    display: flex;
+  }
+  Tab {
+    composes: theme-typography--body2 from global;
+    background: none;
+    color: inherit;
+    border: none;
+    border-bottom: 2px solid var(--theme-primary);
+    outline: none;
+    opacity: 1;
+    height: 30px !important;
+    padding: 0 14px !important;
+    border-top: none !important;
+    font-weight: normal !important;
+
+    &:global([aria-selected='false']) {
+      opacity: 0.8;
+      border-bottom: 2px solid transparent !important;
     }
-    Tab {
-      composes: theme-typography--body2 from global;
-      background: none;
-      color: inherit;
-      border: none;
-      border-bottom: 2px solid var(--theme-primary);
-      outline: none;
+
+    &:global([aria-disabled='true']) {
+      opacity: 0.5;
+    }
+
+    &:hover {
+      cursor: pointer;
       opacity: 1;
-      height: 30px !important;
-      padding: 0 14px !important;
-      border-top: none !important;
-      font-weight: normal !important;
-
-      &:global([aria-selected="false"]) {
-        opacity: 0.8;
-        border-bottom: 2px solid transparent !important;
-      }
-
-      &:global([aria-disabled="true"]) {
-        opacity: 0.5;
-      }
-
-      &:hover {
-        cursor: pointer;
-        opacity: 1;
-      }
     }
+  }
 `;
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/VERTICAL_ROTATED_TAB_STYLES.ts b/webapp/packages/core-ui/src/Tabs/Tab/VERTICAL_ROTATED_TAB_STYLES.ts
index e82c8d3b3f..5a2b58effd 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/VERTICAL_ROTATED_TAB_STYLES.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/VERTICAL_ROTATED_TAB_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const VERTICAL_ROTATED_TAB_STYLES = css`
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts b/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
index f0c6623394..bde8926ac8 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 import { useContext } from 'react';
 
@@ -30,52 +29,61 @@ export function useTab(
 
   useExecutor({
     executor: state.openExecutor,
-    handlers: [async function openHandler(data) {
-      if (tabId !== data.tabId) {
-        return;
-      }
-      await onOpen?.(data);
-    }],
+    handlers: [
+      async function openHandler(data) {
+        if (tabId !== data.tabId) {
+          return;
+        }
+        await onOpen?.(data);
+      },
+    ],
   });
 
   useExecutor({
     executor: state.closeExecutor,
-    handlers: [async function closeHandler(data) {
-      if (tabId !== data.tabId) {
-        return;
-      }
-      await onClose?.(data);
-    }],
+    handlers: [
+      async function closeHandler(data) {
+        if (tabId !== data.tabId) {
+          return;
+        }
+        await onClose?.(data);
+      },
+    ],
   });
 
-  return useObservableRef(() => ({
-    get selected() {
-      return this.state.state.selectedId === this.tabId;
+  return useObservableRef(
+    () => ({
+      get selected() {
+        return this.state.state.selectedId === this.tabId;
+      },
+      get closable() {
+        return this.state.canClose(this.tabId);
+      },
+      getInfo() {
+        return this.state.getTabInfo(this.tabId);
+      },
+      handleOpen(e: React.MouseEvent<HTMLButtonElement>) {
+        if (EventContext.has(e, EventStopPropagationFlag)) {
+          return;
+        }
+        refObject.onClick?.(this.tabId);
+        this.state.open(this.tabId);
+      },
+      handleClose(e: React.MouseEvent<HTMLDivElement>) {
+        EventContext.set(e, EventStopPropagationFlag); // TODO: probably should use special flag
+        this.state.close(tabId);
+      },
+    }),
+    {
+      selected: computed,
+      closable: computed,
+      state: observable.ref,
+      tabId: observable.ref,
     },
-    get closable() {
-      return this.state.canClose(this.tabId);
+    {
+      state,
+      tabId,
     },
-    getInfo() {
-      return this.state.getTabInfo(this.tabId);
-    },
-    handleOpen(e: React.MouseEvent<HTMLButtonElement>) {
-      if (EventContext.has(e, EventStopPropagationFlag)) {
-        return;
-      }
-      refObject.onClick?.(this.tabId);
-      this.state.open(this.tabId);
-    },
-    handleClose(e: React.MouseEvent<HTMLDivElement>) {
-      EventContext.set(e, EventStopPropagationFlag); // TODO: probably should use special flag
-      this.state.close(tabId);
-    },
-  }), {
-    selected: computed,
-    closable: computed,
-    state: observable.ref,
-    tabId: observable.ref,
-  }, {
-    state,
-    tabId,
-  }, ['getInfo', 'handleOpen', 'handleClose']);
+    ['getInfo', 'handleOpen', 'handleClose'],
+  );
 }
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/verticalTabStyles.ts b/webapp/packages/core-ui/src/Tabs/Tab/verticalTabStyles.ts
index aea275c7ea..ccd79814bd 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/verticalTabStyles.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/verticalTabStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const verticalTabStyles = css`
diff --git a/webapp/packages/core-ui/src/Tabs/TabContext.ts b/webapp/packages/core-ui/src/Tabs/TabContext.ts
index 709f4b27ce..ae7fad094f 100644
--- a/webapp/packages/core-ui/src/Tabs/TabContext.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabContext.ts
@@ -5,13 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface ITabContext {
   tabId: string;
 }
 
-export const TabContext = createContext<ITabContext | undefined>(
-  undefined
-);
+export const TabContext = createContext<ITabContext | undefined>(undefined);
diff --git a/webapp/packages/core-ui/src/Tabs/TabList.tsx b/webapp/packages/core-ui/src/Tabs/TabList.tsx
index ff499689a2..14fb950e93 100644
--- a/webapp/packages/core-ui/src/Tabs/TabList.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabList.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import { TabList as BaseTabList, TabListOptions, TabStateReturn } from 'reakit/Tab';
@@ -22,12 +21,7 @@ interface Props extends Omit<TabListOptions, keyof TabStateReturn> {
   childrenFirst?: boolean;
 }
 
-export const TabList = observer<React.PropsWithChildren<Props>>(function TabList({
-  style,
-  children,
-  childrenFirst,
-  ...props
-}) {
+export const TabList = observer<React.PropsWithChildren<Props>>(function TabList({ style, children, childrenFirst, ...props }) {
   const state = useContext(TabsContext);
 
   if (!state) {
@@ -39,28 +33,36 @@ export const TabList = observer<React.PropsWithChildren<Props>>(function TabList
     return (
       <BaseTabList {...props} {...state.state} area-label={props['aria-label'] ?? state.container.areaLabel}>
         {childrenFirst && children}
-        {displayed.map(generateTabElement(
-          (tabInfo, key) => (
-            <TabDefault
-              key={key}
-              tabId={key}
-              name={tabInfo.name}
-              icon={tabInfo.icon}
-              component={tabInfo.tab?.()}
-              {...state.props}
-              style={style}
-              aria-label={tabInfo.name}
-              disabled={props.disabled || tabInfo.isDisabled?.(tabInfo.key, state.props)}
-              onOpen={tabInfo.onOpen}
-              onClose={tabInfo.onClose}
-            />
-          ),
-          state.props,
-        )).flat()}
+        {displayed
+          .map(
+            generateTabElement(
+              (tabInfo, key) => (
+                <TabDefault
+                  key={key}
+                  tabId={key}
+                  name={tabInfo.name}
+                  icon={tabInfo.icon}
+                  component={tabInfo.tab?.()}
+                  {...state.props}
+                  style={style}
+                  aria-label={tabInfo.name}
+                  disabled={props.disabled || tabInfo.isDisabled?.(tabInfo.key, state.props)}
+                  onOpen={tabInfo.onOpen}
+                  onClose={tabInfo.onClose}
+                />
+              ),
+              state.props,
+            ),
+          )
+          .flat()}
         {!childrenFirst && children}
       </BaseTabList>
     );
   }
 
-  return <BaseTabList {...props} {...state.state}>{children}</BaseTabList>;
+  return (
+    <BaseTabList {...props} {...state.state}>
+      {children}
+    </BaseTabList>
+  );
 });
diff --git a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
index 7b5be2cbc6..47a14528cc 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext, useMemo } from 'react';
 import { TabPanel as BaseTabPanel, TabStateReturn } from 'reakit/Tab';
@@ -16,12 +15,7 @@ import { TabContext } from './TabContext';
 import type { TabPanelProps } from './TabPanelProps';
 import { TabsContext } from './TabsContext';
 
-export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({
-  tabId,
-  children,
-  className,
-  lazy,
-}) {
+export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ tabId, children, className, lazy }) {
   const state = useContext(TabsContext);
 
   if (!state) {
@@ -39,9 +33,7 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({
     return (
       <TabContext.Provider value={tabContext}>
         <BaseTabPanel {...state.state} tabId={tabId} className={className}>
-          <Loader suspense>
-            {(children as (state: TabStateReturn) => React.ReactNode)(state.state)}
-          </Loader>
+          <Loader suspense>{(children as (state: TabStateReturn) => React.ReactNode)(state.state)}</Loader>
         </BaseTabPanel>
       </TabContext.Provider>
     );
@@ -50,9 +42,7 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({
   return (
     <TabContext.Provider value={tabContext}>
       <BaseTabPanel {...state.state} tabId={tabId} className={className}>
-        <Loader suspense>
-          {children}
-        </Loader>
+        <Loader suspense>{children}</Loader>
       </BaseTabPanel>
     </TabContext.Provider>
   );
diff --git a/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx b/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx
index 464e49a3d4..a5d9baf241 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
@@ -23,10 +22,7 @@ interface Props extends React.PropsWithChildren {
   style?: ComponentStyle;
 }
 
-export const TabPanelList = observer<Props>(function TabPanelList({
-  style,
-  children,
-}) {
+export const TabPanelList = observer<Props>(function TabPanelList({ style, children }) {
   const state = useContext(TabsContext);
   const styles = useStyles(BASE_TAB_STYLES, style);
 
@@ -47,18 +43,19 @@ export const TabPanelList = observer<Props>(function TabPanelList({
 
   return styled(styles)(
     <>
-      {displayed.map(generateTabElement(
-        (tabInfo, key) => (
-          <TabPanel
-            key={key}
-            tabId={key}
-          >
-            {renderPanel(tabInfo, key)}
-          </TabPanel>
-        ),
-        state.props,
-      )).flat()}
+      {displayed
+        .map(
+          generateTabElement(
+            (tabInfo, key) => (
+              <TabPanel key={key} tabId={key}>
+                {renderPanel(tabInfo, key)}
+              </TabPanel>
+            ),
+            state.props,
+          ),
+        )
+        .flat()}
       {children}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/core-ui/src/Tabs/TabPanelProps.ts b/webapp/packages/core-ui/src/Tabs/TabPanelProps.ts
index b079bfe3c5..3e3ad62ecf 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanelProps.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabPanelProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TabStateReturn } from 'reakit/Tab';
 
 export interface TabPanelProps {
diff --git a/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts b/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
index 984bb3eada..22e92b41ad 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ActionService, DATA_CONTEXT_MENU, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
 
@@ -20,10 +19,7 @@ import { MENU_TAB } from './Tab/MENU_TAB';
 
 @injectable()
 export class TabsBootstrap extends Bootstrap {
-  constructor(
-    private readonly actionService: ActionService,
-    private readonly menuService: MenuService
-  ) {
+  constructor(private readonly actionService: ActionService, private readonly menuService: MenuService) {
     super();
   }
 
@@ -89,12 +85,7 @@ export class TabsBootstrap extends Bootstrap {
       isApplicable: context => {
         const tab = context.tryGet(DATA_CONTEXT_TAB_ID);
         const state = context.tryGet(DATA_CONTEXT_TABS_CONTEXT);
-        return (
-          !!tab
-          && !!state?.enabledBaseActions
-          && context.get(DATA_CONTEXT_MENU) === MENU_TAB
-          && state.canClose(tab)
-        );
+        return !!tab && !!state?.enabledBaseActions && context.get(DATA_CONTEXT_MENU) === MENU_TAB && state.canClose(tab);
       },
       getItems: (context, items) => [
         ...items,
@@ -125,5 +116,5 @@ export class TabsBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
index ed24f272cf..dc6225ddf0 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { PropsWithChildren, ReactNode, forwardRef } from 'react';
+import { forwardRef, PropsWithChildren, ReactNode } from 'react';
 import styled, { css } from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-blocks';
@@ -56,20 +55,14 @@ type TabsBoxProps = PropsWithChildren<{
   style?: ComponentStyle;
 }>;
 
-export const TabsBox = forwardRef<HTMLDivElement, TabsBoxProps>(function TabsBox({
-  currentTabId,
-  tabs,
-  tabIndex,
-  localState,
-  tabList,
-  enabledBaseActions,
-  autoSelect,
-  children,
-  className,
-  onChange,
-  style,
-}, ref) {
-  return styled(styles, useStyles(style))(
+export const TabsBox = forwardRef<HTMLDivElement, TabsBoxProps>(function TabsBox(
+  { currentTabId, tabs, tabIndex, localState, tabList, enabledBaseActions, autoSelect, children, className, onChange, style },
+  ref,
+) {
+  return styled(
+    styles,
+    useStyles(style),
+  )(
     <TabsState
       currentTabId={currentTabId}
       localState={localState}
@@ -80,10 +73,8 @@ export const TabsBox = forwardRef<HTMLDivElement, TabsBoxProps>(function TabsBox
     >
       <tabs-box ref={ref} as="div" className={className} tabIndex={tabIndex}>
         {tabs && <tabs>{tabs}</tabs>}
-        <tab-panels>
-          {children}
-        </tab-panels>
+        <tab-panels>{children}</tab-panels>
       </tabs-box>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx
index 85a406b856..56c0611093 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -48,11 +47,14 @@ export const TabsBoxFromArray = observer<IProps>(function TabsBoxFromArray({
   return styled(useStyles(BASE_TAB_STYLES, style))(
     <TabsBox
       currentTabId={currentTabId}
-      tabs={!hideTabs && tabIdList.map(tabId => (
-        <Tab key={tabId} tabId={tabId} onOpen={onOpen} onClose={onClose}>
-          <TabData tabId={tabId} />
-        </Tab>
-      ))}
+      tabs={
+        !hideTabs &&
+        tabIdList.map(tabId => (
+          <Tab key={tabId} tabId={tabId} onOpen={onOpen} onClose={onClose}>
+            <TabData tabId={tabId} />
+          </Tab>
+        ))
+      }
       className={className}
       style={style}
     >
@@ -61,6 +63,6 @@ export const TabsBoxFromArray = observer<IProps>(function TabsBoxFromArray({
           <PanelData tabId={tabId} />
         </TabPanel>
       ))}
-    </TabsBox>
+    </TabsBox>,
   );
 });
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts b/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
index ccbbe57998..f50d16774c 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
 
 import type { TabProps } from '../Tab/TabProps';
@@ -28,8 +27,8 @@ export interface ITabInfoOptions<TProps = void, TOptions extends Record<string,
 
   generator?: (tabId: string, props?: TProps) => string[];
 
-  tab?: () => (TabContainerTabComponent<TProps> | React.ExoticComponent);
-  panel: () => (TabContainerPanelComponent<TProps> | React.ExoticComponent);
+  tab?: () => TabContainerTabComponent<TProps> | React.ExoticComponent;
+  panel: () => TabContainerPanelComponent<TProps> | React.ExoticComponent;
 
   stateGetter?: (props: TProps) => MetadataValueGetter<string, any>;
 
@@ -40,10 +39,7 @@ export interface ITabInfoOptions<TProps = void, TOptions extends Record<string,
   onOpen?: (tab: ITabData<TProps>) => void;
 }
 
-export interface ITabInfo<
-  TProps = void,
-  TOptions extends Record<string, any> = never
-> extends ITabInfoOptions<TProps, TOptions> {
+export interface ITabInfo<TProps = void, TOptions extends Record<string, any> = never> extends ITabInfoOptions<TProps, TOptions> {
   order: number;
 }
 
@@ -53,12 +49,7 @@ export interface ITabsContainer<TProps = void, TOptions extends Record<string, a
   readonly selectedId: string | null;
   has: (tabId: string) => boolean;
   getTabInfo: (tabId: string) => ITabInfo<TProps, TOptions> | undefined;
-  getTabState: <T>(
-    state: MetadataMap<string, any>,
-    tabId: string,
-    props: TProps,
-    valueGetter?: MetadataValueGetter<string, T>
-  ) => T;
+  getTabState: <T>(state: MetadataMap<string, any>, tabId: string, props: TProps, valueGetter?: MetadataValueGetter<string, T>) => T;
   getDisplayed: (props?: TProps) => Array<ITabInfo<TProps, TOptions>>;
   getIdList: (props?: TProps) => string[];
 }
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts b/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
index 33d2943ff2..b7698e92eb 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
@@ -5,21 +5,18 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import type { MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
 
 import type { ITabInfo, ITabInfoOptions, ITabsContainer } from './ITabsContainer';
 
-export class TabsContainer<TProps = void, TOptions extends Record<string, any> = never>
-implements ITabsContainer<TProps, TOptions> {
+export class TabsContainer<TProps = void, TOptions extends Record<string, any> = never> implements ITabsContainer<TProps, TOptions> {
   readonly areaLabel: string;
   readonly tabInfoMap: Map<string, ITabInfo<TProps, TOptions>>;
 
   get tabInfoList(): Array<ITabInfo<TProps, TOptions>> {
-    return Array.from(this.tabInfoMap.values())
-      .sort((a, b) => a.order - b.order);
+    return Array.from(this.tabInfoMap.values()).sort((a, b) => a.order - b.order);
   }
 
   get selectedId(): string | null {
@@ -67,12 +64,7 @@ implements ITabsContainer<TProps, TOptions> {
     return this.tabInfoMap.get(tabId);
   }
 
-  getTabState<T>(
-    state: MetadataMap<string, any>,
-    tabId: string,
-    props: TProps,
-    valueGetter?: MetadataValueGetter<string, T>
-  ): T {
+  getTabState<T>(state: MetadataMap<string, any>, tabId: string, props: TProps, valueGetter?: MetadataValueGetter<string, T>): T {
     const tabInfo = this.getTabInfo(tabId);
 
     return state.get(tabId, valueGetter || tabInfo?.stateGetter?.(props));
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContext.ts b/webapp/packages/core-ui/src/Tabs/TabsContext.ts
index afaf895baa..e9671097ee 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContext.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 import type { TabStateReturn } from 'reakit/Tab';
 
@@ -38,6 +37,4 @@ export interface ITabsContext<T = Record<string, any>> {
   closeOthers: (tabId: string) => Promise<void>;
 }
 
-export const TabsContext = createContext<ITabsContext<any> | undefined>(
-  undefined
-);
+export const TabsContext = createContext<ITabsContext<any> | undefined>(undefined);
diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
index 440757011e..c00249f782 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect, useMemo, useState } from 'react';
@@ -16,26 +15,27 @@ import { Executor, ExecutorInterrupter } from '@cloudbeaver/core-executor';
 import { isNull, isUndefined, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
 
 import type { ITabData, ITabsContainer } from './TabsContainer/ITabsContainer';
-import { TabsContext, ITabsContext } from './TabsContext';
+import { ITabsContext, TabsContext } from './TabsContext';
 import type { TabDirection } from './TabsContext';
 
 type ExtractContainerProps<T> = T extends void ? Record<string, any> : T;
 
-type Props<T = Record<string, any>> = ExtractContainerProps<T> & React.PropsWithChildren<{
-  selectedId?: string;
-  orientation?: 'horizontal' | 'vertical';
-  currentTabId?: string | null;
-  container?: ITabsContainer<T, any>;
-  localState?: MetadataMap<string, any>;
-  lazy?: boolean;
-  manual?: boolean;
-  autoSelect?: boolean;
-  tabList?: string[];
-  enabledBaseActions?: boolean;
-  canClose?: (tab: ITabData<T>) => boolean;
-  onChange?: (tab: ITabData<T>) => void;
-  onClose?: (tab: ITabData<T>) => void;
-}>;
+type Props<T = Record<string, any>> = ExtractContainerProps<T> &
+  React.PropsWithChildren<{
+    selectedId?: string;
+    orientation?: 'horizontal' | 'vertical';
+    currentTabId?: string | null;
+    container?: ITabsContainer<T, any>;
+    localState?: MetadataMap<string, any>;
+    lazy?: boolean;
+    manual?: boolean;
+    autoSelect?: boolean;
+    tabList?: string[];
+    enabledBaseActions?: boolean;
+    canClose?: (tab: ITabData<T>) => boolean;
+    onChange?: (tab: ITabData<T>) => void;
+    onClose?: (tab: ITabData<T>) => void;
+  }>;
 
 export const TabsState = observer(function TabsState<T = Record<string, any>>({
   selectedId,
@@ -63,11 +63,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     displayed = tabList;
   }
 
-  if (
-    !selectedId
-    && (currentTabId === undefined || currentTabId === null)
-    && autoSelect
-  ) {
+  if (!selectedId && (currentTabId === undefined || currentTabId === null) && autoSelect) {
     if (displayed.length > 0) {
       selectedId = displayed[0];
     }
@@ -86,37 +82,34 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     manual,
   });
 
-  const dynamic = useObjectRef(() => ({
-    selectedId: selectedId || currentTabId,
-  }), {
-    canClose,
-    open: onOpen,
-    close: onClose,
-    props,
-    tabsState,
-    container,
-    state,
-    tabList,
-  });
+  const dynamic = useObjectRef(
+    () => ({
+      selectedId: selectedId || currentTabId,
+    }),
+    {
+      canClose,
+      open: onOpen,
+      close: onClose,
+      props,
+      tabsState,
+      container,
+      state,
+      tabList,
+    },
+  );
 
-  if (
-    (
-      !isNull(currentTabId)
-      && !isUndefined(currentTabId)
-    )
-    || !autoSelect
-  ) {
+  if ((!isNull(currentTabId) && !isUndefined(currentTabId)) || !autoSelect) {
     state.selectedId = currentTabId;
     dynamic.selectedId = currentTabId;
   }
 
   if (
-    displayed.length > 0
-    && !isNull(dynamic.selectedId)
-    && !isUndefined(dynamic.selectedId)
-    && !isNull(selectedId)
-    && !isUndefined(selectedId)
-    && autoSelect
+    displayed.length > 0 &&
+    !isNull(dynamic.selectedId) &&
+    !isUndefined(dynamic.selectedId) &&
+    !isNull(selectedId) &&
+    !isUndefined(selectedId) &&
+    autoSelect
   ) {
     const tabExists = displayed.includes(dynamic.selectedId);
 
@@ -131,32 +124,30 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
 
   useExecutor({
     executor: openExecutor,
-    handlers: [function openHandler(data, contexts) {
-      dynamic.open?.(data);
-      if (dynamic.selectedId === data.tabId) {
-        ExecutorInterrupter.interrupt(contexts);
-        return;
-      }
-      dynamic.selectedId = data.tabId;
-      dynamic.state.setSelectedId(data.tabId);
-    }],
+    handlers: [
+      function openHandler(data, contexts) {
+        dynamic.open?.(data);
+        if (dynamic.selectedId === data.tabId) {
+          ExecutorInterrupter.interrupt(contexts);
+          return;
+        }
+        dynamic.selectedId = data.tabId;
+        dynamic.state.setSelectedId(data.tabId);
+      },
+    ],
   });
 
   useExecutor({
     executor: closeExecutor,
-    handlers: [function closeHandler(data) {
-      dynamic.close?.(data);
-    }],
+    handlers: [
+      function closeHandler(data) {
+        dynamic.close?.(data);
+      },
+    ],
   });
 
   useEffect(() => {
-    if (
-      (
-        !isNull(currentTabId)
-        && !isUndefined(currentTabId)
-      )
-      || !autoSelect
-    ) {
+    if ((!isNull(currentTabId) && !isUndefined(currentTabId)) || !autoSelect) {
       return;
     }
 
@@ -167,10 +158,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
   }, [currentTabId, state.selectedId, autoSelect]);
 
   useEffect(() => {
-    if (
-      !isNull(state.selectedId)
-      && !isUndefined(state.selectedId)
-    ) {
+    if (!isNull(state.selectedId) && !isUndefined(state.selectedId)) {
       openExecutor.execute({
         tabId: state.selectedId,
         props,
@@ -178,111 +166,105 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     }
   }, [!isNull(state.selectedId) && !isUndefined(state.selectedId)]);
 
-  const value = useObservableRef<ITabsContext<T>>(() => ({
-    canClose(tabId) {
-      return dynamic.canClose?.({
-        tabId,
-        props: dynamic.props,
-      }) ?? true;
-    },
-    getTabInfo(tabId: string) {
-      return dynamic.container?.getTabInfo(tabId);
-    },
-    getTabState(tabId: string, valueGetter?: MetadataValueGetter<string, any>) {
-      return dynamic.container?.getTabState(
-        dynamic.tabsState,
-        tabId,
-        dynamic.props,
-        valueGetter
-      );
-    },
-    getLocalState(tabId: string, valueGetter?: MetadataValueGetter<string, any>) {
-      return dynamic.tabsState.get(
-        tabId,
-        valueGetter
-      );
-    },
-    async open(tabId: string) {
-      await openExecutor.execute({
-        tabId,
-        props: dynamic.props,
-      });
-    },
-    async close(tabId: string) {
-      if (!this.canClose(tabId)) {
-        return;
-      }
-
-      await closeExecutor.execute({
-        tabId,
-        props: dynamic.props,
-      });
-    },
-    async closeAll() {
-      if (dynamic.tabList) {
-        for (const tab of dynamic.tabList.slice()) {
-          await this.close(tab);
-        }
-      }
-    },
-    async closeAllToTheDirection(tabId: string, direction: TabDirection) {
-      if (dynamic.tabList) {
-        const index = dynamic.tabList.indexOf(tabId);
-
-        if (index === -1) {
+  const value = useObservableRef<ITabsContext<T>>(
+    () => ({
+      canClose(tabId) {
+        return (
+          dynamic.canClose?.({
+            tabId,
+            props: dynamic.props,
+          }) ?? true
+        );
+      },
+      getTabInfo(tabId: string) {
+        return dynamic.container?.getTabInfo(tabId);
+      },
+      getTabState(tabId: string, valueGetter?: MetadataValueGetter<string, any>) {
+        return dynamic.container?.getTabState(dynamic.tabsState, tabId, dynamic.props, valueGetter);
+      },
+      getLocalState(tabId: string, valueGetter?: MetadataValueGetter<string, any>) {
+        return dynamic.tabsState.get(tabId, valueGetter);
+      },
+      async open(tabId: string) {
+        await openExecutor.execute({
+          tabId,
+          props: dynamic.props,
+        });
+      },
+      async close(tabId: string) {
+        if (!this.canClose(tabId)) {
           return;
         }
 
-        const tabs = direction === 'left' ? dynamic.tabList.slice(0, index) : dynamic.tabList.slice(index + 1);
-
-        for (const tab of tabs) {
-          await this.close(tab);
+        await closeExecutor.execute({
+          tabId,
+          props: dynamic.props,
+        });
+      },
+      async closeAll() {
+        if (dynamic.tabList) {
+          for (const tab of dynamic.tabList.slice()) {
+            await this.close(tab);
+          }
         }
-      }
-    },
-    async closeOthers(tabId: string) {
-      if (dynamic.tabList) {
-        const tabs = dynamic.tabList.filter(tab => tab !== tabId);
-        for (const tab of tabs) {
-          await this.close(tab);
-        }
-      }
-    },
-  }), {
-    state: observable.ref,
-    tabsState: observable.ref,
-    props: observable.ref,
-    container: observable.ref,
-    openExecutor: observable.ref,
-    closeExecutor: observable.ref,
-    lazy: observable.ref,
-    closable: observable.ref,
-    tabList: observable.ref,
-    enabledBaseActions: observable.ref,
-    getTabInfo: action.bound,
-    getTabState: action.bound,
-    getLocalState: action.bound,
-    open: action.bound,
-    close: action.bound,
-    closeAll: action.bound,
-    closeAllToTheDirection: action.bound,
-    closeOthers: action.bound,
-  }, {
-    state,
-    tabsState,
-    props,
-    container,
-    openExecutor,
-    closeExecutor,
-    lazy,
-    closable,
-    tabList,
-    enabledBaseActions,
-  });
+      },
+      async closeAllToTheDirection(tabId: string, direction: TabDirection) {
+        if (dynamic.tabList) {
+          const index = dynamic.tabList.indexOf(tabId);
 
-  return (
-    <TabsContext.Provider value={value}>
-      {children}
-    </TabsContext.Provider>
+          if (index === -1) {
+            return;
+          }
+
+          const tabs = direction === 'left' ? dynamic.tabList.slice(0, index) : dynamic.tabList.slice(index + 1);
+
+          for (const tab of tabs) {
+            await this.close(tab);
+          }
+        }
+      },
+      async closeOthers(tabId: string) {
+        if (dynamic.tabList) {
+          const tabs = dynamic.tabList.filter(tab => tab !== tabId);
+          for (const tab of tabs) {
+            await this.close(tab);
+          }
+        }
+      },
+    }),
+    {
+      state: observable.ref,
+      tabsState: observable.ref,
+      props: observable.ref,
+      container: observable.ref,
+      openExecutor: observable.ref,
+      closeExecutor: observable.ref,
+      lazy: observable.ref,
+      closable: observable.ref,
+      tabList: observable.ref,
+      enabledBaseActions: observable.ref,
+      getTabInfo: action.bound,
+      getTabState: action.bound,
+      getLocalState: action.bound,
+      open: action.bound,
+      close: action.bound,
+      closeAll: action.bound,
+      closeAllToTheDirection: action.bound,
+      closeOthers: action.bound,
+    },
+    {
+      state,
+      tabsState,
+      props,
+      container,
+      openExecutor,
+      closeExecutor,
+      lazy,
+      closable,
+      tabList,
+      enabledBaseActions,
+    },
   );
+
+  return <TabsContext.Provider value={value}>{children}</TabsContext.Provider>;
 });
diff --git a/webapp/packages/core-ui/src/Tabs/generateTabElement.ts b/webapp/packages/core-ui/src/Tabs/generateTabElement.ts
index ecc82977f2..fe13dd193c 100644
--- a/webapp/packages/core-ui/src/Tabs/generateTabElement.ts
+++ b/webapp/packages/core-ui/src/Tabs/generateTabElement.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITabInfo } from './TabsContainer/ITabsContainer';
 
 export function generateTabElement<TProps = void>(
@@ -14,9 +13,7 @@ export function generateTabElement<TProps = void>(
 ): (tabInfo: ITabInfo<TProps>) => JSX.Element[] {
   return tabInfo => {
     if (tabInfo.generator) {
-      return tabInfo
-        .generator(tabInfo.key, props)
-        .map(key => generator(tabInfo, key));
+      return tabInfo.generator(tabInfo.key, props).map(key => generator(tabInfo, key));
     }
 
     return [generator(tabInfo, tabInfo.key)];
diff --git a/webapp/packages/core-ui/src/Tabs/useTabLocalState.ts b/webapp/packages/core-ui/src/Tabs/useTabLocalState.ts
index a60ab17dde..57f26544c2 100644
--- a/webapp/packages/core-ui/src/Tabs/useTabLocalState.ts
+++ b/webapp/packages/core-ui/src/Tabs/useTabLocalState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { MetadataValueGetter } from '@cloudbeaver/core-utils';
diff --git a/webapp/packages/core-ui/src/Tabs/useTabState.ts b/webapp/packages/core-ui/src/Tabs/useTabState.ts
index b076959adc..f402ed92ff 100644
--- a/webapp/packages/core-ui/src/Tabs/useTabState.ts
+++ b/webapp/packages/core-ui/src/Tabs/useTabState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { MetadataValueGetter } from '@cloudbeaver/core-utils';
diff --git a/webapp/packages/core-ui/src/locales/en.ts b/webapp/packages/core-ui/src/locales/en.ts
index ba2f9b724f..d141a562d9 100644
--- a/webapp/packages/core-ui/src/locales/en.ts
+++ b/webapp/packages/core-ui/src/locales/en.ts
@@ -1,3 +1 @@
-export default [
-  ['core_ui_empty', 'Empty'],
-];
+export default [['core_ui_empty', 'Empty']];
diff --git a/webapp/packages/core-ui/src/locales/it.ts b/webapp/packages/core-ui/src/locales/it.ts
index ba2f9b724f..d141a562d9 100644
--- a/webapp/packages/core-ui/src/locales/it.ts
+++ b/webapp/packages/core-ui/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-  ['core_ui_empty', 'Empty'],
-];
+export default [['core_ui_empty', 'Empty']];
diff --git a/webapp/packages/core-ui/src/locales/ru.ts b/webapp/packages/core-ui/src/locales/ru.ts
index 3c68071cd3..d95f701cac 100644
--- a/webapp/packages/core-ui/src/locales/ru.ts
+++ b/webapp/packages/core-ui/src/locales/ru.ts
@@ -1,3 +1 @@
-export default [
-  ['core_ui_empty', 'Пусто'],
-];
+export default [['core_ui_empty', 'Пусто']];
diff --git a/webapp/packages/core-ui/src/manifest.ts b/webapp/packages/core-ui/src/manifest.ts
index 227b9953cb..700fcf97b9 100644
--- a/webapp/packages/core-ui/src/manifest.ts
+++ b/webapp/packages/core-ui/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ClipboardBootstrap } from './Clipboard/ClipboardBootstrap';
diff --git a/webapp/packages/core-ui/src/useAuthenticationAction.tsx b/webapp/packages/core-ui/src/useAuthenticationAction.tsx
index f2181898b8..6a5128b37f 100644
--- a/webapp/packages/core-ui/src/useAuthenticationAction.tsx
+++ b/webapp/packages/core-ui/src/useAuthenticationAction.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { AuthProviderService, UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -29,32 +28,37 @@ export function useAuthenticationAction(options: Options): IAuthenticationAction
   const authProviderService = useService(AuthProviderService);
   const userInfoService = useService(UserInfoResource);
 
-  return useObservableRef(() => ({
-    authenticating: false,
-    get authorized() {
-      return !this.authenticating && userInfoService.hasToken(this.providerId);
-    },
-    async auth() {
-      this.authenticating = true;
-      try {
-        const result = await authProviderService.requireProvider(this.providerId);
+  return useObservableRef(
+    () => ({
+      authenticating: false,
+      get authorized() {
+        return !this.authenticating && userInfoService.hasToken(this.providerId);
+      },
+      async auth() {
+        this.authenticating = true;
+        try {
+          const result = await authProviderService.requireProvider(this.providerId);
 
-        if (result) {
-          await this.onAuthenticate?.();
-        } else {
-          await this.onClose?.();
+          if (result) {
+            await this.onAuthenticate?.();
+          } else {
+            await this.onClose?.();
+          }
+        } finally {
+          this.authenticating = false;
         }
-      } finally {
-        this.authenticating = false;
-      }
+      },
+    }),
+    {
+      authorized: computed,
+      authenticating: observable.ref,
+      providerId: observable.ref,
     },
-  }), {
-    authorized: computed,
-    authenticating: observable.ref,
-    providerId: observable.ref,
-  }, {
-    providerId: options.providerId,
-    onAuthenticate: options.onAuthenticate,
-    onClose: options.onClose,
-  }, ['auth']);
+    {
+      providerId: options.providerId,
+      onAuthenticate: options.onAuthenticate,
+      onClose: options.onClose,
+    },
+    ['auth'],
+  );
 }
diff --git a/webapp/packages/core-utils/src/GlobalConstants.ts b/webapp/packages/core-utils/src/GlobalConstants.ts
index f24d8bacfa..85be5b71dd 100644
--- a/webapp/packages/core-utils/src/GlobalConstants.ts
+++ b/webapp/packages/core-utils/src/GlobalConstants.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isValidUrl } from './isValidUrl';
 import { pathJoin } from './pathJoin';
 
diff --git a/webapp/packages/core-utils/src/ILoadableState.ts b/webapp/packages/core-utils/src/ILoadableState.ts
index b7c26df4e7..2be565c47f 100644
--- a/webapp/packages/core-utils/src/ILoadableState.ts
+++ b/webapp/packages/core-utils/src/ILoadableState.ts
@@ -34,4 +34,4 @@ export function isContainsException(exception?: (Error | null)[] | Error | null)
   }
 
   return !!exception;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/LoadingError.ts b/webapp/packages/core-utils/src/LoadingError.ts
index 67f80a25c1..b2b6f4e99c 100644
--- a/webapp/packages/core-utils/src/LoadingError.ts
+++ b/webapp/packages/core-utils/src/LoadingError.ts
@@ -7,11 +7,7 @@
  */
 
 export class LoadingError extends Error {
-  constructor(
-    private readonly onRefresh: () => void,
-    message?: string,
-    options?: ErrorOptions
-  ) {
+  constructor(private readonly onRefresh: () => void, message?: string, options?: ErrorOptions) {
     super(message, options);
     this.name = 'Loading Error';
     this.refresh = this.refresh.bind(this);
diff --git a/webapp/packages/core-utils/src/MetadataMap.ts b/webapp/packages/core-utils/src/MetadataMap.ts
index 45870451c3..a9f1d68d68 100644
--- a/webapp/packages/core-utils/src/MetadataMap.ts
+++ b/webapp/packages/core-utils/src/MetadataMap.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeAutoObservable, action } from 'mobx';
+import { action, makeAutoObservable, observable } from 'mobx';
 
 import { TempMap } from './TempMap';
 
@@ -24,12 +23,9 @@ export class MetadataMap<TKey, TValue> implements Map<TKey, TValue> {
   constructor(private readonly defaultValueGetter?: DefaultValueGetter<TKey, TValue>) {
     this.syncData = null;
     this.data = observable(new Map());
-    this.temp = new TempMap<TKey, TValue>(
-      this.data,
-      () => {
-        this.syncData?.splice(0, this.syncData.length, ...this.data.entries());
-      }
-    );
+    this.temp = new TempMap<TKey, TValue>(this.data, () => {
+      this.syncData?.splice(0, this.syncData.length, ...this.data.entries());
+    });
 
     makeAutoObservable(this, {
       sync: action,
diff --git a/webapp/packages/core-utils/src/OrderedMap.ts b/webapp/packages/core-utils/src/OrderedMap.ts
index cc636dea7c..a0a46d4c9a 100644
--- a/webapp/packages/core-utils/src/OrderedMap.ts
+++ b/webapp/packages/core-utils/src/OrderedMap.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { action, computed, observable, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 export class OrderedMap<K, V> {
   private readonly indexes = observable.array<K>([], { deep: false });
@@ -84,9 +83,7 @@ export class OrderedMap<K, V> {
   }
 
   sort(comparator: (a: V, B: V) => number): void {
-    const sorted = this.indexes
-      .slice()
-      .sort((a, b) => comparator(this.map.get(a)!, this.map.get(b)!));
+    const sorted = this.indexes.slice().sort((a, b) => comparator(this.map.get(a)!, this.map.get(b)!));
     this.indexes.replace(sorted);
   }
 }
diff --git a/webapp/packages/core-utils/src/PriorityQueue.test.ts b/webapp/packages/core-utils/src/PriorityQueue.test.ts
index b0a266c312..272aa0dc89 100644
--- a/webapp/packages/core-utils/src/PriorityQueue.test.ts
+++ b/webapp/packages/core-utils/src/PriorityQueue.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PriorityQueue } from './PriorityQueue';
 
 describe('PriorityQueue', () => {
diff --git a/webapp/packages/core-utils/src/PriorityQueue.ts b/webapp/packages/core-utils/src/PriorityQueue.ts
index a885777f5a..77ca026d28 100644
--- a/webapp/packages/core-utils/src/PriorityQueue.ts
+++ b/webapp/packages/core-utils/src/PriorityQueue.ts
@@ -11,10 +11,10 @@ function parent(i: number): number {
   return ((i + 1) >>> 1) - 1;
 }
 function left(i: number): number {
-  return  (i << 1) + 1;
+  return (i << 1) + 1;
 }
 function right(i: number): number {
-  return  (i + 1) << 1;
+  return (i + 1) << 1;
 }
 
 type Comparator<T> = (a: T, b: T) => boolean;
@@ -86,13 +86,10 @@ export class PriorityQueue<T = number> {
 
   private siftDown() {
     let node = top;
-    while (
-      (left(node) < this.size() && this.greater(left(node), node))
-      || (right(node) < this.size() && this.greater(right(node), node))
-    ) {
-      const maxChild = (right(node) < this.size() && this.greater(right(node), left(node))) ? right(node) : left(node);
+    while ((left(node) < this.size() && this.greater(left(node), node)) || (right(node) < this.size() && this.greater(right(node), node))) {
+      const maxChild = right(node) < this.size() && this.greater(right(node), left(node)) ? right(node) : left(node);
       this.swap(node, maxChild);
       node = maxChild;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/Promises/CancellablePromise.ts b/webapp/packages/core-utils/src/Promises/CancellablePromise.ts
index c524908151..bdb631bb0a 100644
--- a/webapp/packages/core-utils/src/Promises/CancellablePromise.ts
+++ b/webapp/packages/core-utils/src/Promises/CancellablePromise.ts
@@ -5,13 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PromiseCancelledError } from './PromiseCancelledError';
 
-export type CancellableExecutor<T> = (
-  resolve: (value: T) => void,
-  reject: (reason?: any) => void
-) => undefined | (() => void); // returns nothing or cancel function
+export type CancellableExecutor<T> = (resolve: (value: T) => void, reject: (reason?: any) => void) => undefined | (() => void); // returns nothing or cancel function
 
 /**
  * When cancelled the promise will be rejected with the reason PROMISE_CANCELLED
diff --git a/webapp/packages/core-utils/src/Promises/Deferred.ts b/webapp/packages/core-utils/src/Promises/Deferred.ts
index 9c8675ea53..52a6240baa 100644
--- a/webapp/packages/core-utils/src/Promises/Deferred.ts
+++ b/webapp/packages/core-utils/src/Promises/Deferred.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { action, computed, observable, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 import { errorOf } from '../errorOf';
 import { PromiseCancelledError } from './PromiseCancelledError';
@@ -31,18 +30,21 @@ export class Deferred<T> {
   private readonly promiseExecutor = new PromiseExecutor<T>();
 
   constructor() {
-    makeObservable<Deferred<T>, 'payload' | 'rejectionReason' | 'state' | 'toResolved' | 'toRejected' | 'toCancelled' | 'toCancelling' | 'toPending'>(this, {
-      payload: observable,
-      rejectionReason: observable,
-      state: observable,
-      isInProgress: computed,
-      isFinished: computed,
-      toResolved: action,
-      toRejected: action,
-      toCancelled: action,
-      toCancelling: action,
-      toPending: action,
-    });
+    makeObservable<Deferred<T>, 'payload' | 'rejectionReason' | 'state' | 'toResolved' | 'toRejected' | 'toCancelled' | 'toCancelling' | 'toPending'>(
+      this,
+      {
+        payload: observable,
+        rejectionReason: observable,
+        state: observable,
+        isInProgress: computed,
+        isFinished: computed,
+        toResolved: action,
+        toRejected: action,
+        toCancelled: action,
+        toCancelling: action,
+        toPending: action,
+      },
+    );
   }
 
   get promise(): Promise<T> {
@@ -119,7 +121,7 @@ export class DeferredFromPromise<T> extends Deferred<T> {
         } else {
           this.toRejected(err);
         }
-      }
+      },
     );
   }
 }
diff --git a/webapp/packages/core-utils/src/Promises/PromiseCancelledError.ts b/webapp/packages/core-utils/src/Promises/PromiseCancelledError.ts
index 94093f81f3..e129c66f04 100644
--- a/webapp/packages/core-utils/src/Promises/PromiseCancelledError.ts
+++ b/webapp/packages/core-utils/src/Promises/PromiseCancelledError.ts
@@ -5,14 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { errorOf } from '../errorOf';
 
 export class PromiseCancelledError extends Error {
-  constructor(
-    message?: string,
-    options?: ErrorOptions
-  ) {
+  constructor(message?: string, options?: ErrorOptions) {
     super(message, options);
   }
 }
diff --git a/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts b/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
index a7f5281b7b..0b25978b59 100644
--- a/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
+++ b/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
@@ -6,10 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-export type Executor<T> = (
-  resolve: (value: T | PromiseLike<T>) => void,
-  reject: (reason?: any) => void
-) => void;
+export type Executor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void;
 
 /**
  * Creates promise that can be resolved or rejected externally by calling resolve and reject methods
diff --git a/webapp/packages/core-utils/src/Promises/deferPromise.ts b/webapp/packages/core-utils/src/Promises/deferPromise.ts
index 2499a500a2..2e9c45244f 100644
--- a/webapp/packages/core-utils/src/Promises/deferPromise.ts
+++ b/webapp/packages/core-utils/src/Promises/deferPromise.ts
@@ -5,13 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { CancellablePromise } from './CancellablePromise';
 
-type PromiseExecutor<T> = (
-  resolve: (value: T) => void,
-  reject: (reason?: any) => void
-) => void;
+type PromiseExecutor<T> = (resolve: (value: T) => void, reject: (reason?: any) => void) => void;
 
 /**
  * wait timeout milliseconds then start to execute promise.
diff --git a/webapp/packages/core-utils/src/Quadtree/index.ts b/webapp/packages/core-utils/src/Quadtree/index.ts
index 3f926ccd35..2df807008d 100644
--- a/webapp/packages/core-utils/src/Quadtree/index.ts
+++ b/webapp/packages/core-utils/src/Quadtree/index.ts
@@ -1,6 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="./quadtree.d.ts" />
-
 import Quadtree, { Rectangle } from '@timohausmann/quadtree-ts';
 
-export { Quadtree, Rectangle };
\ No newline at end of file
+export { Quadtree, Rectangle };
diff --git a/webapp/packages/core-utils/src/Quadtree/quadtree.d.ts b/webapp/packages/core-utils/src/Quadtree/quadtree.d.ts
index 409cf05790..07cb53166e 100644
--- a/webapp/packages/core-utils/src/Quadtree/quadtree.d.ts
+++ b/webapp/packages/core-utils/src/Quadtree/quadtree.d.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Quadtree } from '@timohausmann/quadtree-ts';
 
 declare module '@timohausmann/quadtree-ts' {
diff --git a/webapp/packages/core-utils/src/TempMap.ts b/webapp/packages/core-utils/src/TempMap.ts
index 58ebf19ae3..4b9a789da7 100644
--- a/webapp/packages/core-utils/src/TempMap.ts
+++ b/webapp/packages/core-utils/src/TempMap.ts
@@ -5,14 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { cacheValue, ICachedValueObject } from './cacheValue';
 
-const combine = <T>(a: IterableIterator<T>, b: IterableIterator<T>): IterableIterator<T> => (
-  function* () { yield* a; yield* b; }
-)();
+const combine = <T>(a: IterableIterator<T>, b: IterableIterator<T>): IterableIterator<T> =>
+  (function* () {
+    yield* a;
+    yield* b;
+  })();
 
 export class TempMap<TKey, TValue> implements Map<TKey, TValue> {
   get size(): number {
@@ -34,10 +35,7 @@ export class TempMap<TKey, TValue> implements Map<TKey, TValue> {
   private readonly valuesTemp: ICachedValueObject<TValue[]>;
   private readonly entriesTemp: ICachedValueObject<[TKey, TValue][]>;
 
-  constructor(
-    private readonly target: Map<TKey, TValue>,
-    private readonly onSync?: () => void,
-  ) {
+  constructor(private readonly target: Map<TKey, TValue>, private readonly onSync?: () => void) {
     this.temp = new Map();
     this.flushTask = null;
     this.deleted = [];
@@ -121,21 +119,15 @@ export class TempMap<TKey, TValue> implements Map<TKey, TValue> {
   }
 
   entries(): IterableIterator<[TKey, TValue]> {
-    return this.entriesTemp.value(() => Array.from(this.keys())
-      .map<[TKey, TValue]>(key => [key, this.get(key)!]))
-      .values();
+    return this.entriesTemp.value(() => Array.from(this.keys()).map<[TKey, TValue]>(key => [key, this.get(key)!])).values();
   }
 
   keys(): IterableIterator<TKey> {
-    return this.keysTemp.value(() => Array.from(new Set(combine(this.target.keys(), this.temp.keys())))
-      .filter(key => !this.isDeleted(key)))
-      .values();
+    return this.keysTemp.value(() => Array.from(new Set(combine(this.target.keys(), this.temp.keys()))).filter(key => !this.isDeleted(key))).values();
   }
 
   values(): IterableIterator<TValue> {
-    return this.valuesTemp.value(() => Array.from(this.keys())
-      .map<TValue>(key => this.get(key)!))
-      .values();
+    return this.valuesTemp.value(() => Array.from(this.keys()).map<TValue>(key => this.get(key)!)).values();
   }
 
   private scheduleFlush(): void {
@@ -147,22 +139,25 @@ export class TempMap<TKey, TValue> implements Map<TKey, TValue> {
       return;
     }
 
-    this.flushTask = setTimeout(action(() => {
-      for (const deleted of this.deleted) {
-        this.target.delete(deleted);
-      }
-      this.deleted.splice(0, this.deleted.length);
+    this.flushTask = setTimeout(
+      action(() => {
+        for (const deleted of this.deleted) {
+          this.target.delete(deleted);
+        }
+        this.deleted.splice(0, this.deleted.length);
 
-      for (const [key, value] of this.temp) {
-        this.target.set(key, value);
-      }
-      this.onSync?.();
-      this.temp.clear();
-      this.keysTemp.invalidate();
-      this.valuesTemp.invalidate();
-      this.entriesTemp.invalidate();
+        for (const [key, value] of this.temp) {
+          this.target.set(key, value);
+        }
+        this.onSync?.();
+        this.temp.clear();
+        this.keysTemp.invalidate();
+        this.valuesTemp.invalidate();
+        this.entriesTemp.invalidate();
 
-      this.flushTask = null;
-    }), 300);
+        this.flushTask = null;
+      }),
+      300,
+    );
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/TextTools.ts b/webapp/packages/core-utils/src/TextTools.ts
index f92f9126cc..c1cff41b5b 100644
--- a/webapp/packages/core-utils/src/TextTools.ts
+++ b/webapp/packages/core-utils/src/TextTools.ts
@@ -17,7 +17,9 @@ export const TextTools = {
     if (container) {
       const fontTags = ['font-weight', 'font-size', 'font-family'];
       const styleDeclaration = window.getComputedStyle(container);
-      const fontValues = fontTags.map(fontValue => fontValue === 'font-family' ? styleDeclaration.getPropertyValue(fontValue).split(',')[0] : styleDeclaration.getPropertyValue(fontValue));
+      const fontValues = fontTags.map(fontValue =>
+        fontValue === 'font-family' ? styleDeclaration.getPropertyValue(fontValue).split(',')[0] : styleDeclaration.getPropertyValue(fontValue),
+      );
 
       if (fontValues.filter(v => v !== '').length === fontTags.length) {
         font = fontValues.join(' ');
diff --git a/webapp/packages/core-utils/src/blobToData.ts b/webapp/packages/core-utils/src/blobToData.ts
index 91fe089355..480c9bce7a 100644
--- a/webapp/packages/core-utils/src/blobToData.ts
+++ b/webapp/packages/core-utils/src/blobToData.ts
@@ -18,4 +18,4 @@ export function blobToData(blob: Blob | File): Promise<string | null> {
 
     fileReader.readAsDataURL(blob);
   });
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/bytesToSize.test.ts b/webapp/packages/core-utils/src/bytesToSize.test.ts
index a63b8d13a3..8bd2596bfe 100644
--- a/webapp/packages/core-utils/src/bytesToSize.test.ts
+++ b/webapp/packages/core-utils/src/bytesToSize.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { bytesToSize } from './bytesToSize';
 
 describe('Bytes to size', () => {
@@ -48,4 +47,4 @@ describe('Bytes to size', () => {
   test('should return "1.1 TB" when "1209462790553.6" bytes are passed', () => {
     expect(bytesToSize(1209462790553.6)).toBe('1.1 TB');
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/bytesToSize.ts b/webapp/packages/core-utils/src/bytesToSize.ts
index b6471d51a1..86495247fe 100644
--- a/webapp/packages/core-utils/src/bytesToSize.ts
+++ b/webapp/packages/core-utils/src/bytesToSize.ts
@@ -20,4 +20,4 @@ export function bytesToSize(bytes: number): string {
   }
 
   return `${(bytes / Math.pow(1024, i)).toFixed(1)} ${sizes[i]}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/cacheValue.ts b/webapp/packages/core-utils/src/cacheValue.ts
index c3f51b87c2..fce015e859 100644
--- a/webapp/packages/core-utils/src/cacheValue.ts
+++ b/webapp/packages/core-utils/src/cacheValue.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable, runInAction } from 'mobx';
 
 const NOT_INITIALIZED_SYMBOL = Symbol('NOT_INITIALIZED_SYMBOL');
@@ -17,12 +16,15 @@ export interface ICachedValueObject<T> {
 }
 
 export function cacheValue<T>(): ICachedValueObject<T> {
-  const state = observable({
-    invalid: true,
-    value: NOT_INITIALIZED_SYMBOL as T | typeof NOT_INITIALIZED_SYMBOL,
-  }, {
-    value: observable.ref,
-  });
+  const state = observable(
+    {
+      invalid: true,
+      value: NOT_INITIALIZED_SYMBOL as T | typeof NOT_INITIALIZED_SYMBOL,
+    },
+    {
+      value: observable.ref,
+    },
+  );
 
   return {
     value(getter: () => T) {
@@ -41,4 +43,4 @@ export function cacheValue<T>(): ICachedValueObject<T> {
       state.invalid = true;
     },
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/createPath.test.ts b/webapp/packages/core-utils/src/createPath.test.ts
index f7cc62c67d..3eee948b25 100644
--- a/webapp/packages/core-utils/src/createPath.test.ts
+++ b/webapp/packages/core-utils/src/createPath.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createPath } from './createPath';
 
 describe('Create path', () => {
diff --git a/webapp/packages/core-utils/src/createPath.ts b/webapp/packages/core-utils/src/createPath.ts
index 23f5ac0043..fad8403d97 100644
--- a/webapp/packages/core-utils/src/createPath.ts
+++ b/webapp/packages/core-utils/src/createPath.ts
@@ -8,4 +8,4 @@
 
 export function createPath(...names: Array<string | undefined>): string {
   return names.filter(Boolean).join('/');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/debounce.test.ts b/webapp/packages/core-utils/src/debounce.test.ts
index 0588f48724..a450f16c7c 100644
--- a/webapp/packages/core-utils/src/debounce.test.ts
+++ b/webapp/packages/core-utils/src/debounce.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { debounce } from './debounce';
 
 // https://jestjs.io/docs/timer-mocks
@@ -26,4 +25,4 @@ describe('Debounce', () => {
 
     expect(func).toBeCalledTimes(1);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/debounce.ts b/webapp/packages/core-utils/src/debounce.ts
index 86919bb3db..3f4e020a44 100644
--- a/webapp/packages/core-utils/src/debounce.ts
+++ b/webapp/packages/core-utils/src/debounce.ts
@@ -18,4 +18,4 @@ export function debounce<T extends (...args: any[]) => any>(func: T, delay: numb
       func.apply(this, args);
     }, delay);
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/declensionOfNumber.test.ts b/webapp/packages/core-utils/src/declensionOfNumber.test.ts
index 94442bcb97..15e06f93c1 100644
--- a/webapp/packages/core-utils/src/declensionOfNumber.test.ts
+++ b/webapp/packages/core-utils/src/declensionOfNumber.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { declensionOfNumber } from './declensionOfNumber';
 
 describe('Declension of number', () => {
@@ -20,4 +19,4 @@ describe('Declension of number', () => {
   test('should return "Лет" when "18" is passed', () => {
     expect(declensionOfNumber(18, ['Год', 'Года', 'Лет'])).toBe('Лет');
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/errorOf.ts b/webapp/packages/core-utils/src/errorOf.ts
index a94b126840..e540526667 100644
--- a/webapp/packages/core-utils/src/errorOf.ts
+++ b/webapp/packages/core-utils/src/errorOf.ts
@@ -6,10 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-export function errorOf<T extends abstract new (...args: any) => Error>(
-  error: any,
-  constructor: T
-): InstanceType<T> | undefined {
+export function errorOf<T extends abstract new (...args: any) => Error>(error: any, constructor: T): InstanceType<T> | undefined {
   if (error instanceof constructor) {
     return error as InstanceType<T>;
   }
diff --git a/webapp/packages/core-utils/src/flat.test.ts b/webapp/packages/core-utils/src/flat.test.ts
index 820091fbb5..cf91d9ded3 100644
--- a/webapp/packages/core-utils/src/flat.test.ts
+++ b/webapp/packages/core-utils/src/flat.test.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { flat } from './flat';
 
 describe('Flat array', () => {
   test('should return flatted array', () => {
     expect(flat([1, 2, [3, 4]])).toEqual([1, 2, 3, 4]);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/generateFileName.test.ts b/webapp/packages/core-utils/src/generateFileName.test.ts
index 5e0cca839a..67e6675b4b 100644
--- a/webapp/packages/core-utils/src/generateFileName.test.ts
+++ b/webapp/packages/core-utils/src/generateFileName.test.ts
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { generateFileName } from './generateFileName';
 
 describe('generateFileName', () => {
   it('should generate a file name in the expected format', () => {
     const mockDate = new Date('2020-09-09T14:13:20');
-    const spy = jest
-      .spyOn(global, 'Date')
-      .mockImplementation(() => mockDate as unknown as string);
+    const spy = jest.spyOn(global, 'Date').mockImplementation(() => mockDate as unknown as string);
 
     const fileName = 'my-file';
     const fileFormat = '.txt';
@@ -24,4 +21,4 @@ describe('generateFileName', () => {
 
     spy.mockRestore();
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/generateFileName.ts b/webapp/packages/core-utils/src/generateFileName.ts
index a1a0dea25e..bf956d927c 100644
--- a/webapp/packages/core-utils/src/generateFileName.ts
+++ b/webapp/packages/core-utils/src/generateFileName.ts
@@ -8,5 +8,7 @@
 
 export function generateFileName(fileName: string, fileFormat: string) {
   const now = new Date();
-  return `${fileName} ${now.toISOString().slice(0, 10)} ${('0' + now.getHours()).slice(-2)}-${('0' + now.getMinutes()).slice(-2)}-${('0' + now.getSeconds()).slice(-2)}${fileFormat}`;
+  return `${fileName} ${now.toISOString().slice(0, 10)} ${('0' + now.getHours()).slice(-2)}-${('0' + now.getMinutes()).slice(-2)}-${(
+    '0' + now.getSeconds()
+  ).slice(-2)}${fileFormat}`;
 }
diff --git a/webapp/packages/core-utils/src/getCookies.test.ts b/webapp/packages/core-utils/src/getCookies.test.ts
index 5867d75fed..57ca3bc3be 100644
--- a/webapp/packages/core-utils/src/getCookies.test.ts
+++ b/webapp/packages/core-utils/src/getCookies.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getCookies } from './getCookies';
 
 describe('getCookies', () => {
@@ -36,4 +35,4 @@ describe('getCookies', () => {
     // assert that the `cookies` object is empty
     expect(cookies).toEqual({});
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/getPathName.ts b/webapp/packages/core-utils/src/getPathName.ts
index f63f4c9ffd..1bc966176b 100644
--- a/webapp/packages/core-utils/src/getPathName.ts
+++ b/webapp/packages/core-utils/src/getPathName.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getPathParts } from './getPathParts';
 
 export function getPathName(path: string) {
   const parts = getPathParts(path);
   return parts[parts.length - 1];
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/getPathParent.ts b/webapp/packages/core-utils/src/getPathParent.ts
index 5fe78c1a1c..e59f163004 100644
--- a/webapp/packages/core-utils/src/getPathParent.ts
+++ b/webapp/packages/core-utils/src/getPathParent.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createPath } from './createPath';
 import { getPathParts } from './getPathParts';
 
 export function getPathParent(path: string): string {
   const parts = getPathParts(path);
   return createPath(...parts.slice(0, parts.length - 1));
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/getPathParents.ts b/webapp/packages/core-utils/src/getPathParents.ts
index def74498b4..b300a76751 100644
--- a/webapp/packages/core-utils/src/getPathParents.ts
+++ b/webapp/packages/core-utils/src/getPathParents.ts
@@ -5,14 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createPath } from './createPath';
 import { getPathParts } from './getPathParts';
 
 export function getPathParents(path: string): string[] {
   const parts = getPathParts(path);
 
-  return parts
-    .map((_, i, array) => createPath(...array.slice(0, i)))
-    .filter(parent => parent !== path);
-}
\ No newline at end of file
+  return parts.map((_, i, array) => createPath(...array.slice(0, i))).filter(parent => parent !== path);
+}
diff --git a/webapp/packages/core-utils/src/getPathParts.ts b/webapp/packages/core-utils/src/getPathParts.ts
index 97b6330a30..da02d3051f 100644
--- a/webapp/packages/core-utils/src/getPathParts.ts
+++ b/webapp/packages/core-utils/src/getPathParts.ts
@@ -11,4 +11,4 @@ export function getPathParts(path: string): string[] {
     .replace('//', '[\\\\]')
     .split('/')
     .map(v => v.replace(/\[\\\\\]/, '//'));
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/getTextBetween.test.ts b/webapp/packages/core-utils/src/getTextBetween.test.ts
index 20ff76c580..8d93ec7df6 100644
--- a/webapp/packages/core-utils/src/getTextBetween.test.ts
+++ b/webapp/packages/core-utils/src/getTextBetween.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getTextBetween } from './getTextBetween';
 
 describe('Get text between', () => {
diff --git a/webapp/packages/core-utils/src/getUniqueName.test.ts b/webapp/packages/core-utils/src/getUniqueName.test.ts
index 53da38ea04..fa14e0adcc 100644
--- a/webapp/packages/core-utils/src/getUniqueName.test.ts
+++ b/webapp/packages/core-utils/src/getUniqueName.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getUniqueName } from './getUniqueName';
 
 describe('Get unique name', () => {
@@ -24,4 +23,4 @@ describe('Get unique name', () => {
   test('should return "name" when "name" is passed and "name (2)" and "name (1)" are presented', () => {
     expect(getUniqueName('name', ['name (2)', 'name (1)', 'another name'])).toBe('name');
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
index 0ac81e7d23..1de71c0ec8 100644
--- a/webapp/packages/core-utils/src/index.ts
+++ b/webapp/packages/core-utils/src/index.ts
@@ -64,4 +64,4 @@ export * from './utf8ToBase64';
 export * from './createLastPromiseGetter';
 export * from './removeMetadataFromBase64';
 export * from './renamePathName';
-export * from './removeLineBreak';
\ No newline at end of file
+export * from './removeLineBreak';
diff --git a/webapp/packages/core-utils/src/isArrayEquals.test.ts b/webapp/packages/core-utils/src/isArrayEquals.test.ts
index baf2a81a71..b4550e49bd 100644
--- a/webapp/packages/core-utils/src/isArrayEquals.test.ts
+++ b/webapp/packages/core-utils/src/isArrayEquals.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isArraysEqual } from './isArraysEqual';
 
 describe('Is array equals', () => {
@@ -56,4 +55,4 @@ describe('Is array equals', () => {
   test('should use isEqual argument if passed and "order" argument is "true"', () => {
     expect(isArraysEqual([{ a: 1 }], [{ a: 1 }], (a, b) => a.a === b.a, true)).toBe(true);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isArraysEqual.ts b/webapp/packages/core-utils/src/isArraysEqual.ts
index b0afae9d49..0f9ebf892b 100644
--- a/webapp/packages/core-utils/src/isArraysEqual.ts
+++ b/webapp/packages/core-utils/src/isArraysEqual.ts
@@ -8,17 +8,11 @@
 
 const isObjectEqual = <T>(a: T, b: T) => a === b;
 
-export function isArraysEqual<T>(
-  first: T[],
-  second: T[],
-  isEqual: (a: T, b: T) => boolean = isObjectEqual,
-  order?: boolean
-): boolean {
+export function isArraysEqual<T>(first: T[], second: T[], isEqual: (a: T, b: T) => boolean = isObjectEqual, order?: boolean): boolean {
   if (first.length !== second.length) {
     return false;
   }
 
-
   return !first.some((b, index) => {
     if (order) {
       return !isEqual(second[index], b);
diff --git a/webapp/packages/core-utils/src/isDefined.test.ts b/webapp/packages/core-utils/src/isDefined.test.ts
index dd22e544bf..ed0b45cf0a 100644
--- a/webapp/packages/core-utils/src/isDefined.test.ts
+++ b/webapp/packages/core-utils/src/isDefined.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isDefined } from './isDefined';
 
 describe('Is defined', () => {
@@ -36,4 +35,4 @@ describe('Is defined', () => {
   test('should return "false" when "undefined" is passed', () => {
     expect(isDefined(undefined)).toBe(false);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isDefined.ts b/webapp/packages/core-utils/src/isDefined.ts
index 7490c33ffb..5719b11720 100644
--- a/webapp/packages/core-utils/src/isDefined.ts
+++ b/webapp/packages/core-utils/src/isDefined.ts
@@ -8,4 +8,4 @@
 
 export function isDefined<T>(value: T | undefined): value is T {
   return value !== undefined;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/isImageFormat.test.ts b/webapp/packages/core-utils/src/isImageFormat.test.ts
index cdb54ea639..6e8ad1e6fd 100644
--- a/webapp/packages/core-utils/src/isImageFormat.test.ts
+++ b/webapp/packages/core-utils/src/isImageFormat.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isImageFormat } from './isImageFormat';
 
 describe('Is image format', () => {
@@ -40,4 +39,4 @@ describe('Is image format', () => {
   test('should return "false" when link with ".html" extension is passed', () => {
     expect(isImageFormat('https://300.html')).toBe(false);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isMapsEqual.test.ts b/webapp/packages/core-utils/src/isMapsEqual.test.ts
index 8884741724..e1232b98b4 100644
--- a/webapp/packages/core-utils/src/isMapsEqual.test.ts
+++ b/webapp/packages/core-utils/src/isMapsEqual.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isMapsEqual } from './isMapsEqual';
 
 describe('Is maps equal', () => {
@@ -34,4 +33,4 @@ describe('Is maps equal', () => {
 
     expect(isMapsEqual(map1, map2)).toBe(false);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isObjectsEqual.ts b/webapp/packages/core-utils/src/isObjectsEqual.ts
index 2046e57ed4..72db751bad 100644
--- a/webapp/packages/core-utils/src/isObjectsEqual.ts
+++ b/webapp/packages/core-utils/src/isObjectsEqual.ts
@@ -5,12 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import isEqual from 'fast-deep-equal';
 
-export function isObjectsEqual(
-  a: any,
-  b: any
-): boolean {
+export function isObjectsEqual(a: any, b: any): boolean {
   return isEqual(a, b);
 }
diff --git a/webapp/packages/core-utils/src/isPrimitive.ts b/webapp/packages/core-utils/src/isPrimitive.ts
index 3b1b36130f..e9ad822eea 100644
--- a/webapp/packages/core-utils/src/isPrimitive.ts
+++ b/webapp/packages/core-utils/src/isPrimitive.ts
@@ -8,4 +8,4 @@
 
 export function isPrimitive(value: any): boolean {
   return value === null || (typeof value !== 'object' && typeof value !== 'function');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/isPropertiesEqual.test.ts b/webapp/packages/core-utils/src/isPropertiesEqual.test.ts
index f60fa6bbc9..8a116da5cc 100644
--- a/webapp/packages/core-utils/src/isPropertiesEqual.test.ts
+++ b/webapp/packages/core-utils/src/isPropertiesEqual.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isPropertiesEqual } from './isPropertiesEqual';
 
 describe('isPropertiesEqual', () => {
diff --git a/webapp/packages/core-utils/src/isPropertiesEqual.ts b/webapp/packages/core-utils/src/isPropertiesEqual.ts
index 4ea2de54ea..ca7b4ae76a 100644
--- a/webapp/packages/core-utils/src/isPropertiesEqual.ts
+++ b/webapp/packages/core-utils/src/isPropertiesEqual.ts
@@ -7,12 +7,7 @@
  */
 
 export function isPropertiesEqual<T>(first: T, second: T): boolean {
-  if (
-    first === null
-    || second === null
-    || typeof first !== 'object'
-    || typeof second !== 'object'
-  ) {
+  if (first === null || second === null || typeof first !== 'object' || typeof second !== 'object') {
     return false;
   }
 
diff --git a/webapp/packages/core-utils/src/isSafari.ts b/webapp/packages/core-utils/src/isSafari.ts
index 8f2d42a394..cca372289f 100644
--- a/webapp/packages/core-utils/src/isSafari.ts
+++ b/webapp/packages/core-utils/src/isSafari.ts
@@ -8,4 +8,4 @@
 
 const ua = navigator.userAgent.toLowerCase();
 
-export const isSafari = ua.includes('safari') && !ua.includes('chrome');
\ No newline at end of file
+export const isSafari = ua.includes('safari') && !ua.includes('chrome');
diff --git a/webapp/packages/core-utils/src/isSameDay.ts b/webapp/packages/core-utils/src/isSameDay.ts
index 1fd71a58f9..d746f03be9 100644
--- a/webapp/packages/core-utils/src/isSameDay.ts
+++ b/webapp/packages/core-utils/src/isSameDay.ts
@@ -7,9 +7,5 @@
  */
 
 export function isSameDay(dateA: Date, dateB: Date): boolean {
-  return (
-    dateA.getFullYear() === dateB.getFullYear()
-    && dateA.getMonth() === dateB.getMonth()
-    && dateA.getDate() === dateB.getDate()
-  );
-}
\ No newline at end of file
+  return dateA.getFullYear() === dateB.getFullYear() && dateA.getMonth() === dateB.getMonth() && dateA.getDate() === dateB.getDate();
+}
diff --git a/webapp/packages/core-utils/src/isValidUrl.test.ts b/webapp/packages/core-utils/src/isValidUrl.test.ts
index e21ede6b5a..84f91d118a 100644
--- a/webapp/packages/core-utils/src/isValidUrl.test.ts
+++ b/webapp/packages/core-utils/src/isValidUrl.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isValidUrl } from './isValidUrl';
 
 describe('Is valid url', () => {
@@ -24,4 +23,4 @@ describe('Is valid url', () => {
   test('should return "false" when not valid url is passed', () => {
     expect(isValidUrl('example')).toBe(false);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isValidUrl.ts b/webapp/packages/core-utils/src/isValidUrl.ts
index 0a699324a3..ed9f786b8c 100644
--- a/webapp/packages/core-utils/src/isValidUrl.ts
+++ b/webapp/packages/core-utils/src/isValidUrl.ts
@@ -7,12 +7,15 @@
  */
 
 // test freezes with '5999999999999000000000000000000000000000000'
-const urlPattern = new RegExp('^(https?:\\/\\/)?' // protocol
-+ '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' // domain name
-+ '((\\d{1,3}\\.){3}\\d{1,3}))' // OR ip (v4) address
-+ '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' // port and path
-+ '(\\?[;&a-z\\d%_.~+=-]*)?' // query string
-+ '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+const urlPattern = new RegExp(
+  '^(https?:\\/\\/)?' + // protocol
+    '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
+    '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
+    '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
+    '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
+    '(\\#[-a-z\\d_]*)?$',
+  'i',
+); // fragment locator
 
 export function isValidUrl(value: string): boolean {
   return value.startsWith('https://') || value.startsWith('http://');
diff --git a/webapp/packages/core-utils/src/isValuesEqual.test.ts b/webapp/packages/core-utils/src/isValuesEqual.test.ts
index ad1e15595a..27fa153cf2 100644
--- a/webapp/packages/core-utils/src/isValuesEqual.test.ts
+++ b/webapp/packages/core-utils/src/isValuesEqual.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isValuesEqual } from './isValuesEqual';
 
 describe('Is values equal', () => {
@@ -40,4 +39,4 @@ describe('Is values equal', () => {
   test('should return "false" when the different booleans are passed', () => {
     expect(isValuesEqual(true, false)).toBe(false);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/isValuesEqual.ts b/webapp/packages/core-utils/src/isValuesEqual.ts
index a78e33c02f..c7fcf433ba 100644
--- a/webapp/packages/core-utils/src/isValuesEqual.ts
+++ b/webapp/packages/core-utils/src/isValuesEqual.ts
@@ -9,7 +9,7 @@
 export function isValuesEqual<T extends string | boolean | number>(
   first: T | null | undefined,
   second: T | null | undefined,
-  defaultValue?: T | null | undefined
+  defaultValue?: T | null | undefined,
 ): boolean {
   return (first ?? defaultValue) === (second ?? defaultValue);
 }
diff --git a/webapp/packages/core-utils/src/md5.ts b/webapp/packages/core-utils/src/md5.ts
index b0717dcadf..bb718786ba 100644
--- a/webapp/packages/core-utils/src/md5.ts
+++ b/webapp/packages/core-utils/src/md5.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import md5 from 'md5';
 
 export { md5 };
diff --git a/webapp/packages/core-utils/src/openCenteredPopup.ts b/webapp/packages/core-utils/src/openCenteredPopup.ts
index 3bc74823d6..10179c0ac7 100644
--- a/webapp/packages/core-utils/src/openCenteredPopup.ts
+++ b/webapp/packages/core-utils/src/openCenteredPopup.ts
@@ -14,13 +14,7 @@ export interface IWindowOptions {
   features?: string;
 }
 
-export function openCenteredPopup({
-  url,
-  target,
-  width = 500,
-  height = 500,
-  features,
-}: IWindowOptions): Window | null {
+export function openCenteredPopup({ url, target, width = 500, height = 500, features }: IWindowOptions): Window | null {
   if (window.top === null) {
     return null;
   }
diff --git a/webapp/packages/core-utils/src/parseJSONFlat.ts b/webapp/packages/core-utils/src/parseJSONFlat.ts
index 9699abf691..e9b34df229 100644
--- a/webapp/packages/core-utils/src/parseJSONFlat.ts
+++ b/webapp/packages/core-utils/src/parseJSONFlat.ts
@@ -6,11 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-export function parseJSONFlat(
-  object: any,
-  setValue: (key: string, value: any) => void,
-  scope?: string
-) {
+export function parseJSONFlat(object: any, setValue: (key: string, value: any) => void, scope?: string) {
   if (typeof object === 'object') {
     if (Array.isArray(object)) {
       if (scope) {
diff --git a/webapp/packages/core-utils/src/pathJoin.test.ts b/webapp/packages/core-utils/src/pathJoin.test.ts
index de9205efc8..58ab45d129 100644
--- a/webapp/packages/core-utils/src/pathJoin.test.ts
+++ b/webapp/packages/core-utils/src/pathJoin.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { pathJoin } from './pathJoin';
 
 describe('pathJoin', () => {
@@ -36,4 +35,4 @@ describe('pathJoin', () => {
   test('returns "/" if the input contains only slashes', () => {
     expect(pathJoin('/', '/')).toBe('/');
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/pathJoin.ts b/webapp/packages/core-utils/src/pathJoin.ts
index b203722bf6..20d610b1d4 100644
--- a/webapp/packages/core-utils/src/pathJoin.ts
+++ b/webapp/packages/core-utils/src/pathJoin.ts
@@ -21,14 +21,22 @@ export function pathJoin(...segments: string[]): string {
   for (const part of parts) {
     // Remove leading and trailing slashes
     // Also remove "." segments
-    if (!part || part === '.') {continue;}
+    if (!part || part === '.') {
+      continue;
+    }
     // Interpret ".." to pop the last segment
-    if (part === '..') {newParts.pop();}
+    if (part === '..') {
+      newParts.pop();
+    }
     // Push new path segments.
-    else {newParts.push(part);}
+    else {
+      newParts.push(part);
+    }
   }
   // Preserve the initial slash if there was one.
-  if (parts[0] === '') {newParts.unshift('');}
+  if (parts[0] === '') {
+    newParts.unshift('');
+  }
   // Turn back into a single string path.
   return newParts.join('/') || (newParts.length ? '/' : '.');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/removeLineBreak.test.ts b/webapp/packages/core-utils/src/removeLineBreak.test.ts
index 9136521285..81c359f32e 100644
--- a/webapp/packages/core-utils/src/removeLineBreak.test.ts
+++ b/webapp/packages/core-utils/src/removeLineBreak.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { removeLineBreak } from './removeLineBreak';
 
 describe('removeLineBreak', () => {
@@ -14,4 +13,4 @@ describe('removeLineBreak', () => {
     const expectedOutput = 'This is atest stringwith line breaks.';
     expect(removeLineBreak(input)).toEqual(expectedOutput);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/removeLineBreak.ts b/webapp/packages/core-utils/src/removeLineBreak.ts
index d5c99422b2..f319b965c0 100644
--- a/webapp/packages/core-utils/src/removeLineBreak.ts
+++ b/webapp/packages/core-utils/src/removeLineBreak.ts
@@ -8,4 +8,4 @@
 
 export function removeLineBreak(value: string) {
   return value.replace(/\r?\n|\r/g, '');
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/removeMetadataFromBase64.test.ts b/webapp/packages/core-utils/src/removeMetadataFromBase64.test.ts
index 6dede53b09..955c008fd0 100644
--- a/webapp/packages/core-utils/src/removeMetadataFromBase64.test.ts
+++ b/webapp/packages/core-utils/src/removeMetadataFromBase64.test.ts
@@ -5,14 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { removeMetadataFromBase64 } from './removeMetadataFromBase64';
 
-const BASE64 = 'data:application/zip;base64,UEsDBBQACAgIAIB8CVUAAAAAAAAAAAAAAAALAAAAZXdhbGxldC5wZW3Nmceyq0qyhuc8Rc+JExiBgEEP8CC8NzMBEt4j3NNf1trH7D59um/c7slVhCJEVVKUsjK//FP65ZfrxfCirP+N11k7Ml2e+5tpyz7t8n9T+Ohr+hdAk2X+XtEpk/djUZcitcEMR/OcRmM8a4R9yZnBGawCncsdTzsso1WSGXc6voSWMeQpMO3R8lwYheqHxvfostBL22Fpwy29OiJqPLhNgQvd6bgdg7dgPWBkDDOsZrbbZHYVLwPudK1k79VpirZlyROasi04dWTJOr7fzNwbIhoC68nCKqpB4GzRMToanV0M9VcBCm0gsepQGcPZWZOzGCM70Txzy9rPS9P1eafhIG6Jw2my4gEKyWgYBv2IqZfSetjjHgjhG9BQO361HARiEoTf/bIpHpsXPTp6SF/e2mAoGT4/dSkXKJ0sFcTPybY2S0MgjuwjTUwANr0FNmiSqppurQ1SPYhPY6xBrzU4X6HX3hljtwzDkycpSJUIFqznp78LUXKaqy+/DWDAGnXw7aTcWVSR7/K8cH5LGKUzpvW0jfXqjzJW+DdY5620saGli5XG0ibNsIr7A+0AY3a6bJ5YWbDWUWA2Z36C7bRDiOQlchlrpPEKjKWAFK7a7XCa0VPEHcy6BTTfEFZNAki9BOOdeKx4t50aXGVgWLve+VDz5Z6IHk+2TZgGg3nnBsrcxdug7OKWrpqTremQYTlgrrU55QVXCcnHgMESdTMKFgx6zPjYRRM/TxLSbLD2QMxgZxg2RbXCRtRVeePZ5WkQ0Aa0kpy3wb35bI/Xl0Ye+BtpZXRvTnIHUy9PA5txFiN2fSwZ4noz1bGgitJuoWt7T0CcngXEv813HqmFR9JKj+exx3Iv4nlAkroF8wNlVjJkO1hooGg9lJuzzm1KTmllpdMA6PJq9oUEr7zsUqDZIjcVsZei7V9uPGLhiz2Xup9TYezPe0IX2CzuHQiLVWPf2/TZlcBoX9+zaHnbTLLuZsQ5pTs3TQpbxPMDPONEseHJlH5YueYd+vSZ3kXVxKbafZ7Z/HJCQF0gnKJK8Ei2TzEb/Avjl4WQiaisukF85Y3eRNWD3uUH8hJrbgPh/DztLpDKk5dFkQEejjvzxNiLmWQgReFhIDl7+xu8kWPygEaHJN9C1dqPnXCzwlcFthA0t24i7pnXBW2ogErgmuAUt2Ta7vAOIk97lzDNiYVnazSZNJxvZh4jsUgC0NXTFPcErqCsFM71V9LK/hvoY9Q5LOQ2xqxagSoZTU60mrx/F+8TnEvy04rld021haT2K3TibVzBLAjRdMp+AjnVAVUx0r1MHGOeVyJlaXdgn7e4GUBO8pPtwQpYstUPZh3NA0U/NrHj1r3nu2BeD39YIgnwSyxGqnBEEFOv2ed42EyGN+276BRjte5v4+iYVHIR3/PigS3w6bXx5Jw1C9h2Zqy/gOljLXVSqqXz6PeG52M8JX0HjjuuP6T47aOcqGw3vkyz0jTkqnbh11a4UqtPUWqbNwIQb+AAkWwmHjeEb0J+ZBA2KD+HcniVdWIDRjVu5lyOFQX1cLF6l1+61eqh9Qmi+PlpAJFH2S29zej+GtlwLk8iIeh2gSQ+50ZMfXqLHLo80R47Eb9LlulN2GEapa6ecuQ/RAJoOBa8S8LRivfCuMOxdI';
-const BASE64_NO_METADATA = 'UEsDBBQACAgIAIB8CVUAAAAAAAAAAAAAAAALAAAAZXdhbGxldC5wZW3Nmceyq0qyhuc8Rc+JExiBgEEP8CC8NzMBEt4j3NNf1trH7D59um/c7slVhCJEVVKUsjK//FP65ZfrxfCirP+N11k7Ml2e+5tpyz7t8n9T+Ohr+hdAk2X+XtEpk/djUZcitcEMR/OcRmM8a4R9yZnBGawCncsdTzsso1WSGXc6voSWMeQpMO3R8lwYheqHxvfostBL22Fpwy29OiJqPLhNgQvd6bgdg7dgPWBkDDOsZrbbZHYVLwPudK1k79VpirZlyROasi04dWTJOr7fzNwbIhoC68nCKqpB4GzRMToanV0M9VcBCm0gsepQGcPZWZOzGCM70Txzy9rPS9P1eafhIG6Jw2my4gEKyWgYBv2IqZfSetjjHgjhG9BQO361HARiEoTf/bIpHpsXPTp6SF/e2mAoGT4/dSkXKJ0sFcTPybY2S0MgjuwjTUwANr0FNmiSqppurQ1SPYhPY6xBrzU4X6HX3hljtwzDkycpSJUIFqznp78LUXKaqy+/DWDAGnXw7aTcWVSR7/K8cH5LGKUzpvW0jfXqjzJW+DdY5620saGli5XG0ibNsIr7A+0AY3a6bJ5YWbDWUWA2Z36C7bRDiOQlchlrpPEKjKWAFK7a7XCa0VPEHcy6BTTfEFZNAki9BOOdeKx4t50aXGVgWLve+VDz5Z6IHk+2TZgGg3nnBsrcxdug7OKWrpqTremQYTlgrrU55QVXCcnHgMESdTMKFgx6zPjYRRM/TxLSbLD2QMxgZxg2RbXCRtRVeePZ5WkQ0Aa0kpy3wb35bI/Xl0Ye+BtpZXRvTnIHUy9PA5txFiN2fSwZ4noz1bGgitJuoWt7T0CcngXEv813HqmFR9JKj+exx3Iv4nlAkroF8wNlVjJkO1hooGg9lJuzzm1KTmllpdMA6PJq9oUEr7zsUqDZIjcVsZei7V9uPGLhiz2Xup9TYezPe0IX2CzuHQiLVWPf2/TZlcBoX9+zaHnbTLLuZsQ5pTs3TQpbxPMDPONEseHJlH5YueYd+vSZ3kXVxKbafZ7Z/HJCQF0gnKJK8Ei2TzEb/Avjl4WQiaisukF85Y3eRNWD3uUH8hJrbgPh/DztLpDKk5dFkQEejjvzxNiLmWQgReFhIDl7+xu8kWPygEaHJN9C1dqPnXCzwlcFthA0t24i7pnXBW2ogErgmuAUt2Ta7vAOIk97lzDNiYVnazSZNJxvZh4jsUgC0NXTFPcErqCsFM71V9LK/hvoY9Q5LOQ2xqxagSoZTU60mrx/F+8TnEvy04rld021haT2K3TibVzBLAjRdMp+AjnVAVUx0r1MHGOeVyJlaXdgn7e4GUBO8pPtwQpYstUPZh3NA0U/NrHj1r3nu2BeD39YIgnwSyxGqnBEEFOv2ed42EyGN+276BRjte5v4+iYVHIR3/PigS3w6bXx5Jw1C9h2Zqy/gOljLXVSqqXz6PeG52M8JX0HjjuuP6T47aOcqGw3vkyz0jTkqnbh11a4UqtPUWqbNwIQb+AAkWwmHjeEb0J+ZBA2KD+HcniVdWIDRjVu5lyOFQX1cLF6l1+61eqh9Qmi+PlpAJFH2S29zej+GtlwLk8iIeh2gSQ+50ZMfXqLHLo80R47Eb9LlulN2GEapa6ecuQ/RAJoOBa8S8LRivfCuMOxdI';
+const BASE64 =
+  'data:application/zip;base64,UEsDBBQACAgIAIB8CVUAAAAAAAAAAAAAAAALAAAAZXdhbGxldC5wZW3Nmceyq0qyhuc8Rc+JExiBgEEP8CC8NzMBEt4j3NNf1trH7D59um/c7slVhCJEVVKUsjK//FP65ZfrxfCirP+N11k7Ml2e+5tpyz7t8n9T+Ohr+hdAk2X+XtEpk/djUZcitcEMR/OcRmM8a4R9yZnBGawCncsdTzsso1WSGXc6voSWMeQpMO3R8lwYheqHxvfostBL22Fpwy29OiJqPLhNgQvd6bgdg7dgPWBkDDOsZrbbZHYVLwPudK1k79VpirZlyROasi04dWTJOr7fzNwbIhoC68nCKqpB4GzRMToanV0M9VcBCm0gsepQGcPZWZOzGCM70Txzy9rPS9P1eafhIG6Jw2my4gEKyWgYBv2IqZfSetjjHgjhG9BQO361HARiEoTf/bIpHpsXPTp6SF/e2mAoGT4/dSkXKJ0sFcTPybY2S0MgjuwjTUwANr0FNmiSqppurQ1SPYhPY6xBrzU4X6HX3hljtwzDkycpSJUIFqznp78LUXKaqy+/DWDAGnXw7aTcWVSR7/K8cH5LGKUzpvW0jfXqjzJW+DdY5620saGli5XG0ibNsIr7A+0AY3a6bJ5YWbDWUWA2Z36C7bRDiOQlchlrpPEKjKWAFK7a7XCa0VPEHcy6BTTfEFZNAki9BOOdeKx4t50aXGVgWLve+VDz5Z6IHk+2TZgGg3nnBsrcxdug7OKWrpqTremQYTlgrrU55QVXCcnHgMESdTMKFgx6zPjYRRM/TxLSbLD2QMxgZxg2RbXCRtRVeePZ5WkQ0Aa0kpy3wb35bI/Xl0Ye+BtpZXRvTnIHUy9PA5txFiN2fSwZ4noz1bGgitJuoWt7T0CcngXEv813HqmFR9JKj+exx3Iv4nlAkroF8wNlVjJkO1hooGg9lJuzzm1KTmllpdMA6PJq9oUEr7zsUqDZIjcVsZei7V9uPGLhiz2Xup9TYezPe0IX2CzuHQiLVWPf2/TZlcBoX9+zaHnbTLLuZsQ5pTs3TQpbxPMDPONEseHJlH5YueYd+vSZ3kXVxKbafZ7Z/HJCQF0gnKJK8Ei2TzEb/Avjl4WQiaisukF85Y3eRNWD3uUH8hJrbgPh/DztLpDKk5dFkQEejjvzxNiLmWQgReFhIDl7+xu8kWPygEaHJN9C1dqPnXCzwlcFthA0t24i7pnXBW2ogErgmuAUt2Ta7vAOIk97lzDNiYVnazSZNJxvZh4jsUgC0NXTFPcErqCsFM71V9LK/hvoY9Q5LOQ2xqxagSoZTU60mrx/F+8TnEvy04rld021haT2K3TibVzBLAjRdMp+AjnVAVUx0r1MHGOeVyJlaXdgn7e4GUBO8pPtwQpYstUPZh3NA0U/NrHj1r3nu2BeD39YIgnwSyxGqnBEEFOv2ed42EyGN+276BRjte5v4+iYVHIR3/PigS3w6bXx5Jw1C9h2Zqy/gOljLXVSqqXz6PeG52M8JX0HjjuuP6T47aOcqGw3vkyz0jTkqnbh11a4UqtPUWqbNwIQb+AAkWwmHjeEb0J+ZBA2KD+HcniVdWIDRjVu5lyOFQX1cLF6l1+61eqh9Qmi+PlpAJFH2S29zej+GtlwLk8iIeh2gSQ+50ZMfXqLHLo80R47Eb9LlulN2GEapa6ecuQ/RAJoOBa8S8LRivfCuMOxdI';
+const BASE64_NO_METADATA =
+  'UEsDBBQACAgIAIB8CVUAAAAAAAAAAAAAAAALAAAAZXdhbGxldC5wZW3Nmceyq0qyhuc8Rc+JExiBgEEP8CC8NzMBEt4j3NNf1trH7D59um/c7slVhCJEVVKUsjK//FP65ZfrxfCirP+N11k7Ml2e+5tpyz7t8n9T+Ohr+hdAk2X+XtEpk/djUZcitcEMR/OcRmM8a4R9yZnBGawCncsdTzsso1WSGXc6voSWMeQpMO3R8lwYheqHxvfostBL22Fpwy29OiJqPLhNgQvd6bgdg7dgPWBkDDOsZrbbZHYVLwPudK1k79VpirZlyROasi04dWTJOr7fzNwbIhoC68nCKqpB4GzRMToanV0M9VcBCm0gsepQGcPZWZOzGCM70Txzy9rPS9P1eafhIG6Jw2my4gEKyWgYBv2IqZfSetjjHgjhG9BQO361HARiEoTf/bIpHpsXPTp6SF/e2mAoGT4/dSkXKJ0sFcTPybY2S0MgjuwjTUwANr0FNmiSqppurQ1SPYhPY6xBrzU4X6HX3hljtwzDkycpSJUIFqznp78LUXKaqy+/DWDAGnXw7aTcWVSR7/K8cH5LGKUzpvW0jfXqjzJW+DdY5620saGli5XG0ibNsIr7A+0AY3a6bJ5YWbDWUWA2Z36C7bRDiOQlchlrpPEKjKWAFK7a7XCa0VPEHcy6BTTfEFZNAki9BOOdeKx4t50aXGVgWLve+VDz5Z6IHk+2TZgGg3nnBsrcxdug7OKWrpqTremQYTlgrrU55QVXCcnHgMESdTMKFgx6zPjYRRM/TxLSbLD2QMxgZxg2RbXCRtRVeePZ5WkQ0Aa0kpy3wb35bI/Xl0Ye+BtpZXRvTnIHUy9PA5txFiN2fSwZ4noz1bGgitJuoWt7T0CcngXEv813HqmFR9JKj+exx3Iv4nlAkroF8wNlVjJkO1hooGg9lJuzzm1KTmllpdMA6PJq9oUEr7zsUqDZIjcVsZei7V9uPGLhiz2Xup9TYezPe0IX2CzuHQiLVWPf2/TZlcBoX9+zaHnbTLLuZsQ5pTs3TQpbxPMDPONEseHJlH5YueYd+vSZ3kXVxKbafZ7Z/HJCQF0gnKJK8Ei2TzEb/Avjl4WQiaisukF85Y3eRNWD3uUH8hJrbgPh/DztLpDKk5dFkQEejjvzxNiLmWQgReFhIDl7+xu8kWPygEaHJN9C1dqPnXCzwlcFthA0t24i7pnXBW2ogErgmuAUt2Ta7vAOIk97lzDNiYVnazSZNJxvZh4jsUgC0NXTFPcErqCsFM71V9LK/hvoY9Q5LOQ2xqxagSoZTU60mrx/F+8TnEvy04rld021haT2K3TibVzBLAjRdMp+AjnVAVUx0r1MHGOeVyJlaXdgn7e4GUBO8pPtwQpYstUPZh3NA0U/NrHj1r3nu2BeD39YIgnwSyxGqnBEEFOv2ed42EyGN+276BRjte5v4+iYVHIR3/PigS3w6bXx5Jw1C9h2Zqy/gOljLXVSqqXz6PeG52M8JX0HjjuuP6T47aOcqGw3vkyz0jTkqnbh11a4UqtPUWqbNwIQb+AAkWwmHjeEb0J+ZBA2KD+HcniVdWIDRjVu5lyOFQX1cLF6l1+61eqh9Qmi+PlpAJFH2S29zej+GtlwLk8iIeh2gSQ+50ZMfXqLHLo80R47Eb9LlulN2GEapa6ecuQ/RAJoOBa8S8LRivfCuMOxdI';
 
 describe('Remove metadata from base64', () => {
-
   test('should return base64 without metadata when base64 with metadata is passed', () => {
     expect(removeMetadataFromBase64(BASE64)).toMatch(BASE64_NO_METADATA);
   });
@@ -24,4 +24,4 @@ describe('Remove metadata from base64', () => {
   test('should return empty string when empty string is passed', () => {
     expect(removeMetadataFromBase64('')).toMatch('');
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/core-utils/src/removeMetadataFromBase64.ts b/webapp/packages/core-utils/src/removeMetadataFromBase64.ts
index e39b4daee5..81bb536171 100644
--- a/webapp/packages/core-utils/src/removeMetadataFromBase64.ts
+++ b/webapp/packages/core-utils/src/removeMetadataFromBase64.ts
@@ -14,4 +14,4 @@ export function removeMetadataFromBase64(base64: string) {
   }
 
   return parts[0];
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/renamePathName.ts b/webapp/packages/core-utils/src/renamePathName.ts
index ae4131e30e..4675a6ef3a 100644
--- a/webapp/packages/core-utils/src/renamePathName.ts
+++ b/webapp/packages/core-utils/src/renamePathName.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createPath } from './createPath';
 import { getPathParent } from './getPathParent';
 
 export function renamePathName(path: string, name: string): string {
   return createPath(getPathParent(path), name);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/staticImplements.ts b/webapp/packages/core-utils/src/staticImplements.ts
index 386c7cfaf7..b97f7e000f 100644
--- a/webapp/packages/core-utils/src/staticImplements.ts
+++ b/webapp/packages/core-utils/src/staticImplements.ts
@@ -7,5 +7,7 @@
  */
 
 export function staticImplements<T>() {
-  return <U extends T>(constructor: U) => {constructor;};
-}
\ No newline at end of file
+  return <U extends T>(constructor: U) => {
+    constructor;
+  };
+}
diff --git a/webapp/packages/core-utils/src/svgToDataUri.ts b/webapp/packages/core-utils/src/svgToDataUri.ts
index ea55bc9ec6..5bc6092588 100644
--- a/webapp/packages/core-utils/src/svgToDataUri.ts
+++ b/webapp/packages/core-utils/src/svgToDataUri.ts
@@ -5,11 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { utf8ToBase64 } from './utf8ToBase64';
 
-const doctype = '<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [<!ENTITY nbsp "&#160;">]>';
+const doctype =
+  '<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [<!ENTITY nbsp "&#160;">]>';
 
 export function svgToDataUri(src: string): string {
   return `data:image/svg+xml;base64,${utf8ToBase64(doctype + src)}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/throttle.ts b/webapp/packages/core-utils/src/throttle.ts
index 55b599c040..f9fb986e69 100644
--- a/webapp/packages/core-utils/src/throttle.ts
+++ b/webapp/packages/core-utils/src/throttle.ts
@@ -44,11 +44,10 @@ export function throttle<T extends (...args: any[]) => void | Promise<void>>(f:
   } as T;
 }
 
-export function throttleAsync<
-  TResult,
-  TArguments extends any[],
-  T extends (...args: TArguments) => Promise<TResult>
->(f: T, delay: number): ThrottleAsync<TResult, TArguments> {
+export function throttleAsync<TResult, TArguments extends any[], T extends (...args: TArguments) => Promise<TResult>>(
+  f: T,
+  delay: number,
+): ThrottleAsync<TResult, TArguments> {
   let throttle = false;
   let _resolve: ((result: TResult) => void) | null = null;
   let _reject: ((reason?: any) => void) | null = null;
@@ -80,9 +79,7 @@ export function throttleAsync<
         throttle = false;
 
         if (functionArgs) {
-          f.apply(thisObject, functionArgs)
-            .then(_resolve)
-            .catch(_reject);
+          f.apply(thisObject, functionArgs).then(_resolve).catch(_reject);
 
           _resolve = null;
           _reject = null;
diff --git a/webapp/packages/core-utils/src/timestampToDate.ts b/webapp/packages/core-utils/src/timestampToDate.ts
index 071ba16cde..ecd333d48d 100644
--- a/webapp/packages/core-utils/src/timestampToDate.ts
+++ b/webapp/packages/core-utils/src/timestampToDate.ts
@@ -8,4 +8,4 @@
 
 export function timestampToDate(timestamp: number) {
   return new Date(timestamp).toLocaleString();
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/underscore.ts b/webapp/packages/core-utils/src/underscore.ts
index f2005120db..b6d6970b0f 100644
--- a/webapp/packages/core-utils/src/underscore.ts
+++ b/webapp/packages/core-utils/src/underscore.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export { isNull, isUndefined, isObject, uniq, groupBy, iteratee, values as objectValues, compose } from 'underscore';
\ No newline at end of file
+export { isNull, isUndefined, isObject, uniq, groupBy, iteratee, values as objectValues, compose } from 'underscore';
diff --git a/webapp/packages/core-utils/src/uriToBlob.test.ts b/webapp/packages/core-utils/src/uriToBlob.test.ts
index eadcf218ba..856f836d05 100644
--- a/webapp/packages/core-utils/src/uriToBlob.test.ts
+++ b/webapp/packages/core-utils/src/uriToBlob.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { uriToBlob } from './uriToBlob';
 
 describe('uriToBlob', () => {
diff --git a/webapp/packages/core-utils/src/uriToBlob.ts b/webapp/packages/core-utils/src/uriToBlob.ts
index 43ebed6397..e9d54925fd 100644
--- a/webapp/packages/core-utils/src/uriToBlob.ts
+++ b/webapp/packages/core-utils/src/uriToBlob.ts
@@ -17,4 +17,4 @@ export function uriToBlob(uri: string): Blob {
   }
 
   return new Blob([buffer], { type: mimeString });
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-utils/src/utf8ToBase64.ts b/webapp/packages/core-utils/src/utf8ToBase64.ts
index e3f570cd1e..ff0b5bb162 100644
--- a/webapp/packages/core-utils/src/utf8ToBase64.ts
+++ b/webapp/packages/core-utils/src/utf8ToBase64.ts
@@ -9,8 +9,12 @@
 export function utf8ToBase64(data: string): string {
   /*  first we use encodeURIComponent to get percent-encoded UTF-8,
    then we convert the percent encodings into raw bytes which can be fed into btoa. */
-  return window.btoa(decodeURIComponent(encodeURIComponent(data).replace(/%([0-9A-F]{2})/g, (match, p1) => {
-    const c = String.fromCharCode(parseInt(`0x${p1}`, 16));
-    return c === '%' ? '%25' : c;
-  })));
+  return window.btoa(
+    decodeURIComponent(
+      encodeURIComponent(data).replace(/%([0-9A-F]{2})/g, (match, p1) => {
+        const c = String.fromCharCode(parseInt(`0x${p1}`, 16));
+        return c === '%' ? '%25' : c;
+      }),
+    ),
+  );
 }
diff --git a/webapp/packages/core-utils/src/uuid_.ts b/webapp/packages/core-utils/src/uuid_.ts
index 5f356ca4b9..b2c5ae6ebd 100644
--- a/webapp/packages/core-utils/src/uuid_.ts
+++ b/webapp/packages/core-utils/src/uuid_.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { v4 as uuidv4 } from 'uuid';
 
 export type OutputBuffer = ArrayLike<number>;
diff --git a/webapp/packages/core-version-update/src/LocaleService.ts b/webapp/packages/core-version-update/src/LocaleService.ts
index afc2958e1a..e250c65c5e 100644
--- a/webapp/packages/core-version-update/src/LocaleService.ts
+++ b/webapp/packages/core-version-update/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class VersionUpdateLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-version-update/src/VersionUpdateService.ts b/webapp/packages/core-version-update/src/VersionUpdateService.ts
index 2e42218f15..4221cae492 100644
--- a/webapp/packages/core-version-update/src/VersionUpdateService.ts
+++ b/webapp/packages/core-version-update/src/VersionUpdateService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 import { compare } from 'semver';
 
@@ -32,10 +31,7 @@ export class VersionUpdateService {
     return compare(this.versionResource.latest.number, this.versionService.current) === 1;
   }
 
-  constructor(
-    private readonly versionService: VersionService,
-    private readonly versionResource: VersionResource,
-  ) {
+  constructor(private readonly versionService: VersionService, private readonly versionResource: VersionResource) {
     this.instructionGetter = null;
 
     makeObservable(this, {
diff --git a/webapp/packages/core-version-update/src/locales/en.ts b/webapp/packages/core-version-update/src/locales/en.ts
index faadc315d3..4a2338cdc9 100644
--- a/webapp/packages/core-version-update/src/locales/en.ts
+++ b/webapp/packages/core-version-update/src/locales/en.ts
@@ -8,4 +8,4 @@ export default [
   ['version_update_how_to_update', 'How to update'],
   ['version_update_info', 'Info'],
   ['version_update_recommendations', 'Recommendations'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/core-version-update/src/locales/it.ts b/webapp/packages/core-version-update/src/locales/it.ts
index faadc315d3..4a2338cdc9 100644
--- a/webapp/packages/core-version-update/src/locales/it.ts
+++ b/webapp/packages/core-version-update/src/locales/it.ts
@@ -8,4 +8,4 @@ export default [
   ['version_update_how_to_update', 'How to update'],
   ['version_update_info', 'Info'],
   ['version_update_recommendations', 'Recommendations'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/core-version-update/src/locales/ru.ts b/webapp/packages/core-version-update/src/locales/ru.ts
index c074360e74..3b1d77468e 100644
--- a/webapp/packages/core-version-update/src/locales/ru.ts
+++ b/webapp/packages/core-version-update/src/locales/ru.ts
@@ -8,4 +8,4 @@ export default [
   ['version_update_how_to_update', 'Как обновить версию'],
   ['version_update_info', 'Информация'],
   ['version_update_recommendations', 'Рекомендации'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/core-version-update/src/locales/zh.ts b/webapp/packages/core-version-update/src/locales/zh.ts
index faadc315d3..4a2338cdc9 100644
--- a/webapp/packages/core-version-update/src/locales/zh.ts
+++ b/webapp/packages/core-version-update/src/locales/zh.ts
@@ -8,4 +8,4 @@ export default [
   ['version_update_how_to_update', 'How to update'],
   ['version_update_info', 'Info'],
   ['version_update_recommendations', 'Recommendations'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/core-version-update/src/manifest.ts b/webapp/packages/core-version-update/src/manifest.ts
index a4e1bbce1a..04fac836b2 100644
--- a/webapp/packages/core-version-update/src/manifest.ts
+++ b/webapp/packages/core-version-update/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { VersionUpdateLocaleService } from './LocaleService';
@@ -16,8 +15,5 @@ export const manifest: PluginManifest = {
     name: 'Version update',
   },
 
-  providers: [
-    VersionUpdateService,
-    VersionUpdateLocaleService,
-  ],
+  providers: [VersionUpdateService, VersionUpdateLocaleService],
 };
diff --git a/webapp/packages/core-version/src/VersionLocaleService.ts b/webapp/packages/core-version/src/VersionLocaleService.ts
index 156866d29d..4b3e448a27 100644
--- a/webapp/packages/core-version/src/VersionLocaleService.ts
+++ b/webapp/packages/core-version/src/VersionLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class VersionLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/core-version/src/VersionResource.ts b/webapp/packages/core-version/src/VersionResource.ts
index f8b81bca15..7f2d3099ab 100644
--- a/webapp/packages/core-version/src/VersionResource.ts
+++ b/webapp/packages/core-version/src/VersionResource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -31,13 +30,11 @@ export class VersionResource extends CachedMapResource<string, IVersion> {
     return this.values.find(v => v.number === this.latestVersionNumber);
   }
 
-  constructor(
-    private readonly serverConfigResource: ServerConfigResource,
-  ) {
+  constructor(private readonly serverConfigResource: ServerConfigResource) {
     super();
 
     this.latestVersionNumber = null;
-    this.preloadResource(this.serverConfigResource, () => { });
+    this.preloadResource(this.serverConfigResource, () => {});
 
     makeObservable<this, 'latestVersionNumber'>(this, {
       latestVersionNumber: observable.ref,
@@ -56,7 +53,7 @@ export class VersionResource extends CachedMapResource<string, IVersion> {
         cache: 'no-cache',
       });
 
-      const json = await response.json() as IVersions;
+      const json = (await response.json()) as IVersions;
 
       if (json.latestVersion) {
         this.latestVersionNumber = json.latestVersion;
@@ -67,7 +64,6 @@ export class VersionResource extends CachedMapResource<string, IVersion> {
       }
 
       this.replace(resourceKeyList(json.versions.map(version => version.number)), json.versions);
-
     } catch (exception: any) {
       throw new Error('versions_load_fail', { cause: exception });
     }
diff --git a/webapp/packages/core-version/src/VersionService.ts b/webapp/packages/core-version/src/VersionService.ts
index fc21398f38..6a6bca4f7d 100644
--- a/webapp/packages/core-version/src/VersionService.ts
+++ b/webapp/packages/core-version/src/VersionService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -25,9 +24,7 @@ export class VersionService {
     return this.getProductVersion(true).frontendVersion;
   }
 
-  constructor(
-    private readonly serverService: ServerService,
-  ) {
+  constructor(private readonly serverService: ServerService) {
     makeObservable(this, {
       current: computed,
     });
diff --git a/webapp/packages/core-version/src/manifest.ts b/webapp/packages/core-version/src/manifest.ts
index da8631e7f4..22d7e0cd35 100644
--- a/webapp/packages/core-version/src/manifest.ts
+++ b/webapp/packages/core-version/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { VersionLocaleService } from './VersionLocaleService';
@@ -17,9 +16,5 @@ export const manifest: PluginManifest = {
     name: 'App version',
   },
 
-  providers: [
-    VersionService,
-    VersionResource,
-    VersionLocaleService,
-  ],
+  providers: [VersionService, VersionResource, VersionLocaleService],
 };
diff --git a/webapp/packages/core-view/src/Action/ActionItem.ts b/webapp/packages/core-view/src/Action/ActionItem.ts
index 5ffdfa22d8..6daee77c9d 100644
--- a/webapp/packages/core-view/src/Action/ActionItem.ts
+++ b/webapp/packages/core-view/src/Action/ActionItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { flat } from '@cloudbeaver/core-utils';
 
 import type { IDataContextProvider } from '../DataContext/IDataContextProvider';
@@ -29,12 +28,7 @@ export class ActionItem implements IActionItem {
     return this.action.info;
   }
 
-  constructor(
-    action: IAction,
-    handler: IActionHandler,
-    binding: IKeyBindingHandler | null,
-    context: IDataContextProvider
-  ) {
+  constructor(action: IAction, handler: IActionHandler, binding: IKeyBindingHandler | null, context: IDataContextProvider) {
     this.action = action;
     this.handler = handler;
     this.binding = binding;
@@ -47,8 +41,8 @@ export class ActionItem implements IActionItem {
 
   isLoading(): boolean {
     return (
-      this.handler.isLoading?.(this.context, this.action)
-      || flat([this.handler.getLoader?.(this.context, this.action)]).some(loader => loader?.isLoading())
+      this.handler.isLoading?.(this.context, this.action) ||
+      flat([this.handler.getLoader?.(this.context, this.action)]).some(loader => loader?.isLoading())
     );
   }
 
diff --git a/webapp/packages/core-view/src/Action/ActionService.ts b/webapp/packages/core-view/src/Action/ActionService.ts
index 57a6058f20..001213bfb8 100644
--- a/webapp/packages/core-view/src/Action/ActionService.ts
+++ b/webapp/packages/core-view/src/Action/ActionService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import type { IDataContextProvider } from '../DataContext/IDataContextProvider';
@@ -19,16 +18,12 @@ import { KeyBindingService } from './KeyBinding/KeyBindingService';
 export class ActionService {
   private readonly handlers: Map<string, IActionHandler>;
 
-  constructor(
-    private readonly keyBindingService: KeyBindingService
-  ) {
+  constructor(private readonly keyBindingService: KeyBindingService) {
     this.handlers = new Map();
   }
 
   activateAction(context: IDataContextProvider, action: IAction) {
-    this
-      .getAction(context, action)
-      ?.activate();
+    this.getAction(context, action)?.activate();
   }
 
   addHandler(handler: IActionHandler): void {
@@ -54,12 +49,7 @@ export class ActionService {
     if (handler) {
       const binding = this.keyBindingService.getKeyBindingHandler(context, action);
 
-      return new ActionItem(
-        action,
-        handler,
-        binding,
-        context
-      );
+      return new ActionItem(action, handler, binding, context);
     }
 
     return null;
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_COLLAPSE_ALL.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_COLLAPSE_ALL.ts
index 1774328d6a..81af963aad 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_COLLAPSE_ALL.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_COLLAPSE_ALL.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_COLLAPSE_ALL = createAction('collapse-all', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_DELETE.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_DELETE.ts
index fe3b44da1c..efb5e582ed 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_DELETE.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_DELETE.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_DELETE = createAction('delete', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_EDIT.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_EDIT.ts
index a1e757087b..33436d4991 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_EDIT.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_EDIT.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_EDIT = createAction('edit', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts
index db61b1065d..aebeb5f359 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts
@@ -5,12 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
-export const ACTION_EXPORT = createAction(
-  'export',
-  {
-    label: 'data_transfer_dialog_export',
-  }
-);
+export const ACTION_EXPORT = createAction('export', {
+  label: 'data_transfer_dialog_export',
+});
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_FILTER.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_FILTER.ts
index 5ab683ac61..2c7ab38cbd 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_FILTER.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_FILTER.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_FILTER = createAction('filter', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_LAYOUT.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_LAYOUT.ts
index 55b0c9bfce..be19a81daf 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_LAYOUT.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_LAYOUT.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_LAYOUT = createAction('layout', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_NEW_FOLDER.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_NEW_FOLDER.ts
index 83ad972e71..aee8fe678d 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_NEW_FOLDER.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_NEW_FOLDER.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_NEW_FOLDER = createAction('create-folder', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN.ts
index e7ed771f7a..45af68b9c9 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_OPEN = createAction('open', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN_IN_TAB.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN_IN_TAB.ts
index 99b5de52b8..575bc5d85f 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN_IN_TAB.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_OPEN_IN_TAB.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_OPEN_IN_TAB = createAction('open-in-tab', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_REDO.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_REDO.ts
index f392321d8b..31cf54bcf2 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_REDO.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_REDO.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_REDO = createAction('redo', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_REFRESH.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_REFRESH.ts
index 8e940a03b1..b3d0afb126 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_REFRESH.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_REFRESH.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_REFRESH = createAction('refresh', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_RENAME.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_RENAME.ts
index 633a9785fa..9695d0e827 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_RENAME.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_RENAME.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_RENAME = createAction('rename', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_SAVE.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_SAVE.ts
index f872c579f6..d53ab91b03 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_SAVE.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_SAVE.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_SAVE = createAction('save', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_SETTINGS.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_SETTINGS.ts
index edab3ab80f..92c9881872 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_SETTINGS.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_SETTINGS.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_SETTINGS = createAction('settings', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_UNDO.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_UNDO.ts
index c360b016d9..84db8d5d8d 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_UNDO.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_UNDO.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_UNDO = createAction('undo', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_IN.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_IN.ts
index 9e61a598dc..4b4bb17b68 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_IN.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_IN.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_ZOOM_IN = createAction('zoom-in', {
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_OUT.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_OUT.ts
index 54c158169f..4b6ca7b398 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_OUT.ts
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_ZOOM_OUT.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createAction } from '../createAction';
 
 export const ACTION_ZOOM_OUT = createAction('zoom-out', {
diff --git a/webapp/packages/core-view/src/Action/IAction.ts b/webapp/packages/core-view/src/Action/IAction.ts
index 8093ff46c6..fc29f92a8b 100644
--- a/webapp/packages/core-view/src/Action/IAction.ts
+++ b/webapp/packages/core-view/src/Action/IAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IActionInfo } from './IActionInfo';
 
 export interface IAction {
diff --git a/webapp/packages/core-view/src/Action/IActionHandler.ts b/webapp/packages/core-view/src/Action/IActionHandler.ts
index 242dee3604..f9b4523141 100644
--- a/webapp/packages/core-view/src/Action/IActionHandler.ts
+++ b/webapp/packages/core-view/src/Action/IActionHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ILoadableState } from '@cloudbeaver/core-utils';
 
 import type { IDataContextProvider } from '../DataContext/IDataContextProvider';
diff --git a/webapp/packages/core-view/src/Action/IActionItem.ts b/webapp/packages/core-view/src/Action/IActionItem.ts
index c149bcf172..493962218b 100644
--- a/webapp/packages/core-view/src/Action/IActionItem.ts
+++ b/webapp/packages/core-view/src/Action/IActionItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from './IAction';
 import type { IActionHandler } from './IActionHandler';
 import type { IActionInfo } from './IActionInfo';
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_OPEN_IN_TAB.ts b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_OPEN_IN_TAB.ts
index 8468c935f2..12b969052e 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_OPEN_IN_TAB.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_OPEN_IN_TAB.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '../createKeyBinding';
 
 export const KEY_BINDING_OPEN_IN_TAB = createKeyBinding({
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts
index 6ab1c1c70e..6cd186274b 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '../createKeyBinding';
 
 export const KEY_BINDING_REDO = createKeyBinding({
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts
index 56f2368174..6be458ffc5 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '../createKeyBinding';
 
 export const KEY_BINDING_UNDO = createKeyBinding({
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/IKeyBindingHandler.ts b/webapp/packages/core-view/src/Action/KeyBinding/IKeyBindingHandler.ts
index 618de2be42..c66d440b2a 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/IKeyBindingHandler.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/IKeyBindingHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from '../../Action/IAction';
 import type { IDataContextProvider } from '../../DataContext/IDataContextProvider';
 import type { IKeyBinding } from './IKeyBinding';
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/KeyBindingService.ts b/webapp/packages/core-view/src/Action/KeyBinding/KeyBindingService.ts
index ad8bb08df9..55e63fda8b 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/KeyBindingService.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/KeyBindingService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import type { IAction } from '../../Action/IAction';
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/createKeyBinding.ts b/webapp/packages/core-view/src/Action/KeyBinding/createKeyBinding.ts
index c31fcc1ce2..7a0da6df93 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/createKeyBinding.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/createKeyBinding.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IKeyBinding } from './IKeyBinding';
 
 interface IKeyBindingOptions {
diff --git a/webapp/packages/core-view/src/Action/createAction.ts b/webapp/packages/core-view/src/Action/createAction.ts
index 6895a1a791..1fc567c325 100644
--- a/webapp/packages/core-view/src/Action/createAction.ts
+++ b/webapp/packages/core-view/src/Action/createAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from './IAction';
 import type { IActionInfo } from './IActionInfo';
 
@@ -23,9 +22,5 @@ export function createAction(id: string, info: IActionInfo): IAction {
 }
 
 export function isAction(obj: any): obj is IAction {
-  return (
-    obj
-    && typeof obj === 'object'
-    && actionSymbol in obj
-  );
+  return obj && typeof obj === 'object' && actionSymbol in obj;
 }
diff --git a/webapp/packages/core-view/src/DataContext/DataContext.ts b/webapp/packages/core-view/src/DataContext/DataContext.ts
index b007f144aa..27a27c291f 100644
--- a/webapp/packages/core-view/src/DataContext/DataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/DataContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { MetadataMap } from '@cloudbeaver/core-utils';
@@ -117,7 +116,7 @@ export class DataContext implements IDataContext {
         return this.fallback.get(context);
       }
 
-      throw new Error('Context doesn\'t exists');
+      throw new Error("Context doesn't exists");
     }
 
     return this.map.get(context);
diff --git a/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts b/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
index 9a8c4e19e1..e0fba0f036 100644
--- a/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/DynamicDataContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import type { DataContextGetter } from './DataContextGetter';
@@ -60,11 +59,11 @@ export class DynamicDataContext implements IDataContext {
     return this.fallback.has(context);
   }
 
-  get <T>(context: DataContextGetter<T>): T {
+  get<T>(context: DataContextGetter<T>): T {
     return this.fallback.get(context);
   }
 
-  hasValue <T>(context: DataContextGetter<T>, value: T): boolean {
+  hasValue<T>(context: DataContextGetter<T>, value: T): boolean {
     return this.fallback.hasValue(context, value);
   }
 
@@ -72,7 +71,7 @@ export class DynamicDataContext implements IDataContext {
     return this.fallback.find(context, predicate);
   }
 
-  tryGet <T>(context: DataContextGetter<T>): T | undefined {
+  tryGet<T>(context: DataContextGetter<T>): T | undefined {
     return this.fallback.tryGet(context);
   }
 
diff --git a/webapp/packages/core-view/src/DataContext/IDataContext.ts b/webapp/packages/core-view/src/DataContext/IDataContext.ts
index 844786e357..4ef9f73871 100644
--- a/webapp/packages/core-view/src/DataContext/IDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/IDataContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DataContextGetter } from './DataContextGetter';
 import type { IDataContextProvider } from './IDataContextProvider';
 
diff --git a/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts b/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
index 867a84727e..d1dacabc07 100644
--- a/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
+++ b/webapp/packages/core-view/src/DataContext/IDataContextProvider.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DataContextGetter } from './DataContextGetter';
 
 export interface IDataContextProvider {
diff --git a/webapp/packages/core-view/src/DataContext/createDataContext.ts b/webapp/packages/core-view/src/DataContext/createDataContext.ts
index 9f55915440..ca0a016ea5 100644
--- a/webapp/packages/core-view/src/DataContext/createDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/createDataContext.ts
@@ -5,13 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DataContextGetter } from './DataContextGetter';
 
-export function createDataContext<T>(
-  name: string,
-  defaultValue?: () => T extends any ? T : undefined
-): DataContextGetter<T> {
+export function createDataContext<T>(name: string, defaultValue?: () => T extends any ? T : undefined): DataContextGetter<T> {
   name = `@context/${name}`;
   const obj = {
     [name](): T {
diff --git a/webapp/packages/core-view/src/DataContext/useDataContext.ts b/webapp/packages/core-view/src/DataContext/useDataContext.ts
index 631d4fe6f3..35419843ab 100644
--- a/webapp/packages/core-view/src/DataContext/useDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/useDataContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import { DataContext } from './DataContext';
diff --git a/webapp/packages/core-view/src/DataContext/useDynamicDataContext.ts b/webapp/packages/core-view/src/DataContext/useDynamicDataContext.ts
index 269f299506..d8e936f398 100644
--- a/webapp/packages/core-view/src/DataContext/useDynamicDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/useDynamicDataContext.ts
@@ -5,19 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { untracked } from 'mobx';
 import { useEffect, useState } from 'react';
 
-
 import { DataContext } from './DataContext';
 import { DynamicDataContext } from './DynamicDataContext';
 import type { IDataContext } from './IDataContext';
 
-export function useDynamicDataContext(
-  context: IDataContext | undefined,
-  capture: (context: IDataContext) => void
-): void {
+export function useDynamicDataContext(context: IDataContext | undefined, capture: (context: IDataContext) => void): void {
   const [state] = useState(() => new DynamicDataContext(context || new DataContext()));
 
   untracked(() => {
diff --git a/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts b/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
index b213859ff2..7e56d5eb91 100644
--- a/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
+++ b/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { flat, ILoadableState } from '@cloudbeaver/core-utils';
 
 import { createDataContext } from '../DataContext/createDataContext';
diff --git a/webapp/packages/core-view/src/LocaleService.ts b/webapp/packages/core-view/src/LocaleService.ts
index 5e84af109b..937dc42ad0 100644
--- a/webapp/packages/core-view/src/LocaleService.ts
+++ b/webapp/packages/core-view/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
diff --git a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU.ts b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU.ts
index fa7b04d4ee..3fbe232816 100644
--- a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU.ts
+++ b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU.ts
@@ -5,7 +5,6 @@
  * 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 { IMenu } from './IMenu';
 
diff --git a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_LOCAL.ts b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_LOCAL.ts
index 1ae26106aa..2d19833be6 100644
--- a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_LOCAL.ts
+++ b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_LOCAL.ts
@@ -5,7 +5,6 @@
  * 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';
 
 export const DATA_CONTEXT_MENU_LOCAL = createDataContext<boolean | undefined>('menu-local', () => false);
diff --git a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_NESTED.ts b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_NESTED.ts
index c489740e39..15c1edcb78 100644
--- a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_NESTED.ts
+++ b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_MENU_NESTED.ts
@@ -5,7 +5,6 @@
  * 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';
 
 export const DATA_CONTEXT_MENU_NESTED = createDataContext<boolean>('menu-nested', () => false);
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
index faf35e96e1..5fd7bc5556 100644
--- a/webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts
+++ b/webapp/packages/core-view/src/Menu/DATA_CONTEXT_SUBMENU_ITEM.ts
@@ -5,7 +5,6 @@
  * 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';
 
diff --git a/webapp/packages/core-view/src/Menu/IMenuHandler.ts b/webapp/packages/core-view/src/Menu/IMenuHandler.ts
index cb167a736a..3d79e79d63 100644
--- a/webapp/packages/core-view/src/Menu/IMenuHandler.ts
+++ b/webapp/packages/core-view/src/Menu/IMenuHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ILoadableState } from '@cloudbeaver/core-utils';
 
 import type { IDataContextProvider } from '../DataContext/IDataContextProvider';
diff --git a/webapp/packages/core-view/src/Menu/IMenuItemsCreator.ts b/webapp/packages/core-view/src/Menu/IMenuItemsCreator.ts
index 3d79feb209..4a5b2e6bd9 100644
--- a/webapp/packages/core-view/src/Menu/IMenuItemsCreator.ts
+++ b/webapp/packages/core-view/src/Menu/IMenuItemsCreator.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from '../Action/IAction';
 import type { DataContextGetter } from '../DataContext/DataContextGetter';
 import type { IDataContextProvider } from '../DataContext/IDataContextProvider';
@@ -18,12 +17,6 @@ export interface IMenuItemsCreator {
   menus?: IMenu[];
   contexts?: DataContextGetter<any>[];
   isApplicable?: (context: IDataContextProvider) => boolean;
-  getItems: (
-    context: IDataContextProvider,
-    items: MenuCreatorItem[]
-  ) => MenuCreatorItem[];
-  orderItems?: (
-    context: IDataContextProvider,
-    items: MenuCreatorItem[]
-  ) => MenuCreatorItem[];
+  getItems: (context: IDataContextProvider, items: MenuCreatorItem[]) => MenuCreatorItem[];
+  orderItems?: (context: IDataContextProvider, items: MenuCreatorItem[]) => MenuCreatorItem[];
 }
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuActionItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuActionItem.ts
index 49f6ad785a..77391e5b72 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuActionItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuActionItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IActionItem } from '../../Action/IActionItem';
 import type { IMenuItem } from './IMenuItem';
 
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuBaseItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuBaseItem.ts
index 4df347546e..0a2850b92d 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuBaseItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuBaseItem.ts
@@ -5,7 +5,6 @@
  * 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';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuCheckboxItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCheckboxItem.ts
index 995be2fd0e..97bb7e5b56 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuCheckboxItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCheckboxItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuItem } from './IMenuItem';
 
 interface IMenuCheckboxItemCommonProperties {
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
index f88dca83a5..fabb3090a9 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuCustomItem.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -25,13 +24,11 @@ export interface ICustomMenuItemProps<TExtraProps = unknown> {
   className?: string;
 }
 
-export interface IMenuCustomItemOptions<TExtraProps = unknown>
-  extends IMenuCustomItemCommonProperties<TExtraProps> {
+export interface IMenuCustomItemOptions<TExtraProps = unknown> extends IMenuCustomItemCommonProperties<TExtraProps> {
   id: string;
   getComponent: () => ICustomMenuItemComponent<TExtraProps>;
 }
 
-export interface IMenuCustomItem<TExtraProps = unknown>
-  extends IMenuItem, IMenuCustomItemCommonProperties<TExtraProps> {
+export interface IMenuCustomItem<TExtraProps = unknown> extends IMenuItem, IMenuCustomItemCommonProperties<TExtraProps> {
   getComponent?: () => ICustomMenuItemComponent<TExtraProps>;
 }
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuGroupItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuGroupItem.ts
index b374502a1c..ef10287160 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuGroupItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuGroupItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuItem } from './IMenuItem';
 
 export interface IMenuGroupItem extends IMenuItem {
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuLazyItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuLazyItem.ts
index b001575062..6a38a5fde2 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuLazyItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuLazyItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuItem } from './IMenuItem';
 
 export interface IMenuLazyItem extends IMenuItem {
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSeparatorItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSeparatorItem.ts
index 5d0260c2e6..dca605c9dc 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSeparatorItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSeparatorItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuItem } from './IMenuItem';
 
 export type IMenuSeparatorItem = IMenuItem;
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
index 4d15875f14..9406906be4 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/IMenuSubMenuItem.ts
@@ -5,7 +5,6 @@
  * 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 { IMenu } from '../IMenu';
@@ -28,8 +27,7 @@ export interface IMenuSubMenuItem<TExtraProps = unknown> extends IMenuSubMenuIte
   events?: IMenuSubMenuEvents;
 }
 
-export type MenuSubMenuItemIconComponent<TExtraProps = unknown>
-  = React.FC<ISubMenuIconComponentProps<TExtraProps> & TExtraProps>;
+export type MenuSubMenuItemIconComponent<TExtraProps = unknown> = React.FC<ISubMenuIconComponentProps<TExtraProps> & TExtraProps>;
 
 export interface ISubMenuIconComponentProps<TExtraProps = unknown> {
   item: IMenuSubMenuItem<TExtraProps>;
@@ -37,4 +35,4 @@ export interface ISubMenuIconComponentProps<TExtraProps = unknown> {
   className?: string;
 }
 
-export type IMenuSubMenuItemOptions<TExtraProps = unknown> = IMenuSubMenuItemProperties<TExtraProps>;
\ No newline at end of file
+export type IMenuSubMenuItemOptions<TExtraProps = unknown> = IMenuSubMenuItemProperties<TExtraProps>;
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuActionItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuActionItem.ts
index c0d0995b56..d3d8927c17 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuActionItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuActionItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IActionItem } from '../../Action/IActionItem';
 import type { IMenuActionItem } from './IMenuActionItem';
 import { MenuItem } from './MenuItem';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuBaseItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuBaseItem.ts
index adbbeb2e91..6d65f1fc9e 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuBaseItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuBaseItem.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import type { MenuBaseItemIconComponent, IMenuBaseItem, IMenuBaseItemOptions } from './IMenuBaseItem';
+import type { IMenuBaseItem, IMenuBaseItemOptions, MenuBaseItemIconComponent } from './IMenuBaseItem';
 import type { IMenuItemEvents } from './IMenuItem';
 import { MenuItem } from './MenuItem';
 
@@ -30,11 +29,7 @@ export class MenuBaseItem<TExtraProps = unknown> extends MenuItem implements IMe
     return this.isDisabled?.() ?? false;
   }
 
-  constructor(
-    options: IMenuBaseItemOptions<TExtraProps>,
-    events?: IMenuItemEvents,
-    getters?: IMenuBaseItemPropertyGetters<TExtraProps>,
-  ) {
+  constructor(options: IMenuBaseItemOptions<TExtraProps>, events?: IMenuItemEvents, getters?: IMenuBaseItemPropertyGetters<TExtraProps>) {
     super(options.id, events);
     this.label = options.label;
     this.icon = options.icon;
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuCheckboxItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuCheckboxItem.ts
index d114bc8097..b7533ac5c2 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuCheckboxItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuCheckboxItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuCheckboxItem, IMenuCheckboxItemOptions } from './IMenuCheckboxItem';
 import type { IMenuItemEvents } from './IMenuItem';
 import { MenuItem } from './MenuItem';
@@ -33,11 +32,7 @@ export class MenuCheckboxItem extends MenuItem implements IMenuCheckboxItem {
 
   private readonly _checked: boolean;
 
-  constructor(
-    options: IMenuCheckboxItemOptions,
-    events?: IMenuItemEvents,
-    getters?: IMenuBaseItemPropertyGetters,
-  ) {
+  constructor(options: IMenuCheckboxItemOptions, events?: IMenuItemEvents, getters?: IMenuBaseItemPropertyGetters) {
     super(options.id, events);
     this._checked = options.checked ?? false;
     this.label = options.label;
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
index 5329d68b63..efc3574982 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuCustomItem.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -26,11 +25,7 @@ export class MenuCustomItem<TExtraProps = unknown> extends MenuItem implements I
     return this.isDisabled?.() ?? false;
   }
 
-  constructor(
-    options: IMenuCustomItemOptions<TExtraProps>,
-    events?: IMenuItemEvents,
-    getters?: IMenuCustomItemPropertyGetters<TExtraProps>,
-  ) {
+  constructor(options: IMenuCustomItemOptions<TExtraProps>, events?: IMenuItemEvents, getters?: IMenuCustomItemPropertyGetters<TExtraProps>) {
     super(options.id, events);
     this.getComponent = options.getComponent;
     this.isDisabled = getters?.isDisabled;
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuGroupItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuGroupItem.ts
index 69e377bb39..fc5f7d829a 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuGroupItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuGroupItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuGroupItem } from './IMenuGroupItem';
 import type { IMenuItem } from './IMenuItem';
 import { MenuItem } from './MenuItem';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuItem.ts
index 8ac7792ca9..38d78a7b1c 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { uuid } from '@cloudbeaver/core-utils';
 
 import type { IMenuItem, IMenuItemEvents } from './IMenuItem';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuLazyItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuLazyItem.ts
index 0b09eb8add..38d595fdc5 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuLazyItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuLazyItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuItem } from './IMenuItem';
 import type { IMenuLazyItem } from './IMenuLazyItem';
 import { MenuItem } from './MenuItem';
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuSeparatorItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuSeparatorItem.ts
index 04b0d9fd28..f891c24592 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuSeparatorItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuSeparatorItem.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenuSeparatorItem } from './IMenuSeparatorItem';
 import { MenuItem } from './MenuItem';
 
diff --git a/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts b/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
index eac1ef3055..74d3108a06 100644
--- a/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
+++ b/webapp/packages/core-view/src/Menu/MenuItem/MenuSubMenuItem.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenu } from '../IMenu';
-import type { IMenuSubMenuItemOptions, IMenuSubMenuEvents, IMenuSubMenuItem, MenuSubMenuItemIconComponent } from './IMenuSubMenuItem';
+import type { IMenuSubMenuEvents, IMenuSubMenuItem, IMenuSubMenuItemOptions, MenuSubMenuItemIconComponent } from './IMenuSubMenuItem';
 import { MenuItem } from './MenuItem';
 
 export class MenuSubMenuItem<TExtraProps = unknown> extends MenuItem implements IMenuSubMenuItem<TExtraProps> {
@@ -20,10 +19,7 @@ export class MenuSubMenuItem<TExtraProps = unknown> extends MenuItem implements
   readonly getExtraProps?: () => TExtraProps;
   readonly iconComponent?: () => MenuSubMenuItemIconComponent<TExtraProps>;
 
-  constructor(
-    options: IMenuSubMenuItemOptions<TExtraProps>,
-    events?: IMenuSubMenuEvents
-  ) {
+  constructor(options: IMenuSubMenuItemOptions<TExtraProps>, events?: IMenuSubMenuEvents) {
     super(options.menu.id);
     this.menu = options.menu;
     this.label = options.label;
diff --git a/webapp/packages/core-view/src/Menu/MenuService.ts b/webapp/packages/core-view/src/Menu/MenuService.ts
index 33959c56de..c1c3661b05 100644
--- a/webapp/packages/core-view/src/Menu/MenuService.ts
+++ b/webapp/packages/core-view/src/Menu/MenuService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { flat, ILoadableState } from '@cloudbeaver/core-utils';
 
@@ -28,9 +27,7 @@ export class MenuService {
   private readonly handlers: Map<string, IMenuHandler<any>>;
   private readonly creators: IMenuItemsCreator[];
 
-  constructor(
-    private readonly actionService: ActionService,
-  ) {
+  constructor(private readonly actionService: ActionService) {
     this.creators = [];
     this.handlers = new Map();
   }
@@ -67,8 +64,8 @@ export class MenuService {
   }
 
   getMenuItemLoaders(context: IDataContextProvider, itemCreators: MenuCreatorItem[]): ILoadableState[] {
-    return flat(itemCreators
-      .map(item => {
+    return flat(
+      itemCreators.map(item => {
         if (isAction(item)) {
           const handler = this.actionService.getHandler(context, item);
 
@@ -76,9 +73,8 @@ export class MenuService {
         }
 
         return null;
-      }))
-      .filter<ILoadableState>((item => item !== null) as ((obj: any) => obj is ILoadableState))
-    ;
+      }),
+    ).filter<ILoadableState>((item => item !== null) as (obj: any) => obj is ILoadableState);
   }
 
   getMenuItemCreators(context: IDataContextProvider): MenuCreatorItem[] {
@@ -99,7 +95,7 @@ export class MenuService {
           }
 
           return true;
-        })
+        }),
     );
   }
 
diff --git a/webapp/packages/core-view/src/Menu/createMenu.ts b/webapp/packages/core-view/src/Menu/createMenu.ts
index 6dc4fa6615..65ca22d63f 100644
--- a/webapp/packages/core-view/src/Menu/createMenu.ts
+++ b/webapp/packages/core-view/src/Menu/createMenu.ts
@@ -5,17 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IMenu } from './IMenu';
 
 const menuSymbol = Symbol('@menu');
 
-export function createMenu(
-  id: string,
-  label: string,
-  icon?: string,
-  tooltip?: string
-): IMenu {
+export function createMenu(id: string, label: string, icon?: string, tooltip?: string): IMenu {
   const menu = {
     id: `@menu/${id}`,
     label,
@@ -29,9 +23,5 @@ export function createMenu(
 }
 
 export function isMenu(obj: any): obj is IMenu {
-  return (
-    obj
-    && typeof obj === 'object'
-    && menuSymbol in obj
-  );
+  return obj && typeof obj === 'object' && menuSymbol in obj;
 }
diff --git a/webapp/packages/core-view/src/Menu/menuExtractItems.ts b/webapp/packages/core-view/src/Menu/menuExtractItems.ts
index 9db4553680..b287997e72 100644
--- a/webapp/packages/core-view/src/Menu/menuExtractItems.ts
+++ b/webapp/packages/core-view/src/Menu/menuExtractItems.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from '../Action/IAction';
 import type { MenuCreatorItem } from './IMenuItemsCreator';
 import type { IMenuItem } from './MenuItem/IMenuItem';
diff --git a/webapp/packages/core-view/src/Menu/useMenu.ts b/webapp/packages/core-view/src/Menu/useMenu.ts
index 8f25d84714..6abbad0ede 100644
--- a/webapp/packages/core-view/src/Menu/useMenu.ts
+++ b/webapp/packages/core-view/src/Menu/useMenu.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -43,39 +42,44 @@ export function useMenu(options: IMenuOptions): IMenuData {
 
   context.set(DATA_CONTEXT_MENU_LOCAL, options.local);
 
-  const state = useObservableRef<IMenuData>(() => ({
-    context,
-    get loaders(): ILoadableState[] {
-      return [
-        ...menuService.getMenuItemLoaders(this.context, this.itemCreators),
-        ...flat([this.handler?.getLoader?.(this.context, this.menu)])
-          .filter<ILoadableState>((item => !!item) as ((obj: any) => obj is ILoadableState)),
-      ];
+  const state = useObservableRef<IMenuData>(
+    () => ({
+      context,
+      get loaders(): ILoadableState[] {
+        return [
+          ...menuService.getMenuItemLoaders(this.context, this.itemCreators),
+          ...flat([this.handler?.getLoader?.(this.context, this.menu)]).filter<ILoadableState>(
+            (item => !!item) as (obj: any) => obj is ILoadableState,
+          ),
+        ];
+      },
+      get itemCreators() {
+        return menuService.getMenuItemCreators(this.context);
+      },
+      get available() {
+        return this.handler?.hideIfEmpty?.(this.context) === false || this.itemCreators.length > 0;
+      },
+      get items() {
+        return menuService.getMenu(this.context, this.itemCreators);
+      },
+      get handler() {
+        return menuService.getHandler(this.context);
+      },
+    }),
+    {
+      loaders: computed,
+      available: computed,
+      itemCreators: computed,
+      items: computed,
+      handler: computed,
+      menu: observable.ref,
+      context: observable.ref,
     },
-    get itemCreators() {
-      return menuService.getMenuItemCreators(this.context);
+    {
+      menu: options.menu,
+      context,
     },
-    get available() {
-      return this.handler?.hideIfEmpty?.(this.context) === false || this.itemCreators.length > 0;
-    },
-    get items() {
-      return menuService.getMenu(this.context, this.itemCreators);
-    },
-    get handler() {
-      return menuService.getHandler(this.context);
-    },
-  }), {
-    loaders: computed,
-    available: computed,
-    itemCreators: computed,
-    items: computed,
-    handler: computed,
-    menu: observable.ref,
-    context: observable.ref,
-  }, {
-    menu: options.menu,
-    context,
-  });
+  );
 
   return state;
 }
diff --git a/webapp/packages/core-view/src/Menu/useMenuContext.ts b/webapp/packages/core-view/src/Menu/useMenuContext.ts
index 1fd6518aec..17bce8a0cc 100644
--- a/webapp/packages/core-view/src/Menu/useMenuContext.ts
+++ b/webapp/packages/core-view/src/Menu/useMenuContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { IDataContext } from '../DataContext/IDataContext';
diff --git a/webapp/packages/core-view/src/View/AppView.ts b/webapp/packages/core-view/src/View/AppView.ts
index 1c4a36b227..63b37d85af 100644
--- a/webapp/packages/core-view/src/View/AppView.ts
+++ b/webapp/packages/core-view/src/View/AppView.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IActiveView } from './IActiveView';
 import { View } from './View';
 
diff --git a/webapp/packages/core-view/src/View/CaptureView.tsx b/webapp/packages/core-view/src/View/CaptureView.tsx
index adcfde9e21..33fcd12838 100644
--- a/webapp/packages/core-view/src/View/CaptureView.tsx
+++ b/webapp/packages/core-view/src/View/CaptureView.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
@@ -32,23 +31,17 @@ interface Props {
   className?: string;
 }
 
-export const CaptureView = observer<React.PropsWithChildren<Props>>(function CaptureView({
-  view,
-  children,
-  className,
-}) {
+export const CaptureView = observer<React.PropsWithChildren<Props>>(function CaptureView({ view, children, className }) {
   const parentContext = useContext(CaptureViewContext);
   const viewContext = useViewContext(view, parentContext);
   const actionService = useService(ActionService);
   const activeView = useActiveView(view);
   const [ref, state] = useFocus<HTMLDivElement>({ onFocus: activeView.focusView, onBlur: activeView.blurView });
 
-  const actionItems = (
-    view.actions
-      .map(action => actionService.getAction(viewContext, action))
-      .filter(action => action?.binding && !action.isDisabled())
-      .filter(Boolean) as IActionItem[]
-  );
+  const actionItems = view.actions
+    .map(action => actionService.getAction(viewContext, action))
+    .filter(action => action?.binding && !action.isDisabled())
+    .filter(Boolean) as IActionItem[];
 
   let keys = actionItems
     .map(item => item.binding?.binding.keys)
@@ -59,31 +52,32 @@ export const CaptureView = observer<React.PropsWithChildren<Props>>(function Cap
     keys = '*';
   }
 
-  useHotkeys(keys, (event, handler) => {
-    if (!state.reference?.contains(document.activeElement)) {
-      return;
-    }
+  useHotkeys(
+    keys,
+    (event, handler) => {
+      if (!state.reference?.contains(document.activeElement)) {
+        return;
+      }
 
-    const action = actionItems.find(action => (
-      action.binding?.binding.keys === handler.key
-      || action.binding?.binding.keys.includes(handler.key)
-    ));
+      const action = actionItems.find(action => action.binding?.binding.keys === handler.key || action.binding?.binding.keys.includes(handler.key));
 
-    if (action?.binding?.binding.preventDefault) {
-      event.preventDefault();
-    }
+      if (action?.binding?.binding.preventDefault) {
+        event.preventDefault();
+      }
 
-    action?.activate(true);
-  }, {
-    enabled: keys !== '*',
-    enableOnTags: ['INPUT', 'SELECT', 'TEXTAREA'],
-  });
+      action?.activate(true);
+    },
+    {
+      enabled: keys !== '*',
+      enableOnTags: ['INPUT', 'SELECT', 'TEXTAREA'],
+    },
+  );
 
   return styled(styles)(
     <CaptureViewContext.Provider value={viewContext}>
       <div ref={ref} className={className} tabIndex={0}>
         {children}
       </div>
-    </CaptureViewContext.Provider>
+    </CaptureViewContext.Provider>,
   );
 });
diff --git a/webapp/packages/core-view/src/View/CaptureViewContext.ts b/webapp/packages/core-view/src/View/CaptureViewContext.ts
index 5bad136e9d..5a89095133 100644
--- a/webapp/packages/core-view/src/View/CaptureViewContext.ts
+++ b/webapp/packages/core-view/src/View/CaptureViewContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { IDataContext } from '../DataContext/IDataContext';
diff --git a/webapp/packages/core-view/src/View/DATA_CONTEXT_VIEW.ts b/webapp/packages/core-view/src/View/DATA_CONTEXT_VIEW.ts
index 167c8877d5..81ddd4dba4 100644
--- a/webapp/packages/core-view/src/View/DATA_CONTEXT_VIEW.ts
+++ b/webapp/packages/core-view/src/View/DATA_CONTEXT_VIEW.ts
@@ -5,7 +5,6 @@
  * 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 { IView } from './IView';
 
diff --git a/webapp/packages/core-view/src/View/IActiveView.ts b/webapp/packages/core-view/src/View/IActiveView.ts
index fa35524e6b..77a85b3837 100644
--- a/webapp/packages/core-view/src/View/IActiveView.ts
+++ b/webapp/packages/core-view/src/View/IActiveView.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExtension } from '@cloudbeaver/core-extensions';
 
 export interface IActiveView<T> {
diff --git a/webapp/packages/core-view/src/View/IView.ts b/webapp/packages/core-view/src/View/IView.ts
index 7616327e72..3966e18612 100644
--- a/webapp/packages/core-view/src/View/IView.ts
+++ b/webapp/packages/core-view/src/View/IView.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAction } from '../Action/IAction';
 import type { IActiveView } from './IActiveView';
 
diff --git a/webapp/packages/core-view/src/View/View.ts b/webapp/packages/core-view/src/View/View.ts
index c441318c24..1018683360 100644
--- a/webapp/packages/core-view/src/View/View.ts
+++ b/webapp/packages/core-view/src/View/View.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import type { IAction } from '../Action/IAction';
diff --git a/webapp/packages/core-view/src/View/ViewService.ts b/webapp/packages/core-view/src/View/ViewService.ts
index 83fab1a559..beef61768f 100644
--- a/webapp/packages/core-view/src/View/ViewService.ts
+++ b/webapp/packages/core-view/src/View/ViewService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, computed } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/core-view/src/View/useActiveView.ts b/webapp/packages/core-view/src/View/useActiveView.ts
index 3fa6121876..00797adfed 100644
--- a/webapp/packages/core-view/src/View/useActiveView.ts
+++ b/webapp/packages/core-view/src/View/useActiveView.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
@@ -22,15 +21,19 @@ interface IViewController {
 export function useActiveView<T>(view: IView<T>): IViewController {
   const activeViewService = useService(ViewService);
 
-  const controller = useObjectRef(() => ({
-    view,
-    focusView() {
-      activeViewService.setPrimaryView(this.view);
-    },
-    blurView() {
-      activeViewService.blur(this.view);
-    },
-  }), false, ['focusView', 'blurView']);
+  const controller = useObjectRef(
+    () => ({
+      view,
+      focusView() {
+        activeViewService.setPrimaryView(this.view);
+      },
+      blurView() {
+        activeViewService.blur(this.view);
+      },
+    }),
+    false,
+    ['focusView', 'blurView'],
+  );
 
   useEffect(() => {
     activeViewService.addActiveView(view);
diff --git a/webapp/packages/core-view/src/View/useCaptureViewContext.ts b/webapp/packages/core-view/src/View/useCaptureViewContext.ts
index ba5af79297..d1bbf8e58d 100644
--- a/webapp/packages/core-view/src/View/useCaptureViewContext.ts
+++ b/webapp/packages/core-view/src/View/useCaptureViewContext.ts
@@ -5,16 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { IDataContext } from '../DataContext/IDataContext';
 import { useDynamicDataContext } from '../DataContext/useDynamicDataContext';
 import { CaptureViewContext } from './CaptureViewContext';
 
-export function useCaptureViewContext(
-  capture: (context: IDataContext | undefined) => void
-): void {
+export function useCaptureViewContext(capture: (context: IDataContext | undefined) => void): void {
   const context = useContext(CaptureViewContext);
   useDynamicDataContext(context, capture);
 }
diff --git a/webapp/packages/core-view/src/View/useViewContext.ts b/webapp/packages/core-view/src/View/useViewContext.ts
index 4482ffa652..794d987944 100644
--- a/webapp/packages/core-view/src/View/useViewContext.ts
+++ b/webapp/packages/core-view/src/View/useViewContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { IDataContext } from '../DataContext/IDataContext';
diff --git a/webapp/packages/core-view/src/manifest.ts b/webapp/packages/core-view/src/manifest.ts
index 981fb06783..6e89276faa 100644
--- a/webapp/packages/core-view/src/manifest.ts
+++ b/webapp/packages/core-view/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ActionService } from './Action/ActionService';
@@ -19,11 +18,5 @@ export const manifest: PluginManifest = {
     name: 'Core View',
   },
 
-  providers: [
-    ActionService,
-    KeyBindingService,
-    MenuService,
-    ViewService,
-    LocaleService,
-  ],
+  providers: [ActionService, KeyBindingService, MenuService, ViewService, LocaleService],
 };
diff --git a/webapp/packages/eslint-config/eslint-config.json b/webapp/packages/eslint-config/eslint-config.json
index ca261ae188..fb2cb11670 100644
--- a/webapp/packages/eslint-config/eslint-config.json
+++ b/webapp/packages/eslint-config/eslint-config.json
@@ -18,7 +18,8 @@
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
   ],
   "settings": {
     "react": {
@@ -40,12 +41,7 @@
     "space-after-keywords": "off",
     "no-inner-declarations": "off",
     "no-constant-condition": "off",
-    "no-trailing-spaces": "error",
     "space-before-blocks": "error",
-    "@typescript-eslint/indent": [
-      "error",
-      2
-    ],
     "@typescript-eslint/no-invalid-void-type": "off",
     "@typescript-eslint/dot-notation": "off",
     "@typescript-eslint/no-throw-literal": "off",
@@ -136,30 +132,9 @@
       "warn"
     ],
     "@typescript-eslint/no-confusing-void-expression": "off",
-    "@typescript-eslint/no-unnecessary-boolean-literal-compare": [
-      "warn"
-    ],
-    "@typescript-eslint/no-unnecessary-condition": [
-      "warn",
-      {
-        "allowConstantLoopConditions": true
-      }
-    ],
-    "@typescript-eslint/no-unnecessary-type-arguments": [
-      "warn"
-    ],
-    "@typescript-eslint/non-nullable-type-assertion-style": [
-      "warn"
-    ],
     "@typescript-eslint/prefer-function-type": [
       "warn"
     ],
-    "@typescript-eslint/prefer-includes": [
-      "warn"
-    ],
-    "@typescript-eslint/prefer-readonly": [
-      "warn"
-    ],
     "arrow-spacing": "error",
     "import/no-duplicates": "off",
     "import/export": "off",
@@ -206,7 +181,7 @@
     "max-len": [
       "error",
       {
-        "code": 120,
+        "code": 150,
         "ignoreTrailingComments": true,
         "ignoreStrings": true,
         "ignoreTemplateLiterals": true,
diff --git a/webapp/packages/eslint-config/package.json b/webapp/packages/eslint-config/package.json
index e47b4d5963..7145a8b9d9 100644
--- a/webapp/packages/eslint-config/package.json
+++ b/webapp/packages/eslint-config/package.json
@@ -17,6 +17,7 @@
     "eslint": "~8.35.0",
     "eslint-config-airbnb-base": "~15.0.0",
     "eslint-config-airbnb-typescript": "~17.0.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-typescript": "~3.5.3",
     "eslint-plugin-import": "~2.27.5",
     "eslint-plugin-import-helpers": "~1.3.1",
diff --git a/webapp/packages/plugin-administration/src/Administration/Administration.tsx b/webapp/packages/plugin-administration/src/Administration/Administration.tsx
index d2a0f15def..fd88892f47 100644
--- a/webapp/packages/plugin-administration/src/Administration/Administration.tsx
+++ b/webapp/packages/plugin-administration/src/Administration/Administration.tsx
@@ -5,64 +5,63 @@
  * 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 { useLayoutEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AdministrationItemService, filterOnlyActive, IAdministrationItemRoute } from '@cloudbeaver/core-administration';
-import { SlideBox, SlideElement, ErrorBoundary, SlideOverlay, slideBoxStyles, useStyles, Loader } from '@cloudbeaver/core-blocks';
+import { ErrorBoundary, Loader, SlideBox, slideBoxStyles, SlideElement, SlideOverlay, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { TabsState, TabList, verticalTabStyles, BASE_TAB_STYLES, OptionsPanelService } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, OptionsPanelService, TabList, TabsState, verticalTabStyles } from '@cloudbeaver/core-ui';
 
 import { DrawerItem } from './DrawerItem';
 import { ItemContent } from './ItemContent';
 
 const tabsStyles = css`
-    TabList {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-    }
-    Tab {
-      composes: theme-ripple theme-background-background theme-ripple-selectable from global;
-      color: inherit;
-    }
-  `;
+  TabList {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
+  }
+  Tab {
+    composes: theme-ripple theme-background-background theme-ripple-selectable from global;
+    color: inherit;
+  }
+`;
 
 const administrationStyles = css`
-    SlideElement {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    container {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      display: flex;
-      flex-direction: row;
-      flex: 1;
-      overflow: hidden;
-    }
-    TabList {
-      width: 240px;
-      padding-top: 16px;
-      border-right: 2px solid;
-    }
-    content-container {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-    }
-    SlideBox {
-      flex: 1;
-    }
-    content {
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-    }
-    Loader {
-      height: 100%;
-    }
-  `;
+  SlideElement {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  container {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+    overflow: hidden;
+  }
+  TabList {
+    width: 240px;
+    padding-top: 16px;
+    border-right: 2px solid;
+  }
+  content-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+  }
+  SlideBox {
+    flex: 1;
+  }
+  content {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+  }
+  Loader {
+    height: 100%;
+  }
+`;
 
 interface Props {
   configurationWizard: boolean;
@@ -71,7 +70,10 @@ interface Props {
 }
 
 export const Administration = observer<React.PropsWithChildren<Props>>(function Administration({
-  configurationWizard, activeScreen, onItemSelect, children,
+  configurationWizard,
+  activeScreen,
+  onItemSelect,
+  children,
 }) {
   const contentRef = useRef<HTMLDivElement>(null);
   const administrationItemService = useService(AdministrationItemService);
@@ -87,7 +89,7 @@ export const Administration = observer<React.PropsWithChildren<Props>>(function
 
   return styled(useStyles(BASE_TAB_STYLES, verticalTabStyles, administrationStyles, tabsStyles, slideBoxStyles))(
     <container>
-      <TabsState currentTabId={activeScreen?.item} orientation='vertical'>
+      <TabsState currentTabId={activeScreen?.item} orientation="vertical">
         <TabList aria-label="Administration items">
           {items.map(item => (
             <DrawerItem
@@ -95,15 +97,12 @@ export const Administration = observer<React.PropsWithChildren<Props>>(function
               item={item}
               configurationWizard={configurationWizard}
               style={[BASE_TAB_STYLES, verticalTabStyles, tabsStyles]}
-              disabled={(
-                onlyActiveItem
-                && onlyActiveItem.filterOnlyActive?.(configurationWizard, item) !== true
-              ) ? true : false}
+              disabled={onlyActiveItem && onlyActiveItem.filterOnlyActive?.(configurationWizard, item) !== true ? true : false}
               onSelect={onItemSelect}
             />
           ))}
         </TabList>
-        <content-container ref={contentRef} as='div'>
+        <content-container ref={contentRef} as="div">
           {children}
           <SlideBox open={optionsPanelService.active}>
             <SlideElement>
@@ -124,6 +123,6 @@ export const Administration = observer<React.PropsWithChildren<Props>>(function
           </SlideBox>
         </content-container>
       </TabsState>
-    </container>
+    </container>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/Administration/DrawerItem.tsx b/webapp/packages/plugin-administration/src/Administration/DrawerItem.tsx
index 479767b647..4ba8a37faa 100644
--- a/webapp/packages/plugin-administration/src/Administration/DrawerItem.tsx
+++ b/webapp/packages/plugin-administration/src/Administration/DrawerItem.tsx
@@ -5,15 +5,12 @@
  * 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 { type AdministrationItemDrawerProps, ConfigurationWizardService, filterOnlyActive } from '@cloudbeaver/core-administration';
 import { useService } from '@cloudbeaver/core-di';
 
-export const DrawerItem = observer<AdministrationItemDrawerProps>(function DrawerItem({
-  item, onSelect, style, configurationWizard, disabled,
-}) {
+export const DrawerItem = observer<AdministrationItemDrawerProps>(function DrawerItem({ item, onSelect, style, configurationWizard, disabled }) {
   const configurationWizardService = useService(ConfigurationWizardService);
   const Component = item.getDrawerComponent();
 
@@ -23,13 +20,5 @@ export const DrawerItem = observer<AdministrationItemDrawerProps>(function Drawe
 
   const onlyActive = filterOnlyActive(configurationWizard)(item) ? false : disabled;
 
-  return (
-    <Component
-      item={item}
-      configurationWizard={configurationWizard}
-      style={style}
-      disabled={onlyActive}
-      onSelect={onSelect}
-    />
-  );
+  return <Component item={item} configurationWizard={configurationWizard} style={style} disabled={onlyActive} onSelect={onSelect} />;
 });
diff --git a/webapp/packages/plugin-administration/src/Administration/ItemContent.tsx b/webapp/packages/plugin-administration/src/Administration/ItemContent.tsx
index b1641052f5..6977c1f519 100644
--- a/webapp/packages/plugin-administration/src/Administration/ItemContent.tsx
+++ b/webapp/packages/plugin-administration/src/Administration/ItemContent.tsx
@@ -5,7 +5,6 @@
  * 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 { AdministrationItemService, IAdministrationItemRoute } from '@cloudbeaver/core-administration';
@@ -17,10 +16,7 @@ interface Props {
   configurationWizard: boolean;
 }
 
-export const ItemContent = observer<Props>(function ItemContent({
-  activeScreen,
-  configurationWizard,
-}) {
+export const ItemContent = observer<Props>(function ItemContent({ activeScreen, configurationWizard }) {
   const translate = useTranslate();
   const administrationItemService = useService(AdministrationItemService);
 
diff --git a/webapp/packages/plugin-administration/src/AdministrationMenu/AdministrationMenu.tsx b/webapp/packages/plugin-administration/src/AdministrationMenu/AdministrationMenu.tsx
index fcb2a44627..f09f24f204 100644
--- a/webapp/packages/plugin-administration/src/AdministrationMenu/AdministrationMenu.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationMenu/AdministrationMenu.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -32,6 +31,6 @@ export const AdministrationMenu = observer(function AdministrationMenu() {
         style={[topMenuStyles, MENU_BAR_ITEM_STYLES, topMenuStyles, MENU_BAR_DISABLE_EFFECT_STYLES]}
         nestedMenuSettings={{ modal: true }}
       />
-    </menu-wrapper>
+    </menu-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/AdministrationMenu/MENU_APP_ADMINISTRATION_ACTIONS.ts b/webapp/packages/plugin-administration/src/AdministrationMenu/MENU_APP_ADMINISTRATION_ACTIONS.ts
index 4a6bdaef2e..fe1cc4999f 100644
--- a/webapp/packages/plugin-administration/src/AdministrationMenu/MENU_APP_ADMINISTRATION_ACTIONS.ts
+++ b/webapp/packages/plugin-administration/src/AdministrationMenu/MENU_APP_ADMINISTRATION_ACTIONS.ts
@@ -5,7 +5,6 @@
  * 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_APP_ADMINISTRATION_ACTIONS = createMenu('app-administration-actions', 'Application Administration Actions');
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreen.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreen.tsx
index 9978cd82a8..6a19f7eb15 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreen.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreen.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 
@@ -22,10 +21,7 @@ import type { IAdministrationScreenParams } from './IAdministrationScreenParams'
 export const AdministrationScreen: ScreenComponent<IAdministrationScreenParams> = observer(function AdministrationScreen() {
   const administrationScreenService = useService(AdministrationScreenService);
 
-  const handleSelect = useCallback(
-    (item: string) => administrationScreenService.navigateToItem(item),
-    [administrationScreenService]
-  );
+  const handleSelect = useCallback((item: string) => administrationScreenService.navigateToItem(item), [administrationScreenService]);
 
   const accessProvided = usePermission(EAdminPermission.admin);
 
@@ -33,11 +29,7 @@ export const AdministrationScreen: ScreenComponent<IAdministrationScreenParams>
     <>
       <AdministrationTopAppBar />
       {accessProvided && (
-        <Administration
-          configurationWizard={false}
-          activeScreen={administrationScreenService.activeScreen}
-          onItemSelect={handleSelect}
-        />
+        <Administration configurationWizard={false} activeScreen={administrationScreenService.activeScreen} onItemSelect={handleSelect} />
       )}
     </>
   );
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
index 5d9dc44eba..585548d29f 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { ScreenService } from '@cloudbeaver/core-routing';
 
@@ -19,14 +18,13 @@ export class AdministrationScreenServiceBootstrap extends Bootstrap {
   constructor(
     private readonly screenService: ScreenService,
     private readonly administrationScreenService: AdministrationScreenService,
-    private readonly serverConfigResource: ServerConfigResource
+    private readonly serverConfigResource: ServerConfigResource,
   ) {
     super();
   }
 
   register(): void {
-    const canActivate
-      = () => this.administrationScreenService.handleCanActivate.bind(this.administrationScreenService);
+    const canActivate = () => this.administrationScreenService.handleCanActivate.bind(this.administrationScreenService);
 
     this.screenService.create({
       name: AdministrationScreenService.screenName,
@@ -92,8 +90,10 @@ export class AdministrationScreenServiceBootstrap extends Bootstrap {
   async load(): Promise<void> {
     await this.serverConfigResource.load();
 
-    if (this.administrationScreenService.isConfigurationMode
-      && !this.screenService.isActive(this.screenService.routerService.route, AdministrationScreenService.setupName)) {
+    if (
+      this.administrationScreenService.isConfigurationMode &&
+      !this.screenService.isActive(this.screenService.routerService.route, AdministrationScreenService.setupName)
+    ) {
       this.administrationScreenService.navigateToRoot();
     }
   }
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBar.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBar.tsx
index ac666c29c1..71ab5cdacc 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBar.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBar.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Placeholder, TopAppBar } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBarService.ts b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBarService.ts
index 2623a1aad5..8de2a6d044 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBarService.ts
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBarService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/Fill.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/Fill.tsx
index d012c53b2b..277c3fd4d9 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/Fill.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/AdministrationTopAppBar/Fill.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx
index 6b972b2b8d..56e593837b 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 
 import { AdministrationItemService, AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { EAdminPermission } from '@cloudbeaver/core-authentication';
-import { Translate, useResource, usePermission } from '@cloudbeaver/core-blocks';
+import { Translate, usePermission, useResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { SessionPermissionsResource } from '@cloudbeaver/core-root';
 
@@ -29,21 +28,17 @@ export const ConfigurationWizardScreen = observer(function ConfigurationWizardSc
       const route = administrationItemService.getItem(item, true)?.configurationWizardOptions?.defaultRoute;
       administrationScreenService.navigateTo(item, route);
     },
-    [administrationItemService, administrationScreenService]
+    [administrationItemService, administrationScreenService],
   );
 
   if (!usePermission(EAdminPermission.admin)) {
-    return <Translate token='root_permission_denied' />;
+    return <Translate token="root_permission_denied" />;
   }
 
   return (
     <>
       <WizardTopAppBar />
-      <Administration
-        activeScreen={administrationScreenService.activeScreen}
-        configurationWizard
-        onItemSelect={handleSelect}
-      >
+      <Administration activeScreen={administrationScreenService.activeScreen} configurationWizard onItemSelect={handleSelect}>
         <WizardStepper />
       </Administration>
     </>
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx
index c7af482ae3..1902942c33 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx
@@ -5,47 +5,47 @@
  * 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 { ConfigurationWizardService } from '@cloudbeaver/core-administration';
-import { Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Button, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
 const styles = css`
-    wizard-stepper {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-      position: sticky;
-      top: 0;
-      height: 48px;
-      display: flex;
-      padding: 0 16px;
-      align-items: center;
-      border-bottom: solid 2px;
-      z-index: 1;
-      flex-shrink: 0;
-    }
+  wizard-stepper {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
+    position: sticky;
+    top: 0;
+    height: 48px;
+    display: flex;
+    padding: 0 16px;
+    align-items: center;
+    border-bottom: solid 2px;
+    z-index: 1;
+    flex-shrink: 0;
+  }
 
-    actions {
-      composes: theme-border-color-background from global;
-      border-right: solid 1px;
+  actions {
+    composes: theme-border-color-background from global;
+    border-right: solid 1px;
 
-      & Button {
-        margin-right: 16px;
-      }
+    & Button {
+      margin-right: 16px;
     }
+  }
 
-    actions, wizard-text {
-      display: flex;
-      align-items: center;
-      height: 28px;
-    }
+  actions,
+  wizard-text {
+    display: flex;
+    align-items: center;
+    height: 28px;
+  }
 
-    wizard-text {
-      padding: 0 16px;
-    }
-  `;
+  wizard-text {
+    padding: 0 16px;
+  }
+`;
 
 export const WizardStepper = observer(function WizardStepper() {
   const service = useService(ConfigurationWizardService);
@@ -54,23 +54,14 @@ export const WizardStepper = observer(function WizardStepper() {
   return styled(useStyles(styles))(
     <wizard-stepper>
       <actions>
-        <Button
-          type="button"
-          mod={['outlined']}
-          disabled={service.currentStepIndex === 0}
-          onClick={() => service.back()}
-        >
+        <Button type="button" mod={['outlined']} disabled={service.currentStepIndex === 0} onClick={() => service.back()}>
           {translate('ui_stepper_back')}
         </Button>
-        <Button
-          type="button"
-          mod={['unelevated']}
-          onClick={() => service.next()}
-        >
+        <Button type="button" mod={['unelevated']} onClick={() => service.next()}>
           {translate(service.currentStepIndex === service.steps.length - 1 ? 'ui_stepper_finish' : 'ui_stepper_next')}
         </Button>
       </actions>
       <wizard-text>{translate(service.currentStep?.configurationWizardOptions?.description || '')}</wizard-text>
-    </wizard-stepper>
+    </wizard-stepper>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx
index 4178fde9f1..6c3617898b 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Translate } from '@cloudbeaver/core-blocks';
@@ -19,6 +18,8 @@ const styles = css`
 
 export function ConfigurationWizardTitle() {
   return styled(styles)(
-    <wizard-title as='div'><Translate token='administration_configuration_wizard_title' /></wizard-title>
+    <wizard-title as="div">
+      <Translate token="administration_configuration_wizard_title" />
+    </wizard-title>,
   );
 }
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/Fill.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/Fill.tsx
index d012c53b2b..277c3fd4d9 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/Fill.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/Fill.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBar.tsx b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBar.tsx
index 90ba1e3cd1..43181e10da 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBar.tsx
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBar.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Placeholder, TopAppBar } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBarService.ts b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBarService.ts
index 39a2b1f1c3..cf7c7ba94f 100644
--- a/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBarService.ts
+++ b/webapp/packages/plugin-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBarService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
index afcf04e67c..b936f4575e 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationItemService, AdministrationItemType, ConfigurationWizardService } from '@cloudbeaver/core-administration';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 import { FinishPage } from './Finish/FinishPage';
 import { FinishPageDrawerItem } from './Finish/FinishPageDrawerItem';
@@ -23,7 +22,7 @@ export class ConfigurationWizardPagesBootstrapService extends Bootstrap {
   constructor(
     private readonly administrationItemService: AdministrationItemService,
     private readonly configurationWizardService: ConfigurationWizardService,
-    private readonly serverConfigurationService: ServerConfigurationService
+    private readonly serverConfigurationService: ServerConfigurationService,
   ) {
     super();
   }
@@ -47,14 +46,8 @@ export class ConfigurationWizardPagesBootstrapService extends Bootstrap {
         order: 1.5,
         onLoad: this.serverConfigurationService.loadConfig.bind(this.serverConfigurationService),
         isDone: this.serverConfigurationService.isDone.bind(this.serverConfigurationService),
-        onFinish: this.serverConfigurationService.saveConfiguration.bind(
-          this.serverConfigurationService,
-          false
-        ),
-        onConfigurationFinish: this.serverConfigurationService.saveConfiguration.bind(
-          this.serverConfigurationService,
-          true
-        ),
+        onFinish: this.serverConfigurationService.saveConfiguration.bind(this.serverConfigurationService, false),
+        onConfigurationFinish: this.serverConfigurationService.saveConfiguration.bind(this.serverConfigurationService, true),
       },
       order: 4,
       onActivate: () => this.serverConfigurationService.activate(),
@@ -76,5 +69,5 @@ export class ConfigurationWizardPagesBootstrapService extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx
index df2cd8c149..6969a56d56 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx
@@ -5,38 +5,35 @@
  * 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 { ConfigurationWizardService } from '@cloudbeaver/core-administration';
-import { BASE_LAYOUT_GRID_STYLES, Button, useFocus, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_LAYOUT_GRID_STYLES, Button, useFocus, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 
-
-
 const styles = css`
-    layout-grid {
-      width: 100%;
-      flex: 1;
-    }
+  layout-grid {
+    width: 100%;
+    flex: 1;
+  }
 
-    layout-grid-inner {
-      min-height: 100%;
-    }
+  layout-grid-inner {
+    min-height: 100%;
+  }
 
-    layout-grid-cell {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-      position: relative;
-      border: solid 1px;
-      padding: 16px 24px
-    }
+  layout-grid-cell {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
+    position: relative;
+    border: solid 1px;
+    padding: 16px 24px;
+  }
 
-    p {
-      line-height: 2;
-      white-space: pre;
-    }
-  `;
+  p {
+    line-height: 2;
+    white-space: pre;
+  }
+`;
 
 export const FinishPage = observer(function FinishPage() {
   const translate = useTranslate();
@@ -48,19 +45,15 @@ export const FinishPage = observer(function FinishPage() {
   return styled(useStyles(BASE_LAYOUT_GRID_STYLES, styles))(
     <layout-grid>
       <layout-grid-inner>
-        <layout-grid-cell ref={focus} as='div' data-span='12'>
+        <layout-grid-cell ref={focus} as="div" data-span="12">
           <h3>{translate('administration_configuration_wizard_finish_title')}</h3>
           <p>{translate('administration_configuration_wizard_finish_message')}</p>
 
-          <Button
-            type="button"
-            mod={['unelevated']}
-            onClick={() => service.next()}
-          >
+          <Button type="button" mod={['unelevated']} onClick={() => service.next()}>
             {translate('ui_stepper_finish')}
           </Button>
         </layout-grid-cell>
       </layout-grid-inner>
-    </layout-grid>
+    </layout-grid>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx
index 8b898f9dfb..e21ba5bf52 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx
@@ -5,29 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
-export const FinishPageDrawerItem = observer<AdministrationItemDrawerProps>(function FinishPageDrawerItem({
-  item,
-  onSelect,
-  style,
-  disabled,
-}) {
+export const FinishPageDrawerItem = observer<AdministrationItemDrawerProps>(function FinishPageDrawerItem({ item, onSelect, style, disabled }) {
   return styled(useStyles(style))(
-    <Tab
-      tabId={item.name}
-      disabled={disabled
-        || (item.configurationWizardOptions?.isDisabled?.())}
-      onOpen={() => onSelect(item.name)}
-    >
-      <TabIcon icon='/icons/confirmation.svg' viewBox='0 0 16 16' />
-      <TabTitle><Translate token='administration_configuration_wizard_finish' /></TabTitle>
-    </Tab>
+    <Tab tabId={item.name} disabled={disabled || item.configurationWizardOptions?.isDisabled?.()} onOpen={() => onSelect(item.name)}>
+      <TabIcon icon="/icons/confirmation.svg" viewBox="0 0 16 16" />
+      <TabTitle>
+        <Translate token="administration_configuration_wizard_finish" />
+      </TabTitle>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx
index 4cb77d1c86..1f50f38ae0 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,21 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ServerConfigInput } from '@cloudbeaver/core-sdk';
 
-
 interface Props {
   serverConfig: ServerConfigInput;
 }
 
-export const ServerConfigurationConfigurationForm = observer<Props>(function ServerConfigurationConfigurationForm({
-  serverConfig,
-}) {
+export const ServerConfigurationConfigurationForm = observer<Props>(function ServerConfigurationConfigurationForm({ serverConfig }) {
   const translate = useTranslate();
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <>
@@ -34,6 +29,6 @@ export const ServerConfigurationConfigurationForm = observer<Props>(function Ser
       >
         {translate('administration_configuration_wizard_configuration_custom_connections')}
       </Switch>
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx
index 03a81dff00..077e1ee6d4 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx
@@ -5,57 +5,60 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
 
 import { AdministrationSettingsService } from '@cloudbeaver/core-administration';
-import { BASE_CONTAINERS_STYLES, FormContext, GroupTitle, PlaceholderComponent, Switch, useResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  FormContext,
+  GroupTitle,
+  PlaceholderComponent,
+  Switch,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { FeaturesResource } from '@cloudbeaver/core-root';
 import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
 
-export const ServerConfigurationFeaturesForm: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(function ServerConfigurationFeaturesForm({
-  state: { serverConfig },
-  configurationWizard,
-}) {
-  const formContext = useContext(FormContext);
+export const ServerConfigurationFeaturesForm: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(
+  function ServerConfigurationFeaturesForm({ state: { serverConfig }, configurationWizard }) {
+    const formContext = useContext(FormContext);
 
-  if (formContext === null) {
-    throw new Error('Form state should be provided');
-  }
+    if (formContext === null) {
+      throw new Error('Form state should be provided');
+    }
 
-  const administrationSettingsService = useService(AdministrationSettingsService);
-  const features = useResource(
-    ServerConfigurationFeaturesForm,
-    FeaturesResource,
-    configurationWizard ? null : undefined
-  );
-  const translate = useTranslate();
-  const styles = useStyles(BASE_CONTAINERS_STYLES);
+    const administrationSettingsService = useService(AdministrationSettingsService);
+    const features = useResource(ServerConfigurationFeaturesForm, FeaturesResource, configurationWizard ? null : undefined);
+    const translate = useTranslate();
+    const styles = useStyles(BASE_CONTAINERS_STYLES);
 
-  if (features.data.length === 0 || configurationWizard) {
-    return null;
-  }
+    if (features.data.length === 0 || configurationWizard) {
+      return null;
+    }
 
-  return styled(styles)(
-    <>
-      <GroupTitle>{translate('administration_configuration_wizard_configuration_services_group')}</GroupTitle>
-      {features.data.map(feature => (
-        <Switch
-          key={feature.id}
-          value={feature.id}
-          name="enabledFeatures"
-          state={serverConfig}
-          description={feature.description}
-          disabled={administrationSettingsService.isBase(feature.id)}
-          mod={['primary']}
-          small
-        >
-          {feature.label}
-        </Switch>
-      ))}
-    </>
-  );
-});
+    return styled(styles)(
+      <>
+        <GroupTitle>{translate('administration_configuration_wizard_configuration_services_group')}</GroupTitle>
+        {features.data.map(feature => (
+          <Switch
+            key={feature.id}
+            value={feature.id}
+            name="enabledFeatures"
+            state={serverConfig}
+            description={feature.description}
+            disabled={administrationSettingsService.isBase(feature.id)}
+            mod={['primary']}
+            small
+          >
+            {feature.label}
+          </Switch>
+        ))}
+      </>,
+    );
+  },
+);
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
index c728310af6..32be50fc0e 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { Group, GroupTitle, BASE_CONTAINERS_STYLES, InputField, useTranslate, useStyles, useResource } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Group, GroupTitle, InputField, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 
 import type { IServerConfigurationPageState } from '../IServerConfigurationPageState';
@@ -19,22 +17,13 @@ interface Props {
   state: IServerConfigurationPageState;
 }
 
-export const ServerConfigurationInfoForm = observer<Props>(function ServerConfigurationInfoForm({
-  state,
-}) {
+export const ServerConfigurationInfoForm = observer<Props>(function ServerConfigurationInfoForm({ state }) {
   const serverConfigLoader = useResource(ServerConfigurationInfoForm, ServerConfigResource, undefined);
   const translate = useTranslate();
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <Group form gap>
       <GroupTitle>{translate('administration_configuration_wizard_configuration_server_info')}</GroupTitle>
-      <InputField
-        type="text"
-        name="serverName"
-        state={state.serverConfig}
-        mod='surface'
-        required
-        medium
-      >
+      <InputField type="text" name="serverName" state={state.serverConfig} mod="surface" required medium>
         {translate('administration_configuration_wizard_configuration_server_name')}
       </InputField>
       <InputField
@@ -43,7 +32,7 @@ export const ServerConfigurationInfoForm = observer<Props>(function ServerConfig
         name="serverURL"
         state={state.serverConfig}
         readOnly={serverConfigLoader.resource.distributed}
-        mod='surface'
+        mod="surface"
         required
         medium
       >
@@ -54,7 +43,7 @@ export const ServerConfigurationInfoForm = observer<Props>(function ServerConfig
         type="number"
         name="sessionExpireTime"
         state={state.serverConfig}
-        mod='surface'
+        mod="surface"
         min={1}
         mapState={v => (v === 0 ? 60000 : v ?? 1800000) / 1000 / 60}
         mapValue={v => (v === undefined ? 30 : Number(v) || 1) * 1000 * 60}
@@ -63,6 +52,6 @@ export const ServerConfigurationInfoForm = observer<Props>(function ServerConfig
       >
         {translate('administration_configuration_wizard_configuration_server_session_lifetime')}
       </InputField>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx
index 6dbbfe8a8a..a202e72c67 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { CONNECTION_NAVIGATOR_VIEW_SETTINGS, isNavigatorViewSettingsEqual } from '@cloudbeaver/core-root';
 
 import type { IServerConfigurationPageState } from '../IServerConfigurationPageState';
@@ -19,20 +18,21 @@ interface Props {
   configs: IServerConfigurationPageState;
 }
 
-export const ServerConfigurationNavigatorViewForm = observer<Props>(function ServerConfigurationNavigatorViewForm({
-  configs,
-}) {
+export const ServerConfigurationNavigatorViewForm = observer<Props>(function ServerConfigurationNavigatorViewForm({ configs }) {
   const translate = useTranslate();
 
   const isSimpleView = isNavigatorViewSettingsEqual(configs.navigatorConfig, CONNECTION_NAVIGATOR_VIEW_SETTINGS.simple);
 
-  const onNavigatorViewChangeHandler = useCallback((value: boolean) => {
-    if (value) {
-      Object.assign(configs.navigatorConfig, CONNECTION_NAVIGATOR_VIEW_SETTINGS.simple);
-    } else {
-      Object.assign(configs.navigatorConfig, CONNECTION_NAVIGATOR_VIEW_SETTINGS.advanced);
-    }
-  }, [configs]);
+  const onNavigatorViewChangeHandler = useCallback(
+    (value: boolean) => {
+      if (value) {
+        Object.assign(configs.navigatorConfig, CONNECTION_NAVIGATOR_VIEW_SETTINGS.simple);
+      } else {
+        Object.assign(configs.navigatorConfig, CONNECTION_NAVIGATOR_VIEW_SETTINGS.advanced);
+      }
+    },
+    [configs],
+  );
 
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <>
@@ -46,6 +46,6 @@ export const ServerConfigurationNavigatorViewForm = observer<Props>(function Ser
       >
         {translate('administration_configuration_wizard_configuration_navigation_tree_view')}
       </Switch>
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx
index ec1f5e78b3..6300b0e8cb 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx
@@ -5,20 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Group, GroupTitle, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Group, GroupTitle, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ServerConfigInput } from '@cloudbeaver/core-sdk';
 
 interface Props {
   serverConfig: ServerConfigInput;
 }
 
-export const ServerConfigurationSecurityForm = observer<Props>(function ServerConfigurationSecurityForm({
-  serverConfig,
-}) {
+export const ServerConfigurationSecurityForm = observer<Props>(function ServerConfigurationSecurityForm({ serverConfig }) {
   const translate = useTranslate();
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <Group form gap>
@@ -44,6 +41,6 @@ export const ServerConfigurationSecurityForm = observer<Props>(function ServerCo
       >
         {translate('administration_configuration_wizard_configuration_security_public_credentials')}
       </Switch>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationPageState.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationPageState.ts
index 10ec252fc8..bcc79020f2 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationPageState.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationPageState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavigatorSettingsInput, ServerConfigInput } from '@cloudbeaver/core-sdk';
 
 export interface IServerConfigurationPageState {
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx
index 04d0cc2ac6..8d3e73e05b 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx
@@ -5,20 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
 export const ServerConfigurationDrawerItem: React.FC<AdministrationItemDrawerProps> = function ServerConfigurationDrawerItem({
-  item, onSelect, style, disabled,
+  item,
+  onSelect,
+  style,
+  disabled,
 }) {
   return styled(useStyles(style))(
     <Tab tabId={item.name} disabled={disabled} onOpen={() => onSelect(item.name)}>
-      <TabIcon icon='/icons/cog-outline.svg' />
-      <TabTitle><Translate token='administration_configuration_wizard_configuration' /></TabTitle>
-    </Tab>
+      <TabIcon icon="/icons/cog-outline.svg" />
+      <TabTitle>
+        <Translate token="administration_configuration_wizard_configuration" />
+      </TabTitle>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx
index 474a9f4878..01430356b6 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Group, GroupTitle, BASE_CONTAINERS_STYLES, useResource, Combobox, Tags, ITag, Tag, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Combobox, Group, GroupTitle, ITag, Tag, Tags, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { CachedMapAllKey, resourceKeyList, ServerConfigInput } from '@cloudbeaver/core-sdk';
 
@@ -26,15 +24,14 @@ const style = css`
   }
 `;
 
-export const ServerConfigurationDriversForm = observer<Props>(function ServerConfigurationDriversForm({
-  serverConfig,
-}) {
+export const ServerConfigurationDriversForm = observer<Props>(function ServerConfigurationDriversForm({ serverConfig }) {
   const translate = useTranslate();
   const driversResource = useResource(ServerConfigurationDriversForm, DBDriverResource, CachedMapAllKey);
 
   const drivers = driversResource.resource.values.slice().sort(driversResource.resource.compare);
 
-  const tags: ITag[] = driversResource.resource.get(resourceKeyList(serverConfig.disabledDrivers || []))
+  const tags: ITag[] = driversResource.resource
+    .get(resourceKeyList(serverConfig.disabledDrivers || []))
     .filter(Boolean)
     .map(driver => ({
       id: driver!.id,
@@ -78,6 +75,6 @@ export const ServerConfigurationDriversForm = observer<Props>(function ServerCon
           <Tag key={tag.id} id={tag.id} label={tag.label} icon={tag.icon} onRemove={handleRemove} />
         ))}
       </Tags>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
index 3576835c8f..6789f1afb6 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
@@ -5,17 +5,31 @@
  * 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 { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES, ConfigurationWizardService } from '@cloudbeaver/core-administration';
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, GroupItem, GroupTitle, ToolsAction, Loader, Placeholder, SubmittingForm, useFocus, useFormValidator, ToolsPanel, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentComponent, ConfigurationWizardService } from '@cloudbeaver/core-administration';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  GroupItem,
+  GroupTitle,
+  Loader,
+  Placeholder,
+  SubmittingForm,
+  ToolsAction,
+  ToolsPanel,
+  useFocus,
+  useFormValidator,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 
-
 import { ServerConfigurationConfigurationForm } from './Form/ServerConfigurationConfigurationForm';
 import { ServerConfigurationFeaturesForm } from './Form/ServerConfigurationFeaturesForm';
 import { ServerConfigurationInfoForm } from './Form/ServerConfigurationInfoForm';
@@ -42,9 +56,7 @@ const styles = css`
   }
 `;
 
-export const ServerConfigurationPage: AdministrationItemContentComponent = observer(function ServerConfigurationPage({
-  configurationWizard,
-}) {
+export const ServerConfigurationPage: AdministrationItemContentComponent = observer(function ServerConfigurationPage({ configurationWizard }) {
   const translate = useTranslate();
   const style = useStyles(styles, ADMINISTRATION_TOOLS_PANEL_STYLES, BASE_CONTAINERS_STYLES);
   const [focusedRef, state] = useFocus<HTMLFormElement>({ focusFirstChild: true });
@@ -86,7 +98,7 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
   }
 
   return styled(style)(
-    <SubmittingForm ref={focusedRef} name='server_config' onChange={handleChange}>
+    <SubmittingForm ref={focusedRef} name="server_config" onChange={handleChange}>
       {!configurationWizard && (
         <ToolsPanel>
           <ToolsAction
@@ -121,33 +133,27 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
           </Group>
         )}
         <Loader state={service}>
-          {() => styled(style)(
-            <Loader suspense>
-              <Container wrap gap grid medium>
-                <ServerConfigurationInfoForm state={service.state} />
-                <Group form gap>
-                  <GroupTitle>{translate('administration_configuration_wizard_configuration_plugins')}</GroupTitle>
-                  <ServerConfigurationConfigurationForm serverConfig={service.state.serverConfig} />
-                  <ServerConfigurationNavigatorViewForm configs={service.state} />
-                  <ServerConfigurationFeaturesForm state={service.state} configurationWizard={configurationWizard} />
-                  <Placeholder
-                    container={service.pluginsContainer}
-                    configurationWizard={configurationWizard}
-                    state={service.state}
-                  />
-                </Group>
-                <Placeholder
-                  container={service.configurationContainer}
-                  configurationWizard={configurationWizard}
-                  state={service.state}
-                />
-                <ServerConfigurationSecurityForm serverConfig={service.state.serverConfig} />
-                <ServerConfigurationDriversForm serverConfig={service.state.serverConfig} />
-              </Container>
-            </Loader>
-          )}
+          {() =>
+            styled(style)(
+              <Loader suspense>
+                <Container wrap gap grid medium>
+                  <ServerConfigurationInfoForm state={service.state} />
+                  <Group form gap>
+                    <GroupTitle>{translate('administration_configuration_wizard_configuration_plugins')}</GroupTitle>
+                    <ServerConfigurationConfigurationForm serverConfig={service.state.serverConfig} />
+                    <ServerConfigurationNavigatorViewForm configs={service.state} />
+                    <ServerConfigurationFeaturesForm state={service.state} configurationWizard={configurationWizard} />
+                    <Placeholder container={service.pluginsContainer} configurationWizard={configurationWizard} state={service.state} />
+                  </Group>
+                  <Placeholder container={service.configurationContainer} configurationWizard={configurationWizard} state={service.state} />
+                  <ServerConfigurationSecurityForm serverConfig={service.state.serverConfig} />
+                  <ServerConfigurationDriversForm serverConfig={service.state.serverConfig} />
+                </Container>
+              </Loader>,
+            )
+          }
         </Loader>
       </ColoredContainer>
-    </SubmittingForm>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
index 3f6448fe8e..780b73de75 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
@@ -5,15 +5,14 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { ActionSnackbar, ActionSnackbarProps, PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { DEFAULT_NAVIGATOR_VIEW_SETTINGS } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { ENotificationType, INotification, NotificationService } from '@cloudbeaver/core-events';
-import { IExecutor, Executor, IExecutorHandler, ExecutorInterrupter } from '@cloudbeaver/core-executor';
+import { Executor, ExecutorInterrupter, IExecutor, IExecutorHandler } from '@cloudbeaver/core-executor';
 import { ServerConfigResource, SessionDataResource } from '@cloudbeaver/core-root';
 
 import { ADMINISTRATION_SERVER_CONFIGURATION_ITEM } from './ADMINISTRATION_SERVER_CONFIGURATION_ITEM';
@@ -55,7 +54,7 @@ export class ServerConfigurationService {
     private readonly administrationScreenService: AdministrationScreenService,
     private readonly serverConfigResource: ServerConfigResource,
     private readonly notificationService: NotificationService,
-    private readonly sessionDataResource: SessionDataResource
+    private readonly sessionDataResource: SessionDataResource,
   ) {
     this.done = false;
     this.loading = true;
@@ -78,25 +77,20 @@ export class ServerConfigurationService {
 
     this.loadConfigTask
       .next(this.validationTask, () => this.getSaveData(false))
-      .addHandler(() => { this.loading = true; })
+      .addHandler(() => {
+        this.loading = true;
+      })
       .addHandler(this.loadServerConfig)
       .addPostHandler(() => {
         this.loading = false;
         this.showUnsavedNotification(false);
       });
 
-    this.saveTask
-      .before(this.validationTask)
-      .before(this.prepareConfigTask)
-      .addPostHandler(this.save);
+    this.saveTask.before(this.validationTask).before(this.prepareConfigTask).addPostHandler(this.save);
 
-    this.validationTask
-      .addHandler(this.validateForm)
-      .addPostHandler(this.ensureValidation);
+    this.validationTask.addHandler(this.validateForm).addPostHandler(this.ensureValidation);
 
-    this.serverConfigResource
-      .onDataUpdate
-      .addPostHandler(this.showUnsavedNotification.bind(this, false));
+    this.serverConfigResource.onDataUpdate.addPostHandler(this.showUnsavedNotification.bind(this, false));
 
     this.administrationScreenService.activationEvent.addHandler(this.unlinkState.bind(this));
   }
@@ -121,13 +115,10 @@ export class ServerConfigurationService {
   async loadConfig(reset = false): Promise<void> {
     try {
       if (!this.stateLinked) {
-        this.state = this.administrationScreenService.getItemState(
-          'server-configuration',
-          () => {
-            reset = true;
-            return serverConfigStateContext();
-          }
-        );
+        this.state = this.administrationScreenService.getItemState('server-configuration', () => {
+          reset = true;
+          return serverConfigStateContext();
+        });
 
         this.stateLinked = true;
         await this.serverConfigResource.load();
@@ -138,7 +129,6 @@ export class ServerConfigurationService {
         if (reset) {
           this.serverConfigResource.resetUpdate();
         }
-
       }
 
       await this.loadConfigTask.execute({
@@ -146,7 +136,7 @@ export class ServerConfigurationService {
         reset,
       });
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load server configuration');
+      this.notificationService.logException(exception, "Can't load server configuration");
     }
   }
 
@@ -191,7 +181,7 @@ export class ServerConfigurationService {
       Object.assign(data.state.navigatorConfig, config.defaultNavigatorSettings);
     } catch (exception: any) {
       ExecutorInterrupter.interrupt(contexts);
-      this.notificationService.logException(exception, 'Can\'t load server configuration');
+      this.notificationService.logException(exception, "Can't load server configuration");
     }
   };
 
@@ -218,7 +208,7 @@ export class ServerConfigurationService {
         await this.sessionDataResource.refresh();
       }
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t save server configuration');
+      this.notificationService.logException(exception, "Can't save server configuration");
 
       throw exception;
     }
@@ -255,35 +245,38 @@ export class ServerConfigurationService {
 
   private showUnsavedNotification(close: boolean) {
     if (
-      (
-        !this.serverConfigResource.isChanged()
-        && !this.serverConfigResource.isNavigatorSettingsChanged()
-      )
-      || this.administrationScreenService.activeScreen?.item === ADMINISTRATION_SERVER_CONFIGURATION_ITEM
+      (!this.serverConfigResource.isChanged() && !this.serverConfigResource.isNavigatorSettingsChanged()) ||
+      this.administrationScreenService.activeScreen?.item === ADMINISTRATION_SERVER_CONFIGURATION_ITEM
     ) {
       this.unSaveNotification?.close(true);
       return;
     }
 
     if (
-      close
-      || !this.stateLinked
-      || this.unSaveNotification
-      || this.administrationScreenService.isConfigurationMode
+      close ||
+      !this.stateLinked ||
+      this.unSaveNotification ||
+      this.administrationScreenService.isConfigurationMode
       // || !this.administrationScreenService.isAdministrationPageActive
     ) {
       return;
     }
 
-    this.unSaveNotification = this.notificationService.customNotification(() => ActionSnackbar, {
-      actionText: 'administration_configuration_wizard_configuration_server_info_unsaved_navigate',
-      onAction: () => this.administrationScreenService.navigateToItem(ADMINISTRATION_SERVER_CONFIGURATION_ITEM),
-    }, {
-      title: 'administration_configuration_wizard_configuration_server_info_unsaved_title',
-      message: 'administration_configuration_wizard_configuration_server_info_unsaved_message',
-      type: ENotificationType.Info,
-      onClose: () => { this.unSaveNotification = null; },
-    });
+    this.unSaveNotification = this.notificationService.customNotification(
+      () => ActionSnackbar,
+      {
+        actionText: 'administration_configuration_wizard_configuration_server_info_unsaved_navigate',
+        onAction: () => this.administrationScreenService.navigateToItem(ADMINISTRATION_SERVER_CONFIGURATION_ITEM),
+      },
+      {
+        title: 'administration_configuration_wizard_configuration_server_info_unsaved_title',
+        message: 'administration_configuration_wizard_configuration_server_info_unsaved_message',
+        type: ENotificationType.Info,
+        onClose: () => {
+          this.unSaveNotification = null;
+        },
+      },
+    );
   }
 
   private unlinkState(state: boolean): void {
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfigurationAdministrationNavService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfigurationAdministrationNavService.ts
index 9cdfb18822..9418910986 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfigurationAdministrationNavService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfigurationAdministrationNavService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 
@@ -13,9 +12,7 @@ import { ADMINISTRATION_SERVER_CONFIGURATION_ITEM } from './ServerConfiguration/
 
 @injectable()
 export class ServerConfigurationAdministrationNavService {
-  constructor(
-    private readonly administrationScreenService: AdministrationScreenService
-  ) { }
+  constructor(private readonly administrationScreenService: AdministrationScreenService) {}
 
   navToSettings(): void {
     this.administrationScreenService.navigateToItem(ADMINISTRATION_SERVER_CONFIGURATION_ITEM);
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx
index ecec12b4ee..c70af18536 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx
@@ -5,20 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
-export const WelcomeDrawerItem: React.FC<AdministrationItemDrawerProps> = function WelcomeDrawerItem({
-  item, onSelect, style, disabled,
-}) {
+export const WelcomeDrawerItem: React.FC<AdministrationItemDrawerProps> = function WelcomeDrawerItem({ item, onSelect, style, disabled }) {
   return styled(useStyles(style))(
     <Tab tabId={item.name} disabled={disabled} onOpen={() => onSelect(item.name)}>
-      <TabIcon icon='/icons/welcome_bold.svg' viewBox='0 0 16 16' />
-      <TabTitle><Translate token='administration_configuration_wizard_welcome' /></TabTitle>
-    </Tab>
+      <TabIcon icon="/icons/welcome_bold.svg" viewBox="0 0 16 16" />
+      <TabTitle>
+        <Translate token="administration_configuration_wizard_welcome" />
+      </TabTitle>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx
index 2704e01dad..a7a9f06686 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, GroupItem, Translate } from '@cloudbeaver/core-blocks';
@@ -22,15 +21,24 @@ const styles = css`
 `;
 
 export const WelcomePage: React.FC = function WelcomePage() {
-  return styled(styles, BASE_CONTAINERS_STYLES)(
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
     <ColoredContainer wrap gap overflow parent>
       <Group form>
-        <h3><Translate token='administration_configuration_wizard_welcome_title' /></h3>
+        <h3>
+          <Translate token="administration_configuration_wizard_welcome_title" />
+        </h3>
         <GroupItem>
-          <p><Translate token='administration_configuration_wizard_welcome_message' /></p>
-          <note as='div'><Translate token='administration_configuration_wizard_welcome_note' /></note>
+          <p>
+            <Translate token="administration_configuration_wizard_welcome_message" />
+          </p>
+          <note as="div">
+            <Translate token="administration_configuration_wizard_welcome_note" />
+          </note>
         </GroupItem>
       </Group>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 };
diff --git a/webapp/packages/plugin-administration/src/LocaleService.ts b/webapp/packages/plugin-administration/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-administration/src/LocaleService.ts
+++ b/webapp/packages/plugin-administration/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-administration/src/PluginBootstrap.ts
index f3f69ed946..9950f042eb 100644
--- a/webapp/packages/plugin-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-administration/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { EAdminPermission } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -25,7 +24,7 @@ export class PluginBootstrap extends Bootstrap {
     private readonly screenService: ScreenService,
     private readonly administrationScreenService: AdministrationScreenService,
     private readonly administrationTopAppBarService: AdministrationTopAppBarService,
-    private readonly menuService: MenuService
+    private readonly menuService: MenuService,
   ) {
     super();
   }
@@ -48,7 +47,7 @@ export class PluginBootstrap extends Bootstrap {
                 label: 'administration_menu_enter',
                 tooltip: 'administration_menu_enter',
               },
-              { onSelect: () => this.administrationScreenService.navigateToRoot() }
+              { onSelect: () => this.administrationScreenService.navigateToRoot() },
             ),
           ];
         }
@@ -62,7 +61,7 @@ export class PluginBootstrap extends Bootstrap {
                 label: 'administration_menu_back',
                 tooltip: 'administration_menu_back',
               },
-              { onSelect: () => this.screenService.navigateToRoot() }
+              { onSelect: () => this.screenService.navigateToRoot() },
             ),
           ];
         }
@@ -82,5 +81,5 @@ export class PluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-administration/src/locales/en.ts b/webapp/packages/plugin-administration/src/locales/en.ts
index 7405cc5def..69ea0ebf5d 100644
--- a/webapp/packages/plugin-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-administration/src/locales/en.ts
@@ -5,13 +5,22 @@ export default [
   ['administration_configuration_wizard_welcome', 'Welcome'],
   ['administration_configuration_wizard_welcome_step_description', 'Welcome to CloudBeaver'],
   ['administration_configuration_wizard_welcome_title', 'Welcome to CloudBeaver, cloud database management system!'],
-  ['administration_configuration_wizard_welcome_message', 'The easy configuration wizard will guide you through several simple steps to set up the CloudBeaver server. You will need to set server information and administrator credentials. You can set up additional server parameters once the easy configuration is completed.'],
-  ['administration_configuration_wizard_welcome_note', 'Note: you will be able to change these configuration parameters later on the administration panel.'],
+  [
+    'administration_configuration_wizard_welcome_message',
+    'The easy configuration wizard will guide you through several simple steps to set up the CloudBeaver server. You will need to set server information and administrator credentials. You can set up additional server parameters once the easy configuration is completed.',
+  ],
+  [
+    'administration_configuration_wizard_welcome_note',
+    'Note: you will be able to change these configuration parameters later on the administration panel.',
+  ],
 
   ['administration_configuration_wizard_configuration', 'Server configuration'],
   ['administration_configuration_wizard_configuration_step_description', 'Main server configuration'],
   ['administration_configuration_wizard_configuration_title', 'You can configure the main server parameters here.'],
-  ['administration_configuration_wizard_configuration_message', 'You will be able to add additional services after the server configuration.\n\rAdministrator is a super user who can configure server, set databases connections, manage other users and much more. Please, remember the entered password. It is not possible to recover administrator password automatically.'],
+  [
+    'administration_configuration_wizard_configuration_message',
+    'You will be able to add additional services after the server configuration.\n\rAdministrator is a super user who can configure server, set databases connections, manage other users and much more. Please, remember the entered password. It is not possible to recover administrator password automatically.',
+  ],
 
   ['administration_configuration_tools_save_tooltip', 'Save configuration'],
   ['administration_configuration_tools_cancel_tooltip', 'Reset changes'],
@@ -24,17 +33,29 @@ export default [
   ['administration_configuration_wizard_configuration_server_info_unsaved_message', 'Settings can be saved on Server configuration page'],
   ['administration_configuration_wizard_configuration_server_info_unsaved_navigate', 'Open'],
   ['administration_configuration_wizard_configuration_server_session_lifetime', 'Session lifetime, min'],
-  ['administration_configuration_wizard_configuration_server_session_lifetime_description', 'Here you may specify the number of minutes that you wish the session to be allowed to remain idle before it expires'],
+  [
+    'administration_configuration_wizard_configuration_server_session_lifetime_description',
+    'Here you may specify the number of minutes that you wish the session to be allowed to remain idle before it expires',
+  ],
 
   ['administration_configuration_wizard_configuration_plugins', 'Configuration'],
   ['administration_configuration_wizard_configuration_custom_connections', 'Enable private connections'],
-  ['administration_configuration_wizard_configuration_custom_connections_description', 'Allows users to create private connections. Otherwise, all new connections can be created from the administration part only'],
+  [
+    'administration_configuration_wizard_configuration_custom_connections_description',
+    'Allows users to create private connections. Otherwise, all new connections can be created from the administration part only',
+  ],
   ['administration_configuration_wizard_configuration_navigation_tree_view', 'Navigator simple view'],
-  ['administration_configuration_wizard_configuration_navigation_tree_view_description', "By default, all user's new connections will contain only basic information in navigation tree"],
+  [
+    'administration_configuration_wizard_configuration_navigation_tree_view_description',
+    "By default, all user's new connections will contain only basic information in navigation tree",
+  ],
 
   ['administration_configuration_wizard_configuration_security', 'Security'],
   ['administration_configuration_wizard_configuration_security_admin_credentials', 'Save credentials'],
-  ['administration_configuration_wizard_configuration_security_admin_credentials_description', 'Allow to save credentials for pre-configured database'],
+  [
+    'administration_configuration_wizard_configuration_security_admin_credentials_description',
+    'Allow to save credentials for pre-configured database',
+  ],
   ['administration_configuration_wizard_configuration_security_public_credentials', 'Save users credentials'],
   ['administration_configuration_wizard_configuration_security_public_credentials_description', 'Allow to save credentials for non-admin users'],
 
@@ -50,7 +71,10 @@ export default [
   ['administration_configuration_wizard_finish', 'Confirmation'],
   ['administration_configuration_wizard_finish_step_description', 'Confirmation'],
   ['administration_configuration_wizard_finish_title', 'That is almost it.'],
-  ['administration_configuration_wizard_finish_message', 'Press the Finish button to complete the server configuration. You can return to the previous pages if you want to change or add something.\nWhen the configuration is completed all entered settings will be applied for your CloudBeaver server. You will be redirected to the main page to start working.\nYou can always login to the system as administrator to change the server settings.'],
+  [
+    'administration_configuration_wizard_finish_message',
+    'Press the Finish button to complete the server configuration. You can return to the previous pages if you want to change or add something.\nWhen the configuration is completed all entered settings will be applied for your CloudBeaver server. You will be redirected to the main page to start working.\nYou can always login to the system as administrator to change the server settings.',
+  ],
 
   ['administration_disabled_drivers_title', 'Disabled drivers'],
   ['administration_disabled_drivers_search_placeholder', 'Search for the driver...'],
diff --git a/webapp/packages/plugin-administration/src/locales/it.ts b/webapp/packages/plugin-administration/src/locales/it.ts
index 82d4f2899a..cd4788292d 100644
--- a/webapp/packages/plugin-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-administration/src/locales/it.ts
@@ -5,13 +5,22 @@ export default [
   ['administration_configuration_wizard_welcome', 'Benvenuto'],
   ['administration_configuration_wizard_welcome_step_description', 'Benvenuto a CloudBeaver'],
   ['administration_configuration_wizard_welcome_title', 'Benvenuto a CloudBeaver, il sistema di gestione database in cloud!'],
-  ['administration_configuration_wizard_welcome_message', 'Il semplice wizard di configurazione ti guiderà per diversi semplici passi per configurare il tuo server CloudBeaver. Dovrai impostare informazioni sul server e le credenziali amministrative. Potrai inoltre aggiungere la tua prima connessione al database.'],
-  ['administration_configuration_wizard_welcome_note', 'Nota: potrai in seguito modificare questi parametri di configurazione sul pannello di amministrazione.'],
+  [
+    'administration_configuration_wizard_welcome_message',
+    'Il semplice wizard di configurazione ti guiderà per diversi semplici passi per configurare il tuo server CloudBeaver. Dovrai impostare informazioni sul server e le credenziali amministrative. Potrai inoltre aggiungere la tua prima connessione al database.',
+  ],
+  [
+    'administration_configuration_wizard_welcome_note',
+    'Nota: potrai in seguito modificare questi parametri di configurazione sul pannello di amministrazione.',
+  ],
 
   ['administration_configuration_wizard_configuration', 'Configurazione del Server'],
   ['administration_configuration_wizard_configuration_step_description', 'Configurazione del server principale'],
   ['administration_configuration_wizard_configuration_title', 'Puoi configurare i parametri del server principale qui.'],
-  ['administration_configuration_wizard_configuration_message', 'L\'amministratore è un super utente che può configurare server, impostare connessioni ai database, gestire altri utenti e molto di più. Si prega di ricordare la password inserita: non sarà possibile recuperarla in maniera automatica.'],
+  [
+    'administration_configuration_wizard_configuration_message',
+    "L'amministratore è un super utente che può configurare server, impostare connessioni ai database, gestire altri utenti e molto di più. Si prega di ricordare la password inserita: non sarà possibile recuperarla in maniera automatica.",
+  ],
 
   ['administration_configuration_tools_save_tooltip', 'Salva la configurazione'],
   ['administration_configuration_tools_cancel_tooltip', 'Annulla le modifiche'],
@@ -21,21 +30,39 @@ export default [
   ['administration_configuration_wizard_configuration_server_url', 'Server URL'],
   ['administration_configuration_wizard_configuration_server_url_description', 'Server URL di accesso globale'],
   ['administration_configuration_wizard_configuration_server_info_unsaved_title', 'Impostazioni non salvate'],
-  ['administration_configuration_wizard_configuration_server_info_unsaved_message', 'Le impostazioni possono essere salvate sull pagina di Configurazione Server'],
+  [
+    'administration_configuration_wizard_configuration_server_info_unsaved_message',
+    'Le impostazioni possono essere salvate sull pagina di Configurazione Server',
+  ],
   ['administration_configuration_wizard_configuration_server_info_unsaved_navigate', 'Apri'],
-  ['administration_configuration_wizard_configuration_server_session_lifetime_description', 'Qua puoi specificare il numero di minuti che vorresti permettere alla sessione di rimanere in attesa prima che scadi'],
+  [
+    'administration_configuration_wizard_configuration_server_session_lifetime_description',
+    'Qua puoi specificare il numero di minuti che vorresti permettere alla sessione di rimanere in attesa prima che scadi',
+  ],
 
   ['administration_configuration_wizard_configuration_plugins', 'Configurazione'],
   ['administration_configuration_wizard_configuration_custom_connections', 'Abilita connessioni custom'],
-  ['administration_configuration_wizard_configuration_custom_connections_description', 'Permette agli utenti di creare connessioni custom. Altrimenti tutte le nuvoe connessioni saranno create solo dall\'amministratore'],
+  [
+    'administration_configuration_wizard_configuration_custom_connections_description',
+    "Permette agli utenti di creare connessioni custom. Altrimenti tutte le nuvoe connessioni saranno create solo dall'amministratore",
+  ],
   ['administration_configuration_wizard_configuration_navigation_tree_view', 'Vista semplice del navigatore'],
-  ['administration_configuration_wizard_configuration_navigation_tree_view_description', "Di default, tutte le nuove connessioni creati dagli utenti conterranno solo informazioni di base nell\'albero di navigazione"],
+  [
+    'administration_configuration_wizard_configuration_navigation_tree_view_description',
+    "Di default, tutte le nuove connessioni creati dagli utenti conterranno solo informazioni di base nell'albero di navigazione",
+  ],
 
   ['administration_configuration_wizard_configuration_security', 'Sicurezza'],
   ['administration_configuration_wizard_configuration_security_admin_credentials', 'Salva le credenziali'],
-  ['administration_configuration_wizard_configuration_security_admin_credentials_description', 'Permetti di salvare le credenziali per database preconfigurati'],
+  [
+    'administration_configuration_wizard_configuration_security_admin_credentials_description',
+    'Permetti di salvare le credenziali per database preconfigurati',
+  ],
   ['administration_configuration_wizard_configuration_security_public_credentials', 'Salve le credenziali utente'],
-  ['administration_configuration_wizard_configuration_security_public_credentials_description', 'Permetti di salvare le credenziali per gli utenti non amministratori'],
+  [
+    'administration_configuration_wizard_configuration_security_public_credentials_description',
+    'Permetti di salvare le credenziali per gli utenti non amministratori',
+  ],
 
   ['administration_configuration_wizard_configuration_navigator', 'Navigatore'],
   ['administration_configuration_wizard_configuration_navigator_hide_folders', 'Nascondi le Cartelle'],
@@ -49,7 +76,10 @@ export default [
   ['administration_configuration_wizard_finish', 'Conferma'],
   ['administration_configuration_wizard_finish_step_description', 'Conferma'],
   ['administration_configuration_wizard_finish_title', 'Ci siamo quasi.'],
-  ['administration_configuration_wizard_finish_message', 'Premi il pulsante Conferma per completare la configurazione del server. Puoi tornare alle pagine precedenti se vuoi modificare o aggiungere qualcosa.\nQuando la configurazione è completa le impostazioni saranno applicate al tuo server CloudBeaver. Sarai portarto alla pagina principale.\nTi ricordiamo che puoi sempre fare login come amministratore e modificare i settaggi del server.'],
+  [
+    'administration_configuration_wizard_finish_message',
+    'Premi il pulsante Conferma per completare la configurazione del server. Puoi tornare alle pagine precedenti se vuoi modificare o aggiungere qualcosa.\nQuando la configurazione è completa le impostazioni saranno applicate al tuo server CloudBeaver. Sarai portarto alla pagina principale.\nTi ricordiamo che puoi sempre fare login come amministratore e modificare i settaggi del server.',
+  ],
 
   ['administration_disabled_drivers_title', 'Disabled drivers'],
   ['administration_disabled_drivers_search_placeholder', 'Search for the driver...'],
diff --git a/webapp/packages/plugin-administration/src/locales/ru.ts b/webapp/packages/plugin-administration/src/locales/ru.ts
index 542862b50f..a16fabced8 100644
--- a/webapp/packages/plugin-administration/src/locales/ru.ts
+++ b/webapp/packages/plugin-administration/src/locales/ru.ts
@@ -9,22 +9,37 @@ export default [
   ['administration_configuration_wizard_configuration_server_url', 'URL Сервера'],
   ['administration_configuration_wizard_configuration_server_info_unsaved', 'Есть несохранённые изменения'],
   ['administration_configuration_wizard_configuration_server_session_lifetime', 'Время сессии, мин'],
-  ['administration_configuration_wizard_configuration_server_session_lifetime_description', 'В случае бездействия пользователя на протяжении указанного количества минут, его сессия будет закрыта.'],
+  [
+    'administration_configuration_wizard_configuration_server_session_lifetime_description',
+    'В случае бездействия пользователя на протяжении указанного количества минут, его сессия будет закрыта.',
+  ],
 
   ['administration_configuration_tools_save_tooltip', 'Сохранить конфигурацию'],
   ['administration_configuration_tools_cancel_tooltip', 'Отменить изменения'],
 
   ['administration_configuration_wizard_configuration_plugins', 'Настройки'],
   ['administration_configuration_wizard_configuration_custom_connections', 'Разрешить пользовательские подключения'],
-  ['administration_configuration_wizard_configuration_custom_connections_description', 'Позволяет пользователям создавать собственные подключения. Иначе, любые подключения могут быть добавлены только со страницы администрирования'],
+  [
+    'administration_configuration_wizard_configuration_custom_connections_description',
+    'Позволяет пользователям создавать собственные подключения. Иначе, любые подключения могут быть добавлены только со страницы администрирования',
+  ],
   ['administration_configuration_wizard_configuration_navigation_tree_view', 'Упрощенная версия дерева навигации'],
-  ['administration_configuration_wizard_configuration_navigation_tree_view_description', 'Все новые подключения, созданные пользователем, будут иметь только базовую информацию в дереве навигации'],
+  [
+    'administration_configuration_wizard_configuration_navigation_tree_view_description',
+    'Все новые подключения, созданные пользователем, будут иметь только базовую информацию в дереве навигации',
+  ],
 
   ['administration_configuration_wizard_configuration_security', 'Безопасность'],
   ['administration_configuration_wizard_configuration_security_admin_credentials', 'Позволить сохранять приватные данные'],
   ['administration_configuration_wizard_configuration_security_public_credentials', 'Позволить сохранять приватные данные для пользователей'],
-  ['administration_configuration_wizard_configuration_security_admin_credentials_description', 'Позволяет сохранять приватные данные, такие как пароли и SSH ключи'],
-  ['administration_configuration_wizard_configuration_security_public_credentials_description', 'Пользователи будут иметь возможность сохранять приватные данные, такие как пароли и SSH ключи'],
+  [
+    'administration_configuration_wizard_configuration_security_admin_credentials_description',
+    'Позволяет сохранять приватные данные, такие как пароли и SSH ключи',
+  ],
+  [
+    'administration_configuration_wizard_configuration_security_public_credentials_description',
+    'Пользователи будут иметь возможность сохранять приватные данные, такие как пароли и SSH ключи',
+  ],
 
   ['administration_disabled_drivers_title', 'Отключенные драйверы'],
   ['administration_disabled_drivers_search_placeholder', 'Поиск по драйверу...'],
diff --git a/webapp/packages/plugin-administration/src/locales/zh.ts b/webapp/packages/plugin-administration/src/locales/zh.ts
index a0c311229a..ab06203e3c 100644
--- a/webapp/packages/plugin-administration/src/locales/zh.ts
+++ b/webapp/packages/plugin-administration/src/locales/zh.ts
@@ -5,13 +5,19 @@ export default [
   ['administration_configuration_wizard_welcome', '欢迎'],
   ['administration_configuration_wizard_welcome_step_description', '欢迎来到CloudBeaver'],
   ['administration_configuration_wizard_welcome_title', '欢迎来到CloudBeaver，云数据库管理系统！'],
-  ['administration_configuration_wizard_welcome_message', '简单配置向导将引导您通过几个简单的步骤来设置CloudBeaver服务器。您将需要设置服务器信息和管理员凭据。您还可以在此处添加第一个数据库连接。'],
+  [
+    'administration_configuration_wizard_welcome_message',
+    '简单配置向导将引导您通过几个简单的步骤来设置CloudBeaver服务器。您将需要设置服务器信息和管理员凭据。您还可以在此处添加第一个数据库连接。',
+  ],
   ['administration_configuration_wizard_welcome_note', '注意：稍后您能够在管理面板更改这些配置参数。'],
 
   ['administration_configuration_wizard_configuration', '服务器配置'],
   ['administration_configuration_wizard_configuration_step_description', '主要的服务器配置'],
   ['administration_configuration_wizard_configuration_title', '您可以在这里配置主要的服务器参数'],
-  ['administration_configuration_wizard_configuration_message', '管理员是一个超级用户，可以配置服务器、设置数据库连接、管理其他用户等等。请记住输入的密码。无法自动恢复管理员密码。'],
+  [
+    'administration_configuration_wizard_configuration_message',
+    '管理员是一个超级用户，可以配置服务器、设置数据库连接、管理其他用户等等。请记住输入的密码。无法自动恢复管理员密码。',
+  ],
 
   ['administration_configuration_tools_save_tooltip', '保存配置'],
   ['administration_configuration_tools_cancel_tooltip', '重置更改'],
@@ -49,7 +55,10 @@ export default [
   ['administration_configuration_wizard_finish', '确认'],
   ['administration_configuration_wizard_finish_step_description', '确认'],
   ['administration_configuration_wizard_finish_title', '差不多就这样。'],
-  ['administration_configuration_wizard_finish_message', '按完成按钮完成服务器配置。如果您想更改或添加某些内容，可以返回到前面的页面。\n配置完成后，所有输入的设置都将应用于您的CloudBeaver服务器。您将被重定向到主页面开始工作。\n您可以随时以管理员身份登录系统以更改服务器设置。'],
+  [
+    'administration_configuration_wizard_finish_message',
+    '按完成按钮完成服务器配置。如果您想更改或添加某些内容，可以返回到前面的页面。\n配置完成后，所有输入的设置都将应用于您的CloudBeaver服务器。您将被重定向到主页面开始工作。\n您可以随时以管理员身份登录系统以更改服务器设置。',
+  ],
 
   ['administration_disabled_drivers_title', 'Disabled drivers'],
   ['administration_disabled_drivers_search_placeholder', 'Search for the driver...'],
diff --git a/webapp/packages/plugin-administration/src/manifest.ts b/webapp/packages/plugin-administration/src/manifest.ts
index 3a18b5bb65..df76a04e31 100644
--- a/webapp/packages/plugin-administration/src/manifest.ts
+++ b/webapp/packages/plugin-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AdministrationScreenServiceBootstrap } from './AdministrationScreen/AdministrationScreenServiceBootstrap';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
index edba23ccc2..b013812b73 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
@@ -5,15 +5,23 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles, Loader } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  IconOrImage,
+  Loader,
+  Placeholder,
+  useExecutor,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk';
-import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import { AuthConfigurationFormService } from './AuthConfigurationFormService';
 import { authConfigurationContext } from './Contexts/authConfigurationContext';
@@ -26,72 +34,72 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const topBarStyles = css`
-    configuration-top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      padding-top: 16px;
+  configuration-top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    padding-top: 16px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    configuration-top-bar-tabs {
-      flex: 1;
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
+  configuration-top-bar-tabs {
+    flex: 1;
+  }
 
-    configuration-top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
+  configuration-top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
 
-    configuration-status-message {
-      composes: theme-typography--caption from global;
+  configuration-status-message {
+    composes: theme-typography--caption from global;
+    height: 24px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    & IconOrImage {
       height: 24px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      gap: 8px;
-
-      & IconOrImage {
-        height: 24px;
-        width: 24px;
-      }
+      width: 24px;
     }
-  `;
+  }
+`;
 
 const formStyles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-border-color-background from global;
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-border-color-background from global;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   state: IAuthConfigurationFormState;
@@ -100,12 +108,7 @@ interface Props {
   className?: string;
 }
 
-export const AuthConfigurationForm = observer<Props>(function AuthConfigurationForm({
-  state,
-  onCancel,
-  onSave = () => { },
-  className,
-}) {
+export const AuthConfigurationForm = observer<Props>(function AuthConfigurationForm({ state, onCancel, onSave = () => {}, className }) {
   const translate = useTranslate();
   const props = useObjectRef({ onSave });
   const style = useStyles(BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES);
@@ -114,15 +117,17 @@ export const AuthConfigurationForm = observer<Props>(function AuthConfigurationF
 
   useExecutor({
     executor: state.submittingTask,
-    postHandlers: [function save(data, contexts) {
-      const validation = contexts.getContext(service.configurationValidationContext);
-      const state = contexts.getContext(service.configurationStatusContext);
-      const config = contexts.getContext(authConfigurationContext);
+    postHandlers: [
+      function save(data, contexts) {
+        const validation = contexts.getContext(service.configurationValidationContext);
+        const state = contexts.getContext(service.configurationStatusContext);
+        const config = contexts.getContext(authConfigurationContext);
 
-      if (validation.valid && state.saved) {
-        props.onSave(config);
-      }
-    }],
+        if (validation.valid && state.saved) {
+          props.onSave(config);
+        }
+      },
+    ],
   });
 
   useEffect(() => {
@@ -130,18 +135,14 @@ export const AuthConfigurationForm = observer<Props>(function AuthConfigurationF
   }, []);
 
   return styled(styles)(
-    <TabsState
-      container={service.tabsContainer}
-      state={state}
-      onCancel={onCancel}
-    >
+    <TabsState container={service.tabsContainer} state={state} onCancel={onCancel}>
       <box className={className}>
         <configuration-top-bar>
           <configuration-top-bar-tabs>
             <configuration-status-message>
               {state.statusMessage && (
                 <>
-                  <IconOrImage icon='/icons/info_icon.svg' />
+                  <IconOrImage icon="/icons/info_icon.svg" />
                   {translate(state.statusMessage)}
                 </>
               )}
@@ -158,6 +159,6 @@ export const AuthConfigurationForm = observer<Props>(function AuthConfigurationF
           <TabPanelList style={style} />
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx
index 7caffabb38..8bf605644b 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx
@@ -5,40 +5,27 @@
  * 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 { Button, PlaceholderComponent, useTranslate } from '@cloudbeaver/core-blocks';
 
 import type { IAuthConfigurationFormProps } from './IAuthConfigurationFormProps';
 
-export const AuthConfigurationFormBaseActions: PlaceholderComponent<IAuthConfigurationFormProps> = observer(function AuthConfigurationFormBaseActions({
-  state,
-  onCancel,
-}) {
-  const translate = useTranslate();
+export const AuthConfigurationFormBaseActions: PlaceholderComponent<IAuthConfigurationFormProps> = observer(
+  function AuthConfigurationFormBaseActions({ state, onCancel }) {
+    const translate = useTranslate();
 
-  return (
-    <>
-      {onCancel && (
-        <Button
-          type="button"
-          disabled={state.disabled}
-          mod={['outlined']}
-          onClick={onCancel}
-        >
-          {translate('ui_processing_cancel')}
+    return (
+      <>
+        {onCancel && (
+          <Button type="button" disabled={state.disabled} mod={['outlined']} onClick={onCancel}>
+            {translate('ui_processing_cancel')}
+          </Button>
+        )}
+        <Button type="button" disabled={state.disabled || state.readonly} mod={['unelevated']} loader onClick={state.save}>
+          {translate(state.mode === 'edit' ? 'ui_processing_save' : 'ui_processing_create')}
         </Button>
-      )}
-      <Button
-        type="button"
-        disabled={state.disabled || state.readonly}
-        mod={['unelevated']}
-        loader
-        onClick={state.save}
-      >
-        {translate(state.mode === 'edit' ? 'ui_processing_save' : 'ui_processing_create')}
-      </Button>
-    </>
-  );
-});
+      </>
+    );
+  },
+);
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormService.ts
index c6c1cb2415..0b66537432 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
@@ -14,7 +13,12 @@ import { ENotificationType, NotificationService } from '@cloudbeaver/core-events
 import { ExecutorHandlersCollection, ExecutorInterrupter, IExecutorHandler, IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
 import { TabsContainer } from '@cloudbeaver/core-ui';
 
-import type { IAuthConfigurationFormFillConfigData, IAuthConfigurationFormProps, IAuthConfigurationFormSubmitData, IAuthConfigurationFormState } from './IAuthConfigurationFormProps';
+import type {
+  IAuthConfigurationFormFillConfigData,
+  IAuthConfigurationFormProps,
+  IAuthConfigurationFormState,
+  IAuthConfigurationFormSubmitData,
+} from './IAuthConfigurationFormProps';
 
 const AuthConfigurationFormBaseActions = React.lazy(async () => {
   const { AuthConfigurationFormBaseActions } = await import('./AuthConfigurationFormBaseActions');
@@ -48,9 +52,7 @@ export class AuthConfigurationFormService {
   readonly formSubmittingTask: IExecutorHandlersCollection<IAuthConfigurationFormSubmitData>;
   readonly formStateTask: IExecutorHandlersCollection<IAuthConfigurationFormState>;
 
-  constructor(
-    private readonly notificationService: NotificationService,
-  ) {
+  constructor(private readonly notificationService: NotificationService) {
     this.tabsContainer = new TabsContainer('Identity Provider settings');
     this.actionsContainer = new PlaceholderContainer();
     this.configureTask = new ExecutorHandlersCollection();
@@ -60,12 +62,9 @@ export class AuthConfigurationFormService {
     this.formValidationTask = new ExecutorHandlersCollection();
     this.formStateTask = new ExecutorHandlersCollection();
 
-    this.formSubmittingTask
-      .before(this.formValidationTask)
-      .before(this.prepareConfigTask);
+    this.formSubmittingTask.before(this.formValidationTask).before(this.prepareConfigTask);
 
-    this.formStateTask
-      .before<IAuthConfigurationFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
+    this.formStateTask.before<IAuthConfigurationFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
 
     this.formSubmittingTask.addPostHandler(this.showSubmittingStatusMessage);
     this.formValidationTask.addPostHandler(this.ensureValidation);
@@ -99,10 +98,7 @@ export class AuthConfigurationFormService {
     },
   });
 
-  private readonly showSubmittingStatusMessage: IExecutorHandler<IAuthConfigurationFormSubmitData> = (
-    data,
-    contexts
-  ) => {
+  private readonly showSubmittingStatusMessage: IExecutorHandler<IAuthConfigurationFormSubmitData> = (data, contexts) => {
     const status = contexts.getContext(this.configurationStatusContext);
 
     if (!status.saved) {
@@ -111,16 +107,15 @@ export class AuthConfigurationFormService {
 
     if (status.messages.length > 0) {
       if (status.exception) {
-        this.notificationService.logException(
-          status.exception,
-          status.messages[0],
-          status.messages.slice(1).join('\n')
-        );
+        this.notificationService.logException(status.exception, status.messages[0], status.messages.slice(1).join('\n'));
       } else {
-        this.notificationService.notify({
-          title: status.messages[0],
-          message: status.messages.slice(1).join('\n'),
-        }, status.saved ? ENotificationType.Success : ENotificationType.Error);
+        this.notificationService.notify(
+          {
+            title: status.messages[0],
+            message: status.messages.slice(1).join('\n'),
+          },
+          status.saved ? ENotificationType.Success : ENotificationType.Error,
+        );
       }
     }
   };
@@ -133,12 +128,16 @@ export class AuthConfigurationFormService {
     }
 
     if (validation.messages.length > 0) {
-      this.notificationService.notify({
-        title: data.state.mode === 'edit'
-          ? 'administration_identity_providers_provider_save_error'
-          : 'administration_identity_providers_provider_create_error',
-        message: validation.messages.join('\n'),
-      }, validation.valid ? ENotificationType.Info : ENotificationType.Error);
+      this.notificationService.notify(
+        {
+          title:
+            data.state.mode === 'edit'
+              ? 'administration_identity_providers_provider_save_error'
+              : 'administration_identity_providers_provider_create_error',
+          message: validation.messages.join('\n'),
+        },
+        validation.valid ? ENotificationType.Info : ENotificationType.Error,
+      );
     }
   };
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormState.ts
index 5c4bab5087..80735b6349 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import { Executor, IExecutionContextProvider, IExecutor } from '@cloudbeaver/core-executor';
@@ -42,11 +41,7 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
     return false;
   }
 
-  readonly resource: CachedMapResource<
-  string,
-  AdminAuthProviderConfiguration,
-  GetAuthProviderConfigurationsQueryVariables
-  >;
+  readonly resource: CachedMapResource<string, AdminAuthProviderConfiguration, GetAuthProviderConfigurationsQueryVariables>;
 
   readonly service: AuthConfigurationFormService;
   readonly submittingTask: IExecutor<IAuthConfigurationFormSubmitData>;
@@ -57,7 +52,7 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
 
   constructor(
     service: AuthConfigurationFormService,
-    resource: CachedMapResource<string, AdminAuthProviderConfiguration, GetAuthProviderConfigurationsQueryVariables>
+    resource: CachedMapResource<string, AdminAuthProviderConfiguration, GetAuthProviderConfigurationsQueryVariables>,
   ) {
     this.resource = resource;
     this.config = {
@@ -91,9 +86,7 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
     this.loadInfo = this.loadInfo.bind(this);
     this.updateFormState = this.updateFormState.bind(this);
 
-    this.formStateTask
-      .addCollection(service.formStateTask)
-      .addPostHandler(this.updateFormState);
+    this.formStateTask.addCollection(service.formStateTask).addPostHandler(this.updateFormState);
 
     this.loadConfigurationTask
       .before(service.configureTask)
@@ -103,15 +96,13 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
 
         return {
           state,
-          updated: state.info !== configuration.info
-            || state.config.providerId !== configuration.providerId
-            || !this.configured,
+          updated: state.info !== configuration.info || state.config.providerId !== configuration.providerId || !this.configured,
         };
       })
       .next(this.formStateTask);
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   async loadConfigurationInfo(): Promise<AdminAuthProviderConfiguration | undefined> {
     await this.loadConfigurationTask.execute(this);
@@ -119,9 +110,7 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
     return this.info;
   }
 
-  setOptions(
-    mode: AuthConfigurationFormMode,
-  ): this {
+  setOptions(mode: AuthConfigurationFormMode): this {
     this.mode = mode;
     return this;
   }
@@ -136,14 +125,11 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
       {
         state: this,
       },
-      this.service.formSubmittingTask
+      this.service.formSubmittingTask,
     );
   }
 
-  private updateFormState(
-    data: IAuthConfigurationFormState,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormState>
-  ): void {
+  private updateFormState(data: IAuthConfigurationFormState, contexts: IExecutionContextProvider<IAuthConfigurationFormState>): void {
     const context = contexts.getContext(authConfigurationFormStateContext);
 
     this.statusMessage = context.statusMessage;
@@ -152,10 +138,7 @@ export class AuthConfigurationFormState implements IAuthConfigurationFormState {
     this.configured = true;
   }
 
-  private async loadInfo(
-    data: IAuthConfigurationFormState,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormState>
-  ) {
+  private async loadInfo(data: IAuthConfigurationFormState, contexts: IExecutionContextProvider<IAuthConfigurationFormState>) {
     if (!data.config.id) {
       return;
     }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx
index fc4182e5ca..cb2794a755 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx
@@ -5,16 +5,23 @@
  * 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 { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES } from '@cloudbeaver/core-administration';
-import { BASE_CONTAINERS_STYLES, ToolsAction, Loader, ToolsPanel, useTranslate, useStyles, Group, Container, ColoredContainer } from '@cloudbeaver/core-blocks';
+import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentComponent } from '@cloudbeaver/core-administration';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  Loader,
+  ToolsAction,
+  ToolsPanel,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
-
 import { AuthConfigurationsTable } from './AuthConfigurationsTable/AuthConfigurationsTable';
 import { useConfigurationsTable } from './AuthConfigurationsTable/useConfigurationsTable';
 import { CreateAuthConfiguration } from './CreateAuthConfiguration';
@@ -32,9 +39,7 @@ const styles = css`
   }
 `;
 
-export const AuthConfigurationsAdministration: AdministrationItemContentComponent = observer(function AuthConfigurationsAdministration({
-  sub,
-}) {
+export const AuthConfigurationsAdministration: AdministrationItemContentComponent = observer(function AuthConfigurationsAdministration({ sub }) {
   const translate = useTranslate();
   const style = useStyles(BASE_CONTAINERS_STYLES, styles, ADMINISTRATION_TOOLS_PANEL_STYLES);
   const service = useService(CreateAuthConfigurationService);
@@ -80,7 +85,7 @@ export const AuthConfigurationsAdministration: AdministrationItemContentComponen
             <CreateAuthConfiguration />
           </Group>
         )}
-        <Group box='no-overflow'>
+        <Group box="no-overflow">
           <Loader style={loaderStyle} loading={table.processing} overlay>
             <AuthConfigurationsTable
               configurations={table.configurations}
@@ -90,6 +95,6 @@ export const AuthConfigurationsAdministration: AdministrationItemContentComponen
           </Loader>
         </Group>
       </Container>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationNavService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationNavService.ts
index 2e7a7833cd..674f416f28 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationNavService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationNavService.ts
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 
 @injectable()
 export class AuthConfigurationsAdministrationNavService {
-  constructor(
-    private readonly administrationScreenService: AdministrationScreenService
-  ) { }
+  constructor(private readonly administrationScreenService: AdministrationScreenService) {}
 
   navToRoot(): void {
     this.administrationScreenService.navigateToItem('auth-configurations');
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationService.ts
index be9c05dc40..2c55d286e7 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministrationService.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { AdministrationItemService, AdministrationItemType } from '@cloudbeaver/core-administration';
 import { AuthConfigurationsResource, AuthProviderService, AuthProvidersResource } from '@cloudbeaver/core-authentication';
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { AdminAuthProviderConfiguration, CachedMapAllKey } from '@cloudbeaver/core-sdk';
 
@@ -44,7 +43,7 @@ export class AuthConfigurationsAdministrationService extends Bootstrap {
     private readonly authProvidersResource: AuthProvidersResource,
     private readonly authConfigurationsResource: AuthConfigurationsResource,
     private readonly createConfigurationService: CreateAuthConfigurationService,
-    private readonly authProviderService: AuthProviderService
+    private readonly authProviderService: AuthProviderService,
   ) {
     super();
   }
@@ -79,7 +78,7 @@ export class AuthConfigurationsAdministrationService extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async loadConfigurations() {
     try {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx
index 29ef29f00d..6cdc4dca00 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx
@@ -5,25 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
 export const AuthConfigurationsDrawerItem: React.FC<AdministrationItemDrawerProps> = function AuthConfigurationsDrawerItem({
-  item, onSelect, style, disabled,
+  item,
+  onSelect,
+  style,
+  disabled,
 }) {
   return styled(useStyles(style))(
-    <Tab
-      tabId={item.name}
-      disabled={disabled}
-      title='administration_identity_providers_tab_title'
-      onOpen={() => onSelect(item.name)}
-    >
-      <TabIcon icon='/icons/identity_providers.svg' />
-      <TabTitle><Translate token='administration_identity_providers_tab_title' /></TabTitle>
-    </Tab>
+    <Tab tabId={item.name} disabled={disabled} title="administration_identity_providers_tab_title" onOpen={() => onSelect(item.name)}>
+      <TabIcon icon="/icons/identity_providers.svg" />
+      <TabTitle>
+        <Translate token="administration_identity_providers_tab_title" />
+      </TabTitle>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx
index ca5642e817..afccbe1df4 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx
@@ -5,14 +5,20 @@
  * 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, use } from 'reshadow';
 
 import { AuthProvidersResource } from '@cloudbeaver/core-authentication';
 import {
-  TableItem, TableColumnValue, TableItemSelect, TableItemExpand,
-  Placeholder, StaticImage, useResource, FieldCheckbox, Loader
+  FieldCheckbox,
+  Loader,
+  Placeholder,
+  StaticImage,
+  TableColumnValue,
+  TableItem,
+  TableItemExpand,
+  TableItemSelect,
+  useResource,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk';
@@ -58,9 +64,13 @@ export const AuthConfiguration = observer<Props>(function AuthConfiguration({ co
       <TableColumnValue centerContent flex expand>
         <StaticImage icon={icon} title={`${configuration.displayName} icon`} />
       </TableColumnValue>
-      <TableColumnValue title={configuration.displayName} expand ellipsis>{configuration.displayName}</TableColumnValue>
+      <TableColumnValue title={configuration.displayName} expand ellipsis>
+        {configuration.displayName}
+      </TableColumnValue>
       <TableColumnValue>{configuration.providerId}</TableColumnValue>
-      <TableColumnValue title={configuration.description} ellipsis>{configuration.description || ''}</TableColumnValue>
+      <TableColumnValue title={configuration.description} ellipsis>
+        {configuration.description || ''}
+      </TableColumnValue>
       <TableColumnValue>
         <FieldCheckbox checked={configuration.disabled} disabled />
       </TableColumnValue>
@@ -69,6 +79,6 @@ export const AuthConfiguration = observer<Props>(function AuthConfiguration({ co
           <Placeholder container={service.configurationDetailsPlaceholder} configuration={configuration} />
         </Loader>
       </TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx
index df6e79f983..d44612517f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx
@@ -5,37 +5,33 @@
  * 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 { useRef, useEffect, useContext, useCallback } from 'react';
+import { useCallback, useContext, useEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AuthConfigurationsResource } from '@cloudbeaver/core-authentication';
 import { TableContext, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { AuthConfigurationForm } from '../AuthConfigurationForm';
 import { useAuthConfigurationFormState } from '../useAuthConfigurationFormState';
 
 const styles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      box-sizing: border-box;
-      padding-bottom: 24px;
-      display: flex;
-      flex-direction: column;
-      height: 664px;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    box-sizing: border-box;
+    padding-bottom: 24px;
+    display: flex;
+    flex-direction: column;
+    height: 664px;
+  }
+`;
 
 interface Props {
   item: string;
 }
 
-export const AuthConfigurationEdit = observer<Props>(function AuthConfigurationEdit({
-  item,
-}) {
+export const AuthConfigurationEdit = observer<Props>(function AuthConfigurationEdit({ item }) {
   const resource = useService(AuthConfigurationsResource);
   const boxRef = useRef<HTMLDivElement>(null);
   const tableContext = useContext(TableContext);
@@ -51,19 +47,13 @@ export const AuthConfigurationEdit = observer<Props>(function AuthConfigurationE
     });
   }, []);
 
-  const data = useAuthConfigurationFormState(
-    resource,
-    state => state.setOptions('edit')
-  );
+  const data = useAuthConfigurationFormState(resource, state => state.setOptions('edit'));
 
   data.config.id = item;
 
   return styled(useStyles(styles))(
-    <box ref={boxRef} as='div'>
-      <AuthConfigurationForm
-        state={data}
-        onCancel={collapse}
-      />
-    </box>
+    <box ref={boxRef} as="div">
+      <AuthConfigurationForm state={data} onCancel={collapse} />
+    </box>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx
index dadccf1877..afa50ea602 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx
@@ -5,10 +5,9 @@
  * 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 { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
+import { Table, TableBody, TableColumnHeader, TableHeader, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
 import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk';
 
 import { AuthConfiguration } from './AuthConfiguration';
@@ -24,7 +23,7 @@ export const AuthConfigurationsTable = observer<Props>(function AuthConfiguratio
   const keys = configurations.map(configuration => configuration.id);
 
   return (
-    <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size='big'>
+    <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size="big">
       <TableHeader fixed>
         <TableColumnHeader min flex centerContent>
           <TableSelect />
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
index 0aea3db656..5754021a94 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { AuthConfigurationsResource, compareAuthConfigurations } from '@cloudbeaver/core-authentication';
@@ -30,66 +29,71 @@ export function useConfigurationsTable(): Readonly<State> {
 
   const translate = useTranslate();
 
-  return useObservableRef<State>(() => ({
-    tableState: new TableState(),
-    processing: false,
-    get configurations() {
-      return resource.values.slice().sort(compareAuthConfigurations);
+  return useObservableRef<State>(
+    () => ({
+      tableState: new TableState(),
+      processing: false,
+      get configurations() {
+        return resource.values.slice().sort(compareAuthConfigurations);
+      },
+      async update() {
+        if (this.processing) {
+          return;
+        }
+
+        try {
+          this.processing = true;
+          await resource.refresh(CachedMapAllKey);
+          notificationService.logSuccess({ title: 'administration_identity_providers_configuration_list_update_success' });
+        } catch (exception: any) {
+          notificationService.logException(exception, 'administration_identity_providers_configuration_list_update_fail');
+        } finally {
+          this.processing = false;
+        }
+      },
+      async delete() {
+        if (this.processing) {
+          return;
+        }
+
+        const deletionList = this.tableState.selectedList;
+
+        if (deletionList.length === 0) {
+          return;
+        }
+
+        const configurationNames = deletionList.map(id => resource.get(id)?.displayName).filter(Boolean);
+        const nameList = configurationNames.map(name => `"${name}"`).join(', ');
+        const message = `${translate('administration_identity_providers_delete_confirmation')}${nameList}. ${translate('ui_are_you_sure')}`;
+
+        const result = await dialogService.open(ConfirmationDialogDelete, {
+          title: 'ui_data_delete_confirmation',
+          message,
+          confirmActionText: 'ui_delete',
+        });
+
+        if (result === DialogueStateResult.Rejected) {
+          return;
+        }
+
+        try {
+          this.processing = true;
+          await resource.deleteConfiguration(resourceKeyList(deletionList));
+
+          this.tableState.unselect();
+          this.tableState.unexpand(deletionList);
+        } catch (exception: any) {
+          notificationService.logException(exception, 'Configurations delete failed');
+        } finally {
+          this.processing = false;
+        }
+      },
+    }),
+    {
+      processing: observable.ref,
+      configurations: computed,
     },
-    async update() {
-      if (this.processing) {
-        return;
-      }
-
-      try {
-        this.processing = true;
-        await resource.refresh(CachedMapAllKey);
-        notificationService.logSuccess({ title: 'administration_identity_providers_configuration_list_update_success' });
-      } catch (exception: any) {
-        notificationService.logException(exception, 'administration_identity_providers_configuration_list_update_fail');
-      } finally {
-        this.processing = false;
-      }
-    },
-    async delete() {
-      if (this.processing) {
-        return;
-      }
-
-      const deletionList = this.tableState.selectedList;
-
-      if (deletionList.length === 0) {
-        return;
-      }
-
-      const configurationNames = deletionList.map(id => resource.get(id)?.displayName).filter(Boolean);
-      const nameList = configurationNames.map(name => `"${name}"`).join(', ');
-      const message = `${translate('administration_identity_providers_delete_confirmation')}${nameList}. ${translate('ui_are_you_sure')}`;
-
-      const result = await dialogService.open(ConfirmationDialogDelete, {
-        title: 'ui_data_delete_confirmation',
-        message,
-        confirmActionText: 'ui_delete',
-      });
-
-      if (result === DialogueStateResult.Rejected) {
-        return;
-      }
-
-      try {
-        this.processing = true;
-        await resource.deleteConfiguration(resourceKeyList(deletionList));
-
-        this.tableState.unselect();
-        this.tableState.unexpand(deletionList);
-      } catch (exception: any) {
-        notificationService.logException(exception, 'Configurations delete failed');
-      } finally {
-        this.processing = false;
-      }
-    },
-  }), {
-    processing: observable.ref,
-    configurations: computed,
-  }, false, ['update', 'delete']);
+    false,
+    ['update', 'delete'],
+  );
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationContext.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationContext.ts
index 28799cfba3..680f7fb400 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationContext.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk';
 
 export function authConfigurationContext(): AdminAuthProviderConfiguration {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationFormConfigureContext.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationFormConfigureContext.ts
index 83b2a8cdca..a800cd4593 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationFormConfigureContext.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Contexts/authConfigurationFormConfigureContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk';
 
@@ -18,7 +17,7 @@ export interface IAuthConfigurationFormConfigureContext {
 
 export function authConfigurationFormConfigureContext(
   contexts: IExecutionContextProvider<IAuthConfigurationFormState>,
-  state: IAuthConfigurationFormState
+  state: IAuthConfigurationFormState,
 ): IAuthConfigurationFormConfigureContext {
   return {
     info: state.info,
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx
index fc650f9a3e..817a4de3bb 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -16,36 +15,36 @@ import { AuthConfigurationForm } from './AuthConfigurationForm';
 import { CreateAuthConfigurationService } from './CreateAuthConfigurationService';
 
 const styles = css`
-    configuration-create {
-      display: flex;
-      flex-direction: column;
-      height: 660px;
-      overflow: hidden;
-    }
+  configuration-create {
+    display: flex;
+    flex-direction: column;
+    height: 660px;
+    overflow: hidden;
+  }
 
-    title-bar {
-      composes: theme-border-color-background theme-typography--headline6 from global;
-      box-sizing: border-box;
-      padding: 16px 24px;
-      align-items: center;
-      display: flex;
-      font-weight: 400;
-      flex: auto 0 0;
-    }
+  title-bar {
+    composes: theme-border-color-background theme-typography--headline6 from global;
+    box-sizing: border-box;
+    padding: 16px 24px;
+    align-items: center;
+    display: flex;
+    font-weight: 400;
+    flex: auto 0 0;
+  }
 
-    configuration-create-content {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      overflow: auto;
-    }
+  configuration-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+  }
 
-    fill {
-      flex: 1;
-    }
-  `;
+  fill {
+    flex: 1;
+  }
+`;
 
 export const CreateAuthConfiguration: React.FC = observer(function CreateAuthConfiguration() {
   const service = useService(CreateAuthConfigurationService);
@@ -57,13 +56,13 @@ export const CreateAuthConfiguration: React.FC = observer(function CreateAuthCon
   return styled(styles)(
     <configuration-create>
       <title-bar>
-        <Translate token='administration_identity_providers_configuration_add' />
+        <Translate token="administration_identity_providers_configuration_add" />
         <fill />
         <IconButton name="cross" viewBox="0 0 16 16" onClick={service.cancelCreate} />
       </title-bar>
       <configuration-create-content>
         <AuthConfigurationForm state={service.data} onCancel={service.cancelCreate} onSave={service.cancelCreate} />
       </configuration-create-content>
-    </configuration-create>
+    </configuration-create>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfigurationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfigurationService.ts
index 77d4a6e44b..6c7fcc893d 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfigurationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfigurationService.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { AuthConfigurationsResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
@@ -24,7 +23,7 @@ export class CreateAuthConfigurationService {
   constructor(
     private readonly authConfigurationsAdministrationNavService: AuthConfigurationsAdministrationNavService,
     private readonly authConfigurationFormService: AuthConfigurationFormService,
-    private readonly authConfigurationsResource: AuthConfigurationsResource
+    private readonly authConfigurationsResource: AuthConfigurationsResource,
   ) {
     this.data = null;
 
@@ -42,10 +41,7 @@ export class CreateAuthConfigurationService {
   }
 
   fillData(): void {
-    this.data = new AuthConfigurationFormState(
-      this.authConfigurationFormService,
-      this.authConfigurationsResource
-    );
+    this.data = new AuthConfigurationFormState(this.authConfigurationFormService, this.authConfigurationsResource);
   }
 
   create(): void {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IAuthConfigurationFormProps.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IAuthConfigurationFormProps.ts
index 66b2ca86f4..34a2b3f075 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IAuthConfigurationFormProps.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IAuthConfigurationFormProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
 import type { AdminAuthProviderConfiguration, CachedMapResource, GetAuthProviderConfigurationsQueryVariables } from '@cloudbeaver/core-sdk';
 
@@ -22,18 +21,12 @@ export interface IAuthConfigurationFormState {
   readonly loading: boolean;
 
   readonly submittingTask: IExecutorHandlersCollection<IAuthConfigurationFormSubmitData>;
-  readonly resource: CachedMapResource<
-  string,
-  AdminAuthProviderConfiguration,
-  GetAuthProviderConfigurationsQueryVariables
-  >;
+  readonly resource: CachedMapResource<string, AdminAuthProviderConfiguration, GetAuthProviderConfigurationsQueryVariables>;
 
   readonly load: () => Promise<void>;
   readonly loadConfigurationInfo: () => Promise<AdminAuthProviderConfiguration | undefined>;
   readonly save: () => Promise<void>;
-  readonly setOptions: (
-    mode: AuthConfigurationFormMode,
-  ) => this;
+  readonly setOptions: (mode: AuthConfigurationFormMode) => this;
 }
 
 export interface IAuthConfigurationFormProps {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx
index 1d86d83b40..13ed6b0e38 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ServiceDescriptionComponent } from '@cloudbeaver/core-authentication';
 import { Link, Translate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { AuthConfigurationsAdministrationNavService } from './AuthConfigurationsAdministrationNavService';
 
-export const IdentityProvidersServiceLink: ServiceDescriptionComponent = function IdentityProvidersServiceLink({
-  configurationWizard,
-}) {
+export const IdentityProvidersServiceLink: ServiceDescriptionComponent = function IdentityProvidersServiceLink({ configurationWizard }) {
   const authConfigurationsAdministrationNavService = useService(AuthConfigurationsAdministrationNavService);
 
   if (configurationWizard) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
index 343ff90c48..ebf35f202a 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
@@ -5,16 +5,28 @@
  * 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, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AuthConfigurationParametersResource, AuthProvidersResource } from '@cloudbeaver/core-authentication';
 import {
-  BASE_CONTAINERS_STYLES, ColoredContainer, Combobox, FieldCheckbox, Group, GroupTitle,
-  InputField, Link, ObjectPropertyInfoForm, SubmittingForm,
-  Textarea, useClipboard, useResource, useObjectPropertyCategories, useStyles, useTranslate
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Combobox,
+  FieldCheckbox,
+  Group,
+  GroupTitle,
+  InputField,
+  Link,
+  ObjectPropertyInfoForm,
+  SubmittingForm,
+  Textarea,
+  useClipboard,
+  useObjectPropertyCategories,
+  useResource,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { AuthProviderConfigurationParametersFragment, CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
@@ -40,11 +52,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
   const style = useStyles(BASE_CONTAINERS_STYLES, styles);
 
   const providers = useResource(AuthConfigurationOptions, AuthProvidersResource, CachedMapAllKey);
-  const parameters = useResource(
-    AuthConfigurationOptions,
-    AuthConfigurationParametersResource,
-    state.config.providerId || null,
-  );
+  const parameters = useResource(AuthConfigurationOptions, AuthConfigurationParametersResource, state.config.providerId || null);
 
   const { categories, isUncategorizedExists } = useObjectPropertyCategories(parameters.data ?? emptyArray);
 
@@ -59,7 +67,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
       <ColoredContainer parent gap overflow>
         <Group small gap>
           <Combobox
-            name='providerId'
+            name="providerId"
             state={state.config}
             items={providers.resource.configurable}
             keySelector={provider => provider.id}
@@ -76,48 +84,21 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
           >
             {translate('administration_identity_providers_provider')}
           </Combobox>
-          <InputField
-            name='id'
-            state={state.config}
-            readOnly={state.readonly || edit}
-            disabled={state.disabled}
-            required
-            tiny
-            fill
-          >
+          <InputField name="id" state={state.config} readOnly={state.readonly || edit} disabled={state.disabled} required tiny fill>
             {translate('administration_identity_providers_provider_id')}
           </InputField>
-          <InputField
-            name='displayName'
-            state={state.config}
-            minLength={1}
-            disabled={state.disabled}
-            readOnly={state.readonly}
-            required
-            tiny
-            fill
-          >
+          <InputField name="displayName" state={state.config} minLength={1} disabled={state.disabled} readOnly={state.readonly} required tiny fill>
             {translate('administration_identity_providers_provider_configuration_name')}
           </InputField>
-          <Textarea
-            name='description'
-            state={state.config}
-            disabled={state.disabled}
-            readOnly={state.readonly}
-          >
+          <Textarea name="description" state={state.config} disabled={state.disabled} readOnly={state.readonly}>
             {translate('administration_identity_providers_provider_configuration_description')}
           </Textarea>
-          <InputField
-            name='iconURL'
-            state={state.config}
-            disabled={state.disabled}
-            readOnly={state.readonly}
-          >
+          <InputField name="iconURL" state={state.config} disabled={state.disabled} readOnly={state.readonly}>
             {translate('administration_identity_providers_provider_configuration_icon_url')}
           </InputField>
           <FieldCheckbox
             id={edit ? state.config.id : 'AuthConfigurationDisabled'}
-            name='disabled'
+            name="disabled"
             state={state.config}
             disabled={state.disabled}
             readOnly={state.readonly}
@@ -158,7 +139,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
           <Group small gap>
             <GroupTitle>{translate('administration_identity_providers_provider_configuration_links')}</GroupTitle>
             <InputField
-              name='signInLink'
+              name="signInLink"
               state={state.config}
               title={state.config.signInLink}
               disabled={state.disabled}
@@ -169,7 +150,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
               Sign in
             </InputField>
             <InputField
-              name='signOutLink'
+              name="signOutLink"
               state={state.config}
               title={state.config.signOutLink}
               disabled={state.disabled}
@@ -180,7 +161,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
               Sign out
             </InputField>
             <InputField
-              name='redirectLink'
+              name="redirectLink"
               state={state.config}
               title={state.config.redirectLink}
               disabled={state.disabled}
@@ -191,17 +172,13 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
               Redirect
             </InputField>
             {state.config.metadataLink && (
-              <Link
-                href={state.config.metadataLink}
-                target='_blank'
-                rel='noopener noreferrer'
-              >
+              <Link href={state.config.metadataLink} target="_blank" rel="noopener noreferrer">
                 {translate('administration_identity_providers_provider_configuration_links_metadata')}
               </Link>
             )}
           </Group>
         )}
       </ColoredContainer>
-    </SubmittingForm>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptionsTabService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptionsTabService.ts
index 44dc0606c7..048392f4f5 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptionsTabService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptionsTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { AuthConfigurationsResource, AuthProvidersResource } from '@cloudbeaver/core-authentication';
@@ -16,7 +15,11 @@ import { getUniqueName } from '@cloudbeaver/core-utils';
 
 import { AuthConfigurationFormService } from '../AuthConfigurationFormService';
 import { authConfigurationContext } from '../Contexts/authConfigurationContext';
-import type { IAuthConfigurationFormFillConfigData, IAuthConfigurationFormState, IAuthConfigurationFormSubmitData } from '../IAuthConfigurationFormProps';
+import type {
+  IAuthConfigurationFormFillConfigData,
+  IAuthConfigurationFormState,
+  IAuthConfigurationFormSubmitData,
+} from '../IAuthConfigurationFormProps';
 
 const AuthConfigurationOptions = React.lazy(async () => {
   const { AuthConfigurationOptions } = await import('./AuthConfigurationOptions');
@@ -41,27 +44,18 @@ export class AuthConfigurationOptionsTabService extends Bootstrap {
       panel: () => AuthConfigurationOptions,
     });
 
-    this.authConfigurationFormService.prepareConfigTask
-      .addHandler(this.prepareConfig.bind(this));
+    this.authConfigurationFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
-    this.authConfigurationFormService.formValidationTask
-      .addHandler(this.validate.bind(this));
+    this.authConfigurationFormService.formValidationTask.addHandler(this.validate.bind(this));
 
-    this.authConfigurationFormService.formSubmittingTask
-      .addHandler(this.save.bind(this));
+    this.authConfigurationFormService.formSubmittingTask.addHandler(this.save.bind(this));
 
-    this.authConfigurationFormService.fillConfigTask
-      .addHandler(this.fillConfig.bind(this));
+    this.authConfigurationFormService.fillConfigTask.addHandler(this.fillConfig.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
-  private async prepareConfig(
-    {
-      state,
-    }: IAuthConfigurationFormSubmitData,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>
-  ) {
+  private async prepareConfig({ state }: IAuthConfigurationFormSubmitData, contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>) {
     const config = contexts.getContext(authConfigurationContext);
 
     config.id = state.config.id;
@@ -87,12 +81,7 @@ export class AuthConfigurationOptionsTabService extends Bootstrap {
     }
   }
 
-  private async validate(
-    {
-      state,
-    }: IAuthConfigurationFormSubmitData,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>
-  ) {
+  private async validate({ state }: IAuthConfigurationFormSubmitData, contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>) {
     const validation = contexts.getContext(this.authConfigurationFormService.configurationValidationContext);
 
     if (!state.config.displayName.trim()) {
@@ -114,12 +103,7 @@ export class AuthConfigurationOptionsTabService extends Bootstrap {
     }
   }
 
-  private async save(
-    {
-      state,
-    }: IAuthConfigurationFormSubmitData,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>
-  ) {
+  private async save({ state }: IAuthConfigurationFormSubmitData, contexts: IExecutionContextProvider<IAuthConfigurationFormSubmitData>) {
     const status = contexts.getContext(this.authConfigurationFormService.configurationStatusContext);
     const config = contexts.getContext(authConfigurationContext);
 
@@ -149,7 +133,7 @@ export class AuthConfigurationOptionsTabService extends Bootstrap {
 
   private async fillConfig(
     { state, updated }: IAuthConfigurationFormFillConfigData,
-    contexts: IExecutionContextProvider<IAuthConfigurationFormFillConfigData>
+    contexts: IExecutionContextProvider<IAuthConfigurationFormFillConfigData>,
   ) {
     if (!updated) {
       return;
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/useAuthConfigurationFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/useAuthConfigurationFormState.ts
index 37460467f5..40568bcfe5 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/useAuthConfigurationFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/useAuthConfigurationFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
@@ -17,14 +16,11 @@ import type { IAuthConfigurationFormState } from './IAuthConfigurationFormProps'
 
 export function useAuthConfigurationFormState(
   resource: CachedMapResource<string, AdminAuthProviderConfiguration, GetAuthProviderConfigurationsQueryVariables>,
-  configure?: (state: IAuthConfigurationFormState) => any
+  configure?: (state: IAuthConfigurationFormState) => any,
 ): IAuthConfigurationFormState {
   const service = useService(AuthConfigurationFormService);
   const [state] = useState<IAuthConfigurationFormState>(() => {
-    const state = new AuthConfigurationFormState(
-      service,
-      resource,
-    );
+    const state = new AuthConfigurationFormState(service, resource);
     configure?.(state);
 
     state.load();
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
index 0b89ed18d8..7e8c5d2d27 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
@@ -5,13 +5,30 @@
  * 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 React, { useContext } from 'react';
 import styled from 'reshadow';
 
-import { AuthProvider, AuthProviderService, AuthProvidersResource, AuthSettingsService, AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
-import { BASE_CONTAINERS_STYLES, FormContext, Group, GroupTitle, Loader, PlaceholderComponent, Switch, useExecutor, useResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  AUTH_PROVIDER_LOCAL_ID,
+  AuthProvider,
+  AuthProviderService,
+  AuthProvidersResource,
+  AuthSettingsService,
+} from '@cloudbeaver/core-authentication';
+import {
+  BASE_CONTAINERS_STYLES,
+  FormContext,
+  Group,
+  GroupTitle,
+  Loader,
+  PlaceholderComponent,
+  Switch,
+  useExecutor,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
@@ -49,23 +66,25 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
 
   useExecutor({
     executor: formContext.changeExecutor,
-    handlers: [function switchControls() {
-      if (serverConfig.enabledAuthProviders?.length === 0) {
-        if (localProvider && !isAnonymousAccessDisabled) {
-          serverConfig.anonymousAccessEnabled = true;
-        } else if (primaryProvider) {
-          serverConfig.enabledAuthProviders.push(primaryProvider.id);
+    handlers: [
+      function switchControls() {
+        if (serverConfig.enabledAuthProviders?.length === 0) {
+          if (localProvider && !isAnonymousAccessDisabled) {
+            serverConfig.anonymousAccessEnabled = true;
+          } else if (primaryProvider) {
+            serverConfig.enabledAuthProviders.push(primaryProvider.id);
+          }
         }
-      }
 
-      if (serverConfig.enabledAuthProviders?.length) {
-        serverConfig.enabledAuthProviders = serverConfig.enabledAuthProviders.filter(providerId => {
-          const provider = providers.resource.get(providerId)!;
+        if (serverConfig.enabledAuthProviders?.length) {
+          serverConfig.enabledAuthProviders = serverConfig.enabledAuthProviders.filter(providerId => {
+            const provider = providers.resource.get(providerId)!;
 
-          return !provider.requiredFeatures.some(feat => !serverConfig.enabledFeatures?.includes(feat));
-        });
-      }
-    }],
+            return !provider.requiredFeatures.some(feat => !serverConfig.enabledFeatures?.includes(feat));
+          });
+        }
+      },
+    ],
   });
 
   if (externalAuthentication) {
@@ -74,7 +93,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
 
   return styled(styles)(
     <React.Fragment>
-      <Group key='authentication' form gap>
+      <Group key="authentication" form gap>
         <GroupTitle>{translate('administration_configuration_wizard_configuration_authentication_group')}</GroupTitle>
         {localProvider && !isAnonymousAccessDisabled ? (
           <Switch
@@ -96,10 +115,10 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
           const tooltip = disabled ? `Following services need to be enabled: "${provider.requiredFeatures.join(', ')}"` : '';
 
           if (
-            !localProvider
-                  && primaryProvider?.id === provider.id
-                  && serverConfig.enabledAuthProviders?.length === 1
-                  && serverConfig.enabledAuthProviders.includes(provider.id)
+            !localProvider &&
+            primaryProvider?.id === provider.id &&
+            serverConfig.enabledAuthProviders?.length === 1 &&
+            serverConfig.enabledAuthProviders.includes(provider.id)
           ) {
             disabled = true;
           }
@@ -116,7 +135,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
               value={provider.id}
               name="enabledAuthProviders"
               state={serverConfig}
-              description={(
+              description={
                 <>
                   {provider.description}
                   {links.map(link => {
@@ -124,7 +143,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
                     return <Description key={link.id} configurationWizard={configurationWizard} />;
                   })}
                 </>
-              )}
+              }
               mod={['primary']}
               disabled={disabled}
               small
@@ -135,9 +154,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
           );
         })}
       </Group>
-      {configurationWizard && localProvider && (
-        <ServerConfigurationAdminForm serverConfig={serverConfig} />
-      )}
-    </React.Fragment>
+      {configurationWizard && localProvider && <ServerConfigurationAdminForm serverConfig={serverConfig} />}
+    </React.Fragment>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx
index 8e8b2e97b8..373b6d8711 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,49 +5,29 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Group, GroupTitle, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Group, GroupTitle, InputField, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ServerConfigInput } from '@cloudbeaver/core-sdk';
 
-
 interface Props {
   serverConfig: ServerConfigInput;
 }
 
-export const ServerConfigurationAdminForm = observer<Props>(function ServerConfigurationAdminForm({
-  serverConfig,
-}) {
+export const ServerConfigurationAdminForm = observer<Props>(function ServerConfigurationAdminForm({ serverConfig }) {
   const translate = useTranslate();
   const style = useStyles(BASE_CONTAINERS_STYLES);
 
   return styled(style)(
     <Group form gap medium>
       <GroupTitle>{translate('administration_configuration_wizard_configuration_admin')}</GroupTitle>
-      <InputField
-        type="text"
-        name="adminName"
-        state={serverConfig}
-        minLength={6}
-        mod='surface'
-        required
-        tiny
-      >
+      <InputField type="text" name="adminName" state={serverConfig} minLength={6} mod="surface" required tiny>
         {translate('administration_configuration_wizard_configuration_admin_name')}
       </InputField>
-      <InputField
-        type="password"
-        name="adminPassword"
-        state={serverConfig}
-        autoComplete='new-password'
-        mod='surface'
-        required
-        tiny
-      >
+      <InputField type="password" name="adminPassword" state={serverConfig} autoComplete="new-password" mod="surface" required tiny>
         {translate('administration_configuration_wizard_configuration_admin_password')}
       </InputField>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
index 1a3e02abae..0db9de4e32 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
@@ -5,15 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
-import { AuthProvidersResource, AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
+import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter, IExecutorHandler } from '@cloudbeaver/core-executor';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
-import { ILoadConfigData, IServerConfigSaveData, ServerConfigurationService, serverConfigValidationContext } from '@cloudbeaver/plugin-administration';
+import {
+  ILoadConfigData,
+  IServerConfigSaveData,
+  ServerConfigurationService,
+  serverConfigValidationContext,
+} from '@cloudbeaver/plugin-administration';
 
 @injectable()
 export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
@@ -32,7 +36,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
     this.serverConfigurationService.loadConfigTask.addHandler(this.loadServerConfig);
   }
 
-  load(): void { }
+  load(): void {}
 
   private readonly loadServerConfig: IExecutorHandler<ILoadConfigData> = async (data, contexts) => {
     if (!data.reset) {
@@ -62,7 +66,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
       data.state.serverConfig.enabledFeatures = [...config.enabledFeatures];
     } catch (exception: any) {
       ExecutorInterrupter.interrupt(contexts);
-      this.notificationService.logException(exception, 'Can\'t load server configuration');
+      this.notificationService.logException(exception, "Can't load server configuration");
     }
   };
 
@@ -76,10 +80,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
 
     const validation = contexts.getContext(serverConfigValidationContext);
 
-    if (!data.state.serverConfig.adminName
-        || data.state.serverConfig.adminName.length < 6
-        || !data.state.serverConfig.adminPassword
-    ) {
+    if (!data.state.serverConfig.adminName || data.state.serverConfig.adminName.length < 6 || !data.state.serverConfig.adminPassword) {
       validation.invalidate();
     }
   };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
index f9ada7bf13..ab6fb35074 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Translate } from '@cloudbeaver/core-blocks';
@@ -14,50 +13,50 @@ import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
 import { UserForm } from '../UserForm/UserForm';
 
 const styles = css`
-    user-create-footer, user-create-content {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    user-create {
-      display: flex;
-      flex-direction: column;
-      height: 540px;
-      overflow: hidden;
-    }
+  user-create-footer,
+  user-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  user-create {
+    display: flex;
+    flex-direction: column;
+    height: 540px;
+    overflow: hidden;
+  }
 
-    title-bar {
-      composes: theme-border-color-background theme-typography--headline6 from global;
-      box-sizing: border-box;
-      padding: 16px 24px;
-      align-items: center;
-      display: flex;
-      font-weight: 400;
-      flex: auto 0 0;
-    }
+  title-bar {
+    composes: theme-border-color-background theme-typography--headline6 from global;
+    box-sizing: border-box;
+    padding: 16px 24px;
+    align-items: center;
+    display: flex;
+    font-weight: 400;
+    flex: auto 0 0;
+  }
 
-    user-create-content {
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      overflow: auto;
-    }
-  `;
+  user-create-content {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   user: AdminUserInfo;
   onCancel: () => void;
 }
 
-export const CreateMetaParameter: React.FC<Props> = function CreateMetaParameter({
-  user,
-  onCancel,
-}) {
+export const CreateMetaParameter: React.FC<Props> = function CreateMetaParameter({ user, onCancel }) {
   return styled(styles)(
     <user-create>
-      <title-bar><Translate token='authentication_administration_user_connections_user_add' /></title-bar>
+      <title-bar>
+        <Translate token="authentication_administration_user_connections_user_add" />
+      </title-bar>
       <user-create-content>
         <UserForm user={user} onCancel={onCancel} />
       </user-create-content>
-    </user-create>
+    </user-create>,
   );
 };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
index 054a9ceb21..8f02689a07 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts
index 7a12368454..a4fc1c74fa 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
 export interface IUserProfileFormState {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
index 347e51e286..e414440d86 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
@@ -5,13 +5,12 @@
  * 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 { BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, IconOrImage, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { UserInfo } from '@cloudbeaver/core-sdk';
-import { UNDERLINE_TAB_STYLES, TabList, TabsState, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import type { IUserProfileFormState } from './IUserProfileFormState';
 import { MetaParameterInfoPanel } from './UserInfo/MetaParameterInfoPanel';
@@ -24,88 +23,85 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const topBarStyles = css`
-    top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      padding-top: 16px;
+  top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    padding-top: 16px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    top-bar-tabs {
-      flex: 1;
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
+  top-bar-tabs {
+    flex: 1;
+  }
 
-    top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
+  top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
 
-    /*Button:not(:first-child) {
+  /*Button:not(:first-child) {
       margin-right: 24px;
     }*/
 
-    status-message {
-      composes: theme-typography--caption from global;
-      height: 24px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      gap: 8px;
+  status-message {
+    composes: theme-typography--caption from global;
+    height: 24px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-      & IconOrImage {
-        height: 24px;
-        width: 24px;
-      }
+    & IconOrImage {
+      height: 24px;
+      width: 24px;
     }
-  `;
+  }
+`;
 
 const formStyles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    flex-box {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-border-color-background from global;
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  flex-box {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-border-color-background from global;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   user: UserInfo;
   state: IUserProfileFormState;
 }
 
-export const MetaParameterForm = observer<Props>(function MetaParameterForm({
-  user,
-  state,
-}) {
+export const MetaParameterForm = observer<Props>(function MetaParameterForm({ user, state }) {
   const translate = useTranslate();
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
   const styles = useStyles(style, BASE_CONTAINERS_STYLES, topBarStyles, formStyles);
@@ -118,7 +114,7 @@ export const MetaParameterForm = observer<Props>(function MetaParameterForm({
             <status-message>
               {state.info.statusMessage && (
                 <>
-                  <IconOrImage icon='/icons/info_icon.svg' />
+                  <IconOrImage icon="/icons/info_icon.svg" />
                   {translate(state.info.statusMessage)}
                 </>
               )}
@@ -128,15 +124,13 @@ export const MetaParameterForm = observer<Props>(function MetaParameterForm({
               {/* <UserAuthProvidersTab style={style} /> */}
             </TabList>
           </top-bar-tabs>
-          <top-bar-actions>
-            {' '}
-          </top-bar-actions>
+          <top-bar-actions> </top-bar-actions>
         </top-bar>
         <content-box>
           <MetaParameterInfoPanel user={user} style={style} />
           {/* <UserAuthProviderPanel user={user} style={style} /> */}
         </content-box>
       </TabsState>
-    </flex-box>
+    </flex-box>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
index 12dbe7d5a1..373fef7e58 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -20,11 +19,7 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const MetaParameterInfoForm = observer<Props>(function MetaParameterInfoForm({
-  user,
-  className,
-  style,
-}) {
+export const MetaParameterInfoForm = observer<Props>(function MetaParameterInfoForm({ user, className, style }) {
   const userMetaParameters = useResource(MetaParameterInfoForm, UserMetaParametersResource, undefined);
   const styles = useStyles(style, BASE_CONTAINERS_STYLES);
 
@@ -34,13 +29,7 @@ export const MetaParameterInfoForm = observer<Props>(function MetaParameterInfoF
 
   return styled(styles)(
     <Container className={className} wrap gap>
-      <ObjectPropertyInfoForm
-        state={user.metaParameters}
-        properties={userMetaParameters.data}
-        category={null}
-        disabled
-        readOnly
-      />
-    </Container>
+      <ObjectPropertyInfoForm state={user.metaParameters} properties={userMetaParameters.data} category={null} disabled readOnly />
+    </Container>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
index f0dfe6b97a..2e49d6f45a 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -22,16 +21,12 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const MetaParameterInfoPanel = observer<Props>(function MetaParameterInfoPanel({
-  user,
-  className,
-  style,
-}) {
+export const MetaParameterInfoPanel = observer<Props>(function MetaParameterInfoPanel({ user, className, style }) {
   const styles = useStyles(style);
 
   return styled(styles)(
-    <TabPanel tabId='info' className={className}>
+    <TabPanel tabId="info" className={className}>
       <MetaParametersForm user={user} />
-    </TabPanel>
+    </TabPanel>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
index b9e6dbbed4..d72609218f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
@@ -5,27 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab } from '@cloudbeaver/core-ui';
 
-
 interface Props {
   className?: string;
   style?: ComponentStyle;
 }
 
-export const MetaParameterInfoTab = observer<Props>(function MetaParameterInfoTab({
-  className,
-  style,
-}) {
+export const MetaParameterInfoTab = observer<Props>(function MetaParameterInfoTab({ className, style }) {
   const translate = useTranslate();
   const styles = useStyles(style);
 
   return styled(styles)(
-    <Tab tabId='info' style={style} className={className}>{translate('plugin_user_profile_info')}</Tab>
+    <Tab tabId="info" style={style} className={className}>
+      {translate('plugin_user_profile_info')}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
index c54fa3347e..75da0c5a9e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, InputField, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { UserInfo } from '@cloudbeaver/core-sdk';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -22,11 +21,7 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const MetaParametersForm = observer<Props>(function MetaParametersForm({
-  user,
-  className,
-  style,
-}) {
+export const MetaParametersForm = observer<Props>(function MetaParametersForm({ user, className, style }) {
   const styles = useStyles(style, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
 
@@ -35,32 +30,10 @@ export const MetaParametersForm = observer<Props>(function MetaParametersForm({
       <Container medium gap>
         <Group form gap>
           <Container wrap gap>
-            <InputField
-              type="text"
-              name="userId"
-              minLength={1}
-              state={user}
-              mod='surface'
-              disabled
-              readOnly
-              required
-              tiny
-              fill
-            >
+            <InputField type="text" name="userId" minLength={1} state={user} mod="surface" disabled readOnly required tiny fill>
               {translate('plugin_user_profile_info_id')}
             </InputField>
-            <InputField
-              type="text"
-              name="displayName"
-              minLength={1}
-              state={user}
-              mod='surface'
-              disabled
-              readOnly
-              required
-              tiny
-              fill
-            >
+            <InputField type="text" name="displayName" minLength={1} state={user} mod="surface" disabled readOnly required tiny fill>
               {translate('plugin_user_profile_info_displayName')}
             </InputField>
           </Container>
@@ -70,7 +43,6 @@ export const MetaParametersForm = observer<Props>(function MetaParametersForm({
           <AuthProvidersList user={user} providers={user.linkedAuthProviders} />
         </Group>
       </Container>
-
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
index 0d19b020b1..358e9cfa14 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
 import type { IUserProfileFormState } from './IUserProfileFormState';
@@ -20,11 +19,7 @@ export class UserProfileFormState implements IUserProfileFormState {
     };
   }
 
-  async validate(): Promise<void> {
+  async validate(): Promise<void> {}
 
-  }
-
-  dispose(): void {
-
-  }
+  dispose(): void {}
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
index bd63df81f8..6a422a9fa5 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
@@ -5,38 +5,48 @@
  * 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, use } from 'reshadow';
 
 import type { IAdministrationItemSubItem } from '@cloudbeaver/core-administration';
 import { UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useResource, ToolsPanel, ToolsAction, Loader, BASE_LAYOUT_GRID_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_LAYOUT_GRID_STYLES,
+  Loader,
+  Table,
+  TableBody,
+  TableColumnHeader,
+  TableHeader,
+  TableSelect,
+  ToolsAction,
+  ToolsPanel,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useController, useService } from '@cloudbeaver/core-di';
 
-
-
 import { CreateMetaParameter } from './CreateMetaParameter';
 import { CreateMetaParameterService } from './CreateMetaParameterService';
 import { MetadataParam } from './MetadataParam';
 import { MetaParametersController } from './MetaParametersController';
 
 const layoutStyles = css`
-    layout-grid {
-      width: 100%;
-      overflow: auto;
-    }
+  layout-grid {
+    width: 100%;
+    overflow: auto;
+  }
 
-    layout-grid-inner {
-      min-height: 100%;
-    }
+  layout-grid-inner {
+    min-height: 100%;
+  }
 
-    layout-grid-cell {
-      composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-      position: relative;
-      border: solid 1px;
-    }
-  `;
+  layout-grid-cell {
+    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
+    position: relative;
+    border: solid 1px;
+  }
+`;
 
 const styles = css`
   Table {
@@ -60,7 +70,7 @@ export const MetaParameters = observer<Props>(function MetaParameters({ sub, par
   return styled(useStyles(BASE_LAYOUT_GRID_STYLES, styles, layoutStyles))(
     <layout-grid>
       <layout-grid-inner>
-        <layout-grid-cell data-span='12'>
+        <layout-grid-cell data-span="12">
           <ToolsPanel>
             {isLocalProviderAvailable && (
               <ToolsAction
@@ -96,20 +106,12 @@ export const MetaParameters = observer<Props>(function MetaParameters({ sub, par
         </layout-grid-cell>
 
         {param === 'create' && createMetaParameterService.user && (
-          <layout-grid-cell data-span='12'>
-            <CreateMetaParameter
-              user={createMetaParameterService.user}
-              onCancel={createMetaParameterService.cancelCreate}
-            />
+          <layout-grid-cell data-span="12">
+            <CreateMetaParameter user={createMetaParameterService.user} onCancel={createMetaParameterService.cancelCreate} />
           </layout-grid-cell>
         )}
-        <layout-grid-cell data-span='12'>
-          <Table
-            keys={keys}
-            selectedItems={controller.selectedItems}
-            expandedItems={controller.expandedItems}
-            size='big'
-          >
+        <layout-grid-cell data-span="12">
+          <Table keys={keys} selectedItems={controller.selectedItems} expandedItems={controller.expandedItems} size="big">
             <TableHeader fixed>
               {isLocalProviderAvailable && (
                 <TableColumnHeader min flex centerContent>
@@ -123,17 +125,13 @@ export const MetaParameters = observer<Props>(function MetaParameters({ sub, par
             </TableHeader>
             <TableBody>
               {userMetaParametersResource.data.map(param => (
-                <MetadataParam
-                  key={param.id}
-                  param={param}
-                  selectable={isLocalProviderAvailable}
-                />
+                <MetadataParam key={param.id} param={param} selectable={isLocalProviderAvailable} />
               ))}
             </TableBody>
           </Table>
           <Loader state={userMetaParametersResource} overlay />
         </layout-grid-cell>
       </layout-grid-inner>
-    </layout-grid>
+    </layout-grid>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
index 2ee188294e..bd0157d4bd 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { computed, makeObservable, observable } from 'mobx';
 
-import { observable, computed, makeObservable } from 'mobx';
-
-import { AdminUser, AuthProvidersResource, AUTH_PROVIDER_LOCAL_ID, UsersResource } from '@cloudbeaver/core-authentication';
-import { injectable, IInitializableController } from '@cloudbeaver/core-di';
+import { AdminUser, AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, UsersResource } from '@cloudbeaver/core-authentication';
+import { IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
@@ -17,24 +16,22 @@ import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
 import { CachedMapAllKey, GQLErrorCatcher, resourceKeyList } from '@cloudbeaver/core-sdk';
 
 @injectable()
-export class MetaParametersController
-implements IInitializableController {
+export class MetaParametersController implements IInitializableController {
   isDeleting = false;
   readonly selectedItems = observable<string, boolean>(new Map());
   readonly expandedItems = observable<string, boolean>(new Map());
   readonly error = new GQLErrorCatcher();
 
   get users(): AdminUser[] {
-    return Array.from(this.usersResource.data.values())
-      .sort((a, b) => {
-        if (this.usersResource.isNew(a.userId) === this.usersResource.isNew(b.userId)) {
-          return a.userId.localeCompare(b.userId);
-        }
-        if (this.usersResource.isNew(a.userId)) {
-          return -1;
-        }
-        return 1;
-      });
+    return Array.from(this.usersResource.data.values()).sort((a, b) => {
+      if (this.usersResource.isNew(a.userId) === this.usersResource.isNew(b.userId)) {
+        return a.userId.localeCompare(b.userId);
+      }
+      if (this.usersResource.isNew(a.userId)) {
+        return -1;
+      }
+      return 1;
+    });
   }
 
   get isProvidersLoading(): boolean {
@@ -58,7 +55,7 @@ implements IInitializableController {
     private readonly authProvidersResource: AuthProvidersResource,
     private readonly usersResource: UsersResource,
     private readonly commonDialogService: CommonDialogService,
-    private readonly localizationService: LocalizationService
+    private readonly localizationService: LocalizationService,
   ) {
     makeObservable(this, {
       isDeleting: observable,
@@ -87,8 +84,7 @@ implements IInitializableController {
       return;
     }
 
-    const deletionList = Array
-      .from(this.selectedItems)
+    const deletionList = Array.from(this.selectedItems)
       .filter(([_, value]) => value)
       .map(([userId]) => userId);
     if (deletionList.length === 0) {
@@ -96,7 +92,9 @@ implements IInitializableController {
     }
 
     const userNames = deletionList.map(name => `"${name}"`).join(', ');
-    const message = `${this.localizationService.translate('authentication_administration_users_delete_confirmation')}${userNames}. ${this.localizationService.translate('ui_are_you_sure')}`;
+    const message = `${this.localizationService.translate(
+      'authentication_administration_users_delete_confirmation',
+    )}${userNames}. ${this.localizationService.translate('ui_are_you_sure')}`;
 
     const result = await this.commonDialogService.open(ConfirmationDialogDelete, {
       title: 'ui_data_delete_confirmation',
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
index 2fdfc023b2..7317cd6492 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
@@ -5,16 +5,12 @@
  * 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 {
-  TableItem, TableColumnValue, TableItemSelect, TableItemExpand
-} from '@cloudbeaver/core-blocks';
+import { TableColumnValue, TableItem, TableItemExpand, TableItemSelect } from '@cloudbeaver/core-blocks';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
-
 const styles = css`
   TableColumnValue[expand] {
     cursor: pointer;
@@ -40,6 +36,6 @@ export const MetadataParam = observer<Props>(function MetadataParam({ param, sel
       <TableColumnValue expand>{param.id}</TableColumnValue>
       <TableColumnValue>{param.description}</TableColumnValue>
       <TableColumnValue>{}</TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
index bf83ef0172..b2f8af52b6 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -31,9 +30,7 @@ export const OriginIcon = observer<IOriginIconProps>(function Origin({ origin })
   const icon = isLocal ? '/icons/local_connection.svg' : origin.icon;
   const title = isLocal ? 'Local user' : origin.displayName;
 
-  return styled(USER_DETAILS_STYLES)(
-    <StaticImage key={origin.type + origin.subType} icon={icon} title={title} />
-  );
+  return styled(USER_DETAILS_STYLES)(<StaticImage key={origin.type + origin.subType} icon={icon} title={title} />);
 });
 
 export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(function Origin({ user }) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx
index 0c88635376..4e43a7a037 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx
@@ -5,39 +5,32 @@
  * 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 { useContext, useCallback, useEffect, useRef } from 'react';
+import { useCallback, useContext, useEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  Loader,
-  TableContext
-} from '@cloudbeaver/core-blocks';
+import { Loader, TableContext } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 
-
 import { UserForm } from '../UserForm/UserForm';
 import { UserEditController } from './UserEditController';
 
 const styles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      box-sizing: border-box;
-      padding-bottom: 24px;
-      height: 520px;
-      display: flex;
-      flex-direction: column;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    box-sizing: border-box;
+    padding-bottom: 24px;
+    height: 520px;
+    display: flex;
+    flex-direction: column;
+  }
+`;
 
 interface Props {
   item: string;
 }
 
-export const UserEdit = observer<Props>(function UserEdit({
-  item,
-}) {
+export const UserEdit = observer<Props>(function UserEdit({ item }) {
   const boxRef = useRef<HTMLDivElement>(null);
   const controller = useController(UserEditController, item);
   const tableContext = useContext(TableContext);
@@ -51,10 +44,8 @@ export const UserEdit = observer<Props>(function UserEdit({
   }, []);
 
   return styled(useStyles(styles))(
-    <box ref={boxRef} as='div'>
-      {controller.user ? (
-        <UserForm user={controller.user} editing onCancel={collapse} />
-      ) : <Loader />}
-    </box>
+    <box ref={boxRef} as="div">
+      {controller.user ? <UserForm user={controller.user} editing onCancel={collapse} /> : <Loader />}
+    </box>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEditController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEditController.ts
index dd3521720d..341e405441 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEditController.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEditController.ts
@@ -5,19 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
-import {
-  injectable, IInitializableController, IDestructibleController
-} from '@cloudbeaver/core-di';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { GQLErrorCatcher, AdminUserInfo, ResourceKeyUtils, ResourceKey } from '@cloudbeaver/core-sdk';
+import { AdminUserInfo, GQLErrorCatcher, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 @injectable()
-export class UserEditController
-implements IInitializableController, IDestructibleController {
+export class UserEditController implements IInitializableController, IDestructibleController {
   isLoading = true;
   user: AdminUserInfo | null = null;
 
@@ -29,10 +25,7 @@ implements IInitializableController, IDestructibleController {
 
   readonly error = new GQLErrorCatcher();
 
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly usersResource: UsersResource
-  ) {
+  constructor(private readonly notificationService: NotificationService, private readonly usersResource: UsersResource) {
     makeObservable(this, {
       isLoading: observable,
       user: observable,
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamContext.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamContext.ts
index 7cf5bcfd00..25f09ee637 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamContext.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 
 export function teamContext(): TeamInfo {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamFormConfigureContext.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamFormConfigureContext.ts
index 9654fa62a7..e4d32f83b8 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamFormConfigureContext.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Contexts/teamFormConfigureContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 
@@ -15,10 +14,7 @@ export interface ITeamFormConfigureContext {
   readonly info: TeamInfo | undefined;
 }
 
-export function teamFormConfigureContext(
-  contexts: IExecutionContextProvider<ITeamFormState>,
-  state: ITeamFormState
-): ITeamFormConfigureContext {
+export function teamFormConfigureContext(contexts: IExecutionContextProvider<ITeamFormState>, state: ITeamFormState): ITeamFormConfigureContext {
   return {
     info: state.info,
   };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeam.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeam.tsx
index 85e2ea42c8..a79b450922 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeam.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeam.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -16,36 +15,36 @@ import { CreateTeamService } from './CreateTeamService';
 import { TeamForm } from './TeamForm';
 
 const styles = css`
-    team-create {
-      display: flex;
-      flex-direction: column;
-      height: 660px;
-      overflow: hidden;
-    }
+  team-create {
+    display: flex;
+    flex-direction: column;
+    height: 660px;
+    overflow: hidden;
+  }
 
-    title-bar {
-      composes: theme-border-color-background theme-typography--headline6 from global;
-      box-sizing: border-box;
-      padding: 16px 24px;
-      align-items: center;
-      display: flex;
-      font-weight: 400;
-      flex: auto 0 0;
-    }
+  title-bar {
+    composes: theme-border-color-background theme-typography--headline6 from global;
+    box-sizing: border-box;
+    padding: 16px 24px;
+    align-items: center;
+    display: flex;
+    font-weight: 400;
+    flex: auto 0 0;
+  }
 
-    team-create-content {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      overflow: auto;
-    }
+  team-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+  }
 
-    fill {
-      flex: 1;
-    }
-  `;
+  fill {
+    flex: 1;
+  }
+`;
 
 export const CreateTeam: React.FC = observer(function CreateTeam() {
   const service = useService(CreateTeamService);
@@ -57,13 +56,13 @@ export const CreateTeam: React.FC = observer(function CreateTeam() {
   return styled(styles)(
     <team-create>
       <title-bar>
-        <Translate token='administration_teams_team_creation' />
+        <Translate token="administration_teams_team_creation" />
         <fill />
         <IconButton name="cross" viewBox="0 0 16 16" onClick={service.cancelCreate} />
       </title-bar>
       <team-create-content>
         <TeamForm state={service.data} onCancel={service.cancelCreate} onSave={service.cancelCreate} />
       </team-create-content>
-    </team-create>
+    </team-create>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeamService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeamService.ts
index 6fd86b9676..05bf961504 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeamService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/CreateTeamService.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { TeamsResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
@@ -24,7 +23,7 @@ export class CreateTeamService {
   constructor(
     private readonly teamsAdministrationNavService: TeamsAdministrationNavService,
     private readonly teamFormService: TeamFormService,
-    private readonly teamsResource: TeamsResource
+    private readonly teamsResource: TeamsResource,
   ) {
     this.data = null;
 
@@ -42,10 +41,7 @@ export class CreateTeamService {
   }
 
   fillData(): void {
-    this.data = new TeamFormState(
-      this.teamFormService,
-      this.teamsResource
-    );
+    this.data = new TeamFormState(this.teamFormService, this.teamsResource);
   }
 
   create(): void {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx
index fd7c37fdc0..7e43ff79b8 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx
@@ -5,58 +5,58 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import {
-  Table,
-  TableBody,
-  TableItem,
-  TableColumnValue,
   BASE_CONTAINERS_STYLES,
-  Group,
   Button,
-  useObjectRef,
   getComputed,
   getSelectedItems,
-  useTranslate,
+  Group,
+  Table,
+  TableBody,
+  TableColumnValue,
+  TableItem,
+  useObjectRef,
   useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { Connection, DBDriverResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { getFilteredConnections } from './getFilteredConnections';
 import { GrantedConnectionsTableHeader, IFilterState } from './GrantedConnectionsTableHeader/GrantedConnectionsTableHeader';
 import { GrantedConnectionsTableInnerHeader } from './GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader';
 import { GrantedConnectionsTableItem } from './GrantedConnectionsTableItem';
 
 const styles = css`
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    table-container {
-      overflow: auto;
-    }
-    GrantedConnectionsTableHeader {
-      flex: 0 0 auto;
-    }
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-      width: 100%;
-    }
-  `;
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  table-container {
+    overflow: auto;
+  }
+  GrantedConnectionsTableHeader {
+    flex: 0 0 auto;
+  }
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+    width: 100%;
+  }
+`;
 
 interface Props {
   connectionList: Connection[];
@@ -65,12 +65,7 @@ interface Props {
   onGrant: (subjectIds: string[]) => void;
 }
 
-export const ConnectionList = observer<Props>(function ConnectionList({
-  connectionList,
-  grantedSubjects,
-  disabled,
-  onGrant,
-}) {
+export const ConnectionList = observer<Props>(function ConnectionList({ connectionList, grantedSubjects, disabled, onGrant }) {
   const props = useObjectRef({ onGrant });
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
@@ -94,22 +89,17 @@ export const ConnectionList = observer<Props>(function ConnectionList({
     <Group box medium overflow>
       <container>
         <GrantedConnectionsTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>{translate('ui_add')}</Button>
+          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>
+            {translate('ui_add')}
+          </Button>
         </GrantedConnectionsTableHeader>
         <table-container>
-          <Table
-            keys={keys}
-            selectedItems={selectedSubjects}
-            isItemSelectable={item => !grantedSubjects.includes(item)}
-            size='big'
-          >
+          <Table keys={keys} selectedItems={selectedSubjects} isItemSelectable={item => !grantedSubjects.includes(item)} size="big">
             <GrantedConnectionsTableInnerHeader disabled={disabled} />
             <TableBody>
               {!connections.length && filterState.filterValue && (
-                <TableItem item='tableInfo' selectDisabled>
-                  <TableColumnValue colSpan={5}>
-                    {translate('ui_search_no_result_placeholder')}
-                  </TableColumnValue>
+                <TableItem item="tableInfo" selectDisabled>
+                  <TableColumnValue colSpan={5}>{translate('ui_search_no_result_placeholder')}</TableColumnValue>
                 </TableItem>
               )}
               {connections.map(connection => {
@@ -130,6 +120,6 @@ export const ConnectionList = observer<Props>(function ConnectionList({
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnections.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnections.tsx
index b0dd484a89..2f65bbd2fb 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnections.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnections.tsx
@@ -5,14 +5,23 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
 import {
-  BASE_CONTAINERS_STYLES, ColoredContainer, Container, getComputed, Group,
-  InfoItem, Loader, TextPlaceholder, useAutoLoad, useResource, useStyles, useTranslate
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  getComputed,
+  Group,
+  InfoItem,
+  Loader,
+  TextPlaceholder,
+  useAutoLoad,
+  useResource,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { Connection, ConnectionInfoProjectKey, ConnectionInfoResource, DBDriverResource, isCloudConnection } from '@cloudbeaver/core-connections';
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
@@ -41,10 +50,7 @@ const styles = css`
   }
 `;
 
-export const GrantedConnections: TabContainerPanelComponent<ITeamFormProps> = observer(function GrantedConnections({
-  tabId,
-  state: formState,
-}) {
+export const GrantedConnections: TabContainerPanelComponent<ITeamFormProps> = observer(function GrantedConnections({ tabId, state: formState }) {
   const style = useStyles(BASE_CONTAINERS_STYLES, styles);
   const translate = useTranslate();
 
@@ -55,30 +61,16 @@ export const GrantedConnections: TabContainerPanelComponent<ITeamFormProps> = ob
   const projects = useResource(GrantedConnections, ProjectInfoResource, CachedMapAllKey);
 
   const globalConnectionsKey = ConnectionInfoProjectKey(
-    ...(projects.data as Array<ProjectInfo | undefined>)
-      .filter(isGlobalProject)
-      .map(project => project.id)
+    ...(projects.data as Array<ProjectInfo | undefined>).filter(isGlobalProject).map(project => project.id),
   );
 
-  useResource(
-    GrantedConnections,
-    DBDriverResource,
-    CachedMapAllKey,
-    { active: selected }
-  );
+  useResource(GrantedConnections, DBDriverResource, CachedMapAllKey, { active: selected });
 
-  const connectionsLoader = useResource(
-    GrantedConnections,
-    ConnectionInfoResource,
-    globalConnectionsKey,
-    { active: selected }
-  );
+  const connectionsLoader = useResource(GrantedConnections, ConnectionInfoResource, globalConnectionsKey, { active: selected });
 
   const connections = connectionsLoader.data as Connection[];
 
-  const grantedConnections = getComputed(() => connections
-    .filter(connection => state.state.grantedSubjects.includes(connection.id))
-  );
+  const grantedConnections = getComputed(() => connections.filter(connection => state.state.grantedSubjects.includes(connection.id)));
 
   useAutoLoad(state, selected && !loaded);
 
@@ -100,35 +92,37 @@ export const GrantedConnections: TabContainerPanelComponent<ITeamFormProps> = ob
 
   return styled(style)(
     <Loader state={[state.state]}>
-      {() => styled(style)(
-        <ColoredContainer parent gap vertical>
-          {!connections.length ? (
-            <Group large>
-              <TextPlaceholder>{translate('administration_teams_team_granted_connections_empty')}</TextPlaceholder>
-            </Group>
-          ) : (
-            <>
-              {info && <InfoItem info={info} />}
-              <Container gap overflow>
-                <GrantedConnectionList
-                  grantedConnections={grantedConnections}
-                  disabled={formState.disabled}
-                  onEdit={state.edit}
-                  onRevoke={state.revoke}
-                />
-                {state.state.editing && (
-                  <ConnectionList
-                    connectionList={connections}
-                    grantedSubjects={state.state.grantedSubjects}
+      {() =>
+        styled(style)(
+          <ColoredContainer parent gap vertical>
+            {!connections.length ? (
+              <Group large>
+                <TextPlaceholder>{translate('administration_teams_team_granted_connections_empty')}</TextPlaceholder>
+              </Group>
+            ) : (
+              <>
+                {info && <InfoItem info={info} />}
+                <Container gap overflow>
+                  <GrantedConnectionList
+                    grantedConnections={grantedConnections}
                     disabled={formState.disabled}
-                    onGrant={state.grant}
+                    onEdit={state.edit}
+                    onRevoke={state.revoke}
                   />
-                )}
-              </Container>
-            </>
-          )}
-        </ColoredContainer>
-      )}
-    </Loader>
+                  {state.state.editing && (
+                    <ConnectionList
+                      connectionList={connections}
+                      grantedSubjects={state.state.grantedSubjects}
+                      disabled={formState.disabled}
+                      onGrant={state.grant}
+                    />
+                  )}
+                </Container>
+              </>
+            )}
+          </ColoredContainer>,
+        )
+      }
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx
index ba8cb9f52f..adc825277b 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx
@@ -5,59 +5,59 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import {
+  BASE_CONTAINERS_STYLES,
+  Button,
+  getComputed,
+  getSelectedItems,
+  Group,
   Table,
   TableBody,
-  TableItem,
   TableColumnValue,
-  BASE_CONTAINERS_STYLES,
-  Group,
-  Button,
+  TableItem,
   useObjectRef,
-  getSelectedItems,
-  getComputed,
+  useStyles,
   useTranslate,
-  useStyles
 } from '@cloudbeaver/core-blocks';
 import { Connection, DBDriverResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 
-
 import { getFilteredConnections } from './getFilteredConnections';
 import { GrantedConnectionsTableHeader, IFilterState } from './GrantedConnectionsTableHeader/GrantedConnectionsTableHeader';
 import { GrantedConnectionsTableInnerHeader } from './GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader';
 import { GrantedConnectionsTableItem } from './GrantedConnectionsTableItem';
 
 const styles = css`
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    GrantedConnectionsTableHeader {
-      flex: 0 0 auto;
-    }
-    table-container {
-      overflow: auto;
-    }
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-      width: 100%;
-    }
-  `;
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  GrantedConnectionsTableHeader {
+    flex: 0 0 auto;
+  }
+  table-container {
+    overflow: auto;
+  }
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+    width: 100%;
+  }
+`;
 
 interface Props {
   grantedConnections: Connection[];
@@ -66,12 +66,7 @@ interface Props {
   onEdit: () => void;
 }
 
-export const GrantedConnectionList = observer<Props>(function GrantedConnectionList({
-  grantedConnections,
-  disabled,
-  onRevoke,
-  onEdit,
-}) {
+export const GrantedConnectionList = observer<Props>(function GrantedConnectionList({ grantedConnections, disabled, onRevoke, onEdit }) {
   const props = useObjectRef({ onRevoke, onEdit });
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
@@ -104,18 +99,20 @@ export const GrantedConnectionList = observer<Props>(function GrantedConnectionL
     <Group box medium overflow>
       <container>
         <GrantedConnectionsTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>{translate('ui_delete')}</Button>
-          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>{translate('ui_edit')}</Button>
+          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>
+            {translate('ui_delete')}
+          </Button>
+          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>
+            {translate('ui_edit')}
+          </Button>
         </GrantedConnectionsTableHeader>
         <table-container>
-          <Table keys={keys} selectedItems={selectedSubjects} size='big'>
+          <Table keys={keys} selectedItems={selectedSubjects} size="big">
             <GrantedConnectionsTableInnerHeader disabled={disabled} />
             <TableBody>
               {tableInfoText && (
-                <TableItem item='tableInfo' selectDisabled>
-                  <TableColumnValue colSpan={5}>
-                    {translate(tableInfoText)}
-                  </TableColumnValue>
+                <TableItem item="tableInfo" selectDisabled>
+                  <TableColumnValue colSpan={5}>{translate(tableInfoText)}</TableColumnValue>
                 </TableItem>
               )}
               {connections.map(connection => {
@@ -136,6 +133,6 @@ export const GrantedConnectionList = observer<Props>(function GrantedConnectionL
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTabService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTabService.ts
index c83c829490..2f8894c3d8 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTabService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { TeamsResource } from '@cloudbeaver/core-authentication';
@@ -35,7 +34,7 @@ export class GrantedConnectionsTabService extends Bootstrap {
     private readonly teamsResource: TeamsResource,
     private readonly graphQLService: GraphQLService,
     private readonly notificationService: NotificationService,
-    private readonly projectInfoResource: ProjectInfoResource
+    private readonly projectInfoResource: ProjectInfoResource,
   ) {
     super();
     this.key = 'granted-connections';
@@ -52,15 +51,12 @@ export class GrantedConnectionsTabService extends Bootstrap {
       panel: () => GrantedConnections,
     });
 
-    this.teamFormService.afterFormSubmittingTask.addHandler(executorHandlerFilter(
-      () => this.isEnabled(),
-      this.save.bind(this)
-    ));
+    this.teamFormService.afterFormSubmittingTask.addHandler(executorHandlerFilter(() => this.isEnabled(), this.save.bind(this)));
 
     this.teamFormService.configureTask.addHandler(() => this.projectInfoResource.load(CachedMapAllKey));
   }
 
-  load(): Promise<void> | void { }
+  load(): Promise<void> | void {}
 
   private isEnabled(): boolean {
     return this.projectInfoResource.values.some(isGlobalProject);
@@ -76,10 +72,7 @@ export class GrantedConnectionsTabService extends Bootstrap {
     });
   }
 
-  private async save(
-    data: ITeamFormSubmitData,
-    contexts: IExecutionContextProvider<ITeamFormSubmitData>
-  ) {
+  private async save(data: ITeamFormSubmitData, contexts: IExecutionContextProvider<ITeamFormSubmitData>) {
     const config = contexts.getContext(teamContext);
     const status = contexts.getContext(this.teamFormService.configurationStatusContext);
 
@@ -87,11 +80,7 @@ export class GrantedConnectionsTabService extends Bootstrap {
       return;
     }
 
-    const state = this.teamFormService.tabsContainer.getTabState<IGrantedConnectionsTabState>(
-      data.state.partsState,
-      this.key,
-      { state: data.state }
-    );
+    const state = this.teamFormService.tabsContainer.getTabState<IGrantedConnectionsTabState>(data.state.partsState, this.key, { state: data.state });
 
     if (!config.teamId || !state.loaded) {
       return;
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx
index 8a54e85318..e99c1e56f7 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx
@@ -5,11 +5,10 @@
  * 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 { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Filter, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 export interface IFilterState {
   filterValue: string;
@@ -22,24 +21,24 @@ interface Props extends React.PropsWithChildren {
 }
 
 const styles = css`
-    buttons {
-      display: flex;
-      gap: 16px;
-    }
-    header {
-      composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
-      overflow: hidden;
-      position: sticky;
-      top: 0;
-      z-index: 1;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 16px;
-      gap: 16px;
-      border-bottom: 1px solid;
-    }
-  `;
+  buttons {
+    display: flex;
+    gap: 16px;
+  }
+  header {
+    composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
+    overflow: hidden;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    gap: 16px;
+    border-bottom: 1px solid;
+  }
+`;
 
 export const GrantedConnectionsTableHeader = observer<Props>(function GrantedConnectionsTableHeader({ filterState, disabled, className, children }) {
   const translate = useTranslate();
@@ -48,12 +47,10 @@ export const GrantedConnectionsTableHeader = observer<Props>(function GrantedCon
       <Filter
         disabled={disabled}
         placeholder={translate('administration_teams_team_granted_connections_search_placeholder')}
-        name='filterValue'
+        name="filterValue"
         state={filterState}
       />
-      <buttons>
-        {children}
-      </buttons>
-    </header>
+      <buttons>{children}</buttons>
+    </header>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx
index c48c1d4bb5..0767ff42d0 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx
@@ -5,7 +5,6 @@
  * 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 { TableColumnHeader, TableHeader, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
@@ -15,13 +14,12 @@ interface Props {
   className?: string;
 }
 
-
 export const GrantedConnectionsTableInnerHeader = observer<Props>(function GrantedConnectionsTableInnerHeader({ disabled, className }) {
   const translate = useTranslate();
   return (
     <TableHeader className={className} fixed>
       <TableColumnHeader min flex centerContent>
-        <TableSelect id='selectConnections' disabled={disabled} />
+        <TableSelect id="selectConnections" disabled={disabled} />
       </TableColumnHeader>
       <TableColumnHeader min />
       <TableColumnHeader>{translate('connections_connection_name')}</TableColumnHeader>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableItem.tsx
index 7c1d71680d..efb35abf6d 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableItem.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsTableItem.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -30,22 +29,27 @@ const style = css`
 `;
 
 export const GrantedConnectionsTableItem = observer<Props>(function GrantedConnectionsTableItem({
-  id, name, host, icon, iconTooltip, tooltip, disabled, className,
+  id,
+  name,
+  host,
+  icon,
+  iconTooltip,
+  tooltip,
+  disabled,
+  className,
 }) {
   return styled(style)(
-    <TableItem
-      item={id}
-      title={tooltip}
-      disabled={disabled}
-      selectDisabled={disabled}
-      className={className}
-    >
+    <TableItem item={id} title={tooltip} disabled={disabled} selectDisabled={disabled} className={className}>
       <TableColumnValue centerContent flex>
         <TableItemSelect disabled={disabled} />
       </TableColumnValue>
-      <TableColumnValue flex centerContent>{icon && <StaticImage icon={icon} title={iconTooltip} />}</TableColumnValue>
-      <TableColumnValue title={name} ellipsis>{name}</TableColumnValue>
+      <TableColumnValue flex centerContent>
+        {icon && <StaticImage icon={icon} title={iconTooltip} />}
+      </TableColumnValue>
+      <TableColumnValue title={name} ellipsis>
+        {name}
+      </TableColumnValue>
       <TableColumnValue>{host && host}</TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/getFilteredConnections.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/getFilteredConnections.ts
index 047c3e36e8..2853036bb2 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/getFilteredConnections.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/getFilteredConnections.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { isCloudConnection } from '@cloudbeaver/core-connections';
 import type { DatabaseConnectionFragment } from '@cloudbeaver/core-sdk';
 
@@ -13,13 +12,8 @@ import type { DatabaseConnectionFragment } from '@cloudbeaver/core-sdk';
  * @param  {DatabaseConnectionFragment[]} connections
  * @param  {string} filter
  */
-export function getFilteredConnections(
-  connections: DatabaseConnectionFragment[],
-  filter: string
-): DatabaseConnectionFragment[] {
+export function getFilteredConnections(connections: DatabaseConnectionFragment[], filter: string): DatabaseConnectionFragment[] {
   return connections
-    .filter(
-      connection => connection.name.toLowerCase().includes(filter.toLowerCase()) && !isCloudConnection(connection)
-    )
-    .sort((a, b) => (a.name).localeCompare(b.name));
+    .filter(connection => connection.name.toLowerCase().includes(filter.toLowerCase()) && !isCloudConnection(connection))
+    .sort((a, b) => a.name.localeCompare(b.name));
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/useGrantedConnections.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/useGrantedConnections.tsx
index 9a52c25c1e..66f3f2478e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/useGrantedConnections.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/useGrantedConnections.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import { TeamInfo, TeamsResource } from '@cloudbeaver/core-authentication';
@@ -32,51 +31,53 @@ export function useGrantedConnections(team: TeamInfo, mode: TeamFormMode): Reado
   const notificationService = useService(NotificationService);
   const state = useTabState<IGrantedConnectionsTabState>();
 
-  return useObservableRef(() => ({
-    get changed() {
-      return !isArraysEqual(this.state.initialGrantedSubjects, this.state.grantedSubjects);
-    },
-    isLoading() {
-      return this.state.loading;
-    },
-    isLoaded() {
-      return this.state.loaded;
-    },
-    isError() {
-      return false;
-    },
-    edit() {
-      this.state.editing = !this.state.editing;
-    },
-    grant(subjectIds: string[]) {
-      this.state.grantedSubjects.push(...subjectIds);
-    },
-    revoke(subjectIds: string[]) {
-      this.state.grantedSubjects = this.state.grantedSubjects.filter(subject => !subjectIds.includes(subject));
-    },
-    async load() {
-      if (this.state.loaded || this.state.loading) {
-        return;
-      }
-
-      try {
-        this.state.loading = true;
-
-        if (this.mode === 'edit') {
-          const grantInfo = await this.resource.getSubjectConnectionAccess(this.team.teamId);
-          this.state.grantedSubjects = grantInfo.map(subject => subject.dataSourceId);
-          this.state.initialGrantedSubjects = this.state.grantedSubjects.slice();
+  return useObservableRef(
+    () => ({
+      get changed() {
+        return !isArraysEqual(this.state.initialGrantedSubjects, this.state.grantedSubjects);
+      },
+      isLoading() {
+        return this.state.loading;
+      },
+      isLoaded() {
+        return this.state.loaded;
+      },
+      isError() {
+        return false;
+      },
+      edit() {
+        this.state.editing = !this.state.editing;
+      },
+      grant(subjectIds: string[]) {
+        this.state.grantedSubjects.push(...subjectIds);
+      },
+      revoke(subjectIds: string[]) {
+        this.state.grantedSubjects = this.state.grantedSubjects.filter(subject => !subjectIds.includes(subject));
+      },
+      async load() {
+        if (this.state.loaded || this.state.loading) {
+          return;
         }
 
-        this.state.loaded = true;
-      } catch (exception: any) {
-        this.notificationService.logException(exception, `Error getting granted connections for "${this.team.teamId}"`);
-      } finally {
-        this.state.loading = false;
-      }
-    },
-  }),
-  { state: observable.ref, changed: computed, grant: action.bound, revoke: action.bound, edit: action.bound },
-  { state, team, mode, resource, notificationService },
-  ['load']);
+        try {
+          this.state.loading = true;
+
+          if (this.mode === 'edit') {
+            const grantInfo = await this.resource.getSubjectConnectionAccess(this.team.teamId);
+            this.state.grantedSubjects = grantInfo.map(subject => subject.dataSourceId);
+            this.state.initialGrantedSubjects = this.state.grantedSubjects.slice();
+          }
+
+          this.state.loaded = true;
+        } catch (exception: any) {
+          this.notificationService.logException(exception, `Error getting granted connections for "${this.team.teamId}"`);
+        } finally {
+          this.state.loading = false;
+        }
+      },
+    }),
+    { state: observable.ref, changed: computed, grant: action.bound, revoke: action.bound, edit: action.bound },
+    { state, team, mode, resource, notificationService },
+    ['load'],
+  );
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx
index eacbfb3ca4..3e8317b69e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
@@ -13,51 +12,52 @@ import styled, { css } from 'reshadow';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import {
-  Table,
-  TableBody,
-  TableItem,
-  TableColumnValue,
   BASE_CONTAINERS_STYLES,
-  Group,
   Button,
-  useObjectRef,
   getComputed,
   getSelectedItems,
+  Group,
+  Table,
+  TableBody,
+  TableColumnValue,
+  TableItem,
+  useObjectRef,
+  useStyles,
   useTranslate,
-  useStyles
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
-
 import { getFilteredUsers } from './getFilteredUsers';
 import { GrantedUsersTableHeader, IFilterState } from './GrantedUsersTableHeader/GrantedUsersTableHeader';
 import { GrantedUsersTableInnerHeader } from './GrantedUsersTableHeader/GrantedUsersTableInnerHeader';
 import { GrantedUsersTableItem } from './GrantedUsersTableItem';
 
 const styles = css`
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    GrantedUsersTableHeader {
-      flex: 0 0 auto;
-    }
-    table-container {
-      overflow: auto;
-    }
-  `;
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  GrantedUsersTableHeader {
+    flex: 0 0 auto;
+  }
+  table-container {
+    overflow: auto;
+  }
+`;
 
 interface Props {
   grantedUsers: AdminUserInfoFragment[];
@@ -66,9 +66,7 @@ interface Props {
   onEdit: () => void;
 }
 
-export const GrantedUserList = observer<Props>(function GrantedUserList({
-  grantedUsers, disabled, onRevoke, onEdit,
-}) {
+export const GrantedUserList = observer<Props>(function GrantedUserList({ grantedUsers, disabled, onRevoke, onEdit }) {
   const props = useObjectRef({ onRevoke, onEdit });
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
@@ -101,22 +99,20 @@ export const GrantedUserList = observer<Props>(function GrantedUserList({
     <Group box medium overflow>
       <container>
         <GrantedUsersTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>{translate('ui_delete')}</Button>
-          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>{translate('ui_edit')}</Button>
+          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>
+            {translate('ui_delete')}
+          </Button>
+          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>
+            {translate('ui_edit')}
+          </Button>
         </GrantedUsersTableHeader>
         <table-container>
-          <Table
-            keys={keys}
-            selectedItems={selectedSubjects}
-            isItemSelectable={item => !usersResource.isActiveUser(item)}
-          >
+          <Table keys={keys} selectedItems={selectedSubjects} isItemSelectable={item => !usersResource.isActiveUser(item)}>
             <GrantedUsersTableInnerHeader disabled={disabled} />
             <TableBody>
               {tableInfoText && (
-                <TableItem item='tableInfo' selectDisabled>
-                  <TableColumnValue colSpan={5}>
-                    {translate(tableInfoText)}
-                  </TableColumnValue>
+                <TableItem item="tableInfo" selectDisabled>
+                  <TableColumnValue colSpan={5}>{translate(tableInfoText)}</TableColumnValue>
                 </TableItem>
               )}
               {users.map(user => {
@@ -127,7 +123,7 @@ export const GrantedUserList = observer<Props>(function GrantedUserList({
                     id={user.userId}
                     name={`${user.userId}${activeUser ? ' (you)' : ''}`}
                     tooltip={activeUser ? translate('administration_teams_team_granted_users_permission_denied') : user.userId}
-                    icon='/icons/user.svg'
+                    icon="/icons/user.svg"
                     iconTooltip={translate('authentication_user_icon_tooltip')}
                     disabled={disabled}
                   />
@@ -137,6 +133,6 @@ export const GrantedUserList = observer<Props>(function GrantedUserList({
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx
index 903818861a..dcc3a85422 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx
@@ -5,19 +5,27 @@
  * 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 { AdminUser, UsersResource } from '@cloudbeaver/core-authentication';
 import {
-  BASE_CONTAINERS_STYLES, ColoredContainer, Container, getComputed, Group,
-  InfoItem, Loader, TextPlaceholder, useAutoLoad, useResource, useStyles, useTranslate
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  getComputed,
+  Group,
+  InfoItem,
+  Loader,
+  TextPlaceholder,
+  useAutoLoad,
+  useResource,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 
-
 import type { ITeamFormProps } from '../ITeamFormProps';
 import { GrantedUserList } from './GrantedUserList';
 import { useGrantedUsers } from './useGrantedUsers';
@@ -39,10 +47,7 @@ const styles = css`
   }
 `;
 
-export const GrantedUsers: TabContainerPanelComponent<ITeamFormProps> = observer(function GrantedUsers({
-  tabId,
-  state: formState,
-}) {
+export const GrantedUsers: TabContainerPanelComponent<ITeamFormProps> = observer(function GrantedUsers({ tabId, state: formState }) {
   const style = useStyles(BASE_CONTAINERS_STYLES, styles);
   const translate = useTranslate();
 
@@ -51,8 +56,8 @@ export const GrantedUsers: TabContainerPanelComponent<ITeamFormProps> = observer
 
   const users = useResource(GrantedUsers, UsersResource, CachedMapAllKey, { active: selected });
 
-  const grantedUsers = getComputed(() => users.data
-    .filter<AdminUser>((user): user is AdminUser => !!user && state.state.grantedUsers.includes(user.userId))
+  const grantedUsers = getComputed(() =>
+    users.data.filter<AdminUser>((user): user is AdminUser => !!user && state.state.grantedUsers.includes(user.userId)),
   );
 
   useAutoLoad(state, selected && !state.state.loaded);
@@ -63,35 +68,32 @@ export const GrantedUsers: TabContainerPanelComponent<ITeamFormProps> = observer
 
   return styled(style)(
     <Loader state={[state.state]}>
-      {() => styled(style)(
-        <ColoredContainer parent gap vertical>
-          {!users.resource.values.length ? (
-            <Group keepSize large>
-              <TextPlaceholder>{translate('administration_teams_team_granted_users_empty')}</TextPlaceholder>
-            </Group>
-          ) : (
-            <>
-              {formState.mode === 'edit' && state.changed && <InfoItem info='ui_save_reminder' />}
-              <Container gap overflow>
-                <GrantedUserList
-                  grantedUsers={grantedUsers}
-                  disabled={formState.disabled}
-                  onEdit={state.edit}
-                  onRevoke={state.revoke}
-                />
-                {state.state.editing && (
-                  <UserList
-                    userList={users.resource.values}
-                    grantedUsers={state.state.grantedUsers}
-                    disabled={formState.disabled}
-                    onGrant={state.grant}
-                  />
-                )}
-              </Container>
-            </>
-          )}
-        </ColoredContainer>
-      )}
-    </Loader>
+      {() =>
+        styled(style)(
+          <ColoredContainer parent gap vertical>
+            {!users.resource.values.length ? (
+              <Group keepSize large>
+                <TextPlaceholder>{translate('administration_teams_team_granted_users_empty')}</TextPlaceholder>
+              </Group>
+            ) : (
+              <>
+                {formState.mode === 'edit' && state.changed && <InfoItem info="ui_save_reminder" />}
+                <Container gap overflow>
+                  <GrantedUserList grantedUsers={grantedUsers} disabled={formState.disabled} onEdit={state.edit} onRevoke={state.revoke} />
+                  {state.state.editing && (
+                    <UserList
+                      userList={users.resource.values}
+                      grantedUsers={state.state.grantedUsers}
+                      disabled={formState.disabled}
+                      onGrant={state.grant}
+                    />
+                  )}
+                </Container>
+              </>
+            )}
+          </ColoredContainer>,
+        )
+      }
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTabService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTabService.ts
index 7b25c3d0e7..d5fd23360b 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTabService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { TeamsResource, UsersResource } from '@cloudbeaver/core-authentication';
@@ -32,7 +31,7 @@ export class GrantedUsersTabService extends Bootstrap {
     private readonly teamFormService: TeamFormService,
     private readonly usersResource: UsersResource,
     private readonly teamsResource: TeamsResource,
-    private readonly notificationService: NotificationService
+    private readonly notificationService: NotificationService,
   ) {
     super();
     this.key = 'granted-users';
@@ -51,7 +50,7 @@ export class GrantedUsersTabService extends Bootstrap {
     this.teamFormService.afterFormSubmittingTask.addHandler(this.save.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
   private stateGetter(context: ITeamFormProps): MetadataValueGetter<string, IGrantedUsersTabState> {
     return () => ({
@@ -63,10 +62,7 @@ export class GrantedUsersTabService extends Bootstrap {
     });
   }
 
-  private async save(
-    data: ITeamFormSubmitData,
-    contexts: IExecutionContextProvider<ITeamFormSubmitData>
-  ) {
+  private async save(data: ITeamFormSubmitData, contexts: IExecutionContextProvider<ITeamFormSubmitData>) {
     const config = contexts.getContext(teamContext);
     const status = contexts.getContext(this.teamFormService.configurationStatusContext);
 
@@ -74,11 +70,7 @@ export class GrantedUsersTabService extends Bootstrap {
       return;
     }
 
-    const state = this.teamFormService.tabsContainer.getTabState<IGrantedUsersTabState>(
-      data.state.partsState,
-      this.key,
-      { state: data.state }
-    );
+    const state = this.teamFormService.tabsContainer.getTabState<IGrantedUsersTabState>(data.state.partsState, this.key, { state: data.state });
 
     if (!config.teamId || !state.loaded) {
       return;
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx
index 7945fd99af..daa9300d5f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx
@@ -5,13 +5,10 @@
  * 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 { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
-
-
+import { Filter, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 export interface IFilterState {
   filterValue: string;
@@ -24,24 +21,24 @@ interface Props extends React.PropsWithChildren {
 }
 
 const styles = css`
-    buttons {
-      display: flex;
-      gap: 16px;
-    }
-    header {
-      composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
-      overflow: hidden;
-      position: sticky;
-      top: 0;
-      z-index: 1;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 16px;
-      gap: 16px;
-      border-bottom: 1px solid;
-    }
-  `;
+  buttons {
+    display: flex;
+    gap: 16px;
+  }
+  header {
+    composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
+    overflow: hidden;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    gap: 16px;
+    border-bottom: 1px solid;
+  }
+`;
 
 export const GrantedUsersTableHeader = observer<Props>(function GrantedUsersTableHeader({ filterState, disabled, className, children }) {
   const translate = useTranslate();
@@ -50,12 +47,10 @@ export const GrantedUsersTableHeader = observer<Props>(function GrantedUsersTabl
       <Filter
         disabled={disabled}
         placeholder={translate('administration_teams_team_granted_users_search_placeholder')}
-        name='filterValue'
+        name="filterValue"
         state={filterState}
       />
-      <buttons>
-        {children}
-      </buttons>
-    </header>
+      <buttons>{children}</buttons>
+    </header>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx
index 55f5de45bd..ad33b5345e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx
@@ -5,7 +5,6 @@
  * 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 { TableColumnHeader, TableHeader, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
@@ -21,7 +20,7 @@ export const GrantedUsersTableInnerHeader = observer<Props>(function GrantedUser
   return (
     <TableHeader className={className} fixed>
       <TableColumnHeader min>
-        <TableSelect id='selectUsers' disabled={disabled} />
+        <TableSelect id="selectUsers" disabled={disabled} />
       </TableColumnHeader>
       <TableColumnHeader min />
       <TableColumnHeader>{translate('administration_teams_team_granted_users_user_id')}</TableColumnHeader>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx
index 20c0086b22..abb9f21102 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -28,22 +27,16 @@ const style = css`
   }
 `;
 
-export const GrantedUsersTableItem = observer<Props>(function GrantedUsersTableItem({
-  id, name, icon, iconTooltip, tooltip, disabled, className,
-}) {
+export const GrantedUsersTableItem = observer<Props>(function GrantedUsersTableItem({ id, name, icon, iconTooltip, tooltip, disabled, className }) {
   return styled(style)(
-    <TableItem
-      item={id}
-      title={tooltip}
-      disabled={disabled}
-      selectDisabled={disabled}
-      className={className}
-    >
+    <TableItem item={id} title={tooltip} disabled={disabled} selectDisabled={disabled} className={className}>
       <TableColumnValue centerContent flex>
         <TableItemSelect disabled={disabled} />
       </TableColumnValue>
-      <TableColumnValue><StaticImage icon={icon} title={iconTooltip} /></TableColumnValue>
+      <TableColumnValue>
+        <StaticImage icon={icon} title={iconTooltip} />
+      </TableColumnValue>
       <TableColumnValue>{name}</TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx
index 33bea3aa3d..f46e665edf 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
@@ -13,50 +12,51 @@ import styled, { css } from 'reshadow';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import {
-  Table,
-  TableBody,
-  TableItem,
-  TableColumnValue,
   BASE_CONTAINERS_STYLES,
-  Group,
   Button,
-  useObjectRef,
   getComputed,
   getSelectedItems,
-  useTranslate,
+  Group,
+  Table,
+  TableBody,
+  TableColumnValue,
+  TableItem,
+  useObjectRef,
   useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
-
 import { getFilteredUsers } from './getFilteredUsers';
 import { GrantedUsersTableHeader, IFilterState } from './GrantedUsersTableHeader/GrantedUsersTableHeader';
 import { GrantedUsersTableInnerHeader } from './GrantedUsersTableHeader/GrantedUsersTableInnerHeader';
 import { GrantedUsersTableItem } from './GrantedUsersTableItem';
 
 const styles = css`
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    table-container {
-      overflow: auto;
-    }
-    GrantedUsersTableHeader {
-      flex: 0 0 auto;
-    }
-  `;
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  table-container {
+    overflow: auto;
+  }
+  GrantedUsersTableHeader {
+    flex: 0 0 auto;
+  }
+`;
 
 interface Props {
   userList: AdminUserInfoFragment[];
@@ -65,12 +65,7 @@ interface Props {
   onGrant: (subjectIds: string[]) => void;
 }
 
-export const UserList = observer<Props>(function UserList({
-  userList,
-  grantedUsers,
-  disabled,
-  onGrant,
-}) {
+export const UserList = observer<Props>(function UserList({ userList, grantedUsers, disabled, onGrant }) {
   const props = useObjectRef({ onGrant });
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
@@ -94,7 +89,9 @@ export const UserList = observer<Props>(function UserList({
     <Group box medium overflow>
       <container>
         <GrantedUsersTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>{translate('ui_add')}</Button>
+          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>
+            {translate('ui_add')}
+          </Button>
         </GrantedUsersTableHeader>
         <table-container>
           <Table
@@ -105,10 +102,8 @@ export const UserList = observer<Props>(function UserList({
             <GrantedUsersTableInnerHeader disabled={disabled} />
             <TableBody>
               {!users.length && filterState.filterValue && (
-                <TableItem item='tableInfo' selectDisabled>
-                  <TableColumnValue colSpan={5}>
-                    {translate('ui_search_no_result_placeholder')}
-                  </TableColumnValue>
+                <TableItem item="tableInfo" selectDisabled>
+                  <TableColumnValue colSpan={5}>{translate('ui_search_no_result_placeholder')}</TableColumnValue>
                 </TableItem>
               )}
               {users.map(user => {
@@ -119,7 +114,7 @@ export const UserList = observer<Props>(function UserList({
                     id={user.userId}
                     name={`${user.userId}${activeUser ? ' (you)' : ''}`}
                     tooltip={activeUser ? translate('administration_teams_team_granted_users_permission_denied') : user.userId}
-                    icon='/icons/user.svg'
+                    icon="/icons/user.svg"
                     iconTooltip={translate('authentication_user_icon_tooltip')}
                     disabled={disabled}
                   />
@@ -129,6 +124,6 @@ export const UserList = observer<Props>(function UserList({
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/getFilteredUsers.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/getFilteredUsers.ts
index 53d6711803..fd38bb2e84 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/getFilteredUsers.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/getFilteredUsers.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
 /**
@@ -15,5 +14,5 @@ import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 export function getFilteredUsers(users: AdminUserInfoFragment[], filter: string): AdminUserInfoFragment[] {
   return users
     .filter(user => user.enabled && user.userId.toLowerCase().includes(filter.toLowerCase()))
-    .sort((a, b) => (a.userId).localeCompare(b.userId));
+    .sort((a, b) => a.userId.localeCompare(b.userId));
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/useGrantedUsers.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/useGrantedUsers.tsx
index 9cfa0010b7..db1035983b 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/useGrantedUsers.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/useGrantedUsers.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import { TeamInfo, TeamsResource } from '@cloudbeaver/core-authentication';
@@ -32,51 +31,53 @@ export function useGrantedUsers(team: TeamInfo, mode: TeamFormMode): Readonly<St
   const notificationService = useService(NotificationService);
   const state = useTabState<IGrantedUsersTabState>();
 
-  return useObservableRef(() => ({
-    get changed() {
-      return !isArraysEqual(this.state.initialGrantedUsers, this.state.grantedUsers);
-    },
-    isLoading() {
-      return this.state.loading;
-    },
-    isLoaded() {
-      return this.state.loaded;
-    },
-    isError() {
-      return false;
-    },
-    edit() {
-      this.state.editing = !this.state.editing;
-    },
-    revoke(subjectIds: string[]) {
-      this.state.grantedUsers = this.state.grantedUsers.filter(subject => !subjectIds.includes(subject));
-    },
-    grant(subjectIds: string[]) {
-      this.state.grantedUsers.push(...subjectIds);
-    },
-    async load() {
-      if (this.state.loaded || this.state.loading) {
-        return;
-      }
-
-      try {
-        this.state.loading = true;
-
-        if (this.mode === 'edit') {
-          const grantedUsers = await this.resource.loadGrantedUsers(this.team.teamId);
-          this.state.grantedUsers = grantedUsers;
-          this.state.initialGrantedUsers = this.state.grantedUsers.slice();
+  return useObservableRef(
+    () => ({
+      get changed() {
+        return !isArraysEqual(this.state.initialGrantedUsers, this.state.grantedUsers);
+      },
+      isLoading() {
+        return this.state.loading;
+      },
+      isLoaded() {
+        return this.state.loaded;
+      },
+      isError() {
+        return false;
+      },
+      edit() {
+        this.state.editing = !this.state.editing;
+      },
+      revoke(subjectIds: string[]) {
+        this.state.grantedUsers = this.state.grantedUsers.filter(subject => !subjectIds.includes(subject));
+      },
+      grant(subjectIds: string[]) {
+        this.state.grantedUsers.push(...subjectIds);
+      },
+      async load() {
+        if (this.state.loaded || this.state.loading) {
+          return;
         }
 
-        this.state.loaded = true;
-      } catch (exception: any) {
-        this.notificationService.logException(exception, "Can't load users info");
-      } finally {
-        this.state.loading = false;
-      }
-    },
-  }),
-  { state: observable.ref, changed: computed, edit: action.bound, revoke: action.bound, grant: action.bound },
-  { state, team, mode, resource, notificationService },
-  ['load']);
+        try {
+          this.state.loading = true;
+
+          if (this.mode === 'edit') {
+            const grantedUsers = await this.resource.loadGrantedUsers(this.team.teamId);
+            this.state.grantedUsers = grantedUsers;
+            this.state.initialGrantedUsers = this.state.grantedUsers.slice();
+          }
+
+          this.state.loaded = true;
+        } catch (exception: any) {
+          this.notificationService.logException(exception, "Can't load users info");
+        } finally {
+          this.state.loading = false;
+        }
+      },
+    }),
+    { state: observable.ref, changed: computed, edit: action.bound, revoke: action.bound, grant: action.bound },
+    { state, team, mode, resource, notificationService },
+    ['load'],
+  );
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/ITeamFormProps.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/ITeamFormProps.ts
index e561a28be4..5a4c3561b0 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/ITeamFormProps.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/ITeamFormProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TeamInfo, TeamsResource } from '@cloudbeaver/core-authentication';
 import type { IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
 import type { MetadataMap } from '@cloudbeaver/core-utils';
@@ -29,9 +28,7 @@ export interface ITeamFormState {
   readonly load: () => Promise<void>;
   readonly loadTeamInfo: () => Promise<TeamInfo | undefined>;
   readonly save: () => Promise<void>;
-  readonly setOptions: (
-    mode: TeamFormMode,
-  ) => this;
+  readonly setOptions: (mode: TeamFormMode) => this;
 }
 
 export interface ITeamFormProps {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/Permissions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/Permissions.tsx
index b96435e44a..b4635ca821 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/Permissions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/Permissions.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -53,7 +52,7 @@ export const Permissions = observer<ITeamFormProps>(function Permissions({ state
             id={permission.id}
             value={permission.id}
             title={tooltip}
-            name='teamPermissions'
+            name="teamPermissions"
             state={state.config}
             readOnly={state.readonly}
             disabled={state.disabled}
@@ -63,6 +62,6 @@ export const Permissions = observer<ITeamFormProps>(function Permissions({ state
           </FieldCheckbox>
         );
       })}
-    </Group>
+    </Group>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamMetaParameters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamMetaParameters.tsx
index bcf032f285..8a46db3dbd 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamMetaParameters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamMetaParameters.tsx
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { TeamMetaParametersResource } from '@cloudbeaver/core-authentication';
-import { BASE_CONTAINERS_STYLES, Group, useTranslate, useStyles, useResource, GroupTitle, ObjectPropertyInfoForm } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Group, GroupTitle, ObjectPropertyInfoForm, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 import type { ITeamFormState } from '../ITeamFormProps';
 
@@ -18,9 +17,7 @@ interface IProps {
   state: ITeamFormState;
 }
 
-export const TeamMetaParameters = observer<IProps>(function TeamMetaParameters({
-  state,
-}) {
+export const TeamMetaParameters = observer<IProps>(function TeamMetaParameters({ state }) {
   const teamMetaParameters = useResource(TeamMetaParameters, TeamMetaParametersResource, undefined);
   const translate = useTranslate();
   const style = useStyles(BASE_CONTAINERS_STYLES);
@@ -32,13 +29,7 @@ export const TeamMetaParameters = observer<IProps>(function TeamMetaParameters({
   return styled(style)(
     <Group small gap vertical overflow>
       <GroupTitle keepSize>{translate('authentication_team_meta_parameters')}</GroupTitle>
-      <ObjectPropertyInfoForm
-        state={state.config.metaParameters}
-        properties={teamMetaParameters.data}
-        disabled={state.disabled}
-        keepSize
-        tiny
-      />
-    </Group>
+      <ObjectPropertyInfoForm state={state.config.metaParameters} properties={teamMetaParameters.data} disabled={state.disabled} keepSize tiny />
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
index 78a98d44fe..7ddf4e780f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
@@ -5,12 +5,24 @@
  * 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 { useRef } from 'react';
 import styled, { css } from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, InputField, SubmittingForm, Textarea, useTranslate, useStyles, useResource, Loader, GroupTitle, ObjectPropertyInfoForm } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Group,
+  GroupTitle,
+  InputField,
+  Loader,
+  ObjectPropertyInfoForm,
+  SubmittingForm,
+  Textarea,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 
@@ -25,9 +37,7 @@ const styles = css`
   }
 `;
 
-export const TeamOptions: TabContainerPanelComponent<ITeamFormProps> = observer(function TeamOptions({
-  state,
-}) {
+export const TeamOptions: TabContainerPanelComponent<ITeamFormProps> = observer(function TeamOptions({ state }) {
   const serverConfigResource = useResource(TeamOptions, ServerConfigResource, undefined);
   const style = useStyles(BASE_CONTAINERS_STYLES, styles);
   const formRef = useRef<HTMLFormElement>(null);
@@ -38,41 +48,19 @@ export const TeamOptions: TabContainerPanelComponent<ITeamFormProps> = observer(
     <SubmittingForm ref={formRef}>
       <ColoredContainer parent gap overflow>
         <Group small gap>
-          <InputField
-            name='teamId'
-            state={state.config}
-            readOnly={state.readonly || edit}
-            disabled={state.disabled}
-            required
-            tiny
-            fill
-          >
+          <InputField name="teamId" state={state.config} readOnly={state.readonly || edit} disabled={state.disabled} required tiny fill>
             {translate('administration_teams_team_id')}
           </InputField>
-          <InputField
-            name='teamName'
-            state={state.config}
-            readOnly={state.readonly}
-            disabled={state.disabled}
-            tiny
-            fill
-          >
+          <InputField name="teamName" state={state.config} readOnly={state.readonly} disabled={state.disabled} tiny fill>
             {translate('administration_teams_team_name')}
           </InputField>
-          <Textarea
-            name='description'
-            state={state.config}
-            readOnly={state.readonly}
-            disabled={state.disabled}
-            tiny
-            fill
-          >
+          <Textarea name="description" state={state.config} readOnly={state.readonly} disabled={state.disabled} tiny fill>
             {translate('administration_teams_team_description')}
           </Textarea>
         </Group>
         {!serverConfigResource.resource.distributed && <Permissions state={state} />}
         <TeamMetaParameters state={state} />
       </ColoredContainer>
-    </SubmittingForm>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptionsTabService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptionsTabService.ts
index eede5ed7cc..74e39dcc45 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptionsTabService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptionsTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { TeamsResource } from '@cloudbeaver/core-authentication';
@@ -28,7 +27,7 @@ export class TeamOptionsTabService extends Bootstrap {
   constructor(
     private readonly teamFormService: TeamFormService,
     private readonly teamResource: TeamsResource,
-    private readonly localizationService: LocalizationService
+    private readonly localizationService: LocalizationService,
   ) {
     super();
   }
@@ -41,27 +40,18 @@ export class TeamOptionsTabService extends Bootstrap {
       panel: () => TeamOptions,
     });
 
-    this.teamFormService.prepareConfigTask
-      .addHandler(this.prepareConfig.bind(this));
+    this.teamFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
-    this.teamFormService.formValidationTask
-      .addHandler(this.validate.bind(this));
+    this.teamFormService.formValidationTask.addHandler(this.validate.bind(this));
 
-    this.teamFormService.formSubmittingTask
-      .addHandler(this.save.bind(this));
+    this.teamFormService.formSubmittingTask.addHandler(this.save.bind(this));
 
-    this.teamFormService.fillConfigTask
-      .addHandler(this.fillConfig.bind(this));
+    this.teamFormService.fillConfigTask.addHandler(this.fillConfig.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
-  private async prepareConfig(
-    {
-      state,
-    }: ITeamFormSubmitData,
-    contexts: IExecutionContextProvider<ITeamFormSubmitData>
-  ) {
+  private async prepareConfig({ state }: ITeamFormSubmitData, contexts: IExecutionContextProvider<ITeamFormSubmitData>) {
     const config = contexts.getContext(teamContext);
 
     config.teamId = state.config.teamId;
@@ -86,12 +76,7 @@ export class TeamOptionsTabService extends Bootstrap {
     config.teamPermissions = [...state.config.teamPermissions];
   }
 
-  private async validate(
-    {
-      state,
-    }: ITeamFormSubmitData,
-    contexts: IExecutionContextProvider<ITeamFormSubmitData>
-  ) {
+  private async validate({ state }: ITeamFormSubmitData, contexts: IExecutionContextProvider<ITeamFormSubmitData>) {
     const validation = contexts.getContext(this.teamFormService.configurationValidationContext);
 
     if (state.mode === 'create') {
@@ -100,19 +85,16 @@ export class TeamOptionsTabService extends Bootstrap {
       }
 
       if (this.teamResource.has(state.config.teamId)) {
-        validation.error(this.localizationService.translate('administration_teams_team_info_exists', undefined, {
-          teamId: state.config.teamId,
-        }));
+        validation.error(
+          this.localizationService.translate('administration_teams_team_info_exists', undefined, {
+            teamId: state.config.teamId,
+          }),
+        );
       }
     }
   }
 
-  private async save(
-    {
-      state,
-    }: ITeamFormSubmitData,
-    contexts: IExecutionContextProvider<ITeamFormSubmitData>
-  ) {
+  private async save({ state }: ITeamFormSubmitData, contexts: IExecutionContextProvider<ITeamFormSubmitData>) {
     const status = contexts.getContext(this.teamFormService.configurationStatusContext);
     const config = contexts.getContext(teamContext);
 
@@ -138,10 +120,7 @@ export class TeamOptionsTabService extends Bootstrap {
     }
   }
 
-  private fillConfig(
-    { state, updated }: ITeamFormFillConfigData,
-    contexts: IExecutionContextProvider<ITeamFormFillConfigData>
-  ) {
+  private fillConfig({ state, updated }: ITeamFormFillConfigData, contexts: IExecutionContextProvider<ITeamFormFillConfigData>) {
     if (!updated) {
       return;
     }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamForm.tsx
index 1fdaa39cf5..72d8f2a94e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamForm.tsx
@@ -5,15 +5,23 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
-import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles, Loader } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  IconOrImage,
+  Loader,
+  Placeholder,
+  useExecutor,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import { teamContext } from './Contexts/teamContext';
 import type { ITeamFormState } from './ITeamFormProps';
@@ -26,72 +34,72 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const topBarStyles = css`
-    team-top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      padding-top: 16px;
+  team-top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    padding-top: 16px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    team-top-bar-tabs {
-      flex: 1;
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
+  team-top-bar-tabs {
+    flex: 1;
+  }
 
-    team-top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
+  team-top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
 
-    team-status-message {
-      composes: theme-typography--caption from global;
+  team-status-message {
+    composes: theme-typography--caption from global;
+    height: 24px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    & IconOrImage {
       height: 24px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      gap: 8px;
-
-      & IconOrImage {
-        height: 24px;
-        width: 24px;
-      }
+      width: 24px;
     }
-  `;
+  }
+`;
 
 const formStyles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-border-color-background from global;
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-border-color-background from global;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   state: ITeamFormState;
@@ -100,12 +108,7 @@ interface Props {
   className?: string;
 }
 
-export const TeamForm = observer<Props>(function TeamForm({
-  state,
-  onCancel,
-  onSave = () => { },
-  className,
-}) {
+export const TeamForm = observer<Props>(function TeamForm({ state, onCancel, onSave = () => {}, className }) {
   const translate = useTranslate();
   const props = useObjectRef({ onSave });
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
@@ -114,15 +117,17 @@ export const TeamForm = observer<Props>(function TeamForm({
 
   useExecutor({
     executor: state.submittingTask,
-    postHandlers: [function save(data, contexts) {
-      const validation = contexts.getContext(service.configurationValidationContext);
-      const state = contexts.getContext(service.configurationStatusContext);
-      const config = contexts.getContext(teamContext);
+    postHandlers: [
+      function save(data, contexts) {
+        const validation = contexts.getContext(service.configurationValidationContext);
+        const state = contexts.getContext(service.configurationStatusContext);
+        const config = contexts.getContext(teamContext);
 
-      if (validation.valid && state.saved) {
-        props.onSave(config);
-      }
-    }],
+        if (validation.valid && state.saved) {
+          props.onSave(config);
+        }
+      },
+    ],
   });
 
   useEffect(() => {
@@ -130,19 +135,14 @@ export const TeamForm = observer<Props>(function TeamForm({
   }, []);
 
   return styled(styles)(
-    <TabsState
-      container={service.tabsContainer}
-      localState={state.partsState}
-      state={state}
-      onCancel={onCancel}
-    >
+    <TabsState container={service.tabsContainer} localState={state.partsState} state={state} onCancel={onCancel}>
       <box className={className}>
         <team-top-bar>
           <team-top-bar-tabs>
             <team-status-message>
               {state.statusMessage && (
                 <>
-                  <IconOrImage icon='/icons/info_icon.svg' />
+                  <IconOrImage icon="/icons/info_icon.svg" />
                   {translate(state.statusMessage)}
                 </>
               )}
@@ -159,6 +159,6 @@ export const TeamForm = observer<Props>(function TeamForm({
           <TabPanelList style={style} />
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormBaseActions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormBaseActions.tsx
index 232cb644cb..b57d5dc92b 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormBaseActions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormBaseActions.tsx
@@ -5,39 +5,23 @@
  * 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 { Button, PlaceholderComponent, useTranslate } from '@cloudbeaver/core-blocks';
 
-
 import type { ITeamFormProps } from './ITeamFormProps';
 
-export const TeamFormBaseActions: PlaceholderComponent<ITeamFormProps> = observer(function TeamFormBaseActions({
-  state,
-  onCancel,
-}) {
+export const TeamFormBaseActions: PlaceholderComponent<ITeamFormProps> = observer(function TeamFormBaseActions({ state, onCancel }) {
   const translate = useTranslate();
 
   return (
     <>
       {onCancel && (
-        <Button
-          type="button"
-          disabled={state.disabled}
-          mod={['outlined']}
-          onClick={onCancel}
-        >
+        <Button type="button" disabled={state.disabled} mod={['outlined']} onClick={onCancel}>
           {translate('ui_processing_cancel')}
         </Button>
       )}
-      <Button
-        type="button"
-        disabled={state.disabled || state.readonly}
-        mod={['unelevated']}
-        loader
-        onClick={state.save}
-      >
+      <Button type="button" disabled={state.disabled || state.readonly} mod={['unelevated']} loader onClick={state.save}>
         {translate(state.mode === 'edit' ? 'ui_processing_save' : 'ui_processing_create')}
       </Button>
     </>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormService.ts
index efeceee5a8..8e70c000cc 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
@@ -49,9 +48,7 @@ export class TeamFormService {
   readonly afterFormSubmittingTask: IExecutorHandlersCollection<ITeamFormSubmitData>;
   readonly formStateTask: IExecutorHandlersCollection<ITeamFormState>;
 
-  constructor(
-    private readonly notificationService: NotificationService,
-  ) {
+  constructor(private readonly notificationService: NotificationService) {
     this.tabsContainer = new TabsContainer('Team settings');
     this.actionsContainer = new PlaceholderContainer();
     this.configureTask = new ExecutorHandlersCollection();
@@ -62,13 +59,9 @@ export class TeamFormService {
     this.formValidationTask = new ExecutorHandlersCollection();
     this.formStateTask = new ExecutorHandlersCollection();
 
-    this.formSubmittingTask
-      .before(this.formValidationTask)
-      .before(this.prepareConfigTask)
-      .next(this.afterFormSubmittingTask);
+    this.formSubmittingTask.before(this.formValidationTask).before(this.prepareConfigTask).next(this.afterFormSubmittingTask);
 
-    this.formStateTask
-      .before<ITeamFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
+    this.formStateTask.before<ITeamFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
 
     this.formSubmittingTask.addPostHandler(this.showSubmittingStatusMessage);
     this.formValidationTask.addPostHandler(this.ensureValidation);
@@ -113,16 +106,15 @@ export class TeamFormService {
 
     if (status.messages.length > 0) {
       if (status.exception) {
-        this.notificationService.logException(
-          status.exception,
-          status.messages[0],
-          status.messages.slice(1).join('\n')
-        );
+        this.notificationService.logException(status.exception, status.messages[0], status.messages.slice(1).join('\n'));
       } else {
-        this.notificationService.notify({
-          title: status.messages[0],
-          message: status.messages.slice(1).join('\n'),
-        }, status.saved ? ENotificationType.Success : ENotificationType.Error);
+        this.notificationService.notify(
+          {
+            title: status.messages[0],
+            message: status.messages.slice(1).join('\n'),
+          },
+          status.saved ? ENotificationType.Success : ENotificationType.Error,
+        );
       }
     }
   };
@@ -135,12 +127,16 @@ export class TeamFormService {
     }
 
     if (validation.messages.length > 0) {
-      this.notificationService.notify({
-        title: data.state.mode === 'edit'
-          ? 'administration_identity_providers_provider_save_error'
-          : 'administration_identity_providers_provider_create_error',
-        message: validation.messages.join('\n'),
-      }, validation.valid ? ENotificationType.Info : ENotificationType.Error);
+      this.notificationService.notify(
+        {
+          title:
+            data.state.mode === 'edit'
+              ? 'administration_identity_providers_provider_save_error'
+              : 'administration_identity_providers_provider_create_error',
+          message: validation.messages.join('\n'),
+        },
+        validation.valid ? ENotificationType.Info : ENotificationType.Error,
+      );
     }
   };
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormState.ts
index 83d10ad2f8..bc971028fe 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { TeamInfo, TeamsResource } from '@cloudbeaver/core-authentication';
@@ -52,10 +51,7 @@ export class TeamFormState implements ITeamFormState {
   private readonly loadTeamTask: IExecutor<ITeamFormState>;
   private readonly formStateTask: IExecutor<ITeamFormState>;
 
-  constructor(
-    service: TeamFormService,
-    resource: TeamsResource
-  ) {
+  constructor(service: TeamFormService, resource: TeamsResource) {
     this.resource = resource;
     this.config = {
       teamId: '',
@@ -85,9 +81,7 @@ export class TeamFormState implements ITeamFormState {
     this.loadInfo = this.loadInfo.bind(this);
     this.updateFormState = this.updateFormState.bind(this);
 
-    this.formStateTask
-      .addCollection(service.formStateTask)
-      .addPostHandler(this.updateFormState);
+    this.formStateTask.addCollection(service.formStateTask).addPostHandler(this.updateFormState);
 
     this.loadTeamTask
       .before(service.configureTask)
@@ -103,7 +97,7 @@ export class TeamFormState implements ITeamFormState {
       .next(this.formStateTask);
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   async loadTeamInfo(): Promise<TeamInfo | undefined> {
     await this.loadTeamTask.execute(this);
@@ -111,9 +105,7 @@ export class TeamFormState implements ITeamFormState {
     return this.info;
   }
 
-  setOptions(
-    mode: TeamFormMode,
-  ): this {
+  setOptions(mode: TeamFormMode): this {
     this.mode = mode;
     return this;
   }
@@ -128,14 +120,11 @@ export class TeamFormState implements ITeamFormState {
       {
         state: this,
       },
-      this.service.formSubmittingTask
+      this.service.formSubmittingTask,
     );
   }
 
-  private updateFormState(
-    data: ITeamFormState,
-    contexts: IExecutionContextProvider<ITeamFormState>
-  ): void {
+  private updateFormState(data: ITeamFormState, contexts: IExecutionContextProvider<ITeamFormState>): void {
     const context = contexts.getContext(teamFormStateContext);
 
     this.statusMessage = context.statusMessage;
@@ -144,10 +133,7 @@ export class TeamFormState implements ITeamFormState {
     this.configured = true;
   }
 
-  private async loadInfo(
-    data: ITeamFormState,
-    contexts: IExecutionContextProvider<ITeamFormState>
-  ) {
+  private async loadInfo(data: ITeamFormState, contexts: IExecutionContextProvider<ITeamFormState>) {
     if (!data.config.teamId) {
       return;
     }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationNavService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationNavService.ts
index d9fc245584..67b2dc463c 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationNavService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationNavService.ts
@@ -5,16 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 
 import { EUsersAdministrationSub, UsersAdministrationNavigationService } from '../UsersAdministrationNavigationService';
 
 @injectable()
 export class TeamsAdministrationNavService {
-  constructor(
-    private readonly usersAdministrationNavigationService: UsersAdministrationNavigationService
-  ) { }
+  constructor(private readonly usersAdministrationNavigationService: UsersAdministrationNavigationService) {}
 
   navToRoot(): void {
     this.usersAdministrationNavigationService.navToSub(EUsersAdministrationSub.Teams);
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationService.ts
index 4913de34b2..cfedab4fe4 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsAdministrationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsPage.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsPage.tsx
index f7480f4369..efb06ecc8c 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsPage.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsPage.tsx
@@ -5,25 +5,31 @@
  * 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 { ADMINISTRATION_TOOLS_PANEL_STYLES, IAdministrationItemSubItem } from '@cloudbeaver/core-administration';
-import { BASE_CONTAINERS_STYLES, ToolsAction, ToolsPanel, useTranslate, useStyles, ColoredContainer, Group, Container } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  ToolsAction,
+  ToolsPanel,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
-
 import { CreateTeam } from './CreateTeam';
 import { CreateTeamService } from './CreateTeamService';
 import { TeamsTable } from './TeamsTable/TeamsTable';
 import { useTeamsTable } from './TeamsTable/useTeamsTable';
 
-const styles = css` 
-    ToolsPanel {
-      border-bottom: none;
-    }
+const styles = css`
+  ToolsPanel {
+    border-bottom: none;
+  }
 `;
 
 interface Props {
@@ -31,10 +37,7 @@ interface Props {
   param?: string | null;
 }
 
-export const TeamsPage = observer<Props>(function TeamsPage({
-  sub,
-  param,
-}) {
+export const TeamsPage = observer<Props>(function TeamsPage({ sub, param }) {
   const translate = useTranslate();
   const style = useStyles(BASE_CONTAINERS_STYLES, styles, ADMINISTRATION_TOOLS_PANEL_STYLES);
   const service = useService(CreateTeamService);
@@ -82,15 +85,10 @@ export const TeamsPage = observer<Props>(function TeamsPage({
             <CreateTeam />
           </Group>
         )}
-        <Group box='no-overflow'>
-          <TeamsTable
-            teams={table.teams}
-            state={table.state}
-            selectedItems={table.tableState.selected}
-            expandedItems={table.tableState.expanded}
-          />
+        <Group box="no-overflow">
+          <TeamsTable teams={table.teams} state={table.state} selectedItems={table.tableState.selected} expandedItems={table.tableState.expanded} />
         </Group>
       </Container>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/Team.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/Team.tsx
index 7c52cf74c0..1fca98933d 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/Team.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/Team.tsx
@@ -5,15 +5,13 @@
  * 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, use } from 'reshadow';
 
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
-import { TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder, useStyles, Loader } from '@cloudbeaver/core-blocks';
+import { Loader, Placeholder, TableColumnValue, TableItem, TableItemExpand, TableItemSelect, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { TeamsAdministrationService } from '../TeamsAdministrationService';
 import { TeamEdit } from './TeamEdit';
 
@@ -49,14 +47,20 @@ export const Team = observer<Props>(function Team({ team }) {
       <TableColumnValue centerContent flex expand>
         <TableItemExpand />
       </TableColumnValue>
-      <TableColumnValue title={team.teamId} ellipsis expand>{team.teamId}</TableColumnValue>
-      <TableColumnValue title={team.teamName} ellipsis>{team.teamName || ''}</TableColumnValue>
-      <TableColumnValue title={team.description} ellipsis>{team.description || ''}</TableColumnValue>
+      <TableColumnValue title={team.teamId} ellipsis expand>
+        {team.teamId}
+      </TableColumnValue>
+      <TableColumnValue title={team.teamName} ellipsis>
+        {team.teamName || ''}
+      </TableColumnValue>
+      <TableColumnValue title={team.description} ellipsis>
+        {team.description || ''}
+      </TableColumnValue>
       <TableColumnValue flex {...use({ gap: true })}>
         <Loader suspense small inline hideMessage>
           <Placeholder container={service.teamDetailsInfoPlaceholder} team={team} />
         </Loader>
       </TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamEdit.tsx
index 340a11a9f4..4d7340987f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamEdit.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamEdit.tsx
@@ -5,37 +5,33 @@
  * 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 { useRef, useEffect, useContext, useCallback } from 'react';
+import { useCallback, useContext, useEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { TeamsResource } from '@cloudbeaver/core-authentication';
 import { TableContext, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { TeamForm } from '../TeamForm';
 import { useTeamFormState } from '../useTeamFormState';
 
 const styles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      box-sizing: border-box;
-      padding-bottom: 24px;
-      display: flex;
-      flex-direction: column;
-      height: 664px;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    box-sizing: border-box;
+    padding-bottom: 24px;
+    display: flex;
+    flex-direction: column;
+    height: 664px;
+  }
+`;
 
 interface Props {
   item: string;
 }
 
-export const TeamEdit = observer<Props>(function TeamEdit({
-  item,
-}) {
+export const TeamEdit = observer<Props>(function TeamEdit({ item }) {
   const resource = useService(TeamsResource);
   const boxRef = useRef<HTMLDivElement>(null);
   const tableContext = useContext(TableContext);
@@ -51,19 +47,13 @@ export const TeamEdit = observer<Props>(function TeamEdit({
     });
   }, []);
 
-  const data = useTeamFormState(
-    resource,
-    state => state.setOptions('edit')
-  );
+  const data = useTeamFormState(resource, state => state.setOptions('edit'));
 
   data.config.teamId = item;
 
   return styled(useStyles(styles))(
     <box ref={boxRef}>
-      <TeamForm
-        state={data}
-        onCancel={collapse}
-      />
-    </box>
+      <TeamForm state={data} onCancel={collapse} />
+    </box>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamsTable.tsx
index b9c96033d6..536a6e1df7 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/TeamsTable.tsx
@@ -5,12 +5,11 @@
  * 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 { css } from 'reshadow';
 
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
-import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, Loader, useTranslate } from '@cloudbeaver/core-blocks';
+import { Loader, Table, TableBody, TableColumnHeader, TableHeader, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ILoadableState } from '@cloudbeaver/core-utils';
 
 import { Team } from './Team';
@@ -34,7 +33,7 @@ export const TeamsTable = observer<Props>(function TeamsTable({ teams, state, se
 
   return (
     <Loader state={state} style={loaderStyle} overlay>
-      <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size='big'>
+      <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size="big">
         <TableHeader fixed>
           <TableColumnHeader min flex centerContent>
             <TableSelect />
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
index e6f8618c8b..48142c1883 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { compareTeams, TeamInfo, TeamsResource } from '@cloudbeaver/core-authentication';
-import { TableState, useResource, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks';
+import { TableState, useObservableRef, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -32,65 +31,70 @@ export function useTeamsTable(): Readonly<State> {
 
   const translate = useTranslate();
 
-  return useObservableRef<State>(() => ({
-    tableState: new TableState(),
-    processing: false,
-    state: resource,
-    get teams() {
-      return resource.resource.values.slice().sort(compareTeams);
+  return useObservableRef<State>(
+    () => ({
+      tableState: new TableState(),
+      processing: false,
+      state: resource,
+      get teams() {
+        return resource.resource.values.slice().sort(compareTeams);
+      },
+      async update() {
+        if (this.processing) {
+          return;
+        }
+
+        try {
+          this.processing = true;
+          await resource.resource.refresh(CachedMapAllKey);
+          notificationService.logSuccess({ title: 'administration_teams_team_list_update_success' });
+        } catch (exception: any) {
+          notificationService.logException(exception, 'administration_teams_team_list_update_fail');
+        } finally {
+          this.processing = false;
+        }
+      },
+      async delete() {
+        if (this.processing) {
+          return;
+        }
+
+        const deletionList = this.tableState.selectedList;
+
+        if (deletionList.length === 0) {
+          return;
+        }
+
+        const teamNames = deletionList.map(name => `"${name}"`).join(', ');
+        const message = `${translate('administration_teams_delete_confirmation')}${teamNames}. ${translate('ui_are_you_sure')}`;
+        const result = await dialogService.open(ConfirmationDialogDelete, {
+          title: 'ui_data_delete_confirmation',
+          message,
+          confirmActionText: 'ui_delete',
+        });
+
+        if (result === DialogueStateResult.Rejected) {
+          return;
+        }
+
+        try {
+          this.processing = true;
+          await resource.resource.deleteTeam(resourceKeyList(deletionList));
+
+          this.tableState.unselect();
+          this.tableState.unexpand(deletionList);
+        } catch (exception: any) {
+          notificationService.logException(exception, 'Teams delete Error');
+        } finally {
+          this.processing = false;
+        }
+      },
+    }),
+    {
+      processing: observable.ref,
+      teams: computed,
     },
-    async update() {
-      if (this.processing) {
-        return;
-      }
-
-      try {
-        this.processing = true;
-        await resource.resource.refresh(CachedMapAllKey);
-        notificationService.logSuccess({ title: 'administration_teams_team_list_update_success' });
-      } catch (exception: any) {
-        notificationService.logException(exception, 'administration_teams_team_list_update_fail');
-      } finally {
-        this.processing = false;
-      }
-    },
-    async delete() {
-      if (this.processing) {
-        return;
-      }
-
-      const deletionList = this.tableState.selectedList;
-
-      if (deletionList.length === 0) {
-        return;
-      }
-
-      const teamNames = deletionList.map(name => `"${name}"`).join(', ');
-      const message = `${translate('administration_teams_delete_confirmation')}${teamNames}. ${translate('ui_are_you_sure')}`;
-      const result = await dialogService.open(ConfirmationDialogDelete, {
-        title: 'ui_data_delete_confirmation',
-        message,
-        confirmActionText: 'ui_delete',
-      });
-
-      if (result === DialogueStateResult.Rejected) {
-        return;
-      }
-
-      try {
-        this.processing = true;
-        await resource.resource.deleteTeam(resourceKeyList(deletionList));
-
-        this.tableState.unselect();
-        this.tableState.unexpand(deletionList);
-      } catch (exception: any) {
-        notificationService.logException(exception, 'Teams delete Error');
-      } finally {
-        this.processing = false;
-      }
-    },
-  }), {
-    processing: observable.ref,
-    teams: computed,
-  }, false, ['update', 'delete']);
+    false,
+    ['update', 'delete'],
+  );
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/useTeamFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/useTeamFormState.ts
index 729afc91e1..e5a1295f91 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/useTeamFormState.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/useTeamFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import type { TeamsResource } from '@cloudbeaver/core-authentication';
@@ -15,16 +14,10 @@ import type { ITeamFormState } from './ITeamFormProps';
 import { TeamFormService } from './TeamFormService';
 import { TeamFormState } from './TeamFormState';
 
-export function useTeamFormState(
-  resource: TeamsResource,
-  configure?: (state: ITeamFormState) => any
-): ITeamFormState {
+export function useTeamFormState(resource: TeamsResource, configure?: (state: ITeamFormState) => any): ITeamFormState {
   const service = useService(TeamFormService);
   const [state] = useState<ITeamFormState>(() => {
-    const state = new TeamFormState(
-      service,
-      resource,
-    );
+    const state = new TeamFormState(service, resource);
     configure?.(state);
 
     state.load();
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
index 4ad7a9fb89..2a939987a2 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
@@ -5,16 +5,26 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useMemo } from 'react';
 import styled, { css } from 'reshadow';
 
 import {
-  Table, TableHeader, TableColumnHeader, TableBody,
-  TableItem, TableColumnValue, TableItemSelect, StaticImage,
-  TextPlaceholder, ColoredContainer, BASE_CONTAINERS_STYLES, Group, useTranslate, useStyles
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Group,
+  StaticImage,
+  Table,
+  TableBody,
+  TableColumnHeader,
+  TableColumnValue,
+  TableHeader,
+  TableItem,
+  TableItemSelect,
+  TextPlaceholder,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { DBDriverResource, isCloudConnection } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
@@ -24,43 +34,39 @@ import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 import type { IUserFormProps } from '../UserFormService';
 
 const styles = css`
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-      width: 100%;
-    }
-    StaticImage {
-      display: flex;
-      width: 24px;
-    }
-  `;
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+    width: 100%;
+  }
+  StaticImage {
+    display: flex;
+    width: 24px;
+  }
+`;
 
-export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = observer(function ConnectionAccess({
-  controller,
-  editing,
-}) {
+export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = observer(function ConnectionAccess({ controller, editing }) {
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
   const driversResource = useService(DBDriverResource);
   const getConnectionPermission = useCallback(
-    (connectionId: string) => controller.grantedConnections
-      .find(connectionPermission => connectionPermission.dataSourceId === connectionId),
-    [controller.grantedConnections]);
+    (connectionId: string) => controller.grantedConnections.find(connectionPermission => connectionPermission.dataSourceId === connectionId),
+    [controller.grantedConnections],
+  );
   const loading = controller.isLoading;
   const cloudExists = controller.connections.some(isCloudConnection);
-  const localConnections = useMemo(() => computed(
-    () => controller.connections.filter(connection => !isCloudConnection(connection))
-  ), [controller.connections]);
+  const localConnections = useMemo(
+    () => computed(() => controller.connections.filter(connection => !isCloudConnection(connection))),
+    [controller.connections],
+  );
   const isAdmin = controller.user.grantedTeams.includes('admin');
 
   if (controller.connections.length === 0) {
     return styled(style)(
       <ColoredContainer parent>
         <Group keepSize large>
-          <TextPlaceholder>
-            {translate('authentication_administration_user_connections_empty')}
-          </TextPlaceholder>
+          <TextPlaceholder>{translate('authentication_administration_user_connections_empty')}</TextPlaceholder>
         </Group>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
@@ -68,18 +74,16 @@ export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = obse
     return styled(style)(
       <ColoredContainer parent>
         <Group keepSize large>
-          <TextPlaceholder>
-            {translate('connections_connection_access_admin_info')}
-          </TextPlaceholder>
+          <TextPlaceholder>{translate('connections_connection_access_admin_info')}</TextPlaceholder>
         </Group>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
   return styled(style)(
     <ColoredContainer parent overflow>
       <Group box keepSize large>
-        <Table selectedItems={controller.selectedConnections} size='big' onSelect={controller.handleConnectionsAccessChange}>
+        <Table selectedItems={controller.selectedConnections} size="big" onSelect={controller.handleConnectionsAccessChange}>
           <TableHeader fixed>
             <TableColumnHeader min />
             <TableColumnHeader min />
@@ -88,10 +92,8 @@ export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = obse
           </TableHeader>
           <TableBody>
             {cloudExists && (
-              <TableItem item='cloudInfo' selectDisabled>
-                <TableColumnValue colSpan={4}>
-                  {translate('cloud_connections_access_placeholder')}
-                </TableColumnValue>
+              <TableItem item="cloudInfo" selectDisabled>
+                <TableColumnValue colSpan={4}>{translate('cloud_connections_access_placeholder')}</TableColumnValue>
               </TableItem>
             )}
             {localConnections.get().map(connection => {
@@ -107,28 +109,23 @@ export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = obse
               }
 
               return (
-                <TableItem
-                  key={connection.id}
-                  item={connection.id}
-                  selectDisabled={isTeamProvided}
-                >
+                <TableItem key={connection.id} item={connection.id} selectDisabled={isTeamProvided}>
                   <TableColumnValue centerContent flex>
-                    <TableItemSelect
-                      disabled={loading || isTeamProvided}
-                      checked={isTeamProvided}
-                    />
+                    <TableItemSelect disabled={loading || isTeamProvided} checked={isTeamProvided} />
                   </TableColumnValue>
-                  <TableColumnValue><StaticImage icon={driver?.icon} /></TableColumnValue>
-                  <TableColumnValue title={connection.name} ellipsis>{connection.name}</TableColumnValue>
-                  <TableColumnValue title={grantedBy}>
-                    {grantedBy}
+                  <TableColumnValue>
+                    <StaticImage icon={driver?.icon} />
                   </TableColumnValue>
+                  <TableColumnValue title={connection.name} ellipsis>
+                    {connection.name}
+                  </TableColumnValue>
+                  <TableColumnValue title={grantedBy}>{grantedBy}</TableColumnValue>
                 </TableItem>
               );
             })}
           </TableBody>
         </Table>
       </Group>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
index 7601663af9..ef6da43c16 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -21,10 +20,7 @@ const ConnectionAccess = React.lazy(async () => {
 
 @injectable()
 export class ConnectionAccessTabBootstrap extends Bootstrap {
-  constructor(
-    private readonly userFormService: UserFormService,
-    private readonly projectInfoResource: ProjectInfoResource,
-  ) {
+  constructor(private readonly userFormService: UserFormService, private readonly projectInfoResource: ProjectInfoResource) {
     super();
   }
 
@@ -42,5 +38,5 @@ export class ConnectionAccessTabBootstrap extends Bootstrap {
     this.userFormService.onFormInit.addHandler(() => this.projectInfoResource.load(CachedMapAllKey));
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx
index c91e6976ad..a30bb29a68 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx
@@ -5,12 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
-import { TextPlaceholder, Loader, ExceptionMessage, BASE_CONTAINERS_STYLES, ColoredContainer, ObjectPropertyInfoForm, Group, useAutoLoad, useObjectRef, IAutoLoadable, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  ExceptionMessage,
+  Group,
+  IAutoLoadable,
+  Loader,
+  ObjectPropertyInfoForm,
+  TextPlaceholder,
+  useAutoLoad,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminUserInfo, ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
@@ -31,10 +43,7 @@ interface IState {
   exception: Error | null;
 }
 
-export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = observer(function OriginInfoPanel({
-  tabId,
-  user,
-}) {
+export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = observer(function OriginInfoPanel({ tabId, user }) {
   const style = useStyles(BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
   const usersResource = useService(UsersResource);
@@ -53,55 +62,59 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
     origin = user.origins[0];
   }
 
-  const loadableState = useObjectRef<IInnerState>(() => ({
-    get exception(): Error | null {
-      return this.state.exception;
-    },
-    isLoaded(): boolean {
-      return this.state.loaded;
-    },
-    isLoading(): boolean {
-      return this.state.loading;
-    },
-    async load(reload = false) {
-      if ((this.state.loaded && !reload) || this.state.loading) {
-        return;
-      }
-
-      this.state.loading = true;
-      this.state.exception = null;
-
-      try {
-        usersResource.markOutdated(this.user.userId);
-        const userOrigin = await usersResource.load(this.user.userId, ['customIncludeOriginDetails']);
-
-        let origin = userOrigin.origins.find(origin => getOriginTabId('origin', origin) === tabId);
-
-        if (!origin) {
-          origin = user.origins[0];
+  const loadableState = useObjectRef<IInnerState>(
+    () => ({
+      get exception(): Error | null {
+        return this.state.exception;
+      },
+      isLoaded(): boolean {
+        return this.state.loaded;
+      },
+      isLoading(): boolean {
+        return this.state.loading;
+      },
+      async load(reload = false) {
+        if ((this.state.loaded && !reload) || this.state.loading) {
+          return;
         }
 
-        const propertiesState = {} as Record<string, any>;
+        this.state.loading = true;
+        this.state.exception = null;
 
-        for (const property of origin.details!) {
-          propertiesState[property.id!] = property.value;
+        try {
+          usersResource.markOutdated(this.user.userId);
+          const userOrigin = await usersResource.load(this.user.userId, ['customIncludeOriginDetails']);
+
+          let origin = userOrigin.origins.find(origin => getOriginTabId('origin', origin) === tabId);
+
+          if (!origin) {
+            origin = user.origins[0];
+          }
+
+          const propertiesState = {} as Record<string, any>;
+
+          for (const property of origin.details!) {
+            propertiesState[property.id!] = property.value;
+          }
+          this.state.properties = origin.details!;
+          this.state.state = propertiesState;
+          this.state.loaded = true;
+        } catch (error: any) {
+          this.state.exception = error;
+        } finally {
+          this.state.loading = false;
         }
-        this.state.properties = origin.details!;
-        this.state.state = propertiesState;
-        this.state.loaded = true;
-      } catch (error: any) {
-        this.state.exception = error;
-      } finally {
-        this.state.loading = false;
-      }
+      },
+      async reload() {
+        await this.load();
+      },
+    }),
+    {
+      state,
+      user,
     },
-    async reload() {
-      await this.load();
-    },
-  }), {
-    state,
-    user,
-  }, ['reload', 'load', 'isLoaded', 'isLoading']);
+    ['reload', 'load', 'isLoaded', 'isLoading'],
+  );
 
   const { selected } = useTab(tabId);
 
@@ -117,7 +130,7 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
         <Group large>
           <Loader key="static" />
         </Group>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
@@ -127,7 +140,7 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
         <Group large>
           <ExceptionMessage exception={state.exception} onRetry={() => loadableState.reload?.()} />
         </Group>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
@@ -137,21 +150,15 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
         <Group large>
           <TextPlaceholder>{translate('authentication_administration_user_origin_empty')}</TextPlaceholder>
         </Group>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
   return styled(style)(
     <ColoredContainer parent>
       <Group gap large>
-        <ObjectPropertyInfoForm
-          properties={state.properties}
-          state={state.state}
-          readOnly
-          small
-          autoHide
-        />
+        <ObjectPropertyInfoForm properties={state.properties} state={state.state} readOnly small autoHide />
       </Group>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
index 337729f2a3..2dea5f16d3 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui';
+import { Tab, TabContainerTabComponent, TabTitle } from '@cloudbeaver/core-ui';
 
 import { getOriginTabId } from './getOriginTabId';
 import type { IUserFormProps } from './UserFormService';
@@ -25,12 +24,10 @@ export const OriginInfoTab: TabContainerTabComponent<IUserFormProps> = observer(
 }) {
   const origin = user.origins.find(origin => getOriginTabId('origin', origin) === tabId);
   return styled(useStyles(style))(
-    <Tab
-      {...rest}
-      tabId={tabId}
-      style={style}
-    >
-      <TabTitle><Translate token={origin?.displayName || 'Origin'} /></TabTitle>
-    </Tab>
+    <Tab {...rest} tabId={tabId} style={style}>
+      <TabTitle>
+        <Translate token={origin?.displayName || 'Origin'} />
+      </TabTitle>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
index 470bce0673..1265ce23cf 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
@@ -5,14 +5,13 @@
  * 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 { Loader, SubmittingForm, Button, useFocus, StatusMessage, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Button, Loader, StatusMessage, SubmittingForm, useFocus, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useController, useService } from '@cloudbeaver/core-di';
 import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
-import { TabsState, TabList, TabPanelList, UNDERLINE_TAB_STYLES, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import { UserFormController } from './UserFormController';
 import { UserFormService } from './UserFormService';
@@ -24,69 +23,69 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const formStyles = css`
-    FormBox {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    box {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-    SubmittingForm {
-      flex: 1;
-      overflow: auto;
-      display: flex;
-      flex-direction: column;
-    }
+  FormBox {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  box {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+  SubmittingForm {
+    flex: 1;
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+  }
 `;
 
 const topBarStyles = css`
-    connection-top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      padding-top: 16px;
-      margin-bottom: 24px;
+  connection-top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    padding-top: 16px;
+    margin-bottom: 24px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
-    connection-top-bar-tabs {
-      overflow: hidden;
-      flex: 1;
-    }
-    StatusMessage {
-      padding: 0 16px;
-    }
-    connection-top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
-  `;
+  }
+  connection-top-bar-tabs {
+    overflow: hidden;
+    flex: 1;
+  }
+  StatusMessage {
+    padding: 0 16px;
+  }
+  connection-top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
+`;
 
 interface Props {
   user: AdminUserInfo;
@@ -94,11 +93,7 @@ interface Props {
   onCancel: () => void;
 }
 
-export const UserForm = observer<Props>(function UserForm({
-  user,
-  editing = false,
-  onCancel,
-}) {
+export const UserForm = observer<Props>(function UserForm({ user, editing = false, onCancel }) {
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
   const styles = useStyles(style, topBarStyles, formStyles);
   const translate = useTranslate();
@@ -109,13 +104,7 @@ export const UserForm = observer<Props>(function UserForm({
   controller.update(user, editing, onCancel);
 
   return styled(styles)(
-    <TabsState
-      localState={controller.partsState}
-      container={service.tabsContainer}
-      user={user}
-      controller={controller}
-      editing={editing}
-    >
+    <TabsState localState={controller.partsState} container={service.tabsContainer} user={user} controller={controller} editing={editing}>
       <box>
         <connection-top-bar>
           <connection-top-bar-tabs>
@@ -127,20 +116,10 @@ export const UserForm = observer<Props>(function UserForm({
             <TabList style={style} />
           </connection-top-bar-tabs>
           <connection-top-bar-actions>
-            <Button
-              type="button"
-              disabled={controller.isSaving}
-              mod={['outlined']}
-              onClick={onCancel}
-            >
+            <Button type="button" disabled={controller.isSaving} mod={['outlined']} onClick={onCancel}>
               {translate('ui_processing_cancel')}
             </Button>
-            <Button
-              type="button"
-              disabled={controller.isSaving}
-              mod={['unelevated']}
-              onClick={controller.save}
-            >
+            <Button type="button" disabled={controller.isSaving} mod={['unelevated']} onClick={controller.save}>
               {translate(!editing ? 'ui_processing_create' : 'ui_processing_save')}
             </Button>
           </connection-top-bar-actions>
@@ -152,6 +131,6 @@ export const UserForm = observer<Props>(function UserForm({
           </SubmittingForm>
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
index f139f61d11..eb0916abf9 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 import { getOriginTabId } from './getOriginTabId';
 import { UserFormService } from './UserFormService';
@@ -29,9 +28,7 @@ const UserInfo = React.lazy(async () => {
 
 @injectable()
 export class UserFormBaseBootstrap extends Bootstrap {
-  constructor(
-    private readonly userFormService: UserFormService,
-  ) {
+  constructor(private readonly userFormService: UserFormService) {
     super();
   }
 
@@ -61,5 +58,5 @@ export class UserFormBaseBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
index 173761f817..bac68cbd4c 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
@@ -5,19 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { AdminUser, AuthRolesResource, compareTeams, isLocalUser, TeamInfo, TeamsResource, UsersResource } from '@cloudbeaver/core-authentication';
-import { compareConnectionsInfo, ConnectionInfoProjectKey, ConnectionInfoResource, DatabaseConnection, DBDriverResource } from '@cloudbeaver/core-connections';
-import { injectable, IInitializableController, IDestructibleController } from '@cloudbeaver/core-di';
+import {
+  compareConnectionsInfo,
+  ConnectionInfoProjectKey,
+  ConnectionInfoResource,
+  DatabaseConnection,
+  DBDriverResource,
+} from '@cloudbeaver/core-connections';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ENotificationType, NotificationService } from '@cloudbeaver/core-events';
 import { Executor, ExecutorInterrupter } from '@cloudbeaver/core-executor';
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
 import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { GQLErrorCatcher, AdminConnectionGrantInfo, AdminSubjectType, AdminUserInfo, CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import { AdminConnectionGrantInfo, AdminSubjectType, AdminUserInfo, CachedMapAllKey, GQLErrorCatcher } from '@cloudbeaver/core-sdk';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 
 import { IUserFormState, UserFormService } from './UserFormService';
@@ -164,13 +169,10 @@ export class UserFormController implements IInitializableController, IDestructib
         this.notificationService.logSuccess({ title: 'authentication_administration_user_created' });
       } else {
         if (this.credentials.password) {
-          await this.usersResource.updateCredentials(
-            this.user.userId,
-            {
-              profile: '0',
-              credentials: { password: this.credentials.password },
-            }
-          );
+          await this.usersResource.updateCredentials(this.user.userId, {
+            profile: '0',
+            credentials: { password: this.credentials.password },
+          });
         }
         await this.updateTeams();
         await this.saveUserRole();
@@ -219,7 +221,9 @@ export class UserFormController implements IInitializableController, IDestructib
     }
   };
 
-  handleConnectionsAccessChange = () => { this.connectionAccessChanged = true; };
+  handleConnectionsAccessChange = () => {
+    this.connectionAccessChanged = true;
+  };
 
   loadConnectionsAccess = async () => {
     if (this.isLoading || this.connectionAccessLoaded) {
@@ -308,14 +312,10 @@ export class UserFormController implements IInitializableController, IDestructib
   }
 
   private getGrantedConnections() {
-    return Array.from(this.selectedConnections.keys())
-      .filter(connectionId => {
-        const connectionPermission = this.grantedConnections.find(
-          connectionPermission => connectionPermission.dataSourceId === connectionId
-        );
-        return this.selectedConnections.get(connectionId)
-          && connectionPermission?.subjectType !== AdminSubjectType.Team;
-      });
+    return Array.from(this.selectedConnections.keys()).filter(connectionId => {
+      const connectionPermission = this.grantedConnections.find(connectionPermission => connectionPermission.dataSourceId === connectionId);
+      return this.selectedConnections.get(connectionId) && connectionPermission?.subjectType !== AdminSubjectType.Team;
+    });
   }
 
   private async saveMetaParameters() {
@@ -351,7 +351,7 @@ export class UserFormController implements IInitializableController, IDestructib
       await this.teamsResource.load(CachedMapAllKey);
       await this.loadUser();
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load teams');
+      this.notificationService.logException(exception, "Can't load teams");
     } finally {
       this.isLoading = false;
     }
@@ -361,11 +361,11 @@ export class UserFormController implements IInitializableController, IDestructib
     try {
       this.credentials.metaParameters = this.user.metaParameters;
       this.credentials.login = this.user.userId;
-      this.credentials.teams = new Map(this.user.grantedTeams.map(teamId => ([teamId, true])));
+      this.credentials.teams = new Map(this.user.grantedTeams.map(teamId => [teamId, true]));
       this.credentials.authRole = this.user.authRole;
       this.enabled = this.user.enabled;
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load user');
+      this.notificationService.logException(exception, "Can't load user");
     }
   }
 
@@ -374,11 +374,7 @@ export class UserFormController implements IInitializableController, IDestructib
       await this.dbDriverResource.load(CachedMapAllKey);
       const projects = await this.projectInfoResource.load(CachedMapAllKey);
 
-      await this.connectionInfoResource.load(ConnectionInfoProjectKey(
-        ...projects
-          .filter(isGlobalProject)
-          .map(project => project.id)
-      ));
+      await this.connectionInfoResource.load(ConnectionInfoProjectKey(...projects.filter(isGlobalProject).map(project => project.id)));
     } catch (exception: any) {
       this.setStatusMessage('authentication_administration_user_connections_access_connections_load_fail', ENotificationType.Error);
     }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
index 19f8002f2f..7233793cb6 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { AdminUser } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { Executor } from '@cloudbeaver/core-executor';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
index 5cee374dc6..b5526e7866 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
@@ -5,13 +5,26 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AuthRolesResource, UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, FieldCheckbox, Group, GroupTitle, InputField, Loader, ObjectPropertyInfoForm, useResource, useTranslate, useStyles, Combobox } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Combobox,
+  Container,
+  FieldCheckbox,
+  Group,
+  GroupTitle,
+  InputField,
+  Loader,
+  ObjectPropertyInfoForm,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 
 import type { IUserFormProps } from './UserFormService';
@@ -22,19 +35,15 @@ const styles = css`
   }
 `;
 
-export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(function UserInfo({
-  controller,
-  editing,
-}) {
+export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(function UserInfo({ controller, editing }) {
   const style = useStyles(BASE_CONTAINERS_STYLES, styles);
   const translate = useTranslate();
   const userMetaParameters = useResource(UserInfo, UserMetaParametersResource, undefined);
   const authRoles = useResource(UserInfo, AuthRolesResource, undefined);
 
-  const handleTeamChange = useCallback(
-    (teamId: string, value: boolean) => { controller.credentials.teams.set(teamId, value); },
-    []
-  );
+  const handleTeamChange = useCallback((teamId: string, value: boolean) => {
+    controller.credentials.teams.set(teamId, value);
+  }, []);
 
   return styled(style)(
     <ColoredContainer gap overflow>
@@ -42,12 +51,12 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
         <Container gap vertical>
           <GroupTitle keepSize>{translate('authentication_user_credentials')}</GroupTitle>
           <InputField
-            type='text'
-            name='login'
+            type="text"
+            name="login"
             state={controller.credentials}
             disabled={controller.isSaving}
             readOnly={editing}
-            mod='surface'
+            mod="surface"
             keepSize
             tiny
             required
@@ -57,13 +66,13 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
           {controller.local && (
             <>
               <InputField
-                type='password'
-                name='password'
+                type="password"
+                name="password"
                 state={controller.credentials}
-                autoComplete='new-password'
+                autoComplete="new-password"
                 placeholder={editing ? '••••••' : ''}
                 disabled={controller.isSaving}
-                mod='surface'
+                mod="surface"
                 keepSize
                 tiny
                 required
@@ -71,12 +80,12 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
                 {translate('authentication_user_password')}
               </InputField>
               <InputField
-                type='password'
-                name='passwordRepeat'
+                type="password"
+                name="passwordRepeat"
                 state={controller.credentials}
                 placeholder={editing ? '••••••' : ''}
                 disabled={controller.isSaving}
-                mod='surface'
+                mod="surface"
                 keepSize
                 tiny
                 required
@@ -90,7 +99,7 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
       <Group small gap overflow>
         {authRoles.data.length > 0 && (
           <Combobox
-            name='authRole'
+            name="authRole"
             state={controller.credentials}
             items={authRoles.data}
             keySelector={value => value}
@@ -101,12 +110,7 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
           </Combobox>
         )}
         <GroupTitle>{translate('authentication_user_status')}</GroupTitle>
-        <FieldCheckbox
-          id={`${controller.user.userId}_user_enabled`}
-          name='enabled'
-          state={controller}
-          disabled={controller.isSaving}
-        >
+        <FieldCheckbox id={`${controller.user.userId}_user_enabled`} name="enabled" state={controller} disabled={controller.isSaving}>
           {translate('authentication_user_enabled')}
         </FieldCheckbox>
         <GroupTitle>{translate('authentication_user_team')}</GroupTitle>
@@ -118,7 +122,7 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
               key={team.teamId}
               id={`${controller.user.userId}_${team.teamId}`}
               title={tooltip}
-              name='team'
+              name="team"
               checked={!!controller.credentials.teams.get(team.teamId)}
               disabled={controller.isSaving}
               onChange={checked => handleTeamChange(team.teamId, checked)}
@@ -129,19 +133,22 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
         })}
       </Group>
       <Loader state={userMetaParameters} inline>
-        {() => userMetaParameters.data.length > 0 && styled(style)(
-          <Group small gap vertical overflow>
-            <GroupTitle keepSize>{translate('authentication_user_meta_parameters')}</GroupTitle>
-            <ObjectPropertyInfoForm
-              state={controller.credentials.metaParameters}
-              properties={userMetaParameters.data}
-              disabled={controller.isSaving}
-              keepSize
-              tiny
-            />
-          </Group>
-        )}
+        {() =>
+          userMetaParameters.data.length > 0 &&
+          styled(style)(
+            <Group small gap vertical overflow>
+              <GroupTitle keepSize>{translate('authentication_user_meta_parameters')}</GroupTitle>
+              <ObjectPropertyInfoForm
+                state={controller.credentials.metaParameters}
+                properties={userMetaParameters.data}
+                disabled={controller.isSaving}
+                keepSize
+                tiny
+              />
+            </Group>,
+          )
+        }
       </Loader>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts
index e260c78a2a..e953239287 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ObjectOrigin } from '@cloudbeaver/core-sdk';
 
 export function getOriginTabId(tabId: string, origin: ObjectOrigin) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
index 1b62bdf622..702d2880b3 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
@@ -5,12 +5,11 @@
  * 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 { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES } from '@cloudbeaver/core-administration';
-import { ToolsPanel, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentComponent } from '@cloudbeaver/core-administration';
+import { ToolsPanel, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { BASE_TAB_STYLES, ITabData, Tab, TabList, TabPanel, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
@@ -27,7 +26,7 @@ const tabsStyles = css`
     height: 33px;
   }
   Tab {
-    height: 32px!important;
+    height: 32px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
@@ -37,9 +36,7 @@ const tabsStyles = css`
   }
 `;
 
-export const UsersAdministration: AdministrationItemContentComponent = observer(function UsersAdministration({
-  sub, param,
-}) {
+export const UsersAdministration: AdministrationItemContentComponent = observer(function UsersAdministration({ sub, param }) {
   const translate = useTranslate();
   const usersAdministrationNavigationService = useService(UsersAdministrationNavigationService);
   const subName = sub?.name || EUsersAdministrationSub.Users;
@@ -60,9 +57,13 @@ export const UsersAdministration: AdministrationItemContentComponent = observer(
   return styled(style)(
     <TabsState selectedId={subName} lazy onChange={openSub}>
       <ToolsPanel>
-        <TabList aria-label='User Administration pages' style={style}>
-          <Tab tabId={EUsersAdministrationSub.Users} style={style}>{translate('authentication_administration_item_users')}</Tab>
-          <Tab tabId={EUsersAdministrationSub.Teams} style={style}>{translate('administration_teams_tab_title')}</Tab>
+        <TabList aria-label="User Administration pages" style={style}>
+          <Tab tabId={EUsersAdministrationSub.Users} style={style}>
+            {translate('authentication_administration_item_users')}
+          </Tab>
+          <Tab tabId={EUsersAdministrationSub.Teams} style={style}>
+            {translate('administration_teams_tab_title')}
+          </Tab>
           {/* <Tab
             tabId={EUsersAdministrationSub.MetaProperties}
             style={style}
@@ -80,6 +81,6 @@ export const UsersAdministration: AdministrationItemContentComponent = observer(
       <TabPanel tabId={EUsersAdministrationSub.MetaProperties}>
         <MetaParameters />
       </TabPanel>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
index 97986d8e60..08ad73ce6c 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
@@ -5,23 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 
 export enum EUsersAdministrationSub {
   Users = 'users',
   Teams = 'teams',
-  MetaProperties = 'metaProperties'
+  MetaProperties = 'metaProperties',
 }
 
 @injectable()
 export class UsersAdministrationNavigationService {
   static ItemName = 'users';
 
-  constructor(
-    private readonly administrationScreenService: AdministrationScreenService
-  ) {
+  constructor(private readonly administrationScreenService: AdministrationScreenService) {
     this.navToRoot = this.navToRoot.bind(this);
   }
 
@@ -34,10 +31,6 @@ export class UsersAdministrationNavigationService {
   }
 
   navToSub(sub: EUsersAdministrationSub, param?: string): void {
-    this.administrationScreenService.navigateToItemSub(
-      UsersAdministrationNavigationService.ItemName,
-      sub,
-      param
-    );
+    this.administrationScreenService.navigateToItemSub(UsersAdministrationNavigationService.ItemName, sub, param);
   }
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
index 49ed2f747b..e59319f154 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { AdministrationItemService } from '@cloudbeaver/core-administration';
 import { AdminUser, TeamsResource } from '@cloudbeaver/core-authentication';
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 import { CreateTeamService } from './Teams/CreateTeamService';
 import { EUsersAdministrationSub, UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
@@ -78,7 +77,7 @@ export class UsersAdministrationService extends Bootstrap {
     this.userDetailsInfoPlaceholder.add(Origin, 0);
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async cancelCreate(param: string | null) {
     if (param === 'create') {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx
index 7bf7cb0e0b..bef1632571 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx
@@ -5,28 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
-export const UsersDrawerItem: React.FC<AdministrationItemDrawerProps> = function UsersDrawerItem({
-  item,
-  onSelect,
-  style,
-  disabled,
-}) {
+export const UsersDrawerItem: React.FC<AdministrationItemDrawerProps> = function UsersDrawerItem({ item, onSelect, style, disabled }) {
   return styled(useStyles(style))(
-    <Tab
-      tabId={item.name}
-      disabled={disabled}
-      title='authentication_administration_item'
-      onOpen={() => onSelect(item.name)}
-    >
-      <TabIcon icon='/icons/account.svg' />
-      <TabTitle><Translate token='authentication_administration_item' /></TabTitle>
-    </Tab>
+    <Tab tabId={item.name} disabled={disabled} title="authentication_administration_item" onOpen={() => onSelect(item.name)}>
+      <TabIcon icon="/icons/account.svg" />
+      <TabTitle>
+        <Translate token="authentication_administration_item" />
+      </TabTitle>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
index e8b84ec0e6..ec8759ff15 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
@@ -5,62 +5,58 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
-
 import { Translate } from '@cloudbeaver/core-blocks';
 import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
 
-
 import { UserForm } from '../UserForm/UserForm';
 
 const styles = css`
+  user-create-footer,
+  user-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  user-create {
+    display: flex;
+    flex-direction: column;
+    height: 600px;
+    overflow: hidden;
+  }
 
-    user-create-footer, user-create-content {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    user-create {
-      display: flex;
-      flex-direction: column;
-      height: 600px;
-      overflow: hidden;
-    }
+  title-bar {
+    composes: theme-border-color-background theme-typography--headline6 from global;
+    box-sizing: border-box;
+    padding: 16px 24px;
+    align-items: center;
+    display: flex;
+    font-weight: 400;
+    flex: auto 0 0;
+  }
 
-    title-bar {
-      composes: theme-border-color-background theme-typography--headline6 from global;
-      box-sizing: border-box;
-      padding: 16px 24px;
-      align-items: center;
-      display: flex;
-      font-weight: 400;
-      flex: auto 0 0;
-    }
-
-    user-create-content {
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      overflow: auto;
-    }
-  `;
+  user-create-content {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   user: AdminUserInfo;
   onCancel: () => void;
 }
 
-export const CreateUser: React.FC<Props> = function CreateUser({
-  user,
-  onCancel,
-}) {
+export const CreateUser: React.FC<Props> = function CreateUser({ user, onCancel }) {
   return styled(styles)(
     <user-create>
-      <title-bar><Translate token='authentication_administration_user_connections_user_add' /></title-bar>
+      <title-bar>
+        <Translate token="authentication_administration_user_connections_user_add" />
+      </title-bar>
       <user-create-content>
         <UserForm user={user} onCancel={onCancel} />
       </user-create-content>
-    </user-create>
+    </user-create>,
   );
 };
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
index 1b8f055412..095e2e98a6 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
index dfbce9297d..609fdd3655 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
@@ -5,7 +5,6 @@
  * 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 { useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -77,11 +76,8 @@ export const UsersTableFilters = observer<Props>(function UsersTableFilters({ fi
           onFilter={filters.setSearch}
         />
         <actions>
-          <button
-            {...use({ active: open })}
-            onClick={() => setOpen(!open)}
-          >
-            <IconOrImage icon='filter' />
+          <button {...use({ active: open })} onClick={() => setOpen(!open)}>
+            <IconOrImage icon="filter" />
           </button>
         </actions>
       </filter-container>
@@ -99,17 +95,12 @@ export const UsersTableFilters = observer<Props>(function UsersTableFilters({ fi
             {translate('authentication_user_status')}
           </Combobox>
           {!!authRolesResource.data.length && (
-            <Combobox
-              items={[...authRolesResource.data, USER_ROLE_ALL]}
-              value={filters.role}
-              keepSize
-              onSelect={filters.setRole}
-            >
+            <Combobox items={[...authRolesResource.data, USER_ROLE_ALL]} value={filters.role} keepSize onSelect={filters.setRole}>
               {translate('authentication_user_role')}
             </Combobox>
           )}
         </Group>
       )}
-    </Group>
+    </Group>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/useUsersTableFilters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/useUsersTableFilters.tsx
index eb24630af7..5caf98418f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/useUsersTableFilters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/useUsersTableFilters.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import type { AdminUser } from '@cloudbeaver/core-authentication';
@@ -16,7 +15,7 @@ import { isArraysEqual } from '@cloudbeaver/core-utils';
 export enum EUserStatus {
   ENABLED = 'ENABLED',
   DISABLED = 'DISABLED',
-  ALL = 'ALL'
+  ALL = 'ALL',
 }
 
 interface IStatus {
@@ -52,39 +51,42 @@ export interface IUserFilters {
 }
 
 export function useUsersTableFilters(users: AdminUser[]) {
-  const filters: IUserFilters = useObservableRef(() => ({
-    search: '',
-    role: USER_ROLE_ALL,
-    status: EUserStatus.ENABLED,
-    get filteredUsers() {
-      return this.users.filter(user => {
-        const matchSearch = user.userId.toLowerCase().includes(this.search.trim().toLowerCase());
-        const matchStatus = this.status === EUserStatus.ALL
-          || (this.status === EUserStatus.ENABLED ? user.enabled : !user.enabled);
-        const matchRole = this.role === USER_ROLE_ALL || this.role === user.authRole;
+  const filters: IUserFilters = useObservableRef(
+    () => ({
+      search: '',
+      role: USER_ROLE_ALL,
+      status: EUserStatus.ENABLED,
+      get filteredUsers() {
+        return this.users.filter(user => {
+          const matchSearch = user.userId.toLowerCase().includes(this.search.trim().toLowerCase());
+          const matchStatus = this.status === EUserStatus.ALL || (this.status === EUserStatus.ENABLED ? user.enabled : !user.enabled);
+          const matchRole = this.role === USER_ROLE_ALL || this.role === user.authRole;
 
-        return matchSearch && matchStatus && matchRole;
-      });
+          return matchSearch && matchStatus && matchRole;
+        });
+      },
+      setSearch(value: string) {
+        this.search = value;
+      },
+      setRole(role: string) {
+        this.role = role;
+      },
+      setStatus(status: EUserStatus) {
+        this.status = status;
+      },
+    }),
+    {
+      search: observable.ref,
+      role: observable.ref,
+      status: observable.ref,
+      users: observable.ref,
+      filteredUsers: computed<AdminUser[]>({ equals: (first, second) => isArraysEqual(first, second, undefined, true) }),
+      setSearch: action.bound,
+      setRole: action.bound,
+      setStatus: action.bound,
     },
-    setSearch(value: string) {
-      this.search = value;
-    },
-    setRole(role: string) {
-      this.role = role;
-    },
-    setStatus(status: EUserStatus) {
-      this.status = status;
-    },
-  }), {
-    search: observable.ref,
-    role: observable.ref,
-    status: observable.ref,
-    users: observable.ref,
-    filteredUsers: computed<AdminUser[]>({ equals: (first, second) => isArraysEqual(first, second, undefined, true) }),
-    setSearch: action.bound,
-    setRole: action.bound,
-    setStatus: action.bound,
-  }, { users });
+    { users },
+  );
 
   return filters;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx
index e73f2a2ae2..8fdb3d96f4 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx
@@ -5,14 +5,11 @@
  * 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, use } from 'reshadow';
 
 import { AdminUser, UsersResource } from '@cloudbeaver/core-authentication';
-import {
-  TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder, Checkbox, useTranslate, Loader
-} from '@cloudbeaver/core-blocks';
+import { Checkbox, Loader, Placeholder, TableColumnValue, TableItem, TableItemExpand, TableItemSelect, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 
@@ -50,7 +47,8 @@ export const User = observer<Props>(function User({ user, displayAuthRole, selec
   }
 
   const enabledCheckboxTitle = usersService.isActiveUser(user.userId)
-    ? translate('administration_teams_team_granted_users_permission_denied') : undefined;
+    ? translate('administration_teams_team_granted_users_permission_denied')
+    : undefined;
 
   return styled(styles)(
     <TableItem item={user.userId} expandElement={UserEdit} selectDisabled={!selectable}>
@@ -62,11 +60,17 @@ export const User = observer<Props>(function User({ user, displayAuthRole, selec
       <TableColumnValue centerContent flex expand>
         <TableItemExpand />
       </TableColumnValue>
-      <TableColumnValue title={user.userId} expand ellipsis>{user.userId}</TableColumnValue>
+      <TableColumnValue title={user.userId} expand ellipsis>
+        {user.userId}
+      </TableColumnValue>
       {displayAuthRole && (
-        <TableColumnValue title={user.authRole} expand ellipsis>{user.authRole}</TableColumnValue>
+        <TableColumnValue title={user.authRole} expand ellipsis>
+          {user.authRole}
+        </TableColumnValue>
       )}
-      <TableColumnValue title={teams} ellipsis>{teams}</TableColumnValue>
+      <TableColumnValue title={teams} ellipsis>
+        {teams}
+      </TableColumnValue>
       <TableColumnValue>
         <Checkbox
           checked={user.enabled}
@@ -80,6 +84,6 @@ export const User = observer<Props>(function User({ user, displayAuthRole, selec
           <Placeholder container={usersAdministrationService.userDetailsInfoPlaceholder} user={user} />
         </Loader>
       </TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx
index bf83ef0172..b2f8af52b6 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -31,9 +30,7 @@ export const OriginIcon = observer<IOriginIconProps>(function Origin({ origin })
   const icon = isLocal ? '/icons/local_connection.svg' : origin.icon;
   const title = isLocal ? 'Local user' : origin.displayName;
 
-  return styled(USER_DETAILS_STYLES)(
-    <StaticImage key={origin.type + origin.subType} icon={icon} title={title} />
-  );
+  return styled(USER_DETAILS_STYLES)(<StaticImage key={origin.type + origin.subType} icon={icon} title={title} />);
 });
 
 export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(function Origin({ user }) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
index 38127a001f..7057536b33 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
@@ -5,39 +5,32 @@
  * 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 { useContext, useCallback, useEffect, useRef } from 'react';
+import { useCallback, useContext, useEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  Loader,
-  TableContext
-} from '@cloudbeaver/core-blocks';
+import { Loader, TableContext } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 
-
 import { UserForm } from '../UserForm/UserForm';
 import { UserEditController } from './UserEditController';
 
 const styles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      box-sizing: border-box;
-      padding-bottom: 24px;
-      height: 560px;
-      display: flex;
-      flex-direction: column;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    box-sizing: border-box;
+    padding-bottom: 24px;
+    height: 560px;
+    display: flex;
+    flex-direction: column;
+  }
+`;
 
 interface Props {
   item: string;
 }
 
-export const UserEdit = observer<Props>(function UserEdit({
-  item,
-}) {
+export const UserEdit = observer<Props>(function UserEdit({ item }) {
   const boxRef = useRef<HTMLDivElement>(null);
   const controller = useController(UserEditController, item);
   const tableContext = useContext(TableContext);
@@ -51,10 +44,8 @@ export const UserEdit = observer<Props>(function UserEdit({
   }, []);
 
   return styled(styles)(
-    <box ref={boxRef} as='div'>
-      {controller.user ? (
-        <UserForm user={controller.user} editing onCancel={collapse} />
-      ) : <Loader />}
-    </box>
+    <box ref={boxRef} as="div">
+      {controller.user ? <UserForm user={controller.user} editing onCancel={collapse} /> : <Loader />}
+    </box>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEditController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEditController.ts
index e89865cc7a..4e391c620e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEditController.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEditController.ts
@@ -5,19 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
-import {
-  injectable, IInitializableController, IDestructibleController
-} from '@cloudbeaver/core-di';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { GQLErrorCatcher, AdminUserInfo, ResourceKeyUtils, ResourceKey, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import { AdminUserInfo, GQLErrorCatcher, ResourceKey, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 @injectable()
-export class UserEditController
-implements IInitializableController, IDestructibleController {
+export class UserEditController implements IInitializableController, IDestructibleController {
   isLoading = true;
   user: AdminUserInfo | null = null;
 
@@ -29,10 +25,7 @@ implements IInitializableController, IDestructibleController {
 
   readonly error = new GQLErrorCatcher();
 
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly usersResource: UsersResource
-  ) {
+  constructor(private readonly notificationService: NotificationService, private readonly usersResource: UsersResource) {
     makeObservable(this, {
       isLoading: observable,
       user: observable,
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
index b304f1e4b8..10125e7623 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
@@ -5,16 +5,22 @@
  * 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 { ADMINISTRATION_TOOLS_PANEL_STYLES, IAdministrationItemSubItem } from '@cloudbeaver/core-administration';
-import { AuthProvidersResource, AuthRolesResource, AUTH_PROVIDER_LOCAL_ID, UsersResource } from '@cloudbeaver/core-authentication';
+import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, AuthRolesResource, UsersResource } from '@cloudbeaver/core-authentication';
 import {
-  useResource, ToolsAction,
-  ToolsPanel, Loader, useTranslate, useStyles,
-  BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  Loader,
+  ToolsAction,
+  ToolsPanel,
+  useResource,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
@@ -69,7 +75,7 @@ export const UsersPage = observer<Props>(function UsersPage({ sub, param }) {
           {isLocalProviderAvailable && (
             <ToolsAction
               title={translate('authentication_administration_tools_add_tooltip')}
-              icon='add'
+              icon="add"
               viewBox="0 0 24 24"
               disabled={create && !!createUserService.user}
               onClick={createUserService.create}
@@ -79,7 +85,7 @@ export const UsersPage = observer<Props>(function UsersPage({ sub, param }) {
           )}
           <ToolsAction
             title={translate('authentication_administration_tools_refresh_tooltip')}
-            icon='refresh'
+            icon="refresh"
             viewBox="0 0 24 24"
             onClick={table.update}
           >
@@ -109,7 +115,7 @@ export const UsersPage = observer<Props>(function UsersPage({ sub, param }) {
           </Group>
         )}
 
-        <Group box='no-overflow'>
+        <Group box="no-overflow">
           <Loader style={loaderStyle} state={[usersResource, authRolesResource]} overlay>
             <UsersTable
               keys={keys}
@@ -121,6 +127,6 @@ export const UsersPage = observer<Props>(function UsersPage({ sub, param }) {
           </Loader>
         </Group>
       </Container>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
index 419c47a8d7..df337f534f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
@@ -5,11 +5,9 @@
  * 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 {
-  Table, TableHeader, TableColumnHeader, TableBody, useTranslate } from '@cloudbeaver/core-blocks';
+import { Table, TableBody, TableColumnHeader, TableHeader, useTranslate } from '@cloudbeaver/core-blocks';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
 import { User } from './User';
@@ -22,22 +20,11 @@ interface Props {
   displayAuthRole: boolean;
 }
 
-export const UsersTable = observer<Props>(function UsersTable({
-  keys,
-  users,
-  selectedItems,
-  expandedItems,
-  displayAuthRole,
-}) {
+export const UsersTable = observer<Props>(function UsersTable({ keys, users, selectedItems, expandedItems, displayAuthRole }) {
   const translate = useTranslate();
 
   return (
-    <Table
-      keys={keys}
-      selectedItems={selectedItems}
-      expandedItems={expandedItems}
-      size='big'
-    >
+    <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size="big">
       <TableHeader fixed>
         {/* {isLocalProviderAvailable && (
                   <TableColumnHeader min flex centerContent>
@@ -46,9 +33,7 @@ export const UsersTable = observer<Props>(function UsersTable({
                 )} */}
         <TableColumnHeader min />
         <TableColumnHeader>{translate('authentication_user_name')}</TableColumnHeader>
-        {displayAuthRole && (
-          <TableColumnHeader>{translate('authentication_user_role')}</TableColumnHeader>
-        )}
+        {displayAuthRole && <TableColumnHeader>{translate('authentication_user_role')}</TableColumnHeader>}
         <TableColumnHeader>{translate('authentication_user_team')}</TableColumnHeader>
         <TableColumnHeader>{translate('authentication_user_enabled')}</TableColumnHeader>
         <TableColumnHeader />
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
index 53a93c53fe..163a8ec557 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import type { AdminUser, UsersResource } from '@cloudbeaver/core-authentication';
@@ -29,13 +28,12 @@ export function useUsersTable(usersResource: UsersResource) {
   const notificationService = useService(NotificationService);
   const commonDialogService = useService(CommonDialogService);
 
-  const state: State = useObservableRef(() => ({
-    loading: false,
-    state: new TableState(),
-    get users() {
-      return this.usersResource.values
-        .slice()
-        .sort((a, b) => {
+  const state: State = useObservableRef(
+    () => ({
+      loading: false,
+      state: new TableState(),
+      get users() {
+        return this.usersResource.values.slice().sort((a, b) => {
           if (this.usersResource.isNew(a.userId) === this.usersResource.isNew(b.userId)) {
             return a.userId.localeCompare(b.userId);
           }
@@ -44,60 +42,62 @@ export function useUsersTable(usersResource: UsersResource) {
           }
           return 1;
         });
-    },
-    async update() {
-      try {
-        await this.usersResource.refreshAll();
-        notificationService.logSuccess({ title: 'authentication_administration_tools_refresh_success' });
-      } catch (exception: any) {
-        notificationService.logException(exception, 'authentication_administration_tools_refresh_fail');
-      }
-    },
-    async delete() {
-      if (this.loading) {
-        return;
-      }
-
-      const deletionList = this.state.selectedList.filter(([_, value]) => value).map(([userId]) => userId);
-      if (deletionList.length === 0) {
-        return;
-      }
-
-      const userNames = deletionList.map(name => `"${name}"`).join(', ');
-      const message = `${translate('authentication_administration_users_delete_confirmation')}${userNames}. ${translate('ui_are_you_sure')}`;
-
-      const result = await commonDialogService.open(ConfirmationDialogDelete, {
-        title: 'ui_data_delete_confirmation',
-        message,
-        confirmActionText: 'ui_delete',
-      });
-
-      if (result === DialogueStateResult.Rejected) {
-        return;
-      }
-
-      this.loading = true;
-
-      try {
-        await this.usersResource.delete(resourceKeyList(deletionList));
-        this.state.unselect();
-
-        for (const id of deletionList) {
-          this.state.unexpand(id);
+      },
+      async update() {
+        try {
+          await this.usersResource.refreshAll();
+          notificationService.logSuccess({ title: 'authentication_administration_tools_refresh_success' });
+        } catch (exception: any) {
+          notificationService.logException(exception, 'authentication_administration_tools_refresh_fail');
+        }
+      },
+      async delete() {
+        if (this.loading) {
+          return;
         }
-      } catch (exception: any) {
-        notificationService.logException(exception, 'authentication_administration_user_delete_fail');
 
-      } finally {
-        this.loading = false;
-      }
+        const deletionList = this.state.selectedList.filter(([_, value]) => value).map(([userId]) => userId);
+        if (deletionList.length === 0) {
+          return;
+        }
+
+        const userNames = deletionList.map(name => `"${name}"`).join(', ');
+        const message = `${translate('authentication_administration_users_delete_confirmation')}${userNames}. ${translate('ui_are_you_sure')}`;
+
+        const result = await commonDialogService.open(ConfirmationDialogDelete, {
+          title: 'ui_data_delete_confirmation',
+          message,
+          confirmActionText: 'ui_delete',
+        });
+
+        if (result === DialogueStateResult.Rejected) {
+          return;
+        }
+
+        this.loading = true;
+
+        try {
+          await this.usersResource.delete(resourceKeyList(deletionList));
+          this.state.unselect();
+
+          for (const id of deletionList) {
+            this.state.unexpand(id);
+          }
+        } catch (exception: any) {
+          notificationService.logException(exception, 'authentication_administration_user_delete_fail');
+        } finally {
+          this.loading = false;
+        }
+      },
+    }),
+    {
+      loading: observable.ref,
+      users: computed<AdminUser[]>({ equals: (first, second) => isArraysEqual(first, second, undefined, true) }),
+      update: action.bound,
+      delete: action.bound,
     },
-  }), {
-    loading: observable.ref,
-    users: computed<AdminUser[]>({ equals: (first, second) => isArraysEqual(first, second, undefined, true) }),
-    update: action.bound,
-    delete: action.bound,
-  }, { usersResource });
+    { usersResource },
+  );
 
   return state;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/AuthenticationLocaleService.ts b/webapp/packages/plugin-authentication-administration/src/AuthenticationLocaleService.ts
index 4990d5b851..742afeeb87 100644
--- a/webapp/packages/plugin-authentication-administration/src/AuthenticationLocaleService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/AuthenticationLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class AuthenticationLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-authentication-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/PluginBootstrap.ts
index 93c961b99e..2a982a341c 100644
--- a/webapp/packages/plugin-authentication-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/PluginBootstrap.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ServerConfigurationAdministrationNavService, ServerConfigurationService } from '@cloudbeaver/plugin-administration';
 import { AuthenticationService } from '@cloudbeaver/plugin-authentication';
 
@@ -25,20 +24,16 @@ export class PluginBootstrap extends Bootstrap {
     private readonly serverConfigurationService: ServerConfigurationService,
     private readonly serverConfigurationAdministrationNavService: ServerConfigurationAdministrationNavService,
     private readonly authConfigurationsAdministrationNavService: AuthConfigurationsAdministrationNavService,
-    private readonly authenticationService: AuthenticationService
+    private readonly authenticationService: AuthenticationService,
   ) {
     super();
   }
 
   register(): void {
     this.serverConfigurationService.configurationContainer.add(AuthenticationProviders, 0);
-    this.authenticationService.setConfigureAuthProvider(
-      () => this.serverConfigurationAdministrationNavService.navToSettings()
-    );
-    this.authenticationService.setConfigureIdentityProvider(
-      () => this.authConfigurationsAdministrationNavService.navToCreate()
-    );
+    this.authenticationService.setConfigureAuthProvider(() => this.serverConfigurationAdministrationNavService.navToSettings());
+    this.authenticationService.setConfigureIdentityProvider(() => this.authConfigurationsAdministrationNavService.navToCreate());
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/en.ts b/webapp/packages/plugin-authentication-administration/src/locales/en.ts
index 161e83ef8b..0f1ac4c8d0 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/en.ts
@@ -1,7 +1,7 @@
 export default [
   ['authentication_administration_user_connections_user_add', 'User Creation'],
   ['authentication_administration_user_connections_user_new', 'New user'],
-  ['authentication_administration_user_connections_access_load_fail', 'User\'s granted connections loading failed'],
+  ['authentication_administration_user_connections_access_load_fail', "User's granted connections loading failed"],
   ['authentication_administration_user_connections_access_connections_load_fail', 'Connections loading failed'],
   ['authentication_administration_user_connections_access', 'Connections Access'],
   ['authentication_administration_user_connections_access_granted_by', 'Granted by'],
@@ -39,7 +39,10 @@ export default [
   ['administration_configuration_wizard_configuration_services_group', 'Services'],
   ['administration_configuration_wizard_configuration_services', 'Services'],
   ['administration_configuration_wizard_configuration_authentication', 'Enable users authentication'],
-  ['administration_configuration_wizard_configuration_authentication_description', 'Allows users to authenticate. Otherwise only anonymous access is enabled'],
+  [
+    'administration_configuration_wizard_configuration_authentication_description',
+    'Allows users to authenticate. Otherwise only anonymous access is enabled',
+  ],
 
   ['administration_identity_providers_tab_title', 'Identity Providers'],
   ['administration_identity_providers_provider', 'Provider'],
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/it.ts b/webapp/packages/plugin-authentication-administration/src/locales/it.ts
index 52c9cc25a0..e6b0ae7d00 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/it.ts
@@ -1,7 +1,7 @@
 export default [
   ['authentication_administration_user_connections_user_add', 'Creazione di Utente'],
   ['authentication_administration_user_connections_user_new', 'Nuovo utente'],
-  ['authentication_administration_user_connections_access_load_fail', 'Errore in fase di caricamento delle connessioni autorizzate all\'utente'],
+  ['authentication_administration_user_connections_access_load_fail', "Errore in fase di caricamento delle connessioni autorizzate all'utente"],
   ['authentication_administration_user_connections_access_connections_load_fail', 'Errore in fase di caricamento delle connessioni'],
   ['authentication_administration_user_connections_access', 'Accesso alle connessioni'],
   ['authentication_administration_user_connections_access_granted_by', 'Permesso da'],
@@ -34,10 +34,13 @@ export default [
   ['administration_configuration_wizard_configuration_admin', 'Credenziali amministrative'],
   ['administration_configuration_wizard_configuration_admin_name', 'Login'],
   ['administration_configuration_wizard_configuration_admin_password', 'Password'],
-  ['administration_configuration_wizard_configuration_anonymous_access', 'Permetti l\'accesso anonimo'],
+  ['administration_configuration_wizard_configuration_anonymous_access', "Permetti l'accesso anonimo"],
   ['administration_configuration_wizard_configuration_anonymous_access_description', 'Permetti di lavorare con CloudBeaver senza autenticazione'],
   ['administration_configuration_wizard_configuration_authentication_group', 'Impostazioni di autenticazione'],
   ['administration_configuration_wizard_configuration_services', 'Servizi'],
-  ['administration_configuration_wizard_configuration_authentication', 'Abilita l\'autenticazione utente'],
-  ['administration_configuration_wizard_configuration_authentication_description', 'Permetti agli utenti di autenticarsi. In alternativa solo l\'accesso anonimo sarà attivo'],
+  ['administration_configuration_wizard_configuration_authentication', "Abilita l'autenticazione utente"],
+  [
+    'administration_configuration_wizard_configuration_authentication_description',
+    "Permetti agli utenti di autenticarsi. In alternativa solo l'accesso anonimo sarà attivo",
+  ],
 ];
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/ru.ts b/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
index e5828b9155..f31162838b 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
@@ -34,11 +34,17 @@ export default [
   ['administration_configuration_wizard_configuration_admin_name', 'Логин'],
   ['administration_configuration_wizard_configuration_admin_password', 'Пароль'],
   ['administration_configuration_wizard_configuration_anonymous_access', 'Разрешить анонимный доступ'],
-  ['administration_configuration_wizard_configuration_anonymous_access_description', 'Позволяет работать с CloudBeaver без пользовательской аутентификации'],
+  [
+    'administration_configuration_wizard_configuration_anonymous_access_description',
+    'Позволяет работать с CloudBeaver без пользовательской аутентификации',
+  ],
   ['administration_configuration_wizard_configuration_authentication_group', 'Настройки аутентификации'],
   ['administration_configuration_wizard_configuration_services_group', 'Сервисы'],
   ['administration_configuration_wizard_configuration_authentication', 'Включить пользовательскую аутентификацию'],
-  ['administration_configuration_wizard_configuration_authentication_description', 'Позволяет пользователям аутентифицироваться. Иначе будет включен анонимный доступ'],
+  [
+    'administration_configuration_wizard_configuration_authentication_description',
+    'Позволяет пользователям аутентифицироваться. Иначе будет включен анонимный доступ',
+  ],
 
   ['administration_identity_providers_tab_title', 'Провайдеры идентификации'],
   ['administration_identity_providers_provider', 'Провайдер'],
diff --git a/webapp/packages/plugin-authentication-administration/src/manifest.ts b/webapp/packages/plugin-authentication-administration/src/manifest.ts
index 7901338a55..1e4db34826 100644
--- a/webapp/packages/plugin-authentication-administration/src/manifest.ts
+++ b/webapp/packages/plugin-authentication-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AuthConfigurationFormService } from './Administration/IdentityProviders/AuthConfigurationFormService';
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationLocaleService.ts b/webapp/packages/plugin-authentication/src/AuthenticationLocaleService.ts
index 4990d5b851..742afeeb87 100644
--- a/webapp/packages/plugin-authentication/src/AuthenticationLocaleService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthenticationLocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class AuthenticationLocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationService.ts b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
index 7d35ebcd66..5083ee18bc 100644
--- a/webapp/packages/plugin-authentication/src/AuthenticationService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
@@ -5,12 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
-import { AppAuthService, AuthInfoService, AuthProviderContext, AuthProviderService, AuthProvidersResource, AUTH_PROVIDER_LOCAL_ID, IUserAuthConfiguration, RequestedProvider, UserInfoResource } from '@cloudbeaver/core-authentication';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import {
+  AppAuthService,
+  AUTH_PROVIDER_LOCAL_ID,
+  AuthInfoService,
+  AuthProviderContext,
+  AuthProviderService,
+  AuthProvidersResource,
+  IUserAuthConfiguration,
+  RequestedProvider,
+  UserInfoResource,
+} from '@cloudbeaver/core-authentication';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import type { DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { Executor, ExecutorInterrupter, IExecutionContextProvider, IExecutorHandler } from '@cloudbeaver/core-executor';
@@ -85,8 +94,9 @@ export class AuthenticationService extends Bootstrap {
     let userAuthConfiguration: IUserAuthConfiguration | undefined = undefined;
 
     if (providerId) {
-      userAuthConfiguration = this.authInfoService.userAuthConfigurations
-        .find(c => c.providerId === providerId && c.configuration.id === configurationId);
+      userAuthConfiguration = this.authInfoService.userAuthConfigurations.find(
+        c => c.providerId === providerId && c.configuration.id === configurationId,
+      );
     } else if (this.authInfoService.userAuthConfigurations.length > 0) {
       userAuthConfiguration = this.authInfoService.userAuthConfigurations[0];
     }
@@ -104,7 +114,7 @@ export class AuthenticationService extends Bootstrap {
 
       await this.onLogout.execute('after');
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t logout');
+      this.notificationService.logException(exception, "Can't logout");
     }
   }
 
@@ -139,7 +149,8 @@ export class AuthenticationService extends Bootstrap {
 
     options = observable(options);
 
-    this.authPromise = this.authDialogService.showLoginForm(persistent, options)
+    this.authPromise = this.authDialogService
+      .showLoginForm(persistent, options)
       .then(async state => {
         await this.onLogin.execute('after');
         return state;
@@ -151,8 +162,7 @@ export class AuthenticationService extends Bootstrap {
     if (this.serverConfigResource.redirectOnFederatedAuth) {
       await this.authProvidersResource.load(CachedMapAllKey);
 
-      const providers = this.authProvidersResource
-        .getEnabledProviders();
+      const providers = this.authProvidersResource.getEnabledProviders();
 
       if (providers.length === 1) {
         const configurableProvider = providers.find(provider => provider.configurable);
@@ -186,7 +196,9 @@ export class AuthenticationService extends Bootstrap {
     // );
 
     this.sessionActionService.onAction.addHandler(this.authSessionAction.bind(this));
-    this.sessionDataResource.onDataUpdate.addPostHandler(() => { this.requireAuthentication(); });
+    this.sessionDataResource.onDataUpdate.addPostHandler(() => {
+      this.requireAuthentication();
+    });
     this.screenService.routeChange.addHandler(() => this.requireAuthentication());
 
     this.administrationScreenService.ensurePermissions.addHandler(async () => {
@@ -202,12 +214,9 @@ export class AuthenticationService extends Bootstrap {
     this.authProviderService.requestAuthProvider.addHandler(this.requestAuthProviderHandler);
   }
 
-  load(): void { }
+  load(): void {}
 
-  private async authSessionAction(
-    data: ISessionAction | null,
-    contexts: IExecutionContextProvider<ISessionAction | null>
-  ) {
+  private async authSessionAction(data: ISessionAction | null, contexts: IExecutionContextProvider<ISessionAction | null>) {
     const action = contexts.getContext(sessionActionContext);
 
     if (isAutoLoginSessionAction(data)) {
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
index a9866573c8..49121880d1 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
@@ -5,15 +5,21 @@
  * 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, use } from 'reshadow';
 
 import { AuthProvider, UserInfoResource } from '@cloudbeaver/core-authentication';
-import { SubmittingForm, ErrorMessage, TextPlaceholder, Link, useErrorDetails, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Link, SubmittingForm, TextPlaceholder, useErrorDetails, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogService, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
-import { TabsState, TabList, Tab, TabTitle, UNDERLINE_TAB_STYLES, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import {
+  CommonDialogBody,
+  CommonDialogFooter,
+  CommonDialogHeader,
+  CommonDialogService,
+  CommonDialogWrapper,
+  DialogComponent,
+} from '@cloudbeaver/core-dialogs';
+import { BASE_TAB_STYLES, Tab, TabList, TabsState, TabTitle, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import { AuthenticationService } from '../AuthenticationService';
 import type { IAuthOptions } from '../IAuthOptions';
@@ -24,50 +30,46 @@ import { FEDERATED_AUTH } from './FEDERATED_AUTH';
 import { useAuthDialogState } from './useAuthDialogState';
 
 const styles = css`
-    CommonDialogWrapper {
-      min-height: 520px !important;
-      max-height: max(100vh - 48px, 520px) !important;
+  CommonDialogWrapper {
+    min-height: 520px !important;
+    max-height: max(100vh - 48px, 520px) !important;
+  }
+  SubmittingForm {
+    overflow: auto;
+    &[|form] {
+      margin: auto;
     }
-    SubmittingForm {
-      overflow: auto;
-      &[|form] {
-        margin: auto;
-      }
-    }
-    SubmittingForm, AuthProviderForm {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-    }
-    TabList {
-      justify-content: center;
-    }
-    Tab {
-      text-transform: uppercase;
-      &:global([aria-selected=true]) {
-        font-weight: 500 !important;
-      }
-    }
-    AuthProviderForm {
-      flex-direction: column;
-      padding: 18px 24px;
-    }
-    ConfigurationsList {
-      margin-top: 12px;
-    }
-    ErrorMessage {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      flex: 1;
+  }
+  SubmittingForm,
+  AuthProviderForm {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  TabList {
+    justify-content: center;
+  }
+  Tab {
+    text-transform: uppercase;
+    &:global([aria-selected='true']) {
+      font-weight: 500 !important;
     }
+  }
+  AuthProviderForm {
+    flex-direction: column;
+    padding: 18px 24px;
+  }
+  ConfigurationsList {
+    margin-top: 12px;
+  }
+  ErrorMessage {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    flex: 1;
+  }
 `;
 
 export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function AuthDialog({
-  payload: {
-    providerId,
-    configurationId,
-    linkUser = false,
-    accessRequest = false,
-  },
+  payload: { providerId, configurationId, linkUser = false, accessRequest = false },
   options,
   rejectDialog,
 }) {
@@ -79,13 +81,9 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
   const translate = useTranslate();
   const state = dialogData.state;
 
-  const additional = userInfo.data !== null
-    && state.activeProvider?.id !== undefined
-    && !userInfo.hasToken(state.activeProvider.id);
+  const additional = userInfo.data !== null && state.activeProvider?.id !== undefined && !userInfo.hasToken(state.activeProvider.id);
 
-  const showTabs = (
-    (dialogData.providers.length + dialogData.configurations.length) > 1
-  );
+  const showTabs = dialogData.providers.length + dialogData.configurations.length > 1;
   const federate = state.tabId === FEDERATED_AUTH;
 
   let dialogTitle = translate('authentication_login_dialog_title');
@@ -98,7 +96,7 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
     icon = state.activeProvider.icon;
 
     if (state.activeConfiguration) {
-      dialogTitle  += `: ${state.activeConfiguration.displayName}`;
+      dialogTitle += `: ${state.activeConfiguration.displayName}`;
       subTitle = state.activeConfiguration.description;
       icon = state.activeConfiguration.iconURL || icon;
     }
@@ -132,7 +130,11 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
         <TextPlaceholder>
           {translate('authentication_provider_disabled')}
           {authenticationService.configureAuthProvider && (
-            <Link onClick={() => { navToSettings(); }}>
+            <Link
+              onClick={() => {
+                navToSettings();
+              }}
+            >
               {translate('ui_configure')}
             </Link>
           )}
@@ -140,34 +142,30 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
       );
     }
 
-    return (
-      <AuthProviderForm
-        provider={provider}
-        credentials={state.credentials}
-        authenticate={dialogData.authenticating}
-      />
-    );
+    return <AuthProviderForm provider={provider} credentials={state.credentials} authenticate={dialogData.authenticating} />;
   }
 
   return styled(useStyles(BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES))(
-    <TabsState currentTabId={state.tabId} onChange={tabData => { state.setTabId(tabData.tabId); }}>
-      <CommonDialogWrapper size='large' aria-label={translate('authentication_login_dialog_title')}>
-        <CommonDialogHeader
-          title={dialogTitle}
-          icon={icon}
-          subTitle={subTitle}
-          onReject={options?.persistent ? undefined : rejectDialog}
-        />
+    <TabsState
+      currentTabId={state.tabId}
+      onChange={tabData => {
+        state.setTabId(tabData.tabId);
+      }}
+    >
+      <CommonDialogWrapper size="large" aria-label={translate('authentication_login_dialog_title')}>
+        <CommonDialogHeader title={dialogTitle} icon={icon} subTitle={subTitle} onReject={options?.persistent ? undefined : rejectDialog} />
         <CommonDialogBody noBodyPadding>
           {showTabs && (
-            <TabList aria-label='Auth providers'>
+            <TabList aria-label="Auth providers">
               {dialogData.providers.map(provider => (
                 <Tab
                   key={provider.id}
                   tabId={provider.id}
                   title={provider.description || provider.label}
                   disabled={dialogData.authenticating}
-                  onClick={() => { state.setActiveProvider(provider); }}
+                  onClick={() => {
+                    state.setActiveProvider(provider);
+                  }}
                 >
                   <TabTitle>{provider.label}</TabTitle>
                 </Tab>
@@ -178,7 +176,9 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
                   tabId={FEDERATED_AUTH}
                   title={translate('authentication_auth_federated')}
                   disabled={dialogData.authenticating}
-                  onClick={() => { state.setActiveProvider(null); }}
+                  onClick={() => {
+                    state.setActiveProvider(null);
+                  }}
                 >
                   <TabTitle>{translate('authentication_auth_federated')}</TabTitle>
                 </Tab>
@@ -196,16 +196,14 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
                 }}
                 onClose={rejectDialog}
               />
-            ) : renderForm(state.activeProvider)}
+            ) : (
+              renderForm(state.activeProvider)
+            )}
           </SubmittingForm>
         </CommonDialogBody>
         {!federate && (
           <CommonDialogFooter>
-            <AuthDialogFooter
-              authAvailable={!dialogData.configure}
-              isAuthenticating={dialogData.authenticating}
-              onLogin={login}
-            >
+            <AuthDialogFooter authAvailable={!dialogData.configure} isAuthenticating={dialogData.authenticating} onLogin={login}>
               {errorDetails.name && (
                 <ErrorMessage
                   text={errorDetails.message || errorDetails.name}
@@ -217,6 +215,6 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
           </CommonDialogFooter>
         )}
       </CommonDialogWrapper>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx
index f43a955a59..a10d97bf84 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -33,26 +32,15 @@ export interface Props extends React.PropsWithChildren {
   onLogin: () => void;
 }
 
-export const AuthDialogFooter = observer<Props>(function AuthDialogFooter({
-  authAvailable,
-  isAuthenticating,
-  onLogin,
-  children,
-}) {
+export const AuthDialogFooter = observer<Props>(function AuthDialogFooter({ authAvailable, isAuthenticating, onLogin, children }) {
   const translate = useTranslate();
 
   return styled(styles)(
     <footer-container>
       {children}
-      <Button
-        type="button"
-        mod={['unelevated']}
-        loading={isAuthenticating}
-        hidden={!authAvailable}
-        onClick={onLogin}
-      >
+      <Button type="button" mod={['unelevated']} loading={isAuthenticating} hidden={!authAvailable} onClick={onLogin}>
         {translate('authentication_login')}
       </Button>
-    </footer-container>
+    </footer-container>,
   );
 });
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
index 701eb18a28..f6d0e9fab0 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 
@@ -21,9 +20,7 @@ export class AuthDialogService {
   private persistent: boolean;
   private dialog: Promise<DialogueStateResult | null> | null;
 
-  constructor(
-    private readonly commonDialogService: CommonDialogService
-  ) {
+  constructor(private readonly commonDialogService: CommonDialogService) {
     this.persistent = false;
     this.dialog = null;
   }
@@ -32,7 +29,7 @@ export class AuthDialogService {
     persistent = false,
     options: IAuthOptions = {
       providerId: null,
-    }
+    },
   ): Promise<DialogueStateResult | null> {
     if (this.dialog) {
       return this.dialog;
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx
index 48e033ae81..e5cef781d1 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx
@@ -5,25 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import type { AuthProvider, IAuthCredentials } from '@cloudbeaver/core-authentication';
 import { BASE_CONTAINERS_STYLES, Combobox, Group, InputField, useFocus, useStyles } from '@cloudbeaver/core-blocks';
 
-
 interface Props {
   provider: AuthProvider;
   credentials: IAuthCredentials;
   authenticate: boolean;
 }
 
-export const AuthProviderForm = observer<Props>(function AuthProviderForm({
-  provider,
-  credentials,
-  authenticate,
-}) {
+export const AuthProviderForm = observer<Props>(function AuthProviderForm({ provider, credentials, authenticate }) {
   const [elementRef] = useFocus<HTMLDivElement>({ focusFirstChild: true });
 
   function handleProfileSelect() {
@@ -47,20 +41,23 @@ export const AuthProviderForm = observer<Props>(function AuthProviderForm({
           onSelect={handleProfileSelect}
         />
       )}
-      {profile.credentialParameters.map(parameter => parameter.user && (
-        <InputField
-          key={parameter.id}
-          title={parameter.description}
-          type={parameter.encryption === 'none' ? 'text' : 'password'}
-          name={parameter.id}
-          state={credentials.credentials}
-          disabled={authenticate}
-          autoComplete={`section-authentication section-${provider.id} ${parameter.id}`}
-          mod='surface'
-        >
-          {parameter.displayName}
-        </InputField>
-      ))}
-    </Group>
+      {profile.credentialParameters.map(
+        parameter =>
+          parameter.user && (
+            <InputField
+              key={parameter.id}
+              title={parameter.description}
+              type={parameter.encryption === 'none' ? 'text' : 'password'}
+              name={parameter.id}
+              state={credentials.credentials}
+              disabled={authenticate}
+              autoComplete={`section-authentication section-${provider.id} ${parameter.id}`}
+              mod="surface"
+            >
+              {parameter.displayName}
+            </InputField>
+          ),
+      )}
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
index 2fd0e97281..ff7ca66df6 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
@@ -5,53 +5,64 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AuthInfoService, AuthProvider, AuthProviderConfiguration, comparePublicAuthConfigurations } from '@cloudbeaver/core-authentication';
-import { Filter, IconOrImage, Link, Cell, getComputed, TextPlaceholder, usePromiseState, Loader, Button, useTranslate, useStyles, Translate } from '@cloudbeaver/core-blocks';
+import {
+  Button,
+  Cell,
+  Filter,
+  getComputed,
+  IconOrImage,
+  Link,
+  Loader,
+  TextPlaceholder,
+  Translate,
+  usePromiseState,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { ITask } from '@cloudbeaver/core-executor';
 import type { UserInfo } from '@cloudbeaver/core-sdk';
 
-
 import { AuthenticationService } from '../../AuthenticationService';
 
 const styles = css`
-    container {
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-      flex: 1;
-    }
-    Filter {
-      margin: 0 24px 12px 24px;
-    }
-    list {
-      overflow: auto;
-    }
-    Cell {
-      composes: theme-border-color-secondary from global;
-      border-bottom: 1px solid;
-      padding: 0 16px;
-    }
-    IconOrImage {
-      width: 100%;
-      height: 100%;
-    }
-    center {
-      margin: auto;
-    }
+  container {
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    flex: 1;
+  }
+  Filter {
+    margin: 0 24px 12px 24px;
+  }
+  list {
+    overflow: auto;
+  }
+  Cell {
+    composes: theme-border-color-secondary from global;
+    border-bottom: 1px solid;
+    padding: 0 16px;
+  }
+  IconOrImage {
+    width: 100%;
+    height: 100%;
+  }
+  center {
+    margin: auto;
+  }
 `;
 
 const loaderStyle = css`
-    ExceptionMessage {
-      padding: 24px;
-    }
-  `;
+  ExceptionMessage {
+    padding: 24px;
+  }
+`;
 
 interface IProviderConfiguration {
   provider: AuthProvider;
@@ -84,17 +95,15 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
   const [search, setSearch] = useState('');
   const [authTask, setAuthTask] = useState<ITask<UserInfo | null> | null>(null);
   const authTaskState = usePromiseState(authTask);
-  const configurations = getComputed<IProviderConfiguration[]>(() => providers.map(
-    provider => (
-      (provider.configurations || [])
-        .filter(configuration => configuration.signInLink)
-        .map(configuration => ({ provider, configuration }))
-    )).flat()
+  const configurations = getComputed<IProviderConfiguration[]>(() =>
+    providers
+      .map(provider =>
+        (provider.configurations || []).filter(configuration => configuration.signInLink).map(configuration => ({ provider, configuration })),
+      )
+      .flat(),
   );
 
-  const sortedConfigurations = configurations
-    .slice()
-    .sort((a, b) => comparePublicAuthConfigurations(a.configuration, b.configuration));
+  const sortedConfigurations = configurations.slice().sort((a, b) => comparePublicAuthConfigurations(a.configuration, b.configuration));
 
   let filteredConfigurations: IProviderConfiguration[];
 
@@ -138,11 +147,7 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
     return (
       <TextPlaceholder>
         {translate('authentication_configure')}
-        {authenticationService.configureIdentityProvider && (
-          <Link onClick={navToSettings}>
-            {translate('ui_configure')}
-          </Link>
-        )}
+        {authenticationService.configureIdentityProvider && <Link onClick={navToSettings}>{translate('ui_configure')}</Link>}
       </TextPlaceholder>
     );
   }
@@ -150,64 +155,36 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
   if (activeProvider && activeConfiguration) {
     return styled(style)(
       <container className={className}>
-        <Loader
-          state={authTaskState}
-          style={loaderStyle}
-          message="authentication_authorizing"
-          hideException
-        >
+        <Loader state={authTaskState} style={loaderStyle} message="authentication_authorizing" hideException>
           <center>
-            <Button
-              type="button"
-              mod={['unelevated']}
-              onClick={() => auth({ provider: activeProvider, configuration: activeConfiguration })}
-            >
-              <Translate token='authentication_login' />
+            <Button type="button" mod={['unelevated']} onClick={() => auth({ provider: activeProvider, configuration: activeConfiguration })}>
+              <Translate token="authentication_login" />
             </Button>
           </center>
         </Loader>
-      </container>
+      </container>,
     );
   }
 
   return styled(style)(
     <container className={className}>
       {configurations.length >= 10 && (
-        <Filter
-          placeholder={translate('authentication_identity_provider_search_placeholder')}
-          value={search}
-          max
-          onFilter={setSearch}
-        />
+        <Filter placeholder={translate('authentication_identity_provider_search_placeholder')} value={search} max onFilter={setSearch} />
       )}
       <list>
         {filteredConfigurations.map(({ provider, configuration }) => {
           const icon = configuration.iconURL || provider.icon;
           const title = `${configuration.displayName}\n${configuration.description || ''}`;
           return (
-            <Link
-              key={configuration.id}
-              title={title}
-              wrapper
-              onClick={() => auth({ provider, configuration })}
-            >
-              <Cell
-                before={icon ? <IconOrImage icon={icon} /> : undefined}
-                description={configuration.description}
-              >
+            <Link key={configuration.id} title={title} wrapper onClick={() => auth({ provider, configuration })}>
+              <Cell before={icon ? <IconOrImage icon={icon} /> : undefined} description={configuration.description}>
                 {configuration.displayName}
               </Cell>
             </Link>
           );
         })}
       </list>
-      <Loader
-        state={authTaskState}
-        style={loaderStyle}
-        message="authentication_authorizing"
-        overlay
-        hideException
-      />
-    </container>
+      <Loader state={authTaskState} style={loaderStyle} message="authentication_authorizing" overlay hideException />
+    </container>,
   );
 });
diff --git a/webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts b/webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts
index 361adcd535..dce7aaf7b5 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts
+++ b/webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 import { useEffect } from 'react';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { AuthInfoService, AuthProvider, AuthProviderConfiguration, AuthProvidersResource, IAuthCredentials } from '@cloudbeaver/core-authentication';
-import { useResource, useObservableRef } from '@cloudbeaver/core-blocks';
+import { useObservableRef, useResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
@@ -50,72 +49,68 @@ export function useAuthDialogState(accessRequest: boolean, providerId: string |
 
   const primaryId = authProvidersResource.resource.getPrimary();
   const adminPageActive = administrationScreenService.isAdministrationPageActive;
-  const providers = authProvidersResource.data
-    .filter(notEmptyProvider)
-    .sort(compareProviders);
+  const providers = authProvidersResource.data.filter(notEmptyProvider).sort(compareProviders);
 
-  const state = useObservableRef<IState>(() => ({
-    tabId: null,
-    activeProvider: null,
-    activeConfiguration: null,
-    credentials: {
-      profile: '0',
-      credentials: {},
+  const state = useObservableRef<IState>(
+    () => ({
+      tabId: null,
+      activeProvider: null,
+      activeConfiguration: null,
+      credentials: {
+        profile: '0',
+        credentials: {},
+      },
+
+      setTabId(tabId: string): void {
+        this.tabId = tabId;
+      },
+      setActiveProvider(provider: AuthProvider | null): void {
+        this.activeProvider = provider;
+        this.credentials.profile = '0';
+        this.credentials.credentials = {};
+        this.activeConfiguration = null;
+      },
+      setActiveConfiguration(provider: AuthProvider | null, configuration: AuthProviderConfiguration | null): void {
+        this.setActiveProvider(provider);
+        this.activeConfiguration = configuration;
+      },
+    }),
+    {
+      tabId: observable.ref,
+      activeProvider: observable.ref,
+      activeConfiguration: observable.ref,
+      credentials: observable,
+      setActiveProvider: action,
+      setActiveConfiguration: action,
     },
+    false,
+  );
 
-    setTabId(tabId: string): void {
-      this.tabId = tabId;
-    },
-    setActiveProvider(provider: AuthProvider | null): void {
-      this.activeProvider = provider;
-      this.credentials.profile = '0';
-      this.credentials.credentials = {};
-      this.activeConfiguration = null;
-    },
-    setActiveConfiguration(
-      provider: AuthProvider | null,
-      configuration: AuthProviderConfiguration | null
-    ): void {
-      this.setActiveProvider(provider);
-      this.activeConfiguration = configuration;
-    },
-  }), {
-    tabId: observable.ref,
-    activeProvider: observable.ref,
-    activeConfiguration: observable.ref,
-    credentials: observable,
-    setActiveProvider: action,
-    setActiveConfiguration: action,
-  }, false);
-
-  const activeProviders = providers
-    .filter(provider => {
-      if (provider.id === primaryId && adminPageActive && accessRequest) {
-        return true;
-      }
-
-      if (provider.configurable || provider.trusted || provider.private) {
-        return false;
-      }
-
-      if (providerId !== null) {
-        return provider.id === providerId;
-      }
-
-      const active = authProvidersResource.resource.isAuthEnabled(provider.id);
-
-      if (active) {
-        return true;
-      }
+  const activeProviders = providers.filter(provider => {
+    if (provider.id === primaryId && adminPageActive && accessRequest) {
+      return true;
+    }
 
+    if (provider.configurable || provider.trusted || provider.private) {
       return false;
-    });
+    }
 
-  const configurations = providers.filter(provider => (
-    provider.configurable
-    && (provider.configurations?.length || 0) > 0
-    && authProvidersResource.resource.isAuthEnabled(provider.id)
-  ));
+    if (providerId !== null) {
+      return provider.id === providerId;
+    }
+
+    const active = authProvidersResource.resource.isAuthEnabled(provider.id);
+
+    if (active) {
+      return true;
+    }
+
+    return false;
+  });
+
+  const configurations = providers.filter(
+    provider => provider.configurable && (provider.configurations?.length || 0) > 0 && authProvidersResource.resource.isAuthEnabled(provider.id),
+  );
 
   const tabIds = activeProviders.map(provider => provider.id);
 
@@ -123,69 +118,72 @@ export function useAuthDialogState(accessRequest: boolean, providerId: string |
     tabIds.push(FEDERATED_AUTH);
   }
 
-  const data = useObservableRef<IData>(() => ({
-    exception: null,
-    authenticating: false,
-    destroyed: false,
+  const data = useObservableRef<IData>(
+    () => ({
+      exception: null,
+      authenticating: false,
+      destroyed: false,
 
-    get configure(): boolean {
-      if (state.activeProvider) {
-        if (this.adminPageActive && authProvidersResource.resource.isPrimary(state.activeProvider.id)) {
-          return false;
+      get configure(): boolean {
+        if (state.activeProvider) {
+          if (this.adminPageActive && authProvidersResource.resource.isPrimary(state.activeProvider.id)) {
+            return false;
+          }
+          return !authProvidersResource.resource.isAuthEnabled(state.activeProvider.id);
         }
-        return !authProvidersResource.resource.isAuthEnabled(state.activeProvider.id);
-      }
-      return false;
-    },
-    async login(linkUser: boolean): Promise<void> {
-      if (!state.activeProvider || this.authenticating) {
-        return;
-      }
-
-      this.authenticating = true;
-      try {
-        await authInfoService.login(state.activeProvider.id, {
-          credentials: state.credentials,
-          linkUser,
-        });
-      } catch (exception: any) {
-        if (this.destroyed) {
-          notificationService.logException(exception, 'Login failed');
-        } else {
-          this.exception = exception;
+        return false;
+      },
+      async login(linkUser: boolean): Promise<void> {
+        if (!state.activeProvider || this.authenticating) {
+          return;
         }
-        throw exception;
-      } finally {
-        this.authenticating = false;
-      }
-    },
-  }), {
-    state: observable.ref,
-    exception: observable.ref,
-    authenticating: observable.ref,
-    configure: computed,
-    adminPageActive: observable.ref,
-  }, {
-    state,
-    adminPageActive,
-    providers: activeProviders,
-    configurations,
-  });
 
-  useEffect(() => () => { data.destroyed = true; }, []);
+        this.authenticating = true;
+        try {
+          await authInfoService.login(state.activeProvider.id, {
+            credentials: state.credentials,
+            linkUser,
+          });
+        } catch (exception: any) {
+          if (this.destroyed) {
+            notificationService.logException(exception, 'Login failed');
+          } else {
+            this.exception = exception;
+          }
+          throw exception;
+        } finally {
+          this.authenticating = false;
+        }
+      },
+    }),
+    {
+      state: observable.ref,
+      exception: observable.ref,
+      authenticating: observable.ref,
+      configure: computed,
+      adminPageActive: observable.ref,
+    },
+    {
+      state,
+      adminPageActive,
+      providers: activeProviders,
+      configurations,
+    },
+  );
+
+  useEffect(
+    () => () => {
+      data.destroyed = true;
+    },
+    [],
+  );
 
   if (tabIds.length > 0 && (state.tabId === null || !tabIds.includes(state.tabId))) {
     const tabId = tabIds[0];
     state.setTabId(tabId);
 
-    const provider = (
-      activeProviders.find(provider => provider.id === tabId)
-      || providers.find(provider => provider.id === providerId)
-      || null
-    );
-    const configuration = provider?.configurations?.find(
-      configuration => configuration.id === configurationId
-    ) ?? null;
+    const provider = activeProviders.find(provider => provider.id === tabId) || providers.find(provider => provider.id === providerId) || null;
+    const configuration = provider?.configurations?.find(configuration => configuration.id === configurationId) ?? null;
 
     state.setActiveConfiguration(provider, configuration);
   }
diff --git a/webapp/packages/plugin-authentication/src/IAuthOptions.ts b/webapp/packages/plugin-authentication/src/IAuthOptions.ts
index 65061ec2b4..1456c71860 100644
--- a/webapp/packages/plugin-authentication/src/IAuthOptions.ts
+++ b/webapp/packages/plugin-authentication/src/IAuthOptions.ts
@@ -11,4 +11,4 @@ export interface IAuthOptions {
   configurationId?: string;
   linkUser?: boolean;
   accessRequest?: boolean;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-authentication/src/IAutoLoginSessionAction.ts b/webapp/packages/plugin-authentication/src/IAutoLoginSessionAction.ts
index 196d18a3b2..d2a3c87b30 100644
--- a/webapp/packages/plugin-authentication/src/IAutoLoginSessionAction.ts
+++ b/webapp/packages/plugin-authentication/src/IAutoLoginSessionAction.ts
@@ -9,4 +9,4 @@
 export interface IAutoLoginSessionAction {
   action: 'auto-login';
   'auth-id': string;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-authentication/src/PluginBootstrap.ts b/webapp/packages/plugin-authentication/src/PluginBootstrap.ts
index dcaee07dc5..814717d5fd 100644
--- a/webapp/packages/plugin-authentication/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-authentication/src/PluginBootstrap.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AuthInfoService } from '@cloudbeaver/core-authentication';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { DATA_CONTEXT_MENU, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 import { TOP_NAV_BAR_SETTINGS_MENU } from '@cloudbeaver/plugin-settings-menu';
@@ -38,7 +37,7 @@ export class PluginBootstrap extends Bootstrap {
                 label: 'authentication_login',
                 tooltip: 'authentication_login',
               },
-              { onSelect: () => this.authenticationService.authUser(null, false) }
+              { onSelect: () => this.authenticationService.authUser(null, false) },
             ),
           ];
         }
@@ -52,7 +51,7 @@ export class PluginBootstrap extends Bootstrap {
                 label: 'authentication_logout',
                 tooltip: 'authentication_logout',
               },
-              { onSelect: () => this.authenticationService.logout() }
+              { onSelect: () => this.authenticationService.logout() },
             ),
           ];
         }
@@ -72,5 +71,5 @@ export class PluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-authentication/src/index.ts b/webapp/packages/plugin-authentication/src/index.ts
index cd9fe02cc8..998e8e8c93 100644
--- a/webapp/packages/plugin-authentication/src/index.ts
+++ b/webapp/packages/plugin-authentication/src/index.ts
@@ -1,4 +1,5 @@
 import { manifest } from './manifest';
+
 export * from './AuthenticationService';
 export * from './Dialog/AuthDialogService';
 export default manifest;
diff --git a/webapp/packages/plugin-authentication/src/isAutoLoginSessionAction.ts b/webapp/packages/plugin-authentication/src/isAutoLoginSessionAction.ts
index 17ba6ad15c..2cd07a11ca 100644
--- a/webapp/packages/plugin-authentication/src/isAutoLoginSessionAction.ts
+++ b/webapp/packages/plugin-authentication/src/isAutoLoginSessionAction.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IAutoLoginSessionAction } from './IAutoLoginSessionAction';
 
 export function isAutoLoginSessionAction(obj: any): obj is IAutoLoginSessionAction {
   return obj && 'action' in obj && obj.action === 'auto-login';
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-authentication/src/locales/en.ts b/webapp/packages/plugin-authentication/src/locales/en.ts
index 0b7cc179f0..268017a9c5 100644
--- a/webapp/packages/plugin-authentication/src/locales/en.ts
+++ b/webapp/packages/plugin-authentication/src/locales/en.ts
@@ -22,7 +22,7 @@ export default [
   ['authentication_user_team', 'User team'],
   ['authentication_user_status', 'User status'],
   ['authentication_user_enabled', 'Enabled'],
-  ['authentication_user_login_not_set', 'Login can\'t be empty'],
+  ['authentication_user_login_not_set', "Login can't be empty"],
   ['authentication_user_team_not_set', 'At least one team must be selected'],
   ['authentication_user_role_not_set', '{alias:authentication_user_role} is required'],
   ['authentication_user_password_not_set', '{alias:authentication_user_password} is required'],
diff --git a/webapp/packages/plugin-authentication/src/manifest.ts b/webapp/packages/plugin-authentication/src/manifest.ts
index ee8e3f3a5f..11ec90f8bf 100644
--- a/webapp/packages/plugin-authentication/src/manifest.ts
+++ b/webapp/packages/plugin-authentication/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { AuthenticationLocaleService } from './AuthenticationLocaleService';
@@ -18,10 +17,5 @@ export const manifest: PluginManifest = {
     name: 'Plugin Authentication',
   },
 
-  providers: [
-    AuthenticationService,
-    AuthDialogService,
-    PluginBootstrap,
-    AuthenticationLocaleService,
-  ],
+  providers: [AuthenticationService, AuthDialogService, PluginBootstrap, AuthenticationLocaleService],
 };
diff --git a/webapp/packages/plugin-browser/src/LocaleService.ts b/webapp/packages/plugin-browser/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-browser/src/LocaleService.ts
+++ b/webapp/packages/plugin-browser/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-browser/src/PluginBrowserBootstrap.ts b/webapp/packages/plugin-browser/src/PluginBrowserBootstrap.ts
index 0a2c9cc947..d424d15ba8 100644
--- a/webapp/packages/plugin-browser/src/PluginBrowserBootstrap.ts
+++ b/webapp/packages/plugin-browser/src/PluginBrowserBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ActionSnackbar } from '@cloudbeaver/core-blocks';
 import { ServiceWorkerService } from '@cloudbeaver/core-browser';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -33,15 +32,18 @@ export class PluginBrowserBootstrap extends Bootstrap {
         return;
       }
 
-      this.notificationService.customNotification(() => ActionSnackbar, {
-        actionText: 'ui_processing_reload',
-        onAction: () => window.location.reload(),
-      }, { title: 'plugin_browser_update_dialog_title', persistent: true, type: ENotificationType.Info });
+      this.notificationService.customNotification(
+        () => ActionSnackbar,
+        {
+          actionText: 'ui_processing_reload',
+          onAction: () => window.location.reload(),
+        },
+        { title: 'plugin_browser_update_dialog_title', persistent: true, type: ENotificationType.Info },
+      );
 
       ExecutorInterrupter.interrupt(context);
     });
   }
 
-  load(): void | Promise<void> {
-  }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-browser/src/index.ts b/webapp/packages/plugin-browser/src/index.ts
index 510402b96b..eea6e3db82 100644
--- a/webapp/packages/plugin-browser/src/index.ts
+++ b/webapp/packages/plugin-browser/src/index.ts
@@ -1,3 +1,4 @@
 import { browserPlugin } from './manifest';
+
 export default browserPlugin;
 export { browserPlugin };
diff --git a/webapp/packages/plugin-browser/src/locales/en.ts b/webapp/packages/plugin-browser/src/locales/en.ts
index cffac5d368..ce245046d5 100644
--- a/webapp/packages/plugin-browser/src/locales/en.ts
+++ b/webapp/packages/plugin-browser/src/locales/en.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_browser_update_dialog_title', 'Update available'],
   ['plugin_browser_update_dialog_message', 'New version of CloudBeaver is available. Do you want to update?'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-browser/src/locales/it.ts b/webapp/packages/plugin-browser/src/locales/it.ts
index 13ee1be3cd..d6d1738de6 100644
--- a/webapp/packages/plugin-browser/src/locales/it.ts
+++ b/webapp/packages/plugin-browser/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-
-];
\ No newline at end of file
+export default [];
diff --git a/webapp/packages/plugin-browser/src/locales/ru.ts b/webapp/packages/plugin-browser/src/locales/ru.ts
index 3f05dbc138..5f378f8b53 100644
--- a/webapp/packages/plugin-browser/src/locales/ru.ts
+++ b/webapp/packages/plugin-browser/src/locales/ru.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_browser_update_dialog_title', 'Доступно обновление'],
   ['plugin_browser_update_dialog_message', 'Новая версия CloudBeaver доступна. Хотите обновить?'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-browser/src/locales/zh.ts b/webapp/packages/plugin-browser/src/locales/zh.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-browser/src/locales/zh.ts
+++ b/webapp/packages/plugin-browser/src/locales/zh.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-browser/src/manifest.ts b/webapp/packages/plugin-browser/src/manifest.ts
index 0bbcf35d41..ea2fa587c0 100644
--- a/webapp/packages/plugin-browser/src/manifest.ts
+++ b/webapp/packages/plugin-browser/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -13,8 +12,5 @@ import { PluginBrowserBootstrap } from './PluginBrowserBootstrap';
 
 export const browserPlugin: PluginManifest = {
   info: { name: 'Browser plugin' },
-  providers: [
-    PluginBrowserBootstrap,
-    LocaleService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBrowserBootstrap, LocaleService],
+};
diff --git a/webapp/packages/plugin-codemirror6/src/Editor.tsx b/webapp/packages/plugin-codemirror6/src/Editor.tsx
index 9ab7da1a2f..d31c223b7a 100644
--- a/webapp/packages/plugin-codemirror6/src/Editor.tsx
+++ b/webapp/packages/plugin-codemirror6/src/Editor.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef } from 'react';
 import styled from 'reshadow';
@@ -19,18 +18,16 @@ import { ReactCodemirror } from './ReactCodemirror';
 import { EDITOR_BASE_STYLES } from './theme';
 import { useEditorDefaultExtensions } from './useDefaultExtensions';
 
-export const Editor = observer<IEditorProps & IDefaultExtensions, IEditorRef>(forwardRef(function Editor({
-  lineNumbers,
-  extensions = [],
-  ...rest
-}, ref) {
-  const defaultExtensions = useEditorDefaultExtensions({ lineNumbers });
-  const combinedExtensions = [...defaultExtensions];
-  combinedExtensions.push(...extensions);
+export const Editor = observer<IEditorProps & IDefaultExtensions, IEditorRef>(
+  forwardRef(function Editor({ lineNumbers, extensions = [], ...rest }, ref) {
+    const defaultExtensions = useEditorDefaultExtensions({ lineNumbers });
+    const combinedExtensions = [...defaultExtensions];
+    combinedExtensions.push(...extensions);
 
-  return styled(EDITOR_BASE_STYLES)(
-    <wrapper className={clsx('editor', rest.className)}>
-      <ReactCodemirror {...rest} ref={ref} extensions={combinedExtensions} />
-    </wrapper>
-  );
-}));
\ No newline at end of file
+    return styled(EDITOR_BASE_STYLES)(
+      <wrapper className={clsx('editor', rest.className)}>
+        <ReactCodemirror {...rest} ref={ref} extensions={combinedExtensions} />
+      </wrapper>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-codemirror6/src/EditorLoader.tsx b/webapp/packages/plugin-codemirror6/src/EditorLoader.tsx
index 487709b884..f00a0e6ea7 100644
--- a/webapp/packages/plugin-codemirror6/src/EditorLoader.tsx
+++ b/webapp/packages/plugin-codemirror6/src/EditorLoader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { forwardRef } from 'react';
 
 import { ComplexLoader, createComplexLoader } from '@cloudbeaver/core-blocks';
@@ -20,9 +19,5 @@ const loader = createComplexLoader(async function loader() {
 });
 
 export const EditorLoader = forwardRef<IEditorRef, IEditorProps & IDefaultExtensions>(function EditorLoader(props, ref) {
-  return (
-    <ComplexLoader loader={loader}>
-      {({ Editor }) => <Editor {...props} ref={ref} />}
-    </ComplexLoader>
-  );
+  return <ComplexLoader loader={loader}>{({ Editor }) => <Editor {...props} ref={ref} />}</ComplexLoader>;
 });
diff --git a/webapp/packages/plugin-codemirror6/src/IEditorProps.ts b/webapp/packages/plugin-codemirror6/src/IEditorProps.ts
index 3ac8d91844..03b38d14b9 100644
--- a/webapp/packages/plugin-codemirror6/src/IEditorProps.ts
+++ b/webapp/packages/plugin-codemirror6/src/IEditorProps.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IReactCodeMirrorProps } from './IReactCodemirrorProps';
 
 export interface IEditorProps extends IReactCodeMirrorProps {
   className?: string;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-codemirror6/src/IEditorRef.ts b/webapp/packages/plugin-codemirror6/src/IEditorRef.ts
index a22ba1b5cc..d079d6fe67 100644
--- a/webapp/packages/plugin-codemirror6/src/IEditorRef.ts
+++ b/webapp/packages/plugin-codemirror6/src/IEditorRef.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { EditorView } from '@codemirror/view';
 
 export interface IEditorRef {
   container: HTMLDivElement | null;
   view: EditorView | null;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts b/webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts
index 6c32b5f0f0..f858d07cd2 100644
--- a/webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts
+++ b/webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Extension } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 
@@ -18,4 +17,4 @@ export interface IReactCodeMirrorProps {
   autoFocus?: boolean;
   onChange?: (value: string, update: ViewUpdate) => void;
   onUpdate?: (update: ViewUpdate) => void;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx b/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
index ea814fb33a..11d41ade87 100644
--- a/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
+++ b/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
+import { Annotation, EditorState, StateEffect } from '@codemirror/state';
+import { EditorView, ViewUpdate } from '@codemirror/view';
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
-import { Annotation, EditorState, StateEffect } from '@codemirror/state';
-import { ViewUpdate, EditorView } from '@codemirror/view';
 
 import type { IEditorRef } from './IEditorRef';
 import type { IReactCodeMirrorProps } from './IReactCodemirrorProps';
@@ -25,99 +24,99 @@ const defaultTheme = EditorView.theme({
   },
 });
 
-export const ReactCodemirror = observer<IReactCodeMirrorProps, IEditorRef>(forwardRef(function ReactCodemirror({
-  getValue,
-  value,
-  extensions,
-  readonly,
-  autoFocus,
-  onChange,
-  onUpdate,
-}, ref) {
-  value = value ?? getValue?.();
-  const [container, setContainer] = useState<HTMLDivElement | null>(null);
-  const [view, setView] = useState<EditorView | null>(null);
-  const lastValueUpdate = useRef<string | undefined>(undefined);
+export const ReactCodemirror = observer<IReactCodeMirrorProps, IEditorRef>(
+  forwardRef(function ReactCodemirror({ getValue, value, extensions, readonly, autoFocus, onChange, onUpdate }, ref) {
+    value = value ?? getValue?.();
+    const [container, setContainer] = useState<HTMLDivElement | null>(null);
+    const [view, setView] = useState<EditorView | null>(null);
+    const lastValueUpdate = useRef<string | undefined>(undefined);
 
-  const ext = [defaultTheme];
-  const callbackRef = useObjectRef({ onChange, onUpdate });
+    const ext = [defaultTheme];
+    const callbackRef = useObjectRef({ onChange, onUpdate });
 
-  if (readonly) {
-    // can lead to missing state updates
-    ext.push(EditorState.readOnly.of(true));
-    // ext.push(EditorView.editable.of(false));
-  }
-
-  if (extensions) {
-    ext.push(extensions);
-  }
-
-  const updateListener = useMemo(() => EditorView.updateListener.of((update: ViewUpdate) => {
-    const remote = update.transactions.some(tr => tr.annotation(External));
-
-    if (update.docChanged && !remote) {
-      const doc = update.state.doc;
-      const value = doc.toString();
-
-      lastValueUpdate.current = value;
-      callbackRef.onChange?.(value, update);
+    if (readonly) {
+      // can lead to missing state updates
+      ext.push(EditorState.readOnly.of(true));
+      // ext.push(EditorView.editable.of(false));
     }
 
-    callbackRef.onUpdate?.(update);
-  }), []);
-
-  ext.push(updateListener);
-
-  useLayoutEffect(() => {
-    if (container) {
-      const ev = new EditorView({
-        parent: container,
-      });
-
-      setView(ev);
-
-      ev.dom.addEventListener('keydown', event => {
-        const newEvent = new KeyboardEvent('keydown', event);
-        document.dispatchEvent(newEvent);
-      });
-
-      return () => {
-        ev.destroy();
-        setView(null);
-      };
+    if (extensions) {
+      ext.push(extensions);
     }
 
-    return () => { };
-  }, [container]);
+    const updateListener = useMemo(
+      () =>
+        EditorView.updateListener.of((update: ViewUpdate) => {
+          const remote = update.transactions.some(tr => tr.annotation(External));
 
-  useLayoutEffect(() => {
-    if (view && value !== lastValueUpdate.current) {
-      lastValueUpdate.current = value;
-      view.dispatch({
-        changes: { from: 0, to: view.state.doc.length, insert: value },
-        annotations: [External.of(true)],
-      });
-    }
-  }, [value, view]);
+          if (update.docChanged && !remote) {
+            const doc = update.state.doc;
+            const value = doc.toString();
 
-  useLayoutEffect(() => {
-    if (view) {
-      view.dispatch({ effects: StateEffect.reconfigure.of(ext) });
-    }
-  });
+            lastValueUpdate.current = value;
+            callbackRef.onChange?.(value, update);
+          }
 
-  useLayoutEffect(() => {
-    if (!readonly && autoFocus && view) {
-      view.focus();
-    }
-  }, [autoFocus, view, readonly]);
+          callbackRef.onUpdate?.(update);
+        }),
+      [],
+    );
 
-  useImperativeHandle(ref, () => ({
-    container,
-    view,
-  }), [container, view]);
+    ext.push(updateListener);
 
-  return (
-    <div ref={setContainer} className='ReactCodemirror' />
-  );
-}));
\ No newline at end of file
+    useLayoutEffect(() => {
+      if (container) {
+        const ev = new EditorView({
+          parent: container,
+        });
+
+        setView(ev);
+
+        ev.dom.addEventListener('keydown', event => {
+          const newEvent = new KeyboardEvent('keydown', event);
+          document.dispatchEvent(newEvent);
+        });
+
+        return () => {
+          ev.destroy();
+          setView(null);
+        };
+      }
+
+      return () => {};
+    }, [container]);
+
+    useLayoutEffect(() => {
+      if (view && value !== lastValueUpdate.current) {
+        lastValueUpdate.current = value;
+        view.dispatch({
+          changes: { from: 0, to: view.state.doc.length, insert: value },
+          annotations: [External.of(true)],
+        });
+      }
+    }, [value, view]);
+
+    useLayoutEffect(() => {
+      if (view) {
+        view.dispatch({ effects: StateEffect.reconfigure.of(ext) });
+      }
+    });
+
+    useLayoutEffect(() => {
+      if (!readonly && autoFocus && view) {
+        view.focus();
+      }
+    }, [autoFocus, view, readonly]);
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        container,
+        view,
+      }),
+      [container, view],
+    );
+
+    return <div ref={setContainer} className="ReactCodemirror" />;
+  }),
+);
diff --git a/webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts b/webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts
index c00d77f244..72fc911e3d 100644
--- a/webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts
+++ b/webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts
@@ -5,21 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { GlobalConstants, clsx } from '@cloudbeaver/core-utils';
 import { defaultKeymap, indentWithTab } from '@codemirror/commands';
-import { foldGutter, indentOnInput, syntaxHighlighting, bracketMatching } from '@codemirror/language';
+import { bracketMatching, foldGutter, indentOnInput, syntaxHighlighting } from '@codemirror/language';
 import { highlightSelectionMatches } from '@codemirror/search';
 import type { Extension } from '@codemirror/state';
-import { tooltips, lineNumbers, highlightSpecialChars, dropCursor, rectangularSelection, crosshairCursor, keymap, highlightActiveLineGutter, highlightActiveLine } from '@codemirror/view';
+import {
+  crosshairCursor,
+  dropCursor,
+  highlightActiveLine,
+  highlightActiveLineGutter,
+  highlightSpecialChars,
+  keymap,
+  lineNumbers,
+  rectangularSelection,
+  tooltips,
+} from '@codemirror/view';
 import { classHighlighter } from '@lezer/highlight';
 
+import { clsx, GlobalConstants } from '@cloudbeaver/core-utils';
+
 // @TODO allow to configure bindings outside of the component
-const DEFAULT_KEY_MAP = defaultKeymap
-  .filter(binding => (
-    binding.mac !== 'Ctrl-f'
-    && binding.key !== 'Mod-Enter'
-  ));
+const DEFAULT_KEY_MAP = defaultKeymap.filter(binding => binding.mac !== 'Ctrl-f' && binding.key !== 'Mod-Enter');
 
 DEFAULT_KEY_MAP.push(indentWithTab);
 
@@ -72,4 +78,4 @@ export function getDefaultExtensions(options?: IDefaultExtensions): Record<strin
   }
 
   return extensions;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-codemirror6/src/theme/styles.ts b/webapp/packages/plugin-codemirror6/src/theme/styles.ts
index 342bd5f54c..c839d4462c 100644
--- a/webapp/packages/plugin-codemirror6/src/theme/styles.ts
+++ b/webapp/packages/plugin-codemirror6/src/theme/styles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ThemeSelector } from '@cloudbeaver/core-theming';
 
 export const EDITOR_BASE_STYLES: ThemeSelector = async theme => {
diff --git a/webapp/packages/plugin-codemirror6/src/useDefaultExtensions.ts b/webapp/packages/plugin-codemirror6/src/useDefaultExtensions.ts
index 7892fef28a..c1c554827e 100644
--- a/webapp/packages/plugin-codemirror6/src/useDefaultExtensions.ts
+++ b/webapp/packages/plugin-codemirror6/src/useDefaultExtensions.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
+import type { Extension } from '@codemirror/state';
 import { useState } from 'react';
 
 import { createComplexLoader, useComplexLoader } from '@cloudbeaver/core-blocks';
-import type { Extension } from '@codemirror/state';
 
 import type { IDefaultExtensions } from './getDefaultExtensions';
 
@@ -50,4 +49,4 @@ export function useEditorDefaultExtensions(options?: IDefaultExtensions) {
   }
 
   return Object.values(extensions);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-codemirror6/src/useEditorAutocompletion.ts b/webapp/packages/plugin-codemirror6/src/useEditorAutocompletion.ts
index f2fc318830..bfabe842b0 100644
--- a/webapp/packages/plugin-codemirror6/src/useEditorAutocompletion.ts
+++ b/webapp/packages/plugin-codemirror6/src/useEditorAutocompletion.ts
@@ -5,12 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { useMemo, useState } from 'react';
-
 import { autocompletion, startCompletion } from '@codemirror/autocomplete';
 import type { Extension } from '@codemirror/state';
 import { keymap } from '@codemirror/view';
+import { useMemo, useState } from 'react';
 
 export type CompletionConfig = Parameters<typeof autocompletion>[0];
 
@@ -19,16 +17,17 @@ export function useEditorAutocompletion(config?: CompletionConfig): Extension[]
     keymap.of([
       { key: 'Alt-Space', run: startCompletion, preventDefault: true },
       { key: 'Shift-Ctrl-Space', run: startCompletion, preventDefault: true },
-    ])
+    ]),
   );
 
-  const autocompletionExtension = useMemo(() => autocompletion({
-    ...config,
-    closeOnBlur: false,
-  }), [config]);
+  const autocompletionExtension = useMemo(
+    () =>
+      autocompletion({
+        ...config,
+        closeOnBlur: false,
+      }),
+    [config],
+  );
 
-  return [
-    autocompletionExtension,
-    autocompleteKeyMap,
-  ];
+  return [autocompletionExtension, autocompleteKeyMap];
 }
diff --git a/webapp/packages/plugin-connection-custom/src/Actions/ACTION_CONNECTION_CUSTOM.ts b/webapp/packages/plugin-connection-custom/src/Actions/ACTION_CONNECTION_CUSTOM.ts
index 13e52fd6a4..88faafa3ce 100644
--- a/webapp/packages/plugin-connection-custom/src/Actions/ACTION_CONNECTION_CUSTOM.ts
+++ b/webapp/packages/plugin-connection-custom/src/Actions/ACTION_CONNECTION_CUSTOM.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_CUSTOM = createAction(
-  'connection-custom',
-  {
-    label: 'plugin_connection_custom_action_custom_label',
-  }
-);
+export const ACTION_CONNECTION_CUSTOM = createAction('connection-custom', {
+  label: 'plugin_connection_custom_action_custom_label',
+});
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
index 39236c0ac9..540238dd1d 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { ConnectionsManagerService, DBDriver, DBDriverResource } from '@cloudbeaver/core-connections';
-import { injectable, IInitializableController } from '@cloudbeaver/core-di';
+import { IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
@@ -30,7 +29,7 @@ export class CustomConnectionController implements IInitializableController {
     private readonly notificationService: NotificationService,
     private readonly projectsService: ProjectsService,
     private readonly publicConnectionFormService: PublicConnectionFormService,
-    private readonly connectionsManagerService: ConnectionsManagerService
+    private readonly connectionsManagerService: ConnectionsManagerService,
   ) {
     this.isLoading = true;
 
@@ -60,7 +59,7 @@ export class CustomConnectionController implements IInitializableController {
     const state = await this.publicConnectionFormService.open(
       projects[0].id,
       { driverId },
-      this.drivers.map(driver => driver.id)
+      this.drivers.map(driver => driver.id),
     );
 
     if (state) {
@@ -72,7 +71,7 @@ export class CustomConnectionController implements IInitializableController {
     try {
       await this.dbDriverResource.load(CachedMapAllKey);
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load database drivers');
+      this.notificationService.logException(exception, "Can't load database drivers");
     } finally {
       this.isLoading = false;
     }
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx
index 5db2244a16..7322363994 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx
@@ -5,7 +5,6 @@
  * 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 { useTranslate } from '@cloudbeaver/core-blocks';
@@ -15,9 +14,7 @@ import type { DialogComponent } from '@cloudbeaver/core-dialogs';
 import { CustomConnectionController } from './CustomConnectionController';
 import { DriverSelectorDialog } from './DriverSelectorDialog/DriverSelectorDialog';
 
-export const CustomConnectionDialog: DialogComponent<null, null> = observer(function CustomConnectionDialog({
-  rejectDialog,
-}) {
+export const CustomConnectionDialog: DialogComponent<null, null> = observer(function CustomConnectionDialog({ rejectDialog }) {
   const controller = useController(CustomConnectionController, rejectDialog);
   const translate = useTranslate();
 
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/Driver.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/Driver.tsx
index b342ce5cb9..86ad83bf03 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/Driver.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/Driver.tsx
@@ -5,14 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  ListItem, ListItemIcon, ListItemName, ListItemDescription, StaticImage
-} from '@cloudbeaver/core-blocks';
+import { ListItem, ListItemDescription, ListItemIcon, ListItemName, StaticImage } from '@cloudbeaver/core-blocks';
 
 export interface IDriver {
   id: string;
@@ -39,9 +36,11 @@ export const Driver = observer<Props>(function Driver({ driver, onSelect }) {
 
   return styled(styles)(
     <ListItem onClick={select}>
-      <ListItemIcon><StaticImage icon={driver.icon} /></ListItemIcon>
+      <ListItemIcon>
+        <StaticImage icon={driver.icon} />
+      </ListItemIcon>
       <ListItemName>{driver.name}</ListItemName>
       <ListItemDescription title={driver.description}>{driver.description}</ListItemDescription>
-    </ListItem>
+    </ListItem>,
   );
 });
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx
index 07a9609ac7..28d2aaf44b 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx
@@ -5,12 +5,11 @@
  * 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 { useState, useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { ItemListSearch, ItemList, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
+import { ItemList, ItemListSearch, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
 
 import { Driver, IDriver } from './Driver';
 
@@ -43,8 +42,10 @@ export const DriverSelector = observer<Props>(function DriverSelector({ drivers,
     <div ref={focusedRef}>
       <ItemListSearch placeholder={translate('connections_driver_search_placeholder')} onChange={setSearch} />
       <ItemList className={className}>
-        {filteredDrivers.map(driver => <Driver key={driver.id} driver={driver} onSelect={onSelect} />)}
+        {filteredDrivers.map(driver => (
+          <Driver key={driver.id} driver={driver} onSelect={onSelect} />
+        ))}
       </ItemList>
-    </div>
+    </div>,
   );
 });
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx
index 90faff6523..b004afc35e 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -29,21 +28,14 @@ interface IProps {
   onClose: () => void;
 }
 
-export const DriverSelectorDialog = observer<IProps>(function DriverSelectorDialog({
-  title,
-  drivers,
-  isLoading,
-  onSelect,
-  onClose,
-}) {
+export const DriverSelectorDialog = observer<IProps>(function DriverSelectorDialog({ title, drivers, isLoading, onSelect, onClose }) {
   return styled(styles)(
-    <CommonDialogWrapper size='large' fixedSize>
+    <CommonDialogWrapper size="large" fixedSize>
       <CommonDialogHeader title={title} onReject={onClose} />
       <CommonDialogBody noBodyPadding noOverflow>
         {isLoading && <Loader />}
         {!isLoading && <DriverSelector drivers={drivers} onSelect={onSelect} />}
       </CommonDialogBody>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-}
-);
+});
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
index 0dce7d4605..d408572fe3 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionsManagerService } from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
@@ -34,17 +33,12 @@ export class CustomConnectionPluginBootstrap extends Bootstrap {
   register(): void | Promise<void> {
     this.menuService.addCreator({
       menus: [MENU_CONNECTIONS],
-      getItems: (context, items) => [
-        ...items,
-        ACTION_CONNECTION_CUSTOM,
-      ],
+      getItems: (context, items) => [...items, ACTION_CONNECTION_CUSTOM],
     });
 
     this.actionService.addHandler({
       id: 'connection-custom',
-      isActionApplicable: (context, action) => [
-        ACTION_CONNECTION_CUSTOM,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_CONNECTION_CUSTOM].includes(action),
       isHidden: (context, action) => {
         if (this.connectionsManagerService.createConnectionProjects.length === 0) {
           return true;
@@ -59,10 +53,7 @@ export class CustomConnectionPluginBootstrap extends Bootstrap {
       getLoader: (context, action) => {
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey)
-        );
+        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
       },
       handler: async (context, action) => {
         switch (action) {
@@ -75,7 +66,7 @@ export class CustomConnectionPluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async openConnectionsDialog() {
     await this.commonDialogService.open(CustomConnectionDialog, null);
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnectionSettingsService.ts b/webapp/packages/plugin-connection-custom/src/CustomConnectionSettingsService.ts
index cb78d379c2..146767a629 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnectionSettingsService.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnectionSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-connection-custom/src/LocaleService.ts b/webapp/packages/plugin-connection-custom/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-connection-custom/src/LocaleService.ts
+++ b/webapp/packages/plugin-connection-custom/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-connection-custom/src/manifest.ts b/webapp/packages/plugin-connection-custom/src/manifest.ts
index 7d8cbee961..0364a343d6 100644
--- a/webapp/packages/plugin-connection-custom/src/manifest.ts
+++ b/webapp/packages/plugin-connection-custom/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { CustomConnectionPluginBootstrap } from './CustomConnectionPluginBootstrap';
@@ -17,9 +16,5 @@ export const customConnectionPluginManifest: PluginManifest = {
     name: 'Custom connection plugin',
   },
 
-  providers: [
-    LocaleService,
-    CustomConnectionPluginBootstrap,
-    CustomConnectionSettingsService,
-  ],
+  providers: [LocaleService, CustomConnectionPluginBootstrap, CustomConnectionSettingsService],
 };
diff --git a/webapp/packages/plugin-connection-search/src/Actions/ACTION_CONNECTION_SEARCH.ts b/webapp/packages/plugin-connection-search/src/Actions/ACTION_CONNECTION_SEARCH.ts
index f794e07bdf..78187f10ee 100644
--- a/webapp/packages/plugin-connection-search/src/Actions/ACTION_CONNECTION_SEARCH.ts
+++ b/webapp/packages/plugin-connection-search/src/Actions/ACTION_CONNECTION_SEARCH.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_SEARCH = createAction(
-  'connection-search',
-  {
-    label: 'plugin_connection_search_action_search_label',
-  }
-);
+export const ACTION_CONNECTION_SEARCH = createAction('connection-search', {
+  label: 'plugin_connection_search_action_search_label',
+});
diff --git a/webapp/packages/plugin-connection-search/src/ConnectionSearchSettingsService.ts b/webapp/packages/plugin-connection-search/src/ConnectionSearchSettingsService.ts
index 0a88002f58..a2738c6a8c 100644
--- a/webapp/packages/plugin-connection-search/src/ConnectionSearchSettingsService.ts
+++ b/webapp/packages/plugin-connection-search/src/ConnectionSearchSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-connection-search/src/LocaleService.ts b/webapp/packages/plugin-connection-search/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-connection-search/src/LocaleService.ts
+++ b/webapp/packages/plugin-connection-search/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
index 1180241dde..a4025a5864 100644
--- a/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
+++ b/webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { ConnectionInfoResource, ConnectionsManagerService, createConnectionParam } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
@@ -106,16 +105,11 @@ export class ConnectionSearchService {
 
   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
-        ))
-      )
+      !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;
     }
@@ -160,26 +154,20 @@ export class ConnectionSearchService {
         this.projectsService,
         this.projectInfoResource,
         this.connectionFormService,
-        this.connectionInfoResource
+        this.connectionInfoResource,
       );
 
       this.formState.closeTask.addHandler(this.goBack.bind(this));
     }
 
     this.formState
-      .setOptions(
-        'create',
-        'public'
-      )
-      .setConfig(
-        projects[0].id,
-        {
-          ...this.connectionInfoResource.getEmptyConfig(),
-          driverId: database.defaultDriver,
-          host: database.host,
-          port: `${database.port}`,
-        }
-      )
+      .setOptions('create', 'public')
+      .setConfig(projects[0].id, {
+        ...this.connectionInfoResource.getEmptyConfig(),
+        driverId: database.defaultDriver,
+        host: database.host,
+        port: `${database.port}`,
+      })
       .setAvailableDrivers(database.possibleDrivers);
 
     this.formState.load();
diff --git a/webapp/packages/plugin-connection-search/src/Search/Database.tsx b/webapp/packages/plugin-connection-search/src/Search/Database.tsx
index 2e2fd028ad..e045f2b47d 100644
--- a/webapp/packages/plugin-connection-search/src/Search/Database.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/Database.tsx
@@ -5,41 +5,37 @@
  * 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 { ListItem, ListItemIcon, ListItemName, StaticImage } from '@cloudbeaver/core-blocks';
 import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 
-
 const styles = css`
-    ListItemIcon {
-      position: relative;
-      min-width: 80px;
-      justify-content: flex-end;
-    }
+  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;
+  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;
-      }
+    &:hover {
+      z-index: 1;
     }
-  `;
+    &:not(:first-child) {
+      margin-left: -20px;
+    }
+  }
+`;
 
 interface Props {
   database: AdminConnectionSearchInfo;
@@ -49,10 +45,9 @@ interface Props {
 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) => {
+  const orderedDrivers = useMemo(
+    () =>
+      database.possibleDrivers.slice().sort((a, b) => {
         if (a === database.defaultDriver) {
           return 1;
         }
@@ -60,8 +55,9 @@ export const Database = observer<Props>(function Database({ database, onSelect }
           return -1;
         }
         return a.localeCompare(b);
-      })
-  ), [database]);
+      }),
+    [database],
+  );
 
   const host = database.host + ':' + database.port;
   const name = database.displayName !== database.host ? database.displayName + ' (' + host + ')' : host;
@@ -69,9 +65,11 @@ export const Database = observer<Props>(function Database({ database, onSelect }
   return styled(styles)(
     <ListItem onClick={select}>
       <ListItemIcon>
-        {orderedDrivers.map(driverId => <StaticImage key={driverId} icon={drivers.get(driverId)?.icon} />)}
+        {orderedDrivers.map(driverId => (
+          <StaticImage key={driverId} icon={drivers.get(driverId)?.icon} />
+        ))}
       </ListItemIcon>
       <ListItemName>{name}</ListItemName>
-    </ListItem>
+    </ListItem>,
   );
 });
diff --git a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
index 27297aa24a..5d75cb2d58 100644
--- a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
@@ -5,28 +5,24 @@
  * 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, useTranslate
-} from '@cloudbeaver/core-blocks';
+import { ItemList, ItemListSearch, SubmittingForm, TextPlaceholder, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 
-
 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;
-    }
-  `;
+  SubmittingForm {
+    composes: theme-background-surface theme-text-on-surface from global;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   databases: AdminConnectionSearchInfo[];
@@ -38,9 +34,7 @@ interface Props {
   onSearch?: () => Promise<void>;
 }
 
-export const DatabaseList = observer<Props>(function DatabaseList({
-  databases, hosts, disabled, className, onSelect, onChange, onSearch,
-}) {
+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);
@@ -57,13 +51,19 @@ export const DatabaseList = observer<Props>(function DatabaseList({
 
   return styled(styles)(
     <SubmittingForm ref={focusedRef} className={className} onSubmit={onSearch}>
-      <ItemListSearch value={hosts} placeholder={translate('connections_administration_search_database_tip')} disabled={disabled} onChange={onChange} onSearch={searchHandler} />
+      <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>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
index 9df24061c7..8f0f8c9131 100644
--- a/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/SearchDatabase.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -43,7 +42,7 @@ export const SearchDatabase: React.FC = observer(function SearchDatabase() {
           onSave={() => connectionSearchService.saveConnection()}
           onCancel={() => connectionSearchService.goBack()}
         />
-      </Loader>
+      </Loader>,
     );
   }
 
diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
index b9c74b7d8a..bf176be5b5 100644
--- a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -5,14 +5,13 @@
  * 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-authentication';
 import { ConnectionsManagerService } from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { PermissionsService } from '@cloudbeaver/core-root';
-import { getCachedMapResourceLoaderState, CachedMapAllKey } from '@cloudbeaver/core-sdk';
-import { MenuService, ActionService, DATA_CONTEXT_MENU, DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+import { CachedMapAllKey, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
+import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_SEARCH } from './Actions/ACTION_CONNECTION_SEARCH';
@@ -36,20 +35,14 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
   register(): void | Promise<void> {
     this.menuService.addCreator({
       isApplicable: context => context.tryGet(DATA_CONTEXT_MENU) === MENU_CONNECTIONS,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_CONNECTION_SEARCH,
-      ],
+      getItems: (context, items) => [...items, ACTION_CONNECTION_SEARCH],
     });
 
     this.actionService.addHandler({
       id: 'connection-search',
-      isActionApplicable: (context, action) => [
-        ACTION_CONNECTION_SEARCH,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_CONNECTION_SEARCH].includes(action),
       isHidden: (context, action) => {
-        if (this.connectionsManagerService.createConnectionProjects.length === 0
-          || !this.permissionsService.has(EAdminPermission.admin)) {
+        if (this.connectionsManagerService.createConnectionProjects.length === 0 || !this.permissionsService.has(EAdminPermission.admin)) {
           return true;
         }
 
@@ -62,10 +55,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
       getLoader: (context, action) => {
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey)
-        );
+        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
       },
       handler: async (context, action) => {
         switch (action) {
@@ -78,5 +68,5 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-connection-search/src/index.ts b/webapp/packages/plugin-connection-search/src/index.ts
index 5e6de37178..22f185f033 100644
--- a/webapp/packages/plugin-connection-search/src/index.ts
+++ b/webapp/packages/plugin-connection-search/src/index.ts
@@ -2,4 +2,4 @@ import { connectionSearchPlugin } from './manifest';
 
 export default connectionSearchPlugin;
 
-export * from './ConnectionSearchSettingsService';
\ No newline at end of file
+export * from './ConnectionSearchSettingsService';
diff --git a/webapp/packages/plugin-connection-search/src/locales/en.ts b/webapp/packages/plugin-connection-search/src/locales/en.ts
index 1e83566e27..db83b12b1c 100644
--- a/webapp/packages/plugin-connection-search/src/locales/en.ts
+++ b/webapp/packages/plugin-connection-search/src/locales/en.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_connection_search_action_search_label', 'Search'],
-];
+export default [['plugin_connection_search_action_search_label', 'Search']];
diff --git a/webapp/packages/plugin-connection-search/src/locales/it.ts b/webapp/packages/plugin-connection-search/src/locales/it.ts
index 1e83566e27..db83b12b1c 100644
--- a/webapp/packages/plugin-connection-search/src/locales/it.ts
+++ b/webapp/packages/plugin-connection-search/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_connection_search_action_search_label', 'Search'],
-];
+export default [['plugin_connection_search_action_search_label', 'Search']];
diff --git a/webapp/packages/plugin-connection-search/src/locales/ru.ts b/webapp/packages/plugin-connection-search/src/locales/ru.ts
index 1cb0672ad7..c8c837efdf 100644
--- a/webapp/packages/plugin-connection-search/src/locales/ru.ts
+++ b/webapp/packages/plugin-connection-search/src/locales/ru.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_connection_search_action_search_label', 'Поиск'],
-];
+export default [['plugin_connection_search_action_search_label', 'Поиск']];
diff --git a/webapp/packages/plugin-connection-search/src/locales/zh.ts b/webapp/packages/plugin-connection-search/src/locales/zh.ts
index 1e83566e27..db83b12b1c 100644
--- a/webapp/packages/plugin-connection-search/src/locales/zh.ts
+++ b/webapp/packages/plugin-connection-search/src/locales/zh.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_connection_search_action_search_label', 'Search'],
-];
+export default [['plugin_connection_search_action_search_label', 'Search']];
diff --git a/webapp/packages/plugin-connection-search/src/manifest.ts b/webapp/packages/plugin-connection-search/src/manifest.ts
index acaf3985b4..481cb74b90 100644
--- a/webapp/packages/plugin-connection-search/src/manifest.ts
+++ b/webapp/packages/plugin-connection-search/src/manifest.ts
@@ -9,10 +9,5 @@ export const connectionSearchPlugin: PluginManifest = {
   info: {
     name: 'Search connection plugin',
   },
-  providers: [
-    SearchConnectionPluginBootstrap,
-    ConnectionSearchService,
-    LocaleService,
-    ConnectionSearchSettingsService,
-  ],
-};
\ No newline at end of file
+  providers: [SearchConnectionPluginBootstrap, ConnectionSearchService, LocaleService, ConnectionSearchSettingsService],
+};
diff --git a/webapp/packages/plugin-connection-template/src/Actions/ACTION_CONNECTION_TEMPLATE.ts b/webapp/packages/plugin-connection-template/src/Actions/ACTION_CONNECTION_TEMPLATE.ts
index 5a2e4ca1e3..bd2c259e79 100644
--- a/webapp/packages/plugin-connection-template/src/Actions/ACTION_CONNECTION_TEMPLATE.ts
+++ b/webapp/packages/plugin-connection-template/src/Actions/ACTION_CONNECTION_TEMPLATE.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_TEMPLATE = createAction(
-  'connection-template',
-  {
-    label: 'plugin_connection_template_action_connection_template_label',
-  }
-);
+export const ACTION_CONNECTION_TEMPLATE = createAction('connection-template', {
+  label: 'plugin_connection_template_action_connection_template_label',
+});
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionController.ts b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionController.ts
index 2ab3e487d2..1490601d66 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionController.ts
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionController.ts
@@ -5,11 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { computed, makeObservable, observable } from 'mobx';
 
-import { observable, makeObservable, computed } from 'mobx';
-
-import { DBDriverResource, Connection, DatabaseAuthModelsResource, ConnectionInfoResource, DBDriver, ConnectionInitConfig, USER_NAME_PROPERTY_ID, createConnectionParam, ConnectionInfoProjectKey } from '@cloudbeaver/core-connections';
-import { injectable, IInitializableController, IDestructibleController } from '@cloudbeaver/core-di';
+import {
+  Connection,
+  ConnectionInfoProjectKey,
+  ConnectionInfoResource,
+  ConnectionInitConfig,
+  createConnectionParam,
+  DatabaseAuthModelsResource,
+  DBDriver,
+  DBDriverResource,
+  USER_NAME_PROPERTY_ID,
+} from '@cloudbeaver/core-connections';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
@@ -23,7 +32,7 @@ import { TemplateConnectionsService } from '../TemplateConnectionsService';
 
 export enum ConnectionStep {
   ConnectionTemplateSelect,
-  Connection
+  Connection,
 }
 
 export interface IConnectionController {
@@ -34,8 +43,7 @@ export interface IConnectionController {
 }
 
 @injectable()
-export class ConnectionController
-implements IInitializableController, IDestructibleController, IConnectionController {
+export class ConnectionController implements IInitializableController, IDestructibleController, IConnectionController {
   step = ConnectionStep.ConnectionTemplateSelect;
   isLoading = true;
   isConnecting = false;
@@ -74,9 +82,7 @@ implements IInitializableController, IDestructibleController, IConnectionControl
       return [];
     }
 
-    return this.template.networkHandlersConfig
-      .filter(handler => handler.enabled && !handler.savePassword)
-      .map(handler => handler.id);
+    return this.template.networkHandlersConfig.filter(handler => handler.enabled && !handler.savePassword).map(handler => handler.id);
   }
 
   constructor(
@@ -128,17 +134,11 @@ implements IInitializableController, IDestructibleController, IConnectionControl
     this.isConnecting = true;
     this.clearError();
     try {
-      const connections = await this.connectionInfoResource.load(
-        ConnectionInfoProjectKey(this.projectsService.userProject.id)
-      );
+      const connections = await this.connectionInfoResource.load(ConnectionInfoProjectKey(this.projectsService.userProject.id));
       const connectionNames = connections.map(connection => connection.name);
 
       const uniqueConnectionName = getUniqueName(this.template.name || 'Template connection', connectionNames);
-      const connection = await this.connectionInfoResource.createFromTemplate(
-        this.template.projectId,
-        this.template.id,
-        uniqueConnectionName
-      );
+      const connection = await this.connectionInfoResource.createFromTemplate(this.template.projectId, this.template.id, uniqueConnectionName);
 
       try {
         await this.connectionInfoResource.init(this.getConfig(connection.projectId, connection.id));
@@ -241,7 +241,7 @@ implements IInitializableController, IDestructibleController, IConnectionControl
       await this.templateConnectionsResource.load();
       await this.dbDriverResource.load(CachedMapAllKey);
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load database sources');
+      this.notificationService.logException(exception, "Can't load database sources");
     } finally {
       this.isLoading = false;
     }
@@ -256,7 +256,7 @@ implements IInitializableController, IDestructibleController, IConnectionControl
       this.isLoading = true;
       this.authModel = await this.dbAuthModelsResource.load(this.dbDriver.defaultAuthModel);
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load driver auth model');
+      this.notificationService.logException(exception, "Can't load driver auth model");
     } finally {
       this.isLoading = false;
     }
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
index 458908c31e..f3a6c9a4d6 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
@@ -5,18 +5,10 @@
  * 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 {
-  ErrorMessage,
-  SubmittingForm,
-  Loader,
-  useFocus,
-  useTranslate,
-  useAdministrationSettings,
-} from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Loader, SubmittingForm, useAdministrationSettings, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import { ConnectionAuthenticationFormLoader } from '@cloudbeaver/plugin-connections';
@@ -26,28 +18,27 @@ import { ConnectionDialogFooter } from './ConnectionDialogFooter';
 import { TemplateConnectionSelector } from './TemplateConnectionSelector/TemplateConnectionSelector';
 
 const styles = css`
-    SubmittingForm, center {
-      display: flex;
-      flex: 1;
-      margin: auto;
-    }
-    center {
-      box-sizing: border-box;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-    }
-    ConnectionAuthenticationFormLoader {
-      align-content: center;
-    }
-    ErrorMessage {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
+  SubmittingForm,
+  center {
+    display: flex;
+    flex: 1;
+    margin: auto;
+  }
+  center {
+    box-sizing: border-box;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  ConnectionAuthenticationFormLoader {
+    align-content: center;
+  }
+  ErrorMessage {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
 `;
 
-export const ConnectionDialog: DialogComponent<null, null> = observer(function ConnectionDialog({
-  rejectDialog,
-}) {
+export const ConnectionDialog: DialogComponent<null, null> = observer(function ConnectionDialog({ rejectDialog }) {
   const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
   const controller = useController(ConnectionController, rejectDialog);
   const translate = useTranslate();
@@ -60,7 +51,7 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
   }
 
   return styled(styles)(
-    <CommonDialogWrapper size='large' fixedSize>
+    <CommonDialogWrapper size="large" fixedSize>
       <CommonDialogHeader
         title="basicConnection_connectionDialog_newConnection"
         subTitle={subtitle}
@@ -76,28 +67,23 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
             onSelect={controller.onTemplateSelect}
           />
         )}
-        {controller.step === ConnectionStep.Connection && (!controller.authModel ? (
-          <center>
-            {controller.isConnecting && translate('basicConnection_connectionDialog_connecting_message')}
-          </center>
-        ) : (
-          <SubmittingForm ref={focusedRef} onSubmit={controller.onConnect}>
-            <ConnectionAuthenticationFormLoader
-              config={controller.config}
-              authModelId={controller.authModel.id}
-              networkHandlers={controller.networkHandlers}
-              formId={controller.template?.id}
-              allowSaveCredentials={credentialsSavingEnabled}
-              disabled={controller.isConnecting}
-            />
-          </SubmittingForm>
-        ))}
+        {controller.step === ConnectionStep.Connection &&
+          (!controller.authModel ? (
+            <center>{controller.isConnecting && translate('basicConnection_connectionDialog_connecting_message')}</center>
+          ) : (
+            <SubmittingForm ref={focusedRef} onSubmit={controller.onConnect}>
+              <ConnectionAuthenticationFormLoader
+                config={controller.config}
+                authModelId={controller.authModel.id}
+                networkHandlers={controller.networkHandlers}
+                formId={controller.template?.id}
+                allowSaveCredentials={credentialsSavingEnabled}
+                disabled={controller.isConnecting}
+              />
+            </SubmittingForm>
+          ))}
         {controller.responseMessage && (
-          <ErrorMessage
-            text={controller.responseMessage}
-            hasDetails={controller.hasDetails}
-            onShowDetails={controller.onShowDetails}
-          />
+          <ErrorMessage text={controller.responseMessage} hasDetails={controller.hasDetails} onShowDetails={controller.onShowDetails} />
         )}
       </CommonDialogBody>
       {controller.step === ConnectionStep.Connection && (
@@ -109,6 +95,6 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
           />
         </CommonDialogFooter>
       )}
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
index c40d40e8ae..bb8582c617 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
@@ -5,29 +5,27 @@
  * 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 { Button, useTranslate } from '@cloudbeaver/core-blocks';
 
-
 const styles = css`
-controls {
-  display: flex;
-  flex: 1;
-  height: 100%;
-  align-items: center;
-  margin: auto;
-}
+  controls {
+    display: flex;
+    flex: 1;
+    height: 100%;
+    align-items: center;
+    margin: auto;
+  }
 
-fill {
-  flex: 1;
-}
+  fill {
+    flex: 1;
+  }
 
-Button:not(:first-child) {
-  margin-left: 24px;
-}
+  Button:not(:first-child) {
+    margin-left: 24px;
+  }
 `;
 
 interface Props {
@@ -36,34 +34,17 @@ interface Props {
   onBack: () => void;
 }
 
-export const ConnectionDialogFooter = observer<Props>(function ConnectionDialogFooter({
-  isConnecting,
-  onConnect,
-  onBack,
-}) {
+export const ConnectionDialogFooter = observer<Props>(function ConnectionDialogFooter({ isConnecting, onConnect, onBack }) {
   const translate = useTranslate();
   return styled(styles)(
     <controls as="div">
-      <Button
-        type="button"
-        mod={['outlined']}
-        disabled={isConnecting}
-        onClick={onBack}
-      >
+      <Button type="button" mod={['outlined']} disabled={isConnecting} onClick={onBack}>
         {translate('ui_stepper_back')}
       </Button>
       <fill as="div" />
-      <Button
-        type="button"
-        mod={['unelevated']}
-        disabled={isConnecting}
-        onClick={onConnect}
-      >
-        {isConnecting
-          ? translate('basicConnection_connectionDialog_connecting')
-          : translate('connections_connection_connect')}
+      <Button type="button" mod={['unelevated']} disabled={isConnecting} onClick={onConnect}>
+        {isConnecting ? translate('basicConnection_connectionDialog_connecting') : translate('connections_connection_connect')}
       </Button>
-    </controls>
+    </controls>,
   );
-}
-);
+});
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionItem.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionItem.tsx
index 4ed75c227a..9462d1bf5c 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionItem.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionItem.tsx
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  ListItem, ListItemDescription, ListItemName, ListItemIcon, StaticImage
-} from '@cloudbeaver/core-blocks';
-import type { DBDriver, Connection } from '@cloudbeaver/core-connections';
+import { ListItem, ListItemDescription, ListItemIcon, ListItemName, StaticImage } from '@cloudbeaver/core-blocks';
+import type { Connection, DBDriver } from '@cloudbeaver/core-connections';
 
 interface Props {
   template: Connection;
@@ -29,18 +26,16 @@ const styles = css`
   }
 `;
 
-export const TemplateConnectionItem = observer<Props>(function TemplateConnectionItem({
-  template,
-  dbDriver,
-  onSelect,
-}) {
+export const TemplateConnectionItem = observer<Props>(function TemplateConnectionItem({ template, dbDriver, onSelect }) {
   const select = useCallback(() => onSelect(template.id), [template]);
 
   return styled(styles)(
     <ListItem onClick={select}>
-      <ListItemIcon><StaticImage icon={dbDriver?.icon} /></ListItemIcon>
+      <ListItemIcon>
+        <StaticImage icon={dbDriver?.icon} />
+      </ListItemIcon>
       <ListItemName>{template.name}</ListItemName>
       <ListItemDescription title={template.description}>{template.description}</ListItemDescription>
-    </ListItem>
+    </ListItem>,
   );
 });
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionSelector.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionSelector.tsx
index c3834c9558..39fd6c20db 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionSelector.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/TemplateConnectionSelector/TemplateConnectionSelector.tsx
@@ -5,12 +5,11 @@
  * 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 { useState, useMemo } from 'react';
+import { useMemo, useState } from 'react';
 
 import { ItemList, ItemListSearch } from '@cloudbeaver/core-blocks';
-import type { DBDriver, Connection } from '@cloudbeaver/core-connections';
+import type { Connection, DBDriver } from '@cloudbeaver/core-connections';
 
 import { TemplateConnectionItem } from './TemplateConnectionItem';
 
@@ -40,12 +39,7 @@ export const TemplateConnectionSelector = observer<Props>(function TemplateConne
       <ItemListSearch onChange={setSearch} />
       <ItemList className={className}>
         {filteredTemplateConnections.map(template => (
-          <TemplateConnectionItem
-            key={template.id}
-            template={template}
-            dbDriver={dbDrivers.get(template.driverId)}
-            onSelect={onSelect}
-          />
+          <TemplateConnectionItem key={template.id} template={template} dbDriver={dbDrivers.get(template.driverId)} onSelect={onSelect} />
         ))}
       </ItemList>
     </>
diff --git a/webapp/packages/plugin-connection-template/src/LocaleService.ts b/webapp/packages/plugin-connection-template/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-connection-template/src/LocaleService.ts
+++ b/webapp/packages/plugin-connection-template/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
index cc943a7395..27c12cf578 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
 import { PermissionsService } from '@cloudbeaver/core-root';
 import { CachedMapAllKey, getCachedDataResourceLoaderState, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { MenuService, ActionService, DATA_CONTEXT_MENU, DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_TEMPLATE } from './Actions/ACTION_CONNECTION_TEMPLATE';
@@ -39,33 +38,24 @@ export class TemplateConnectionPluginBootstrap extends Bootstrap {
   register(): void | Promise<void> {
     this.menuService.addCreator({
       isApplicable: context => context.tryGet(DATA_CONTEXT_MENU) === MENU_CONNECTIONS,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_CONNECTION_TEMPLATE,
-      ],
+      getItems: (context, items) => [...items, ACTION_CONNECTION_TEMPLATE],
     });
 
     this.actionService.addHandler({
       id: 'connection-template',
-      isActionApplicable: (context, action) => [
-        ACTION_CONNECTION_TEMPLATE,
-      ].includes(action),
-      isHidden: () => (
-        !this.appAuthService.authenticated
-        || !this.projectsService.userProject?.canEditDataSources
-        || !this.templateConnectionsService.projectTemplates.length
-      ),
+      isActionApplicable: (context, action) => [ACTION_CONNECTION_TEMPLATE].includes(action),
+      isHidden: () =>
+        !this.appAuthService.authenticated ||
+        !this.projectsService.userProject?.canEditDataSources ||
+        !this.templateConnectionsService.projectTemplates.length,
       getLoader: (context, action) => {
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => [
-            ...this.appAuthService.loaders,
-            getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey),
-            getCachedDataResourceLoaderState(this.templateConnectionsResource, undefined, undefined),
-          ]
-        );
+        return state.getState(action.id, () => [
+          ...this.appAuthService.loaders,
+          getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey),
+          getCachedDataResourceLoaderState(this.templateConnectionsResource, undefined, undefined),
+        ]);
       },
       handler: async (context, action) => {
         switch (action) {
@@ -78,7 +68,7 @@ export class TemplateConnectionPluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async openConnectionsDialog() {
     await this.commonDialogService.open(ConnectionDialog, null);
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
index 66c433bf56..d944e8ba70 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
@@ -5,19 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { Connection, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
-import {  SessionDataResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedDataResource, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
+import { SessionDataResource } from '@cloudbeaver/core-root';
+import { CachedDataResource, GraphQLService, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class TemplateConnectionsResource extends CachedDataResource<Connection[]> {
   constructor(
     private readonly graphQLService: GraphQLService,
     connectionInfoResource: ConnectionInfoResource,
-    sessionDataResource:SessionDataResource,
+    sessionDataResource: SessionDataResource,
     appAuthService: AppAuthService,
   ) {
     super(() => []);
@@ -32,9 +31,7 @@ export class TemplateConnectionsResource extends CachedDataResource<Connection[]
       }
     });
     connectionInfoResource.onItemDelete.addHandler(list => {
-      const isAnyTemplate = connectionInfoResource
-        .get(ResourceKeyUtils.toList(list))
-        .some(connection => connection?.template);
+      const isAnyTemplate = connectionInfoResource.get(ResourceKeyUtils.toList(list)).some(connection => connection?.template);
 
       if (isAnyTemplate) {
         this.markOutdated();
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionsService.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionsService.ts
index 391856c0d5..3ff2e52b51 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionsService.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Connection } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { ProjectsService } from '@cloudbeaver/core-projects';
@@ -15,10 +14,7 @@ import { TemplateConnectionsResource } from './TemplateConnectionsResource';
 @injectable()
 export class TemplateConnectionsService {
   get projectTemplates(): Connection[] {
-    if (
-      this.projectsService.userProject
-      && this.projectsService.activeProjects.includes(this.projectsService.userProject)
-    ) {
+    if (this.projectsService.userProject && this.projectsService.activeProjects.includes(this.projectsService.userProject)) {
       return this.templateConnectionsResource.data;
     }
 
@@ -28,9 +24,5 @@ export class TemplateConnectionsService {
     // );
     return [];
   }
-  constructor(
-    private readonly templateConnectionsResource: TemplateConnectionsResource,
-    private readonly projectsService: ProjectsService,
-  ) {
-  }
+  constructor(private readonly templateConnectionsResource: TemplateConnectionsResource, private readonly projectsService: ProjectsService) {}
 }
diff --git a/webapp/packages/plugin-connection-template/src/locales/zh.ts b/webapp/packages/plugin-connection-template/src/locales/zh.ts
index d554184ac7..52ea3d122e 100644
--- a/webapp/packages/plugin-connection-template/src/locales/zh.ts
+++ b/webapp/packages/plugin-connection-template/src/locales/zh.ts
@@ -1,12 +1,12 @@
 export default [
-    ['basicConnection_connectionDialog_newConnection', '新连接'],
-    ['basicConnection_connectionDialog_title', '连接数据库'],
-    ['basicConnection_connectionDialog_listTitle', '数据库：'],
-    ['basicConnection_connectionDialog_username', '用户库用户名：'],
-    ['basicConnection_connectionDialog_usernamePlaceholder', '用户'],
-    ['basicConnection_connectionDialog_password', '数据库用户密码：'],
-    ['basicConnection_connectionDialog_passwordPlaceholder', '密码'],
-    ['basicConnection_connectionDialog_connecting', '连接中...'],
-    ['basicConnection_connectionDialog_connecting_message', '连接数据库...'],
-    ['basicConnection_main_menu_item', '从模板创建'],
-  ];
+  ['basicConnection_connectionDialog_newConnection', '新连接'],
+  ['basicConnection_connectionDialog_title', '连接数据库'],
+  ['basicConnection_connectionDialog_listTitle', '数据库：'],
+  ['basicConnection_connectionDialog_username', '用户库用户名：'],
+  ['basicConnection_connectionDialog_usernamePlaceholder', '用户'],
+  ['basicConnection_connectionDialog_password', '数据库用户密码：'],
+  ['basicConnection_connectionDialog_passwordPlaceholder', '密码'],
+  ['basicConnection_connectionDialog_connecting', '连接中...'],
+  ['basicConnection_connectionDialog_connecting_message', '连接数据库...'],
+  ['basicConnection_main_menu_item', '从模板创建'],
+];
diff --git a/webapp/packages/plugin-connection-template/src/manifest.ts b/webapp/packages/plugin-connection-template/src/manifest.ts
index e490e37ca5..7accde3222 100644
--- a/webapp/packages/plugin-connection-template/src/manifest.ts
+++ b/webapp/packages/plugin-connection-template/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -18,10 +17,5 @@ export const connectionTemplate: PluginManifest = {
     name: 'Template Connections plugin',
   },
 
-  providers: [
-    TemplateConnectionsResource,
-    LocaleService,
-    TemplateConnectionPluginBootstrap,
-    TemplateConnectionsService,
-  ],
+  providers: [TemplateConnectionsResource, LocaleService, TemplateConnectionPluginBootstrap, TemplateConnectionsService],
 };
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
index 227da76394..731cf009e2 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
@@ -5,12 +5,25 @@
  * 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 { AdministrationItemContentProps, ADMINISTRATION_TOOLS_PANEL_STYLES } from '@cloudbeaver/core-administration';
-import { Loader, useResource, ToolsAction, ToolsPanel, useTranslate, useStyles, Translate, Group, ColoredContainer, BASE_CONTAINERS_STYLES, Container, GroupTitle, GroupItem } from '@cloudbeaver/core-blocks';
+import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentProps } from '@cloudbeaver/core-administration';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  GroupItem,
+  GroupTitle,
+  Loader,
+  ToolsAction,
+  ToolsPanel,
+  Translate,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource, DBDriverResource } from '@cloudbeaver/core-connections';
 import { useController, useService } from '@cloudbeaver/core-di';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
@@ -58,7 +71,7 @@ export const ConnectionsAdministration = observer<AdministrationItemContentProps
         <ToolsPanel>
           <ToolsAction
             title={translate('connections_administration_tools_add_tooltip')}
-            icon='add'
+            icon="add"
             viewBox="0 0 24 24"
             disabled={!!sub || controller.isProcessing}
             onClick={service.create}
@@ -97,7 +110,7 @@ export const ConnectionsAdministration = observer<AdministrationItemContentProps
             <CreateConnection method={param} configurationWizard={configurationWizard} />
           </Group>
         )}
-        <Group box='no-overflow'>
+        <Group box="no-overflow">
           <Loader style={loaderStyle} loading={controller.isProcessing} overlay>
             <ConnectionsTable
               keys={controller.keys}
@@ -108,6 +121,6 @@ export const ConnectionsAdministration = observer<AdministrationItemContentProps
           </Loader>
         </Group>
       </Container>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationController.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationController.ts
index 2229772d76..47f2c18d1c 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationController.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationController.ts
@@ -5,15 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { computed, makeObservable, observable } from 'mobx';
 
-import { observable, computed, makeObservable } from 'mobx';
-
-import { compareConnectionsInfo, compareNewConnectionsInfo, Connection, ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam, DatabaseConnection, IConnectionInfoParams } from '@cloudbeaver/core-connections';
+import {
+  compareConnectionsInfo,
+  compareNewConnectionsInfo,
+  Connection,
+  ConnectionInfoActiveProjectKey,
+  ConnectionInfoResource,
+  createConnectionParam,
+  DatabaseConnection,
+  IConnectionInfoParams,
+} from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { isSharedProject, isGlobalProject, ProjectInfoResource, projectInfoSortByName } from '@cloudbeaver/core-projects';
+import { isGlobalProject, isSharedProject, ProjectInfoResource, projectInfoSortByName } from '@cloudbeaver/core-projects';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { isArraysEqual, isDefined, isObjectsEqual } from '@cloudbeaver/core-utils';
 
@@ -66,7 +74,7 @@ export class ConnectionsAdministrationController {
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly commonDialogService: CommonDialogService,
     private readonly localizationService: LocalizationService,
-    private readonly projectInfoResource: ProjectInfoResource
+    private readonly projectInfoResource: ProjectInfoResource,
   ) {
     makeObservable(this, {
       isProcessing: observable,
@@ -97,8 +105,7 @@ export class ConnectionsAdministrationController {
       return;
     }
 
-    const deletionList = Array
-      .from(this.selectedItems)
+    const deletionList = Array.from(this.selectedItems)
       .filter(([_, value]) => value)
       .map(([connectionId]) => connectionId);
 
@@ -108,7 +115,9 @@ export class ConnectionsAdministrationController {
 
     const connectionNames = deletionList.map(id => this.connectionInfoResource.get(id)?.name).filter(Boolean);
     const nameList = connectionNames.map(name => `"${name}"`).join(', ');
-    const message = `${this.localizationService.translate('connections_administration_delete_confirmation')}${nameList}. ${this.localizationService.translate('ui_are_you_sure')}`;
+    const message = `${this.localizationService.translate(
+      'connections_administration_delete_confirmation',
+    )}${nameList}. ${this.localizationService.translate('ui_are_you_sure')}`;
 
     const result = await this.commonDialogService.open(ConfirmationDialogDelete, {
       title: 'ui_data_delete_confirmation',
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationNavService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationNavService.ts
index d966c336c3..7704f4a23c 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationNavService.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationNavService.ts
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 
 @injectable()
 export class ConnectionsAdministrationNavService {
-  constructor(
-    private readonly administrationScreenService: AdministrationScreenService
-  ) { }
+  constructor(private readonly administrationScreenService: AdministrationScreenService) {}
 
   navToRoot() {
     this.administrationScreenService.navigateToItem('connections');
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
index a33506d8f2..a772049291 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { AdministrationItemService, AdministrationItemType } from '@cloudbeaver/core-administration';
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource, DatabaseConnection, DBDriverResource } from '@cloudbeaver/core-connections';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
@@ -55,7 +54,7 @@ export class ConnectionsAdministrationService extends Bootstrap {
     private readonly dbDriverResource: DBDriverResource,
     private readonly createConnectionService: CreateConnectionService,
     private readonly commonDialogService: CommonDialogService,
-    private readonly serverConfigResource: ServerConfigResource
+    private readonly serverConfigResource: ServerConfigResource,
   ) {
     super();
   }
@@ -88,13 +87,9 @@ export class ConnectionsAdministrationService extends Bootstrap {
     this.connectionDetailsPlaceholder.add(SSH, 2);
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private async refreshUserConnections(
-    configuration: boolean,
-    outside: boolean,
-    outsideAdminPage: boolean
-  ): Promise<void> {
+  private async refreshUserConnections(configuration: boolean, outside: boolean, outsideAdminPage: boolean): Promise<void> {
     // TODO: we have to track users' leaving the page
     if (outside) {
       this.connectionInfoResource.cleanNewFlags();
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsDrawerItem.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsDrawerItem.tsx
index bd27449806..7396f283c5 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsDrawerItem.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsDrawerItem.tsx
@@ -5,20 +5,25 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration';
-import { useStyles, Translate } from '@cloudbeaver/core-blocks';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Translate, useStyles } from '@cloudbeaver/core-blocks';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
 export const ConnectionsDrawerItem: React.FC<AdministrationItemDrawerProps> = function ConnectionsDrawerItem({
-  item, onSelect, style, disabled, configurationWizard,
+  item,
+  onSelect,
+  style,
+  disabled,
+  configurationWizard,
 }) {
   return styled(useStyles(style))(
     <Tab tabId={item.name} disabled={disabled} onOpen={() => onSelect(item.name)}>
-      <TabIcon icon='/icons/connection.svg' />
-      <TabTitle><Translate token={configurationWizard ? 'connections_administration_configuration_wizard_step_title' : 'connections_administration_item'} /></TabTitle>
-    </Tab>
+      <TabIcon icon="/icons/connection.svg" />
+      <TabTitle>
+        <Translate token={configurationWizard ? 'connections_administration_configuration_wizard_step_title' : 'connections_administration_item'} />
+      </TabTitle>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx
index 6d6d87fa5f..f54530b163 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx
@@ -5,17 +5,13 @@
  * 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 {
-  TableItem, TableColumnValue, TableItemSelect, TableItemExpand, StaticImage, Placeholder, Loader
-} from '@cloudbeaver/core-blocks';
+import { Loader, Placeholder, StaticImage, TableColumnValue, TableItem, TableItemExpand, TableItemSelect } from '@cloudbeaver/core-blocks';
 import { DatabaseConnection, DBDriverResource, IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 
-
 import { ConnectionsAdministrationService } from '../ConnectionsAdministrationService';
 import { ConnectionEdit } from './ConnectionEdit';
 
@@ -59,19 +55,24 @@ export const Connection = observer<Props>(function Connection({ connectionKey, c
       <TableColumnValue centerContent flex expand>
         <StaticImage icon={icon} />
       </TableColumnValue>
-      <TableColumnValue title={connection.name} expand ellipsis>{connection.name}</TableColumnValue>
-      <TableColumnValue>{connection.host}{connection.host && connection.port && `:${connection.port}`}</TableColumnValue>
+      <TableColumnValue title={connection.name} expand ellipsis>
+        {connection.name}
+      </TableColumnValue>
+      <TableColumnValue>
+        {connection.host}
+        {connection.host && connection.port && `:${connection.port}`}
+      </TableColumnValue>
       <TableColumnValue>{connection.folder && connection.folder}</TableColumnValue>
       {projectName !== undefined && (
-        <TableColumnValue title={projectName ?? ''} expand ellipsis>{projectName}</TableColumnValue>)}
+        <TableColumnValue title={projectName ?? ''} expand ellipsis>
+          {projectName}
+        </TableColumnValue>
+      )}
       <TableColumnValue flex>
         <Loader suspense small inline hideMessage>
-          <Placeholder
-            container={connectionsAdministrationService.connectionDetailsPlaceholder}
-            connection={connection}
-          />
+          <Placeholder container={connectionsAdministrationService.connectionDetailsPlaceholder} connection={connection} />
         </Loader>
       </TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/ConnectionDetailsStyles.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/ConnectionDetailsStyles.ts
index 5403502278..4163986891 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/ConnectionDetailsStyles.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/ConnectionDetailsStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const CONNECTION_DETAILS_STYLES = css`
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Origin.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Origin.tsx
index 6fed134352..3af2422328 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Origin.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Origin.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,9 +14,7 @@ import { PlaceholderComponent, StaticImage } from '@cloudbeaver/core-blocks';
 import type { IConnectionDetailsPlaceholderProps } from '../../ConnectionsAdministrationService';
 import { CONNECTION_DETAILS_STYLES } from './ConnectionDetailsStyles';
 
-export const Origin: PlaceholderComponent<IConnectionDetailsPlaceholderProps> = observer(function Origin({
-  connection,
-}) {
+export const Origin: PlaceholderComponent<IConnectionDetailsPlaceholderProps> = observer(function Origin({ connection }) {
   const isLocal = connection.origin?.type === AUTH_PROVIDER_LOCAL_ID;
 
   if (!connection.origin || isLocal) {
@@ -27,7 +24,5 @@ export const Origin: PlaceholderComponent<IConnectionDetailsPlaceholderProps> =
   const icon = connection.origin.icon;
   const title = connection.origin.displayName;
 
-  return styled(CONNECTION_DETAILS_STYLES)(
-    <StaticImage icon={icon} title={title} />
-  );
+  return styled(CONNECTION_DETAILS_STYLES)(<StaticImage icon={icon} title={title} />);
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
index 128b4bafff..26cf7d7fcb 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { PlaceholderComponent, StaticImage, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 
-
 import type { IConnectionDetailsPlaceholderProps } from '../../ConnectionsAdministrationService';
 import { CONNECTION_DETAILS_STYLES } from './ConnectionDetailsStyles';
 
@@ -27,6 +25,6 @@ export const SSH: PlaceholderComponent<IConnectionDetailsPlaceholderProps> = obs
   }
 
   return styled(CONNECTION_DETAILS_STYLES)(
-    <StaticImage icon='/icons/ssh_tunnel.svg' title={translate(handler.data?.label || 'connections_network_handler_ssh_tunnel_title')} />
+    <StaticImage icon="/icons/ssh_tunnel.svg" title={translate(handler.data?.label || 'connections_network_handler_ssh_tunnel_title')} />,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Template.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Template.tsx
index a51406b3ec..6493619398 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Template.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/Template.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -19,7 +18,5 @@ export const Template: PlaceholderComponent<IConnectionDetailsPlaceholderProps>
     return null;
   }
 
-  return styled(CONNECTION_DETAILS_STYLES)(
-    <StaticImage icon='/icons/template_connection.svg' title='Template connection' />
-  );
+  return styled(CONNECTION_DETAILS_STYLES)(<StaticImage icon="/icons/template_connection.svg" title="Template connection" />);
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx
index 17e5087327..87fe8e34b1 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx
@@ -5,9 +5,8 @@
  * 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 { useRef, useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { Loader } from '@cloudbeaver/core-blocks';
@@ -16,26 +15,24 @@ import { useService } from '@cloudbeaver/core-di';
 import { ConnectionFormLoader, useConnectionFormState } from '@cloudbeaver/plugin-connections';
 
 const styles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      box-sizing: border-box;
-      padding-bottom: 24px;
-      display: flex;
-      flex-direction: column;
-      height: 740px;
-    }
-    Loader {
-      height: 100%;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    box-sizing: border-box;
+    padding-bottom: 24px;
+    display: flex;
+    flex-direction: column;
+    height: 740px;
+  }
+  Loader {
+    height: 100%;
+  }
+`;
 
 interface Props {
   item: IConnectionInfoParams;
 }
 
-export const ConnectionEdit = observer<Props>(function ConnectionEditNew({
-  item,
-}) {
+export const ConnectionEdit = observer<Props>(function ConnectionEditNew({ item }) {
   const connectionInfoResource = useService(ConnectionInfoResource);
   const boxRef = useRef<HTMLDivElement>(null);
   // const tableContext = useContext(TableContext);
@@ -48,10 +45,7 @@ export const ConnectionEdit = observer<Props>(function ConnectionEditNew({
     });
   }, []);
 
-  const data = useConnectionFormState(
-    connectionInfoResource,
-    state => state.setOptions('edit', 'admin')
-  );
+  const data = useConnectionFormState(connectionInfoResource, state => state.setOptions('edit', 'admin'));
 
   data.config.connectionId = item.connectionId;
   data.projectId = item.projectId;
@@ -65,6 +59,6 @@ export const ConnectionEdit = observer<Props>(function ConnectionEditNew({
           // onSave={collapse}
         />
       </Loader>
-    </box>
+    </box>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionsTable.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionsTable.tsx
index f410b39fb9..eb84affb52 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionsTable.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionsTable.tsx
@@ -5,14 +5,9 @@
  * 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 {
-  Table, TableHeader, TableColumnHeader,
-  TableBody, TableSelect, useTranslate,
-  getComputed, useResource
-} from '@cloudbeaver/core-blocks';
+import { getComputed, Table, TableBody, TableColumnHeader, TableHeader, TableSelect, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { DatabaseConnection, IConnectionInfoParams, serializeConnectionParam } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { isGlobalProject, isSharedProject, ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
@@ -27,25 +22,20 @@ interface Props {
   expandedItems: Map<IConnectionInfoParams, boolean>;
 }
 
-export const ConnectionsTable = observer<Props>(function ConnectionsTable({
-  keys,
-  connections,
-  selectedItems,
-  expandedItems,
-}) {
+export const ConnectionsTable = observer<Props>(function ConnectionsTable({ keys, connections, selectedItems, expandedItems }) {
   const translate = useTranslate();
   const projectService = useService(ProjectsService);
   const projectsLoader = useResource(ConnectionsTable, ProjectInfoResource, CachedMapAllKey);
-  const displayProjects = getComputed(() => projectService
-    .activeProjects
-    .filter(project => isGlobalProject(project) || isSharedProject(project)).length > 1);
+  const displayProjects = getComputed(
+    () => projectService.activeProjects.filter(project => isGlobalProject(project) || isSharedProject(project)).length > 1,
+  );
 
   function getProjectName(projectId: string) {
-    return displayProjects ? (projectsLoader.resource.get(projectId)?.name ?? null) : undefined;
+    return displayProjects ? projectsLoader.resource.get(projectId)?.name ?? null : undefined;
   }
 
   return (
-    <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size='big'>
+    <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size="big">
       <TableHeader fixed>
         <TableColumnHeader min flex centerContent>
           <TableSelect />
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx
index e61d510c3f..3cec7ef372 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx
@@ -5,108 +5,109 @@
  * 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 { IconButton, Loader, StaticImage, Icon, useResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Icon, IconButton, Loader, StaticImage, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
-import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 import { ConnectionFormLoader } from '@cloudbeaver/plugin-connections';
 
 import { CreateConnectionService } from '../CreateConnectionService';
 
 const styles = css`
-    title-bar {
-      composes: theme-border-color-background from global;
+  title-bar {
+    composes: theme-border-color-background from global;
+  }
+
+  connection-create {
+    display: flex;
+    flex-direction: column;
+    height: 800px;
+    overflow: hidden;
+  }
+
+  connection-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+  }
+
+  Tab {
+    composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
+    height: 46px !important;
+    text-transform: uppercase;
+    font-weight: 500 !important;
+  }
+
+  TabList {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    border-top: solid 1px;
+    position: relative;
+    flex-shrink: 0;
+    align-items: center;
+
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
 
-    connection-create {
-      display: flex;
-      flex-direction: column;
-      height: 800px;
-      overflow: hidden;
-    }
+  TabPanel,
+  CustomConnection,
+  SearchDatabase {
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+  }
 
-    connection-create-content {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      overflow: auto;
-    }
+  Loader {
+    z-index: 1;
+    height: 100%;
+  }
 
-    Tab {
-      composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
-      height: 46px!important;
-      text-transform: uppercase;
-      font-weight: 500 !important;
-    }
+  title-bar {
+    composes: theme-typography--headline6 from global;
+    padding: 16px 24px;
+    align-items: center;
+    display: flex;
+    font-weight: 400;
+    flex: auto 0 0;
+  }
 
-    TabList {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      border-top: solid 1px;
-      position: relative;
-      flex-shrink: 0;
-      align-items: center;
+  StaticImage {
+    width: 32px;
+    max-height: 32px;
+    margin-right: 16px;
+  }
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
+  fill {
+    flex: 1;
+  }
 
-    TabPanel, CustomConnection, SearchDatabase {
-      flex-direction: column;
-      height: 100%;
-      overflow: auto;
-    }
+  back-button {
+    position: relative;
+    box-sizing: border-box;
+    margin-right: 16px;
+    display: flex;
 
-    Loader {
-      z-index: 1;
-      height: 100%;
-    }
-
-    title-bar {
-      composes: theme-typography--headline6 from global;
-      padding: 16px 24px;
-      align-items: center;
-      display: flex;
-      font-weight: 400;
-      flex: auto 0 0;
-    }
-
-    StaticImage {
-      width: 32px;
-      max-height: 32px;
-      margin-right: 16px;
-    }
-
-    fill {
-      flex: 1;
-    }
-
-    back-button {
-      position: relative;
+    & Icon {
       box-sizing: border-box;
-      margin-right: 16px;
-      display: flex;
-
-      & Icon {
-        box-sizing: border-box;
-        transform: rotate(90deg);
-        cursor: pointer;
-        height: 16px;
-        width: 16px;
-      }
+      transform: rotate(90deg);
+      cursor: pointer;
+      height: 16px;
+      width: 16px;
     }
-  `;
+  }
+`;
 
 const componentStyle = [BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES];
 
@@ -115,23 +116,19 @@ interface Props {
   configurationWizard: boolean;
 }
 
-export const CreateConnection = observer<Props>(function CreateConnection({
-  method,
-}) {
+export const CreateConnection = observer<Props>(function CreateConnection({ method }) {
   const style = useStyles(componentStyle);
   const createConnectionService = useService(CreateConnectionService);
   const translate = useTranslate();
-  const driver = useResource(
-    CreateConnection,
-    DBDriverResource,
-    createConnectionService.data?.config.driverId || null
-  );
+  const driver = useResource(CreateConnection, DBDriverResource, createConnectionService.data?.config.driverId || null);
 
   if (createConnectionService.data) {
     return styled(style)(
       <connection-create>
         <title-bar>
-          <back-button><Icon name="angle" viewBox="0 0 15 8" onClick={createConnectionService.clearConnectionTemplate} /></back-button>
+          <back-button>
+            <Icon name="angle" viewBox="0 0 15 8" onClick={createConnectionService.clearConnectionTemplate} />
+          </back-button>
           {driver.data?.icon && <StaticImage icon={driver.data.icon} />}
           {driver.data?.name ?? translate('connections_administration_connection_create')}
           <fill />
@@ -146,7 +143,7 @@ export const CreateConnection = observer<Props>(function CreateConnection({
             />
           </Loader>
         </connection-create-content>
-      </connection-create>
+      </connection-create>,
     );
   }
 
@@ -170,6 +167,6 @@ export const CreateConnection = observer<Props>(function CreateConnection({
           {createConnectionService.disabled && <Loader overlay />}
         </connection-create-content>
       </TabsState>
-    </connection-create>
+    </connection-create>,
   );
 });
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 702acaf91c..0c552a45c8 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
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 import { CreateConnectionService } from '../CreateConnectionService';
 
@@ -19,9 +18,7 @@ const CustomConnection = React.lazy(async () => {
 
 @injectable()
 export class CreateConnectionBaseBootstrap extends Bootstrap {
-  constructor(
-    private readonly createConnectionService: CreateConnectionService,
-  ) {
+  constructor(private readonly createConnectionService: CreateConnectionService) {
     super();
   }
 
@@ -34,5 +31,5 @@ export class CreateConnectionBaseBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/ConnectionManualService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/ConnectionManualService.ts
index 4f9aa57c90..a02d981ba0 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/ConnectionManualService.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/ConnectionManualService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 
@@ -21,10 +20,7 @@ export class ConnectionManualService {
     this.createConnectionService.disabled = value;
   }
 
-  constructor(
-    private readonly connectionInfoResource: ConnectionInfoResource,
-    private readonly createConnectionService: CreateConnectionService
-  ) {
+  constructor(private readonly connectionInfoResource: ConnectionInfoResource, private readonly createConnectionService: CreateConnectionService) {
     this.select = this.select.bind(this);
   }
 
@@ -35,7 +31,7 @@ export class ConnectionManualService {
         ...this.connectionInfoResource.getEmptyConfig(),
         driverId,
       },
-      [driverId]
+      [driverId],
     );
   }
 }
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
index ccd3c8b103..675051f499 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
@@ -26,9 +25,10 @@ export const CustomConnection = observer(function CustomConnection() {
   const connectionManualService = useService(ConnectionManualService);
   const dbDriverResource = useResource(CustomConnection, DBDriverResource, CachedMapAllKey);
 
-  const drivers = useMemo(() => computed(() => (
-    dbDriverResource.resource.enabledDrivers.slice().sort(dbDriverResource.resource.compare)
-  )), [dbDriverResource]);
+  const drivers = useMemo(
+    () => computed(() => dbDriverResource.resource.enabledDrivers.slice().sort(dbDriverResource.resource.compare)),
+    [dbDriverResource],
+  );
 
   useResource(CustomConnection, ProjectInfoResource, CachedMapAllKey);
 
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/Driver.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/Driver.tsx
index 41be21c5d6..7fc2dd452b 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/Driver.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/Driver.tsx
@@ -5,14 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  ListItem, ListItemIcon, StaticImage, ListItemName, ListItemDescription
-} from '@cloudbeaver/core-blocks';
+import { ListItem, ListItemDescription, ListItemIcon, ListItemName, StaticImage } from '@cloudbeaver/core-blocks';
 import type { DBDriver } from '@cloudbeaver/core-connections';
 
 const styles = css`
@@ -33,9 +30,11 @@ export const Driver = observer<Props>(function Driver({ driver, onSelect }) {
 
   return styled(styles)(
     <ListItem onClick={select}>
-      <ListItemIcon><StaticImage icon={driver.icon} /></ListItemIcon>
+      <ListItemIcon>
+        <StaticImage icon={driver.icon} />
+      </ListItemIcon>
       <ListItemName>{driver.name}</ListItemName>
       <ListItemDescription title={driver.description}>{driver.description}</ListItemDescription>
-    </ListItem>
+    </ListItem>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx
index 12ee09ced0..18d24ccfd6 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx
@@ -5,15 +5,13 @@
  * 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 { useState, useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { ItemListSearch, ItemList, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
+import { ItemList, ItemListSearch, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
 import type { DBDriver } from '@cloudbeaver/core-connections';
 
-
 import { Driver } from './Driver';
 
 interface Props {
@@ -45,8 +43,10 @@ export const DriverList = observer<Props>(function DriverList({ drivers, classNa
     <div ref={focusedRef}>
       <ItemListSearch value={search} placeholder={translate('connections_driver_search_placeholder')} onChange={setSearch} />
       <ItemList className={className}>
-        {filteredDrivers.map(driver => <Driver key={driver.id} driver={driver} onSelect={onSelect} />)}
+        {filteredDrivers.map(driver => (
+          <Driver key={driver.id} driver={driver} onSelect={onSelect} />
+        ))}
       </ItemList>
-    </div>
+    </div>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts
index f7ec8818ab..ff6a4d846a 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, action } from 'mobx';
+import { action, makeObservable, observable } from 'mobx';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
@@ -38,7 +37,7 @@ export class CreateConnectionService {
     private readonly connectionFormService: ConnectionFormService,
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly projectsService: ProjectsService,
-    private readonly projectInfoResource: ProjectInfoResource
+    private readonly projectInfoResource: ProjectInfoResource,
   ) {
     this.data = null;
     this.tabsContainer = new TabsContainer('Connection Creation mode');
@@ -110,12 +109,7 @@ export class CreateConnectionService {
   }
 
   setConnectionTemplate(projectId: string, config: ConnectionConfig, availableDrivers: string[]): void {
-    this.data = new ConnectionFormState(
-      this.projectsService,
-      this.projectInfoResource,
-      this.connectionFormService,
-      this.connectionInfoResource
-    );
+    this.data = new ConnectionFormState(this.projectsService, this.projectInfoResource, this.connectionFormService, this.connectionInfoResource);
 
     this.data.closeTask.addHandler(this.cancelCreate.bind(this));
 
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx
index 1a400ea6d1..f379525af5 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
@@ -13,15 +12,15 @@ import styled, { css } from 'reshadow';
 
 import { TeamsResource, UsersResource } from '@cloudbeaver/core-authentication';
 import {
-  TextPlaceholder,
-  Loader,
-  useResource,
   BASE_CONTAINERS_STYLES,
   ColoredContainer,
-  Group,
   Container,
+  Group,
   InfoItem,
+  Loader,
+  TextPlaceholder,
   useAutoLoad,
+  useResource,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { isCloudConnection } from '@cloudbeaver/core-connections';
@@ -34,7 +33,6 @@ import { ConnectionAccessGrantedList } from './ConnectionAccessGrantedList';
 import { ConnectionAccessList } from './ConnectionAccessList';
 import { useConnectionAccessState } from './useConnectionAccessState';
 
-
 const styles = css`
   ColoredContainer {
     flex: 1;
@@ -51,10 +49,7 @@ const styles = css`
   }
 `;
 
-export const ConnectionAccess: TabContainerPanelComponent<IConnectionFormProps> = observer(function ConnectionAccess({
-  tabId,
-  state: formState,
-}) {
+export const ConnectionAccess: TabContainerPanelComponent<IConnectionFormProps> = observer(function ConnectionAccess({ tabId, state: formState }) {
   const state = useConnectionAccessState(formState.info);
   const translate = useTranslate();
 
@@ -65,13 +60,15 @@ export const ConnectionAccess: TabContainerPanelComponent<IConnectionFormProps>
   const users = useResource(ConnectionAccess, UsersResource, CachedMapAllKey, { active: selected });
   const teams = useResource(ConnectionAccess, TeamsResource, CachedMapAllKey, { active: selected });
 
-  const grantedUsers = useMemo(() => computed(() => users.resource.values
-    .filter(user => state.state.grantedSubjects.includes(user.userId))
-  ), [state.state.grantedSubjects, users.resource]);
+  const grantedUsers = useMemo(
+    () => computed(() => users.resource.values.filter(user => state.state.grantedSubjects.includes(user.userId))),
+    [state.state.grantedSubjects, users.resource],
+  );
 
-  const grantedTeams = useMemo(() => computed(() => teams.resource.values
-    .filter(team => state.state.grantedSubjects.includes(team.teamId))
-  ), [state.state.grantedSubjects, teams.resource]);
+  const grantedTeams = useMemo(
+    () => computed(() => teams.resource.values.filter(team => state.state.grantedSubjects.includes(team.teamId))),
+    [state.state.grantedSubjects, teams.resource],
+  );
 
   if (!selected) {
     return null;
@@ -88,39 +85,47 @@ export const ConnectionAccess: TabContainerPanelComponent<IConnectionFormProps>
     info = 'cloud_connections_access_placeholder';
   }
 
-  return styled(styles, BASE_CONTAINERS_STYLES)(
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
     <Loader state={[users, teams, state.state]}>
-      {() => styled(styles, BASE_CONTAINERS_STYLES)(
-        <ColoredContainer parent gap vertical>
-          {!users.resource.values.length && !teams.resource.values.length ? (
-            <Group keepSize large>
-              <TextPlaceholder>{translate('connections_administration_connection_access_empty')}</TextPlaceholder>
-            </Group>
-          ) : (
-            <>
-              {info && <InfoItem info={info} />}
-              <Container gap overflow>
-                <ConnectionAccessGrantedList
-                  grantedUsers={grantedUsers.get()}
-                  grantedTeams={grantedTeams.get()}
-                  disabled={disabled}
-                  onEdit={state.edit}
-                  onRevoke={state.revoke}
-                />
-                {state.state.editing && (
-                  <ConnectionAccessList
-                    userList={users.resource.values}
-                    teamList={teams.resource.values}
-                    grantedSubjects={state.state.grantedSubjects}
+      {() =>
+        styled(
+          styles,
+          BASE_CONTAINERS_STYLES,
+        )(
+          <ColoredContainer parent gap vertical>
+            {!users.resource.values.length && !teams.resource.values.length ? (
+              <Group keepSize large>
+                <TextPlaceholder>{translate('connections_administration_connection_access_empty')}</TextPlaceholder>
+              </Group>
+            ) : (
+              <>
+                {info && <InfoItem info={info} />}
+                <Container gap overflow>
+                  <ConnectionAccessGrantedList
+                    grantedUsers={grantedUsers.get()}
+                    grantedTeams={grantedTeams.get()}
                     disabled={disabled}
-                    onGrant={state.grant}
+                    onEdit={state.edit}
+                    onRevoke={state.revoke}
                   />
-                )}
-              </Container>
-            </>
-          )}
-        </ColoredContainer>
-      )}
-    </Loader>
+                  {state.state.editing && (
+                    <ConnectionAccessList
+                      userList={users.resource.values}
+                      teamList={teams.resource.values}
+                      grantedSubjects={state.state.grantedSubjects}
+                      disabled={disabled}
+                      onGrant={state.grant}
+                    />
+                  )}
+                </Container>
+              </>
+            )}
+          </ColoredContainer>,
+        )
+      }
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
index 15e8a4c988..45ff8b0a09 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
@@ -13,49 +12,50 @@ import styled, { css } from 'reshadow';
 
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 import {
-  Table,
-  TableBody,
-  TableItem,
-  TableColumnValue,
   BASE_CONTAINERS_STYLES,
-  Group,
   Button,
-  useObjectRef,
   getComputed,
   getSelectedItems,
-  useTranslate
+  Group,
+  Table,
+  TableBody,
+  TableColumnValue,
+  TableItem,
+  useObjectRef,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
-
 import { ConnectionAccessTableHeader, IFilterState } from './ConnectionAccessTableHeader/ConnectionAccessTableHeader';
 import { ConnectionAccessTableInnerHeader } from './ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader';
 import { ConnectionAccessTableItem } from './ConnectionAccessTableItem';
 import { getFilteredTeams, getFilteredUsers } from './getFilteredSubjects';
 
 const styles = css`
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    ConnectionAccessTableHeader {
-      flex: 0 0 auto;
-    }
-    table-container {
-      overflow: auto;
-    }
-  `;
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  ConnectionAccessTableHeader {
+    flex: 0 0 auto;
+  }
+  table-container {
+    overflow: auto;
+  }
+`;
 
 interface Props {
   grantedUsers: AdminUserInfoFragment[];
@@ -97,21 +97,26 @@ export const ConnectionAccessGrantedList = observer<Props>(function ConnectionAc
     }
   }
 
-  return styled(styles, BASE_CONTAINERS_STYLES)(
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
     <Group box medium overflow>
       <container>
         <ConnectionAccessTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>{translate('ui_delete')}</Button>
-          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>{translate('ui_edit')}</Button>
+          <Button disabled={disabled || !selected} mod={['outlined']} onClick={revoke}>
+            {translate('ui_delete')}
+          </Button>
+          <Button disabled={disabled} mod={['unelevated']} onClick={props.onEdit}>
+            {translate('ui_edit')}
+          </Button>
         </ConnectionAccessTableHeader>
         <table-container>
           <Table keys={keys} selectedItems={selectedSubjects}>
             <ConnectionAccessTableInnerHeader disabled={disabled} />
             <TableBody>
-              <TableItem item='tableInfo' selectDisabled>
-                <TableColumnValue colSpan={5}>
-                  {translate(tableInfoText)}
-                </TableColumnValue>
+              <TableItem item="tableInfo" selectDisabled>
+                <TableColumnValue colSpan={5}>{translate(tableInfoText)}</TableColumnValue>
               </TableItem>
               {teams.map(team => (
                 <ConnectionAccessTableItem
@@ -120,7 +125,7 @@ export const ConnectionAccessGrantedList = observer<Props>(function ConnectionAc
                   name={team.teamName || team.teamId}
                   tooltip={team.teamId}
                   description={team.description}
-                  icon='/icons/team.svg'
+                  icon="/icons/team.svg"
                   iconTooltip={translate('authentication_team_icon_tooltip')}
                   disabled={disabled}
                 />
@@ -131,7 +136,7 @@ export const ConnectionAccessGrantedList = observer<Props>(function ConnectionAc
                   id={user.userId}
                   name={user.userId}
                   tooltip={user.userId}
-                  icon='/icons/user.svg'
+                  icon="/icons/user.svg"
                   iconTooltip={translate('authentication_user_icon_tooltip')}
                   disabled={disabled}
                 />
@@ -140,6 +145,6 @@ export const ConnectionAccessGrantedList = observer<Props>(function ConnectionAc
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
index 2cc56f8234..ab811e555d 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
@@ -13,48 +12,49 @@ import styled, { css } from 'reshadow';
 
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 import {
-  Table,
-  TableBody,
-  TableItem,
-  TableColumnValue,
   BASE_CONTAINERS_STYLES,
-  Group,
   Button,
-  useObjectRef,
   getComputed,
   getSelectedItems,
+  Group,
+  Table,
+  TableBody,
+  TableColumnValue,
+  TableItem,
+  useObjectRef,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
-
 import { ConnectionAccessTableHeader, IFilterState } from './ConnectionAccessTableHeader/ConnectionAccessTableHeader';
 import { ConnectionAccessTableInnerHeader } from './ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader';
 import { ConnectionAccessTableItem } from './ConnectionAccessTableItem';
 import { getFilteredTeams, getFilteredUsers } from './getFilteredSubjects';
 
 const styles = css`
-    Table {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Group {
-      position: relative;
-    }
-    Group, container, table-container {
-      height: 100%;
-    }
-    container {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-    }
-    table-container {
-      overflow: auto;
-    }
-    ConnectionAccessTableHeader {
-      flex: 0 0 auto;
-    }
-  `;
+  Table {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Group {
+    position: relative;
+  }
+  Group,
+  container,
+  table-container {
+    height: 100%;
+  }
+  container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  table-container {
+    overflow: auto;
+  }
+  ConnectionAccessTableHeader {
+    flex: 0 0 auto;
+  }
+`;
 
 interface Props {
   userList: AdminUserInfoFragment[];
@@ -64,13 +64,7 @@ interface Props {
   disabled: boolean;
 }
 
-export const ConnectionAccessList = observer<Props>(function ConnectionAccessList({
-  userList,
-  teamList,
-  grantedSubjects,
-  onGrant,
-  disabled,
-}) {
+export const ConnectionAccessList = observer<Props>(function ConnectionAccessList({ userList, teamList, grantedSubjects, onGrant, disabled }) {
   const props = useObjectRef({ onGrant });
   const translate = useTranslate();
   const [selectedSubjects] = useState<Map<any, boolean>>(() => observable(new Map()));
@@ -87,25 +81,24 @@ export const ConnectionAccessList = observer<Props>(function ConnectionAccessLis
     selectedSubjects.clear();
   }, []);
 
-  return styled(styles, BASE_CONTAINERS_STYLES)(
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
     <Group box medium overflow>
       <container>
         <ConnectionAccessTableHeader filterState={filterState} disabled={disabled}>
-          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>{translate('ui_add')}</Button>
+          <Button disabled={disabled || !selected} mod={['unelevated']} onClick={grant}>
+            {translate('ui_add')}
+          </Button>
         </ConnectionAccessTableHeader>
         <table-container>
-          <Table
-            keys={keys}
-            selectedItems={selectedSubjects}
-            isItemSelectable={item => !grantedSubjects.includes(item)}
-          >
+          <Table keys={keys} selectedItems={selectedSubjects} isItemSelectable={item => !grantedSubjects.includes(item)}>
             <ConnectionAccessTableInnerHeader disabled={disabled} />
             <TableBody>
               {!keys.length && filterState.filterValue && (
-                <TableItem item='tableInfo' selectDisabled>
-                  <TableColumnValue colSpan={5}>
-                    {translate('ui_search_no_result_placeholder')}
-                  </TableColumnValue>
+                <TableItem item="tableInfo" selectDisabled>
+                  <TableColumnValue colSpan={5}>{translate('ui_search_no_result_placeholder')}</TableColumnValue>
                 </TableItem>
               )}
               {teams.map(team => (
@@ -115,7 +108,7 @@ export const ConnectionAccessList = observer<Props>(function ConnectionAccessLis
                   name={team.teamName || team.teamId}
                   tooltip={team.teamId}
                   description={team.description}
-                  icon='/icons/team.svg'
+                  icon="/icons/team.svg"
                   iconTooltip={translate('authentication_team_icon_tooltip')}
                   disabled={disabled}
                 />
@@ -126,7 +119,7 @@ export const ConnectionAccessList = observer<Props>(function ConnectionAccessLis
                   id={user.userId}
                   name={user.userId}
                   tooltip={user.userId}
-                  icon='/icons/user.svg'
+                  icon="/icons/user.svg"
                   iconTooltip={translate('authentication_user_icon_tooltip')}
                   disabled={disabled}
                 />
@@ -135,6 +128,6 @@ export const ConnectionAccessList = observer<Props>(function ConnectionAccessLis
           </Table>
         </table-container>
       </container>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
index 9973fe4176..b5b6891281 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
@@ -15,7 +15,14 @@ import { executorHandlerFilter, IExecutionContextProvider } from '@cloudbeaver/c
 import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { PermissionsService } from '@cloudbeaver/core-root';
 import type { MetadataValueGetter } from '@cloudbeaver/core-utils';
-import { connectionConfigContext, ConnectionFormService, connectionFormStateContext, IConnectionFormProps, IConnectionFormState, IConnectionFormSubmitData } from '@cloudbeaver/plugin-connections';
+import {
+  connectionConfigContext,
+  ConnectionFormService,
+  connectionFormStateContext,
+  IConnectionFormProps,
+  IConnectionFormState,
+  IConnectionFormSubmitData,
+} from '@cloudbeaver/plugin-connections';
 
 import type { IConnectionAccessTabState } from './IConnectionAccessTabState';
 
@@ -46,35 +53,23 @@ export class ConnectionAccessTabService extends Bootstrap {
       title: 'connections_connection_edit_access',
       order: 4,
       stateGetter: context => this.stateGetter(context),
-      isHidden: (_, context) => (
-        !context
-        || !this.isAccessTabActive(context.state)
-      ),
-      isDisabled: (tabId, props) => !props?.state.config.driverId
-        || this.administrationScreenService.isConfigurationMode,
+      isHidden: (_, context) => !context || !this.isAccessTabActive(context.state),
+      isDisabled: (tabId, props) => !props?.state.config.driverId || this.administrationScreenService.isConfigurationMode,
       panel: () => ConnectionAccess,
     });
 
-    this.connectionFormService.formSubmittingTask
-      .addHandler(executorHandlerFilter(
-        data => this.isAccessTabActive(data.state),
-        this.save.bind(this)
-      ));
+    this.connectionFormService.formSubmittingTask.addHandler(executorHandlerFilter(data => this.isAccessTabActive(data.state), this.save.bind(this)));
 
-    this.connectionFormService.formStateTask
-      .addHandler(executorHandlerFilter(
-        this.isAccessTabActive.bind(this),
-        this.formState.bind(this)
-      ));
+    this.connectionFormService.formStateTask.addHandler(executorHandlerFilter(this.isAccessTabActive.bind(this), this.formState.bind(this)));
   }
 
-  load(): void { }
+  load(): void {}
 
   private isAccessTabActive(state: IConnectionFormState): boolean {
     return (
-      state.projectId !== null
-      && isGlobalProject(this.projectInfoResource.get(state.projectId))
-      && this.permissionsResource.has(EAdminPermission.admin)
+      state.projectId !== null &&
+      isGlobalProject(this.projectInfoResource.get(state.projectId)) &&
+      this.permissionsResource.has(EAdminPermission.admin)
     );
   }
 
@@ -88,14 +83,8 @@ export class ConnectionAccessTabService extends Bootstrap {
     });
   }
 
-  private async save(
-    data: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
-    if (
-      data.submitType === 'test'
-      || !data.state.projectId
-    ) {
+  private async save(data: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
+    if (data.submitType === 'test' || !data.state.projectId) {
       return;
     }
     const status = contexts.getContext(this.connectionFormService.connectionStatusContext);
@@ -105,11 +94,9 @@ export class ConnectionAccessTabService extends Bootstrap {
     }
 
     const config = contexts.getContext(connectionConfigContext);
-    const state = this.connectionFormService.tabsContainer.getTabState<IConnectionAccessTabState>(
-      data.state.partsState,
-      this.key,
-      { state: data.state }
-    );
+    const state = this.connectionFormService.tabsContainer.getTabState<IConnectionAccessTabState>(data.state.partsState, this.key, {
+      state: data.state,
+    });
 
     if (!config.connectionId || !state.loaded) {
       return;
@@ -120,24 +107,14 @@ export class ConnectionAccessTabService extends Bootstrap {
     const changed = await this.isChanged(key, state.grantedSubjects);
 
     if (changed) {
-      await this.connectionInfoResource.setAccessSubjects(
-        key,
-        state.grantedSubjects
-      );
+      await this.connectionInfoResource.setAccessSubjects(key, state.grantedSubjects);
       state.initialGrantedSubjects = state.grantedSubjects.slice();
     }
   }
 
-  private async formState(
-    data: IConnectionFormState,
-    contexts: IExecutionContextProvider<IConnectionFormState>
-  ) {
+  private async formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
-    const state = this.connectionFormService.tabsContainer.getTabState<IConnectionAccessTabState>(
-      data.partsState,
-      this.key,
-      { state: data }
-    );
+    const state = this.connectionFormService.tabsContainer.getTabState<IConnectionAccessTabState>(data.partsState, this.key, { state: data });
 
     if (!config.connectionId || !data.projectId || !state.loaded) {
       return;
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx
index a6eafb27ed..2e0590a279 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx
@@ -5,13 +5,10 @@
  * 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 { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
-
-
+import { Filter, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 export interface IFilterState {
   filterValue: string;
@@ -24,38 +21,41 @@ interface Props {
 }
 
 const styles = css`
-    buttons {
-      display: flex;
-      gap: 16px;
-    }
-    header {
-      composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
-      overflow: hidden;
-      position: sticky;
-      top: 0;
-      z-index: 1;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 16px;
-      gap: 16px;
-      border-bottom: 1px solid;
-    }
-  `;
+  buttons {
+    display: flex;
+    gap: 16px;
+  }
+  header {
+    composes: theme-border-color-background theme-background-surface theme-text-on-surface from global;
+    overflow: hidden;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    gap: 16px;
+    border-bottom: 1px solid;
+  }
+`;
 
-export const ConnectionAccessTableHeader = observer<React.PropsWithChildren<Props>>(function ConnectionAccessTableHeader({ filterState, disabled, className, children }) {
+export const ConnectionAccessTableHeader = observer<React.PropsWithChildren<Props>>(function ConnectionAccessTableHeader({
+  filterState,
+  disabled,
+  className,
+  children,
+}) {
   const translate = useTranslate();
   return styled(useStyles(styles))(
     <header className={className}>
       <Filter
         disabled={disabled}
         placeholder={translate('connections_connection_access_filter_placeholder')}
-        name='filterValue'
+        name="filterValue"
         state={filterState}
       />
-      <buttons>
-        {children}
-      </buttons>
-    </header>
+      <buttons>{children}</buttons>
+    </header>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx
index f34595d8d8..687681ceeb 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx
@@ -5,7 +5,6 @@
  * 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 { TableColumnHeader, TableHeader, TableSelect, useTranslate } from '@cloudbeaver/core-blocks';
@@ -20,7 +19,7 @@ export const ConnectionAccessTableInnerHeader = observer<Props>(function Connect
   return (
     <TableHeader className={className} fixed>
       <TableColumnHeader min>
-        <TableSelect id='selectUsersAndTeams' disabled={disabled} />
+        <TableSelect id="selectUsersAndTeams" disabled={disabled} />
       </TableColumnHeader>
       <TableColumnHeader min />
       <TableColumnHeader>{translate('connections_connection_access_user_or_team_name')}</TableColumnHeader>
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableItem.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableItem.tsx
index bb6bc5171e..1c48ef168f 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableItem.tsx
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableItem.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -30,22 +29,25 @@ const style = css`
 `;
 
 export const ConnectionAccessTableItem = observer<Props>(function ConnectionAccessTableItem({
-  id, name, description, icon, iconTooltip, tooltip, disabled, className,
+  id,
+  name,
+  description,
+  icon,
+  iconTooltip,
+  tooltip,
+  disabled,
+  className,
 }) {
   return styled(style)(
-    <TableItem
-      item={id}
-      title={tooltip}
-      disabled={disabled}
-      selectDisabled={disabled}
-      className={className}
-    >
+    <TableItem item={id} title={tooltip} disabled={disabled} selectDisabled={disabled} className={className}>
       <TableColumnValue centerContent flex>
         <TableItemSelect disabled={disabled} />
       </TableColumnValue>
-      <TableColumnValue><StaticImage icon={icon} title={iconTooltip} /></TableColumnValue>
+      <TableColumnValue>
+        <StaticImage icon={icon} title={iconTooltip} />
+      </TableColumnValue>
       <TableColumnValue>{name}</TableColumnValue>
       <TableColumnValue>{description}</TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts
index fd9dc67158..6232fd4120 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TeamInfo } from '@cloudbeaver/core-authentication';
 import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 
@@ -16,7 +15,7 @@ import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk';
 export function getFilteredUsers(users: AdminUserInfoFragment[], filter: string): AdminUserInfoFragment[] {
   return users
     .filter(user => user.enabled && user.userId.toLowerCase().includes(filter.toLowerCase()))
-    .sort((a, b) => (a.userId).localeCompare(b.userId));
+    .sort((a, b) => a.userId.localeCompare(b.userId));
 }
 
 /**
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/useConnectionAccessState.ts b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/useConnectionAccessState.ts
index 6896968741..e99b6bc394 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/useConnectionAccessState.ts
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/useConnectionAccessState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import { IAutoLoadable, useObservableRef } from '@cloudbeaver/core-blocks';
@@ -32,74 +31,76 @@ export function useConnectionAccessState(connection: DatabaseConnectionFragment
   const notificationService = useService(NotificationService);
   const state = useTabState<IConnectionAccessTabState>();
 
-  return useObservableRef(() => ({
-    exception: null as Error | null,
-    get changed() {
-      return !isArraysEqual(this.state.initialGrantedSubjects, this.state.grantedSubjects);
-    },
-    isLoading() {
-      return this.state.loading;
-    },
-    isError() {
-      return isContainsException(this.exception);
-    },
-    isLoaded() {
-      return this.state.loaded;
-    },
-    edit() {
-      this.state.editing = !this.state.editing;
-    },
-    revoke(subjectIds: string[]) {
-      this.state.grantedSubjects = this.state.grantedSubjects.filter(subject => !subjectIds.includes(subject));
-    },
-    grant(subjectIds: string[]) {
-      this.state.grantedSubjects.push(...subjectIds);
-    },
-    async load(reload = false) {
-      let loaded = this.exception || this.state.loaded;
+  return useObservableRef(
+    () => ({
+      exception: null as Error | null,
+      get changed() {
+        return !isArraysEqual(this.state.initialGrantedSubjects, this.state.grantedSubjects);
+      },
+      isLoading() {
+        return this.state.loading;
+      },
+      isError() {
+        return isContainsException(this.exception);
+      },
+      isLoaded() {
+        return this.state.loaded;
+      },
+      edit() {
+        this.state.editing = !this.state.editing;
+      },
+      revoke(subjectIds: string[]) {
+        this.state.grantedSubjects = this.state.grantedSubjects.filter(subject => !subjectIds.includes(subject));
+      },
+      grant(subjectIds: string[]) {
+        this.state.grantedSubjects.push(...subjectIds);
+      },
+      async load(reload = false) {
+        let loaded = this.exception || this.state.loaded;
 
-      if (reload) {
-        loaded = false;
-      }
-
-      if (loaded || this.state.loading) {
-        return;
-      }
-
-      try {
-        this.state.loading = true;
-
-        if (this.connection) {
-          const key = createConnectionParam(this.connection);
-          const grantedSubjects = await this.resource.loadAccessSubjects(key);
-          this.state.grantedSubjects = grantedSubjects.map(subject => subject.subjectId);
-          this.state.initialGrantedSubjects = this.state.grantedSubjects.slice();
+        if (reload) {
+          loaded = false;
         }
 
-        this.state.loaded = true;
-        this.exception = null;
-      } catch (exception: any) {
-        this.notificationService.logException(exception, 'connections_connection_edit_access_load_failed');
-        this.exception = exception;
-      } finally {
-        this.state.loading = false;
-      }
+        if (loaded || this.state.loading) {
+          return;
+        }
+
+        try {
+          this.state.loading = true;
+
+          if (this.connection) {
+            const key = createConnectionParam(this.connection);
+            const grantedSubjects = await this.resource.loadAccessSubjects(key);
+            this.state.grantedSubjects = grantedSubjects.map(subject => subject.subjectId);
+            this.state.initialGrantedSubjects = this.state.grantedSubjects.slice();
+          }
+
+          this.state.loaded = true;
+          this.exception = null;
+        } catch (exception: any) {
+          this.notificationService.logException(exception, 'connections_connection_edit_access_load_failed');
+          this.exception = exception;
+        } finally {
+          this.state.loading = false;
+        }
+      },
+      async reload() {
+        this.load(true);
+      },
+    }),
+    {
+      exception: observable.ref,
+      state: observable.ref,
+      changed: computed,
+      edit: action.bound,
+      isLoading: action.bound,
+      isLoaded: action.bound,
+      reload: action.bound,
+      revoke: action.bound,
+      grant: action.bound,
     },
-    async reload() {
-      this.load(true);
-    },
-  }),
-  {
-    exception: observable.ref,
-    state: observable.ref,
-    changed: computed,
-    edit: action.bound,
-    isLoading: action.bound,
-    isLoaded: action.bound,
-    reload: action.bound,
-    revoke: action.bound,
-    grant: action.bound,
-  },
-  { state, connection, resource, notificationService },
-  ['load']);
+    { state, connection, resource, notificationService },
+    ['load'],
+  );
 }
diff --git a/webapp/packages/plugin-connections-administration/src/LocaleService.ts b/webapp/packages/plugin-connections-administration/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-connections-administration/src/LocaleService.ts
+++ b/webapp/packages/plugin-connections-administration/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-connections-administration/src/index.ts b/webapp/packages/plugin-connections-administration/src/index.ts
index 515700d344..939e1ee7f7 100644
--- a/webapp/packages/plugin-connections-administration/src/index.ts
+++ b/webapp/packages/plugin-connections-administration/src/index.ts
@@ -1,4 +1,5 @@
 import { connectionPlugin } from './manifest';
+
 export * from './Administration/Connections/ConnectionsAdministration';
 export * from './Administration/Connections/CreateConnection/Manual/ConnectionManualService';
 export * from './Administration/Connections/ConnectionsAdministrationNavService';
diff --git a/webapp/packages/plugin-connections-administration/src/locales/it.ts b/webapp/packages/plugin-connections-administration/src/locales/it.ts
index 73d0dd1037..3be43aa970 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/it.ts
@@ -1,4 +1,4 @@
 export default [
   ['connections_public_connection_edit_menu_item_title', 'Modifica Connessione'],
-  ['connections_public_connection_edit_cancel_title', 'Conferma l\'annullamento'],
+  ['connections_public_connection_edit_cancel_title', "Conferma l'annullamento"],
 ];
diff --git a/webapp/packages/plugin-connections-administration/src/manifest.ts b/webapp/packages/plugin-connections-administration/src/manifest.ts
index 9c70e33a83..a1564cd91a 100644
--- a/webapp/packages/plugin-connections-administration/src/manifest.ts
+++ b/webapp/packages/plugin-connections-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionsAdministrationNavService } from './Administration/Connections/ConnectionsAdministrationNavService';
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthService.ts b/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
index faf7ae24cb..5405991776 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
@@ -5,9 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AuthProviderService } from '@cloudbeaver/core-authentication';
-import { Connection, ConnectionInfoResource, ConnectionsManagerService, createConnectionParam, IConnectionInfoParams } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  createConnectionParam,
+  IConnectionInfoParams,
+} from '@cloudbeaver/core-connections';
 import { Dependency, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -30,17 +35,12 @@ export class ConnectionAuthService extends Dependency {
 
     connectionsManagerService.connectionExecutor.addHandler(this.connectionDialog.bind(this));
     this.authenticationService.onLogout.before(connectionsManagerService.onDisconnect, state => ({
-      connections: connectionInfoResource.values
-        .filter(connection => connection.connected)
-        .map(createConnectionParam),
+      connections: connectionInfoResource.values.filter(connection => connection.connected).map(createConnectionParam),
       state,
     }));
   }
 
-  private async connectionDialog(
-    connectionKey: IConnectionInfoParams,
-    context: IExecutionContextProvider<IConnectionInfoParams | null>
-  ) {
+  private async connectionDialog(connectionKey: IConnectionInfoParams, context: IExecutionContextProvider<IConnectionInfoParams | null>) {
     const connection = context.getContext(this.connectionsManagerService.connectionContext);
 
     try {
@@ -84,8 +84,8 @@ export class ConnectionAuthService extends Dependency {
 
     connection = await this.connectionInfoResource.load(key, ['includeAuthNeeded', 'includeNetworkHandlersConfig', 'includeCredentialsSaved']);
 
-    const networkHandlers = connection.networkHandlersConfig!
-      .filter(handler => handler.enabled && (!handler.savePassword || resetCredentials))
+    const networkHandlers = connection
+      .networkHandlersConfig!.filter(handler => handler.enabled && (!handler.savePassword || resetCredentials))
       .map(handler => handler.id);
 
     if (connection.authNeeded || (connection.credentialsSaved && resetCredentials) || networkHandlers.length > 0) {
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
index 77a697cc01..047fb8d9c3 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
@@ -5,16 +5,14 @@
  * 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 { SubmittingForm, useFocus, Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Button, SubmittingForm, useFocus, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useDBDriver } from '@cloudbeaver/core-connections';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
 
-
 import { ConnectionAuthenticationFormLoader } from './ConnectionAuthenticationFormLoader';
 
 const styles = css`
@@ -50,7 +48,7 @@ export const ConnectionAuthenticationDialog: DialogComponent<Payload> = observer
   const { driver } = useDBDriver(payload.driverId || '');
 
   return styled(useStyles(styles))(
-    <CommonDialogWrapper size='large'>
+    <CommonDialogWrapper size="large">
       <CommonDialogHeader
         title="connections_connection_credentials_provisioning"
         subTitle="connections_connection_credentials_provisioning_description"
@@ -73,6 +71,6 @@ export const ConnectionAuthenticationDialog: DialogComponent<Payload> = observer
           {translate('ui_apply')}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx
index 596310934c..d84191c6d6 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const ConnectionAuthenticationDialogLoader = React.lazy(async () => {
   const { ConnectionAuthenticationDialog } = await import('./ConnectionAuthenticationDialog');
   return { default: ConnectionAuthenticationDialog };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx
index 5da00066d2..bda8ad1104 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx
@@ -5,15 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Container, FieldCheckbox, Group, GroupTitle, ObjectPropertyInfoForm, TextPlaceholder, useResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  Container,
+  FieldCheckbox,
+  Group,
+  GroupTitle,
+  ObjectPropertyInfoForm,
+  TextPlaceholder,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { DatabaseAuthModelsResource } from '@cloudbeaver/core-connections';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
-
 import type { IConnectionAuthenticationConfig } from './IConnectionAuthenticationConfig';
 import { NetworkHandlers } from './NetworkHandlers';
 
@@ -89,6 +98,6 @@ export const ConnectionAuthenticationForm = observer<Props>(function ConnectionA
           disabled={disabled}
         />
       )}
-    </Container>
+    </Container>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx
index c5ef42b8ec..f2eb496816 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const ConnectionAuthenticationFormLoader = React.lazy(async () => {
   const { ConnectionAuthenticationForm } = await import('./ConnectionAuthenticationForm');
   return { default: ConnectionAuthenticationForm };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/IConnectionAuthenticationConfig.ts b/webapp/packages/plugin-connections/src/ConnectionAuthentication/IConnectionAuthenticationConfig.ts
index f8cf9ef6e4..f38bb9f1ac 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/IConnectionAuthenticationConfig.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/IConnectionAuthenticationConfig.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 
 export interface IConnectionAuthenticationConfig {
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
index 7ce4ea8c8e..d809c3bff7 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, FieldCheckbox, GroupTitle, InputField, useResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, FieldCheckbox, GroupTitle, InputField, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerResource } from '@cloudbeaver/core-connections';
 import { NetworkHandlerAuthType, NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 
@@ -39,27 +38,19 @@ export const NetworkHandlerAuthForm = observer<Props>(function NetworkHandlerAut
 
   const state = networkHandlersConfig.find(state => state.id === id)!;
   const keyAuth = state.authType === NetworkHandlerAuthType.PublicKey;
-  const passwordLabel = keyAuth ? 'Passphrase' : translate(`connections_network_handler_${id}_password`, 'connections_network_handler_default_password');
+  const passwordLabel = keyAuth
+    ? 'Passphrase'
+    : translate(`connections_network_handler_${id}_password`, 'connections_network_handler_default_password');
 
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <>
-      <GroupTitle>{handler.data?.label || translate(`connections_network_handler_${id}_title`, 'connections_network_handler_default_title')}</GroupTitle>
-      <InputField
-        type="text"
-        name="userName"
-        state={state}
-        disabled={disabled}
-        mod='surface'
-      >
+      <GroupTitle>
+        {handler.data?.label || translate(`connections_network_handler_${id}_title`, 'connections_network_handler_default_title')}
+      </GroupTitle>
+      <InputField type="text" name="userName" state={state} disabled={disabled} mod="surface">
         {translate(`connections_network_handler_${id}_user`, 'connections_network_handler_default_user')}
       </InputField>
-      <InputField
-        type="password"
-        name="password"
-        state={state}
-        disabled={disabled}
-        mod='surface'
-      >
+      <InputField type="password" name="password" state={state} disabled={disabled} mod="surface">
         {passwordLabel}
       </InputField>
       {keyAuth && <SSHKeyUploader state={state} disabled={disabled} />}
@@ -72,6 +63,6 @@ export const NetworkHandlerAuthForm = observer<Props>(function NetworkHandlerAut
           disabled={disabled}
         />
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx
index 80535692f9..767543019f 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { BASE_CONTAINERS_STYLES, Group, useStyles } from '@cloudbeaver/core-blocks';
 import type { NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
 
-
 import { NetworkHandlerAuthForm } from './NetworkHandlerAuthForm';
 
 interface Props {
@@ -41,6 +38,6 @@ export const NetworkHandlers = observer<Props>(function NetworkHandlers({ networ
           disabled={disabled}
         />
       ))}
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
index 6f79f54fbf..018f61c75b 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
@@ -5,15 +5,25 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, Loader, ErrorMessage, useErrorDetails, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ErrorMessage,
+  IconOrImage,
+  Loader,
+  Placeholder,
+  useErrorDetails,
+  useExecutor,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
-import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import { ConnectionFormService } from './ConnectionFormService';
 import { connectionConfigContext } from './Contexts/connectionConfigContext';
@@ -26,78 +36,78 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const topBarStyles = css`
-    connection-top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-    }
-    connection-top-bar {
-      position: relative;
-      display: flex;
-      padding-top: 16px;
+  connection-top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+  }
+  connection-top-bar {
+    position: relative;
+    display: flex;
+    padding-top: 16px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    connection-top-bar-tabs {
-      flex: 1;
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
+  connection-top-bar-tabs {
+    flex: 1;
+  }
 
-    connection-top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
+  connection-top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
 
-    /*Button:not(:first-child) {
+  /*Button:not(:first-child) {
       margin-right: 24px;
     }*/
 
-    connection-status-message {
-      composes: theme-typography--caption from global;
-      height: 24px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      gap: 8px;
+  connection-status-message {
+    composes: theme-typography--caption from global;
+    height: 24px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-      & IconOrImage {
-        height: 24px;
-        width: 24px;
-      }
+    & IconOrImage {
+      height: 24px;
+      width: 24px;
     }
-  `;
+  }
+`;
 
 const formStyles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-border-color-background from global;
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-border-color-background from global;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   state: IConnectionFormState;
@@ -106,12 +116,7 @@ interface Props {
   className?: string;
 }
 
-export const ConnectionForm = observer<Props>(function ConnectionForm({
-  state,
-  onCancel,
-  onSave = () => { },
-  className,
-}) {
+export const ConnectionForm = observer<Props>(function ConnectionForm({ state, onCancel, onSave = () => {}, className }) {
   const translate = useTranslate();
   const props = useObjectRef({ onSave });
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
@@ -121,15 +126,17 @@ export const ConnectionForm = observer<Props>(function ConnectionForm({
 
   useExecutor({
     executor: state.submittingTask,
-    postHandlers: [function save(data, contexts) {
-      const validation = contexts.getContext(service.connectionValidationContext);
-      const state = contexts.getContext(service.connectionStatusContext);
-      const config = contexts.getContext(connectionConfigContext);
+    postHandlers: [
+      function save(data, contexts) {
+        const validation = contexts.getContext(service.connectionValidationContext);
+        const state = contexts.getContext(service.connectionStatusContext);
+        const config = contexts.getContext(connectionConfigContext);
 
-      if (validation.valid && state.saved && data.submitType === 'submit') {
-        props.onSave(config);
-      }
-    }],
+        if (validation.valid && state.saved && data.submitType === 'submit') {
+          props.onSave(config);
+        }
+      },
+    ],
   });
 
   useEffect(() => {
@@ -137,37 +144,26 @@ export const ConnectionForm = observer<Props>(function ConnectionForm({
   }, [state]);
 
   if (error.name) {
-    return styled(styles)(
-      <ErrorMessage
-        text={error.message || error.name}
-        hasDetails={error.hasDetails}
-        onShowDetails={error.open}
-      />
-    );
+    return styled(styles)(<ErrorMessage text={error.message || error.name} hasDetails={error.hasDetails} onShowDetails={error.open} />);
   }
 
   if (!state.configured) {
     return styled(styles)(
       <box className={className}>
         <Loader />
-      </box>
+      </box>,
     );
   }
 
   return styled(styles)(
-    <TabsState
-      container={service.tabsContainer}
-      localState={state.partsState}
-      state={state}
-      onCancel={onCancel}
-    >
+    <TabsState container={service.tabsContainer} localState={state.partsState} state={state} onCancel={onCancel}>
       <box className={className}>
         <connection-top-bar>
           <connection-top-bar-tabs>
             <connection-status-message>
               {state.statusMessage && (
                 <>
-                  <IconOrImage icon='/icons/info_icon.svg' />
+                  <IconOrImage icon="/icons/info_icon.svg" />
                   {translate(state.statusMessage)}
                 </>
               )}
@@ -184,6 +180,6 @@ export const ConnectionForm = observer<Props>(function ConnectionForm({
           <TabPanelList style={style} />
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
index 2d06d6b891..c0c0c47a79 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
@@ -5,12 +5,11 @@
  * 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 { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import { Button, getComputed, PlaceholderComponent, useResource, useTranslate } from '@cloudbeaver/core-blocks';
-import { DBDriverResource, DatabaseAuthModelsResource } from '@cloudbeaver/core-connections';
+import { DatabaseAuthModelsResource, DBDriverResource } from '@cloudbeaver/core-connections';
 import { useAuthenticationAction } from '@cloudbeaver/core-ui';
 
 import type { IConnectionFormProps } from './IConnectionFormProps';
@@ -20,17 +19,13 @@ export const ConnectionFormBaseActions: PlaceholderComponent<IConnectionFormProp
   onCancel,
 }) {
   const translate = useTranslate();
-  const driverMap = useResource(
-    ConnectionFormBaseActions,
-    DBDriverResource,
-    state.config.driverId || null
-  );
+  const driverMap = useResource(ConnectionFormBaseActions, DBDriverResource, state.config.driverId || null);
 
   const driver = driverMap.data;
   const { data: authModel } = useResource(
     ConnectionFormBaseActions,
     DatabaseAuthModelsResource,
-    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null)
+    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null),
   );
   const authentication = useAuthenticationAction({
     providerId: authModel?.requiredAuth ?? state.info?.requiredAuth ?? AUTH_PROVIDER_LOCAL_ID,
@@ -41,31 +36,14 @@ export const ConnectionFormBaseActions: PlaceholderComponent<IConnectionFormProp
   return (
     <>
       {onCancel && (
-        <Button
-          type="button"
-          disabled={state.disabled}
-          mod={['outlined']}
-          onClick={onCancel}
-        >
+        <Button type="button" disabled={state.disabled} mod={['outlined']} onClick={onCancel}>
           {translate('ui_processing_cancel')}
         </Button>
       )}
-      <Button
-        type="button"
-        disabled={state.disabled || !authorized}
-        mod={['outlined']}
-        loader
-        onClick={state.test}
-      >
+      <Button type="button" disabled={state.disabled || !authorized} mod={['outlined']} loader onClick={state.test}>
         {translate('connections_connection_test')}
       </Button>
-      <Button
-        type="button"
-        disabled={state.disabled || state.readonly}
-        mod={['unelevated']}
-        loader
-        onClick={state.save}
-      >
+      <Button type="button" disabled={state.disabled || state.readonly} mod={['unelevated']} loader onClick={state.save}>
         {translate(state.mode === 'edit' ? 'ui_processing_save' : 'ui_processing_create')}
       </Button>
     </>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActionsLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActionsLoader.tsx
index 08e94a3df2..4904f1e01c 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActionsLoader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActionsLoader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const ConnectionFormBaseActionsLoader = React.lazy(async () => {
   const { ConnectionFormBaseActions } = await import('./ConnectionFormBaseActions');
   return { default: ConnectionFormBaseActions };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormLoader.tsx
index 83cf88863d..77b70de265 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormLoader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormLoader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const ConnectionFormLoader = React.lazy(async () => {
   const { ConnectionForm } = await import('./ConnectionForm');
   return { default: ConnectionForm };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormService.ts
index 79f07d371e..076313f2bd 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable, runInAction, toJS } from 'mobx';
 
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
@@ -20,7 +19,7 @@ import { ConnectionAuthenticationDialogLoader } from '../ConnectionAuthenticatio
 import { ConnectionFormBaseActionsLoader } from './ConnectionFormBaseActionsLoader';
 import { connectionConfigContext } from './Contexts/connectionConfigContext';
 import { connectionCredentialsStateContext } from './Contexts/connectionCredentialsStateContext';
-import type { IConnectionFormProps, IConnectionFormState, IConnectionFormFillConfigData, IConnectionFormSubmitData } from './IConnectionFormProps';
+import type { IConnectionFormFillConfigData, IConnectionFormProps, IConnectionFormState, IConnectionFormSubmitData } from './IConnectionFormProps';
 
 export interface IConnectionFormValidation {
   valid: boolean;
@@ -63,12 +62,9 @@ export class ConnectionFormService {
     this.formValidationTask = new ExecutorHandlersCollection();
     this.formStateTask = new ExecutorHandlersCollection();
 
-    this.formSubmittingTask
-      .before(this.formValidationTask)
-      .before(this.prepareConfigTask);
+    this.formSubmittingTask.before(this.formValidationTask).before(this.prepareConfigTask);
 
-    this.formStateTask
-      .before<IConnectionFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
+    this.formStateTask.before<IConnectionFormSubmitData>(this.prepareConfigTask, state => ({ state, submitType: 'submit' }));
 
     this.prepareConfigTask.addPostHandler(this.askCredentials);
     this.formSubmittingTask.addPostHandler(this.showSubmittingStatusMessage);
@@ -112,16 +108,15 @@ export class ConnectionFormService {
 
     if (status.messages.length > 0) {
       if (status.exception) {
-        this.notificationService.logException(
-          status.exception,
-          status.messages[0],
-          status.messages.slice(1).join('\n')
-        );
+        this.notificationService.logException(status.exception, status.messages[0], status.messages.slice(1).join('\n'));
       } else {
-        this.notificationService.notify({
-          title: status.messages[0],
-          message: status.messages.slice(1).join('\n'),
-        }, status.saved ? ENotificationType.Success : ENotificationType.Error);
+        this.notificationService.notify(
+          {
+            title: status.messages[0],
+            message: status.messages.slice(1).join('\n'),
+          },
+          status.saved ? ENotificationType.Success : ENotificationType.Error,
+        );
       }
     }
   };
@@ -174,12 +169,14 @@ export class ConnectionFormService {
 
     if (validation.messages.length > 0) {
       const messages = validation.messages.map(message => this.localizationService.translate(message));
-      this.notificationService.notify({
-        title: data.state.mode === 'edit'
-          ? 'connections_administration_connection_save_error'
-          : 'connections_administration_connection_create_error',
-        message: messages.join('\n'),
-      }, validation.valid ? ENotificationType.Info : ENotificationType.Error);
+      this.notificationService.notify(
+        {
+          title:
+            data.state.mode === 'edit' ? 'connections_administration_connection_save_error' : 'connections_administration_connection_create_error',
+          message: messages.join('\n'),
+        },
+        validation.valid ? ENotificationType.Info : ENotificationType.Error,
+      );
     }
   };
 }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
index aa31ce3d5d..26aa6a9398 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable } from 'mobx';
 
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
@@ -18,7 +17,7 @@ import { MetadataMap, uuid } from '@cloudbeaver/core-utils';
 import { connectionFormConfigureContext } from './connectionFormConfigureContext';
 import type { ConnectionFormService } from './ConnectionFormService';
 import { connectionFormStateContext } from './Contexts/connectionFormStateContext';
-import type { IConnectionFormState, ConnectionFormMode, ConnectionFormType, IConnectionFormSubmitData } from './IConnectionFormProps';
+import type { ConnectionFormMode, ConnectionFormType, IConnectionFormState, IConnectionFormSubmitData } from './IConnectionFormProps';
 
 export class ConnectionFormState implements IConnectionFormState {
   mode: ConnectionFormMode;
@@ -96,7 +95,7 @@ export class ConnectionFormState implements IConnectionFormState {
     private readonly projectsService: ProjectsService,
     private readonly projectInfoResource: ProjectInfoResource,
     service: ConnectionFormService,
-    resource: ConnectionInfoResource
+    resource: ConnectionInfoResource,
   ) {
     this._id = uuid();
     this.initError = null;
@@ -117,7 +116,6 @@ export class ConnectionFormState implements IConnectionFormState {
     this.mode = 'create';
     this.type = 'public';
 
-
     this.syncProject = this.syncProject.bind(this);
     this.syncInfo = this.syncInfo.bind(this);
     this.test = this.test.bind(this);
@@ -126,18 +124,13 @@ export class ConnectionFormState implements IConnectionFormState {
     this.loadInfo = this.loadInfo.bind(this);
     this.updateFormState = this.updateFormState.bind(this);
 
-    this.formStateTask
-      .addCollection(service.formStateTask)
-      .addPostHandler(this.updateFormState);
+    this.formStateTask.addCollection(service.formStateTask).addPostHandler(this.updateFormState);
 
-    this.resource.onItemUpdate
-      .addHandler(this.syncInfo);
+    this.resource.onItemUpdate.addHandler(this.syncInfo);
 
-    this.projectInfoResource.onDataUpdate
-      .addHandler(this.syncProject);
+    this.projectInfoResource.onDataUpdate.addHandler(this.syncProject);
 
-    this.projectsService.onActiveProjectChange
-      .addHandler(this.syncProject);
+    this.projectsService.onActiveProjectChange.addHandler(this.syncProject);
 
     this.submittingTask.addPostHandler(async (data, contexts) => {
       const status = contexts.getContext(service.connectionStatusContext);
@@ -159,9 +152,7 @@ export class ConnectionFormState implements IConnectionFormState {
 
         return {
           state,
-          updated: state.info !== configuration.info
-            || state.config.driverId !== configuration.driverId
-            || !this.configured,
+          updated: state.info !== configuration.info || state.config.driverId !== configuration.driverId || !this.configured,
         };
       })
       .next(this.formStateTask);
@@ -214,10 +205,7 @@ export class ConnectionFormState implements IConnectionFormState {
     return this;
   }
 
-  setOptions(
-    mode: ConnectionFormMode,
-    type: ConnectionFormType
-  ): this {
+  setOptions(mode: ConnectionFormMode, type: ConnectionFormType): this {
     this.mode = mode;
     this.type = type;
     return this;
@@ -247,7 +235,7 @@ export class ConnectionFormState implements IConnectionFormState {
         state: this,
         submitType: 'submit',
       },
-      this.service.formSubmittingTask
+      this.service.formSubmittingTask,
     );
   }
 
@@ -257,7 +245,7 @@ export class ConnectionFormState implements IConnectionFormState {
         state: this,
         submitType: 'test',
       },
-      this.service.formSubmittingTask
+      this.service.formSubmittingTask,
     );
   }
 
@@ -267,12 +255,9 @@ export class ConnectionFormState implements IConnectionFormState {
   }
 
   dispose(): void {
-    this.resource.onItemUpdate
-      .removeHandler(this.syncInfo);
-    this.projectInfoResource.onDataUpdate
-      .removeHandler(this.syncProject);
-    this.projectsService.onActiveProjectChange
-      .removeHandler(this.syncProject);
+    this.resource.onItemUpdate.removeHandler(this.syncInfo);
+    this.projectInfoResource.onDataUpdate.removeHandler(this.syncProject);
+    this.projectsService.onActiveProjectChange.removeHandler(this.syncProject);
   }
 
   async close(): Promise<void> {
@@ -300,9 +285,9 @@ export class ConnectionFormState implements IConnectionFormState {
 
   private syncInfo(key: ResourceKeySimple<IConnectionInfoParams>) {
     if (
-      !this.config.connectionId
-      || this.projectId === null
-      || !this.resource.isIntersect(key, createConnectionParam(this.projectId, this.config.connectionId))
+      !this.config.connectionId ||
+      this.projectId === null ||
+      !this.resource.isIntersect(key, createConnectionParam(this.projectId, this.config.connectionId))
     ) {
       return;
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionConfigContext.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionConfigContext.ts
index 102332e1b7..4e22566ca3 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionConfigContext.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionConfigContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
 
 export function connectionConfigContext(): ConnectionConfig {
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
index 45f8e6199e..3c7fb83edd 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
 export interface IConnectionFormStateContext extends IFormStateInfo {
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
index 1d41ee5597..07fcbcd570 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 
 import { DBDriverResource } from '@cloudbeaver/core-connections';
@@ -17,15 +16,12 @@ import { connectionFormConfigureContext } from '../connectionFormConfigureContex
 import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
 import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
-import type { IConnectionFormFillConfigData, IConnectionFormSubmitData, IConnectionFormState } from '../IConnectionFormProps';
+import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 import { DriverPropertiesLoader } from './DriverPropertiesLoader';
 
 @injectable()
 export class ConnectionDriverPropertiesTabService extends Bootstrap {
-  constructor(
-    private readonly connectionFormService: ConnectionFormService,
-    private readonly dbDriverResource: DBDriverResource,
-  ) {
+  constructor(private readonly connectionFormService: ConnectionFormService, private readonly dbDriverResource: DBDriverResource) {
     super();
 
     makeObservable<this, 'fillConfig'>(this, {
@@ -48,20 +44,16 @@ export class ConnectionDriverPropertiesTabService extends Bootstrap {
       },
     });
 
-    this.connectionFormService.prepareConfigTask
-      .addHandler(this.prepareConfig.bind(this));
+    this.connectionFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
-    this.connectionFormService.formStateTask
-      .addHandler(this.formState.bind(this));
+    this.connectionFormService.formStateTask.addHandler(this.formState.bind(this));
 
-    this.connectionFormService.fillConfigTask
-      .addHandler(this.fillConfig.bind(this));
+    this.connectionFormService.fillConfigTask.addHandler(this.fillConfig.bind(this));
 
-    this.connectionFormService.configureTask
-      .addHandler(this.configure.bind(this));
+    this.connectionFormService.configureTask.addHandler(this.configure.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
   private configure(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const configuration = contexts.getContext(connectionFormConfigureContext);
@@ -69,10 +61,7 @@ export class ConnectionDriverPropertiesTabService extends Bootstrap {
     configuration.include('includeProperties', 'includeProviderProperties');
   }
 
-  private fillConfig(
-    { state, updated }: IConnectionFormFillConfigData,
-    contexts: IExecutionContextProvider<IConnectionFormFillConfigData>
-  ) {
+  private fillConfig({ state, updated }: IConnectionFormFillConfigData, contexts: IExecutionContextProvider<IConnectionFormFillConfigData>) {
     if (!updated) {
       return;
     }
@@ -87,21 +76,13 @@ export class ConnectionDriverPropertiesTabService extends Bootstrap {
     state.config.properties = { ...state.info.properties };
   }
 
-  private prepareConfig(
-    {
-      state,
-    }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private prepareConfig({ state }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const config = contexts.getContext(connectionConfigContext);
 
     config.properties = { ...state.config.properties };
   }
 
-  private formState(
-    data: IConnectionFormState,
-    contexts: IExecutionContextProvider<IConnectionFormState>
-  ) {
+  private formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     if (!data.info || !data.config.driverId) {
       return;
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
index 753da4d0f3..1131c5c909 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx
@@ -5,13 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable, runInAction } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, IProperty, Loader, PropertiesTable, useResource, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Group,
+  IProperty,
+  Loader,
+  PropertiesTable,
+  useResource,
+  useStyles,
+} from '@cloudbeaver/core-blocks';
 import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 import { uuid } from '@cloudbeaver/core-utils';
@@ -33,10 +41,7 @@ const styles = css`
   }
 `;
 
-export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps> = observer(function DriverProperties({
-  tabId,
-  state: formState,
-}) {
+export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps> = observer(function DriverProperties({ tabId, state: formState }) {
   const style = useStyles(styles, BASE_CONTAINERS_STYLES);
   const { selected } = useTab(tabId);
 
@@ -60,19 +65,15 @@ export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps>
     return { propertiesList, add, remove };
   });
 
-  const driver = useResource(
-    DriverProperties,
-    DBDriverResource,
-    { key: (selected && formState.config.driverId) || null, includes: ['includeDriverProperties'] as const },
-  );
+  const driver = useResource(DriverProperties, DBDriverResource, {
+    key: (selected && formState.config.driverId) || null,
+    includes: ['includeDriverProperties'] as const,
+  });
 
   runInAction(() => {
     if (driver.data) {
       for (const key of Object.keys(formState.config.properties)) {
-        if (
-          driver.data.driverProperties.some(property => property.id === key)
-          || state.propertiesList.some(property => property.key === key)
-        ) {
+        if (driver.data.driverProperties.some(property => property.id === key) || state.propertiesList.some(property => property.key === key)) {
           continue;
         }
 
@@ -81,21 +82,25 @@ export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps>
     }
   });
 
-  const joinedProperties = useMemo(() => computed<IProperty[]>(() => ([
-    ...state.propertiesList,
-    ...(driver.data?.driverProperties
-      ? driver.data.driverProperties.map<IProperty>(property => ({
-        id: property.id!,
-        key: property.id!,
-        keyPlaceholder: property.id,
-        displayName: property.displayName,
-        valuePlaceholder: property.defaultValue,
-        defaultValue: property.defaultValue,
-        description: property.description,
-        validValues: property.validValues,
-      }))
-      : []),
-  ])), [driver.data]);
+  const joinedProperties = useMemo(
+    () =>
+      computed<IProperty[]>(() => [
+        ...state.propertiesList,
+        ...(driver.data?.driverProperties
+          ? driver.data.driverProperties.map<IProperty>(property => ({
+              id: property.id!,
+              key: property.id!,
+              keyPlaceholder: property.id,
+              displayName: property.displayName,
+              valuePlaceholder: property.defaultValue,
+              defaultValue: property.defaultValue,
+              description: property.description,
+              validValues: property.validValues,
+            }))
+          : []),
+      ]),
+    [driver.data],
+  );
 
   return styled(style)(
     <ColoredContainer parent>
@@ -109,6 +114,6 @@ export const DriverProperties: TabContainerPanelComponent<IConnectionFormProps>
           onRemove={state.remove}
         />
       </Group>
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverPropertiesLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverPropertiesLoader.tsx
index a4e5b47594..0b0b4e632a 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverPropertiesLoader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverPropertiesLoader.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const DriverPropertiesLoader = React.lazy(async () => {
   const { DriverProperties } = await import('./DriverProperties');
   return { default: DriverProperties };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts b/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
index 9a21873c32..1bd1681957 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 import type { ConnectionInfoResource, DatabaseConnection } from '@cloudbeaver/core-connections';
 import type { IExecutor, IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
@@ -42,10 +41,7 @@ export interface IConnectionFormState {
   readonly loadConnectionInfo: () => Promise<DatabaseConnection | undefined>;
   readonly reset: () => void;
   readonly setPartsState: (state: MetadataMap<string, any>) => this;
-  readonly setOptions: (
-    mode: ConnectionFormMode,
-    type: ConnectionFormType
-  ) => this;
+  readonly setOptions: (mode: ConnectionFormMode, type: ConnectionFormType) => this;
   readonly setConfig: (projectId: string, config: ConnectionConfig) => this;
   readonly setProject: (projectId: string) => this;
   readonly setAvailableDrivers: (drivers: string[]) => this;
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index 420ec6f017..39692a21d8 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -5,12 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, runInAction, toJS } from 'mobx';
 import React from 'react';
 
-import { AuthProvidersResource, AUTH_PROVIDER_LOCAL_ID, EAdminPermission, UserInfoResource } from '@cloudbeaver/core-authentication';
-import { ConnectionInfoProjectKey, createConnectionParam, DatabaseAuthModelsResource, DatabaseConnection, DBDriverResource, isLocalConnection } from '@cloudbeaver/core-connections';
+import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, EAdminPermission, UserInfoResource } from '@cloudbeaver/core-authentication';
+import {
+  ConnectionInfoProjectKey,
+  createConnectionParam,
+  DatabaseAuthModelsResource,
+  DatabaseConnection,
+  DBDriverResource,
+  isLocalConnection,
+} from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { LocalizationService } from '@cloudbeaver/core-localization';
@@ -24,7 +30,7 @@ import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
 import { connectionCredentialsStateContext } from '../Contexts/connectionCredentialsStateContext';
 import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
-import type { IConnectionFormSubmitData, IConnectionFormFillConfigData, IConnectionFormState } from '../IConnectionFormProps';
+import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 
 export const Options = React.lazy(async () => {
   const { Options } = await import('./Options');
@@ -42,7 +48,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     private readonly localizationService: LocalizationService,
     private readonly authProvidersResource: AuthProvidersResource,
     private readonly databaseAuthModelsResource: DatabaseAuthModelsResource,
-    private readonly permissionsService: PermissionsService
+    private readonly permissionsService: PermissionsService,
   ) {
     super();
 
@@ -59,27 +65,20 @@ export class ConnectionOptionsTabService extends Bootstrap {
       panel: () => Options,
     });
 
-    this.connectionFormService.prepareConfigTask
-      .addHandler(this.prepareConfig.bind(this));
+    this.connectionFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
-    this.connectionFormService.formValidationTask
-      .addHandler(this.validate.bind(this));
+    this.connectionFormService.formValidationTask.addHandler(this.validate.bind(this));
 
-    this.connectionFormService.formSubmittingTask
-      .addHandler(this.save.bind(this));
+    this.connectionFormService.formSubmittingTask.addHandler(this.save.bind(this));
 
-    this.connectionFormService.formStateTask
-      .addHandler(this.formState.bind(this))
-      .addHandler(this.formAuthState.bind(this));
+    this.connectionFormService.formStateTask.addHandler(this.formState.bind(this)).addHandler(this.formAuthState.bind(this));
 
-    this.connectionFormService.configureTask
-      .addHandler(this.configure.bind(this));
+    this.connectionFormService.configureTask.addHandler(this.configure.bind(this));
 
-    this.connectionFormService.fillConfigTask
-      .addHandler(this.fillConfig.bind(this));
+    this.connectionFormService.fillConfigTask.addHandler(this.fillConfig.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
   isProjectShared(state: IConnectionFormState): boolean {
     if (state.projectId === null) {
@@ -103,13 +102,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     return adminPermission && originLocal && isProjectShared && !this.serverConfigResource.distributed;
   }
 
-  private async save(
-    {
-      state,
-      submitType,
-    }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private async save({ state, submitType }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const status = contexts.getContext(this.connectionFormService.connectionStatusContext);
     const config = contexts.getContext(connectionConfigContext);
 
@@ -121,10 +114,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     try {
       if (submitType === 'submit') {
         if (state.mode === 'edit') {
-          const connection = await state.resource.update(
-            createConnectionParam(state.projectId, config.connectionId!),
-            config
-          );
+          const connection = await state.resource.update(createConnectionParam(state.projectId, config.connectionId!), config);
           status.info('Connection was updated');
           status.info(connection.name);
         } else {
@@ -149,19 +139,10 @@ export class ConnectionOptionsTabService extends Bootstrap {
     }
   }
 
-  private async validate(
-    {
-      state,
-    }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private async validate({ state }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const validation = contexts.getContext(this.connectionFormService.connectionValidationContext);
 
-    if (
-      state.config.configurationType === DriverConfigurationType.Manual
-       && state.config.host?.length === 0
-       && state.config.driverId
-    ) {
+    if (state.config.configurationType === DriverConfigurationType.Manual && state.config.host?.length === 0 && state.config.driverId) {
       const driver = await this.dbDriverResource.load(state.config.driverId);
       if (!driver.embedded) {
         validation.error('plugin_connections_connection_form_host_invalid');
@@ -193,10 +174,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     // }
   }
 
-  private fillConfig(
-    { state, updated }: IConnectionFormFillConfigData,
-    contexts: IExecutionContextProvider<IConnectionFormFillConfigData>
-  ) {
+  private fillConfig({ state, updated }: IConnectionFormFillConfigData, contexts: IExecutionContextProvider<IConnectionFormFillConfigData>) {
     if (!updated) {
       return;
     }
@@ -229,7 +207,6 @@ export class ConnectionOptionsTabService extends Bootstrap {
     state.config.url = state.info.url;
     state.config.folder = state.info.folder;
 
-
     state.config.authModelId = state.info.authModel;
     state.config.saveCredentials = state.info.credentialsSaved;
     state.config.sharedCredentials = state.info.sharedCredentials;
@@ -253,10 +230,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     configuration.include('includeOrigin', 'includeAuthProperties', 'includeCredentialsSaved', 'customIncludeOptions');
   }
 
-  private async prepareConfig(
-    { state }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private async prepareConfig({ state }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const config = contexts.getContext(connectionConfigContext);
     const credentialsState = contexts.getContext(connectionCredentialsStateContext);
 
@@ -276,9 +250,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     tempConfig.name = state.config.name?.trim();
 
     if (tempConfig.name && state.mode === 'create') {
-      const connections = await state.resource.load(
-        ConnectionInfoProjectKey(state.projectId)
-      );
+      const connections = await state.resource.load(ConnectionInfoProjectKey(state.projectId));
       const connectionNames = connections.map(connection => connection.name);
 
       tempConfig.name = getUniqueName(tempConfig.name, connectionNames);
@@ -351,17 +323,12 @@ export class ConnectionOptionsTabService extends Bootstrap {
     });
   }
 
-  private async formAuthState(
-    data: IConnectionFormState,
-    contexts: IExecutionContextProvider<IConnectionFormState>
-  ) {
+  private async formAuthState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
     const stateContext = contexts.getContext(connectionFormStateContext);
 
     const driver = await this.dbDriverResource.load(config.driverId!, ['includeProviderProperties']);
-    const authModel = await this.databaseAuthModelsResource.load(
-      config.authModelId ?? data.info?.authModel ?? driver.defaultAuthModel
-    );
+    const authModel = await this.databaseAuthModelsResource.load(config.authModelId ?? data.info?.authModel ?? driver.defaultAuthModel);
 
     const providerId = authModel.requiredAuth ?? data.info?.requiredAuth ?? AUTH_PROVIDER_LOCAL_ID;
 
@@ -369,16 +336,15 @@ export class ConnectionOptionsTabService extends Bootstrap {
 
     if (!this.userInfoResource.hasToken(providerId)) {
       const provider = await this.authProvidersResource.load(providerId);
-      const message = this.localizationService.translate('connections_public_connection_cloud_auth_required', undefined, { providerLabel: provider.label });
+      const message = this.localizationService.translate('connections_public_connection_cloud_auth_required', undefined, {
+        providerLabel: provider.label,
+      });
       stateContext.setStatusMessage(message);
       stateContext.readonly = data.mode === 'edit';
     }
   }
 
-  private async formState(
-    data: IConnectionFormState,
-    contexts: IExecutionContextProvider<IConnectionFormState>
-  ) {
+  private async formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     if (!data.info) {
       return;
     }
@@ -388,38 +354,29 @@ export class ConnectionOptionsTabService extends Bootstrap {
     const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties']);
 
     if (
-      !isValuesEqual(config.name, data.info.name, '')
-      || !isValuesEqual(config.configurationType, data.info.configurationType, DriverConfigurationType.Manual)
-      || !isValuesEqual(config.description, data.info.description, '')
-      || !isValuesEqual(config.template, data.info.template, true)
-      || !isValuesEqual(config.folder, data.info.folder, undefined)
-      || !isValuesEqual(config.driverId, data.info.driverId, '')
-      || (config.url !== undefined && !isValuesEqual(config.url, data.info.url, ''))
-      || (config.host !== undefined && !isValuesEqual(config.host, data.info.host, ''))
-      || (config.port !== undefined && !isValuesEqual(config.port, data.info.port, ''))
-      || (config.serverName !== undefined && !isValuesEqual(config.serverName, data.info.serverName, ''))
-      || (config.databaseName !== undefined && !isValuesEqual(config.databaseName, data.info.databaseName, ''))
-      || config.credentials !== undefined
-      || (config.authModelId !== undefined && !isValuesEqual(config.authModelId, data.info.authModel, ''))
-      || (config.saveCredentials !== undefined && config.saveCredentials !== data.info.credentialsSaved)
-      || (config.sharedCredentials !== undefined && config.sharedCredentials !== data.info.sharedCredentials)
-      || (
-        config.providerProperties !== undefined
-        && !isObjectPropertyInfoStateEqual(
-          driver.providerProperties,
-          config.providerProperties,
-          data.info.providerProperties
-        )
-      )
+      !isValuesEqual(config.name, data.info.name, '') ||
+      !isValuesEqual(config.configurationType, data.info.configurationType, DriverConfigurationType.Manual) ||
+      !isValuesEqual(config.description, data.info.description, '') ||
+      !isValuesEqual(config.template, data.info.template, true) ||
+      !isValuesEqual(config.folder, data.info.folder, undefined) ||
+      !isValuesEqual(config.driverId, data.info.driverId, '') ||
+      (config.url !== undefined && !isValuesEqual(config.url, data.info.url, '')) ||
+      (config.host !== undefined && !isValuesEqual(config.host, data.info.host, '')) ||
+      (config.port !== undefined && !isValuesEqual(config.port, data.info.port, '')) ||
+      (config.serverName !== undefined && !isValuesEqual(config.serverName, data.info.serverName, '')) ||
+      (config.databaseName !== undefined && !isValuesEqual(config.databaseName, data.info.databaseName, '')) ||
+      config.credentials !== undefined ||
+      (config.authModelId !== undefined && !isValuesEqual(config.authModelId, data.info.authModel, '')) ||
+      (config.saveCredentials !== undefined && config.saveCredentials !== data.info.credentialsSaved) ||
+      (config.sharedCredentials !== undefined && config.sharedCredentials !== data.info.sharedCredentials) ||
+      (config.providerProperties !== undefined &&
+        !isObjectPropertyInfoStateEqual(driver.providerProperties, config.providerProperties, data.info.providerProperties))
     ) {
       stateContext.markEdited();
     }
   }
 
-  private isCredentialsChanged(
-    authProperties: ObjectPropertyInfo[],
-    credentials: Record<string, any>
-  ) {
+  private isCredentialsChanged(authProperties: ObjectPropertyInfo[], credentials: Record<string, any>) {
     for (const property of authProperties) {
       const value = credentials[property.id!];
 
@@ -434,10 +391,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     return false;
   }
 
-  private async getConnectionAuthModelProperties(
-    authModelId: string,
-    connectionInfo?: DatabaseConnection
-  ): Promise<ObjectPropertyInfo[]> {
+  private async getConnectionAuthModelProperties(authModelId: string, connectionInfo?: DatabaseConnection): Promise<ObjectPropertyInfo[]> {
     const authModel = await this.databaseAuthModelsResource.load(authModelId);
 
     let properties = authModel.properties;
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
index ebc2775ca5..ac7c8067e7 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
@@ -5,33 +5,32 @@
  * 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, useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AUTH_PROVIDER_LOCAL_ID, EAdminPermission } from '@cloudbeaver/core-authentication';
 import {
-  InputField,
-  SubmittingForm,
-  useResource,
-  ColoredContainer,
   BASE_CONTAINERS_STYLES,
-  Group,
-  GroupTitle,
-  FieldCheckbox,
-  ObjectPropertyInfoForm,
-  Textarea,
+  ColoredContainer,
   Combobox,
   Container,
-  useFormValidator,
+  FieldCheckbox,
+  FormFieldDescription,
   getComputed,
+  Group,
+  GroupTitle,
+  InputField,
+  ObjectPropertyInfoForm,
   Radio,
   RadioGroup,
-  FormFieldDescription,
-  useTranslate,
-  usePermission,
+  SubmittingForm,
+  Textarea,
   useAdministrationSettings,
+  useFormValidator,
+  usePermission,
+  useResource,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { DatabaseAuthModelsResource, DBDriverResource, isLocalConnection } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
@@ -75,21 +74,13 @@ const driverConfiguration: IDriverConfiguration[] = [
   },
 ];
 
-export const Options: TabContainerPanelComponent<IConnectionFormProps> = observer(function Options({
-  state,
-}) {
+export const Options: TabContainerPanelComponent<IConnectionFormProps> = observer(function Options({ state }) {
   const serverConfigResource = useResource(Options, ServerConfigResource, undefined as void);
   const connectionOptionsTabService = useService(ConnectionOptionsTabService);
   const service = useService(ConnectionFormService);
   const formRef = useRef<HTMLFormElement>(null);
   const translate = useTranslate();
-  const {
-    info,
-    config,
-    availableDrivers,
-    submittingTask: submittingHandlers,
-    disabled,
-  } = state;
+  const { info, config, availableDrivers, submittingTask: submittingHandlers, disabled } = state;
 
   //@TODO it's here until the profile implementation in the CloudBeaver
   const readonly = state.readonly || info?.authModel === PROFILE_AUTH_MODEL_ID;
@@ -118,12 +109,11 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
       onData: (data, resource, prevDriver) => {
         optionsHook.setDefaults(data, prevDriver);
       },
-    }
+    },
   );
 
   const driver = driverMap.data;
-  const configurationTypes = driverConfiguration
-    .filter(conf => driver?.configurationTypes.includes(conf.value));
+  const configurationTypes = driverConfiguration.filter(conf => driver?.configurationTypes.includes(conf.value));
 
   function handleFormChange(value?: unknown, name?: string) {
     if (name !== 'name') {
@@ -148,7 +138,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   const { data: applicableAuthModels } = useResource(
     Options,
     DatabaseAuthModelsResource,
-    getComputed(() => driver?.applicableAuthModels ? resourceKeyList(driver.applicableAuthModels) : CachedMapEmptyKey)
+    getComputed(() => (driver?.applicableAuthModels ? resourceKeyList(driver.applicableAuthModels) : CachedMapEmptyKey)),
   );
 
   const { data: authModel } = useResource(
@@ -157,7 +147,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
     getComputed(() => config.authModelId || info?.authModel || driver?.defaultAuthModel || null),
     {
       onData: data => optionsHook.setAuthModel(data),
-    }
+    },
   );
 
   const authentication = useAuthenticationAction({
@@ -169,31 +159,26 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   const originLocal = !info || isLocalConnection(info);
   const templateAvailable = connectionOptionsTabService.isTemplateAvailable(state);
 
-  const availableAuthModels = applicableAuthModels.filter(model => !!model && (
-    adminPermission
-    || !model.requiresLocalConfiguration
-  ));
-  const drivers = driverMap.resource.enabledDrivers
-    .filter(({ id }) => availableDrivers.includes(id));
+  const availableAuthModels = applicableAuthModels.filter(model => !!model && (adminPermission || !model.requiresLocalConfiguration));
+  const drivers = driverMap.resource.enabledDrivers.filter(({ id }) => availableDrivers.includes(id));
 
   let properties = authModel?.properties;
 
-  if (
-    info?.authProperties
-    && info.authProperties.length > 0
-    && config.authModelId === info.authModel
-  ) {
+  if (info?.authProperties && info.authProperties.length > 0 && config.authModelId === info.authModel) {
     properties = info.authProperties;
   }
 
-  return styled(styles, BASE_CONTAINERS_STYLES)(
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
     <SubmittingForm ref={formRef} disabled={driverMap.isLoading()} onChange={handleFormChange}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <Group form gap>
             <Container wrap gap>
               <Combobox
-                name='driverId'
+                name="driverId"
                 state={config}
                 items={drivers}
                 keySelector={driver => driver.id}
@@ -225,16 +210,9 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                 >
                   {translate('connections_connection_configuration')}
               </Combobox>*/}
-                  <FormFieldDescription
-                    label={translate('connections_connection_configuration')}
-                    tiny
-                    fill
-                  >
+                  <FormFieldDescription label={translate('connections_connection_configuration')} tiny fill>
                     <Container gap>
-                      <RadioGroup
-                        name='configurationType'
-                        state={config}
-                      >
+                      <RadioGroup name="configurationType" state={config}>
                         {driverConfiguration.map(conf => (
                           <Radio
                             key={conf.value}
@@ -262,7 +240,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                 disabled={disabled}
                 readOnly={readonly}
                 autoComplete={`section-${config.driverId || 'driver'} section-jdbc`}
-                mod='surface'
+                mod="surface"
               >
                 {translate('customConnection_url_JDBC')}
               </InputField>
@@ -286,7 +264,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                 state={config}
                 disabled={disabled}
                 readOnly={readonly}
-                mod='surface'
+                mod="surface"
                 required
                 tiny
                 fill
@@ -307,7 +285,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                   state={config}
                   disabled={disabled}
                   autoComplete={`section-${config.driverId || 'driver'} section-folder`}
-                  mod='surface'
+                  mod="surface"
                   autoHide
                   readOnly
                   tiny
@@ -324,29 +302,23 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                 state={config}
                 disabled={edit || disabled}
                 readOnly={readonly}
-              // autoHide // maybe better to use autoHide
+                // autoHide // maybe better to use autoHide
               >
                 {translate('connections_connection_template')}
               </FieldCheckbox>
             )}
-            <Textarea
-              name="description"
-              rows={3}
-              state={config}
-              disabled={disabled}
-              readOnly={readonly}
-            >
+            <Textarea name="description" rows={3} state={config} disabled={disabled} readOnly={readonly}>
               {translate('connections_connection_description')}
             </Textarea>
           </Group>
         </Container>
         <Container medium gap>
-          {(!driver?.anonymousAccess && (authentication.authorized || !edit)) && (
+          {!driver?.anonymousAccess && (authentication.authorized || !edit) && (
             <Group form gap>
               <GroupTitle>{translate('connections_connection_edit_authentication')}</GroupTitle>
               {availableAuthModels.length > 1 && (
                 <Combobox
-                  name='authModelId'
+                  name="authModelId"
                   state={config}
                   items={availableAuthModels}
                   keySelector={model => model!.id}
@@ -364,7 +336,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                 <>
                   <Container wrap gap hideEmpty>
                     <ObjectPropertyInfoForm
-                      autofillToken='new-password'
+                      autofillToken="new-password"
                       properties={properties}
                       state={config.credentials}
                       disabled={disabled}
@@ -385,10 +357,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                       >
                         {translate('connections_connection_edit_save_credentials')}
                       </FieldCheckbox>
-                      {(
-                        serverConfigResource.resource.distributed
-                        && connectionOptionsTabService.isProjectShared(state)
-                      ) && (
+                      {serverConfigResource.resource.distributed && connectionOptionsTabService.isProjectShared(state) && (
                         <FieldCheckbox
                           id={config.connectionId + 'isShared'}
                           name="sharedCredentials"
@@ -407,15 +376,10 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
             </Group>
           )}
           {driver?.providerProperties && (
-            <ProviderPropertiesForm
-              config={config}
-              properties={driver.providerProperties}
-              disabled={disabled}
-              readonly={readonly}
-            />
+            <ProviderPropertiesForm config={config} properties={driver.providerProperties} disabled={disabled} readonly={readonly} />
           )}
         </Container>
       </ColoredContainer>
-    </SubmittingForm>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx
index d92412e0b9..c94fcfaff6 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Container, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Container, InputField, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
 
-
 interface Props {
   config: ConnectionConfig;
   disabled?: boolean;
@@ -22,64 +20,29 @@ interface Props {
   originLocal?: boolean;
 }
 
-export const ParametersForm = observer<Props>(function ParametersForm({
-  config,
-  embedded,
-  requiresServerName,
-  disabled,
-  readOnly,
-  originLocal,
-}) {
+export const ParametersForm = observer<Props>(function ParametersForm({ config, embedded, requiresServerName, disabled, readOnly, originLocal }) {
   const translate = useTranslate();
 
   return styled(useStyles(BASE_CONTAINERS_STYLES))(
     <Container gap>
       {!embedded && (
         <Container wrap gap>
-          <InputField
-            type="text"
-            name="host"
-            state={config}
-            disabled={disabled}
-            readOnly={readOnly || !originLocal}
-            small
-            required
-          >
+          <InputField type="text" name="host" state={config} disabled={disabled} readOnly={readOnly || !originLocal} small required>
             {translate('customConnection_custom_host')}
           </InputField>
-          <InputField
-            type="number"
-            name="port"
-            state={config}
-            disabled={disabled}
-            readOnly={readOnly || !originLocal}
-            tiny
-          >
+          <InputField type="number" name="port" state={config} disabled={disabled} readOnly={readOnly || !originLocal} tiny>
             {translate('customConnection_custom_port')}
           </InputField>
         </Container>
       )}
-      <InputField
-        type="text"
-        name="databaseName"
-        state={config}
-        disabled={disabled}
-        readOnly={readOnly}
-      >
+      <InputField type="text" name="databaseName" state={config} disabled={disabled} readOnly={readOnly}>
         {translate('customConnection_custom_database')}
       </InputField>
       {requiresServerName && (
-        <InputField
-          type="text"
-          name="serverName"
-          state={config}
-          disabled={disabled}
-          readOnly={readOnly}
-          required
-        >
+        <InputField type="text" name="serverName" state={config} disabled={disabled} readOnly={readOnly} required>
           {translate('customConnection_custom_server_name')}
         </InputField>
       )}
-    </Container>
+    </Container>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ProviderPropertiesForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ProviderPropertiesForm.tsx
index 5012c9693f..69658ee791 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ProviderPropertiesForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ProviderPropertiesForm.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Container, useTranslate, Group, GroupTitle, ObjectPropertyInfoForm } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, Container, Group, GroupTitle, ObjectPropertyInfoForm, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ConnectionConfig, DriverProviderPropertyInfoFragment } from '@cloudbeaver/core-sdk';
 
 type DriverProviderPropertyInfo = DriverProviderPropertyInfoFragment;
@@ -21,17 +20,10 @@ interface Props {
   readonly?: boolean;
 }
 
-export const ProviderPropertiesForm = observer<Props>(function ProviderPropertiesForm({
-  config,
-  properties,
-  disabled,
-  readonly,
-}) {
+export const ProviderPropertiesForm = observer<Props>(function ProviderPropertiesForm({ config, properties, disabled, readonly }) {
   const translate = useTranslate();
 
-  const supportedProperties = properties.filter(
-    property => property.supportedConfigurationTypes?.some(type => type === config.configurationType)
-  );
+  const supportedProperties = properties.filter(property => property.supportedConfigurationTypes?.some(type => type === config.configurationType));
 
   if (!supportedProperties.length) {
     return null;
@@ -67,6 +59,6 @@ export const ProviderPropertiesForm = observer<Props>(function ProviderPropertie
           />
         </Container>
       )}
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/useOptions.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/useOptions.ts
index e14ca3e182..d9b519c04b 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/useOptions.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/useOptions.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { runInAction } from 'mobx';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
@@ -17,22 +16,21 @@ import type { IConnectionFormState } from '../IConnectionFormProps';
 const MAX_HOST_LENGTH = 20;
 
 export function useOptions(state: IConnectionFormState) {
-  const refObject = useObjectRef(() => ({
-    prevName: null as string | null,
-  }), {
-    state,
-  });
+  const refObject = useObjectRef(
+    () => ({
+      prevName: null as string | null,
+    }),
+    {
+      state,
+    },
+  );
 
   return useObjectRef({
     updateNameTemplate(driver: DBDriver | undefined) {
       runInAction(() => {
         const {
           prevName,
-          state: {
-            config,
-            info,
-            mode,
-          },
+          state: { config, info, mode },
         } = refObject;
 
         const isAutoFill = config.name === prevName || prevName === null;
@@ -66,10 +64,7 @@ export function useOptions(state: IConnectionFormState) {
     setDefaults(driver: DBDriver | undefined, prevDriver?: DBDriver) {
       runInAction(() => {
         const {
-          state: {
-            config,
-            info,
-          },
+          state: { config, info },
         } = refObject;
 
         if (info || driver?.id !== config.driverId) {
@@ -77,11 +72,9 @@ export function useOptions(state: IConnectionFormState) {
         }
 
         if (!config.configurationType || !driver?.configurationTypes.includes(config.configurationType)) {
-          config.configurationType = (
-            driver?.configurationTypes.includes(DriverConfigurationType.Manual)
-              ? DriverConfigurationType.Manual
-              : DriverConfigurationType.Url
-          );
+          config.configurationType = driver?.configurationTypes.includes(DriverConfigurationType.Manual)
+            ? DriverConfigurationType.Manual
+            : DriverConfigurationType.Url;
         }
 
         if ((!prevDriver && config.host === undefined) || config.host === prevDriver?.defaultServer) {
@@ -111,10 +104,7 @@ export function useOptions(state: IConnectionFormState) {
     },
     setAuthModel(model: DatabaseAuthModel) {
       const {
-        state: {
-          config,
-          info,
-        },
+        state: { config, info },
       } = refObject;
 
       config.credentials = {};
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx
index d5d6301f5a..be88f5d3df 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx
@@ -5,7 +5,6 @@
  * 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 { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
@@ -15,21 +14,15 @@ import { useAuthenticationAction } from '@cloudbeaver/core-ui';
 
 import type { IConnectionFormProps } from '../IConnectionFormProps';
 
-export const AuthenticationButton: PlaceholderComponent<IConnectionFormProps> = observer(function ConnectionFormAuthenticationAction({
-  state,
-}) {
+export const AuthenticationButton: PlaceholderComponent<IConnectionFormProps> = observer(function ConnectionFormAuthenticationAction({ state }) {
   const translate = useTranslate();
-  const driverMap = useResource(
-    ConnectionFormAuthenticationAction,
-    DBDriverResource,
-    state.config.driverId || null
-  );
+  const driverMap = useResource(ConnectionFormAuthenticationAction, DBDriverResource, state.config.driverId || null);
 
   const driver = driverMap.data;
   const { data: authModel } = useResource(
     ConnectionFormAuthenticationAction,
     DatabaseAuthModelsResource,
-    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null)
+    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null),
   );
 
   const authentication = useAuthenticationAction({
@@ -42,12 +35,7 @@ export const AuthenticationButton: PlaceholderComponent<IConnectionFormProps> =
   }
 
   return (
-    <Button
-      type="button"
-      disabled={state.disabled}
-      mod={['outlined']}
-      onClick={authentication.auth}
-    >
+    <Button type="button" disabled={state.disabled} mod={['outlined']} onClick={authentication.auth}>
       {translate('authentication_authenticate')}
     </Button>
   );
@@ -56,17 +44,13 @@ export const AuthenticationButton: PlaceholderComponent<IConnectionFormProps> =
 export const ConnectionFormAuthenticationAction: PlaceholderComponent<IConnectionFormProps> = observer(function ConnectionFormAuthenticationAction({
   state,
 }) {
-  const driverMap = useResource(
-    ConnectionFormAuthenticationAction,
-    DBDriverResource,
-    state.config.driverId || null
-  );
+  const driverMap = useResource(ConnectionFormAuthenticationAction, DBDriverResource, state.config.driverId || null);
 
   const driver = driverMap.data;
   const { data: authModel } = useResource(
     ConnectionFormAuthenticationAction,
     DatabaseAuthModelsResource,
-    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null)
+    getComputed(() => state.config.authModelId || state.info?.authModel || driver?.defaultAuthModel || null),
   );
 
   if (!authModel?.requiredAuth && !state.info?.requiredAuth) {
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.ts
index 2725f75ccd..113812c3d2 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionOriginInfoTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { isLocalConnection } from '@cloudbeaver/core-connections';
@@ -31,9 +30,7 @@ export const OriginInfoTab = React.lazy(async () => {
 
 @injectable()
 export class ConnectionOriginInfoTabService extends Bootstrap {
-  constructor(
-    private readonly connectionFormService: ConnectionFormService,
-  ) {
+  constructor(private readonly connectionFormService: ConnectionFormService) {
     super();
   }
 
@@ -44,17 +41,15 @@ export class ConnectionOriginInfoTabService extends Bootstrap {
       tab: () => OriginInfoTab,
       panel: () => OriginInfo,
       stateGetter: () => () => ({}),
-      isHidden: (tabId, props) => props?.state.info ? isLocalConnection(props.state.info) : true,
+      isHidden: (tabId, props) => (props?.state.info ? isLocalConnection(props.state.info) : true),
     });
 
-    this.connectionFormService.configureTask
-      .addHandler(this.configure.bind(this));
+    this.connectionFormService.configureTask.addHandler(this.configure.bind(this));
 
-    this.connectionFormService.actionsContainer
-      .add(ConnectionFormAuthenticationAction, 0);
+    this.connectionFormService.actionsContainer.add(ConnectionFormAuthenticationAction, 0);
   }
 
-  load(): void { }
+  load(): void {}
 
   private configure(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const configuration = contexts.getContext(connectionFormConfigureContext);
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx
index a17bc86356..1bf2c2d4ad 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx
@@ -5,11 +5,21 @@
  * 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 { TextPlaceholder, Loader, ExceptionMessage, useResource, ColoredContainer, Group, ObjectPropertyInfoForm, BASE_CONTAINERS_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  ExceptionMessage,
+  Group,
+  Loader,
+  ObjectPropertyInfoForm,
+  TextPlaceholder,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { createConnectionParam } from '@cloudbeaver/core-connections';
 import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
 
@@ -28,48 +38,46 @@ const style = css`
   }
 `;
 
-export const OriginInfo: TabContainerPanelComponent<IConnectionFormProps> = observer(function OriginInfo({
-  tabId,
-  state: {
-    info,
-    resource,
-  },
-}) {
+export const OriginInfo: TabContainerPanelComponent<IConnectionFormProps> = observer(function OriginInfo({ tabId, state: { info, resource } }) {
   const tab = useTab(tabId);
   const translate = useTranslate();
   // const userInfoService = useService(UserInfoResource);
   const state = useTabState<Record<string, any>>();
   const styles = useStyles(style, BASE_CONTAINERS_STYLES);
 
-  const connection = useResource(OriginInfo, resource, {
-    key: (tab.selected && info) ? createConnectionParam(info.projectId, info.id) : null,
-    includes: ['includeOrigin', 'customIncludeOriginDetails'] as const,
-  }, {
-    // isActive: () => !info?.origin || userInfoService.hasOrigin(info.origin),
-    onData: (connection, res, prev) => {
-      if (!connection.origin.details) {
-        return;
-      }
+  const connection = useResource(
+    OriginInfo,
+    resource,
+    {
+      key: tab.selected && info ? createConnectionParam(info.projectId, info.id) : null,
+      includes: ['includeOrigin', 'customIncludeOriginDetails'] as const,
+    },
+    {
+      // isActive: () => !info?.origin || userInfoService.hasOrigin(info.origin),
+      onData: (connection, res, prev) => {
+        if (!connection.origin.details) {
+          return;
+        }
 
-      if (prev?.origin.details) {
-        for (const property of prev.origin.details) {
-          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-          delete state[property.id!];
+        if (prev?.origin.details) {
+          for (const property of prev.origin.details) {
+            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+            delete state[property.id!];
+          }
         }
-      }
 
-      for (const property of connection.origin.details) {
-        state[property.id!] = property.value;
-      }
+        for (const property of connection.origin.details) {
+          state[property.id!] = property.value;
+        }
+      },
     },
-  }
   );
 
   if (connection.isLoading()) {
     return styled(styles)(
       <ColoredContainer>
         <Loader key="static" />
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
@@ -77,7 +85,7 @@ export const OriginInfo: TabContainerPanelComponent<IConnectionFormProps> = obse
     return styled(styles)(
       <ColoredContainer>
         <ExceptionMessage exception={connection.exception} onRetry={connection.reload} />
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
@@ -95,22 +103,16 @@ export const OriginInfo: TabContainerPanelComponent<IConnectionFormProps> = obse
     return styled(styles)(
       <ColoredContainer parent>
         <TextPlaceholder>{translate('connections_administration_connection_no_information')}</TextPlaceholder>
-      </ColoredContainer>
+      </ColoredContainer>,
     );
   }
 
   return styled(styles)(
     <ColoredContainer parent>
       <Group large gap>
-        <ObjectPropertyInfoForm
-          properties={connection.data.origin.details}
-          state={state}
-          readOnly
-          small
-          autoHide
-        />
+        <ObjectPropertyInfoForm properties={connection.data.origin.details} state={state} readOnly small autoHide />
       </Group>
       <Loader key="overlay" loading={connection.isLoading()} overlay />
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx
index f2b343f69b..39b665866a 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx
@@ -5,23 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useStyles, Translate } from '@cloudbeaver/core-blocks';
-import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui';
+import { Translate, useStyles } from '@cloudbeaver/core-blocks';
+import { Tab, TabContainerTabComponent, TabTitle } from '@cloudbeaver/core-ui';
 
 import type { IConnectionFormProps } from '../IConnectionFormProps';
 
-export const OriginInfoTab: TabContainerTabComponent<IConnectionFormProps> = observer(function OriginInfoTab({
-  state: { info },
-  style,
-  ...rest
-}) {
+export const OriginInfoTab: TabContainerTabComponent<IConnectionFormProps> = observer(function OriginInfoTab({ state: { info }, style, ...rest }) {
   return styled(useStyles(style))(
     <Tab {...rest} style={style}>
-      <TabTitle><Translate token={info?.origin?.displayName || 'Origin'} /></TabTitle>
-    </Tab>
+      <TabTitle>
+        <Translate token={info?.origin?.displayName || 'Origin'} />
+      </TabTitle>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
index c7c9c7f35d..78fb6368ba 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 import React from 'react';
 
@@ -32,10 +31,7 @@ export const SSHPanel = React.lazy(async () => {
 
 @injectable()
 export class ConnectionSSHTabService extends Bootstrap {
-  constructor(
-    private readonly connectionFormService: ConnectionFormService,
-    private readonly dbDriverResource: DBDriverResource
-  ) {
+  constructor(private readonly connectionFormService: ConnectionFormService, private readonly dbDriverResource: DBDriverResource) {
     super();
 
     makeObservable<this, 'fillConfig' | 'prepareConfig'>(this, {
@@ -63,28 +59,20 @@ export class ConnectionSSHTabService extends Bootstrap {
       },
     });
 
-    this.connectionFormService.prepareConfigTask
-      .addHandler(this.prepareConfig.bind(this));
+    this.connectionFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
-    this.connectionFormService.formValidationTask
-      .addHandler(this.validate.bind(this));
+    this.connectionFormService.formValidationTask.addHandler(this.validate.bind(this));
 
-    this.connectionFormService.formStateTask
-      .addHandler(this.formState.bind(this));
+    this.connectionFormService.formStateTask.addHandler(this.formState.bind(this));
 
-    this.connectionFormService.configureTask
-      .addHandler(this.configure.bind(this));
+    this.connectionFormService.configureTask.addHandler(this.configure.bind(this));
 
-    this.connectionFormService.fillConfigTask
-      .addHandler(this.fillConfig.bind(this));
+    this.connectionFormService.fillConfigTask.addHandler(this.fillConfig.bind(this));
   }
 
-  load(): void { }
+  load(): void {}
 
-  private fillConfig(
-    { state, updated }: IConnectionFormFillConfigData,
-    contexts: IExecutionContextProvider<IConnectionFormFillConfigData>
-  ) {
+  private fillConfig({ state, updated }: IConnectionFormFillConfigData, contexts: IExecutionContextProvider<IConnectionFormFillConfigData>) {
     if (!updated) {
       return;
     }
@@ -121,15 +109,7 @@ export class ConnectionSSHTabService extends Bootstrap {
     configuration.include('includeNetworkHandlersConfig');
   }
 
-  private validate(
-    {
-      state: {
-        config,
-        info,
-      },
-    }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private validate({ state: { config, info } }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const validation = contexts.getContext(this.connectionFormService.connectionValidationContext);
 
     if (!config.networkHandlersConfig) {
@@ -168,12 +148,7 @@ export class ConnectionSSHTabService extends Bootstrap {
     }
   }
 
-  private prepareConfig(
-    {
-      state,
-    }: IConnectionFormSubmitData,
-    contexts: IExecutionContextProvider<IConnectionFormSubmitData>
-  ) {
+  private prepareConfig({ state }: IConnectionFormSubmitData, contexts: IExecutionContextProvider<IConnectionFormSubmitData>) {
     const config = contexts.getContext(connectionConfigContext);
     const credentialsState = contexts.getContext(connectionCredentialsStateContext);
     const urlType = state.config.configurationType === DriverConfigurationType.Url;
@@ -206,10 +181,7 @@ export class ConnectionSSHTabService extends Bootstrap {
     }
   }
 
-  private formState(
-    data: IConnectionFormState,
-    contexts: IExecutionContextProvider<IConnectionFormState>
-  ) {
+  private formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
     if (config.networkHandlersConfig !== undefined) {
       const stateContext = contexts.getContext(connectionFormStateContext);
@@ -226,14 +198,16 @@ export class ConnectionSSHTabService extends Bootstrap {
     const port = Number(initial?.properties?.port);
     const formPort = Number(handler.properties?.port);
 
-    if (handler.enabled !== initial?.enabled
-      || handler.authType !== initial?.authType
-      || handler.savePassword !== initial?.savePassword
-      || handler.userName !== initial?.userName
-      || handler.properties?.host !== initial?.properties?.host
-      || port !== formPort
-      || handler.properties?.aliveInterval !== initial?.properties?.aliveInterval
-      || handler.properties?.sshConnectTimeout !== initial?.properties?.sshConnectTimeout) {
+    if (
+      handler.enabled !== initial?.enabled ||
+      handler.authType !== initial?.authType ||
+      handler.savePassword !== initial?.savePassword ||
+      handler.userName !== initial?.userName ||
+      handler.properties?.host !== initial?.properties?.host ||
+      port !== formPort ||
+      handler.properties?.aliveInterval !== initial?.properties?.aliveInterval ||
+      handler.properties?.sshConnectTimeout !== initial?.properties?.sshConnectTimeout
+    ) {
       return true;
     }
 
@@ -246,8 +220,8 @@ export class ConnectionSSHTabService extends Bootstrap {
     }
 
     return (
-      (((initial?.password === null && handler.password !== null) || initial?.password === '') && handler.password !== '')
-      || !!handler.password?.length
+      (((initial?.password === null && handler.password !== null) || initial?.password === '') && handler.password !== '') ||
+      !!handler.password?.length
     );
   }
 
@@ -256,9 +230,6 @@ export class ConnectionSSHTabService extends Bootstrap {
       return false;
     }
 
-    return (
-      (((initial?.key === null && handler.key !== null) || initial?.key === '') && handler.key !== '')
-      || !!handler.key?.length
-    );
+    return (((initial?.key === null && handler.key !== null) || initial?.key === '') && handler.key !== '') || !!handler.key?.length;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 634aa8dce3..12d4b20e38 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -5,15 +5,28 @@
  * 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 {
-  Group, SubmittingForm, useResource, Button, ColoredContainer, InputField,
-  FieldCheckbox, BASE_CONTAINERS_STYLES, Switch, GroupItem, Container,
-  Combobox, Expandable, EXPANDABLE_FORM_STYLES, useTranslate, useStyles, useAdministrationSettings
+  BASE_CONTAINERS_STYLES,
+  Button,
+  ColoredContainer,
+  Combobox,
+  Container,
+  Expandable,
+  EXPANDABLE_FORM_STYLES,
+  FieldCheckbox,
+  Group,
+  GroupItem,
+  InputField,
+  SubmittingForm,
+  Switch,
+  useAdministrationSettings,
+  useResource,
+  useStyles,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 import { NetworkHandlerAuthType, NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
@@ -36,15 +49,8 @@ interface Props extends IConnectionFormProps {
   handlerState: NetworkHandlerConfigInput;
 }
 
-export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
-  state: formState,
-  handlerState,
-}) {
-  const {
-    info,
-    readonly,
-    disabled: formDisabled,
-  } = formState;
+export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ state: formState, handlerState }) {
+  const { info, readonly, disabled: formDisabled } = formState;
   const [loading, setLoading] = useState(false);
   const { credentialsSavingEnabled } = useAdministrationSettings();
 
@@ -90,12 +96,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
     <SubmittingForm>
       <ColoredContainer parent>
         <Group form gap keepSize large>
-          <Switch
-            name="enabled"
-            state={handlerState}
-            mod={['primary']}
-            disabled={disabled || readonly}
-          >
+          <Switch name="enabled" state={handlerState} mod={['primary']} disabled={disabled || readonly}>
             {translate('connections_network_handler_ssh_tunnel_enable')}
           </Switch>
           <Combobox
@@ -117,7 +118,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               state={handlerState.properties}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              mod='surface'
+              mod="surface"
               required
               small
             >
@@ -129,7 +130,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               state={handlerState.properties}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              mod='surface'
+              mod="surface"
               required
               tiny
             >
@@ -143,7 +144,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
               state={handlerState}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              mod='surface'
+              mod="surface"
               required={handlerState.savePassword}
               tiny
             >
@@ -152,25 +153,18 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             <InputField
               type="password"
               name="password"
-              autoComplete='new-password'
+              autoComplete="new-password"
               state={handlerState}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              mod='surface'
+              mod="surface"
               required={!keyAuth && handlerState.savePassword}
               description={passwordSaved ? translate('ui_processing_saved') : undefined}
               tiny
             >
               {passwordLabel}
             </InputField>
-            {keyAuth && (
-              <SSHKeyUploader
-                state={handlerState}
-                saved={keySaved}
-                disabled={disabled || !enabled}
-                readonly={readonly}
-              />
-            )}
+            {keyAuth && <SSHKeyUploader state={handlerState} saved={keySaved} disabled={disabled || !enabled} readonly={readonly} />}
           </Container>
           {credentialsSavingEnabled && (
             <FieldCheckbox
@@ -183,31 +177,28 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             </FieldCheckbox>
           )}
           <Container gap>
-            <Expandable
-              style={EXPANDABLE_FORM_STYLES}
-              label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}
-            >
+            <Expandable style={EXPANDABLE_FORM_STYLES} label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}>
               <Container gap>
                 <InputField
-                  type='number'
-                  name='aliveInterval'
+                  type="number"
+                  name="aliveInterval"
                   state={handlerState.properties}
                   disabled={disabled || !enabled}
                   readOnly={readonly}
                   labelTooltip={aliveIntervalLabel}
-                  mod='surface'
+                  mod="surface"
                   tiny
                 >
                   {aliveIntervalLabel}
                 </InputField>
                 <InputField
-                  type='number'
-                  name='sshConnectTimeout'
+                  type="number"
+                  name="sshConnectTimeout"
                   state={handlerState.properties}
                   disabled={disabled || !enabled}
                   readOnly={readonly}
                   labelTooltip={connectTimeoutLabel}
-                  mod='surface'
+                  mod="surface"
                   tiny
                 >
                   {connectTimeoutLabel}
@@ -216,18 +207,12 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({
             </Expandable>
           </Container>
           <GroupItem>
-            <Button
-              type='button'
-              mod={['unelevated']}
-              disabled={disabled || !enabled || !testAvailable}
-              loader
-              onClick={testConnection}
-            >
+            <Button type="button" mod={['unelevated']} disabled={disabled || !enabled || !testAvailable} loader onClick={testConnection}>
               {translate('connections_network_handler_test')}
             </Button>
           </GroupItem>
         </Group>
       </ColoredContainer>
-    </SubmittingForm>
+    </SubmittingForm>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx
index c1b7524983..4ff3e99ed6 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHKeyUploader.tsx
@@ -5,7 +5,6 @@
  * 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 { Button, GroupItem, Textarea, UploadArea, useTranslate } from '@cloudbeaver/core-blocks';
@@ -41,7 +40,7 @@ export const SSHKeyUploader = observer<Props>(function SSHKeyUploader({ state, s
   return (
     <>
       <Textarea
-        name='key'
+        name="key"
         state={state}
         disabled={disabled}
         readOnly={readonly}
@@ -52,20 +51,12 @@ export const SSHKeyUploader = observer<Props>(function SSHKeyUploader({ state, s
         {translate('connections_network_handler_ssh_tunnel_private_key')}
       </Textarea>
       <GroupItem>
-        <UploadArea
-          disabled={disabled || readonly}
-          reset
-          onChange={handleKeyUpload}
-        >
-          <Button
-            tag="div"
-            disabled={disabled || readonly}
-            mod={['outlined']}
-          >
+        <UploadArea disabled={disabled || readonly} reset onChange={handleKeyUpload}>
+          <Button tag="div" disabled={disabled || readonly} mod={['outlined']}>
             {translate('ui_file')}
           </Button>
         </UploadArea>
       </GroupItem>
     </>
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHPanel.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHPanel.tsx
index 2a98894157..28de5386a6 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHPanel.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHPanel.tsx
@@ -5,16 +5,14 @@
  * 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 {  SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
+import { SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 
 import type { IConnectionFormProps } from '../IConnectionFormProps';
 import { SSH } from './SSH';
 
-
 export const SSHPanel: TabContainerPanelComponent<IConnectionFormProps> = observer(function SSHPanel(props) {
   const state = props.state.config.networkHandlersConfig?.find(state => state.id === SSH_TUNNEL_ID);
   const tab = useTab(props.tabId);
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx
index ecb59836f6..15c1ff5638 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx
@@ -5,26 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { Translate, useResource, useStyles } from '@cloudbeaver/core-blocks';
 import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
-import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui';
+import { Tab, TabContainerTabComponent, TabTitle } from '@cloudbeaver/core-ui';
 
 import type { IConnectionFormProps } from '../IConnectionFormProps';
 
-export const SSHTab: TabContainerTabComponent<IConnectionFormProps> = observer(function SSHTab({
-  style,
-  ...rest
-}) {
+export const SSHTab: TabContainerTabComponent<IConnectionFormProps> = observer(function SSHTab({ style, ...rest }) {
   const styles = useStyles(style);
   const handler = useResource(SSHTab, NetworkHandlerResource, SSH_TUNNEL_ID);
 
   return styled(styles)(
     <Tab {...rest} title={handler.data?.description} style={style}>
-      <TabTitle><Translate token={handler.data?.label || 'connections_network_handler_ssh_tunnel_title'} /></TabTitle>
-    </Tab>
+      <TabTitle>
+        <Translate token={handler.data?.label || 'connections_network_handler_ssh_tunnel_title'} />
+      </TabTitle>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts
index 603f376403..e469d4a713 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/authTypes.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 import { NetworkHandlerAuthType } from '@cloudbeaver/core-sdk';
 
@@ -23,4 +22,4 @@ export const authTypes: IAuthType[] = [
     key: NetworkHandlerAuthType.PublicKey,
     label: 'Public Key',
   },
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/connectionFormConfigureContext.ts b/webapp/packages/plugin-connections/src/ConnectionForm/connectionFormConfigureContext.ts
index 82861db825..2480dbc0ec 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/connectionFormConfigureContext.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/connectionFormConfigureContext.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DatabaseConnection } from '@cloudbeaver/core-connections';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import type { CachedResourceIncludeArgs, GetUserConnectionsQueryVariables } from '@cloudbeaver/core-sdk';
 
 import type { IConnectionFormState } from './IConnectionFormProps';
 
-export type ConnectionFormInfoIncludes = CachedResourceIncludeArgs<
-DatabaseConnection,
-GetUserConnectionsQueryVariables
->;
+export type ConnectionFormInfoIncludes = CachedResourceIncludeArgs<DatabaseConnection, GetUserConnectionsQueryVariables>;
 
 export interface IConnectionFormConfigureContext {
   readonly driverId: string | undefined;
@@ -27,7 +23,7 @@ export interface IConnectionFormConfigureContext {
 
 export function connectionFormConfigureContext(
   contexts: IExecutionContextProvider<IConnectionFormState>,
-  state: IConnectionFormState
+  state: IConnectionFormState,
 ): IConnectionFormConfigureContext {
   return {
     info: state.info,
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/useConnectionFormState.ts b/webapp/packages/plugin-connections/src/ConnectionForm/useConnectionFormState.ts
index 45f07b73c0..68751a78f6 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/useConnectionFormState.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/useConnectionFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect, useState } from 'react';
 
 import type { ConnectionInfoResource } from '@cloudbeaver/core-connections';
@@ -16,21 +15,13 @@ import { ConnectionFormService } from './ConnectionFormService';
 import { ConnectionFormState } from './ConnectionFormState';
 import type { IConnectionFormState } from './IConnectionFormProps';
 
-export function useConnectionFormState(
-  resource: ConnectionInfoResource,
-  configure?: (state: IConnectionFormState) => any
-): IConnectionFormState {
+export function useConnectionFormState(resource: ConnectionInfoResource, configure?: (state: IConnectionFormState) => any): IConnectionFormState {
   const projectsService = useService(ProjectsService);
   const projectInfoResource = useService(ProjectInfoResource);
 
   const service = useService(ConnectionFormService);
   const [state] = useState<IConnectionFormState>(() => {
-    const state = new ConnectionFormState(
-      projectsService,
-      projectInfoResource,
-      service,
-      resource,
-    );
+    const state = new ConnectionFormState(projectsService, projectInfoResource, service, resource);
     configure?.(state);
 
     state.load();
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_CHANGE_CREDENTIALS.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_CHANGE_CREDENTIALS.ts
index 355dbbb7b3..2d186dcbb0 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_CHANGE_CREDENTIALS.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_CHANGE_CREDENTIALS.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_CHANGE_CREDENTIALS = createAction(
-  'connection-change-credentials',
-  {
-    label: 'app_navigationTree_context_change_credentials',
-  }
-);
+export const ACTION_CONNECTION_CHANGE_CREDENTIALS = createAction('connection-change-credentials', {
+  label: 'app_navigationTree_context_change_credentials',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT.ts
index a63f008520..dbc0f0ca9c 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_DISCONNECT = createAction(
-  'connection-disconnect',
-  {
-    label: 'app_navigationTree_context_disconnect',
-  }
-);
+export const ACTION_CONNECTION_DISCONNECT = createAction('connection-disconnect', {
+  label: 'app_navigationTree_context_disconnect',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT_ALL.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT_ALL.ts
index 80ca613fa9..228b206828 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT_ALL.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_DISCONNECT_ALL.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_DISCONNECT_ALL = createAction(
-  'connection-disconnect-all',
-  {
-    label: 'plugin_connections_action_disconnect_all_label',
-  }
-);
+export const ACTION_CONNECTION_DISCONNECT_ALL = createAction('connection-disconnect-all', {
+  label: 'plugin_connections_action_disconnect_all_label',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_EDIT.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_EDIT.ts
index df25ebe5d1..aab5957a4d 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_EDIT.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_EDIT.ts
@@ -5,12 +5,8 @@
  * 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_CONNECTION_EDIT = createAction(
-  'connection-edit',
-  {
-    label: 'connections_public_connection_edit_menu_item_title',
-  }
-);
+export const ACTION_CONNECTION_EDIT = createAction('connection-edit', {
+  label: 'connections_public_connection_edit_menu_item_title',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_ADVANCED.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_ADVANCED.ts
index 8da08fd0e2..fe8ff3f5b6 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_ADVANCED.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_ADVANCED.ts
@@ -5,13 +5,9 @@
  * 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_CONNECTION_VIEW_ADVANCED = createAction(
-  'connection-view-advanced',
-  {
-    label: 'app_navigationTree_connection_view_option_advanced',
-    type: 'select',
-  }
-);
+export const ACTION_CONNECTION_VIEW_ADVANCED = createAction('connection-view-advanced', {
+  label: 'app_navigationTree_connection_view_option_advanced',
+  type: 'select',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SIMPLE.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SIMPLE.ts
index 222c157ba1..dda3624e25 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SIMPLE.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SIMPLE.ts
@@ -5,13 +5,9 @@
  * 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_CONNECTION_VIEW_SIMPLE = createAction(
-  'connection-view-simple',
-  {
-    label: 'app_navigationTree_connection_view_option_simple',
-    type: 'select',
-  }
-);
+export const ACTION_CONNECTION_VIEW_SIMPLE = createAction('connection-view-simple', {
+  label: 'app_navigationTree_connection_view_option_simple',
+  type: 'select',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS.ts b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS.ts
index 802f1c1f7c..818fa53fad 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/Actions/ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS.ts
@@ -5,13 +5,9 @@
  * 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_CONNECTION_VIEW_SYSTEM_OBJECTS = createAction(
-  'connection-view-system-objects',
-  {
-    label: 'app_navigationTree_connection_view_option_showSystemObjects',
-    type: 'checkbox',
-  }
-);
+export const ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS = createAction('connection-view-system-objects', {
+  label: 'app_navigationTree_connection_view_option_showSystemObjects',
+  type: 'checkbox',
+});
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
index 1ff7ac0f82..e6b3a007f1 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
@@ -5,15 +5,34 @@
  * 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-authentication';
-import { Connection, ConnectionInfoResource, ConnectionsManagerService, ConnectionsSettingsService, createConnectionParam } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  ConnectionsSettingsService,
+  createConnectionParam,
+} from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
-import { CONNECTION_NAVIGATOR_VIEW_SETTINGS, isNavigatorViewSettingsEqual, NavigatorViewSettings, PermissionsService, ServerConfigResource } from '@cloudbeaver/core-root';
+import {
+  CONNECTION_NAVIGATOR_VIEW_SETTINGS,
+  isNavigatorViewSettingsEqual,
+  NavigatorViewSettings,
+  PermissionsService,
+  ServerConfigResource,
+} from '@cloudbeaver/core-root';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { ActionService, ACTION_DELETE, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, DATA_CONTEXT_MENU_NESTED, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
+import {
+  ACTION_DELETE,
+  ActionService,
+  DATA_CONTEXT_LOADABLE_STATE,
+  DATA_CONTEXT_MENU,
+  DATA_CONTEXT_MENU_NESTED,
+  MenuSeparatorItem,
+  MenuService,
+} from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
 import { ConnectionAuthService } from '../ConnectionAuthService';
@@ -55,8 +74,8 @@ export class ConnectionMenuBootstrap extends Bootstrap {
     this.menuService.addCreator({
       isApplicable: context => {
         if (
-          this.pluginConnectionsSettingsService.settings.getValue('hideConnectionViewForUsers')
-          && !this.permissionsService.has(EAdminPermission.admin)
+          this.pluginConnectionsSettingsService.settings.getValue('hideConnectionViewForUsers') &&
+          !this.permissionsService.has(EAdminPermission.admin)
         ) {
           return false;
         }
@@ -73,15 +92,9 @@ export class ConnectionMenuBootstrap extends Bootstrap {
           return false;
         }
 
-        return (
-          context.has(DATA_CONTEXT_CONNECTION)
-          && !context.has(DATA_CONTEXT_MENU_NESTED)
-        );
+        return context.has(DATA_CONTEXT_CONNECTION) && !context.has(DATA_CONTEXT_MENU_NESTED);
       },
-      getItems: (context, items) => [
-        ...items,
-        MENU_CONNECTION_VIEW,
-      ],
+      getItems: (context, items) => [...items, MENU_CONNECTION_VIEW],
     });
 
     this.menuService.addCreator({
@@ -101,26 +114,17 @@ export class ConnectionMenuBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'connection-view',
-      isActionApplicable: (context, action) => [
-        ACTION_CONNECTION_VIEW_SIMPLE,
-        ACTION_CONNECTION_VIEW_ADVANCED,
-        ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS,
-      ].includes(action),
+      isActionApplicable: (context, action) =>
+        [ACTION_CONNECTION_VIEW_SIMPLE, ACTION_CONNECTION_VIEW_ADVANCED, ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS].includes(action),
       isChecked: (context, action) => {
         const connection = context.get(DATA_CONTEXT_CONNECTION);
 
         switch (action) {
           case ACTION_CONNECTION_VIEW_SIMPLE: {
-            return isNavigatorViewSettingsEqual(
-              connection.navigatorSettings,
-              CONNECTION_NAVIGATOR_VIEW_SETTINGS.simple
-            );
+            return isNavigatorViewSettingsEqual(connection.navigatorSettings, CONNECTION_NAVIGATOR_VIEW_SETTINGS.simple);
           }
           case ACTION_CONNECTION_VIEW_ADVANCED: {
-            return isNavigatorViewSettingsEqual(
-              connection.navigatorSettings,
-              CONNECTION_NAVIGATOR_VIEW_SETTINGS.advanced
-            );
+            return isNavigatorViewSettingsEqual(connection.navigatorSettings, CONNECTION_NAVIGATOR_VIEW_SETTINGS.advanced);
           }
           case ACTION_CONNECTION_VIEW_SYSTEM_OBJECTS: {
             return connection.navigatorSettings.showSystemObjects;
@@ -215,9 +219,8 @@ export class ConnectionMenuBootstrap extends Bootstrap {
         const connection = context.get(DATA_CONTEXT_CONNECTION);
 
         if (action === ACTION_CONNECTION_CHANGE_CREDENTIALS) {
-          return state.getState(
-            action.id,
-            () => getCachedMapResourceLoaderState(this.connectionInfoResource, createConnectionParam(connection), ['includeCredentialsSaved'], true)
+          return state.getState(action.id, () =>
+            getCachedMapResourceLoaderState(this.connectionInfoResource, createConnectionParam(connection), ['includeCredentialsSaved'], true),
           );
         }
 
@@ -228,9 +231,7 @@ export class ConnectionMenuBootstrap extends Bootstrap {
 
         switch (action) {
           case ACTION_CONNECTION_DISCONNECT: {
-            await this.connectionsManagerService.closeConnectionAsync(
-              createConnectionParam(connection)
-            );
+            await this.connectionsManagerService.closeConnectionAsync(createConnectionParam(connection));
             break;
           }
           case ACTION_CONNECTION_DISCONNECT_ALL: {
@@ -239,9 +240,7 @@ export class ConnectionMenuBootstrap extends Bootstrap {
           }
           case ACTION_DELETE: {
             try {
-              await this.connectionsManagerService.deleteConnection(
-                createConnectionParam(connection)
-              );
+              await this.connectionsManagerService.deleteConnection(createConnectionParam(connection));
             } catch (exception: any) {
               this.notificationService.logException(exception, 'Failed to delete connection');
             }
@@ -252,10 +251,7 @@ export class ConnectionMenuBootstrap extends Bootstrap {
             break;
           }
           case ACTION_CONNECTION_CHANGE_CREDENTIALS: {
-            await this.connectionAuthService.auth(
-              { connectionId: connection.id, projectId: connection.projectId },
-              true
-            );
+            await this.connectionAuthService.auth({ connectionId: connection.id, projectId: connection.projectId }, true);
             break;
           }
         }
@@ -263,14 +259,11 @@ export class ConnectionMenuBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 
   private async changeConnectionView(connection: Connection, settings: NavigatorViewSettings) {
     try {
-      connection = await this.connectionInfoResource.changeConnectionView(
-        createConnectionParam(connection),
-        settings
-      );
+      connection = await this.connectionInfoResource.changeConnectionView(createConnectionParam(connection), settings);
 
       if (connection.nodePath) {
         await this.navNodeManagerService.refreshTree(connection.nodePath);
@@ -283,15 +276,13 @@ export class ConnectionMenuBootstrap extends Bootstrap {
   private addConnectionsMenuToTopAppBar() {
     this.menuService.addCreator({
       menus: [MENU_APP_ACTIONS],
-      getItems: (context, items) => [
-        ...items,
-        MENU_CONNECTIONS,
-      ],
+      getItems: (context, items) => [...items, MENU_CONNECTIONS],
     });
     this.menuService.setHandler({
       id: 'connections-menu-base',
       isApplicable: context => context.tryGet(DATA_CONTEXT_MENU) === MENU_CONNECTIONS,
-      isHidden: () => this.connectionsManagerService.createConnectionProjects.length === 0 || this.connectionsSettingsService.settings.getValue('disabled'),
+      isHidden: () =>
+        this.connectionsManagerService.createConnectionProjects.length === 0 || this.connectionsSettingsService.settings.getValue('disabled'),
       isLabelVisible: () => false,
     });
   }
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/DATA_CONTEXT_CONNECTION.ts b/webapp/packages/plugin-connections/src/ContextMenu/DATA_CONTEXT_CONNECTION.ts
index 0e02cd81db..b81ecc19bf 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/DATA_CONTEXT_CONNECTION.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/DATA_CONTEXT_CONNECTION.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Connection } from '@cloudbeaver/core-connections';
 import { createDataContext } from '@cloudbeaver/core-view';
 
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts
index 3a516a39a4..c88d42439e 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts
@@ -5,12 +5,11 @@
  * 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_CONNECTIONS = createMenu(
   'connections',
   'plugin_connections_menu_connections_label',
   '/icons/plugin_connections_menu_m.svg',
-  'plugin_connections_menu_connections_label'
+  'plugin_connections_menu_connections_label',
 );
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTION_VIEW.ts b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTION_VIEW.ts
index 2cc0589684..45f785c3f0 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTION_VIEW.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTION_VIEW.ts
@@ -5,10 +5,6 @@
  * 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_CONNECTION_VIEW = createMenu(
-  'connection-view',
-  'app_navigationTree_connection_view'
-);
+export const MENU_CONNECTION_VIEW = createMenu('connection-view', 'app_navigationTree_connection_view');
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
index 58fa7f3ce6..563a475ba7 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
@@ -5,11 +5,16 @@
  * 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 { observable, makeObservable } from 'mobx';
-
-import { ConnectionInfoResource, ConnectionInitConfig, DBDriverResource, IConnectionInfoParams, USER_NAME_PROPERTY_ID } from '@cloudbeaver/core-connections';
-import { injectable, IInitializableController, IDestructibleController } from '@cloudbeaver/core-di';
+import {
+  ConnectionInfoResource,
+  ConnectionInitConfig,
+  DBDriverResource,
+  IConnectionInfoParams,
+  USER_NAME_PROPERTY_ID,
+} from '@cloudbeaver/core-connections';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
@@ -38,7 +43,7 @@ export class DBAuthDialogController implements IInitializableController, IDestru
     private readonly notificationService: NotificationService,
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly commonDialogService: CommonDialogService,
-    private readonly dbDriverResource: DBDriverResource
+    private readonly dbDriverResource: DBDriverResource,
   ) {
     makeObservable(this, {
       isAuthenticating: observable.ref,
@@ -108,7 +113,9 @@ export class DBAuthDialogController implements IInitializableController, IDestru
   private async loadAuthModel() {
     try {
       const connection = await this.connectionInfoResource.load(this.connectionKey, [
-        'includeAuthProperties', 'includeNetworkHandlersConfig', 'includeAuthNeeded',
+        'includeAuthProperties',
+        'includeNetworkHandlersConfig',
+        'includeAuthNeeded',
       ]);
 
       if (connection.authNeeded) {
@@ -133,7 +140,7 @@ export class DBAuthDialogController implements IInitializableController, IDestru
         }
       }
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load auth model');
+      this.notificationService.logException(exception, "Can't load auth model");
     }
   }
 
@@ -141,7 +148,7 @@ export class DBAuthDialogController implements IInitializableController, IDestru
     try {
       await this.dbDriverResource.load(CachedMapAllKey);
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load database drivers', '', true);
+      this.notificationService.logException(exception, "Can't load database drivers", '', true);
     }
   }
 }
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx
index 753df144e1..f37aec66cf 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx
@@ -5,13 +5,11 @@
  * 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 { Button, useTranslate } from '@cloudbeaver/core-blocks';
 
-
 const styles = css`
   footer-container {
     display: flex;
@@ -45,14 +43,9 @@ export const DBAuthDialogFooter = observer<React.PropsWithChildren<Props>>(funct
   return styled(styles)(
     <footer-container className={className}>
       {children}
-      <Button
-        type="button"
-        mod={['unelevated']}
-        disabled={isAuthenticating}
-        onClick={onLogin}
-      >
+      <Button type="button" mod={['unelevated']} disabled={isAuthenticating} onClick={onLogin}>
         {translate('authentication_login')}
       </Button>
-    </footer-container>
+    </footer-container>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
index d78d579530..acfa945348 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
@@ -5,18 +5,10 @@
  * 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 {
-  SubmittingForm,
-  useFocus,
-  ErrorMessage,
-  useStyles,
-  Loader,
-  useAdministrationSettings,
-} from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Loader, SubmittingForm, useAdministrationSettings, useFocus, useStyles } from '@cloudbeaver/core-blocks';
 import { IConnectionInfoParams, useConnectionInfo, useDBDriver } from '@cloudbeaver/core-connections';
 import { useController } from '@cloudbeaver/core-di';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
@@ -26,20 +18,20 @@ import { DBAuthDialogController } from './DBAuthDialogController';
 import { DBAuthDialogFooter } from './DBAuthDialogFooter';
 
 const styles = css`
-    SubmittingForm {
-      overflow: auto;
-      margin: auto;
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-    }
-    ConnectionAuthenticationFormLoader {
-      align-content: center;
-    }
-    ErrorMessage {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      flex: 1;
-    }
+  SubmittingForm {
+    overflow: auto;
+    margin: auto;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  ConnectionAuthenticationFormLoader {
+    align-content: center;
+  }
+  ErrorMessage {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    flex: 1;
+  }
 `;
 
 interface Payload {
@@ -48,12 +40,7 @@ interface Payload {
   resetCredentials?: boolean;
 }
 
-export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function DatabaseAuthDialog({
-  payload,
-  options,
-  rejectDialog,
-  resolveDialog,
-}) {
+export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function DatabaseAuthDialog({ payload, options, rejectDialog, resolveDialog }) {
   const connection = useConnectionInfo(payload.connection);
   const controller = useController(DBAuthDialogController, payload.connection, payload.networkHandlers, resolveDialog);
 
@@ -68,7 +55,7 @@ export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function Da
   }
 
   return styled(useStyles(styles))(
-    <CommonDialogWrapper size='large'>
+    <CommonDialogWrapper size="large">
       <CommonDialogHeader
         title="connections_database_authentication"
         subTitle={connection.connectionInfo?.name}
@@ -77,36 +64,29 @@ export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function Da
       />
       <CommonDialogBody>
         <SubmittingForm ref={focusedRef} onSubmit={controller.login}>
-          {!connection.isLoaded() || connection.isLoading() || !controller.configured
-            ? <Loader />
-            : (
-              <ConnectionAuthenticationFormLoader
-                config={controller.config}
-                authModelId={authModelId}
-                authProperties={connection.connectionInfo?.authProperties}
-                networkHandlers={payload.networkHandlers}
-                formId={`${payload.connection.projectId}:${payload.connection.connectionId}`}
-                allowSaveCredentials={credentialsSavingEnabled}
-                disabled={controller.isAuthenticating}
-                hideFeatures={['nonSecuredProperty']}
-              />
-            )}
+          {!connection.isLoaded() || connection.isLoading() || !controller.configured ? (
+            <Loader />
+          ) : (
+            <ConnectionAuthenticationFormLoader
+              config={controller.config}
+              authModelId={authModelId}
+              authProperties={connection.connectionInfo?.authProperties}
+              networkHandlers={payload.networkHandlers}
+              formId={`${payload.connection.projectId}:${payload.connection.connectionId}`}
+              allowSaveCredentials={credentialsSavingEnabled}
+              disabled={controller.isAuthenticating}
+              hideFeatures={['nonSecuredProperty']}
+            />
+          )}
         </SubmittingForm>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <DBAuthDialogFooter
-          isAuthenticating={controller.isAuthenticating}
-          onLogin={controller.login}
-        >
+        <DBAuthDialogFooter isAuthenticating={controller.isAuthenticating} onLogin={controller.login}>
           {controller.error.responseMessage && (
-            <ErrorMessage
-              text={controller.error.responseMessage}
-              hasDetails={controller.error.hasDetails}
-              onShowDetails={controller.showDetails}
-            />
+            <ErrorMessage text={controller.error.responseMessage} hasDetails={controller.error.hasDetails} onShowDetails={controller.showDetails} />
           )}
         </DBAuthDialogFooter>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/LocaleService.ts b/webapp/packages/plugin-connections/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-connections/src/LocaleService.ts
+++ b/webapp/packages/plugin-connections/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts b/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts
index 11f453b543..9e6bd72176 100644
--- a/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts
@@ -5,23 +5,46 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import { untracked } from 'mobx';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
-import { ConnectionFolderProjectKey, ConnectionFolderResource, ConnectionInfoResource, ConnectionsManagerService, CONNECTION_FOLDER_NAME_VALIDATION, createConnectionFolderParam, createConnectionParam, getConnectionFolderIdFromNodeId, IConnectionFolderParam, IConnectionInfoParams, getConnectionFolderId } from '@cloudbeaver/core-connections';
+import {
+  CONNECTION_FOLDER_NAME_VALIDATION,
+  ConnectionFolderProjectKey,
+  ConnectionFolderResource,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  createConnectionFolderParam,
+  createConnectionParam,
+  getConnectionFolderId,
+  getConnectionFolderIdFromNodeId,
+  IConnectionFolderParam,
+  IConnectionInfoParams,
+} from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter, IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { ENodeMoveType, getNodesFromContext, INodeMoveData, NavNode, NavNodeInfoResource, NavNodeManagerService, navNodeMoveContext, NavTreeResource, NAV_NODE_TYPE_FOLDER, nodeDeleteContext, ProjectsNavNodeService, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
+import {
+  ENodeMoveType,
+  getNodesFromContext,
+  INodeMoveData,
+  NAV_NODE_TYPE_FOLDER,
+  NavNode,
+  NavNodeInfoResource,
+  NavNodeManagerService,
+  navNodeMoveContext,
+  NavTreeResource,
+  nodeDeleteContext,
+  ProjectsNavNodeService,
+  ROOT_NODE_PATH,
+} from '@cloudbeaver/core-navigation-tree';
 import { getProjectNodeId, NAV_NODE_TYPE_PROJECT, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { CachedMapAllKey, ResourceKeyAlias, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 import { createPath } from '@cloudbeaver/core-utils';
-import { ActionService, ACTION_NEW_FOLDER, DATA_CONTEXT_MENU, IAction, IDataContextProvider, MenuService } from '@cloudbeaver/core-view';
-import { DATA_CONTEXT_ELEMENTS_TREE, MENU_ELEMENTS_TREE_TOOLS, type IElementsTree } from '@cloudbeaver/plugin-navigation-tree';
+import { ACTION_NEW_FOLDER, ActionService, DATA_CONTEXT_MENU, IAction, IDataContextProvider, MenuService } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_ELEMENTS_TREE, type IElementsTree, MENU_ELEMENTS_TREE_TOOLS } from '@cloudbeaver/plugin-navigation-tree';
 import { FolderDialog } from '@cloudbeaver/plugin-projects';
 
 import { NAV_NODE_TYPE_CONNECTION } from './NAV_NODE_TYPE_CONNECTION';
@@ -50,7 +73,7 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
     private readonly notificationService: NotificationService,
     private readonly navNodeInfoResource: NavNodeInfoResource,
     private readonly projectInfoResource: ProjectInfoResource,
-    private readonly projectsNavNodeService: ProjectsNavNodeService
+    private readonly projectsNavNodeService: ProjectsNavNodeService,
   ) {
     super();
   }
@@ -72,11 +95,7 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       }
       await this.connectionFolderResource.load(CachedMapAllKey);
 
-      const nodes = ResourceKeyUtils
-        .filter(
-          data,
-          nodeId => this.connectionFolderResource.fromNodeId(nodeId) !== undefined
-        )
+      const nodes = ResourceKeyUtils.filter(data, nodeId => this.connectionFolderResource.fromNodeId(nodeId) !== undefined)
         .map(nodeId => this.navNodeInfoResource.get(nodeId))
         .filter<NavNode>(Boolean as any)
         .map(node => node.name)
@@ -104,12 +123,7 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       isActionApplicable: (context, action) => {
         const tree = context.tryGet(DATA_CONTEXT_ELEMENTS_TREE);
 
-        if (
-          action !== ACTION_NEW_FOLDER
-          || !tree
-          || !this.userInfoResource.data
-          || tree.baseRoot !== ROOT_NODE_PATH
-        ) {
+        if (action !== ACTION_NEW_FOLDER || !tree || !this.userInfoResource.data || tree.baseRoot !== ROOT_NODE_PATH) {
           return false;
         }
 
@@ -139,26 +153,16 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_ELEMENTS_TREE_TOOLS,
       getItems: (context, items) => {
         if (!items.includes(ACTION_NEW_FOLDER)) {
-          return [
-            ...items,
-            ACTION_NEW_FOLDER,
-          ];
+          return [...items, ACTION_NEW_FOLDER];
         }
 
         return items;
       },
     });
   }
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private async moveConnectionToFolder(
-    {
-      type,
-      targetNode,
-      moveContexts,
-    }: INodeMoveData,
-    contexts: IExecutionContextProvider<INodeMoveData>
-  ) {
+  private async moveConnectionToFolder({ type, targetNode, moveContexts }: INodeMoveData, contexts: IExecutionContextProvider<INodeMoveData>) {
     if (![NAV_NODE_TYPE_PROJECT, NAV_NODE_TYPE_FOLDER].includes(targetNode.nodeType!)) {
       return;
     }
@@ -173,10 +177,10 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
 
     const supported = nodes.every(node => {
       if (
-        ![NAV_NODE_TYPE_CONNECTION, NAV_NODE_TYPE_FOLDER, NAV_NODE_TYPE_PROJECT].includes(node.nodeType!)
-        || targetProject !== this.projectsNavNodeService.getProject(node.id)
-        || children.includes(node.id)
-        || targetNode.id === node.id
+        ![NAV_NODE_TYPE_CONNECTION, NAV_NODE_TYPE_FOLDER, NAV_NODE_TYPE_PROJECT].includes(node.nodeType!) ||
+        targetProject !== this.projectsNavNodeService.getProject(node.id) ||
+        children.includes(node.id) ||
+        targetNode.id === node.id
       ) {
         return false;
       }
@@ -194,26 +198,19 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       }
     } else {
       const childrenNode = this.navNodeInfoResource.get(resourceKeyList(children));
-      const folderDuplicates = nodes.filter(node => (
-        node.nodeType === NAV_NODE_TYPE_FOLDER
-        && (
-          childrenNode.some(child => child?.nodeType === NAV_NODE_TYPE_FOLDER && child.name === node.name)
-          || nodes.some(child => (
-            child.nodeType === NAV_NODE_TYPE_FOLDER
-            && child.name === node.name
-            && child.id !== node.id
-          ))
-        )
-      ));
+      const folderDuplicates = nodes.filter(
+        node =>
+          node.nodeType === NAV_NODE_TYPE_FOLDER &&
+          (childrenNode.some(child => child?.nodeType === NAV_NODE_TYPE_FOLDER && child.name === node.name) ||
+            nodes.some(child => child.nodeType === NAV_NODE_TYPE_FOLDER && child.name === node.name && child.id !== node.id)),
+      );
 
       if (folderDuplicates.length > 0) {
         this.notificationService.logError({
           title: 'connections_public_connection_folder_move_failed',
-          message: this.localizationService.translate(
-            'connections_public_connection_folder_move_duplication',
-            undefined,
-            { name: folderDuplicates.map(node => `"${node.name}"`).join(', ') }
-          ),
+          message: this.localizationService.translate('connections_public_connection_folder_move_duplication', undefined, {
+            name: folderDuplicates.map(node => `"${node.name}"`).join(', '),
+          }),
         });
         return;
       }
@@ -251,7 +248,7 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
         const targetNode = this.getTargetNode(tree);
 
         if (!targetNode) {
-          this.notificationService.logError({ title:'Can\'t create folder', message: 'core_projects_no_default_project' });
+          this.notificationService.logError({ title: "Can't create folder", message: 'core_projects_no_default_project' });
           return;
         }
 
@@ -277,24 +274,23 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
               return false;
             }
 
-            let parentKey: ResourceKeyAlias<any, {
-              projectId: string;
-            }> | IConnectionFolderParam = ConnectionFolderProjectKey(projectId);
+            let parentKey:
+              | ResourceKeyAlias<
+                  any,
+                  {
+                    projectId: string;
+                  }
+                >
+              | IConnectionFolderParam = ConnectionFolderProjectKey(projectId);
 
             if (folder) {
-              parentKey = createConnectionFolderParam(
-                projectId,
-                folder
-              );
+              parentKey = createConnectionFolderParam(projectId, folder);
             }
 
             try {
               await this.connectionFolderResource.load(parentKey);
 
-              return !this.connectionFolderResource.has(createConnectionFolderParam(
-                projectId,
-                createPath(folder, trimmed)
-              ));
+              return !this.connectionFolderResource.has(createConnectionFolderParam(projectId, createPath(folder, trimmed)));
             } catch (exception: any) {
               setMessage('connections_connection_folder_validation');
               return false;
@@ -308,10 +304,10 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
             this.navTreeResource.markOutdated(
               result.folder
                 ? getConnectionFolderId(createConnectionFolderParam(result.projectId, result.folder))
-                : getProjectNodeId(result.projectId)
+                : getProjectNodeId(result.projectId),
             );
           } catch (exception: any) {
-            this.notificationService.logException(exception, 'Can\'t create folder');
+            this.notificationService.logException(exception, "Can't create folder");
           }
         }
 
@@ -321,10 +317,7 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
   }
 
   private async syncWithNavTree(key: ResourceKeySimple<string>) {
-    const isFolder = ResourceKeyUtils.some(
-      key,
-      nodeId => this.connectionFolderResource.fromNodeId(nodeId) !== undefined
-    );
+    const isFolder = ResourceKeyUtils.some(key, nodeId => this.connectionFolderResource.fromNodeId(nodeId) !== undefined);
 
     if (isFolder) {
       this.connectionFolderResource.markOutdated();
@@ -359,7 +352,6 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       return;
     }
 
-
     const project = this.projectsNavNodeService.getByNodeId(projectNode.id);
 
     if (!project?.canEditDataSources) {
@@ -378,4 +370,4 @@ export class ConnectionFoldersBootstrap extends Bootstrap {
       selectProject: false,
     };
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-connections/src/NavNodes/NAV_NODE_TYPE_CONNECTION.ts b/webapp/packages/plugin-connections/src/NavNodes/NAV_NODE_TYPE_CONNECTION.ts
index f1be784c1d..88a7ac870e 100644
--- a/webapp/packages/plugin-connections/src/NavNodes/NAV_NODE_TYPE_CONNECTION.ts
+++ b/webapp/packages/plugin-connections/src/NavNodes/NAV_NODE_TYPE_CONNECTION.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_TYPE_CONNECTION = 'Connection';
\ No newline at end of file
+export const NAV_NODE_TYPE_CONNECTION = 'Connection';
diff --git a/webapp/packages/plugin-connections/src/PluginBootstrap.ts b/webapp/packages/plugin-connections/src/PluginBootstrap.ts
index 8a9be6b993..2a6930a17c 100644
--- a/webapp/packages/plugin-connections/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,7 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void { }
+  register(): void {}
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-connections/src/PluginConnectionsSettingsService.ts b/webapp/packages/plugin-connections/src/PluginConnectionsSettingsService.ts
index f720cccdf8..e3abbafde3 100644
--- a/webapp/packages/plugin-connections/src/PluginConnectionsSettingsService.ts
+++ b/webapp/packages/plugin-connections/src/PluginConnectionsSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
index e88675b549..83a1a4f1a1 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
@@ -30,14 +29,16 @@ export const PublicConnectionForm: React.FC = observer(function PublicConnection
 
   return styled(styles)(
     <Loader loading={service.formState === null}>
-      {() => service.formState && (
-        <ConnectionFormLoader
-          // key={service.formState.id}
-          state={service.formState}
-          onSave={save}
-          onCancel={close}
-        />
-      )}
-    </Loader>
+      {() =>
+        service.formState && (
+          <ConnectionFormLoader
+            // key={service.formState.id}
+            state={service.formState}
+            onSave={save}
+            onCancel={close}
+          />
+        )
+      }
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
index 7cb588a2ad..bfb51e459e 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -41,24 +40,26 @@ export class PublicConnectionFormService {
     private readonly userInfoResource: UserInfoResource,
     private readonly authenticationService: AuthenticationService,
     private readonly projectsService: ProjectsService,
-    private readonly projectInfoResource: ProjectInfoResource
+    private readonly projectInfoResource: ProjectInfoResource,
   ) {
     this.formState = null;
     this.optionsPanelService.closeTask.addHandler(this.closeHandler);
     this.connectionInfoResource.onDataUpdate.addPostHandler(this.closeRemoved);
     this.connectionInfoResource.onItemDelete.addPostHandler(this.closeDeleted);
 
-    this.authenticationService.onLogin.addHandler(executorHandlerFilter(
-      () => !!this.formState && this.optionsPanelService.isOpen(formGetter),
-      async (event, context) => {
-        if (event === 'before' && this.userInfoResource.data === null) {
-          const confirmed = await this.showUnsavedChangesDialog();
-          if (!confirmed) {
-            ExecutorInterrupter.interrupt(context);
+    this.authenticationService.onLogin.addHandler(
+      executorHandlerFilter(
+        () => !!this.formState && this.optionsPanelService.isOpen(formGetter),
+        async (event, context) => {
+          if (event === 'before' && this.userInfoResource.data === null) {
+            const confirmed = await this.showUnsavedChangesDialog();
+            if (!confirmed) {
+              ExecutorInterrupter.interrupt(context);
+            }
           }
-        }
-      }
-    ));
+        },
+      ),
+    );
 
     makeObservable(this, {
       formState: observable.shallow,
@@ -78,17 +79,14 @@ export class PublicConnectionFormService {
         this.projectsService,
         this.projectInfoResource,
         this.connectionFormService,
-        this.connectionInfoResource
+        this.connectionInfoResource,
       );
 
       this.formState.closeTask.addHandler(this.close.bind(this, true));
     }
 
     this.formState
-      .setOptions(
-        config.connectionId ? 'edit' : 'create',
-        'public'
-      )
+      .setOptions(config.connectionId ? 'edit' : 'create', 'public')
       .setConfig(projectId, config)
       .setAvailableDrivers(availableDrivers || []);
 
@@ -124,14 +122,10 @@ export class PublicConnectionFormService {
   }
 
   async save(): Promise<void> {
-    const key = (
-      (this.formState && this.formState.config.connectionId && this.formState.projectId !== null)
-        ? createConnectionParam(
-          this.formState.projectId,
-          this.formState.config.connectionId
-        )
-        : null
-    );
+    const key =
+      this.formState && this.formState.config.connectionId && this.formState.projectId !== null
+        ? createConnectionParam(this.formState.projectId, this.formState.config.connectionId)
+        : null;
 
     await this.close(true);
 
@@ -145,10 +139,7 @@ export class PublicConnectionFormService {
       return;
     }
 
-    if (!this.connectionInfoResource.has(createConnectionParam(
-      this.formState.projectId,
-      this.formState.config.connectionId
-    ))) {
+    if (!this.connectionInfoResource.has(createConnectionParam(this.formState.projectId, this.formState.config.connectionId))) {
       this.close(true);
     }
   };
@@ -158,10 +149,7 @@ export class PublicConnectionFormService {
       return;
     }
 
-    if (this.connectionInfoResource.isIntersect(data, createConnectionParam(
-      this.formState.projectId,
-      this.formState.config.connectionId
-    ))) {
+    if (this.connectionInfoResource.isIntersect(data, createConnectionParam(this.formState.projectId, this.formState.config.connectionId))) {
       this.close(true);
     }
   };
@@ -176,16 +164,11 @@ export class PublicConnectionFormService {
 
   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
-        ))
-      )
+      !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;
     }
diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts
index 4e7896a98b..a0c038fc6c 100644
--- a/webapp/packages/plugin-connections/src/index.ts
+++ b/webapp/packages/plugin-connections/src/index.ts
@@ -1,4 +1,5 @@
 import { connectionPlugin } from './manifest';
+
 export * from './ConnectionAuthentication/IConnectionAuthenticationConfig';
 export * from './ConnectionAuthentication/ConnectionAuthenticationFormLoader';
 export * from './ConnectionForm/Options/ConnectionOptionsTabService';
diff --git a/webapp/packages/plugin-connections/src/locales/en.ts b/webapp/packages/plugin-connections/src/locales/en.ts
index 1db4772eed..63315370df 100644
--- a/webapp/packages/plugin-connections/src/locales/en.ts
+++ b/webapp/packages/plugin-connections/src/locales/en.ts
@@ -1,7 +1,7 @@
 export default [
   ['connections_public_connection_edit_menu_item_title', 'Edit Connection'],
   ['connections_public_connection_edit_cancel_title', 'Cancel confirmation'],
-  ['connections_public_connection_edit_cancel_message', 'You\'re going to cancel connection changes. Unsaved changes will be lost. Are you sure?'],
+  ['connections_public_connection_edit_cancel_message', "You're going to cancel connection changes. Unsaved changes will be lost. Are you sure?"],
   ['connections_public_connection_edit_reconnect_title', 'Connection updated'],
   ['connections_public_connection_edit_reconnect_message', 'Connection has been updated. Do you want to reconnect?'],
   ['connections_public_connection_edit_reconnect_failed', 'Failed to reconnect'],
@@ -10,8 +10,8 @@ export default [
   ['connections_public_connection_cloud_auth_required', 'You need to sign in with "{arg:providerLabel}" credentials to work with connection.'],
   ['plugin_connections_connection_form_project_invalid', 'You have no access to create connections in selected project'],
   ['plugin_connections_connection_form_host_configuration_invalid', 'Host configuration is not supported'],
-  ['plugin_connections_connection_form_name_invalid', 'Field \'Connection name\' can\'t be empty'],
-  ['plugin_connections_connection_form_host_invalid', 'Field \'Host\' can\'t be empty'],
+  ['plugin_connections_connection_form_name_invalid', "Field 'Connection name' can't be empty"],
+  ['plugin_connections_connection_form_host_invalid', "Field 'Host' can't be empty"],
   ['connections_public_connection_folder_delete_confirmation', 'You\'re going to delete "{arg:name}". Connections won\'t be deleted. Are you sure?'],
   ['plugin_connections_menu_connections_label', 'Connection'],
   ['plugin_connections_action_disconnect_all_label', 'Disconnect All'],
diff --git a/webapp/packages/plugin-connections/src/locales/it.ts b/webapp/packages/plugin-connections/src/locales/it.ts
index 71cc88536d..02ff569356 100644
--- a/webapp/packages/plugin-connections/src/locales/it.ts
+++ b/webapp/packages/plugin-connections/src/locales/it.ts
@@ -1,7 +1,10 @@
 export default [
   ['connections_public_connection_edit_menu_item_title', 'Modifica Connessione'],
-  ['connections_public_connection_edit_cancel_title', 'Conferma l\'annullamento'],
-  ['connections_public_connection_edit_cancel_message', 'Stai per annullare le modifiche alla connessione. Modifiche non salvate saranno perse. Sei sicuro?'],
+  ['connections_public_connection_edit_cancel_title', "Conferma l'annullamento"],
+  [
+    'connections_public_connection_edit_cancel_message',
+    'Stai per annullare le modifiche alla connessione. Modifiche non salvate saranno perse. Sei sicuro?',
+  ],
   ['connections_public_connection_edit_reconnect_title', 'Connection updated'],
   ['connections_public_connection_edit_reconnect_message', 'Connection has been updated. Do you want to reconnect?'],
   ['connections_public_connection_edit_reconnect_failed', 'Failed to reconnect'],
@@ -9,8 +12,8 @@ export default [
   ['connections_public_connection_folder_move_duplication', 'Target folder or selected folders contains folder with the same name ({arg:name})'],
   ['plugin_connections_connection_form_project_invalid', 'You have no access to create connections in selected project'],
   ['plugin_connections_connection_form_host_configuration_invalid', 'Host configuration is not supported'],
-  ['plugin_connections_connection_form_name_invalid', 'Field \'Connection name\' can\'t be empty'],
-  ['plugin_connections_connection_form_host_invalid', 'Field \'Host\' can\'t be empty'],
+  ['plugin_connections_connection_form_name_invalid', "Field 'Connection name' can't be empty"],
+  ['plugin_connections_connection_form_host_invalid', "Field 'Host' can't be empty"],
   ['connections_public_connection_folder_delete_confirmation', 'You\'re going to delete "{arg:name}". Connections won\'t be deleted. Are you sure?'],
   ['plugin_connections_menu_connections_label', 'Connessione'],
   ['plugin_connections_action_disconnect_all_label', 'Scollegati da tutto'],
diff --git a/webapp/packages/plugin-connections/src/locales/ru.ts b/webapp/packages/plugin-connections/src/locales/ru.ts
index 0db9b6c372..24a65239b4 100644
--- a/webapp/packages/plugin-connections/src/locales/ru.ts
+++ b/webapp/packages/plugin-connections/src/locales/ru.ts
@@ -9,8 +9,8 @@ export default [
   ['connections_public_connection_folder_move_duplication', 'Выбранные папки или папка назначения содержит папки с таким же названием ({arg:name})'],
   ['plugin_connections_connection_form_project_invalid', 'У вас нет разрешения создавать коннекшены в выбранном проекте'],
   ['plugin_connections_connection_form_host_configuration_invalid', 'Конфигурация хоста не поддерживается'],
-  ['plugin_connections_connection_form_name_invalid', 'Поле \'Название подключения\' не может быть пустым'],
-  ['plugin_connections_connection_form_host_invalid', 'Поле \'Хост\' не может быть пустым'],
+  ['plugin_connections_connection_form_name_invalid', "Поле 'Название подключения' не может быть пустым"],
+  ['plugin_connections_connection_form_host_invalid', "Поле 'Хост' не может быть пустым"],
   ['connections_public_connection_folder_delete_confirmation', 'Вы удаляете "{arg:name}". Подключения не будут удалены. Вы уверены?'],
   ['plugin_connections_menu_connections_label', 'Подключение'],
   ['plugin_connections_action_disconnect_all_label', 'Отключить все'],
diff --git a/webapp/packages/plugin-connections/src/locales/zh.ts b/webapp/packages/plugin-connections/src/locales/zh.ts
index 9dfe224c21..747bde2e20 100644
--- a/webapp/packages/plugin-connections/src/locales/zh.ts
+++ b/webapp/packages/plugin-connections/src/locales/zh.ts
@@ -9,8 +9,8 @@ export default [
   ['connections_public_connection_folder_move_duplication', 'Target folder or selected folders contains folder with the same name ({arg:name})'],
   ['plugin_connections_connection_form_project_invalid', 'You have no access to create connections in selected project'],
   ['plugin_connections_connection_form_host_configuration_invalid', 'Host configuration is not supported'],
-  ['plugin_connections_connection_form_name_invalid', 'Field \'Connection name\' can\'t be empty'],
-  ['plugin_connections_connection_form_host_invalid', 'Field \'Host\' can\'t be empty'],
+  ['plugin_connections_connection_form_name_invalid', "Field 'Connection name' can't be empty"],
+  ['plugin_connections_connection_form_host_invalid', "Field 'Host' can't be empty"],
   ['connections_public_connection_folder_delete_confirmation', 'You\'re going to delete "{arg:name}". Connections won\'t be deleted. Are you sure?'],
   ['plugin_connections_menu_connections_label', '连接'],
   ['plugin_connections_action_disconnect_all_label', '断开所有连接'],
diff --git a/webapp/packages/plugin-connections/src/manifest.ts b/webapp/packages/plugin-connections/src/manifest.ts
index 0ba8098438..0781bd406f 100644
--- a/webapp/packages/plugin-connections/src/manifest.ts
+++ b/webapp/packages/plugin-connections/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionAuthService } from './ConnectionAuthService';
diff --git a/webapp/packages/plugin-data-export/src/Bootstrap.ts b/webapp/packages/plugin-data-export/src/Bootstrap.ts
index ec170ec03f..182ca1ae8c 100644
--- a/webapp/packages/plugin-data-export/src/Bootstrap.ts
+++ b/webapp/packages/plugin-data-export/src/Bootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap as B, injectable } from '@cloudbeaver/core-di';
 
 import { DataExportMenuService } from './DataExportMenuService';
diff --git a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
index d21e29d10a..46bd3dd34e 100644
--- a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createConnectionParam } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
-import { IMenuContext, CommonDialogService } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService, IMenuContext } from '@cloudbeaver/core-dialogs';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
-import { ActionService, ACTION_EXPORT, DATA_CONTEXT_MENU_NESTED, MenuService } from '@cloudbeaver/core-view';
+import { ACTION_EXPORT, ActionService, DATA_CONTEXT_MENU_NESTED, MenuService } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_CONNECTION } from '@cloudbeaver/plugin-connections';
-import { TableFooterMenuService, ITableFooterMenuContext, IDatabaseDataSource, IDataContainerOptions } from '@cloudbeaver/plugin-data-viewer';
+import { IDatabaseDataSource, IDataContainerOptions, ITableFooterMenuContext, TableFooterMenuService } from '@cloudbeaver/plugin-data-viewer';
 import type { IDataQueryOptions } from '@cloudbeaver/plugin-sql-editor';
 
 import { DataExportSettingsService } from './DataExportSettingsService';
@@ -26,7 +25,7 @@ export class DataExportMenuService {
     private readonly dataExportSettingsService: DataExportSettingsService,
     private readonly actionService: ActionService,
     private readonly menuService: MenuService,
-  ) { }
+  ) {}
 
   register(): void {
     this.tableFooterMenuService.registerMenuItem({
@@ -40,9 +39,11 @@ export class DataExportMenuService {
       },
       isHidden: () => this.isDisabled(),
       isDisabled(context) {
-        return context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.getResult(context.data.resultIndex);
+        return (
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.getResult(context.data.resultIndex)
+        );
       },
       onClick: this.exportData.bind(this),
     });
@@ -55,25 +56,14 @@ export class DataExportMenuService {
           return false;
         }
 
-        return (
-          !this.isDisabled()
-          && context.has(DATA_CONTEXT_CONNECTION)
-          && !context.has(DATA_CONTEXT_MENU_NESTED)
-        );
+        return !this.isDisabled() && context.has(DATA_CONTEXT_CONNECTION) && !context.has(DATA_CONTEXT_MENU_NESTED);
       },
-      getItems: (context, items) => [
-        ...items,
-        ACTION_EXPORT,
-      ],
+      getItems: (context, items) => [...items, ACTION_EXPORT],
     });
 
     this.actionService.addHandler({
       id: 'data-export',
-      isActionApplicable: (context, action) => (
-        action === ACTION_EXPORT
-        && context.has(DATA_CONTEXT_CONNECTION)
-        && context.has(DATA_CONTEXT_NAV_NODE)
-      ),
+      isActionApplicable: (context, action) => action === ACTION_EXPORT && context.has(DATA_CONTEXT_CONNECTION) && context.has(DATA_CONTEXT_NAV_NODE),
       handler: async (context, action) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE);
         const connection = context.get(DATA_CONTEXT_CONNECTION);
diff --git a/webapp/packages/plugin-data-export/src/DataExportProcessService.ts b/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
index 41b42ddc9c..9d05adf8e5 100644
--- a/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { GraphQLService, DataTransferParameters } from '@cloudbeaver/core-sdk';
+import { DataTransferParameters, GraphQLService } from '@cloudbeaver/core-sdk';
 import { Deferred, GlobalConstants, OrderedMap } from '@cloudbeaver/core-utils';
 
 import { ExportFromContainerProcess } from './ExportFromContainerProcess';
@@ -32,10 +31,7 @@ export interface ExportProcess {
 export class DataExportProcessService {
   readonly exportProcesses = new OrderedMap<string, ExportProcess>(value => value.taskId);
 
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    private readonly notificationService: NotificationService
-  ) { }
+  constructor(private readonly graphQLService: GraphQLService, private readonly notificationService: NotificationService) {}
 
   async cancel(exportId: string): Promise<void> {
     const process = this.exportProcesses.get(exportId);
@@ -86,10 +82,7 @@ export class DataExportProcessService {
     return GlobalConstants.absoluteServiceUrl('/data/', dataFileId);
   }
 
-  async exportData(
-    context: IExportContext,
-    parameters: DataTransferParameters
-  ): Promise<string> {
+  async exportData(context: IExportContext, parameters: DataTransferParameters): Promise<string> {
     let process: Process | undefined;
 
     if (context.contextId && context.resultId) {
@@ -114,7 +107,7 @@ export class DataExportProcessService {
   private async exportFromContainer(
     connectionKey: IConnectionInfoParams,
     containerNodePath: string,
-    parameters: DataTransferParameters
+    parameters: DataTransferParameters,
   ): Promise<Process> {
     const process = new ExportFromContainerProcess(this.graphQLService, this.notificationService);
     const taskId = await process.start(connectionKey, containerNodePath, parameters);
@@ -125,7 +118,7 @@ export class DataExportProcessService {
     connectionKey: IConnectionInfoParams,
     contextId: string,
     resultsId: string,
-    parameters: DataTransferParameters
+    parameters: DataTransferParameters,
   ): Promise<Process> {
     const process = new ExportFromResultsProcess(this.graphQLService, this.notificationService);
     const taskId = await process.start(connectionKey, contextId, resultsId, parameters);
diff --git a/webapp/packages/plugin-data-export/src/DataExportService.ts b/webapp/packages/plugin-data-export/src/DataExportService.ts
index 8a928729a4..820a55ed0f 100644
--- a/webapp/packages/plugin-data-export/src/DataExportService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { DataTransferParameters } from '@cloudbeaver/core-sdk';
@@ -20,8 +19,8 @@ export class DataExportService {
   constructor(
     private readonly notificationService: NotificationService,
     private readonly dataExportProcessService: DataExportProcessService,
-    readonly processors: DataTransferProcessorsResource
-  ) { }
+    readonly processors: DataTransferProcessorsResource,
+  ) {}
 
   async cancel(exportId: string): Promise<void> {
     await this.dataExportProcessService.cancel(exportId);
@@ -35,14 +34,8 @@ export class DataExportService {
     this.dataExportProcessService.download(exportId);
   }
 
-  async exportData(
-    context: IExportContext,
-    parameters: DataTransferParameters
-  ): Promise<string> {
-    const taskId = await this.dataExportProcessService.exportData(
-      context,
-      parameters
-    );
+  async exportData(context: IExportContext, parameters: DataTransferParameters): Promise<string> {
+    const taskId = await this.dataExportProcessService.exportData(context, parameters);
 
     this.notificationService.customNotification(() => ExportNotification, { source: taskId });
     return taskId;
diff --git a/webapp/packages/plugin-data-export/src/DataExportSettingsService.test.ts b/webapp/packages/plugin-data-export/src/DataExportSettingsService.test.ts
index b68f45dab5..d55ff10f6a 100644
--- a/webapp/packages/plugin-data-export/src/DataExportSettingsService.test.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -25,19 +24,9 @@ import { DataExportSettings, DataExportSettingsService } from './DataExportSetti
 import { manifest } from './manifest';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  datasourceContextSwitch,
-  navigationTree,
-  navigationTabs,
-  objectViewer,
-  dataViewer,
-  manifest
-);
+const app = createApp(datasourceContextSwitch, navigationTree, navigationTabs, objectViewer, dataViewer, manifest);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -70,9 +59,7 @@ test('New settings equal deprecated settings A', async () => {
   const settings = app.injector.getServiceByClass(DataExportSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigA)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigA)));
 
   await config.refresh();
 
@@ -84,12 +71,10 @@ test('New settings equal deprecated settings B', async () => {
   const settings = app.injector.getServiceByClass(DataExportSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigB)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigB)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('disabled')).toBe(testValueB);
   expect(settings.deprecatedSettings.getValue('disabled')).toBe(testValueB);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-export/src/DataExportSettingsService.ts b/webapp/packages/plugin-data-export/src/DataExportSettingsService.ts
index be64cfbf79..6c1a84599b 100644
--- a/webapp/packages/plugin-data-export/src/DataExportSettingsService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
index 1901159fbc..6f970abf15 100644
--- a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
+++ b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
@@ -5,19 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedMapResource, DataTransferProcessorInfo, resourceKeyList, CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import { CachedMapAllKey, CachedMapResource, DataTransferProcessorInfo, GraphQLService, resourceKeyList } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class DataTransferProcessorsResource extends CachedMapResource<string, DataTransferProcessorInfo> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    serverConfigResource: ServerConfigResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, serverConfigResource: ServerConfigResource) {
     super(() => new Map());
-    this.sync(serverConfigResource, () => {}, () => CachedMapAllKey);
+    this.sync(
+      serverConfigResource,
+      () => {},
+      () => CachedMapAllKey,
+    );
   }
 
   protected async loader(): Promise<Map<string, DataTransferProcessorInfo>> {
diff --git a/webapp/packages/plugin-data-export/src/Dialog/DataExportController.ts b/webapp/packages/plugin-data-export/src/Dialog/DataExportController.ts
index 24116f2e5a..1dda3d5148 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/DataExportController.ts
+++ b/webapp/packages/plugin-data-export/src/Dialog/DataExportController.ts
@@ -5,15 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import type { IProperty } from '@cloudbeaver/core-blocks';
-import { injectable, IInitializableController, IDestructibleController } from '@cloudbeaver/core-di';
+import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
-import { DataTransferOutputSettings, DataTransferProcessorInfo, GQLErrorCatcher, ObjectPropertyInfo, ObjectPropertyLength } from '@cloudbeaver/core-sdk';
+import {
+  DataTransferOutputSettings,
+  DataTransferProcessorInfo,
+  GQLErrorCatcher,
+  ObjectPropertyInfo,
+  ObjectPropertyLength,
+} from '@cloudbeaver/core-sdk';
 
 import { DataExportService } from '../DataExportService';
 import type { IExportContext } from '../IExportContext';
@@ -21,7 +26,7 @@ import { DefaultExportOutputSettingsResource } from './DefaultExportOutputSettin
 
 export enum DataExportStep {
   DataTransferProcessor,
-  Configure
+  Configure,
 }
 
 @injectable()
@@ -35,11 +40,7 @@ export class DataExportController implements IInitializableController, IDestruct
   processor: DataTransferProcessorInfo | null = null;
 
   get processors(): DataTransferProcessorInfo[] {
-    return Array
-      .from(
-        this.dataExportService.processors.data.values()
-      )
-      .sort(sortProcessors);
+    return Array.from(this.dataExportService.processors.data.values()).sort(sortProcessors);
   }
 
   processorProperties: any = {};
@@ -88,19 +89,16 @@ export class DataExportController implements IInitializableController, IDestruct
     this.isExporting = true;
 
     try {
-      await this.dataExportService.exportData(
-        this.context,
-        {
-          processorId: this.processor.id,
-          processorProperties: this.processorProperties,
-          filter: this.context.filter,
-          outputSettings: this.outputSettings,
-        }
-      );
+      await this.dataExportService.exportData(this.context, {
+        processorId: this.processor.id,
+        processorProperties: this.processorProperties,
+        filter: this.context.filter,
+        outputSettings: this.outputSettings,
+      });
       this.close();
     } catch (exception: any) {
       if (!this.error.catch(exception) || this.isDistructed) {
-        this.notificationService.logException(exception, 'Can\'t export');
+        this.notificationService.logException(exception, "Can't export");
       }
     } finally {
       this.isExporting = false;
@@ -113,20 +111,18 @@ export class DataExportController implements IInitializableController, IDestruct
   };
 
   selectProcessor = (processorId: string) => {
-    this.processor = this.dataExportService
-      .processors
-      .data
-      .get(processorId)!;
+    this.processor = this.dataExportService.processors.data.get(processorId)!;
 
-    this.properties = this.processor.properties?.map<IProperty>(property => ({
-      id: property.id!,
-      key: property.id!,
-      displayName: property.displayName,
-      description: property.description,
-      validValues: property.validValues,
-      defaultValue: property.defaultValue,
-      valuePlaceholder: property.defaultValue,
-    })) || [];
+    this.properties =
+      this.processor.properties?.map<IProperty>(property => ({
+        id: property.id!,
+        key: property.id!,
+        displayName: property.displayName,
+        description: property.description,
+        validValues: property.validValues,
+        defaultValue: property.defaultValue,
+        valuePlaceholder: property.defaultValue,
+      })) || [];
 
     this.processorProperties = {};
 
@@ -144,7 +140,7 @@ export class DataExportController implements IInitializableController, IDestruct
     try {
       await this.dataExportService.processors.load();
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load data export processors');
+      this.notificationService.logException(exception, "Can't load data export processors");
     }
   }
 
@@ -155,14 +151,14 @@ export class DataExportController implements IInitializableController, IDestruct
         Object.assign(this.outputSettings, data.outputSettings);
       }
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load output settings');
+      this.notificationService.logException(exception, "Can't load output settings");
     }
   }
 }
 
 function sortProcessors(processorA: DataTransferProcessorInfo, processorB: DataTransferProcessorInfo): number {
   if (processorA.order === processorB.order) {
-    return (processorA.name || '').localeCompare((processorB.name || ''));
+    return (processorA.name || '').localeCompare(processorB.name || '');
   }
 
   return processorA.order - processorB.order;
diff --git a/webapp/packages/plugin-data-export/src/Dialog/DataExportDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/DataExportDialog.tsx
index cb1a618d56..4283b7d21d 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/DataExportDialog.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/DataExportDialog.tsx
@@ -5,7 +5,6 @@
  * 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 { useController } from '@cloudbeaver/core-di';
@@ -16,10 +15,7 @@ import { DataExportController, DataExportStep } from './DataExportController';
 import { ProcessorConfigureDialog } from './ProcessorConfigureDialog';
 import { ProcessorSelectDialog } from './ProcessorSelectDialog';
 
-export const DataExportDialog: DialogComponent<IExportContext> = observer(function DataExportDialog({
-  payload,
-  rejectDialog,
-}) {
+export const DataExportDialog: DialogComponent<IExportContext> = observer(function DataExportDialog({ payload, rejectDialog }) {
   const controller = useController(DataExportController, payload, rejectDialog);
 
   if (controller.step === DataExportStep.Configure && controller.processor) {
diff --git a/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts b/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts
index e704308216..3cf66d1835 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts
+++ b/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts
@@ -5,18 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import {
-  GraphQLService,
-  CachedDataResource,
-  DataTransferDefaultExportSettings
-} from '@cloudbeaver/core-sdk';
+import { CachedDataResource, DataTransferDefaultExportSettings, GraphQLService } from '@cloudbeaver/core-sdk';
 
 @injectable()
-export class DefaultExportOutputSettingsResource
-  extends CachedDataResource<DataTransferDefaultExportSettings | null> {
-
+export class DefaultExportOutputSettingsResource extends CachedDataResource<DataTransferDefaultExportSettings | null> {
   constructor(private readonly graphQLService: GraphQLService) {
     super(() => null);
   }
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx
index d853c5f39b..54d859e9ed 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx
@@ -5,7 +5,6 @@
  * 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 { ItemList } from '@cloudbeaver/core-blocks';
@@ -19,14 +18,12 @@ interface Props {
   className?: string;
 }
 
-export const ExportProcessorList = observer<Props>(function ExportProcessorList({
-  processors,
-  onSelect,
-  className,
-}) {
+export const ExportProcessorList = observer<Props>(function ExportProcessorList({ processors, onSelect, className }) {
   return (
     <ItemList className={className}>
-      {processors.map(processor => <ProcessorItem key={processor.id} processor={processor} onSelect={onSelect} />)}
+      {processors.map(processor => (
+        <ProcessorItem key={processor.id} processor={processor} onSelect={onSelect} />
+      ))}
     </ItemList>
   );
 });
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
index 83efffaabc..37bd33c79c 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
@@ -5,14 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import {
-  ListItem, ListItemIcon, StaticImage, ListItemName, ListItemDescription
-} from '@cloudbeaver/core-blocks';
+import { ListItem, ListItemDescription, ListItemIcon, ListItemName, StaticImage } from '@cloudbeaver/core-blocks';
 import type { DataTransferProcessorInfo } from '@cloudbeaver/core-sdk';
 
 interface Props {
@@ -21,24 +18,23 @@ interface Props {
 }
 
 const styles = css`
-    StaticImage {
-      box-sizing: border-box;
-      width: 24px;
-      max-height: 24px;
-    }
-  `;
+  StaticImage {
+    box-sizing: border-box;
+    width: 24px;
+    max-height: 24px;
+  }
+`;
 
-export const ProcessorItem = observer<Props>(function ProcessorItem({
-  processor,
-  onSelect,
-}) {
+export const ProcessorItem = observer<Props>(function ProcessorItem({ processor, onSelect }) {
   const select = useCallback(() => onSelect(processor.id), [processor]);
 
   return styled(styles)(
     <ListItem onClick={select}>
-      <ListItemIcon><StaticImage icon={processor.icon} /></ListItemIcon>
+      <ListItemIcon>
+        <StaticImage icon={processor.icon} />
+      </ListItemIcon>
       <ListItemName>{processor.name}</ListItemName>
       <ListItemDescription title={processor.description}>{processor.description}</ListItemDescription>
-    </ListItem>
+    </ListItem>,
   );
 });
diff --git a/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx b/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx
index 35779349f1..48c7174933 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx
@@ -26,7 +26,7 @@ const styles = css`
 
   FieldCheckbox {
     margin-bottom: 6px;
-    margin-left: 24px
+    margin-left: 24px;
   }
 `;
 
@@ -48,21 +48,13 @@ export const OutputOptionsForm = observer(function OutputOptionsForm(props: Prop
 
         return styled(styles)(
           <root>
-            <Combobox
-              name="encoding"
-              state={props.outputSettings}
-              items={data.supportedEncodings}
-              searchable
-            >
-                Encoding
+            <Combobox name="encoding" state={props.outputSettings} items={data.supportedEncodings} searchable>
+              Encoding
             </Combobox>
-            <FieldCheckbox
-              name="insertBom"
-              state={props.outputSettings}
-            >
-                Insert BOM
+            <FieldCheckbox name="insertBom" state={props.outputSettings}>
+              Insert BOM
             </FieldCheckbox>
-          </root>
+          </root>,
         );
       }}
     </Loader>
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
index 0e7dfa4fd7..05cdd7a521 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
@@ -9,7 +9,7 @@ import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { IProperty, PropertiesTable, ErrorMessage, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { ErrorMessage, IProperty, PropertiesTable, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper } from '@cloudbeaver/core-dialogs';
 import type { DataTransferOutputSettings, DataTransferProcessorInfo, GQLErrorCatcher } from '@cloudbeaver/core-sdk';
 import { ITabData, Tab, TabList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
@@ -18,32 +18,32 @@ import { OutputOptionsForm } from './OutputOptionsForm';
 import { ProcessorConfigureDialogFooter } from './ProcessorConfigureDialogFooter';
 
 const styles = css`
-    Tab {
-      composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
-    }
-    PropertiesTable {
-      flex: 1;
-      overflow: hidden;
-      padding: 12px 0;
-    }
-    message {
-      margin: auto;
-    }
-    ErrorMessage {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      position: sticky;
-      bottom: 0;
-      padding: 8px 24px;
-    }
+  Tab {
+    composes: theme-ripple theme-background-secondary theme-text-on-secondary from global;
+  }
+  PropertiesTable {
+    flex: 1;
+    overflow: hidden;
+    padding: 12px 0;
+  }
+  message {
+    margin: auto;
+  }
+  ErrorMessage {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    position: sticky;
+    bottom: 0;
+    padding: 8px 24px;
+  }
 
-    TabList {
-      margin: 0 10px;
-    }
+  TabList {
+    margin: 0 10px;
+  }
 
-    ObjectPropertyInfoForm {
-      margin: 12px 0;
-    }
-  `;
+  ObjectPropertyInfoForm {
+    margin: 12px 0;
+  }
+`;
 
 interface Props {
   processor: DataTransferProcessorInfo;
@@ -96,12 +96,12 @@ export const ProcessorConfigureDialog = observer<Props>(function ProcessorConfig
   }
 
   return styled(useStyles(UNDERLINE_TAB_STYLES, styles))(
-    <CommonDialogWrapper size='large' fixedSize>
+    <CommonDialogWrapper size="large" fixedSize>
       <CommonDialogHeader title={title} onReject={onClose} />
       <CommonDialogBody noOverflow noBodyPadding>
         {!processor.isBinary ? (
           <TabsState currentTabId={currentTabId} onChange={handleTabChange}>
-            <TabList aria-label='Export Settings tabs'>
+            <TabList aria-label="Export Settings tabs">
               <Tab tabId={SETTINGS_TABS.EXTRACTION} style={UNDERLINE_TAB_STYLES}>
                 {translate('data_transfer_format_settings')}
               </Tab>
@@ -112,21 +112,12 @@ export const ProcessorConfigureDialog = observer<Props>(function ProcessorConfig
           </TabsState>
         ) : null}
         {currentTabId === SETTINGS_TABS.EXTRACTION ? (
-          <PropertiesTable
-            properties={properties}
-            propertiesState={processorProperties}
-          />
+          <PropertiesTable properties={properties} propertiesState={processorProperties} />
         ) : (
           <OutputOptionsForm outputSettings={outputSettings} />
         )}
 
-        {error.responseMessage && (
-          <ErrorMessage
-            text={error.responseMessage}
-            hasDetails={error.hasDetails}
-            onShowDetails={onShowDetails}
-          />
-        )}
+        {error.responseMessage && <ErrorMessage text={error.responseMessage} hasDetails={error.hasDetails} onShowDetails={onShowDetails} />}
       </CommonDialogBody>
       <CommonDialogFooter>
         <ProcessorConfigureDialogFooter
@@ -138,6 +129,6 @@ export const ProcessorConfigureDialog = observer<Props>(function ProcessorConfig
           onNext={handleNextClick}
         />
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx
index 996531360f..3d3785e99f 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx
@@ -5,13 +5,11 @@
  * 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 { Button, useTranslate } from '@cloudbeaver/core-blocks';
 
-
 const styles = css`
   controls {
     display: flex;
@@ -51,43 +49,22 @@ export const ProcessorConfigureDialogFooter = observer<Props>(function Processor
 
   return styled(styles)(
     <controls as="div">
-      <Button
-        type="button"
-        mod={['outlined']}
-        disabled={isExporting}
-        onClick={onBack}
-      >
+      <Button type="button" mod={['outlined']} disabled={isExporting} onClick={onBack}>
         {translate('ui_stepper_back')}
       </Button>
       <fill as="div" />
-      <Button
-        type="button"
-        mod={['outlined']}
-        disabled={isExporting}
-        onClick={onCancel}
-      >
+      <Button type="button" mod={['outlined']} disabled={isExporting} onClick={onCancel}>
         {translate('ui_processing_cancel')}
       </Button>
       {isFinalStep ? (
-        <Button
-          type="button"
-          mod={['unelevated']}
-          disabled={isExporting}
-          onClick={onExport}
-        >
+        <Button type="button" mod={['unelevated']} disabled={isExporting} onClick={onExport}>
           {translate('data_transfer_dialog_export')}
         </Button>
       ) : (
-        <Button
-          type="button"
-          mod={['unelevated']}
-          disabled={isExporting}
-          onClick={onNext}
-        >
+        <Button type="button" mod={['unelevated']} disabled={isExporting} onClick={onNext}>
           {translate('ui_stepper_next')}
         </Button>
       )}
-    </controls>
+    </controls>,
   );
-}
-);
+});
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx
index 3ac8ea53b3..42cd4ffcb2 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -49,22 +48,13 @@ interface Props {
   onClose: () => void;
 }
 
-export const ProcessorSelectDialog = observer<Props>(function ProcessorSelectDialog({
-  context,
-  processors,
-  isLoading,
-  onSelect,
-  onClose,
-}) {
+export const ProcessorSelectDialog = observer<Props>(function ProcessorSelectDialog({ context, processors, isLoading, onSelect, onClose }) {
   const translate = useTranslate();
   const { node } = useNode(context.containerNodePath || '');
 
   return styled(styles)(
-    <CommonDialogWrapper size='large' fixedSize>
-      <CommonDialogHeader
-        title="data_transfer_dialog_title"
-        onReject={onClose}
-      />
+    <CommonDialogWrapper size="large" fixedSize>
+      <CommonDialogHeader title="data_transfer_dialog_title" onReject={onClose} />
       <CommonDialogBody noBodyPadding noOverflow>
         <export-object>
           {!context.sourceName && `${translate('data_transfer_exporting_table')} ${node?.name}`}
@@ -73,7 +63,6 @@ export const ProcessorSelectDialog = observer<Props>(function ProcessorSelectDia
         {isLoading && <Loader />}
         {!isLoading && <ExportProcessorList processors={processors} onSelect={onSelect} />}
       </CommonDialogBody>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-}
-);
+});
diff --git a/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts b/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
index e22924939d..b80333445f 100644
--- a/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
+++ b/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
@@ -5,15 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import type { NotificationService } from '@cloudbeaver/core-events';
-import {
-  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters
-} from '@cloudbeaver/core-sdk';
-import {
-  CancellablePromise, cancellableTimeout, Deferred, EDeferredState
-} from '@cloudbeaver/core-utils';
+import { AsyncTaskInfo, DataTransferParameters, GraphQLService, ServerInternalError } from '@cloudbeaver/core-sdk';
+import { CancellablePromise, cancellableTimeout, Deferred, EDeferredState } from '@cloudbeaver/core-utils';
 
 const DELAY_BETWEEN_TRIES = 1000;
 
@@ -23,16 +18,11 @@ export class ExportFromContainerProcess extends Deferred<string> {
   private timeout?: CancellablePromise<void>;
   private isCancelConfirmed = false; // true when server successfully executed cancelQueryAsync
 
-  constructor(private readonly graphQLService: GraphQLService,
-    private readonly notificationService: NotificationService) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly notificationService: NotificationService) {
     super();
   }
 
-  async start(
-    connectionKey: IConnectionInfoParams,
-    containerNodePath: string,
-    parameters: DataTransferParameters
-  ): Promise<string> {
+  async start(connectionKey: IConnectionInfoParams, containerNodePath: string, parameters: DataTransferParameters): Promise<string> {
     // start async task
     try {
       const { taskInfo } = await this.graphQLService.sdk.exportDataFromContainer({
@@ -96,7 +86,7 @@ export class ExportFromContainerProcess extends Deferred<string> {
       try {
         this.timeout = cancellableTimeout(DELAY_BETWEEN_TRIES);
         await this.timeout;
-      } catch { }
+      } catch {}
     }
   }
 
diff --git a/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts b/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
index 474f550609..7d8ae9bca5 100644
--- a/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
+++ b/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
@@ -5,15 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import type { NotificationService } from '@cloudbeaver/core-events';
-import {
-  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters
-} from '@cloudbeaver/core-sdk';
-import {
-  CancellablePromise, cancellableTimeout, Deferred, EDeferredState
-} from '@cloudbeaver/core-utils';
+import { AsyncTaskInfo, DataTransferParameters, GraphQLService, ServerInternalError } from '@cloudbeaver/core-sdk';
+import { CancellablePromise, cancellableTimeout, Deferred, EDeferredState } from '@cloudbeaver/core-utils';
 
 const DELAY_BETWEEN_TRIES = 1000;
 
@@ -23,17 +18,11 @@ export class ExportFromResultsProcess extends Deferred<string> {
   private timeout?: CancellablePromise<void>;
   private isCancelConfirmed = false; // true when server successfully executed cancelQueryAsync
 
-  constructor(private readonly graphQLService: GraphQLService,
-    private readonly notificationService: NotificationService) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly notificationService: NotificationService) {
     super();
   }
 
-  async start(
-    connectionKey: IConnectionInfoParams,
-    contextId: string,
-    resultsId: string,
-    parameters: DataTransferParameters
-  ): Promise<string> {
+  async start(connectionKey: IConnectionInfoParams, contextId: string, resultsId: string, parameters: DataTransferParameters): Promise<string> {
     // start async task
     try {
       const { taskInfo } = await this.graphQLService.sdk.exportDataFromResults({
@@ -98,7 +87,7 @@ export class ExportFromResultsProcess extends Deferred<string> {
       try {
         this.timeout = cancellableTimeout(DELAY_BETWEEN_TRIES);
         await this.timeout;
-      } catch { }
+      } catch {}
     }
   }
 
diff --git a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx
index e44e8599e2..62282b0b31 100644
--- a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx
+++ b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx
@@ -5,13 +5,10 @@
  * 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 {
-  Button, SnackbarWrapper, SnackbarStatus, SnackbarContent, SnackbarBody, SnackbarFooter, useTranslate
-} from '@cloudbeaver/core-blocks';
+import { Button, SnackbarBody, SnackbarContent, SnackbarFooter, SnackbarStatus, SnackbarWrapper, useTranslate } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 import { ENotificationType, NotificationComponentProps } from '@cloudbeaver/core-events';
 import { EDeferredState } from '@cloudbeaver/core-utils';
@@ -45,9 +42,7 @@ type Props = NotificationComponentProps<{
   source: string;
 }>;
 
-export const ExportNotification = observer<Props>(function ExportNotification({
-  notification,
-}) {
+export const ExportNotification = observer<Props>(function ExportNotification({ notification }) {
   const controller = useController(ExportNotificationController, notification);
   const translate = useTranslate();
   const { title, status, message } = controller.status;
@@ -60,41 +55,22 @@ export const ExportNotification = observer<Props>(function ExportNotification({
           {message && <message>{message}</message>}
           <source-name>
             {controller.sourceName}
-            {controller.task?.context.sourceName && (
-              <pre title={controller.task.context.sourceName}>
-                {controller.task.context.sourceName}
-              </pre>
-            )}
+            {controller.task?.context.sourceName && <pre title={controller.task.context.sourceName}>{controller.task.context.sourceName}</pre>}
           </source-name>
         </SnackbarBody>
         <SnackbarFooter timestamp={notification.timestamp}>
           {status === ENotificationType.Info && controller.downloadUrl && (
             <>
-              <Button
-                type="button"
-                mod={['outlined']}
-                onClick={controller.delete}
-              >
+              <Button type="button" mod={['outlined']} onClick={controller.delete}>
                 {translate('data_transfer_notification_delete')}
               </Button>
-              <Button
-                tag='a'
-                href={controller.downloadUrl}
-                mod={['unelevated']}
-                download
-                onClick={controller.download}
-              >
+              <Button tag="a" href={controller.downloadUrl} mod={['unelevated']} download onClick={controller.download}>
                 {translate('data_transfer_notification_download')}
               </Button>
             </>
           )}
           {status === ENotificationType.Error && (
-            <Button
-              type="button"
-              mod={['outlined']}
-              disabled={controller.isDetailsDialogOpen}
-              onClick={controller.showDetails}
-            >
+            <Button type="button" mod={['outlined']} disabled={controller.isDetailsDialogOpen} onClick={controller.showDetails}>
               {translate('ui_errors_details')}
             </Button>
           )}
@@ -110,7 +86,6 @@ export const ExportNotification = observer<Props>(function ExportNotification({
           )}
         </SnackbarFooter>
       </SnackbarContent>
-    </SnackbarWrapper>
-
+    </SnackbarWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
index 9b338a6713..84aa293b06 100644
--- a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
+++ b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, makeObservable } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { IInitializableController, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
@@ -14,7 +13,7 @@ import { ENotificationType, INotification } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
-import { ServerInternalError, ServerErrorType } from '@cloudbeaver/core-sdk';
+import { ServerErrorType, ServerInternalError } from '@cloudbeaver/core-sdk';
 import { Deferred, EDeferredState, errorOf } from '@cloudbeaver/core-utils';
 
 import { DataExportProcessService, ExportProcess } from '../DataExportProcessService';
@@ -100,7 +99,7 @@ export class ExportNotificationController implements IInitializableController {
     private readonly commonDialogService: CommonDialogService,
     private readonly dataExportProcessService: DataExportProcessService,
     private readonly navNodeManagerService: NavNodeManagerService,
-    private readonly localization: LocalizationService
+    private readonly localization: LocalizationService,
   ) {
     makeObservable(this, {
       isDetailsDialogOpen: observable,
diff --git a/webapp/packages/plugin-data-export/src/IExportContext.ts b/webapp/packages/plugin-data-export/src/IExportContext.ts
index 63a1b5f89f..7714e63181 100644
--- a/webapp/packages/plugin-data-export/src/IExportContext.ts
+++ b/webapp/packages/plugin-data-export/src/IExportContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import type { SqlDataFilter } from '@cloudbeaver/core-sdk';
 
diff --git a/webapp/packages/plugin-data-export/src/LocaleService.ts b/webapp/packages/plugin-data-export/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-data-export/src/LocaleService.ts
+++ b/webapp/packages/plugin-data-export/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-data-export/src/locales/it.ts b/webapp/packages/plugin-data-export/src/locales/it.ts
index d8b070f865..c53e827cc2 100644
--- a/webapp/packages/plugin-data-export/src/locales/it.ts
+++ b/webapp/packages/plugin-data-export/src/locales/it.ts
@@ -3,7 +3,7 @@ export default [
   ['data_transfer_dialog_export', 'Esporta'],
   ['data_transfer_dialog_export_tooltip', 'Esporta i risultati in un file'],
   ['data_transfer_dialog_configuration_title', 'Esporta la configurazione'],
-  ['data_transfer_dialog_preparation', 'Sto preparando l\'esportazione in un file. Attendi...'],
+  ['data_transfer_dialog_preparation', "Sto preparando l'esportazione in un file. Attendi..."],
   ['data_transfer_notification_preparation', 'Sto preparando il download del tuo file. Attendi...'],
   ['data_transfer_notification_ready', 'Il file è pronto per il download'],
   ['data_transfer_notification_error', 'Preparazione fallita o annullata'],
diff --git a/webapp/packages/plugin-data-export/src/locales/zh.ts b/webapp/packages/plugin-data-export/src/locales/zh.ts
index 2758b522fb..045bc97bca 100644
--- a/webapp/packages/plugin-data-export/src/locales/zh.ts
+++ b/webapp/packages/plugin-data-export/src/locales/zh.ts
@@ -1,15 +1,15 @@
 export default [
-    ['data_transfer_dialog_title', '导出数据'],
-    ['data_transfer_dialog_export', '导出'],
-    ['data_transfer_dialog_export_tooltip', '将结果集导出为文件'],
-    ['data_transfer_dialog_configuration_title', '导出配置'],
-    ['data_transfer_dialog_preparation', '我们准备您的文件以供导出。请稍等...'],
-    ['data_transfer_notification_preparation', '我们准备您的文件以供下载。请稍等...'],
-    ['data_transfer_notification_ready', '文件已经准备好下载'],
-    ['data_transfer_notification_error', '数据导出失败'],
-    ['data_transfer_notification_cancelled', '数据导出已取消'],
-    ['data_transfer_notification_download', '下载'],
-    ['data_transfer_notification_delete', '删除'],
-    ['data_transfer_exporting_table', '表：'],
-    ['data_transfer_exporting_sql', 'SQL：'],
-  ];
+  ['data_transfer_dialog_title', '导出数据'],
+  ['data_transfer_dialog_export', '导出'],
+  ['data_transfer_dialog_export_tooltip', '将结果集导出为文件'],
+  ['data_transfer_dialog_configuration_title', '导出配置'],
+  ['data_transfer_dialog_preparation', '我们准备您的文件以供导出。请稍等...'],
+  ['data_transfer_notification_preparation', '我们准备您的文件以供下载。请稍等...'],
+  ['data_transfer_notification_ready', '文件已经准备好下载'],
+  ['data_transfer_notification_error', '数据导出失败'],
+  ['data_transfer_notification_cancelled', '数据导出已取消'],
+  ['data_transfer_notification_download', '下载'],
+  ['data_transfer_notification_delete', '删除'],
+  ['data_transfer_exporting_table', '表：'],
+  ['data_transfer_exporting_sql', 'SQL：'],
+];
diff --git a/webapp/packages/plugin-data-export/src/manifest.ts b/webapp/packages/plugin-data-export/src/manifest.ts
index 0eefc82705..0841f74ce2 100644
--- a/webapp/packages/plugin-data-export/src/manifest.ts
+++ b/webapp/packages/plugin-data-export/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { Bootstrap } from './Bootstrap';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
index 4a4306078d..b06883984b 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef, useContext, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
@@ -44,113 +43,111 @@ export interface IEditorRef {
 
 const lockNavigation = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Home', 'End', 'Enter'];
 
-export const CellEditor = observer<Pick<EditorProps<IResultSetRowKey>, 'row' | 'column' | 'onClose'>, IEditorRef>(forwardRef(function CellEditor({
-  row,
-  column,
-  onClose,
-}, ref) {
-  const dataGridContext = useContext(DataGridContext);
-  const tableDataContext = useContext(TableDataContext);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const [elementRef, setElementRef] = useState<HTMLDivElement | null>(null);
-  const [popperRef, setPopperRef] = useState<HTMLDivElement | null>(null);
-  const popper = usePopper(elementRef, popperRef, {
-    placement: 'right',
-    modifiers: [
-      { name: 'flip', enabled: false },
-    ],
-  });
+export const CellEditor = observer<Pick<EditorProps<IResultSetRowKey>, 'row' | 'column' | 'onClose'>, IEditorRef>(
+  forwardRef(function CellEditor({ row, column, onClose }, ref) {
+    const dataGridContext = useContext(DataGridContext);
+    const tableDataContext = useContext(TableDataContext);
+    const inputRef = useRef<HTMLInputElement>(null);
+    const [elementRef, setElementRef] = useState<HTMLDivElement | null>(null);
+    const [popperRef, setPopperRef] = useState<HTMLDivElement | null>(null);
+    const popper = usePopper(elementRef, popperRef, {
+      placement: 'right',
+      modifiers: [{ name: 'flip', enabled: false }],
+    });
 
-  if (!dataGridContext || !tableDataContext || column.columnDataIndex === null) {
-    throw new Error('DataGridContext should be provided');
-  }
-
-  useImperativeHandle(ref, () => ({
-    focus: () => inputRef.current?.focus(),
-  }));
-
-  useEffect(() => {
-    function resize(data: IColumnResizeInfo) {
-      if (elementRef && popperRef && data.column === column.idx) {
-        popperRef.style.width = (data.width + 1) + 'px';
-      }
+    if (!dataGridContext || !tableDataContext || column.columnDataIndex === null) {
+      throw new Error('DataGridContext should be provided');
     }
 
-    dataGridContext.columnResize.addHandler(resize);
+    useImperativeHandle(ref, () => ({
+      focus: () => inputRef.current?.focus(),
+    }));
 
-    return () => dataGridContext.columnResize.removeHandler(resize);
-  }, [elementRef, popperRef, column]);
-
-  useLayoutEffect(() => {
-    if (elementRef && popperRef) {
-      const size = elementRef.closest('[role="gridcell"]')?.getBoundingClientRect();
-
-      if (size) {
-        popperRef.style.width = (size.width + 1) + 'px';
-        popperRef.style.height = (size.height + 1) + 'px';
+    useEffect(() => {
+      function resize(data: IColumnResizeInfo) {
+        if (elementRef && popperRef && data.column === column.idx) {
+          popperRef.style.width = data.width + 1 + 'px';
+        }
       }
-    }
-  });
 
-  const cellKey: IResultSetElementKey = { row, column: column.columnDataIndex };
+      dataGridContext.columnResize.addHandler(resize);
 
-  const value = tableDataContext.format
-    .getText(tableDataContext.getCellValue(cellKey)!) ?? '';
+      return () => dataGridContext.columnResize.removeHandler(resize);
+    }, [elementRef, popperRef, column]);
 
-  const handleSave = () => onClose(false);
-  const handleReject = () => {
-    tableDataContext.editor.revert(cellKey);
-    onClose(false);
-  };
-  const handleChange = (value: string) => {
-    tableDataContext.editor.set(cellKey, value);
-  };
-  const handleUndo = () => {
-    tableDataContext.editor.revert(cellKey);
-    onClose(false);
-  };
+    useLayoutEffect(() => {
+      if (elementRef && popperRef) {
+        const size = elementRef.closest('[role="gridcell"]')?.getBoundingClientRect();
 
-  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-    if (lockNavigation.includes(event.key)) {
+        if (size) {
+          popperRef.style.width = size.width + 1 + 'px';
+          popperRef.style.height = size.height + 1 + 'px';
+        }
+      }
+    });
+
+    const cellKey: IResultSetElementKey = { row, column: column.columnDataIndex };
+
+    const value = tableDataContext.format.getText(tableDataContext.getCellValue(cellKey)!) ?? '';
+
+    const handleSave = () => onClose(false);
+    const handleReject = () => {
+      tableDataContext.editor.revert(cellKey);
+      onClose(false);
+    };
+    const handleChange = (value: string) => {
+      tableDataContext.editor.set(cellKey, value);
+    };
+    const handleUndo = () => {
+      tableDataContext.editor.revert(cellKey);
+      onClose(false);
+    };
+
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (lockNavigation.includes(event.key)) {
+        event.stopPropagation();
+      }
+    };
+
+    const preventClick = (event: React.MouseEvent<HTMLDivElement>) => {
+      EventContext.set(event, EventStopPropagationFlag); // better but not works
       event.stopPropagation();
-    }
-  };
+    };
 
-  const preventClick = (event: React.MouseEvent<HTMLDivElement>) => {
-    EventContext.set(event, EventStopPropagationFlag); // better but not works
-    event.stopPropagation();
-  };
-
-  return styled(styles)(
-    <box
-      ref={setElementRef}
-      as='div'
-      onKeyDown={handleKeyDown}
-      onClick={preventClick}
-      onDoubleClick={preventClick}
-      onMouseDown={preventClick}
-      onMouseUp={preventClick}
-    >
-      {createPortal((
-        <editor ref={setPopperRef} as="div" style={popper.styles.popper} {...popper.attributes.popper}>
-          <InlineEditor
-            ref={inputRef}
-            value={value}
-            controlsPosition="inside"
-            edited
-            hideSave
-            hideCancel
-            autofocus
-            active
-            simple
-            onBlur={handleSave}
-            onSave={handleSave}
-            onReject={handleReject}
-            onChange={handleChange}
-            onUndo={handleUndo}
-          />
-        </editor>
-      ), dataGridContext.getEditorPortal()!) as any}
-    </box>
-  );
-}));
+    return styled(styles)(
+      <box
+        ref={setElementRef}
+        as="div"
+        onKeyDown={handleKeyDown}
+        onClick={preventClick}
+        onDoubleClick={preventClick}
+        onMouseDown={preventClick}
+        onMouseUp={preventClick}
+      >
+        {
+          createPortal(
+            <editor ref={setPopperRef} as="div" style={popper.styles.popper} {...popper.attributes.popper}>
+              <InlineEditor
+                ref={inputRef}
+                value={value}
+                controlsPosition="inside"
+                edited
+                hideSave
+                hideCancel
+                autofocus
+                active
+                simple
+                onBlur={handleSave}
+                onSave={handleSave}
+                onReject={handleReject}
+                onChange={handleChange}
+                onUndo={handleUndo}
+              />
+            </editor>,
+            dataGridContext.getEditorPortal()!,
+          ) as any
+        }
+      </box>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellContext.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellContext.ts
index 6a8d5129fe..0bb702b6ca 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellContext.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellContext.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { IMouseHook } from '@cloudbeaver/core-blocks';
-import type { IResultSetElementKey, DatabaseEditChangeType } from '@cloudbeaver/plugin-data-viewer';
+import type { DatabaseEditChangeType, IResultSetElementKey } from '@cloudbeaver/plugin-data-viewer';
 
 import type { CellPosition } from '../../Editing/EditingContext';
 
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellRenderer.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellRenderer.tsx
index 927fd3fca4..3353cbb247 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellRenderer.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellRenderer/CellRenderer.tsx
@@ -5,16 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useContext, useEffect } from 'react';
 
-
 import { getComputed, useMouse, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
 import { clsx } from '@cloudbeaver/core-utils';
-import { IResultSetElementKey, IResultSetRowKey, isBooleanValuePresentationAvailable, DatabaseEditChangeType } from '@cloudbeaver/plugin-data-viewer';
+import { DatabaseEditChangeType, IResultSetElementKey, IResultSetRowKey, isBooleanValuePresentationAvailable } from '@cloudbeaver/plugin-data-viewer';
 import { CalculatedColumn, Cell, CellRendererProps } from '@cloudbeaver/plugin-react-data-grid';
 
 import { CellPosition, EditingContext } from '../../Editing/EditingContext';
@@ -33,48 +31,54 @@ export const CellRenderer = observer<CellRendererProps<IResultSetRowKey, unknown
 
   const rowIdx = tableDataContext.getRowIndexFromKey(row);
 
-  const cellContext = useObservableRef(() => ({
-    mouse,
-    get position(): CellPosition {
-      return { idx: this.column.idx, rowIdx: this.rowIdx };
-    },
-    get cell(): IResultSetElementKey | undefined {
-      if (this.column.columnDataIndex === null) {
-        return undefined;
-      }
-      return { row: this.row, column: this.column.columnDataIndex };
-    },
-    get isEditing(): boolean {
-      return editingContext.isEditing(this.position) || false;
-    },
-    get isSelected(): boolean {
-      return selectionContext.isSelected(this.position.rowIdx, this.position.idx) || false;
-    },
-    get editionState(): DatabaseEditChangeType | null {
-      if (!this.cell) {
-        return null;
-      }
+  const cellContext = useObservableRef(
+    () => ({
+      mouse,
+      get position(): CellPosition {
+        return { idx: this.column.idx, rowIdx: this.rowIdx };
+      },
+      get cell(): IResultSetElementKey | undefined {
+        if (this.column.columnDataIndex === null) {
+          return undefined;
+        }
+        return { row: this.row, column: this.column.columnDataIndex };
+      },
+      get isEditing(): boolean {
+        return editingContext.isEditing(this.position) || false;
+      },
+      get isSelected(): boolean {
+        return selectionContext.isSelected(this.position.rowIdx, this.position.idx) || false;
+      },
+      get editionState(): DatabaseEditChangeType | null {
+        if (!this.cell) {
+          return null;
+        }
 
-      return tableDataContext.getEditionState(this.cell);
+        return tableDataContext.getEditionState(this.cell);
+      },
+    }),
+    {
+      row: observable.ref,
+      column: observable.ref,
+      rowIdx: observable.ref,
+      position: computed,
+      cell: computed,
+      isEditing: computed,
+      isSelected: computed,
+      editionState: computed,
     },
-  }), {
-    row: observable.ref,
-    column: observable.ref,
-    rowIdx: observable.ref,
-    position: computed,
-    cell: computed,
-    isEditing: computed,
-    isSelected: computed,
-    editionState: computed,
-  }, { row, column, rowIdx });
+    { row, column, rowIdx },
+  );
 
-  const classes = getComputed(() => clsx({
-    'rdg-cell-custom-selected': cellContext.isSelected,
-    'rdg-cell-custom-editing': cellContext.isEditing,
-    'rdg-cell-custom-added': cellContext.editionState === DatabaseEditChangeType.add,
-    'rdg-cell-custom-deleted': cellContext.editionState === DatabaseEditChangeType.delete,
-    'rdg-cell-custom-edited': cellContext.editionState === DatabaseEditChangeType.update,
-  }));
+  const classes = getComputed(() =>
+    clsx({
+      'rdg-cell-custom-selected': cellContext.isSelected,
+      'rdg-cell-custom-editing': cellContext.isEditing,
+      'rdg-cell-custom-added': cellContext.editionState === DatabaseEditChangeType.add,
+      'rdg-cell-custom-deleted': cellContext.editionState === DatabaseEditChangeType.delete,
+      'rdg-cell-custom-edited': cellContext.editionState === DatabaseEditChangeType.update,
+    }),
+  );
 
   function isEditable(column: CalculatedColumn<IResultSetRowKey>): boolean {
     if (!cellContext.cell) {
@@ -90,57 +94,58 @@ export const CellRenderer = observer<CellRendererProps<IResultSetRowKey, unknown
 
     const handleByBooleanFormatter = isBooleanValuePresentationAvailable(value, resultColumn);
 
-    return !(
-      handleByBooleanFormatter
-      || tableDataContext.isCellReadonly(cellContext.cell)
-    );
+    return !(handleByBooleanFormatter || tableDataContext.isCellReadonly(cellContext.cell));
   }
 
-  const state = useObjectRef(() => ({
-    mouseDown(event: React.MouseEvent<HTMLDivElement>) {
-      // this.selectCell(this.row, this.column);
-    },
-    mouseUp(event: React.MouseEvent<HTMLDivElement>) {
-      if (
-        // !this.dataGridContext.isGridInFocus()
-        EventContext.has(event, EventStopPropagationFlag)
-      ) {
-        return;
-      }
+  const state = useObjectRef(
+    () => ({
+      mouseDown(event: React.MouseEvent<HTMLDivElement>) {
+        // this.selectCell(this.row, this.column);
+      },
+      mouseUp(event: React.MouseEvent<HTMLDivElement>) {
+        if (
+          // !this.dataGridContext.isGridInFocus()
+          EventContext.has(event, EventStopPropagationFlag)
+        ) {
+          return;
+        }
 
-      this.selectionContext.select(
-        {
-          colIdx: this.column.idx,
-          rowIdx: this.rowIdx,
-        },
-        event.ctrlKey || event.metaKey,
-        event.shiftKey,
-        false
-      );
-    },
-    doubleClick(event: React.MouseEvent<HTMLDivElement>) {
-      if (
-        !this.isEditable(this.column)
-        // !this.dataGridContext.isGridInFocus()
-        || EventContext.has(event, EventStopPropagationFlag)
-      ) {
-        return;
-      }
+        this.selectionContext.select(
+          {
+            colIdx: this.column.idx,
+            rowIdx: this.rowIdx,
+          },
+          event.ctrlKey || event.metaKey,
+          event.shiftKey,
+          false,
+        );
+      },
+      doubleClick(event: React.MouseEvent<HTMLDivElement>) {
+        if (
+          !this.isEditable(this.column) ||
+          // !this.dataGridContext.isGridInFocus()
+          EventContext.has(event, EventStopPropagationFlag)
+        ) {
+          return;
+        }
 
-      this.editingContext.edit(cellContext.position);
+        this.editingContext.edit(cellContext.position);
+      },
+    }),
+    {
+      row,
+      column,
+      rowIdx,
+      isCellSelected,
+      selectionContext,
+      dataGridContext,
+      editingContext,
+      tableDataContext,
+      isEditable,
+      selectCell,
     },
-  }), {
-    row,
-    column,
-    rowIdx,
-    isCellSelected,
-    selectionContext,
-    dataGridContext,
-    editingContext,
-    tableDataContext,
-    isEditable,
-    selectCell,
-  }, ['doubleClick', 'mouseUp', 'mouseDown']);
+    ['doubleClick', 'mouseUp', 'mouseDown'],
+  );
 
   useEffect(() => () => editingContext.closeEditor(cellContext.position), []);
 
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContext.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContext.ts
index db9b90dfa0..34bd583d33 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContext.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContext.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
-
 import type { IExecutor } from '@cloudbeaver/core-executor';
 import type { IDatabaseDataModel, IDataTableActions } from '@cloudbeaver/plugin-data-viewer';
 import type { DataGridHandle } from '@cloudbeaver/plugin-react-data-grid';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
index ea88803828..f8278fae6f 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
@@ -5,9 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { isBooleanValuePresentationAvailable, DatabaseEditChangeType, ResultSetEditAction, ResultSetFormatAction, ResultSetViewAction, ResultSetSelectAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  DatabaseEditChangeType,
+  isBooleanValuePresentationAvailable,
+  ResultSetEditAction,
+  ResultSetFormatAction,
+  ResultSetSelectAction,
+  ResultSetViewAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import { DataGridContextMenuService } from './DataGridContextMenuService';
 
@@ -15,246 +21,195 @@ import { DataGridContextMenuService } from './DataGridContextMenuService';
 export class DataGridContextMenuCellEditingService {
   private static readonly menuEditingToken = 'menuEditing';
 
-  constructor(
-    private readonly dataGridContextMenuService: DataGridContextMenuService
-  ) { }
+  constructor(private readonly dataGridContextMenuService: DataGridContextMenuService) {}
 
   getMenuEditingToken(): string {
     return DataGridContextMenuCellEditingService.menuEditingToken;
   }
 
   register(): void {
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: this.getMenuEditingToken(),
-        order: 4,
-        title: 'data_grid_table_editing',
-        icon: 'edit',
-        isPanel: true,
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          return context.data.model.isDisabled(context.data.resultIndex)
-            || context.data.model.isReadonly(context.data.resultIndex);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'open_inline_editor',
-        order: 0,
-        title: 'data_grid_table_editing_open_inline_editor',
-        icon: 'edit',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const format = context.data.model.source.getAction(context.data.resultIndex, ResultSetFormatAction);
-          const view = context.data.model.source.getAction(context.data.resultIndex, ResultSetViewAction);
-          const cellValue = view.getCellValue(context.data.key);
-          const column = view.getColumn(context.data.key.column);
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: this.getMenuEditingToken(),
+      order: 4,
+      title: 'data_grid_table_editing',
+      icon: 'edit',
+      isPanel: true,
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        return context.data.model.isDisabled(context.data.resultIndex) || context.data.model.isReadonly(context.data.resultIndex);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'open_inline_editor',
+      order: 0,
+      title: 'data_grid_table_editing_open_inline_editor',
+      icon: 'edit',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const format = context.data.model.source.getAction(context.data.resultIndex, ResultSetFormatAction);
+        const view = context.data.model.source.getAction(context.data.resultIndex, ResultSetViewAction);
+        const cellValue = view.getCellValue(context.data.key);
+        const column = view.getColumn(context.data.key.column);
 
-          if (!column || cellValue === undefined || format.isReadOnly(context.data.key)) {
-            return true;
-          }
+        if (!column || cellValue === undefined || format.isReadOnly(context.data.key)) {
+          return true;
+        }
 
-          return isBooleanValuePresentationAvailable(cellValue, column);
-        },
-        onClick(context) {
-          context.data.spreadsheetActions.edit(context.data.key);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'set_to_null',
-        order: 1,
-        title: 'data_grid_table_editing_set_to_null',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const { key, model, resultIndex } = context.data;
-          const view = model.source.getAction(resultIndex, ResultSetViewAction);
-          const format = model.source.getAction(resultIndex, ResultSetFormatAction);
-          const cellValue = view.getCellValue(key);
+        return isBooleanValuePresentationAvailable(cellValue, column);
+      },
+      onClick(context) {
+        context.data.spreadsheetActions.edit(context.data.key);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'set_to_null',
+      order: 1,
+      title: 'data_grid_table_editing_set_to_null',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const { key, model, resultIndex } = context.data;
+        const view = model.source.getAction(resultIndex, ResultSetViewAction);
+        const format = model.source.getAction(resultIndex, ResultSetFormatAction);
+        const cellValue = view.getCellValue(key);
 
-          return (
-            cellValue === undefined
-            || format.isReadOnly(context.data.key)
-            || view.getColumn(key.column)?.required
-            || format.isNull(cellValue)
-          );
-        },
-        onClick(context) {
-          context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction)
-            .set(context.data.key, null);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_add',
-        order: 5,
-        icon: '/icons/data_add_sm.svg',
-        title: 'data_grid_table_editing_row_add',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          return !editor.hasFeature('add');
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          editor.addRow(context.data.key.row);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_add_copy',
-        order: 5.5,
-        icon: '/icons/data_add_copy_sm.svg',
-        title: 'data_grid_table_editing_row_add_copy',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          return !editor.hasFeature('add');
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          editor.duplicateRow(context.data.key.row);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_delete',
-        order: 6,
-        icon: '/icons/data_delete_sm.svg',
-        title: 'data_grid_table_editing_row_delete',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        return cellValue === undefined || format.isReadOnly(context.data.key) || view.getColumn(key.column)?.required || format.isNull(cellValue);
+      },
+      onClick(context) {
+        context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction).set(context.data.key, null);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_add',
+      order: 5,
+      icon: '/icons/data_add_sm.svg',
+      title: 'data_grid_table_editing_row_add',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        return !editor.hasFeature('add');
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        editor.addRow(context.data.key.row);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_add_copy',
+      order: 5.5,
+      icon: '/icons/data_add_copy_sm.svg',
+      title: 'data_grid_table_editing_row_add_copy',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        return !editor.hasFeature('add');
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        editor.duplicateRow(context.data.key.row);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_delete',
+      order: 6,
+      icon: '/icons/data_delete_sm.svg',
+      title: 'data_grid_table_editing_row_delete',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
 
-          if (context.data.model.isReadonly(context.data.resultIndex) || !editor.hasFeature('delete')) {
-            return true;
-          }
+        if (context.data.model.isReadonly(context.data.resultIndex) || !editor.hasFeature('delete')) {
+          return true;
+        }
 
-          const format = context.data.model.source.getAction(context.data.resultIndex, ResultSetFormatAction);
-          return (
-            format.isReadOnly(context.data.key)
-            || editor.getElementState(context.data.key) === DatabaseEditChangeType.delete
-          );
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          editor.deleteRow(context.data.key.row);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_delete_selected',
-        order: 6.1,
-        icon: '/icons/data_delete_sm.svg',
-        title: 'data_viewer_action_edit_delete',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        const format = context.data.model.source.getAction(context.data.resultIndex, ResultSetFormatAction);
+        return format.isReadOnly(context.data.key) || editor.getElementState(context.data.key) === DatabaseEditChangeType.delete;
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        editor.deleteRow(context.data.key.row);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_delete_selected',
+      order: 6.1,
+      icon: '/icons/data_delete_sm.svg',
+      title: 'data_viewer_action_edit_delete',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
 
-          if (context.data.model.isReadonly(context.data.resultIndex) || !editor.hasFeature('delete')) {
-            return true;
-          }
+        if (context.data.model.isReadonly(context.data.resultIndex) || !editor.hasFeature('delete')) {
+          return true;
+        }
 
-          const select = context.data.model.source.getActionImplementation(
-            context.data.resultIndex,
-            ResultSetSelectAction
-          );
+        const select = context.data.model.source.getActionImplementation(context.data.resultIndex, ResultSetSelectAction);
 
-          const selectedElements = select?.getSelectedElements() || [];
+        const selectedElements = select?.getSelectedElements() || [];
 
-          return !selectedElements.some(key => editor.getElementState(key) !== DatabaseEditChangeType.delete);
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          const select = context.data.model.source.getActionImplementation(
-            context.data.resultIndex,
-            ResultSetSelectAction
-          );
+        return !selectedElements.some(key => editor.getElementState(key) !== DatabaseEditChangeType.delete);
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        const select = context.data.model.source.getActionImplementation(context.data.resultIndex, ResultSetSelectAction);
 
-          const selectedElements = select?.getSelectedElements() || [];
+        const selectedElements = select?.getSelectedElements() || [];
 
-          editor.delete(...selectedElements);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_revert',
-        order: 7,
-        icon: '/icons/data_revert_sm.svg',
-        title: 'data_grid_table_editing_row_revert',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          return editor.getElementState(context.data.key) === null;
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          editor.revert(context.data.key);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuEditingToken(),
-      {
-        id: 'row_revert_selected',
-        order: 7.1,
-        icon: '/icons/data_revert_sm.svg',
-        title: 'data_viewer_action_edit_revert',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          const select = context.data.model.source.getActionImplementation(
-            context.data.resultIndex,
-            ResultSetSelectAction
-          );
+        editor.delete(...selectedElements);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_revert',
+      order: 7,
+      icon: '/icons/data_revert_sm.svg',
+      title: 'data_grid_table_editing_row_revert',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        return editor.getElementState(context.data.key) === null;
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        editor.revert(context.data.key);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuEditingToken(), {
+      id: 'row_revert_selected',
+      order: 7.1,
+      icon: '/icons/data_revert_sm.svg',
+      title: 'data_viewer_action_edit_revert',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        const select = context.data.model.source.getActionImplementation(context.data.resultIndex, ResultSetSelectAction);
 
-          const selectedElements = select?.getSelectedElements() || [];
-          return !selectedElements.some(key => editor.getElementState(key) !== null);
-        },
-        onClick(context) {
-          const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
-          const select = context.data.model.source.getActionImplementation(
-            context.data.resultIndex,
-            ResultSetSelectAction
-          );
+        const selectedElements = select?.getSelectedElements() || [];
+        return !selectedElements.some(key => editor.getElementState(key) !== null);
+      },
+      onClick(context) {
+        const editor = context.data.model.source.getAction(context.data.resultIndex, ResultSetEditAction);
+        const select = context.data.model.source.getActionImplementation(context.data.resultIndex, ResultSetSelectAction);
 
-          const selectedElements = select?.getSelectedElements() || [];
-          editor.revert(...selectedElements);
-        },
-      }
-    );
+        const selectedElements = select?.getSelectedElements() || [];
+        editor.revert(...selectedElements);
+      },
+    });
   }
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index 195063e966..c74e9c1d6d 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -5,24 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { CommonDialogService, DialogueStateResult, IContextMenuItem, IMenuContext, ComputedContextMenuModel } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService, ComputedContextMenuModel, DialogueStateResult, IContextMenuItem, IMenuContext } from '@cloudbeaver/core-dialogs';
 import { ClipboardService } from '@cloudbeaver/core-ui';
 import { replaceMiddle } from '@cloudbeaver/core-utils';
 import {
-  wrapOperationArgument,
   IDatabaseDataModel,
-  nullOperationsFilter,
-  ResultSetConstraintAction,
+  IDatabaseDataOptions,
+  IDatabaseResultSet,
+  IResultSetColumnKey,
   IS_NOT_NULL_ID,
   IS_NULL_ID,
-  ResultSetDataAction,
-  IDatabaseResultSet,
-  IDatabaseDataOptions,
-  ResultSetFormatAction,
   isFilterConstraint,
-  IResultSetColumnKey
+  nullOperationsFilter,
+  ResultSetConstraintAction,
+  ResultSetDataAction,
+  ResultSetFormatAction,
+  wrapOperationArgument,
 } from '@cloudbeaver/plugin-data-viewer';
 
 import { DataGridContextMenuService, IDataGridCellMenuContext } from '../DataGridContextMenuService';
@@ -115,331 +114,286 @@ export class DataGridContextMenuFilterService {
   }
 
   register(): void {
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: this.getMenuFilterToken(),
-        order: 2,
-        title: 'data_grid_table_filter',
-        icon: 'filter',
-        isPanel: true,
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          if (context.data.model.isDisabled(context.data.resultIndex)) {
-            return true;
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: this.getMenuFilterToken(),
+      order: 2,
+      title: 'data_grid_table_filter',
+      icon: 'filter',
+      isPanel: true,
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        if (context.data.model.isDisabled(context.data.resultIndex)) {
+          return true;
+        }
+
+        const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
+        return !constraints.supported;
+      },
+    });
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: 'deleteFiltersAndOrders',
+      order: 3,
+      title: 'data_grid_table_delete_filters_and_orders',
+      icon: 'erase',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        if (context.data.model.isDisabled(context.data.resultIndex)) {
+          return true;
+        }
+
+        const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
+        return constraints.orderConstraints.length === 0 && constraints.filterConstraints.length === 0;
+      },
+      onClick: async context => {
+        const { model, resultIndex } = context.data;
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+
+        await model.requestDataAction(async () => {
+          constraints.deleteData();
+          await model.request(true);
+        });
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'clipboardValue',
+      order: 0,
+      title: 'ui_clipboard',
+      icon: 'filter-clipboard',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        if (!this.clipboardService.clipboardAvailable || this.clipboardService.state === 'denied') {
+          return true;
+        }
+
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const supportedOperations = data.getColumnOperations(context.data.key.column);
+
+        return supportedOperations.length === 0;
+      },
+      panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
+        id: 'clipboardValuePanel',
+        menuItemsGetter: context => {
+          if (context.contextType !== DataGridContextMenuService.cellContext) {
+            return [];
           }
 
-          const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
-          return !constraints.supported;
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: 'deleteFiltersAndOrders',
-        order: 3,
-        title: 'data_grid_table_delete_filters_and_orders',
-        icon: 'erase',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          if (context.data.model.isDisabled(context.data.resultIndex)) {
-            return true;
-          }
+          const valueGetter = () => this.clipboardService.clipboardValue || '';
+          const items = this.getGeneralizedMenuItems(context, valueGetter, 'filter-clipboard', () => this.clipboardService.state === 'prompt');
 
-          const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
-          return (
-            constraints.orderConstraints.length === 0
-            && constraints.filterConstraints.length === 0
-          );
-        },
-        onClick: async context => {
-          const { model, resultIndex } = context.data;
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-
-          await model.requestDataAction(async () => {
-            constraints.deleteData();
-            await model.request(true);
-          });
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'clipboardValue',
-        order: 0,
-        title: 'ui_clipboard',
-        icon: 'filter-clipboard',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          if (!this.clipboardService.clipboardAvailable || this.clipboardService.state === 'denied') {
-            return true;
-          }
-
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const supportedOperations = data.getColumnOperations(context.data.key.column);
-
-          return supportedOperations.length === 0;
-        },
-        panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
-          id: 'clipboardValuePanel',
-          menuItemsGetter: context => {
-            if (context.contextType !== DataGridContextMenuService.cellContext) {
-              return [];
-            }
-
-            const valueGetter = () => this.clipboardService.clipboardValue || '';
-            const items = this.getGeneralizedMenuItems(
-              context,
-              valueGetter,
-              'filter-clipboard',
-              () => this.clipboardService.state === 'prompt'
-            );
-
-            return [
-              {
-                id: 'permission',
-                isPresent: () => true,
-                isHidden: () => this.clipboardService.state !== 'prompt',
-                isDisabled(context) {
-                  return context.data.model.isLoading();
-                },
-                title: 'data_grid_table_context_menu_filter_clipboard_permission',
-                icon: 'permission',
-                onClick: async () => {
-                  await this.clipboardService.read();
-                },
+          return [
+            {
+              id: 'permission',
+              isPresent: () => true,
+              isHidden: () => this.clipboardService.state !== 'prompt',
+              isDisabled(context) {
+                return context.data.model.isLoading();
               },
-              ...items,
-            ];
-          },
-        }),
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'cellValue',
-        order: 1,
-        title: 'data_grid_table_filter_cell_value',
-        icon: 'filter',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
+              title: 'data_grid_table_context_menu_filter_clipboard_permission',
+              icon: 'permission',
+              onClick: async () => {
+                await this.clipboardService.read();
+              },
+            },
+            ...items,
+          ];
         },
-        isHidden: context => {
-          const { model, resultIndex, key } = context.data;
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const format = model.source.getAction(resultIndex, ResultSetFormatAction);
-          const supportedOperations = data.getColumnOperations(key.column);
-          const value = data.getCellValue(key);
+      }),
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'cellValue',
+      order: 1,
+      title: 'data_grid_table_filter_cell_value',
+      icon: 'filter',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const { model, resultIndex, key } = context.data;
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const format = model.source.getAction(resultIndex, ResultSetFormatAction);
+        const supportedOperations = data.getColumnOperations(key.column);
+        const value = data.getCellValue(key);
 
-          return value === undefined || supportedOperations.length === 0 || format.isNull(value);
-        },
-        panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
-          id: 'cellValuePanel',
-          menuItemsGetter: context => {
-            const { model, resultIndex, key } = context.data;
-            const data = model.source.getAction(resultIndex, ResultSetDataAction);
-            const cellValue = data.getCellValue(key);
-            const items = this.getGeneralizedMenuItems(context, cellValue, 'filter');
-            return items;
-          },
-        }),
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'customValue',
-        order: 2,
-        title: 'data_grid_table_filter_custom_value',
-        icon: 'filter-custom',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
+        return value === undefined || supportedOperations.length === 0 || format.isNull(value);
+      },
+      panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
+        id: 'cellValuePanel',
+        menuItemsGetter: context => {
           const { model, resultIndex, key } = context.data;
           const data = model.source.getAction(resultIndex, ResultSetDataAction);
           const cellValue = data.getCellValue(key);
+          const items = this.getGeneralizedMenuItems(context, cellValue, 'filter');
+          return items;
+        },
+      }),
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'customValue',
+      order: 2,
+      title: 'data_grid_table_filter_custom_value',
+      icon: 'filter-custom',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const { model, resultIndex, key } = context.data;
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const cellValue = data.getCellValue(key);
+        const supportedOperations = data.getColumnOperations(key.column);
+
+        return cellValue === undefined || supportedOperations.length === 0;
+      },
+      panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
+        id: 'customValuePanel',
+        menuItemsGetter: context => {
+          const { model, resultIndex, key } = context.data;
+          const format = model.source.getAction(resultIndex, ResultSetFormatAction);
+          const data = model.source.getAction(resultIndex, ResultSetDataAction);
           const supportedOperations = data.getColumnOperations(key.column);
+          const cellValue = data.getCellValue(key) ?? '';
+          const columnLabel = data.getColumn(key.column)?.label || '';
 
-          return cellValue === undefined || supportedOperations.length === 0;
-        },
-        panel: new ComputedContextMenuModel<IDataGridCellMenuContext>({
-          id: 'customValuePanel',
-          menuItemsGetter: context => {
-            const { model, resultIndex, key } = context.data;
-            const format = model.source.getAction(resultIndex, ResultSetFormatAction);
-            const data = model.source.getAction(resultIndex, ResultSetDataAction);
-            const supportedOperations = data.getColumnOperations(key.column);
-            const cellValue = data.getCellValue(key) ?? '';
-            const columnLabel = data.getColumn(key.column)?.label || '';
+          return supportedOperations
+            .filter(operation => !nullOperationsFilter(operation))
+            .map(operation => {
+              const title = `${columnLabel} ${operation.expression}`;
 
-            return supportedOperations
-              .filter(operation => !nullOperationsFilter(operation))
-              .map(operation => {
-                const title = `${columnLabel} ${operation.expression}`;
+              return {
+                id: operation.id,
+                isPresent: () => true,
+                isDisabled(context) {
+                  return context.data.model.isLoading();
+                },
+                title: title + ' ..',
+                icon: 'filter-custom',
+                onClick: async () => {
+                  const stringifyCellValue = format.toDisplayString(cellValue);
+                  const customValue = await this.commonDialogService.open(FilterCustomValueDialog, {
+                    defaultValue: stringifyCellValue,
+                    inputTitle: title + ':',
+                  });
 
-                return {
-                  id: operation.id,
-                  isPresent: () => true,
-                  isDisabled(context) {
-                    return context.data.model.isLoading();
-                  },
-                  title: title + ' ..',
-                  icon: 'filter-custom',
-                  onClick: async () => {
-                    const stringifyCellValue = format.toDisplayString(cellValue);
-                    const customValue = await this.commonDialogService.open(
-                      FilterCustomValueDialog,
-                      {
-                        defaultValue: stringifyCellValue,
-                        inputTitle: title + ':',
-                      }
-                    );
+                  if (customValue === DialogueStateResult.Rejected || customValue === DialogueStateResult.Resolved) {
+                    return;
+                  }
 
-                    if (customValue === DialogueStateResult.Rejected || customValue === DialogueStateResult.Resolved) {
-                      return;
-                    }
+                  await this.applyFilter(model, resultIndex, key.column, operation.id, customValue);
+                },
+              };
+            });
+        },
+      }),
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'isNullValue',
+      order: 3,
+      icon: 'filter',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const supportedOperations = data.getColumnOperations(context.data.key.column);
 
-                    await this.applyFilter(
-                      model,
-                      resultIndex,
-                      key.column,
-                      operation.id,
-                      customValue
-                    );
-                  },
-                };
-              });
-          },
-        }),
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'isNullValue',
-        order: 3,
-        icon: 'filter',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const supportedOperations = data.getColumnOperations(context.data.key.column);
+        return !supportedOperations.some(operation => operation.id === IS_NULL_ID);
+      },
+      titleGetter: context => {
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const columnLabel = data.getColumn(context.data.key.column)?.label || '';
+        return `${columnLabel} IS NULL`;
+      },
+      onClick: async context => {
+        await this.applyFilter(context.data.model, context.data.resultIndex, context.data.key.column, IS_NULL_ID);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'isNotNullValue',
+      order: 4,
+      icon: 'filter',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const supportedOperations = data.getColumnOperations(context.data.key.column);
 
-          return !supportedOperations.some(operation => operation.id === IS_NULL_ID);
-        },
-        titleGetter: context => {
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const columnLabel = data.getColumn(context.data.key.column)?.label || '';
-          return `${columnLabel} IS NULL`;
-        },
-        onClick: async context => {
-          await this.applyFilter(context.data.model, context.data.resultIndex, context.data.key.column, IS_NULL_ID);
-        },
+        return !supportedOperations.some(operation => operation.id === IS_NOT_NULL_ID);
+      },
+      titleGetter: context => {
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const columnLabel = data.getColumn(context.data.key.column)?.label || '';
+        return `${columnLabel} IS NOT NULL`;
+      },
+      onClick: async context => {
+        await this.applyFilter(context.data.model, context.data.resultIndex, context.data.key.column, IS_NOT_NULL_ID);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'deleteFilter',
+      order: 5,
+      icon: 'filter-reset',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const { model, resultIndex, key } = context.data;
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const resultColumn = data.getColumn(key.column);
+        const currentConstraint = resultColumn ? constraints.get(resultColumn.position) : undefined;
 
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'isNotNullValue',
-        order: 4,
-        icon: 'filter',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const supportedOperations = data.getColumnOperations(context.data.key.column);
+        return !currentConstraint || !isFilterConstraint(currentConstraint);
+      },
+      titleGetter: context => {
+        const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
+        const columnLabel = data.getColumn(context.data.key.column)?.name || '';
+        return `Delete filter for ${columnLabel}`;
+      },
+      onClick: async context => {
+        const { model, resultIndex, key } = context.data;
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const resultColumn = data.getColumn(key.column);
 
-          return !supportedOperations.some(operation => operation.id === IS_NOT_NULL_ID);
-        },
-        titleGetter: context => {
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const columnLabel = data.getColumn(context.data.key.column)?.label || '';
-          return `${columnLabel} IS NOT NULL`;
-        },
-        onClick: async context => {
-          await this.applyFilter(context.data.model, context.data.resultIndex, context.data.key.column, IS_NOT_NULL_ID);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'deleteFilter',
-        order: 5,
-        icon: 'filter-reset',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          const { model, resultIndex, key } = context.data;
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const resultColumn = data.getColumn(key.column);
-          const currentConstraint = resultColumn ? constraints.get(resultColumn.position) : undefined;
+        if (!resultColumn) {
+          throw new Error(`Failed to get result column info for the following column index: "${key.column.index}"`);
+        }
 
-          return !currentConstraint || !isFilterConstraint(currentConstraint);
-        },
-        titleGetter: context => {
-          const data = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataAction);
-          const columnLabel = data.getColumn(context.data.key.column)?.name || '';
-          return `Delete filter for ${columnLabel}`;
-        },
-        onClick: async context => {
-          const { model, resultIndex, key } = context.data;
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const resultColumn = data.getColumn(key.column);
+        await model.requestDataAction(async () => {
+          constraints.deleteFilter(resultColumn.position);
+          await model.request(true);
+        });
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuFilterToken(), {
+      id: 'deleteAllFilters',
+      order: 6,
+      icon: 'filter-reset-all',
+      title: 'data_grid_table_filter_reset_all_filters',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const { model, resultIndex } = context.data;
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
 
-          if (!resultColumn) {
-            throw new Error(`Failed to get result column info for the following column index: "${key.column.index}"`);
-          }
+        return constraints.filterConstraints.length === 0 && !model.requestInfo.requestFilter;
+      },
+      onClick: async context => {
+        const { model, resultIndex } = context.data;
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
 
-          await model.requestDataAction(async () => {
-            constraints.deleteFilter(resultColumn.position);
-            await model.request(true);
-          });
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuFilterToken(),
-      {
-        id: 'deleteAllFilters',
-        order: 6,
-        icon: 'filter-reset-all',
-        title: 'data_grid_table_filter_reset_all_filters',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          const { model, resultIndex } = context.data;
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-
-          return constraints.filterConstraints.length === 0 && !model.requestInfo.requestFilter;
-        },
-        onClick: async context => {
-          const { model, resultIndex } = context.data;
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-
-          await model.requestDataAction(async () => {
-            constraints.deleteDataFilters();
-            await model.request(true);
-          });
-        },
-      }
-    );
+        await model.requestDataAction(async () => {
+          constraints.deleteDataFilters();
+          await model.request(true);
+        });
+      },
+    });
   }
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
index 147a17bc55..7bdf97a47d 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
@@ -5,14 +5,20 @@
  * 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 { useState, useCallback, useRef, useEffect } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import { Button, InputField, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent, DialogComponentProps } from '@cloudbeaver/core-dialogs';
+import {
+  CommonDialogBody,
+  CommonDialogFooter,
+  CommonDialogHeader,
+  CommonDialogWrapper,
+  DialogComponent,
+  DialogComponentProps,
+} from '@cloudbeaver/core-dialogs';
 import { ClipboardService } from '@cloudbeaver/core-ui';
 
 export const dialogStyle = css`
@@ -28,60 +34,53 @@ interface IPayload {
   defaultValue: string | number;
 }
 
-export const FilterCustomValueDialog: DialogComponent<IPayload, string | number> = observer(
-  function FilterCustomValueDialog({
-    payload,
-    resolveDialog,
-    rejectDialog,
-  }: DialogComponentProps<IPayload, string | number>) {
-    const clipboardService = useService(ClipboardService);
-    const inputRef = useRef<HTMLInputElement>(null);
+export const FilterCustomValueDialog: DialogComponent<IPayload, string | number> = observer(function FilterCustomValueDialog({
+  payload,
+  resolveDialog,
+  rejectDialog,
+}: DialogComponentProps<IPayload, string | number>) {
+  const clipboardService = useService(ClipboardService);
+  const inputRef = useRef<HTMLInputElement>(null);
 
-    const [value, setValue] = useState<string | number>(payload.defaultValue);
-    const handleApply = useCallback(() => resolveDialog(value), [value, resolveDialog]);
-    const translate = useTranslate();
+  const [value, setValue] = useState<string | number>(payload.defaultValue);
+  const handleApply = useCallback(() => resolveDialog(value), [value, resolveDialog]);
+  const translate = useTranslate();
 
-    const getValueFromClipboard = useCallback(async () => {
-      const value = await clipboardService.read();
-      if (value) {
-        setValue(value);
-      }
-      if (inputRef.current) {
-        inputRef.current.focus();
-      }
-    }, [clipboardService]);
+  const getValueFromClipboard = useCallback(async () => {
+    const value = await clipboardService.read();
+    if (value) {
+      setValue(value);
+    }
+    if (inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [clipboardService]);
 
-    useEffect(() => {
-      inputRef.current?.focus();
-    }, []);
+  useEffect(() => {
+    inputRef.current?.focus();
+  }, []);
 
-    return styled(dialogStyle)(
-      <CommonDialogWrapper size='small'>
-        <CommonDialogHeader title="data_grid_table_context_menu_filter_dialog_title" onReject={rejectDialog} />
-        <CommonDialogBody noOverflow>
-          <InputField
-            ref={inputRef}
-            name='customValue'
-            value={value}
-            onChange={setValue}
-          >
-            {payload.inputTitle}
-          </InputField>
-        </CommonDialogBody>
-        <CommonDialogFooter>
-          {clipboardService.clipboardAvailable && clipboardService.state !== 'denied' && (
-            <Button type="button" mod={['outlined']} onClick={getValueFromClipboard}>
-              {translate('ui_clipboard')}
-            </Button>
-          )}
-          <Button type="button" mod={['outlined']} onClick={rejectDialog}>
-            {translate('ui_processing_cancel')}
+  return styled(dialogStyle)(
+    <CommonDialogWrapper size="small">
+      <CommonDialogHeader title="data_grid_table_context_menu_filter_dialog_title" onReject={rejectDialog} />
+      <CommonDialogBody noOverflow>
+        <InputField ref={inputRef} name="customValue" value={value} onChange={setValue}>
+          {payload.inputTitle}
+        </InputField>
+      </CommonDialogBody>
+      <CommonDialogFooter>
+        {clipboardService.clipboardAvailable && clipboardService.state !== 'denied' && (
+          <Button type="button" mod={['outlined']} onClick={getValueFromClipboard}>
+            {translate('ui_clipboard')}
           </Button>
-          <Button type="button" mod={['unelevated']} onClick={handleApply}>
-            {translate('ui_processing_ok')}
-          </Button>
-        </CommonDialogFooter>
-      </CommonDialogWrapper>
-    );
-  }
-);
+        )}
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
+          {translate('ui_processing_cancel')}
+        </Button>
+        <Button type="button" mod={['unelevated']} onClick={handleApply}>
+          {translate('ui_processing_ok')}
+        </Button>
+      </CommonDialogFooter>
+    </CommonDialogWrapper>,
+  );
+});
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
index 290b61f77c..4f24ca586b 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
@@ -5,9 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { EOrder, IDatabaseDataModel, ResultSetConstraintAction, ResultSetDataAction, Order, IResultSetColumnKey } from '@cloudbeaver/plugin-data-viewer';
+import {
+  EOrder,
+  IDatabaseDataModel,
+  IResultSetColumnKey,
+  Order,
+  ResultSetConstraintAction,
+  ResultSetDataAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import { DataGridContextMenuService } from './DataGridContextMenuService';
 
@@ -15,20 +21,13 @@ import { DataGridContextMenuService } from './DataGridContextMenuService';
 export class DataGridContextMenuOrderService {
   private static readonly menuOrderToken = 'menuOrder';
 
-  constructor(
-    private readonly dataGridContextMenuService: DataGridContextMenuService,
-  ) { }
+  constructor(private readonly dataGridContextMenuService: DataGridContextMenuService) {}
 
   getMenuOrderToken(): string {
     return DataGridContextMenuOrderService.menuOrderToken;
   }
 
-  private async changeOrder(
-    model: IDatabaseDataModel,
-    resultIndex: number,
-    column: IResultSetColumnKey,
-    order: Order
-  ) {
+  private async changeOrder(model: IDatabaseDataModel, resultIndex: number, column: IResultSetColumnKey, order: Order) {
     const data = model.source.getAction(resultIndex, ResultSetDataAction);
     const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
     const resultColumn = data.getColumn(column);
@@ -44,113 +43,98 @@ export class DataGridContextMenuOrderService {
   }
 
   register(): void {
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: this.getMenuOrderToken(),
-        order: 1,
-        title: 'data_grid_table_order',
-        icon: 'order-arrow-unknown',
-        isPanel: true,
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
-          return !constraints.supported || context.data.model.isDisabled(context.data.resultIndex);
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuOrderToken(),
-      {
-        id: 'asc',
-        type: 'radio',
-        title: 'ASC',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isDisabled: context => context.data.model.isLoading(),
-        onClick: async context => {
-          await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, EOrder.asc);
-        },
-        isChecked: context => {
-          const { model, resultIndex, key } = context.data;
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const resultColumn = data.getColumn(key.column);
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: this.getMenuOrderToken(),
+      order: 1,
+      title: 'data_grid_table_order',
+      icon: 'order-arrow-unknown',
+      isPanel: true,
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
+        return !constraints.supported || context.data.model.isDisabled(context.data.resultIndex);
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuOrderToken(), {
+      id: 'asc',
+      type: 'radio',
+      title: 'ASC',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isDisabled: context => context.data.model.isLoading(),
+      onClick: async context => {
+        await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, EOrder.asc);
+      },
+      isChecked: context => {
+        const { model, resultIndex, key } = context.data;
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+        const resultColumn = data.getColumn(key.column);
 
-          return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.asc;
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuOrderToken(),
-      {
-        id: 'desc',
-        type: 'radio',
-        title: 'DESC',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isDisabled: context => context.data.model.isLoading(),
-        onClick: async context => {
-          await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, EOrder.desc);
-        },
-        isChecked: context => {
-          const { model, resultIndex, key } = context.data;
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const resultColumn = data.getColumn(key.column);
+        return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.asc;
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuOrderToken(), {
+      id: 'desc',
+      type: 'radio',
+      title: 'DESC',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isDisabled: context => context.data.model.isLoading(),
+      onClick: async context => {
+        await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, EOrder.desc);
+      },
+      isChecked: context => {
+        const { model, resultIndex, key } = context.data;
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+        const resultColumn = data.getColumn(key.column);
 
-          return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.desc;
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuOrderToken(),
-      {
-        id: 'disableOrder',
-        type: 'radio',
-        title: 'data_grid_table_disable_order',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isDisabled: context => context.data.model.isLoading(),
-        onClick: async context => {
-          await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, null);
-        },
-        isChecked: context => {
-          const { model, resultIndex, key } = context.data;
-          const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const resultColumn = data.getColumn(key.column);
+        return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.desc;
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuOrderToken(), {
+      id: 'disableOrder',
+      type: 'radio',
+      title: 'data_grid_table_disable_order',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isDisabled: context => context.data.model.isLoading(),
+      onClick: async context => {
+        await this.changeOrder(context.data.model, context.data.resultIndex, context.data.key.column, null);
+      },
+      isChecked: context => {
+        const { model, resultIndex, key } = context.data;
+        const data = model.source.getAction(resultIndex, ResultSetDataAction);
+        const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
+        const resultColumn = data.getColumn(key.column);
 
-          return !!resultColumn && constraints.getOrder(resultColumn.position) === null;
-        },
-      }
-    );
-    this.dataGridContextMenuService.add(
-      this.getMenuOrderToken(),
-      {
-        id: 'disableOrders',
-        title: 'data_grid_table_disable_all_orders',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden: context => {
-          const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
-          return !constraints.orderConstraints.length;
-        },
-        isDisabled: context => context.data.model.isLoading(),
-        onClick: async context => {
-          const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
-          await context.data.model.requestDataAction(async () => {
-            constraints.deleteOrders();
-            await context.data.model.request(true);
-          });
-        },
-      }
-    );
+        return !!resultColumn && constraints.getOrder(resultColumn.position) === null;
+      },
+    });
+    this.dataGridContextMenuService.add(this.getMenuOrderToken(), {
+      id: 'disableOrders',
+      title: 'data_grid_table_disable_all_orders',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden: context => {
+        const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
+        return !constraints.orderConstraints.length;
+      },
+      isDisabled: context => context.data.model.isLoading(),
+      onClick: async context => {
+        const constraints = context.data.model.source.getAction(context.data.resultIndex, ResultSetConstraintAction);
+        await context.data.model.requestDataAction(async () => {
+          constraints.deleteOrders();
+          await context.data.model.request(true);
+        });
+      },
+    });
   }
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
index 8d66bda091..616af6741b 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuSaveContentService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ResultSetDataContentAction, ResultSetDataKeysUtils } from '@cloudbeaver/plugin-data-viewer';
@@ -16,48 +15,41 @@ import { DataGridContextMenuService } from './DataGridContextMenuService';
 export class DataGridContextMenuSaveContentService {
   private static readonly menuContentSaveToken = 'menuContentSave';
 
-  constructor(
-    private readonly dataGridContextMenuService: DataGridContextMenuService,
-    private readonly notificationService: NotificationService
-  ) { }
+  constructor(private readonly dataGridContextMenuService: DataGridContextMenuService, private readonly notificationService: NotificationService) {}
 
   getMenuContentSaveToken(): string {
     return DataGridContextMenuSaveContentService.menuContentSaveToken;
   }
 
   register(): void {
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: this.getMenuContentSaveToken(),
-        order: 4,
-        title: 'ui_download',
-        icon: '/icons/export.svg',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        onClick: async context => {
-          const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
-          try {
-            await content.downloadFileData(context.data.key);
-          } catch (exception: any) {
-            this.notificationService.logException(exception, 'data_grid_table_context_menu_save_value_error');
-          }
-        },
-        isHidden: context => {
-          const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
-          return !content.isDownloadable(context.data.key);
-        },
-        isDisabled: context => {
-          const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: this.getMenuContentSaveToken(),
+      order: 4,
+      title: 'ui_download',
+      icon: '/icons/export.svg',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      onClick: async context => {
+        const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
+        try {
+          await content.downloadFileData(context.data.key);
+        } catch (exception: any) {
+          this.notificationService.logException(exception, 'data_grid_table_context_menu_save_value_error');
+        }
+      },
+      isHidden: context => {
+        const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
+        return !content.isDownloadable(context.data.key);
+      },
+      isDisabled: context => {
+        const content = context.data.model.source.getAction(context.data.resultIndex, ResultSetDataContentAction);
 
-          return context.data.model.isLoading() || (
-            !!content.activeElement && ResultSetDataKeysUtils.isElementsKeyEqual(
-              context.data.key, content.activeElement
-            )
-          );
-        },
-      }
-    );
+        return (
+          context.data.model.isLoading() ||
+          (!!content.activeElement && ResultSetDataKeysUtils.isElementsKeyEqual(context.data.key, content.activeElement))
+        );
+      },
+    });
   }
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuService.ts
index af3241319b..408de50586 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ContextMenuService, IContextMenuItem, IMenuPanel } from '@cloudbeaver/core-dialogs';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
@@ -26,9 +25,7 @@ export class DataGridContextMenuService {
   static cellContext = 'data-grid-cell-context-menu';
   private static readonly menuToken = 'dataGridCell';
 
-  constructor(
-    private readonly contextMenuService: ContextMenuService,
-  ) {
+  constructor(private readonly contextMenuService: ContextMenuService) {
     this.onRootMenuOpen = new Executor();
   }
 
@@ -42,13 +39,16 @@ export class DataGridContextMenuService {
     spreadsheetActions: IDataPresentationActions<IResultSetElementKey>,
     resultIndex: number,
     key: IResultSetElementKey,
-    simple: boolean
+    simple: boolean,
   ): IMenuPanel {
-    return this.contextMenuService.createContextMenu<IDataGridCellMenuContext>({
-      menuId: this.getMenuToken(),
-      contextType: DataGridContextMenuService.cellContext,
-      data: { model, actions, spreadsheetActions, resultIndex, key, simple },
-    }, this.getMenuToken());
+    return this.contextMenuService.createContextMenu<IDataGridCellMenuContext>(
+      {
+        menuId: this.getMenuToken(),
+        contextType: DataGridContextMenuService.cellContext,
+        data: { model, actions, spreadsheetActions, resultIndex, key, simple },
+      },
+      this.getMenuToken(),
+    );
   }
 
   openMenu(
@@ -57,7 +57,7 @@ export class DataGridContextMenuService {
     spreadsheetActions: IDataPresentationActions<IResultSetElementKey>,
     resultIndex: number,
     key: IResultSetElementKey,
-    simple: boolean
+    simple: boolean,
   ): void {
     this.onRootMenuOpen.execute({ model, actions, spreadsheetActions, resultIndex, key, simple });
   }
@@ -66,5 +66,5 @@ export class DataGridContextMenuService {
     this.contextMenuService.addMenuItem(panelId, menuItem);
   }
 
-  register(): void { }
+  register(): void {}
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridLoader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridLoader.tsx
index db1eb96ed8..f8f42c12cb 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridLoader.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridLoader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ComplexLoader, createComplexLoader } from '@cloudbeaver/core-blocks';
 import type { IDataPresentationProps } from '@cloudbeaver/plugin-data-viewer';
 
@@ -15,11 +14,5 @@ const loader = createComplexLoader(async function loader() {
 });
 
 export const DataGridLoader: React.FC<IDataPresentationProps> = function DataGridLoader(props) {
-  return (
-    <ComplexLoader loader={loader}>
-      {({ DataGridTable }) => (
-        <DataGridTable {...props} />
-      )}
-    </ComplexLoader>
-  );
+  return <ComplexLoader loader={loader}>{({ DataGridTable }) => <DataGridTable {...props} />}</ComplexLoader>;
 };
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/DataGridSelectionContext.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/DataGridSelectionContext.ts
index 9fe354d8c6..3e19ee5f8b 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/DataGridSelectionContext.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/DataGridSelectionContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { IResultSetElementKey } from '@cloudbeaver/plugin-data-viewer';
@@ -18,12 +17,7 @@ export interface IDataGridSelectionContext {
   selectColumn: (colIdx: number, multiple: boolean) => void;
   selectTable: () => void;
   isSelected: (rowIdx: number, colIdx: number) => boolean;
-  selectRange: (
-    startPosition: IDraggingPosition,
-    lastPosition: IDraggingPosition,
-    multiple: boolean,
-    temporary: boolean
-  ) => void;
+  selectRange: (startPosition: IDraggingPosition, lastPosition: IDraggingPosition, multiple: boolean, temporary: boolean) => void;
 }
 
 export const DataGridSelectionContext = createContext<IDataGridSelectionContext>(undefined as any);
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/useGridSelectionContext.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/useGridSelectionContext.tsx
index 94b22cccf5..b89afee0ab 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/useGridSelectionContext.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridSelection/useGridSelectionContext.tsx
@@ -5,12 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, observable } from 'mobx';
 import { useState } from 'react';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
-import { IResultSetColumnKey, IResultSetElementKey, IResultSetRowKey, ResultSetDataKeysUtils, ResultSetSelectAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  IResultSetColumnKey,
+  IResultSetElementKey,
+  IResultSetRowKey,
+  ResultSetDataKeysUtils,
+  ResultSetSelectAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import type { ITableData } from '../TableDataContext';
 import type { IDraggingPosition } from '../useGridDragging';
@@ -22,24 +27,23 @@ interface IGridSelectionState {
   lastSelectedCell: IDraggingPosition | null;
 }
 
-export function useGridSelectionContext(
-  tableData: ITableData,
-  selectionAction: ResultSetSelectAction
-): IDataGridSelectionContext {
+export function useGridSelectionContext(tableData: ITableData, selectionAction: ResultSetSelectAction): IDataGridSelectionContext {
   const props = useObjectRef({ tableData, selectionAction });
 
-  const [state] = useState<IGridSelectionState>(() => observable({
-    range: false,
-    temporarySelection: new Map<string, IResultSetElementKey[]>(),
-    lastSelectedCell: null,
-  }));
+  const [state] = useState<IGridSelectionState>(() =>
+    observable({
+      range: false,
+      temporarySelection: new Map<string, IResultSetElementKey[]>(),
+      lastSelectedCell: null,
+    }),
+  );
 
   const selectRows = action(function selectRows(
     startRow: IResultSetRowKey,
     lastRow: IResultSetRowKey,
     columns: IResultSetColumnKey[] = [],
     multiple = false,
-    temporary = false
+    temporary = false,
   ) {
     const { selectionAction } = props;
     const { temporarySelection } = state;
@@ -88,20 +92,18 @@ export function useGridSelectionContext(
       for (let rowIdx = firstRowIndex; rowIdx <= lastRowIndex; rowIdx++) {
         const row = props.tableData.getRow(rowIdx)!;
         const newElements = rowSelection
-          .filter(
-            element => !rowsSelection[i]
-              .some(column => ResultSetDataKeysUtils.isEqual(column.column, element))
-          )
+          .filter(element => !rowsSelection[i].some(column => ResultSetDataKeysUtils.isEqual(column.column, element)))
           .map<IResultSetElementKey>(column => ({ row, column }));
 
-        temporarySelection.set(ResultSetDataKeysUtils.serialize(row),
-          [...rowsSelection[i], ...newElements]
-            .filter(column => {
-              if (selected) {
-                return !rowSelection.some(key => ResultSetDataKeysUtils.isEqual(key, column.column));
-              }
-              return true;
-            }));
+        temporarySelection.set(
+          ResultSetDataKeysUtils.serialize(row),
+          [...rowsSelection[i], ...newElements].filter(column => {
+            if (selected) {
+              return !rowSelection.some(key => ResultSetDataKeysUtils.isEqual(key, column.column));
+            }
+            return true;
+          }),
+        );
         i++;
       }
       return;
@@ -116,12 +118,7 @@ export function useGridSelectionContext(
     }
   });
 
-  function selectRange(
-    startPosition: IDraggingPosition,
-    lastPosition: IDraggingPosition,
-    multiple: boolean,
-    temporary = false
-  ) {
+  function selectRange(startPosition: IDraggingPosition, lastPosition: IDraggingPosition, multiple: boolean, temporary = false) {
     state.range = temporary;
     const columnsInRange = props.tableData.getColumnsInRange(startPosition.colIdx, lastPosition.colIdx);
     const isIndexColumnInRange = props.tableData.isIndexColumnInRange(columnsInRange);
@@ -132,28 +129,19 @@ export function useGridSelectionContext(
       selectRows(
         startRow,
         lastRow,
-        isIndexColumnInRange
-          ? undefined
-          : (columnsInRange
-            .filter(column => column.columnDataIndex !== null)
-            .map(column => column.columnDataIndex!)),
+        isIndexColumnInRange ? undefined : columnsInRange.filter(column => column.columnDataIndex !== null).map(column => column.columnDataIndex!),
         multiple,
-        temporary
+        temporary,
       );
     }
   }
 
-  const selectColumn = action(function selectColumn(
-    colIdx: number,
-    multiple: boolean
-  ) {
+  const selectColumn = action(function selectColumn(colIdx: number, multiple: boolean) {
     const { selectionAction, tableData } = props;
 
     state.temporarySelection.clear();
 
-    const column = tableData
-      .getColumn(colIdx)
-      ?.columnDataIndex ?? undefined;
+    const column = tableData.getColumn(colIdx)?.columnDataIndex ?? undefined;
 
     const selected = selectionAction.isElementSelected({ column });
 
@@ -170,9 +158,7 @@ export function useGridSelectionContext(
   }
 
   function isSelected(rowIdx: number, colIdx: number) {
-    const column = props.tableData
-      .getColumn(colIdx)
-      ?.columnDataIndex ?? undefined;
+    const column = props.tableData.getColumn(colIdx)?.columnDataIndex ?? undefined;
 
     const row = props.tableData.getRow(rowIdx);
 
@@ -252,14 +238,17 @@ export function useGridSelectionContext(
     }
   }
 
-  return useObjectRef<IDataGridSelectionContext>(() => ({
-    get selectedCells() {
-      return props.selectionAction.selectedElements;
-    },
-    select,
-    selectColumn,
-    selectTable,
-    isSelected,
-    selectRange,
-  }), false);
+  return useObjectRef<IDataGridSelectionContext>(
+    () => ({
+      get selectedCells() {
+        return props.selectionAction.selectedElements;
+      },
+      select,
+      selectColumn,
+      selectTable,
+      isSelected,
+      selectRange,
+    }),
+    false,
+  );
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
index 520e175900..73a4120164 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
@@ -5,7 +5,6 @@
  * 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, useEffect, useMemo, useRef, useState } from 'react';
 import styled from 'reshadow';
@@ -16,8 +15,15 @@ import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events
 import { Executor } from '@cloudbeaver/core-executor';
 import { ClipboardService } from '@cloudbeaver/core-ui';
 import {
-  DatabaseDataSelectActionsData, DatabaseEditChangeType, IDatabaseResultSet, IDataPresentationProps,
-  IResultSetEditActionData, IResultSetElementKey, IResultSetPartialKey, ResultSetDataKeysUtils, ResultSetSelectAction
+  DatabaseDataSelectActionsData,
+  DatabaseEditChangeType,
+  IDatabaseResultSet,
+  IDataPresentationProps,
+  IResultSetEditActionData,
+  IResultSetElementKey,
+  IResultSetPartialKey,
+  ResultSetDataKeysUtils,
+  ResultSetSelectAction,
 } from '@cloudbeaver/plugin-data-viewer';
 import type { DataGridHandle, Position } from '@cloudbeaver/plugin-react-data-grid';
 import DataGrid from '@cloudbeaver/plugin-react-data-grid';
@@ -49,7 +55,13 @@ function isAtBottom(event: React.UIEvent<HTMLDivElement>): boolean {
 const rowHeight = 25;
 const headerHeight = 28;
 
-export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResultSet>>(function DataGridTable({ model, actions, resultIndex, simple, className }) {
+export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResultSet>>(function DataGridTable({
+  model,
+  actions,
+  resultIndex,
+  simple,
+  className,
+}) {
   const translate = useTranslate();
 
   const clipboardService = useService(ClipboardService);
@@ -57,10 +69,13 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
   const editorRef = useRef<HTMLDivElement>(null);
   const dataGridDivRef = useRef<HTMLDivElement | null>(null);
   const dataGridRef = useRef<DataGridHandle>(null);
-  const innerState = useObjectRef<IInnerState>(() => ({
-    lastCount: 0,
-    lastScrollTop: 0,
-  }), false);
+  const innerState = useObjectRef<IInnerState>(
+    () => ({
+      lastCount: 0,
+      lastScrollTop: 0,
+    }),
+    false,
+  );
   const styles = useStyles(reactGridStyles, baseStyles);
   const [columnResize] = useState(() => new Executor<IColumnResizeInfo>());
 
@@ -145,11 +160,7 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
 
   const hamdlers = useObjectRef(() => ({
     selectCell(pos: Position, scroll = false): void {
-      if (
-        dataGridRef.current?.selectedCell.idx !== pos.idx
-        || dataGridRef.current.selectedCell.rowIdx !== pos.rowIdx
-        || scroll
-      ) {
+      if (dataGridRef.current?.selectedCell.idx !== pos.idx || dataGridRef.current.selectedCell.rowIdx !== pos.rowIdx || scroll) {
         dataGridRef.current?.selectCell(pos);
       }
     },
@@ -212,8 +223,7 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
 
     switch (event.nativeEvent.code) {
       case 'Delete': {
-        const filteredRows = activeRows
-          .filter(cell => tableData.editor.getElementState(cell) !== DatabaseEditChangeType.delete);
+        const filteredRows = activeRows.filter(cell => tableData.editor.getElementState(cell) !== DatabaseEditChangeType.delete);
 
         if (filteredRows.length > 0) {
           const editor = tableData.editor;
@@ -264,12 +274,7 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
   useEffect(() => {
     function syncEditor(data: IResultSetEditActionData) {
       const editor = tableData.editor;
-      if (
-        data.resultId !== editor.result.id
-        || !data.value
-        || data.value.length === 0
-        || data.type === DatabaseEditChangeType.delete
-      ) {
+      if (data.resultId !== editor.result.id || !data.value || data.value.length === 0 || data.type === DatabaseEditChangeType.delete) {
         return;
       }
 
@@ -310,7 +315,8 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
     tableData.editor.action.addHandler(syncEditor);
 
     function syncFocus(data: DatabaseDataSelectActionsData<IResultSetPartialKey>) {
-      setTimeout(() => { // TODO: update focus after render rows update
+      setTimeout(() => {
+        // TODO: update focus after render rows update
         if (data.type === 'focus') {
           if (!data.key?.column || !data.key.row) {
             return;
@@ -337,9 +343,9 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
     const gridDiv = dataGridDivRef.current;
 
     if (
-      gridDiv
-      && innerState.lastCount > model.source.count
-      && model.source.count * rowHeight < gridDiv.scrollTop + gridDiv.clientHeight - headerHeight
+      gridDiv &&
+      innerState.lastCount > model.source.count &&
+      model.source.count * rowHeight < gridDiv.scrollTop + gridDiv.clientHeight - headerHeight
     ) {
       gridDiv.scrollTo({
         top: model.source.count * rowHeight - gridDiv.clientHeight + headerHeight - 1,
@@ -350,11 +356,7 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
   }, [model.source.count]);
 
   const handleFocusChange = (position: CellPosition) => {
-    if (
-      focusSyncRef.current
-      && focusSyncRef.current.idx === position.idx
-      && focusSyncRef.current.rowIdx === position.rowIdx
-    ) {
+    if (focusSyncRef.current && focusSyncRef.current.idx === position.idx && focusSyncRef.current.rowIdx === position.rowIdx) {
       focusSyncRef.current = null;
       return;
     }
@@ -388,20 +390,23 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
 
       await model.requestDataPortion(0, model.countGain + model.source.count);
     },
-    [model, resultIndex]
+    [model, resultIndex],
   );
 
-  const gridContext = useMemo<IDataGridContext>(() => ({
-    model,
-    actions,
-    columnResize,
-    resultIndex,
-    simple,
-    isGridInFocus,
-    getEditorPortal: () => editorRef.current,
-    getDataGridApi: () => dataGridRef.current,
-    focus: restoreFocus,
-  }), [model, actions, resultIndex, simple, editorRef, dataGridRef, gridContainerRef, restoreFocus]);
+  const gridContext = useMemo<IDataGridContext>(
+    () => ({
+      model,
+      actions,
+      columnResize,
+      resultIndex,
+      simple,
+      isGridInFocus,
+      getEditorPortal: () => editorRef.current,
+      getDataGridApi: () => dataGridRef.current,
+      focus: restoreFocus,
+    }),
+    [model, actions, resultIndex, simple, editorRef, dataGridRef, gridContainerRef, restoreFocus],
+  );
 
   if (!tableData.columns.length) {
     return <TextPlaceholder>{translate('data_grid_table_empty_placeholder')}</TextPlaceholder>;
@@ -445,6 +450,6 @@ export const DataGridTable = observer<IDataPresentationProps<any, IDatabaseResul
           </TableDataContext.Provider>
         </EditingContext.Provider>
       </DataGridSelectionContext.Provider>
-    </DataGridContext.Provider>
+    </DataGridContext.Provider>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatter.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatter.tsx
index 60c669b956..ff32574560 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatter.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatter.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext, useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -51,11 +50,7 @@ export const CellFormatter = observer<Props>(function CellFormatter({ className,
   const editingContext = useContext(EditingContext);
   const [menuVisible, setMenuVisible] = useState(false);
   const isEditing = cellContext.isEditing;
-  const showCellMenu = getComputed(() => !isEditing && (
-    rest.isCellSelected
-    || cellContext.mouse.state.mouseEnter
-    || menuVisible
-  ));
+  const showCellMenu = getComputed(() => !isEditing && (rest.isCellSelected || cellContext.mouse.state.mouseEnter || menuVisible));
 
   const spreadsheetActions = useObjectRef<IDataPresentationActions<IResultSetElementKey>>({
     edit(position) {
@@ -73,7 +68,7 @@ export const CellFormatter = observer<Props>(function CellFormatter({ className,
       <formatter-container>
         <CellFormatterFactory {...rest} isEditing={isEditing} />
       </formatter-container>
-      {showCellMenu && cellContext.cell && !rest.isScrolling  && (
+      {showCellMenu && cellContext.cell && !rest.isScrolling && (
         <menu-container>
           <CellMenu
             cellKey={cellContext.cell}
@@ -86,6 +81,6 @@ export const CellFormatter = observer<Props>(function CellFormatter({ className,
           />
         </menu-container>
       )}
-    </formatter-wrapper>
+    </formatter-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatterFactory.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatterFactory.tsx
index 9e43fb9579..b0951a4d52 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatterFactory.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatterFactory.tsx
@@ -5,14 +5,12 @@
  * 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 { useContext, useRef } from 'react';
 
 import { IResultSetRowKey, isBooleanValuePresentationAvailable } from '@cloudbeaver/plugin-data-viewer';
 import type { FormatterProps } from '@cloudbeaver/plugin-react-data-grid';
 
-
 import { CellContext } from '../CellRenderer/CellContext';
 import { TableDataContext } from '../TableDataContext';
 import { BooleanFormatter } from './CellFormatters/BooleanFormatter';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/BooleanFormatter.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/BooleanFormatter.tsx
index 5220440787..3089039b9d 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/BooleanFormatter.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/BooleanFormatter.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useContext, useMemo } from 'react';
-import styled, { use, css } from 'reshadow';
+import styled, { css, use } from 'reshadow';
 
 import type { IResultSetRowKey } from '@cloudbeaver/plugin-data-viewer';
 import type { FormatterProps } from '@cloudbeaver/plugin-react-data-grid';
@@ -47,16 +46,12 @@ export const BooleanFormatter = observer<FormatterProps<IResultSetRowKey>>(funct
   const formatter = tableDataContext.format;
   const rawValue = useMemo(
     () => computed(() => formatter.get(tableDataContext.getCellValue(cellContext!.cell!)!)),
-    [tableDataContext, cellContext.cell, formatter]
+    [tableDataContext, cellContext.cell, formatter],
   ).get();
   const value = typeof rawValue === 'string' ? rawValue.toLowerCase() === 'true' : rawValue;
   const stringifiedValue = formatter.toDisplayString(value);
   const valueRepresentation = value === null ? stringifiedValue : `[${value ? 'v' : ' '}]`;
-  const disabled = (
-    !column.editable
-    || editingContext.readonly
-    || formatter.isReadOnly(cellContext.cell)
-  );
+  const disabled = !column.editable || editingContext.readonly || formatter.isReadOnly(cellContext.cell);
 
   function toggleValue() {
     if (disabled || !tableDataContext || !cellContext.cell) {
@@ -76,12 +71,12 @@ export const BooleanFormatter = observer<FormatterProps<IResultSetRowKey>>(funct
   return styled(styles)(
     <boolean-formatter
       className={value === null ? 'cell-null' : undefined}
-      as='span'
+      as="span"
       title={stringifiedValue}
       onClick={toggleValue}
       {...use({ disabled, boolean: value !== null })}
     >
       {valueRepresentation}
-    </boolean-formatter>
+    </boolean-formatter>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/TextFormatter.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/TextFormatter.tsx
index 2f884f7482..d7635f5f7c 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/TextFormatter.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/CellFormatters/TextFormatter.tsx
@@ -5,11 +5,9 @@
  * 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, useContext, useEffect, useRef } from 'react';
 
-
 import { getComputed, IconOrImage } from '@cloudbeaver/core-blocks';
 import { clsx, isValidUrl } from '@cloudbeaver/core-utils';
 import type { IResultSetRowKey } from '@cloudbeaver/plugin-data-viewer';
@@ -52,12 +50,7 @@ export const TextFormatter = observer<FormatterProps<IResultSetRowKey>>(function
   if (cellContext.isEditing) {
     return (
       <div className={classes}>
-        <CellEditor
-          ref={editorRef}
-          row={row}
-          column={column}
-          onClose={handleClose}
-        />
+        <CellEditor ref={editorRef} row={row} column={column} onClose={handleClose} />
       </div>
     );
   }
@@ -67,11 +60,11 @@ export const TextFormatter = observer<FormatterProps<IResultSetRowKey>>(function
   return (
     <div title={value} className={classes}>
       {isUrl && (
-        <a href={rawValue as string} target='_blank' rel='noreferrer' draggable={false}>
-          <IconOrImage icon='external-link' viewBox='0 0 24 24' />
+        <a href={rawValue as string} target="_blank" rel="noreferrer" draggable={false}>
+          <IconOrImage icon="external-link" viewBox="0 0 24 24" />
         </a>
       )}
-      <div className='text-formatter__value'>{value}</div>
+      <div className="text-formatter__value">{value}</div>
     </div>
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/IndexFormatter.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/IndexFormatter.tsx
index fc5e7609d3..88f3a132e3 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/IndexFormatter.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/IndexFormatter.tsx
@@ -5,13 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useContext } from 'react';
 
 import type { IResultSetRowKey } from '@cloudbeaver/plugin-data-viewer';
 import type { FormatterProps } from '@cloudbeaver/plugin-react-data-grid';
 
-
 import { CellContext } from '../CellRenderer/CellContext';
 
 export const IndexFormatter: React.FC<FormatterProps<IResultSetRowKey>> = function IndexFormatter(props) {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx
index 9665dd6e95..34769838a8 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -41,9 +40,7 @@ export const CellMenu = observer<Props>(function CellMenu({
 }) {
   const dataGridContextMenuService = useService(DataGridContextMenuService);
 
-  const panel = dataGridContextMenuService.constructMenuWithContext(
-    model, actions, spreadsheetActions, resultIndex, cellKey, simple
-  );
+  const panel = dataGridContextMenuService.constructMenuWithContext(model, actions, spreadsheetActions, resultIndex, cellKey, simple);
 
   if (!panel.menuItems.length || panel.menuItems.every(item => item.isHidden)) {
     return null;
@@ -63,20 +60,10 @@ export const CellMenu = observer<Props>(function CellMenu({
   }
 
   return styled(cellMenuStyles)(
-    <cell-menu
-      as='div'
-      onMouseUp={markStopPropagation}
-      onDoubleClick={stopPropagation}
-    >
-      <MenuTrigger
-        panel={panel}
-        style={[cellMenuStyles]}
-        modal
-        onClick={handleClick}
-        onVisibleSwitch={onStateSwitch}
-      >
+    <cell-menu as="div" onMouseUp={markStopPropagation} onDoubleClick={stopPropagation}>
+      <MenuTrigger panel={panel} style={[cellMenuStyles]} modal onClick={handleClick} onVisibleSwitch={onStateSwitch}>
         <Icon name="snack" viewBox="0 0 16 10" />
       </MenuTrigger>
-    </cell-menu>
+    </cell-menu>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/cellMenuStyles.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/cellMenuStyles.ts
index e023c1800b..efbf1869cd 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/cellMenuStyles.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/cellMenuStyles.ts
@@ -5,34 +5,33 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const cellMenuStyles = css`
-    IconOrImage {
-      composes: theme-text-primary from global;
-    }
-    :global(.rdg-cell):not(:global([aria-selected=true])):not(:hover) cell-menu {
+  IconOrImage {
+    composes: theme-text-primary from global;
+  }
+  :global(.rdg-cell):not(:global([aria-selected='true'])):not(:hover) cell-menu {
+    display: none;
+  }
+  cell-menu {
+    flex: 0 0 auto;
+    height: var(--rdg-row-height);
+    position: absolute;
+    top: 0px;
+    right: 0px;
+  }
+  MenuTrigger {
+    height: 100%;
+
+    &:before {
       display: none;
     }
-    cell-menu {
-      flex: 0 0 auto;
-      height: var(--rdg-row-height);
-      position: absolute;
-      top: 0px;
-      right: 0px;
-    }
-    MenuTrigger {
-      height: 100%;
 
-      &:before {
-        display: none;
-      }
-
-      & Icon {
-        cursor: pointer;
-        width: 16px;
-        height: 10px; 
-      }
+    & Icon {
+      cursor: pointer;
+      width: 16px;
+      height: 10px;
     }
+  }
 `;
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/OrderButton.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/OrderButton.tsx
index b8326882ea..faecbae305 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/OrderButton.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/OrderButton.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -42,12 +41,7 @@ interface Props {
   className?: string;
 }
 
-export const OrderButton = observer<Props>(function OrderButton({
-  model,
-  resultIndex,
-  attributePosition,
-  className,
-}) {
+export const OrderButton = observer<Props>(function OrderButton({ model, resultIndex, attributePosition, className }) {
   const translate = useTranslate();
   const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
   const currentOrder = constraints.getOrder(attributePosition);
@@ -74,18 +68,14 @@ export const OrderButton = observer<Props>(function OrderButton({
 
   return styled(styles)(
     <order-button
-      as='button'
+      as="button"
       title={translate('data_grid_table_tooltip_column_header_order')}
       className={className}
       disabled={disabled}
       onMouseDown={preventFocus}
       onClick={handleSort}
     >
-      <IconOrImage
-        icon={icon}
-        viewBox='0 0 16 16'
-        className={currentOrder === null ? 'rdg-table-header__order-button_unordered' : undefined}
-      />
-    </order-button>
+      <IconOrImage icon={icon} viewBox="0 0 16 16" className={currentOrder === null ? 'rdg-table-header__order-button_unordered' : undefined} />
+    </order-button>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
index 09c6fe6a37..9ec9cb5bc8 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -63,9 +62,7 @@ const headerStyles = css`
   }
 `;
 
-export const TableColumnHeader = observer<HeaderRendererProps<any>>(function TableColumnHeader({
-  column: calculatedColumn,
-}) {
+export const TableColumnHeader = observer<HeaderRendererProps<any>>(function TableColumnHeader({ column: calculatedColumn }) {
   const dataGridContext = useContext(DataGridContext);
   const tableDataContext = useContext(TableDataContext);
   const gridSelectionContext = useContext(DataGridSelectionContext);
@@ -76,9 +73,7 @@ export const TableColumnHeader = observer<HeaderRendererProps<any>>(function Tab
   const dndData = useTableColumnDnD(model, resultIndex, calculatedColumn.columnDataIndex);
 
   const dataReadonly = getComputed(() => tableDataContext.isReadOnly() || model.isReadonly(resultIndex));
-  const sortingDisabled = getComputed(
-    () => !tableDataContext.constraints.supported || !model.source.executionContext?.context
-  );
+  const sortingDisabled = getComputed(() => !tableDataContext.constraints.supported || !model.source.executionContext?.context);
 
   let resultColumn: SqlResultColumn | undefined;
   let icon = calculatedColumn.icon;
@@ -114,20 +109,14 @@ export const TableColumnHeader = observer<HeaderRendererProps<any>>(function Tab
 
   return styled(headerStyles)(
     <table-header ref={dndData.setTargetRef} {...use({ dragging: dndData.state.isDragging })}>
-      <shrink-container as='div' title={columnTooltip} onClick={handleClick}>
+      <shrink-container as="div" title={columnTooltip} onClick={handleClick}>
         <icon>
           {icon && <StaticImage icon={icon} />}
-          {!dataReadonly && columnReadOnly && <readonly-status className='rdg-table-header__readonly-status' />}
+          {!dataReadonly && columnReadOnly && <readonly-status className="rdg-table-header__readonly-status" />}
         </icon>
         <name>{columnName}</name>
       </shrink-container>
-      {!sortingDisabled && resultColumn && (
-        <OrderButton
-          model={model}
-          resultIndex={resultIndex}
-          attributePosition={resultColumn.position}
-        />
-      )}
-    </table-header>
+      {!sortingDisabled && resultColumn && <OrderButton model={model} resultIndex={resultIndex} attributePosition={resultColumn.position} />}
+    </table-header>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx
index 57dc688861..87e766e097 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled, { css } from 'reshadow';
@@ -42,10 +41,7 @@ export const TableIndexColumnHeader = observer<HeaderRendererProps<any>>(functio
     throw new Error('Contexts required');
   }
 
-  const readonly = getComputed(() => (
-    tableDataContext.isReadOnly()
-    || dataGridContext.model.isReadonly(dataGridContext.resultIndex)
-  ));
+  const readonly = getComputed(() => tableDataContext.isReadOnly() || dataGridContext.model.isReadonly(dataGridContext.resultIndex));
 
   function handleClick(event: React.MouseEvent<HTMLButtonElement>) {
     selectionContext.selectTable();
@@ -54,8 +50,8 @@ export const TableIndexColumnHeader = observer<HeaderRendererProps<any>>(functio
 
   return styled(styles)(
     <container title={translate('data_grid_table_index_column_tooltip')} onClick={handleClick}>
-      {readonly && <IconOrImage title={translate('data_grid_table_readonly_tooltip')} icon='/icons/lock.png' />}
+      {readonly && <IconOrImage title={translate('data_grid_table_readonly_tooltip')} icon="/icons/lock.png" />}
       {props.column.name}
-    </container>
+    </container>,
   );
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/useTableColumnDnD.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/useTableColumnDnD.ts
index 2e2f0f3144..fbf9344f7c 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/useTableColumnDnD.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/useTableColumnDnD.ts
@@ -5,16 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { IDNDData, useDNDData } from '@cloudbeaver/core-ui';
 import { useDataContext } from '@cloudbeaver/core-view';
-import { DATA_CONTEXT_DV_DDM, DATA_CONTEXT_DV_DDM_RESULT_INDEX, DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY, IDatabaseDataModel, IResultSetColumnKey } from '@cloudbeaver/plugin-data-viewer';
+import {
+  DATA_CONTEXT_DV_DDM,
+  DATA_CONTEXT_DV_DDM_RESULT_INDEX,
+  DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY,
+  IDatabaseDataModel,
+  IResultSetColumnKey,
+} from '@cloudbeaver/plugin-data-viewer';
 
-export function useTableColumnDnD(
-  model: IDatabaseDataModel,
-  resultIndex: number,
-  columnKey: IResultSetColumnKey | null
-): IDNDData {
+export function useTableColumnDnD(model: IDatabaseDataModel, resultIndex: number, columnKey: IResultSetColumnKey | null): IDNDData {
   const context = useDataContext();
 
   context.set(DATA_CONTEXT_DV_DDM, model);
@@ -26,4 +27,4 @@ export function useTableColumnDnD(
   });
 
   return dndData;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableDataContext.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableDataContext.ts
index 1700d6dc68..c1d6558471 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableDataContext.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableDataContext.ts
@@ -5,14 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
-
 import type { SqlResultColumn } from '@cloudbeaver/core-sdk';
 import type {
-  IResultSetColumnKey, IResultSetElementKey, IResultSetRowKey, IResultSetValue, DatabaseEditChangeType,
-  ResultSetDataAction, ResultSetEditAction, ResultSetFormatAction, ResultSetViewAction, ResultSetConstraintAction
+  DatabaseEditChangeType,
+  IResultSetColumnKey,
+  IResultSetElementKey,
+  IResultSetRowKey,
+  IResultSetValue,
+  ResultSetConstraintAction,
+  ResultSetDataAction,
+  ResultSetEditAction,
+  ResultSetFormatAction,
+  ResultSetViewAction,
 } from '@cloudbeaver/plugin-data-viewer';
 import type { Column } from '@cloudbeaver/plugin-react-data-grid';
 
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridDragging.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridDragging.ts
index 551f30e00d..704b669d7e 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridDragging.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridDragging.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback, useEffect } from 'react';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
@@ -23,7 +22,7 @@ interface IMousePosition {
 type DraggingCallback = (
   startPosition: IDraggingPosition,
   currentPosition: IDraggingPosition,
-  event: React.MouseEvent<HTMLDivElement> | MouseEvent
+  event: React.MouseEvent<HTMLDivElement> | MouseEvent,
 ) => void;
 
 interface IDraggingState {
@@ -35,10 +34,7 @@ interface IDraggingState {
 }
 
 interface IDraggingCallbacks {
-  onDragStart?: (
-    startPosition: IDraggingPosition,
-    event: React.MouseEvent<HTMLDivElement> | MouseEvent
-  ) => void;
+  onDragStart?: (startPosition: IDraggingPosition, event: React.MouseEvent<HTMLDivElement> | MouseEvent) => void;
   onDragOver?: DraggingCallback;
   onDragEnd?: DraggingCallback;
 }
@@ -88,13 +84,16 @@ function isDraggingStarted(delta: number | null, threshold: number) {
 export function useGridDragging(props: IDraggingCallbacks) {
   const callbacks = useObjectRef(props);
 
-  const state = useObjectRef<IDraggingState>(() => ({
-    startDraggingCell: null,
-    currentDraggingCell: null,
-    startMousePosition: null,
-    dragging: false,
-    mouseDown: false,
-  }), false);
+  const state = useObjectRef<IDraggingState>(
+    () => ({
+      startDraggingCell: null,
+      currentDraggingCell: null,
+      startMousePosition: null,
+      dragging: false,
+      mouseDown: false,
+    }),
+    false,
+  );
 
   const onMouseDownHandler = useCallback((event: React.MouseEvent<HTMLDivElement>) => {
     const position = getCellPositionFromEvent(event);
@@ -134,8 +133,7 @@ export function useGridDragging(props: IDraggingCallbacks) {
     }
 
     // check if the new cell is equal to the previous cell
-    if (position.rowIdx === state.currentDraggingCell?.rowIdx
-      && position.colIdx === state.currentDraggingCell.colIdx) {
+    if (position.rowIdx === state.currentDraggingCell?.rowIdx && position.colIdx === state.currentDraggingCell.colIdx) {
       return;
     }
 
@@ -151,7 +149,8 @@ export function useGridDragging(props: IDraggingCallbacks) {
           colIdx: position.colIdx,
           rowIdx: position.rowIdx,
         },
-        event);
+        event,
+      );
     }
   }, []);
 
@@ -173,7 +172,8 @@ export function useGridDragging(props: IDraggingCallbacks) {
           colIdx: state.currentDraggingCell.colIdx,
           rowIdx: state.currentDraggingCell.rowIdx,
         },
-        event);
+        event,
+      );
     }
 
     state.dragging = false;
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridSelectedCellsCopy.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridSelectedCellsCopy.ts
index 87a8d2d1cf..1dd5ad7aaa 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridSelectedCellsCopy.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useGridSelectedCellsCopy.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 import { useObjectRef } from '@cloudbeaver/core-blocks';
@@ -26,13 +25,9 @@ function getCellCopyValue(tableData: ITableData, key: IResultSetElementKey): str
   return cellValue ?? '';
 }
 
-function getSelectedCellsValue(
-  tableData: ITableData,
-  selectedCells: Map<string, IResultSetElementKey[]>
-) {
+function getSelectedCellsValue(tableData: ITableData, selectedCells: Map<string, IResultSetElementKey[]>) {
   const orderedSelectedCells = new Map<string, IResultSetElementKey[]>(
-    [...selectedCells]
-      .sort((a, b) => tableData.getRowIndexFromKey(a[1][0].row) - tableData.getRowIndexFromKey(b[1][0].row))
+    [...selectedCells].sort((a, b) => tableData.getRowIndexFromKey(a[1][0].row) - tableData.getRowIndexFromKey(b[1][0].row)),
   );
 
   const selectedColumns: IResultSetColumnKey[] = [];
@@ -46,9 +41,7 @@ function getSelectedCellsValue(
   for (const rowSelection of orderedSelectedCells.values()) {
     const rowCellsValues: string[] = [];
     for (const column of tableData.view.columnKeys) {
-      if (
-        !selectedColumns.some(columnKey => ResultSetDataKeysUtils.isEqual(columnKey, column))
-      ) {
+      if (!selectedColumns.some(columnKey => ResultSetDataKeysUtils.isEqual(columnKey, column))) {
         continue;
       }
 
@@ -69,7 +62,7 @@ function getSelectedCellsValue(
 export function useGridSelectedCellsCopy(
   tableData: ITableData,
   resultSetSelectAction: ResultSetSelectAction,
-  selectionContext: IDataGridSelectionContext
+  selectionContext: IDataGridSelectionContext,
 ) {
   const props = useObjectRef({ tableData, selectionContext, resultSetSelectAction });
 
@@ -81,10 +74,7 @@ export function useGridSelectedCellsCopy(
       let value: string | null = null;
 
       if (Array.from(props.selectionContext.selectedCells.keys()).length > 0) {
-        value = getSelectedCellsValue(
-          props.tableData,
-          props.selectionContext.selectedCells
-        );
+        value = getSelectedCellsValue(props.tableData, props.selectionContext.selectedCells);
       } else if (focusedElement) {
         value = getCellCopyValue(tableData, focusedElement);
       }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableData.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableData.ts
index 4ad366146e..212e2a1387 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableData.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableData.ts
@@ -5,16 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
-
 import { useObservableRef } from '@cloudbeaver/core-blocks';
 import { TextTools } from '@cloudbeaver/core-utils';
 import {
-  IDatabaseDataModel, IDatabaseResultSet, IResultSetColumnKey, IResultSetElementKey, IResultSetRowKey,
-  ResultSetConstraintAction, ResultSetDataAction, ResultSetDataKeysUtils,
-  ResultSetEditAction, ResultSetFormatAction, ResultSetViewAction
+  IDatabaseDataModel,
+  IDatabaseResultSet,
+  IResultSetColumnKey,
+  IResultSetElementKey,
+  IResultSetRowKey,
+  ResultSetConstraintAction,
+  ResultSetDataAction,
+  ResultSetDataKeysUtils,
+  ResultSetEditAction,
+  ResultSetFormatAction,
+  ResultSetViewAction,
 } from '@cloudbeaver/plugin-data-viewer';
 import type { Column } from '@cloudbeaver/plugin-react-data-grid';
 
@@ -40,7 +46,7 @@ export function useTableData(
   model: IDatabaseDataModel<any, IDatabaseResultSet>,
   resultIndex: number,
   gridDIVElement: React.RefObject<HTMLDivElement | null>,
-  onCellKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void
+  onCellKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void,
 ): ITableData {
   const format = model.source.getAction(resultIndex, ResultSetFormatAction);
   const data = model.source.getAction(resultIndex, ResultSetDataAction);
@@ -48,37 +54,37 @@ export function useTableData(
   const view = model.source.getAction(resultIndex, ResultSetViewAction);
   const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
 
-  return useObservableRef<ITableData & { gridDIVElement: React.RefObject<HTMLDivElement | null> }>(() => ({
-    get gridDiv(): HTMLDivElement | null {
-      return this.gridDIVElement.current;
-    },
-    get columnKeys(): IResultSetColumnKey[] {
-      return this.view.columnKeys;
-    },
-    get rows(): IResultSetRowKey[] {
-      return this.view.rowKeys;
-    },
-    get columns() {
-      if (this.columnKeys.length === 0) {
-        return [];
-      }
-      const columnNames = this.format.getHeaders();
-      const rowStrings = this.format.getLongestCells();
+  return useObservableRef<ITableData & { gridDIVElement: React.RefObject<HTMLDivElement | null> }>(
+    () => ({
+      get gridDiv(): HTMLDivElement | null {
+        return this.gridDIVElement.current;
+      },
+      get columnKeys(): IResultSetColumnKey[] {
+        return this.view.columnKeys;
+      },
+      get rows(): IResultSetRowKey[] {
+        return this.view.rowKeys;
+      },
+      get columns() {
+        if (this.columnKeys.length === 0) {
+          return [];
+        }
+        const columnNames = this.format.getHeaders();
+        const rowStrings = this.format.getLongestCells();
 
-      // TODO: seems better to do not measure container size
-      //       for detecting max columns size, better to use configurable variable
-      const measuredCells = TextTools.getWidth({
-        font: '400 14px Roboto',
-        text: columnNames.map((cell, i) => {
-          if (cell.length > (rowStrings[i] || '').length) {
-            return cell;
-          }
-          return rowStrings[i];
-        }),
-      }).map(v => v + 16 + 32 + 20);
+        // TODO: seems better to do not measure container size
+        //       for detecting max columns size, better to use configurable variable
+        const measuredCells = TextTools.getWidth({
+          font: '400 14px Roboto',
+          text: columnNames.map((cell, i) => {
+            if (cell.length > (rowStrings[i] || '').length) {
+              return cell;
+            }
+            return rowStrings[i];
+          }),
+        }).map(v => v + 16 + 32 + 20);
 
-      const columns: Array<Column<IResultSetRowKey, any>> = this.columnKeys.map<Column<IResultSetRowKey, any>>(
-        (col, index) => ({
+        const columns: Array<Column<IResultSetRowKey, any>> = this.columnKeys.map<Column<IResultSetRowKey, any>>((col, index) => ({
           // key: uuid(),
           key: ResultSetDataKeysUtils.serialize(col),
           columnDataIndex: { index },
@@ -90,115 +96,108 @@ export function useTableData(
             onCellKeyDown,
           },
         }));
-      columns.unshift(indexColumn);
+        columns.unshift(indexColumn);
 
-      return columns;
-    },
-    getMetrics(columnIndex) {
-      if (columnIndex < 0 || columnIndex > this.columns.length) {
-        return undefined;
-      }
+        return columns;
+      },
+      getMetrics(columnIndex) {
+        if (columnIndex < 0 || columnIndex > this.columns.length) {
+          return undefined;
+        }
 
-      let left = 0;
-      for (let i = 0; i < columnIndex; i++) {
-        const column = this.columns[i];
-        left += column.width as number;
-      }
+        let left = 0;
+        for (let i = 0; i < columnIndex; i++) {
+          const column = this.columns[i];
+          left += column.width as number;
+        }
 
-      const column = this.getColumn(columnIndex)!;
+        const column = this.getColumn(columnIndex)!;
 
-      return {
-        left,
-        right: left + (column.width as number),
-        width: column.width as number,
-      };
-    },
-    getRow(rowIndex) {
-      return this.rows[rowIndex];
-    },
-    getColumn(columnIndex) {
-      return this.columns[columnIndex];
-    },
-    getColumnByDataIndex(key) {
-      return this.columns.find(column => (
-        column.columnDataIndex !== null
-        && ResultSetDataKeysUtils.isEqual(column.columnDataIndex, key)
-      ))!;
-    },
-    getColumnInfo(key) {
-      return this.data.getColumn(key);
-    },
-    getCellValue(key) {
-      return this.view.getCellValue(key);
-    },
-    getColumnIndexFromKey(key) {
-      return this.columns.findIndex(column => column.key === key);
-    },
-    getColumnIndexFromColumnKey(columnKey) {
-      return this.columns
-        .findIndex(column => (
-          column.columnDataIndex !== null
-          && ResultSetDataKeysUtils.isEqual(columnKey, column.columnDataIndex)
-        ));
-    },
-    getRowIndexFromKey(rowKey) {
-      return this.rows.findIndex(row => ResultSetDataKeysUtils.isEqual(rowKey, row));
-    },
-    getColumnsInRange(startIndex, endIndex) {
-      if (startIndex === endIndex) {
-        return [this.columns[startIndex]];
-      }
+        return {
+          left,
+          right: left + (column.width as number),
+          width: column.width as number,
+        };
+      },
+      getRow(rowIndex) {
+        return this.rows[rowIndex];
+      },
+      getColumn(columnIndex) {
+        return this.columns[columnIndex];
+      },
+      getColumnByDataIndex(key) {
+        return this.columns.find(column => column.columnDataIndex !== null && ResultSetDataKeysUtils.isEqual(column.columnDataIndex, key))!;
+      },
+      getColumnInfo(key) {
+        return this.data.getColumn(key);
+      },
+      getCellValue(key) {
+        return this.view.getCellValue(key);
+      },
+      getColumnIndexFromKey(key) {
+        return this.columns.findIndex(column => column.key === key);
+      },
+      getColumnIndexFromColumnKey(columnKey) {
+        return this.columns.findIndex(column => column.columnDataIndex !== null && ResultSetDataKeysUtils.isEqual(columnKey, column.columnDataIndex));
+      },
+      getRowIndexFromKey(rowKey) {
+        return this.rows.findIndex(row => ResultSetDataKeysUtils.isEqual(rowKey, row));
+      },
+      getColumnsInRange(startIndex, endIndex) {
+        if (startIndex === endIndex) {
+          return [this.columns[startIndex]];
+        }
 
-      const firstIndex = Math.min(startIndex, endIndex);
-      const lastIndex = Math.max(startIndex, endIndex);
-      return this.columns.slice(firstIndex, lastIndex + 1);
-    },
-    getEditionState(key) {
-      return this.editor.getElementState(key);
-    },
-    inBounds(position) {
-      return this.view.has(position);
-    },
-    isCellEdited(key) {
-      return this.editor.isElementEdited(key);
-    },
-    isIndexColumn(columnKey) {
-      return columnKey === indexColumn.key;
-    },
-    isIndexColumnInRange(columnsRange) {
-      return columnsRange.some(column => this.isIndexColumn(column.key));
-    },
-    isReadOnly() {
-      return this.columnKeys.every(column => this.getColumnInfo(column)?.readOnly);
-    },
-    isCellReadonly(key: Partial<IResultSetElementKey>) {
-      if (!key.column) {
-        return true;
-      }
+        const firstIndex = Math.min(startIndex, endIndex);
+        const lastIndex = Math.max(startIndex, endIndex);
+        return this.columns.slice(firstIndex, lastIndex + 1);
+      },
+      getEditionState(key) {
+        return this.editor.getElementState(key);
+      },
+      inBounds(position) {
+        return this.view.has(position);
+      },
+      isCellEdited(key) {
+        return this.editor.isElementEdited(key);
+      },
+      isIndexColumn(columnKey) {
+        return columnKey === indexColumn.key;
+      },
+      isIndexColumnInRange(columnsRange) {
+        return columnsRange.some(column => this.isIndexColumn(column.key));
+      },
+      isReadOnly() {
+        return this.columnKeys.every(column => this.getColumnInfo(column)?.readOnly);
+      },
+      isCellReadonly(key: Partial<IResultSetElementKey>) {
+        if (!key.column) {
+          return true;
+        }
 
-      const column = this.getColumnByDataIndex(key.column);
+        const column = this.getColumnByDataIndex(key.column);
 
-      return (
-        !column.editable
-        || this.format.isReadOnly(key)
-      );
+        return !column.editable || this.format.isReadOnly(key);
+      },
+    }),
+    {
+      columns: computed,
+      rows: computed,
+      columnKeys: computed,
+      format: observable.ref,
+      data: observable.ref,
+      editor: observable.ref,
+      view: observable.ref,
+      constraints: observable.ref,
+      gridDIVElement: observable.ref,
     },
-  }), {
-    columns: computed,
-    rows: computed,
-    columnKeys: computed,
-    format: observable.ref,
-    data: observable.ref,
-    editor: observable.ref,
-    view: observable.ref,
-    constraints: observable.ref,
-    gridDIVElement: observable.ref,
-  }, {
-    format,
-    data,
-    editor,
-    view,
-    constraints,
-    gridDIVElement,
-  });
+    {
+      format,
+      data,
+      editor,
+      view,
+      constraints,
+      gridDIVElement,
+    },
+  );
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.test.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.test.ts
index 7351f1bf13..0f273cb3a1 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.test.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -25,19 +24,9 @@ import { DataGridSettings, DataGridSettingsService } from './DataGridSettingsSer
 import { manifest } from './manifest';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  datasourceContextSwitch,
-  navigationTree,
-  navigationTabs,
-  objectViewer,
-  dataViewer,
-  manifest
-);
+const app = createApp(datasourceContextSwitch, navigationTree, navigationTabs, objectViewer, dataViewer, manifest);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -70,9 +59,7 @@ test('New settings equal deprecated settings A', async () => {
   const settings = app.injector.getServiceByClass(DataGridSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigA)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigA)));
 
   await config.refresh();
 
@@ -84,12 +71,10 @@ test('New settings equal deprecated settings B', async () => {
   const settings = app.injector.getServiceByClass(DataGridSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfigB)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfigB)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('hidden')).toBe(testValueB);
   expect(settings.deprecatedSettings.getValue('hidden')).toBe(testValueB);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.ts
index 8be1043f96..c220e2f9c1 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGridSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/Editing/EditingContext.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/Editing/EditingContext.tsx
index 73967607d6..658519794a 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/Editing/EditingContext.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/Editing/EditingContext.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 export interface IEditingContext {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/Editing/useEditing.ts b/webapp/packages/plugin-data-spreadsheet-new/src/Editing/useEditing.ts
index 52fabde8b5..a7c2eb743c 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/Editing/useEditing.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/Editing/useEditing.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { useState } from 'react';
 
@@ -29,13 +28,17 @@ interface IEditingOptions {
 }
 
 export function useEditing(options: IEditingOptions): IEditingContext {
-  const state = useObservableRef(() => ({
-    editingCells: new MetadataMap<string, IEditingState>(() => ({ editing: false })),
-    editorOpened: false,
-  }), {
-    editorOpened: observable.ref,
-    readonly: observable.ref,
-  }, { options, readonly: !!options.readonly });
+  const state = useObservableRef(
+    () => ({
+      editingCells: new MetadataMap<string, IEditingState>(() => ({ editing: false })),
+      editorOpened: false,
+    }),
+    {
+      editorOpened: observable.ref,
+      readonly: observable.ref,
+    },
+    { options, readonly: !!options.readonly },
+  );
 
   const [context] = useState<IEditingContext>({
     get readonly() {
@@ -75,9 +78,7 @@ export function useEditing(options: IEditingOptions): IEditingContext {
       return state.editorOpened;
     },
     isEditing(position: CellPosition) {
-      return state.editingCells
-        .get(getPositionHash(position))
-        .editing;
+      return state.editingCells.get(getPositionHash(position)).editing;
     },
   });
 
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/LocaleService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/LocaleService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetBootstrap.ts b/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetBootstrap.ts
index b1ca1e038a..ffb1bab96d 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetBootstrap.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ExceptionsCatcherService } from '@cloudbeaver/core-events';
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
@@ -29,7 +28,7 @@ export class SpreadsheetBootstrap extends Bootstrap {
     private readonly dataGridContextMenuCellEditingService: DataGridContextMenuCellEditingService,
     private readonly dataGridContextMenuService: DataGridContextMenuService,
     private readonly dataGridContextMenuSaveContentService: DataGridContextMenuSaveContentService,
-    exceptionsCatcherService: ExceptionsCatcherService
+    exceptionsCatcherService: ExceptionsCatcherService,
   ) {
     super();
     exceptionsCatcherService.ignore('ResizeObserver loop limit exceeded'); // Produces by react-data-grid
@@ -40,11 +39,10 @@ export class SpreadsheetBootstrap extends Bootstrap {
       id: 'spreadsheet_grid',
       dataFormat: ResultDataFormat.Resultset,
       getPresentationComponent: () => SpreadsheetGrid,
-      hidden: () => (
+      hidden: () =>
         this.dataGridSettingsService.settings.isValueDefault('hidden')
           ? this.dataGridSettingsService.deprecatedSettings.getValue('hidden')
-          : this.dataGridSettingsService.settings.getValue('hidden')
-      ),
+          : this.dataGridSettingsService.settings.getValue('hidden'),
       title: 'Table',
       icon: 'table-icon-sm',
     });
@@ -53,28 +51,22 @@ export class SpreadsheetBootstrap extends Bootstrap {
     this.dataGridContextMenuCellEditingService.register();
     this.dataGridContextMenuSaveContentService.register();
 
-    this.dataGridContextMenuService.add(
-      this.dataGridContextMenuService.getMenuToken(),
-      {
-        id: 'view_value_panel',
-        isPresent(context) {
-          return context.contextType === DataGridContextMenuService.cellContext;
-        },
-        isHidden(context) {
-          return (
-            typeof context.data.actions.valuePresentationId === 'string'
-            || context.data.simple
-          );
-        },
-        order: 0.5,
-        title: 'data_grid_table_open_value_panel',
-        icon: 'value-panel',
-        onClick(context) {
-          context.data.actions.setValuePresentation('');
-        },
-      }
-    );
+    this.dataGridContextMenuService.add(this.dataGridContextMenuService.getMenuToken(), {
+      id: 'view_value_panel',
+      isPresent(context) {
+        return context.contextType === DataGridContextMenuService.cellContext;
+      },
+      isHidden(context) {
+        return typeof context.data.actions.valuePresentationId === 'string' || context.data.simple;
+      },
+      order: 0.5,
+      title: 'data_grid_table_open_value_panel',
+      icon: 'value-panel',
+      onClick(context) {
+        context.data.actions.setValuePresentation('');
+      },
+    });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetGrid.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetGrid.tsx
index d490fd1b1c..96bda26fdd 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetGrid.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/SpreadsheetGrid.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDataPresentationProps } from '@cloudbeaver/plugin-data-viewer';
 
 import { DataGridLoader } from './DataGrid/DataGridLoader';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/locales/it.ts b/webapp/packages/plugin-data-spreadsheet-new/src/locales/it.ts
index 6c82540d8b..53bc025695 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/locales/it.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/locales/it.ts
@@ -1,7 +1,7 @@
 export default [
   ['data_grid_table_editing', 'Modifca'],
   ['data_grid_table_editing_set_to_null', 'Imposta a NULL'],
-  ['data_grid_table_editing_open_inline_editor', 'Apri l\'editor contestuale'],
+  ['data_grid_table_editing_open_inline_editor', "Apri l'editor contestuale"],
   ['data_grid_table_order', 'Ordinamento'],
   ['data_grid_table_open_value_panel', 'Mostra nel pannello dei valori'],
   ['data_grid_table_filter', 'Filtri'],
@@ -10,7 +10,7 @@ export default [
   ['data_grid_table_filter_reset_all_filters', 'Reimposta tutti i filtri'],
   ['data_grid_table_disable_order', 'Disabilitato'],
   ['data_grid_table_disable_all_orders', 'Disabilita tutto'],
-  ['data_grid_table_delete_filters_and_orders', 'Reimposta i filtri / l\'ordinamento'],
+  ['data_grid_table_delete_filters_and_orders', "Reimposta i filtri / l'ordinamento"],
   ['data_grid_table_tooltip_column_header_order', 'Ordina per colonna'],
   ['data_grid_table_context_menu_filter_dialog_title', 'Modifica valore'],
   ['data_grid_table_context_menu_filter_clipboard_permission', 'Dai accesso agli appunti'],
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts b/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts
index 325443cdac..6c3fb4aa01 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DataGridContextMenuCellEditingService } from './DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/styles/styles.ts b/webapp/packages/plugin-data-spreadsheet-new/src/styles/styles.ts
index cc26903dc8..700ef7dcb5 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/styles/styles.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/styles/styles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ThemeSelector } from '@cloudbeaver/core-theming';
 
 export const reactGridStyles: ThemeSelector = async theme => {
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts
index 4aad9a99d0..f02153bbc3 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts
@@ -5,7 +5,6 @@
  * 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_DATA_VIEWER_GROUPING_CLEAR = createAction('data-viewer-grouping-clear', {
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN.ts
index 7a032ed84e..3c38d776b8 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN.ts
@@ -5,7 +5,6 @@
  * 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_DATA_VIEWER_GROUPING_REMOVE_COLUMN = createAction('data-viewer-grouping-remove-column', {
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
index e92910977a..ea9f23e732 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
@@ -5,11 +5,19 @@
  * 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 { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
-import { DATA_CONTEXT_DV_DDM, DATA_CONTEXT_DV_DDM_RESULT_INDEX, DATA_VIEWER_DATA_MODEL_ACTIONS_MENU, DataPresentationService, DataPresentationType, ResultSetDataAction, ResultSetSelectAction, ResultSetViewAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  DATA_CONTEXT_DV_DDM,
+  DATA_CONTEXT_DV_DDM_RESULT_INDEX,
+  DATA_VIEWER_DATA_MODEL_ACTIONS_MENU,
+  DataPresentationService,
+  DataPresentationType,
+  ResultSetDataAction,
+  ResultSetSelectAction,
+  ResultSetViewAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import { ACTION_DATA_VIEWER_GROUPING_CLEAR } from './Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR';
 import { ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN } from './Actions/ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN';
@@ -21,7 +29,7 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
   constructor(
     private readonly dataPresentationService: DataPresentationService,
     private readonly menuService: MenuService,
-    private readonly actionService: ActionService
+    private readonly actionService: ActionService,
   ) {
     super();
   }
@@ -31,7 +39,7 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
     this.registerActions();
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private registerActions(): void {
     this.actionService.addHandler({
@@ -108,11 +116,7 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
         return context.has(DATA_CONTEXT_DV_DDM_RS_GROUPING);
       },
       getItems(context, items) {
-        return [
-          ...items,
-          ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN,
-          ACTION_DATA_VIEWER_GROUPING_CLEAR,
-        ];
+        return [...items, ACTION_DATA_VIEWER_GROUPING_REMOVE_COLUMN, ACTION_DATA_VIEWER_GROUPING_CLEAR];
       },
     });
   }
@@ -124,11 +128,7 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
       title: 'plugin_data_viewer_result_set_grouping_title',
       icon: '/icons/plugin_data_viewer_result_set_grouping_m.svg',
       dataFormat: ResultDataFormat.Resultset,
-      hidden: (
-        dataFormat,
-        model,
-        resultIndex
-      ) => {
+      hidden: (dataFormat, model, resultIndex) => {
         if (!model.source.hasResult(resultIndex)) {
           return true;
         }
@@ -139,5 +139,4 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
       getPresentationComponent: () => DVResultSetGroupingPresentation,
     });
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
index b7c052bd03..9bb867ab70 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useContext, useState } from 'react';
@@ -29,7 +28,8 @@ const styles = css`
     position: relative;
     overflow: auto;
 
-    &[|active]::after, &[|negative]::after {
+    &[|active]::after,
+    &[|negative]::after {
       position: absolute;
       top: 0;
       left: 0;
@@ -54,7 +54,7 @@ const styles = css`
       display: flex;
       height: 100%;
       width: 100%;
-  
+
       & message {
         box-sizing: border-box;
         padding: 24px;
@@ -66,7 +66,7 @@ const styles = css`
   }
   throw-box {
     position: fixed;
-    
+
     &:not([|showDropOutside]) {
       left: 0;
       top: 0;
@@ -112,20 +112,24 @@ export const DVResultSetGroupingPresentation: DataPresentationComponent<any, IDa
   const model = useGroupingDataModel(originalModel, resultIndex, state);
   const dnd = useGroupingDnDColumns(state, originalModel, model);
 
-  const groupingData = useObservableRef<IPrivateGroupingData>(() => ({
-    getColumns() {
-      return this.state.columns;
+  const groupingData = useObservableRef<IPrivateGroupingData>(
+    () => ({
+      getColumns() {
+        return this.state.columns;
+      },
+      removeColumn(...columns) {
+        this.state.columns = this.state.columns.filter(column => !columns.includes(column));
+      },
+      clear() {
+        this.state.presentationId = '';
+        this.state.columns = [];
+      },
+    }),
+    {
+      clear: action,
     },
-    removeColumn(...columns) {
-      this.state.columns = this.state.columns.filter(column => !columns.includes(column));
-    },
-    clear() {
-      this.state.presentationId = '';
-      this.state.columns = [];
-    },
-  }), {
-    clear: action,
-  }, { state });
+    { state },
+  );
 
   context.set(DATA_CONTEXT_DV_DDM_RS_GROUPING, groupingData);
 
@@ -148,9 +152,7 @@ export const DVResultSetGroupingPresentation: DataPresentationComponent<any, IDa
       >
         {state.columns.length === 0 ? (
           <placeholder>
-            <message>
-              {translate('plugin_data_viewer_result_set_grouping_placeholder')}
-            </message>
+            <message>{translate('plugin_data_viewer_result_set_grouping_placeholder')}</message>
           </placeholder>
         ) : (
           <TableViewerLoader
@@ -165,6 +167,6 @@ export const DVResultSetGroupingPresentation: DataPresentationComponent<any, IDa
           />
         )}
       </drop-area>
-    </>
+    </>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts
index e5acf2dd5b..2aa5d80faa 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts
@@ -5,7 +5,6 @@
  * 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 interface IResultSetGroupingData {
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts
index 8b2fda1f52..d8d42f43a6 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDatabaseResultSet } from '@cloudbeaver/plugin-data-viewer';
 import { IDataQueryOptions, QueryDataSource } from '@cloudbeaver/plugin-sql-editor';
 
@@ -44,4 +43,4 @@ export class GroupingDataSource extends QueryDataSource<IDataGroupingOptions> {
       throw exception;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts
index d3ccc7d392..f41b39b1e4 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts
@@ -8,4 +8,4 @@
 
 export interface IGroupingQueryState {
   columns: string[];
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/LocaleService.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/LocaleService.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts
index 958a96fea8..dc9e65d40b 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts
@@ -1,4 +1,4 @@
 import { dvResultSetGroupingPlugin } from './manifest';
 
 export { dvResultSetGroupingPlugin };
-export default dvResultSetGroupingPlugin;
\ No newline at end of file
+export default dvResultSetGroupingPlugin;
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts
index 41f96bc2f4..1e0732d10b 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DVResultSetGroupingPluginBootstrap } from './DVResultSetGroupingPluginBootstrap';
@@ -13,8 +12,5 @@ import { LocaleService } from './LocaleService';
 
 export const dvResultSetGroupingPlugin: PluginManifest = {
   info: { name: 'Result Set Grouping plugin' },
-  providers: [
-    DVResultSetGroupingPluginBootstrap,
-    LocaleService,
-  ],
-};
\ No newline at end of file
+  providers: [DVResultSetGroupingPluginBootstrap, LocaleService],
+};
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts
index 1b4cc72917..52d14ef628 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { reaction } from 'mobx';
 import { useEffect } from 'react';
 
@@ -14,7 +13,14 @@ import { ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core
 import { App, useService } from '@cloudbeaver/core-di';
 import { AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
 import { isObjectsEqual } from '@cloudbeaver/core-utils';
-import { DataViewerSettingsService, DatabaseDataAccessMode, DatabaseDataModel, IDatabaseDataModel, IDatabaseResultSet, TableViewerStorageService } from '@cloudbeaver/plugin-data-viewer';
+import {
+  DatabaseDataAccessMode,
+  DatabaseDataModel,
+  DataViewerSettingsService,
+  IDatabaseDataModel,
+  IDatabaseResultSet,
+  TableViewerStorageService,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import { GroupingDataSource, IDataGroupingOptions } from './GroupingDataSource';
 import type { IGroupingQueryState } from './IGroupingQueryState';
@@ -38,36 +44,29 @@ export function useGroupingDataModel(
   const contextInfo = executionContext?.context;
   const connectionKey = contextInfo ? createConnectionParam(contextInfo.projectId, contextInfo.connectionId) : null;
 
-  const connectionInfoLoader = useResource(
-    useGroupingDataModel,
-    ConnectionInfoResource,
-    connectionKey
-  );
+  const connectionInfoLoader = useResource(useGroupingDataModel, ConnectionInfoResource, connectionKey);
   const connectionInfo = connectionInfoLoader.data;
 
-  const model = useObjectRef(() => {
-    const source = new GroupingDataSource(
-      app.getServiceInjector(),
-      graphQLService,
-      asyncTaskInfoService,
-    );
+  const model = useObjectRef(
+    () => {
+      const source = new GroupingDataSource(app.getServiceInjector(), graphQLService, asyncTaskInfoService);
 
-    const model = tableViewerStorageService.add(new DatabaseDataModel(source));
+      const model = tableViewerStorageService.add(new DatabaseDataModel(source));
 
-    model
-      .setAccess(DatabaseDataAccessMode.Readonly)
-      .setCountGain(dataViewerSettingsService.getDefaultRowsCount())
-      .setSlice(0);
+      model.setAccess(DatabaseDataAccessMode.Readonly).setCountGain(dataViewerSettingsService.getDefaultRowsCount()).setSlice(0);
 
-    return {
-      source,
-      model,
-      dispose() {
-        this.model.dispose();
-        tableViewerStorageService.remove(this.model.id);
-      },
-    };
-  }, false, ['dispose']);
+      return {
+        source,
+        model,
+        dispose() {
+          this.model.dispose();
+          tableViewerStorageService.remove(this.model.id);
+        },
+      };
+    },
+    false,
+    ['dispose'],
+  );
 
   useEffect(() => {
     sourceModel.onDispose.addHandler(model.dispose);
@@ -77,54 +76,48 @@ export function useGroupingDataModel(
   }, [sourceModel]);
 
   useEffect(() => {
-    const sub = reaction(() => {
-      const result = sourceModel.source.hasResult(sourceResultIndex)
-        ? sourceModel.source.getResult(sourceResultIndex)
-        : null;
+    const sub = reaction(
+      () => {
+        const result = sourceModel.source.hasResult(sourceResultIndex) ? sourceModel.source.getResult(sourceResultIndex) : null;
 
-      return {
-        columns: state.columns,
-        sourceResultId: result?.id,
-      };
-    }, async ({ columns, sourceResultId }) => {
-      if (columns.length !== 0 && sourceResultId) {
-        const executionContext = sourceModel.source.executionContext;
-        model.model.source
-          .setExecutionContext(executionContext)
-          .setSupportedDataFormats(connectionInfo?.supportedDataFormats ?? []);
+        return {
+          columns: state.columns,
+          sourceResultId: result?.id,
+        };
+      },
+      async ({ columns, sourceResultId }) => {
+        if (columns.length !== 0 && sourceResultId) {
+          const executionContext = sourceModel.source.executionContext;
+          model.model.source.setExecutionContext(executionContext).setSupportedDataFormats(connectionInfo?.supportedDataFormats ?? []);
 
-        if (executionContext?.context) {
-          const connectionKey = createConnectionParam(
-            executionContext.context.projectId,
-            executionContext.context.connectionId
-          );
+          if (executionContext?.context) {
+            const connectionKey = createConnectionParam(executionContext.context.projectId, executionContext.context.connectionId);
 
+            model.model
+              .setOptions({
+                query: '',
+                columns,
+                sourceResultId,
+                connectionKey,
+                constraints: [],
+                whereFilter: '',
+              })
+              .setCountGain(dataViewerSettingsService.getDefaultRowsCount())
+              .setSlice(0)
+              .source.resetData();
+          }
+        } else {
           model.model
-            .setOptions({
-              query: '',
-              columns,
-              sourceResultId,
-              connectionKey,
-              constraints: [],
-              whereFilter: '',
-            })
             .setCountGain(dataViewerSettingsService.getDefaultRowsCount())
             .setSlice(0)
-            .source
-            .resetData();
+            .source.setExecutionContext(null)
+            .setSupportedDataFormats([])
+            .clearError()
+            .setResults([]);
         }
-      } else {
-        model.model
-          .setCountGain(dataViewerSettingsService.getDefaultRowsCount())
-          .setSlice(0)
-          .source
-          .setExecutionContext(null)
-          .setSupportedDataFormats([])
-          .clearError()
-          .setResults([]);
-      }
-
-    }, { fireImmediately: true, equals: isObjectsEqual });
+      },
+      { fireImmediately: true, equals: isObjectsEqual },
+    );
 
     return sub;
   }, [state, sourceModel, sourceResultIndex]);
@@ -134,4 +127,4 @@ export function useGroupingDataModel(
   return {
     model: model.model,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDnDColumns.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDnDColumns.ts
index a0b192742c..ca30042d3d 100644
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDnDColumns.ts
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDnDColumns.ts
@@ -5,9 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { IDNDBox, useDNDBox } from '@cloudbeaver/core-ui';
-import { DATA_CONTEXT_DV_DDM, DATA_CONTEXT_DV_DDM_RESULT_INDEX, DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY, IDatabaseDataModel, IDatabaseResultSet, IResultSetColumnKey, ResultSetDataAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  DATA_CONTEXT_DV_DDM,
+  DATA_CONTEXT_DV_DDM_RESULT_INDEX,
+  DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY,
+  IDatabaseDataModel,
+  IDatabaseResultSet,
+  IResultSetColumnKey,
+  ResultSetDataAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import type { IGroupingQueryState } from './IGroupingQueryState';
 import type { IGroupingDataModel } from './useGroupingDataModel';
@@ -20,14 +27,13 @@ interface IGroupingQueryResult {
 export function useGroupingDnDColumns(
   state: IGroupingQueryState,
   sourceModel: IDatabaseDataModel<any, IDatabaseResultSet>,
-  groupingModel: IGroupingDataModel
+  groupingModel: IGroupingDataModel,
 ): IGroupingQueryResult {
-
   async function dropItem(
     model: IDatabaseDataModel<any, IDatabaseResultSet>,
     resultIndex: number,
     columnKey: IResultSetColumnKey | null,
-    outside: boolean
+    outside: boolean,
   ) {
     if (!columnKey) {
       return;
@@ -48,19 +54,14 @@ export function useGroupingDnDColumns(
       }
 
       state.columns = columnNames;
-    } catch (e) {
-
-    }
+    } catch (e) {}
   }
 
   const dndBox = useDNDBox({
     canDrop: context => {
       const model = context.tryGet(DATA_CONTEXT_DV_DDM);
 
-      return (
-        context.has(DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY)
-        && model === sourceModel
-      );
+      return context.has(DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY) && model === sourceModel;
     },
     onDrop: async context => {
       const model = context.get(DATA_CONTEXT_DV_DDM);
@@ -75,10 +76,7 @@ export function useGroupingDnDColumns(
     canDrop: context => {
       const model = context.tryGet(DATA_CONTEXT_DV_DDM);
 
-      return (
-        context.has(DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY)
-        && model?.id === groupingModel.model.id
-      );
+      return context.has(DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY) && model?.id === groupingModel.model.id;
     },
     onDrop: async context => {
       const model = context.get(DATA_CONTEXT_DV_DDM);
@@ -93,4 +91,4 @@ export function useGroupingDnDColumns(
     dndBox,
     dndThrowBox,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index a2e0b3cf26..b11c953016 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -5,13 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { ConnectionExecutionContextService, IConnectionExecutionContext, IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
 import type { ITask } from '@cloudbeaver/core-executor';
-import { AsyncTaskInfoService, GraphQLService, ResultDataFormat, SqlExecuteInfo, SqlQueryResults, UpdateResultsDataBatchMutationVariables } from '@cloudbeaver/core-sdk';
+import {
+  AsyncTaskInfoService,
+  GraphQLService,
+  ResultDataFormat,
+  SqlExecuteInfo,
+  SqlQueryResults,
+  UpdateResultsDataBatchMutationVariables,
+} from '@cloudbeaver/core-sdk';
 
 import { DocumentEditAction } from './DatabaseDataModel/Actions/Document/DocumentEditAction';
 import { ResultSetEditAction } from './DatabaseDataModel/Actions/ResultSet/ResultSetEditAction';
@@ -65,9 +71,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     }
   }
 
-  async request(
-    prevResults: IDatabaseResultSet[]
-  ): Promise<IDatabaseResultSet[]> {
+  async request(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
     const options = this.options;
 
     if (!options) {
@@ -81,10 +85,10 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     let firstResultId: string | undefined;
 
     if (
-      prevResults.length === 1
-      && prevResults[0].contextId === executionContext.context!.id
-      && prevResults[0].connectionId === executionContext.context?.connectionId
-      && prevResults[0].id !== null
+      prevResults.length === 1 &&
+      prevResults[0].contextId === executionContext.context!.id &&
+      prevResults[0].connectionId === executionContext.context?.connectionId &&
+      prevResults[0].id !== null
     ) {
       firstResultId = prevResults[0].id;
     }
@@ -115,7 +119,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
         return result;
       },
       () => this.asyncTaskInfoService.cancel(task.id),
-      () => this.asyncTaskInfoService.remove(task.id)
+      () => this.asyncTaskInfoService.remove(task.id),
     );
 
     try {
@@ -140,9 +144,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     }
   }
 
-  async save(
-    prevResults: IDatabaseResultSet[]
-  ): Promise<IDatabaseResultSet[]> {
+  async save(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
     const executionContext = await this.ensureContextCreated();
 
     try {
@@ -177,8 +179,9 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
         };
 
         if (editor) {
-          const responseResult = this.transformResults(executionContextInfo, response.result.results, 0)
-            .find(newResult => newResult.id === result.id);
+          const responseResult = this.transformResults(executionContextInfo, response.result.results, 0).find(
+            newResult => newResult.id === result.id,
+          );
 
           if (responseResult) {
             editor.applyUpdate(responseResult);
@@ -222,11 +225,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     }
   }
 
-  private transformResults(
-    executionContextInfo: IConnectionExecutionContextInfo,
-    results: SqlQueryResults[],
-    limit: number
-  ): IDatabaseResultSet[] {
+  private transformResults(executionContextInfo: IConnectionExecutionContextInfo, results: SqlQueryResults[], limit: number): IDatabaseResultSet[] {
     return results.map<IDatabaseResultSet>(result => ({
       id: result.resultSet?.id || '0',
       uniqueResultId: `${executionContextInfo.connectionId}_${executionContextInfo.id}_${result.resultSet?.id || '0'}`,
@@ -250,7 +249,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
       const executionContext = await this.connectionExecutionContextService.create(
         this.options.connectionKey,
         this.options.catalog,
-        this.options.schema
+        this.options.schema,
       );
 
       this.setExecutionContext(executionContext);
diff --git a/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts b/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
index 337a609a8d..fd94b9bb05 100644
--- a/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import type { TabProps } from '@cloudbeaver/core-ui';
@@ -14,10 +13,7 @@ import type { IDatabaseDataModel } from './DatabaseDataModel/IDatabaseDataModel'
 import type { IDatabaseDataResult } from './DatabaseDataModel/IDatabaseDataResult';
 import type { IDataTableActions } from './TableViewer/IDataTableActions';
 
-export interface IDataPresentationProps<
-  TOptions = any,
-  TResult extends IDatabaseDataResult = IDatabaseDataResult
-> {
+export interface IDataPresentationProps<TOptions = any, TResult extends IDatabaseDataResult = IDatabaseDataResult> {
   dataFormat: ResultDataFormat;
   model: IDatabaseDataModel<TOptions, TResult>;
   actions: IDataTableActions;
@@ -28,13 +24,12 @@ export interface IDataPresentationProps<
 
 export enum DataPresentationType {
   main,
-  toolsPanel
+  toolsPanel,
 }
 
-export type DataPresentationComponent<
-  TOptions = any,
-  TResult extends IDatabaseDataResult = IDatabaseDataResult
-> = React.FunctionComponent<IDataPresentationProps<TOptions, TResult>>;
+export type DataPresentationComponent<TOptions = any, TResult extends IDatabaseDataResult = IDatabaseDataResult> = React.FunctionComponent<
+  IDataPresentationProps<TOptions, TResult>
+>;
 
 export type PresentationTabProps = TabProps & {
   presentation: IDataPresentationOptions;
@@ -49,11 +44,7 @@ export interface IDataPresentationOptions {
   type?: DataPresentationType;
   title?: string;
   icon?: string;
-  hidden?: (
-    dataFormat: ResultDataFormat | null,
-    model: IDatabaseDataModel,
-    resultIndex: number
-  ) => boolean;
+  hidden?: (dataFormat: ResultDataFormat | null, model: IDatabaseDataModel, resultIndex: number) => boolean;
   getPresentationComponent: () => DataPresentationComponent;
   getTabComponent?: () => PresentationTabComponent;
   onActivate?: () => void;
@@ -83,10 +74,7 @@ export class DataPresentationService {
     resultIndex: number,
   ): IDataPresentation[] {
     return Array.from(this.dataPresentations.values()).filter(presentation => {
-      if (
-        presentation.dataFormat !== undefined
-        && !supportedDataFormats.includes(presentation.dataFormat)
-      ) {
+      if (presentation.dataFormat !== undefined && !supportedDataFormats.includes(presentation.dataFormat)) {
         return false;
       }
 
@@ -118,9 +106,9 @@ export class DataPresentationService {
 
     for (const presentation of this.dataPresentations.values()) {
       if (
-        (presentation.dataFormat === undefined || presentation.dataFormat === dataFormat)
-        && presentation.type === type
-        && !presentation.hidden?.(dataFormat, model, resultIndex)
+        (presentation.dataFormat === undefined || presentation.dataFormat === dataFormat) &&
+        presentation.type === type &&
+        !presentation.hidden?.(dataFormat, model, resultIndex)
       ) {
         return presentation;
       }
@@ -130,12 +118,9 @@ export class DataPresentationService {
   }
 
   add(options: IDataPresentationOptions): void {
-    this.dataPresentations.set(
-      options.id,
-      {
-        ...options,
-        type: options.type || DataPresentationType.main,
-      }
-    );
+    this.dataPresentations.set(options.id, {
+      ...options,
+      type: options.type || DataPresentationType.main,
+    });
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerBootstrap.ts b/webapp/packages/plugin-data-viewer/src/DataViewerBootstrap.ts
index e531267632..725f34787b 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { DataViewerTabService } from './DataViewerTabService';
@@ -21,5 +20,5 @@ export class DataViewerBootstrap extends Bootstrap {
     this.dataViewerTabService.register();
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerDataChangeConfirmationService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerDataChangeConfirmationService.ts
index 37f2c339af..6c5acd482d 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerDataChangeConfirmationService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerDataChangeConfirmationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -20,7 +19,7 @@ export class DataViewerDataChangeConfirmationService {
   constructor(
     private readonly commonDialogService: CommonDialogService,
     private readonly dataViewerTableService: TableViewerStorageService,
-    private readonly notificationService: NotificationService
+    private readonly notificationService: NotificationService,
   ) {
     this.checkUnsavedData = this.checkUnsavedData.bind(this);
   }
@@ -33,12 +32,7 @@ export class DataViewerDataChangeConfirmationService {
     }
   }
 
-  private async checkUnsavedData({
-    type,
-    model,
-  }: IRequestEventData<any, any>,
-  contexts: IExecutionContextProvider<IRequestEventData<any, any>>
-  ) {
+  private async checkUnsavedData({ type, model }: IRequestEventData<any, any>, contexts: IExecutionContextProvider<IRequestEventData<any, any>>) {
     if (type === 'before') {
       const confirmationContext = contexts.getContext(SaveConfirmedContext);
 
@@ -50,10 +44,7 @@ export class DataViewerDataChangeConfirmationService {
 
       try {
         for (let resultIndex = 0; resultIndex < results.length; resultIndex++) {
-          const editor = model.source.getActionImplementation(
-            resultIndex,
-            DatabaseEditAction
-          );
+          const editor = model.source.getActionImplementation(resultIndex, DatabaseEditAction);
 
           if (editor?.isEdited() && model.source.executionContext?.context) {
             if (confirmationContext.confirmed) {
@@ -85,7 +76,7 @@ export class DataViewerDataChangeConfirmationService {
   }
 }
 
-interface ISaveConfirmedContext{
+interface ISaveConfirmedContext {
   confirmed: boolean | null;
   setConfirmed: (state: boolean) => void;
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerPanel.tsx b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerPanel.tsx
index 70300f9452..3a08117c30 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerPanel.tsx
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
@@ -24,40 +23,43 @@ const styles = css`
   }
 `;
 
-export const DataViewerPanel: ObjectPagePanelComponent<IDataViewerPageState> = observer(function DataViewerPanel({
-  tab,
-  page,
-}) {
+export const DataViewerPanel: ObjectPagePanelComponent<IDataViewerPageState> = observer(function DataViewerPanel({ tab, page }) {
   const dataViewerDatabaseDataModel = useDataViewerDatabaseDataModel(tab);
   const pageState = page.getState(tab);
 
-  const handlePresentationChange = useCallback((presentationId: string) => {
-    const pageState = page.getState(tab);
+  const handlePresentationChange = useCallback(
+    (presentationId: string) => {
+      const pageState = page.getState(tab);
 
-    if (!pageState) {
-      page.setState(tab, {
-        presentationId,
-        resultIndex: 0,
-        valuePresentationId: null,
-      });
-    } else {
-      pageState.presentationId = presentationId;
-    }
-  }, [page, tab]);
+      if (!pageState) {
+        page.setState(tab, {
+          presentationId,
+          resultIndex: 0,
+          valuePresentationId: null,
+        });
+      } else {
+        pageState.presentationId = presentationId;
+      }
+    },
+    [page, tab],
+  );
 
-  const handleValuePresentationChange = useCallback((valuePresentationId: string | null) => {
-    const pageState = page.getState(tab);
+  const handleValuePresentationChange = useCallback(
+    (valuePresentationId: string | null) => {
+      const pageState = page.getState(tab);
 
-    if (!pageState) {
-      page.setState(tab, {
-        presentationId: '',
-        resultIndex: 0,
-        valuePresentationId,
-      });
-    } else {
-      pageState.valuePresentationId = valuePresentationId;
-    }
-  }, [page, tab]);
+      if (!pageState) {
+        page.setState(tab, {
+          presentationId: '',
+          resultIndex: 0,
+          valuePresentationId,
+        });
+      } else {
+        pageState.valuePresentationId = valuePresentationId;
+      }
+    },
+    [page, tab],
+  );
 
   if (!tab.handlerState.tableId) {
     return <TextPlaceholder>Table model not loaded</TextPlaceholder>;
@@ -77,6 +79,6 @@ export const DataViewerPanel: ObjectPagePanelComponent<IDataViewerPageState> = o
       ) : (
         <TextPlaceholder>Table model not loaded</TextPlaceholder>
       )}
-    </Loader>
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx
index 2fbde9c9e0..55a68ec5e8 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx
@@ -5,22 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useStyles, Translate } from '@cloudbeaver/core-blocks';
+import { Translate, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
-import { TabIcon, Tab, TabTitle } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 import type { ObjectPageTabComponent } from '@cloudbeaver/plugin-object-viewer';
 
 import type { IDataViewerPageState } from '../IDataViewerPageState';
 
-
-export const DataViewerTab: ObjectPageTabComponent<IDataViewerPageState> = observer(function DataViewerTab({
-  tab, page, onSelect, style,
-}) {
+export const DataViewerTab: ObjectPageTabComponent<IDataViewerPageState> = observer(function DataViewerTab({ tab, page, onSelect, style }) {
   const styles = useStyles(style);
   const navNodeManagerService = useService(NavNodeManagerService);
 
@@ -30,8 +26,10 @@ export const DataViewerTab: ObjectPageTabComponent<IDataViewerPageState> = obser
 
   return styled(styles)(
     <Tab tabId={page.key} style={style} onOpen={onSelect}>
-      <TabIcon icon='table-icon' />
-      <TabTitle><Translate token='data_viewer_tab_title' /></TabTitle>
-    </Tab>
+      <TabIcon icon="table-icon" />
+      <TabTitle>
+        <Translate token="data_viewer_tab_title" />
+      </TabTitle>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
index fbfec1e74b..c1b7ea7550 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 import { useEffect } from 'react';
 
-import { useResource, useObservableRef } from '@cloudbeaver/core-blocks';
+import { useObservableRef, useResource } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
@@ -38,121 +37,114 @@ export function useDataViewerDatabaseDataModel(tab: ITab<IObjectViewerTabState>)
   const dataPresentationService = useService(DataPresentationService);
   const dataViewerDataChangeConfirmationService = useService(DataViewerDataChangeConfirmationService);
 
-  const connection = useResource(
-    useDataViewerDatabaseDataModel,
-    ConnectionInfoResource,
-    tab.handlerState.connectionKey ?? null
-  );
+  const connection = useResource(useDataViewerDatabaseDataModel, ConnectionInfoResource, tab.handlerState.connectionKey ?? null);
 
-  const state = useObservableRef<IDataViewerDatabaseDataModel>(() => ({
-    _exception: null,
-    _loading: false,
-    get exception() {
-      if (isContainsException(connection.exception)) {
-        return connection.exception;
-      }
-      return this._exception;
-    },
-    isLoading(): boolean {
-      return connection.isLoading() || this._loading;
-    },
-    isLoaded(): boolean {
-      return connection.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
-    },
-    async reload() {
-      if (isContainsException(connection.exception)) {
-        connection.reload();
-      }
-      this.init();
-    },
-    async load() {
-      if (isContainsException(this.exception)) {
-        return;
-      }
-
-      await this.init();
-    },
-    async init() {
-      if (this._loading) {
-        return;
-      }
-      this._loading = true;
-      try {
-        if (!this.tab.handlerState.connectionKey) {
-          this._exception = null;
+  const state = useObservableRef<IDataViewerDatabaseDataModel>(
+    () => ({
+      _exception: null,
+      _loading: false,
+      get exception() {
+        if (isContainsException(connection.exception)) {
+          return connection.exception;
+        }
+        return this._exception;
+      },
+      isLoading(): boolean {
+        return connection.isLoading() || this._loading;
+      },
+      isLoaded(): boolean {
+        return connection.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
+      },
+      async reload() {
+        if (isContainsException(connection.exception)) {
+          connection.reload();
+        }
+        this.init();
+      },
+      async load() {
+        if (isContainsException(this.exception)) {
           return;
         }
 
-        const node = navNodeManagerService.getNode({
-          nodeId: this.tab.handlerState.objectId,
-          parentId: this.tab.handlerState.parentId,
-        });
-
-        if (!navNodeManagerService.isNodeHasData(node)) {
-          this._exception = null;
+        await this.init();
+      },
+      async init() {
+        if (this._loading) {
           return;
         }
-
-        let model = dataViewerTableService.get(this.tab.handlerState.tableId || '');
-
-        if (
-          model
-          && !model.source.executionContext?.context
-          && model.source.results.length > 0
-        ) {
-          model.resetData();
-        }
-
-        if (!model) {
-          await connectionInfoResource.waitLoad();
-          const connectionInfo = connectionInfoResource.get(this.tab.handlerState.connectionKey);
-
-          if (!connectionInfo) {
-            throw new Error('Connection doesn\'t exists');
+        this._loading = true;
+        try {
+          if (!this.tab.handlerState.connectionKey) {
+            this._exception = null;
+            return;
           }
 
-          model = dataViewerTableService.create(
-            connectionInfo,
-            node
-          );
-          this.tab.handlerState.tableId = model.id;
-          model.source.setOutdated();
-          dataViewerDataChangeConfirmationService.trackTableDataUpdate(model.id);
+          const node = navNodeManagerService.getNode({
+            nodeId: this.tab.handlerState.objectId,
+            parentId: this.tab.handlerState.parentId,
+          });
 
-          const pageState = dataViewerTabService.page.getState(this.tab);
+          if (!navNodeManagerService.isNodeHasData(node)) {
+            this._exception = null;
+            return;
+          }
 
-          if (pageState) {
-            const presentation = dataPresentationService.get(pageState.presentationId);
+          let model = dataViewerTableService.get(this.tab.handlerState.tableId || '');
 
-            if (presentation?.dataFormat !== undefined) {
-              model.setDataFormat(presentation.dataFormat);
+          if (model && !model.source.executionContext?.context && model.source.results.length > 0) {
+            model.resetData();
+          }
+
+          if (!model) {
+            await connectionInfoResource.waitLoad();
+            const connectionInfo = connectionInfoResource.get(this.tab.handlerState.connectionKey);
+
+            if (!connectionInfo) {
+              throw new Error("Connection doesn't exists");
+            }
+
+            model = dataViewerTableService.create(connectionInfo, node);
+            this.tab.handlerState.tableId = model.id;
+            model.source.setOutdated();
+            dataViewerDataChangeConfirmationService.trackTableDataUpdate(model.id);
+
+            const pageState = dataViewerTabService.page.getState(this.tab);
+
+            if (pageState) {
+              const presentation = dataPresentationService.get(pageState.presentationId);
+
+              if (presentation?.dataFormat !== undefined) {
+                model.setDataFormat(presentation.dataFormat);
+              }
             }
           }
-        }
 
-        model.setName(node?.name || null);
-        this._exception = null;
-      } catch (exception: any) {
-        this._exception = exception;
-      } finally {
-        this._loading = false;
-      }
+          model.setName(node?.name || null);
+          this._exception = null;
+        } catch (exception: any) {
+          this._exception = exception;
+        } finally {
+          this._loading = false;
+        }
+      },
+    }),
+    {
+      exception: computed,
+      _loading: observable.ref,
+      _exception: observable.ref,
+      tab: observable.ref,
+      isLoaded: action.bound,
+      isLoading: action.bound,
+      reload: action.bound,
     },
-  }), {
-    exception: computed,
-    _loading: observable.ref,
-    _exception: observable.ref,
-    tab: observable.ref,
-    isLoaded: action.bound,
-    isLoading: action.bound,
-    reload: action.bound,
-  }, {
-    tab,
-  });
+    {
+      tab,
+    },
+  );
 
   useEffect(() => {
     state.load();
   });
 
   return state;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
index 01d0a61ff4..2de32016b6 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Connection } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 
@@ -13,9 +12,7 @@ import { DataViewerSettingsService } from './DataViewerSettingsService';
 
 @injectable()
 export class DataViewerService {
-  constructor(
-    private readonly dataViewerSettingsService: DataViewerSettingsService,
-  ) { }
+  constructor(private readonly dataViewerSettingsService: DataViewerSettingsService) {}
 
   isDataEditable(connection: Connection) {
     const disabled = this.dataViewerSettingsService.settings.isValueDefault('disableEdit')
@@ -23,4 +20,4 @@ export class DataViewerService {
       : this.dataViewerSettingsService.settings.getValue('disableEdit');
     return !disabled && !connection.readOnly;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.test.ts b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.test.ts
index 9cf77aa0e1..ce3f0e7a45 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.test.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -24,18 +23,9 @@ import { DataViewerSettings, DataViewerSettingsService } from './DataViewerSetti
 import { manifest } from './manifest';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  datasourceContextSwitch,
-  navigationTree,
-  navigationTabs,
-  objectViewer,
-  manifest
-);
+const app = createApp(datasourceContextSwitch, navigationTree, navigationTabs, objectViewer, manifest);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -68,9 +58,7 @@ async function setupSettingsService(mockConfig: any = {}) {
   const settings = app.injector.getServiceByClass(DataViewerSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(mockConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(mockConfig)));
 
   await config.refresh();
 
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
index e4864ee4e8..8310850e78 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
@@ -34,10 +33,7 @@ export class DataViewerSettingsService {
       count = 0;
     }
     return count !== undefined
-      ? Math.max(
-        this.settings.getValue('fetchMin'),
-        Math.min(count, this.settings.getValue('fetchMax'))
-      )
+      ? Math.max(this.settings.getValue('fetchMin'), Math.min(count, this.settings.getValue('fetchMax')))
       : this.settings.getValue('fetchDefault');
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
index c60d0dfdea..121bdce6fc 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionInfoResource, ConnectionsManagerService, IConnectionExecutorData } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -13,7 +12,7 @@ import { ExecutorInterrupter, IExecutionContextProvider } from '@cloudbeaver/cor
 import { INodeNavigationData, NavigationType, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { ITab, NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
-import { DBObjectPageService, ObjectPage, ObjectViewerTabService, IObjectViewerTabState, isObjectViewerTab } from '@cloudbeaver/plugin-object-viewer';
+import { DBObjectPageService, IObjectViewerTabState, isObjectViewerTab, ObjectPage, ObjectViewerTabService } from '@cloudbeaver/plugin-object-viewer';
 
 import { DataViewerPanel } from './DataViewerPage/DataViewerPanel';
 import { DataViewerTab } from './DataViewerPage/DataViewerTab';
@@ -32,7 +31,7 @@ export class DataViewerTabService {
     private readonly notificationService: NotificationService,
     private readonly connectionsManagerService: ConnectionsManagerService,
     private readonly navigationTabsService: NavigationTabsService,
-    private readonly connectionInfoResource: ConnectionInfoResource
+    private readonly connectionInfoResource: ConnectionInfoResource,
   ) {
     this.page = this.dbObjectPageService.register({
       key: 'data_viewer_data',
@@ -54,20 +53,19 @@ export class DataViewerTabService {
     this.navNodeManagerService.navigator.addHandler(this.navigationHandler.bind(this));
   }
 
-  private async disconnectHandler(
-    data: IConnectionExecutorData,
-    contexts: IExecutionContextProvider<IConnectionExecutorData>
-  ) {
+  private async disconnectHandler(data: IConnectionExecutorData, contexts: IExecutionContextProvider<IConnectionExecutorData>) {
     const connectionsKey = resourceKeyList(data.connections);
     if (data.state === 'before') {
-      const tabs = Array.from(this.navigationTabsService.findTabs(
-        isObjectViewerTab(tab => {
-          if (!tab.handlerState.connectionKey) {
-            return false;
-          }
-          return this.connectionInfoResource.isIntersect(connectionsKey, tab.handlerState.connectionKey);
-        })
-      ));
+      const tabs = Array.from(
+        this.navigationTabsService.findTabs(
+          isObjectViewerTab(tab => {
+            if (!tab.handlerState.connectionKey) {
+              return false;
+            }
+            return this.connectionInfoResource.isIntersect(connectionsKey, tab.handlerState.connectionKey);
+          }),
+        ),
+      );
 
       for (const tab of tabs) {
         const canDisconnect = await this.handleTabCanClose(tab);
@@ -86,12 +84,7 @@ export class DataViewerTabService {
     }
 
     try {
-      const {
-        nodeInfo,
-        tabInfo,
-        initTab,
-        trySwitchPage,
-      } = await contexts.getContext(this.objectViewerTabService.objectViewerTabContext);
+      const { nodeInfo, tabInfo, initTab, trySwitchPage } = await contexts.getContext(this.objectViewerTabService.objectViewerTabContext);
 
       const node = await this.navNodeManagerService.loadNode(nodeInfo);
 
@@ -122,7 +115,7 @@ export class DataViewerTabService {
         await model.requestDataAction(() => {
           canClose = true;
         });
-      } catch { }
+      } catch {}
 
       return canClose;
     }
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
index 1dc76a1a7f..2ecd821dc2 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { ConnectionExecutionContextService, Connection, createConnectionParam } from '@cloudbeaver/core-connections';
+import { Connection, ConnectionExecutionContextService, createConnectionParam } from '@cloudbeaver/core-connections';
 import { App, injectable } from '@cloudbeaver/core-di';
 import { EObjectFeature, NavNode, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
@@ -31,7 +30,7 @@ export class DataViewerTableService {
     private readonly connectionExecutionContextService: ConnectionExecutionContextService,
     private readonly dataViewerService: DataViewerService,
     private readonly dataViewerSettingsService: DataViewerSettingsService,
-  ) { }
+  ) {}
 
   has(tableId: string): boolean {
     return this.tableViewerStorageService.has(tableId);
@@ -50,12 +49,8 @@ export class DataViewerTableService {
     }
   }
 
-  create(
-    connection: Connection,
-    node: NavNode | undefined
-  ): IDatabaseDataModel<IDataContainerOptions, IDatabaseResultSet> {
-    const nodeInfo = this.navNodeManagerService
-      .getNodeContainerInfo(node?.id ?? '');
+  create(connection: Connection, node: NavNode | undefined): IDatabaseDataModel<IDataContainerOptions, IDatabaseResultSet> {
+    const nodeInfo = this.navNodeManagerService.getNodeContainerInfo(node?.id ?? '');
 
     const source = new ContainerDataSource(
       this.app.getServiceInjector(),
@@ -77,7 +72,8 @@ export class DataViewerTableService {
       .setConstraintsAvailable(node?.objectFeatures.includes(EObjectFeature.supportsDataFilter) ?? true);
 
     const editable = this.dataViewerService.isDataEditable(connection);
-    const dataModel = this.tableViewerStorageService.add(new DatabaseDataModel(source))
+    const dataModel = this.tableViewerStorageService
+      .add(new DatabaseDataModel(source))
       .setCountGain(this.dataViewerSettingsService.getDefaultRowsCount())
       .setSlice(0)
       .setAccess(editable ? DatabaseDataAccessMode.Default : DatabaseDataAccessMode.Readonly);
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataActionDecorator.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataActionDecorator.ts
index 5787c683f7..99a265efab 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataActionDecorator.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataActionDecorator.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDatabaseDataActionInterface } from '../IDatabaseDataAction';
 
 const ACTION_PARAMS = 'custom:data-viewer/action/params';
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseEditAction.ts
index ae4b570784..4a1bd1e736 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseEditAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseEditAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
@@ -13,12 +12,18 @@ import { DatabaseDataAction } from '../DatabaseDataAction';
 import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 import type { IDatabaseDataSource } from '../IDatabaseDataSource';
 import { databaseDataAction } from './DatabaseDataActionDecorator';
-import type { DatabaseEditChangeType, IDatabaseDataEditAction, IDatabaseDataEditActionData, IDatabaseDataEditApplyActionData } from './IDatabaseDataEditAction';
+import type {
+  DatabaseEditChangeType,
+  IDatabaseDataEditAction,
+  IDatabaseDataEditActionData,
+  IDatabaseDataEditApplyActionData,
+} from './IDatabaseDataEditAction';
 
 @databaseDataAction()
 export abstract class DatabaseEditAction<TKey, TValue, TResult extends IDatabaseDataResult>
   extends DatabaseDataAction<any, TResult>
-  implements IDatabaseDataEditAction<TKey, TValue, TResult> {
+  implements IDatabaseDataEditAction<TKey, TValue, TResult>
+{
   static dataFormat: ResultDataFormat[] | null = null;
 
   readonly action: ISyncExecutor<IDatabaseDataEditActionData<TKey, TValue>>;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseSelectAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseSelectAction.ts
index e39be2d3b7..8b44552b34 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseSelectAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseSelectAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
@@ -18,7 +17,8 @@ import type { DatabaseDataSelectActionsData, IDatabaseDataSelectAction } from '.
 @databaseDataAction()
 export abstract class DatabaseSelectAction<TKey, TResult extends IDatabaseDataResult>
   extends DatabaseDataAction<any, TResult>
-  implements IDatabaseDataSelectAction<TKey, TResult> {
+  implements IDatabaseDataSelectAction<TKey, TResult>
+{
   static dataFormat: ResultDataFormat[] | null = null;
   readonly actions: ISyncExecutor<DatabaseDataSelectActionsData<TKey>>;
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentDataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentDataAction.ts
index 98fb40fcc5..856964c30a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentDataAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentDataAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
@@ -18,8 +17,7 @@ import type { IDatabaseDataResultAction } from '../IDatabaseDataResultAction';
 import type { IDatabaseDataDocument } from './IDatabaseDataDocument';
 
 @databaseDataAction()
-export class DocumentDataAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IDatabaseDataResultAction<IDatabaseResultSet> {
+export class DocumentDataAction extends DatabaseDataAction<any, IDatabaseResultSet> implements IDatabaseDataResultAction<IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Document];
 
   get documents(): IDatabaseDataDocument[] {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentEditAction.ts
index df45c01d2b..fa35ebabdf 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentEditAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/Document/DocumentEditAction.ts
@@ -5,7 +5,6 @@
  * 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 { ResultDataFormat, SqlResultRow, UpdateResultsDataBatchMutationVariables } from '@cloudbeaver/core-sdk';
@@ -20,18 +19,13 @@ import type { IDatabaseDataDocument } from './IDatabaseDataDocument';
 import type { IDocumentElementKey } from './IDocumentElementKey';
 
 @databaseDataAction()
-export class DocumentEditAction
-  extends DatabaseEditAction<IDocumentElementKey, IDatabaseDataDocument, IDatabaseResultSet> {
+export class DocumentEditAction extends DatabaseEditAction<IDocumentElementKey, IDatabaseDataDocument, IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Document];
 
   readonly editedElements: Map<number, IDatabaseDataDocument>;
   private readonly data: DocumentDataAction;
 
-  constructor(
-    source: IDatabaseDataSource<any, IDatabaseResultSet>,
-    result: IDatabaseResultSet,
-    data: DocumentDataAction
-  ) {
+  constructor(source: IDatabaseDataSource<any, IDatabaseResultSet>, result: IDatabaseResultSet, data: DocumentDataAction) {
     super(source, result);
     this.editedElements = new Map();
     this.data = data;
@@ -82,11 +76,13 @@ export class DocumentEditAction
       type: DatabaseEditChangeType.update,
       revert: false,
       resultId: this.result.id,
-      value: [{
-        key: key,
-        prevValue,
-        value,
-      }],
+      value: [
+        {
+          key: key,
+          prevValue,
+          value,
+        },
+      ],
     });
 
     this.removeUnchanged(key);
@@ -121,7 +117,7 @@ export class DocumentEditAction
         ...previousValue,
         data: value,
       },
-      previousValue
+      previousValue,
     );
   }
 
@@ -170,7 +166,8 @@ export class DocumentEditAction
 
       updatedRows.push({
         data: [this.data.get(id)],
-        updateValues: { // TODO: remove, place new document in data field
+        updateValues: {
+          // TODO: remove, place new document in data field
           0: document,
         },
       });
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataConstraintAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataConstraintAction.ts
index 8e0845d3e3..e403758390 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataConstraintAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataConstraintAction.ts
@@ -5,15 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SqlDataFilterConstraint } from '@cloudbeaver/core-sdk';
 
 import type { IDatabaseDataAction } from '../IDatabaseDataAction';
 import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 import type { Order } from '../Order';
 
-export interface IDatabaseDataConstraintAction<TResult extends IDatabaseDataResult>
-  extends IDatabaseDataAction<any, TResult> {
+export interface IDatabaseDataConstraintAction<TResult extends IDatabaseDataResult> extends IDatabaseDataAction<any, TResult> {
   readonly filterConstraints: SqlDataFilterConstraint[];
   readonly orderConstraints: SqlDataFilterConstraint[];
   readonly supported: boolean;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataEditAction.ts
index 927136b134..687b7c6da2 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataEditAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataEditAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
 
 import type { IDatabaseDataAction } from '../IDatabaseDataAction';
@@ -15,7 +14,7 @@ import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 export enum DatabaseEditChangeType {
   update,
   add,
-  delete
+  delete,
 }
 
 export interface IDatabaseDataEditActionValue<TKey, TValue> {
@@ -43,8 +42,7 @@ export interface IDatabaseDataEditActionData<TKey, TValue> {
   value?: Array<IDatabaseDataEditActionValue<TKey, TValue>>;
 }
 
-export interface IDatabaseDataEditAction<TKey, TValue, TResult extends IDatabaseDataResult>
-  extends IDatabaseDataAction<any, TResult> {
+export interface IDatabaseDataEditAction<TKey, TValue, TResult extends IDatabaseDataResult> extends IDatabaseDataAction<any, TResult> {
   readonly action: ISyncExecutor<IDatabaseDataEditActionData<TKey, TValue>>;
   readonly applyAction: ISyncExecutor<IDatabaseDataEditApplyActionData<any>>;
   isEdited: () => boolean;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataFormatAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataFormatAction.ts
index 0fb3ef1d4f..997cd7eebc 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataFormatAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataFormatAction.ts
@@ -5,12 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDatabaseDataAction } from '../IDatabaseDataAction';
 import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 
-export interface IDatabaseDataFormatAction<TKey, TResult extends IDatabaseDataResult>
-  extends IDatabaseDataAction<any, TResult> {
+export interface IDatabaseDataFormatAction<TKey, TResult extends IDatabaseDataResult> extends IDatabaseDataAction<any, TResult> {
   isReadOnly: (key: TKey) => boolean;
   get: (value: any) => any;
   getText: (value: any) => string | null;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataResultAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataResultAction.ts
index 0bdc42a4c6..c74490c590 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataResultAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataResultAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDatabaseDataAction } from '../IDatabaseDataAction';
 import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataSelectAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataSelectAction.ts
index e2dc0964f7..4bfe142982 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataSelectAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataSelectAction.ts
@@ -5,28 +5,29 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
 
 import type { IDatabaseDataAction } from '../IDatabaseDataAction';
 import type { IDatabaseDataResult } from '../IDatabaseDataResult';
 
-export type DatabaseDataSelectActionsData<TKey> = {
-  type: 'select';
-  resultId: string | null;
-  key: TKey;
-  selected: boolean;
-} | {
-  type: 'focus';
-  resultId: string | null;
-  key: TKey | null;
-} | {
-  type: 'clear';
-  resultId: string | null;
-};
+export type DatabaseDataSelectActionsData<TKey> =
+  | {
+      type: 'select';
+      resultId: string | null;
+      key: TKey;
+      selected: boolean;
+    }
+  | {
+      type: 'focus';
+      resultId: string | null;
+      key: TKey | null;
+    }
+  | {
+      type: 'clear';
+      resultId: string | null;
+    };
 
-export interface IDatabaseDataSelectAction<TKey, TResult extends IDatabaseDataResult>
-  extends IDatabaseDataAction<any, TResult> {
+export interface IDatabaseDataSelectAction<TKey, TResult extends IDatabaseDataResult> extends IDatabaseDataAction<any, TResult> {
   readonly actions: ISyncExecutor<DatabaseDataSelectActionsData<TKey>>;
   isSelected: () => boolean;
   isElementSelected: (key: TKey) => boolean;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_CONSTRAINTS_DELETE_ACTION.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_CONSTRAINTS_DELETE_ACTION.ts
index a6fb4f86e6..1270f3eef7 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_CONSTRAINTS_DELETE_ACTION.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_CONSTRAINTS_DELETE_ACTION.ts
@@ -5,7 +5,6 @@
  * 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 DATA_VIEWER_CONSTRAINTS_DELETE_ACTION = createAction('data-viewer-constraints-delete', {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_REFRESH_ACTION.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_REFRESH_ACTION.ts
index a55e8b9ae9..93b469677a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_REFRESH_ACTION.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_REFRESH_ACTION.ts
@@ -5,7 +5,6 @@
  * 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 DATA_VIEWER_REFRESH_ACTION = createAction('data-viewer-refresh', {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/DataContext/DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/DataContext/DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY.ts
index 26b7e8e551..1b1b7eae06 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/DataContext/DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/DataContext/DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY.ts
@@ -5,9 +5,10 @@
  * 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';
 
 import type { IResultSetColumnKey } from '../IResultSetDataKey';
 
-export const DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY = createDataContext<IResultSetColumnKey | null>('data-viewer-database-data-model-result-set-column-key');
+export const DATA_CONTEXT_DV_DDM_RS_COLUMN_KEY = createDataContext<IResultSetColumnKey | null>(
+  'data-viewer-database-data-model-result-set-column-key',
+);
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts
index dc69d520fd..c4d547220c 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IResultSetContentValue } from './IResultSetContentValue';
 import type { IResultSetElementKey } from './IResultSetDataKey';
 
@@ -18,4 +17,4 @@ export interface IResultSetDataContentAction {
   retrieveFileDataUrlFromCache: (element: IResultSetElementKey) => string | undefined;
   downloadFileData: (element: IResultSetElementKey) => Promise<void>;
   clearCache: () => void;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
index 4ee8f8cac9..3eb63dc59d 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { DataTypeLogicalOperation, ResultDataFormat, SqlDataFilterConstraint } from '@cloudbeaver/core-sdk';
@@ -22,8 +21,10 @@ export const IS_NULL_ID = 'IS_NULL';
 export const IS_NOT_NULL_ID = 'IS_NOT_NULL';
 
 @databaseDataAction()
-export class ResultSetConstraintAction extends DatabaseDataAction<IDatabaseDataOptions, IDatabaseResultSet>
-  implements IDatabaseDataConstraintAction<IDatabaseResultSet> {
+export class ResultSetConstraintAction
+  extends DatabaseDataAction<IDatabaseDataOptions, IDatabaseResultSet>
+  implements IDatabaseDataConstraintAction<IDatabaseResultSet>
+{
   static dataFormat = [ResultDataFormat.Resultset, ResultDataFormat.Document];
 
   get supported(): boolean {
@@ -59,8 +60,7 @@ export class ResultSetConstraintAction extends DatabaseDataAction<IDatabaseDataO
       return;
     }
 
-    this.source.options.constraints = this.source.options.constraints
-      .filter(constraint => constraint.attributePosition !== attributePosition);
+    this.source.options.constraints = this.source.options.constraints.filter(constraint => constraint.attributePosition !== attributePosition);
   }
 
   private deleteEmptyConstraint(attributePosition: number) {
@@ -72,8 +72,7 @@ export class ResultSetConstraintAction extends DatabaseDataAction<IDatabaseDataO
   }
 
   private getMaxOrderPosition() {
-    return Math.max(0, ...this.orderConstraints
-      .map(constraint => constraint.orderPosition !== undefined ? constraint.orderPosition + 1 : -1));
+    return Math.max(0, ...this.orderConstraints.map(constraint => (constraint.orderPosition !== undefined ? constraint.orderPosition + 1 : -1)));
   }
 
   get(attributePosition: number): SqlDataFilterConstraint | undefined {
@@ -274,8 +273,9 @@ export class ResultSetConstraintAction extends DatabaseDataAction<IDatabaseDataO
       }
 
       if (column && prevColumn.position !== column.position) {
-        const prevConstraint = this.source.prevOptions?.constraints
-          .find(prevConstraint => prevConstraint.attributePosition === constraint.attributePosition);
+        const prevConstraint = this.source.prevOptions?.constraints.find(
+          prevConstraint => prevConstraint.attributePosition === constraint.attributePosition,
+        );
 
         constraint.attributePosition = column.position;
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
index 390731a30c..97e55d7263 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { DataTypeLogicalOperation, ResultDataFormat, SqlResultColumn } from '@cloudbeaver/core-sdk';
@@ -21,8 +20,7 @@ import { isResultSetContentValue } from './isResultSetContentValue';
 import type { IResultSetValue } from './ResultSetFormatAction';
 
 @databaseDataAction()
-export class ResultSetDataAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IDatabaseDataResultAction<IDatabaseResultSet> {
+export class ResultSetDataAction extends DatabaseDataAction<any, IDatabaseResultSet> implements IDatabaseDataResultAction<IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Resultset];
 
   get rows(): IResultSetValue[][] {
@@ -88,12 +86,7 @@ export class ResultSetDataAction extends DatabaseDataAction<any, IDatabaseResult
   }
 
   getCellValue(cell: IResultSetElementKey): IResultSetValue | undefined {
-    if (
-      cell.row === undefined
-      || cell.column === undefined
-      || cell.row.index >= this.rows.length
-      || cell.column.index >= this.columns.length
-    ) {
+    if (cell.row === undefined || cell.column === undefined || cell.row.index >= this.rows.length || cell.column.index >= this.columns.length) {
       return undefined;
     }
 
@@ -131,7 +124,6 @@ export class ResultSetDataAction extends DatabaseDataAction<any, IDatabaseResult
       return [];
     }
 
-    return column.supportedOperations
-      .filter(operation => operation.argumentCount === 1 || operation.argumentCount === 0);
+    return column.supportedOperations.filter(operation => operation.argumentCount === 1 || operation.argumentCount === 0);
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts
index d8ae35f0f7..d223d48cd9 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts
@@ -5,7 +5,6 @@
  * 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 { QuotasService } from '@cloudbeaver/core-root';
@@ -28,8 +27,7 @@ import { ResultSetViewAction } from './ResultSetViewAction';
 const RESULT_VALUE_PATH = 'sql-result-value';
 
 @databaseDataAction()
-export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IResultSetDataContentAction {
+export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabaseResultSet> implements IResultSetDataContentAction {
   static dataFormat = [ResultDataFormat.Resultset];
 
   private readonly view: ResultSetViewAction;
@@ -83,17 +81,15 @@ export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabas
       throw new Error('Failed to get value metadata information');
     }
 
-    const url = await this.source.runTask(
-      async () => {
-        try {
-          this.activeElement = element;
-          const fileName = await this.loadFileName(this.result, column.position, row);
-          return this.generateFileDataUrl(fileName);
-        } finally {
-          this.activeElement = null;
-        }
+    const url = await this.source.runTask(async () => {
+      try {
+        this.activeElement = element;
+        const fileName = await this.loadFileName(this.result, column.position, row);
+        return this.generateFileDataUrl(fileName);
+      } finally {
+        this.activeElement = null;
       }
-    );
+    });
 
     return url;
   }
@@ -150,4 +146,4 @@ export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabas
 
     return response.url;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataKeysUtils.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataKeysUtils.ts
index 204eba95fe..570ef27a1a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataKeysUtils.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataKeysUtils.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IResultSetColumnKey, IResultSetElementKey, IResultSetRowKey } from './IResultSetDataKey';
 
 export const ResultSetDataKeysUtils = {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
index e6a5cbaa30..19438fa8cc 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable } from 'mobx';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -16,7 +15,13 @@ import type { IDatabaseDataSource } from '../../IDatabaseDataSource';
 import type { IDatabaseResultSet } from '../../IDatabaseResultSet';
 import { databaseDataAction } from '../DatabaseDataActionDecorator';
 import { DatabaseEditAction } from '../DatabaseEditAction';
-import { DatabaseEditChangeType, IDatabaseDataEditActionData, IDatabaseDataEditActionValue, IDatabaseDataEditApplyActionData, IDatabaseDataEditApplyActionUpdate } from '../IDatabaseDataEditAction';
+import {
+  DatabaseEditChangeType,
+  IDatabaseDataEditActionData,
+  IDatabaseDataEditActionValue,
+  IDatabaseDataEditApplyActionData,
+  IDatabaseDataEditApplyActionUpdate,
+} from '../IDatabaseDataEditAction';
 import type { IResultSetColumnKey, IResultSetElementKey, IResultSetRowKey } from './IResultSetDataKey';
 import { isResultSetContentValue } from './isResultSetContentValue';
 import { ResultSetDataAction } from './ResultSetDataAction';
@@ -33,19 +38,14 @@ export interface IResultSetUpdate {
 export type IResultSetEditActionData = IDatabaseDataEditActionData<IResultSetElementKey, IResultSetValue>;
 
 @databaseDataAction()
-export class ResultSetEditAction
-  extends DatabaseEditAction<IResultSetElementKey, IResultSetValue, IDatabaseResultSet> {
+export class ResultSetEditAction extends DatabaseEditAction<IResultSetElementKey, IResultSetValue, IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Resultset];
 
   readonly applyAction: ISyncExecutor<IDatabaseDataEditApplyActionData<IResultSetRowKey>>;
   private readonly editorData: Map<string, IResultSetUpdate>;
   private readonly data: ResultSetDataAction;
 
-  constructor(
-    source: IDatabaseDataSource<any, IDatabaseResultSet>,
-    result: IDatabaseResultSet,
-    data: ResultSetDataAction
-  ) {
+  constructor(source: IDatabaseDataSource<any, IDatabaseResultSet>, result: IDatabaseResultSet, data: ResultSetDataAction) {
     super(source, result);
     this.applyAction = new SyncExecutor();
     this.editorData = new Map();
@@ -77,22 +77,21 @@ export class ResultSetEditAction
   }
 
   get updates(): IResultSetUpdate[] {
-    return Array.from(this.editorData.values())
-      .sort((a, b) => {
-        if (a.type !== b.type) {
-          if (a.type === DatabaseEditChangeType.update) {
-            return -1;
-          }
-
-          if (b.type === DatabaseEditChangeType.update) {
-            return 1;
-          }
-
-          return a.type - b.type;
+    return Array.from(this.editorData.values()).sort((a, b) => {
+      if (a.type !== b.type) {
+        if (a.type === DatabaseEditChangeType.update) {
+          return -1;
         }
 
-        return a.row.index - b.row.index;
-      });
+        if (b.type === DatabaseEditChangeType.update) {
+          return 1;
+        }
+
+        return a.type - b.type;
+      }
+
+      return a.row.index - b.row.index;
+    });
   }
 
   isEdited(): boolean {
@@ -142,9 +141,7 @@ export class ResultSetEditAction
   }
 
   get(key: IResultSetElementKey): IResultSetValue | undefined {
-    return this.editorData
-      .get(ResultSetDataKeysUtils.serialize(key.row))
-      ?.update[key.column.index];
+    return this.editorData.get(ResultSetDataKeysUtils.serialize(key.row))?.update[key.column.index];
   }
 
   set(key: IResultSetElementKey, value: IResultSetValue): void {
@@ -167,11 +164,13 @@ export class ResultSetEditAction
       resultId: this.result.id,
       type: update.type,
       revert: false,
-      value: [{
-        key,
-        prevValue,
-        value,
-      }],
+      value: [
+        {
+          key,
+          prevValue,
+          value,
+        },
+      ],
     });
 
     this.removeEmptyUpdate(update);
@@ -205,9 +204,11 @@ export class ResultSetEditAction
         resultId: this.result.id,
         type: update.type,
         revert: false,
-        value: [{
-          key: { column, row },
-        }],
+        value: [
+          {
+            key: { column, row },
+          },
+        ],
       });
     }
   }
@@ -232,8 +233,7 @@ export class ResultSetEditAction
     for (const row of rows) {
       let value = this.data.getRowValue(row);
 
-      const editedValue = this.editorData
-        .get(ResultSetDataKeysUtils.serialize(row));
+      const editedValue = this.editorData.get(ResultSetDataKeysUtils.serialize(row));
 
       if (editedValue) {
         value = editedValue.update;
@@ -299,9 +299,11 @@ export class ResultSetEditAction
           resultId: this.result.id,
           type: update.type,
           revert: false,
-          value: [{
-            key: { column, row: key },
-          }],
+          value: [
+            {
+              key: { column, row: key },
+            },
+          ],
         });
       }
     } else if (!silent) {
@@ -309,9 +311,11 @@ export class ResultSetEditAction
         resultId: this.result.id,
         type: update.type,
         revert: true,
-        value: [{
-          key: { column, row: key },
-        }],
+        value: [
+          {
+            key: { column, row: key },
+          },
+        ],
       });
     }
   }
@@ -517,18 +521,12 @@ export class ResultSetEditAction
       return;
     }
 
-    if (update.source && !update.source.some(
-      (value, i) => !this.compareCellValue(value, update.update[i])
-    )) {
+    if (update.source && !update.source.some((value, i) => !this.compareCellValue(value, update.update[i]))) {
       this.editorData.delete(ResultSetDataKeysUtils.serialize(update.row));
     }
   }
 
-  private getOrCreateUpdate(
-    row: IResultSetRowKey,
-    type: DatabaseEditChangeType,
-    update?: IResultSetValue[]
-  ): [IResultSetUpdate, boolean] {
+  private getOrCreateUpdate(row: IResultSetRowKey, type: DatabaseEditChangeType, update?: IResultSetValue[]): [IResultSetUpdate, boolean] {
     const key = ResultSetDataKeysUtils.serialize(row);
     let created = false;
 
@@ -538,14 +536,14 @@ export class ResultSetEditAction
       if (type !== DatabaseEditChangeType.add) {
         source = this.data.getRowValue(row);
       } else {
-        source = [...update || []];
+        source = [...(update || [])];
       }
 
       this.editorData.set(key, {
         row,
         type,
         source,
-        update: observable([...source || update || []]),
+        update: observable([...(source || update || [])]),
       });
       created = true;
     }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts
index adb3d7132a..718510da59 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import { removeLineBreak } from '@cloudbeaver/core-utils';
 
@@ -20,12 +19,13 @@ import { isResultSetContentValue } from './isResultSetContentValue';
 import { ResultSetEditAction } from './ResultSetEditAction';
 import { ResultSetViewAction } from './ResultSetViewAction';
 
-export type IResultSetValue =
-  string | number | boolean | Record<string, string | number | Record<string, any> | null> | null;
+export type IResultSetValue = string | number | boolean | Record<string, string | number | Record<string, any> | null> | null;
 
 @databaseDataAction()
-export class ResultSetFormatAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IDatabaseDataFormatAction<IResultSetElementKey, IDatabaseResultSet> {
+export class ResultSetFormatAction
+  extends DatabaseDataAction<any, IDatabaseResultSet>
+  implements IDatabaseDataFormatAction<IResultSetElementKey, IDatabaseResultSet>
+{
   static dataFormat = [ResultDataFormat.Resultset];
 
   private readonly view: ResultSetViewAction;
@@ -35,7 +35,7 @@ export class ResultSetFormatAction extends DatabaseDataAction<any, IDatabaseResu
     source: IDatabaseDataSource<any, IDatabaseResultSet>,
     result: IDatabaseResultSet,
     view: ResultSetViewAction,
-    edit: ResultSetEditAction
+    edit: ResultSetEditAction,
   ) {
     super(source, result);
     this.view = view;
@@ -84,10 +84,7 @@ export class ResultSetFormatAction extends DatabaseDataAction<any, IDatabaseResu
         const value = this.view.getCellValue(key as IResultSetElementKey);
 
         if (isResultSetContentValue(value)) {
-          readonly = (
-            value.binary !== undefined
-            || value.contentLength !== value.text?.length
-          );
+          readonly = value.binary !== undefined || value.contentLength !== value.text?.length;
         } else if (value !== null && typeof value === 'object') {
           readonly = true;
         }
@@ -136,7 +133,12 @@ export class ResultSetFormatAction extends DatabaseDataAction<any, IDatabaseResu
     }
 
     if (typeof value === 'string' && value.length > 1000) {
-      return removeLineBreak(value.split('').map(v => (v.charCodeAt(0) < 32 ? ' ' : v)).join(''));
+      return removeLineBreak(
+        value
+          .split('')
+          .map(v => (v.charCodeAt(0) < 32 ? ' ' : v))
+          .join(''),
+      );
     }
 
     return removeLineBreak(String(value));
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetSelectAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetSelectAction.ts
index 023b809134..75bb3f2268 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetSelectAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetSelectAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, IReactionDisposer, makeObservable, observable, reaction, toJS } from 'mobx';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -46,7 +45,7 @@ export class ResultSetSelectAction extends DatabaseSelectAction<any, IDatabaseRe
     result: IDatabaseResultSet,
     view: ResultSetViewAction,
     edit: ResultSetEditAction,
-    data: ResultSetDataAction
+    data: ResultSetDataAction,
   ) {
     super(source, result);
     this.view = view;
@@ -65,46 +64,49 @@ export class ResultSetSelectAction extends DatabaseSelectAction<any, IDatabaseRe
       clear: action,
     });
 
-    this.validationDisposer = reaction(() => this.view.rowKeys, (current, previous) => {
-      if (this.focusedElement) {
-        const focus = this.focusedElement;
-        const currentIndex = current.findIndex(key => ResultSetDataKeysUtils.isEqual(key, focus.row));
+    this.validationDisposer = reaction(
+      () => this.view.rowKeys,
+      (current, previous) => {
+        if (this.focusedElement) {
+          const focus = this.focusedElement;
+          const currentIndex = current.findIndex(key => ResultSetDataKeysUtils.isEqual(key, focus.row));
 
-        const focusIndex = previous.findIndex(key => ResultSetDataKeysUtils.isEqual(key, focus.row));
+          const focusIndex = previous.findIndex(key => ResultSetDataKeysUtils.isEqual(key, focus.row));
 
-        if (currentIndex >= 0 && focusIndex === -1) {
-          return;
-        }
-
-        if (focusIndex === -1 || current.length === 0) {
-          this.focus(null);
-          return;
-        }
-
-        if (!current.some(key => ResultSetDataKeysUtils.isEqual(key, focus.row))) {
-          for (let index = focusIndex; index >= 0; index--) {
-            const previousElement = previous[index];
-            const row = current.find(key => ResultSetDataKeysUtils.isEqual(key, previousElement));
-
-            if (row) {
-              this.focus({ ...this.focusedElement, row });
-              return;
-            }
-          }
-          for (let index = focusIndex; index <= previous.length; index++) {
-            const nextElement = previous[index];
-            const row = current.find(key => ResultSetDataKeysUtils.isEqual(key, nextElement));
-
-            if (row) {
-              this.focus({ ...this.focusedElement, row });
-              return;
-            }
+          if (currentIndex >= 0 && focusIndex === -1) {
+            return;
           }
 
-          this.focus({ ...this.focusedElement, row: current[current.length - 1] });
+          if (focusIndex === -1 || current.length === 0) {
+            this.focus(null);
+            return;
+          }
+
+          if (!current.some(key => ResultSetDataKeysUtils.isEqual(key, focus.row))) {
+            for (let index = focusIndex; index >= 0; index--) {
+              const previousElement = previous[index];
+              const row = current.find(key => ResultSetDataKeysUtils.isEqual(key, previousElement));
+
+              if (row) {
+                this.focus({ ...this.focusedElement, row });
+                return;
+              }
+            }
+            for (let index = focusIndex; index <= previous.length; index++) {
+              const nextElement = previous[index];
+              const row = current.find(key => ResultSetDataKeysUtils.isEqual(key, nextElement));
+
+              if (row) {
+                this.focus({ ...this.focusedElement, row });
+                return;
+              }
+            }
+
+            this.focus({ ...this.focusedElement, row: current[current.length - 1] });
+          }
         }
-      }
-    });
+      },
+    );
 
     this.edit.action.addHandler(this.syncFocus.bind(this));
     this.edit.applyAction.addHandler(this.syncFocusOnUpdate.bind(this));
@@ -118,10 +120,7 @@ export class ResultSetSelectAction extends DatabaseSelectAction<any, IDatabaseRe
     if (!this.focusedElement) {
       return false;
     }
-    return (
-      ResultSetDataKeysUtils.isEqual(key.column, this.focusedElement.column)
-      && ResultSetDataKeysUtils.isEqual(key.row, this.focusedElement.row)
-    );
+    return ResultSetDataKeysUtils.isEqual(key.column, this.focusedElement.column) && ResultSetDataKeysUtils.isEqual(key.row, this.focusedElement.row);
   }
 
   isElementSelected(key: IResultSetPartialKey): boolean {
@@ -270,10 +269,7 @@ export class ResultSetSelectAction extends DatabaseSelectAction<any, IDatabaseRe
       key = null;
     }
 
-    if (
-      (key && this.isFocused(key))
-      || key === this.focusedElement
-    ) {
+    if ((key && this.isFocused(key)) || key === this.focusedElement) {
       return;
     }
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
index 94bdccda8b..8246af0d5e 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { DataTypeLogicalOperation, ResultDataFormat, SqlResultColumn } from '@cloudbeaver/core-sdk';
@@ -24,15 +23,11 @@ import { ResultSetEditAction } from './ResultSetEditAction';
 import type { IResultSetValue } from './ResultSetFormatAction';
 
 @databaseDataAction()
-export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IDatabaseDataResultAction<IDatabaseResultSet> {
+export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResultSet> implements IDatabaseDataResultAction<IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Resultset];
 
   get rowKeys(): IResultSetRowKey[] {
-    return [
-      ...this.editor.addRows,
-      ...this.data.rows.map((c, index) => ({ index })),
-    ].sort((a, b) => a.index - b.index);
+    return [...this.editor.addRows, ...this.data.rows.map((c, index) => ({ index }))].sort((a, b) => a.index - b.index);
   }
 
   get columnKeys(): IResultSetColumnKey[] {
@@ -54,7 +49,7 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
     source: IDatabaseDataSource<any, IDatabaseResultSet>,
     result: IDatabaseResultSet,
     data: ResultSetDataAction,
-    editor: ResultSetEditAction
+    editor: ResultSetEditAction,
   ) {
     super(source, result);
     this.data = data;
@@ -128,10 +123,7 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
       return edited;
     }
 
-    if (
-      cell.row.index >= this.rows.length
-      || cell.column.index >= this.columns.length
-    ) {
+    if (cell.row.index >= this.rows.length || cell.column.index >= this.columns.length) {
       return undefined;
     }
 
@@ -163,7 +155,6 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
       return [];
     }
 
-    return column.supportedOperations
-      .filter(operation => operation.argumentCount === 1 || operation.argumentCount === 0);
+    return column.supportedOperations.filter(operation => operation.argumentCount === 1 || operation.argumentCount === 0);
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/isResultSetContentValue.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/isResultSetContentValue.ts
index d3268f3e89..38303410d7 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/isResultSetContentValue.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/isResultSetContentValue.ts
@@ -5,12 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IResultSetContentValue } from './IResultSetContentValue';
 
 export function isResultSetContentValue(value: any): value is IResultSetContentValue {
-  return value !== null
-    && typeof value === 'object'
-    && '$type' in value
-    && value.$type === 'content';
-}
\ No newline at end of file
+  return value !== null && typeof value === 'object' && '$type' in value && value.$type === 'content';
+}
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts
index fd4525fc68..adf6271e05 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { IDatabaseDataModel } from '../IDatabaseDataModel';
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM_RESULT_INDEX.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM_RESULT_INDEX.ts
index f7bb63e9b9..150409518e 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM_RESULT_INDEX.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM_RESULT_INDEX.ts
@@ -5,7 +5,6 @@
  * 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_DV_DDM_RESULT_INDEX = createDataContext<number>('data-viewer-database-data-model-result-index');
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataAction.ts
index db580a26ec..55004c5c69 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataAction.ts
@@ -5,15 +5,13 @@
  * 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 type { IDatabaseDataAction, IDatabaseDataActionClass, IDatabaseDataActionInterface } from './IDatabaseDataAction';
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
 import type { IDatabaseDataSource } from './IDatabaseDataSource';
 
-export abstract class DatabaseDataAction<TOptions, TResult extends IDatabaseDataResult>
-implements IDatabaseDataAction<TOptions, TResult> {
+export abstract class DatabaseDataAction<TOptions, TResult extends IDatabaseDataResult> implements IDatabaseDataAction<TOptions, TResult> {
   result: TResult;
 
   get resultIndex(): number {
@@ -39,29 +37,25 @@ implements IDatabaseDataAction<TOptions, TResult> {
     this.result = result;
   }
 
-  updateResults(results: TResult[]): void { }
+  updateResults(results: TResult[]): void {}
 
-  afterResultUpdate(): void { }
+  afterResultUpdate(): void {}
 
-  tryGetAction<T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T | undefined {
+  tryGetAction<T extends IDatabaseDataAction<TOptions, TResult>>(action: IDatabaseDataActionClass<TOptions, TResult, T>): T | undefined {
     return this.source.actions.tryGet(this.result, action);
   }
 
-  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T {
+  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(action: IDatabaseDataActionClass<TOptions, TResult, T>): T {
     return this.source.actions.get(this.result, action);
   }
 
   getActionImplementation<T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ): T | undefined {
     return this.source.actions.getImplementation(this.result, action);
   }
 
-  dispose(): void { }
+  dispose(): void {}
 }
 
 export function isDatabaseDataAction(action: any): action is IDatabaseDataActionClass<any, any, any> {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataActions.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataActions.ts
index 10a073f9b1..3faf9542e8 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataActions.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataActions.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable, runInAction } from 'mobx';
 
 import { getDependingDataActions } from './Actions/DatabaseDataActionDecorator';
@@ -17,8 +16,7 @@ import type { IDatabaseDataSource } from './IDatabaseDataSource';
 
 type ActionsList<TOptions, TResult extends IDatabaseDataResult> = Array<IDatabaseDataAction<TOptions, TResult>>;
 
-export class DatabaseDataActions<TOptions, TResult extends IDatabaseDataResult>
-implements IDatabaseDataActions<TOptions, TResult> {
+export class DatabaseDataActions<TOptions, TResult extends IDatabaseDataResult> implements IDatabaseDataActions<TOptions, TResult> {
   private readonly actions: Map<string, ActionsList<TOptions, TResult>>;
   private readonly source: IDatabaseDataSource<TOptions, TResult>;
 
@@ -33,10 +31,7 @@ implements IDatabaseDataActions<TOptions, TResult> {
     });
   }
 
-  tryGet<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    Action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T | undefined {
+  tryGet<T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, Action: IDatabaseDataActionClass<TOptions, TResult, T>): T | undefined {
     if (Action.dataFormat && !Action.dataFormat.includes(result.dataFormat)) {
       return undefined;
     }
@@ -44,10 +39,7 @@ implements IDatabaseDataActions<TOptions, TResult> {
     return this.get(result, Action);
   }
 
-  get<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    Action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T {
+  get<T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, Action: IDatabaseDataActionClass<TOptions, TResult, T>): T {
     if (Action.dataFormat && !Action.dataFormat.includes(result.dataFormat)) {
       throw new Error('DataFormat unsupported');
     }
@@ -58,8 +50,7 @@ implements IDatabaseDataActions<TOptions, TResult> {
       let action = actions.find(action => action instanceof Action);
 
       if (!action) {
-        const allDeps = getDependingDataActions(Action)
-          .slice(2); // skip source and result arguments
+        const allDeps = getDependingDataActions(Action).slice(2); // skip source and result arguments
 
         const depends: any[] = [];
 
@@ -84,7 +75,7 @@ implements IDatabaseDataActions<TOptions, TResult> {
 
   getImplementation<T extends IDatabaseDataAction<TOptions, TResult>>(
     result: TResult,
-    Action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    Action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ): T | undefined {
     const actions = this.getActionsList(result.uniqueResultId);
     const action = actions?.find(action => action instanceof Action);
@@ -122,11 +113,7 @@ implements IDatabaseDataActions<TOptions, TResult> {
     }
   }
 
-  private addActionToList(
-    resultId: string,
-    actions: ActionsList<TOptions, TResult>,
-    action: IDatabaseDataAction<TOptions, TResult>
-  ) {
+  private addActionToList(resultId: string, actions: ActionsList<TOptions, TResult>, action: IDatabaseDataAction<TOptions, TResult>) {
     actions.push(action);
   }
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataFormat.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataFormat.ts
index f372fc557a..47e1dd344a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataFormat.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataFormat.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DatabaseDataModel } from './DatabaseDataModel';
 
 export interface DatabaseDataFormat<T> {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
index 0b7a98cc79..0c0deb2a4e 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import { Executor, ExecutorInterrupter, IExecutor } from '@cloudbeaver/core-executor';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
@@ -16,8 +15,7 @@ import type { IDatabaseDataModel, IRequestEventData } from './IDatabaseDataModel
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
 import type { DatabaseDataAccessMode, IDatabaseDataSource, IRequestInfo } from './IDatabaseDataSource';
 
-export class DatabaseDataModel<TOptions, TResult extends IDatabaseDataResult = IDatabaseDataResult>
-implements IDatabaseDataModel<TOptions, TResult> {
+export class DatabaseDataModel<TOptions, TResult extends IDatabaseDataResult = IDatabaseDataResult> implements IDatabaseDataModel<TOptions, TResult> {
   id: string;
   name: string | null;
   source: IDatabaseDataSource<TOptions, TResult>;
@@ -147,18 +145,12 @@ implements IDatabaseDataModel<TOptions, TResult> {
   }
 
   async reload(): Promise<void> {
-    await this.requestDataAction(() => this.source
-      .setSlice(0, this.countGain)
-      .requestData()
-    );
+    await this.requestDataAction(() => this.source.setSlice(0, this.countGain).requestData());
   }
 
   async requestDataPortion(offset: number, count: number): Promise<void> {
     if (!this.isDataAvailable(offset, count)) {
-      await this.requestDataAction(() => this.source
-        .setSlice(offset, count)
-        .requestData()
-      );
+      await this.requestDataAction(() => this.source.setSlice(offset, count).requestData());
     }
   }
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
index 1fb86f02aa..e757d3c1bb 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, action, toJS } from 'mobx';
+import { action, makeObservable, observable, toJS } from 'mobx';
 
 import type { IConnectionExecutionContext } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
@@ -18,8 +17,7 @@ import type { IDatabaseDataActions } from './IDatabaseDataActions';
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
 import { DatabaseDataAccessMode, IDatabaseDataSource, IRequestInfo } from './IDatabaseDataSource';
 
-export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseDataResult>
-implements IDatabaseDataSource<TOptions, TResult> {
+export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseDataResult> implements IDatabaseDataSource<TOptions, TResult> {
   access: DatabaseDataAccessMode;
   dataFormat: ResultDataFormat;
   supportedDataFormats: ResultDataFormat[];
@@ -99,15 +97,15 @@ implements IDatabaseDataSource<TOptions, TResult> {
 
   tryGetAction<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
   ): T | undefined;
   tryGetAction<T extends IDatabaseDataAction<TOptions, TResult>>(
     result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
   ): T | undefined;
   tryGetAction<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number | TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
   ): T | undefined {
     if (typeof resultIndex === 'number') {
       if (!this.hasResult(resultIndex)) {
@@ -119,17 +117,11 @@ implements IDatabaseDataSource<TOptions, TResult> {
     return this.actions.tryGet(resultIndex, action);
   }
 
-  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(
-    resultIndex: number,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T;
-  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ): T;
+  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(resultIndex: number, action: IDatabaseDataActionClass<TOptions, TResult, T>): T;
+  getAction<T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, action: IDatabaseDataActionClass<TOptions, TResult, T>): T;
   getAction<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number | TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
   ): T {
     if (typeof resultIndex === 'number') {
       if (!this.hasResult(resultIndex)) {
@@ -143,15 +135,15 @@ implements IDatabaseDataSource<TOptions, TResult> {
 
   getActionImplementation<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ): T | undefined;
   getActionImplementation<T extends IDatabaseDataAction<TOptions, TResult>>(
     result: TResult,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ): T | undefined;
   getActionImplementation<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number | TResult,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ): T | undefined {
     if (typeof resultIndex === 'number') {
       if (!this.hasResult(resultIndex)) {
@@ -193,10 +185,7 @@ implements IDatabaseDataSource<TOptions, TResult> {
   }
 
   isReadonly(resultIndex: number): boolean {
-    return this.access === DatabaseDataAccessMode.Readonly
-      || this.results.length > 1
-      || !this.executionContext?.context
-      || this.disabled;
+    return this.access === DatabaseDataAccessMode.Readonly || this.results.length > 1 || !this.executionContext?.context || this.disabled;
   }
 
   isLoading(): boolean {
@@ -255,19 +244,19 @@ implements IDatabaseDataSource<TOptions, TResult> {
     if (this.activeTask) {
       try {
         await this.activeTask;
-      } catch { }
+      } catch {}
     }
 
     if (this.activeSave) {
       try {
         await this.activeSave;
-      } catch { }
+      } catch {}
     }
 
     if (this.activeRequest) {
       try {
         await this.activeRequest;
-      } catch { }
+      } catch {}
     }
 
     this.activeTask = task();
@@ -283,7 +272,8 @@ implements IDatabaseDataSource<TOptions, TResult> {
     if (this.activeSave) {
       try {
         await this.activeSave;
-      } finally { }
+      } finally {
+      }
     }
 
     if (this.activeRequest) {
@@ -317,7 +307,8 @@ implements IDatabaseDataSource<TOptions, TResult> {
     if (this.activeRequest) {
       try {
         await this.activeRequest;
-      } finally { }
+      } finally {
+      }
     }
 
     if (this.activeSave) {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataAction.ts
index fbdb9f7428..99167680e3 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataAction.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataAction.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
@@ -14,18 +13,10 @@ import type { IDatabaseDataSource } from './IDatabaseDataSource';
 type AbstractConstructorFunction<
   TOptions,
   TResult extends IDatabaseDataResult,
-  TAction extends IDatabaseDataAction<TOptions, TResult>
-> = abstract new (
-  source: IDatabaseDataSource<TOptions, TResult>,
-  result: TResult,
-  ...actions: any[]
-) => TAction;
+  TAction extends IDatabaseDataAction<TOptions, TResult>,
+> = abstract new (source: IDatabaseDataSource<TOptions, TResult>, result: TResult, ...actions: any[]) => TAction;
 
-type ConstructorFunction<
-  TOptions,
-  TResult extends IDatabaseDataResult,
-  TAction extends IDatabaseDataAction<TOptions, TResult>
-> = new (
+type ConstructorFunction<TOptions, TResult extends IDatabaseDataResult, TAction extends IDatabaseDataAction<TOptions, TResult>> = new (
   source: IDatabaseDataSource<TOptions, TResult>,
   result: TResult,
   ...actions: any[]
@@ -34,7 +25,7 @@ type ConstructorFunction<
 export type IDatabaseDataActionInterface<
   TOptions,
   TResult extends IDatabaseDataResult,
-  TAction extends IDatabaseDataAction<TOptions, TResult>
+  TAction extends IDatabaseDataAction<TOptions, TResult>,
 > = AbstractConstructorFunction<TOptions, TResult, TAction> & {
   dataFormat: ResultDataFormat[] | null;
   prototype: TAction;
@@ -43,7 +34,7 @@ export type IDatabaseDataActionInterface<
 export type IDatabaseDataActionClass<
   TOptions,
   TResult extends IDatabaseDataResult,
-  TAction extends IDatabaseDataAction<TOptions, TResult>
+  TAction extends IDatabaseDataAction<TOptions, TResult>,
 > = ConstructorFunction<TOptions, TResult, TAction> & {
   dataFormat: ResultDataFormat[] | null;
   prototype: TAction;
@@ -57,14 +48,10 @@ export interface IDatabaseDataAction<TOptions, TResult extends IDatabaseDataResu
   updateResult: (result: TResult) => void;
   updateResults: (results: TResult[]) => void;
   afterResultUpdate: () => void;
-  tryGetAction: <T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T | undefined;
-  getAction: <T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T;
+  tryGetAction: <T extends IDatabaseDataAction<TOptions, TResult>>(action: IDatabaseDataActionClass<TOptions, TResult, T>) => T | undefined;
+  getAction: <T extends IDatabaseDataAction<TOptions, TResult>>(action: IDatabaseDataActionClass<TOptions, TResult, T>) => T;
   getActionImplementation: <T extends IDatabaseDataAction<TOptions, TResult>>(
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ) => T | undefined;
   dispose: () => void;
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataActions.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataActions.ts
index 58a837bee6..47726e4b81 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataActions.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataActions.ts
@@ -5,22 +5,18 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IDatabaseDataAction, IDatabaseDataActionClass, IDatabaseDataActionInterface } from './IDatabaseDataAction';
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
 
 export interface IDatabaseDataActions<TOptions, TResult extends IDatabaseDataResult> {
   tryGet: <T extends IDatabaseDataAction<TOptions, TResult>>(
     result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
   ) => T | undefined;
-  get: <T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T;
+  get: <T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, action: IDatabaseDataActionClass<TOptions, TResult, T>) => T;
   getImplementation: <T extends IDatabaseDataAction<TOptions, TResult>>(
     result: TResult,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
   ) => T | undefined;
 
   updateResults: (results: TResult[]) => void;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataEditor.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataEditor.ts
index 669c34fe0c..e153636431 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataEditor.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataEditor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutor } from '@cloudbeaver/core-executor';
 
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
@@ -13,7 +12,7 @@ import type { IDatabaseDataResult } from './IDatabaseDataResult';
 export enum DataUpdateType {
   delete,
   update,
-  add
+  add,
 }
 
 export interface IResultEditingDiff {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
index 481ab465f5..44be18e79c 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExecutor } from '@cloudbeaver/core-executor';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataOptions.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataOptions.ts
index b630d8d72d..2b6c946d3a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataOptions.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataOptions.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import type { SqlDataFilterConstraint } from '@cloudbeaver/core-sdk';
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataResult.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataResult.ts
index 3d268743c4..f0fd9e253a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataResult.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataResult.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
 export interface IDatabaseDataResult {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
index 26633874cb..00d33aa2a8 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionExecutionContext } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
@@ -24,7 +23,7 @@ export interface IRequestInfo {
 
 export enum DatabaseDataAccessMode {
   Default,
-  Readonly
+  Readonly,
 }
 
 export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResult = IDatabaseDataResult> {
@@ -55,25 +54,19 @@ export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResu
 
   tryGetAction: (<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T | undefined) & (<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T | undefined);
-  getAction: (<T extends IDatabaseDataAction<TOptions, TResult>>(
-    resultIndex: number,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T) & (<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    action: IDatabaseDataActionClass<TOptions, TResult, T>
-  ) => T);
+    action: IDatabaseDataActionClass<TOptions, TResult, T>,
+  ) => T | undefined) &
+    (<T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, action: IDatabaseDataActionClass<TOptions, TResult, T>) => T | undefined);
+  getAction: (<T extends IDatabaseDataAction<TOptions, TResult>>(resultIndex: number, action: IDatabaseDataActionClass<TOptions, TResult, T>) => T) &
+    (<T extends IDatabaseDataAction<TOptions, TResult>>(result: TResult, action: IDatabaseDataActionClass<TOptions, TResult, T>) => T);
   getActionImplementation: (<T extends IDatabaseDataAction<TOptions, TResult>>(
     resultIndex: number,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
-  ) => T | undefined) & (<T extends IDatabaseDataAction<TOptions, TResult>>(
-    result: TResult,
-    action: IDatabaseDataActionInterface<TOptions, TResult, T>
-  ) => T | undefined);
+    action: IDatabaseDataActionInterface<TOptions, TResult, T>,
+  ) => T | undefined) &
+    (<T extends IDatabaseDataAction<TOptions, TResult>>(
+      result: TResult,
+      action: IDatabaseDataActionInterface<TOptions, TResult, T>,
+    ) => T | undefined);
 
   getResult: (index: number) => TResult | null;
 
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseResultSet.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseResultSet.ts
index 10e7c97ed4..355895e5d0 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseResultSet.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseResultSet.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SqlResultSet } from '@cloudbeaver/core-sdk';
 
 import type { IDatabaseDataResult } from './IDatabaseDataResult';
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Order.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Order.ts
index 28f8f3f942..8c6c86fd0f 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Order.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Order.ts
@@ -8,7 +8,7 @@
 
 export enum EOrder {
   'asc' = 'asc',
-  'desc' = 'desc'
+  'desc' = 'desc',
 }
 
 export type Order = EOrder | null;
diff --git a/webapp/packages/plugin-data-viewer/src/LocaleService.ts b/webapp/packages/plugin-data-viewer/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-data-viewer/src/LocaleService.ts
+++ b/webapp/packages/plugin-data-viewer/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/IDataTableActions.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/IDataTableActions.ts
index 0fa015575f..eee9050a1c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/IDataTableActions.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/IDataTableActions.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
 import type { IDatabaseDataModel } from '../DatabaseDataModel/IDatabaseDataModel';
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx
index 130e723417..3dcbf6bb7c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import styled, { css, use } from 'reshadow';
@@ -17,65 +16,66 @@ import { errorOf } from '@cloudbeaver/core-utils';
 import type { IDatabaseDataModel } from '../DatabaseDataModel/IDatabaseDataModel';
 
 const style = css`
-    error {
-      composes: theme-background-surface theme-text-on-surface from global;
-      position: absolute;
-      box-sizing: border-box;
-      width: 100%;
-      height: 100%;
-      padding: 16px;
-      overflow: auto;
+  error {
+    composes: theme-background-surface theme-text-on-surface from global;
+    position: absolute;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    padding: 16px;
+    overflow: auto;
+    pointer-events: none;
+    bottom: 0;
+    right: 0;
+    z-index: 1;
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out, width 0.3s ease-in-out, height 0.3s ease-in-out, background 0.3s ease-in-out;
+
+    &[|animated] {
+      overflow: hidden;
+      pointer-events: auto;
+      opacity: 1;
+    }
+    &[|collapsed] {
+      pointer-events: auto;
+      width: 92px;
+      height: 72px;
+      background: transparent !important;
+
+      & IconOrImage {
+        cursor: pointer;
+      }
+
+      & error-message,
+      & controls {
+        display: none;
+      }
+    }
+    &[|errorHidden] {
       pointer-events: none;
-      bottom: 0;
-      right: 0;
-      z-index: 1;
-      opacity: 0;
-      transition: opacity 0.3s ease-in-out, width 0.3s ease-in-out, height 0.3s ease-in-out, background 0.3s ease-in-out;
-
-      &[|animated] {
-        overflow: hidden;
-        pointer-events: auto;
-        opacity: 1;
-      }
-      &[|collapsed] {
-        pointer-events: auto;
-        width: 92px;
-        height: 72px;
-        background: transparent!important;
-
-        & IconOrImage {
-            cursor: pointer;
-        }
-
-        & error-message, & controls {
-            display: none;
-        }
-      }
-      &[|errorHidden] {
-        pointer-events: none;
-      }
     }
-    error-body {
-      display: flex;
-      gap: 24px;
-      align-items: center;
-      margin-bottom: 24px;
+  }
+  error-body {
+    display: flex;
+    gap: 24px;
+    align-items: center;
+    margin-bottom: 24px;
+  }
+  error-message {
+    white-space: pre-wrap;
+  }
+  IconOrImage {
+    width: 40px;
+    height: 40px;
+  }
+  controls {
+    display: flex;
+    gap: 16px;
+    & > Button {
+      flex-shrink: 0;
     }
-    error-message {
-      white-space: pre-wrap;
-    }
-    IconOrImage {
-      width: 40px;
-      height: 40px;
-    }
-    controls {
-      display: flex;
-      gap: 16px;
-      & > Button {
-        flex-shrink: 0;
-      }
-    }
-  `;
+  }
+`;
 
 interface Props {
   model: IDatabaseDataModel;
@@ -90,24 +90,24 @@ interface ErrorInfo {
   show: () => void;
 }
 
-export const TableError = observer<Props>(function TableError({
-  model,
-  loading,
-  className,
-}) {
+export const TableError = observer<Props>(function TableError({ model, loading, className }) {
   const translate = useTranslate();
-  const errorInfo = useObservableRef<ErrorInfo>(() => ({
-    error: null,
-    display: false,
-    hide() {
-      this.display = false;
+  const errorInfo = useObservableRef<ErrorInfo>(
+    () => ({
+      error: null,
+      display: false,
+      hide() {
+        this.display = false;
+      },
+      show() {
+        this.display = true;
+      },
+    }),
+    {
+      display: observable.ref,
     },
-    show() {
-      this.display = true;
-    },
-  }), {
-    display: observable.ref,
-  }, false);
+    false,
+  );
 
   if (errorInfo.error !== model.source.error) {
     errorInfo.error = model.source.error || null;
@@ -141,26 +141,22 @@ export const TableError = observer<Props>(function TableError({
   return styled(style)(
     <error {...use({ animated, collapsed: !errorInfo.display, errorHidden })} className={className}>
       <error-body>
-        <IconOrImage
-          icon={icon}
-          title={error.message}
-          onClick={() => errorInfo.show()}
-        />
+        <IconOrImage icon={icon} title={error.message} onClick={() => errorInfo.show()} />
         <error-message>{error.message}</error-message>
       </error-body>
       <controls>
-        <Button type='button' mod={['outlined']} onClick={() => errorInfo.hide()}>
+        <Button type="button" mod={['outlined']} onClick={() => errorInfo.hide()}>
           {translate('ui_error_close')}
         </Button>
         {error.hasDetails && (
-          <Button type='button' mod={['outlined']} onClick={error.open}>
+          <Button type="button" mod={['outlined']} onClick={error.open}>
             {translate('ui_errors_details')}
           </Button>
         )}
-        <Button type='button' mod={['unelevated']} onClick={onRetry}>
+        <Button type="button" mod={['unelevated']} onClick={onRetry}>
           {translate('ui_processing_retry')}
         </Button>
       </controls>
-    </error>
+    </error>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx
index 47e42f7900..a2ab8b16a6 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx
@@ -5,9 +5,8 @@
  * 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 styled, { css } from 'reshadow';
 
 import { Icon, Menu, MenuItem, MenuItemElement, TimerIcon, useTranslate } from '@cloudbeaver/core-blocks';
 import { declensionOfNumber } from '@cloudbeaver/core-utils';
@@ -16,50 +15,50 @@ import type { IDatabaseDataModel } from '../../../DatabaseDataModel/IDatabaseDat
 import { useAutoRefresh } from './useAutoRefresh';
 
 const styles = css`
-auto-reload {
-  composes: theme-text-primary theme-ripple from global;
-  height: 100%;
-  display: flex;
-  cursor: pointer;
-  align-items: center;
-
-  & icon-box {
-    position: relative;
-    padding-left: 8px;
-    display: flex;
-    align-items: center;
-
-    & Icon {
-      width: 16px;
-      height: 16px;
-      flex-grow: 0;
-      flex-shrink: 0;
-    }
-    
-    &:hover > Icon :global(use) {
-      fill: var(--theme-primary) !important;
-    }
-  }
-
-  & arrow-box {
-    position: relative;
+  auto-reload {
+    composes: theme-text-primary theme-ripple from global;
     height: 100%;
     display: flex;
+    cursor: pointer;
     align-items: center;
-    padding-right: 8px;
 
-    & > Icon {
-      width: 14px;
-      height: 14px;
-      flex-grow: 0;
-      flex-shrink: 0;
+    & icon-box {
+      position: relative;
+      padding-left: 8px;
+      display: flex;
+      align-items: center;
+
+      & Icon {
+        width: 16px;
+        height: 16px;
+        flex-grow: 0;
+        flex-shrink: 0;
+      }
+
+      &:hover > Icon :global(use) {
+        fill: var(--theme-primary) !important;
+      }
     }
 
-    &:hover > Icon :global(use) {
-      fill: var(--theme-primary) !important;
+    & arrow-box {
+      position: relative;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      padding-right: 8px;
+
+      & > Icon {
+        width: 14px;
+        height: 14px;
+        flex-grow: 0;
+        flex-shrink: 0;
+      }
+
+      &:hover > Icon :global(use) {
+        fill: var(--theme-primary) !important;
+      }
     }
   }
-}
 `;
 
 interface Props {
@@ -69,20 +68,13 @@ interface Props {
 
 const intervals = [5, 10, 15, 30, 60];
 
-export const AutoRefreshButton = observer<Props>(function AutoRefreshButton({
-  model,
-  disabled,
-}) {
+export const AutoRefreshButton = observer<Props>(function AutoRefreshButton({ model, disabled }) {
   const translate = useTranslate();
   const autoRefresh = useAutoRefresh(model);
   const interval = autoRefresh.settings.interval;
   const intervals_messages: string[] = [];
 
-  const buttonTitle = translate(
-    interval === null
-      ? 'data_viewer_action_refresh'
-      : 'data_viewer_action_auto_refresh_stop'
-  );
+  const buttonTitle = translate(interval === null ? 'data_viewer_action_refresh' : 'data_viewer_action_auto_refresh_stop');
 
   function handleClick() {
     if (disabled) {
@@ -104,51 +96,31 @@ export const AutoRefreshButton = observer<Props>(function AutoRefreshButton({
       interval = Math.round(interval / 60);
     }
 
-    intervals_messages.push(
-      translate(declensionOfNumber(interval, message), undefined, { interval })
-    );
+    intervals_messages.push(translate(declensionOfNumber(interval, message), undefined, { interval }));
   }
 
   return styled(styles)(
     <auto-reload aria-disabled={disabled}>
       <icon-box title={buttonTitle} onClick={handleClick}>
-        {interval === null ? (
-          <Icon name='/icons/refresh_m.svg#root' viewBox="0 0 24 24" />
-        ) : (
-          <TimerIcon
-            state="stop"
-            interval={interval}
-          />
-        )}
+        {interval === null ? <Icon name="/icons/refresh_m.svg#root" viewBox="0 0 24 24" /> : <TimerIcon state="stop" interval={interval} />}
       </icon-box>
       <Menu
-        label='Auto refresh'
-        items={(
+        label="Auto refresh"
+        items={
           <>
             <MenuItem label={translate('ui_custom')} close onClick={autoRefresh.configure}>
               <MenuItemElement label={translate('ui_custom')} />
             </MenuItem>
             {intervals.map((inte, i) => (
-              <MenuItem
-                key={inte}
-                label={intervals_messages[i]}
-                selected={interval === inte}
-                close
-                onClick={() => autoRefresh.setInterval(inte)}
-              >
+              <MenuItem key={inte} label={intervals_messages[i]} selected={interval === inte} close onClick={() => autoRefresh.setInterval(inte)}>
                 <MenuItemElement label={intervals_messages[i]} />
               </MenuItem>
             ))}
-            <MenuItem
-              label={translate('ui_processing_stop')}
-              selected={interval === null}
-              close
-              onClick={autoRefresh.stop}
-            >
+            <MenuItem label={translate('ui_processing_stop')} selected={interval === null} close onClick={autoRefresh.stop}>
               <MenuItemElement label={translate('ui_processing_stop')} />
             </MenuItem>
           </>
-        )}
+        }
         disabled={disabled}
         modal
         disclosure
@@ -157,6 +129,6 @@ export const AutoRefreshButton = observer<Props>(function AutoRefreshButton({
           <Icon name="arrow" viewBox="0 0 16 16" />
         </arrow-box>
       </Menu>
-    </auto-reload>
+    </auto-reload>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
index acb88f9784..a29ebbd4ae 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
@@ -5,7 +5,6 @@
  * 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 { useRef } from 'react';
 import styled, { css } from 'reshadow';
@@ -13,32 +12,31 @@ import styled, { css } from 'reshadow';
 import { BASE_CONTAINERS_STYLES, Button, Container, FieldCheckbox, Group, InputField, SubmittingForm, useTranslate } from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponentProps } from '@cloudbeaver/core-dialogs';
 
-
 import type { IAutoRefreshSettings } from './IAutoRefreshSettings';
 
 const styles = css`
-    footer-container {
-      display: flex;
-      width: min-content;
-      flex: 1;
-      align-items: center;
-      justify-content: flex-end;
-      gap: 24px;
-    }
-    buttons {
-      flex: 1;
-      display: flex;
-      gap: 24px;
-    }
-    wrapper {
-      display: flex;
-      height: 100%;
-      width: 100%;
-      overflow: auto;
-    }
-    fill {
-      flex: 1;
-    }
+  footer-container {
+    display: flex;
+    width: min-content;
+    flex: 1;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 24px;
+  }
+  buttons {
+    flex: 1;
+    display: flex;
+    gap: 24px;
+  }
+  wrapper {
+    display: flex;
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+  }
+  fill {
+    flex: 1;
+  }
 `;
 
 interface Payload {
@@ -63,33 +61,22 @@ export const AutoRefreshSettingsDialog = observer<DialogComponentProps<Payload>>
     }
   }
 
-  return styled(styles, BASE_CONTAINERS_STYLES)(
-    <CommonDialogWrapper size='small'>
-      <CommonDialogHeader
-        title='data_viewer_auto_refresh_settings'
-        icon='/icons/settings_cog_m.svg'
-        onReject={rejectDialog}
-      />
+  return styled(
+    styles,
+    BASE_CONTAINERS_STYLES,
+  )(
+    <CommonDialogWrapper size="small">
+      <CommonDialogHeader title="data_viewer_auto_refresh_settings" icon="/icons/settings_cog_m.svg" onReject={rejectDialog} />
       <CommonDialogBody noBodyPadding noOverflow>
         <wrapper>
           <SubmittingForm ref={formRef} onSubmit={() => resolve()}>
             <Container>
               <Group form gap>
-                <InputField
-                  name='interval'
-                  state={payload.settings}
-                  type='number'
-                  min={5}
-                  max={3600}
-                >
+                <InputField name="interval" state={payload.settings} type="number" min={5} max={3600}>
                   {translate('ui_interval')}
                 </InputField>
 
-                <FieldCheckbox
-                  id="dataViewer.tableViewer.autoRefresh.stopOnError"
-                  name="stopOnError"
-                  state={payload.settings}
-                >
+                <FieldCheckbox id="dataViewer.tableViewer.autoRefresh.stopOnError" name="stopOnError" state={payload.settings}>
                   {translate('data_viewer_auto_refresh_settings_stop_on_error')}
                 </FieldCheckbox>
               </Group>
@@ -98,15 +85,18 @@ export const AutoRefreshSettingsDialog = observer<DialogComponentProps<Payload>>
         </wrapper>
       </CommonDialogBody>
       <CommonDialogFooter>
-
         <footer-container>
           <buttons>
-            <Button mod={['outlined']} onClick={() => rejectDialog()}>{translate('ui_processing_cancel')}</Button>
+            <Button mod={['outlined']} onClick={() => rejectDialog()}>
+              {translate('ui_processing_cancel')}
+            </Button>
             <fill />
-            <Button mod={['unelevated']} onClick={() => resolve()}>{translate('ui_processing_ok')}</Button>
+            <Button mod={['unelevated']} onClick={() => resolve()}>
+              {translate('ui_processing_ok')}
+            </Button>
           </buttons>
         </footer-container>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/IAutoRefreshSettings.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/IAutoRefreshSettings.ts
index 7da151318d..2c7e17793d 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/IAutoRefreshSettings.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/IAutoRefreshSettings.ts
@@ -9,4 +9,4 @@
 export interface IAutoRefreshSettings {
   interval: number | null;
   stopOnError: boolean;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/useAutoRefresh.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/useAutoRefresh.ts
index 0dbc05a2ed..b382e4ce1e 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/useAutoRefresh.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/useAutoRefresh.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { useInterval, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
@@ -25,49 +24,60 @@ interface IAutoRefresh {
 
 export function useAutoRefresh(model: IDatabaseDataModel<any, any>) {
   const commonDialogService = useService(CommonDialogService);
-  const settings = useObservableRef<IAutoRefreshSettings>(() => ({
-    interval: null,
-    stopOnError: true,
-  }), {
-    interval: observable,
-    stopOnError: observable,
-  }, false);
+  const settings = useObservableRef<IAutoRefreshSettings>(
+    () => ({
+      interval: null,
+      stopOnError: true,
+    }),
+    {
+      interval: observable,
+      stopOnError: observable,
+    },
+    false,
+  );
 
-  useInterval(async () => {
-    try {
-      await model.refresh();
-    } catch { }
+  useInterval(
+    async () => {
+      try {
+        await model.refresh();
+      } catch {}
 
-    if (model.source.error && settings.stopOnError) {
-      settings.interval = null;
-    }
-  }, settings.interval !== null ? settings.interval * 1000 : null);
-
-  return useObjectRef<IAutoRefresh>(() => ({
-    async configure() {
-      const settings: IAutoRefreshSettings = observable({ ...this.settings });
-
-      const result = await commonDialogService.open(AutoRefreshSettingsDialog, { settings });
-
-      if (result === DialogueStateResult.Resolved) {
-        let interval = settings.interval;
-
-        if (typeof interval === 'string') {
-          interval = Number.parseInt(interval);
-        }
-
-        if (!Number.isInteger(interval)) {
-          interval = null;
-        }
-
-        Object.assign(this.settings, { ...settings, interval });
+      if (model.source.error && settings.stopOnError) {
+        settings.interval = null;
       }
     },
-    setInterval(interval: number) {
-      this.settings.interval = interval;
-    },
-    stop() {
-      this.settings.interval = null;
-    },
-  }), { settings }, ['configure', 'setInterval', 'stop']);
-}
\ No newline at end of file
+    settings.interval !== null ? settings.interval * 1000 : null,
+  );
+
+  return useObjectRef<IAutoRefresh>(
+    () => ({
+      async configure() {
+        const settings: IAutoRefreshSettings = observable({ ...this.settings });
+
+        const result = await commonDialogService.open(AutoRefreshSettingsDialog, { settings });
+
+        if (result === DialogueStateResult.Resolved) {
+          let interval = settings.interval;
+
+          if (typeof interval === 'string') {
+            interval = Number.parseInt(interval);
+          }
+
+          if (!Number.isInteger(interval)) {
+            interval = null;
+          }
+
+          Object.assign(this.settings, { ...settings, interval });
+        }
+      },
+      setInterval(interval: number) {
+        this.settings.interval = interval;
+      },
+      stop() {
+        this.settings.interval = null;
+      },
+    }),
+    { settings },
+    ['configure', 'setInterval', 'stop'],
+  );
+}
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index c09cb51383..f92ad0c936 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -5,7 +5,6 @@
  * 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, useEffect, useRef, useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -20,52 +19,52 @@ import { AutoRefreshButton } from './AutoRefresh/AutoRefreshButton';
 import { TableFooterMenu } from './TableFooterMenu/TableFooterMenu';
 
 const tableFooterStyles = css`
-    ToolsPanel {
-      align-items: center;
-      flex: 0 0 auto;
-      overflow: auto;
-      gap: 8px;
-      min-height: 32px;
-      height: initial;
-    }
-    count input,
-    count placeholder {
-      height: 26px;
-      width: 80px;
-      box-sizing: border-box;
-      padding: 4px 7px;
-      font-size: 13px;
-      line-height: 24px;
-    }
-    reload {
-      composes: theme-text-primary theme-ripple from global;
-      height: 100%;
-      display: flex;
-      cursor: pointer;
-      align-items: center;
-      padding: 0 16px;
+  ToolsPanel {
+    align-items: center;
+    flex: 0 0 auto;
+    overflow: auto;
+    gap: 8px;
+    min-height: 32px;
+    height: initial;
+  }
+  count input,
+  count placeholder {
+    height: 26px;
+    width: 80px;
+    box-sizing: border-box;
+    padding: 4px 7px;
+    font-size: 13px;
+    line-height: 24px;
+  }
+  reload {
+    composes: theme-text-primary theme-ripple from global;
+    height: 100%;
+    display: flex;
+    cursor: pointer;
+    align-items: center;
+    padding: 0 16px;
 
-      & IconOrImage {
-        & :global(use) {
-          fill: var(--theme-primary) !important;
-        }
-        width: 24px;
-        height: 24px;
+    & IconOrImage {
+      & :global(use) {
+        fill: var(--theme-primary) !important;
       }
-    }
-    IconButton {
-      position: relative;
-      height: 24px;
       width: 24px;
-      display: block;
+      height: 24px;
     }
-    time {
-      composes: theme-typography--caption from global;
-      white-space: nowrap;
-      margin-left: auto;
-      margin-right: 16px;
-    }
-  `;
+  }
+  IconButton {
+    position: relative;
+    height: 24px;
+    width: 24px;
+    display: block;
+  }
+  time {
+    composes: theme-typography--caption from global;
+    white-space: nowrap;
+    margin-left: auto;
+    margin-right: 16px;
+  }
+`;
 
 interface Props {
   resultIndex: number;
@@ -74,33 +73,23 @@ interface Props {
   context?: IDataContext;
 }
 
-export const TableFooter = observer<Props>(function TableFooter({
-  resultIndex,
-  model,
-  simple,
-  context,
-}) {
+export const TableFooter = observer<Props>(function TableFooter({ resultIndex, model, simple, context }) {
   const ref = useRef<HTMLInputElement>(null);
   const [limit, setLimit] = useState(model.countGain + '');
   const dataViewerSettingsService = useService(DataViewerSettingsService);
 
-  const handleChange = useCallback(
-    async () => {
-      if (!ref.current) {
-        return;
-      }
+  const handleChange = useCallback(async () => {
+    if (!ref.current) {
+      return;
+    }
 
-      const value = dataViewerSettingsService.getDefaultRowsCount(parseInt(ref.current.value, 10));
+    const value = dataViewerSettingsService.getDefaultRowsCount(parseInt(ref.current.value, 10));
 
-      setLimit(value + '');
-      if (model.countGain !== value) {
-        await model
-          .setCountGain(value)
-          .reload();
-      }
-    },
-    [model]
-  );
+    setLimit(value + '');
+    if (model.countGain !== value) {
+      await model.setCountGain(value).reload();
+    }
+  }, [model]);
 
   useEffect(() => {
     if (limit !== model.countGain + '') {
@@ -115,10 +104,7 @@ export const TableFooter = observer<Props>(function TableFooter({
       {/* <reload aria-disabled={disabled} onClick={() => model.refresh()}>
         <IconOrImage icon='reload' viewBox="0 0 16 16" />
       </reload> */}
-      <AutoRefreshButton
-        model={model}
-        disabled={disabled}
-      />
+      <AutoRefreshButton model={model} disabled={disabled} />
       <count>
         <SubmittingForm onSubmit={handleChange}>
           <input
@@ -138,6 +124,6 @@ export const TableFooter = observer<Props>(function TableFooter({
           {model.source.requestInfo.requestMessage} - {model.source.requestInfo.requestDuration}ms
         </time>
       )}
-    </ToolsPanel>
+    </ToolsPanel>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/DATA_VIEWER_DATA_MODEL_ACTIONS_MENU.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/DATA_VIEWER_DATA_MODEL_ACTIONS_MENU.ts
index 3dcfd3df6c..7847d63c15 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/DATA_VIEWER_DATA_MODEL_ACTIONS_MENU.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/DATA_VIEWER_DATA_MODEL_ACTIONS_MENU.ts
@@ -5,7 +5,6 @@
  * 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 DATA_VIEWER_DATA_MODEL_ACTIONS_MENU = createMenu('data-viewer-data-model-actions', 'Data viewer data model actions menu');
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
index 54cb3205f1..4bd9c6d424 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -47,13 +46,7 @@ interface Props {
   className?: string;
 }
 
-export const TableFooterMenu = observer<Props>(function TableFooterMenu({
-  resultIndex,
-  model,
-  simple,
-  context,
-  className,
-}) {
+export const TableFooterMenu = observer<Props>(function TableFooterMenu({ resultIndex, model, simple, context, className }) {
   const mainMenuService = useService(TableFooterMenuService);
   const menu = useMenu({ menu: DATA_VIEWER_DATA_MODEL_ACTIONS_MENU, context });
 
@@ -67,6 +60,6 @@ export const TableFooterMenu = observer<Props>(function TableFooterMenu({
         <TableFooterMenuItem key={i} menuItem={topItem} />
       ))}
       <MenuBar menu={menu} style={[MENU_BAR_DEFAULT_STYLES, MENU_BAR_SMALL_STYLES, menuStyles]} />
-    </menu-wrapper>
+    </menu-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
index 7144b5c1e9..d1997593aa 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
@@ -5,7 +5,6 @@
  * 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 type { ButtonHTMLAttributes } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -18,39 +17,36 @@ type Props = ButtonHTMLAttributes<any> & {
 };
 
 export const tableFooterMenuStyles = css`
-    Menu {
-      composes: theme-text-on-surface from global;
-    }
-    MenuTrigger {
-      composes: theme-ripple from global;
-      height: 100%;
-      padding: 0 12px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      &[|hidden] {
-        display: none;
-      }
-    }
-    ToolsAction[|hidden] {
+  Menu {
+    composes: theme-text-on-surface from global;
+  }
+  MenuTrigger {
+    composes: theme-ripple from global;
+    height: 100%;
+    padding: 0 12px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    &[|hidden] {
       display: none;
     }
-    menu-trigger-icon IconOrImage {
-      display: block;
-      width: 16px;
-    }
-    menu-trigger-title {
-      display: block;
-    }
-    menu-trigger-icon + menu-trigger-title {
-      padding-left: 8px;
-    }
-  `;
+  }
+  ToolsAction[|hidden] {
+    display: none;
+  }
+  menu-trigger-icon IconOrImage {
+    display: block;
+    width: 16px;
+  }
+  menu-trigger-title {
+    display: block;
+  }
+  menu-trigger-icon + menu-trigger-title {
+    padding-left: 8px;
+  }
+`;
 
-export const TableFooterMenuItem = observer<Props>(function TableFooterMenuItem({
-  menuItem,
-  ...props
-}) {
+export const TableFooterMenuItem = observer<Props>(function TableFooterMenuItem({ menuItem, ...props }) {
   const translate = useTranslate();
 
   if (!menuItem.panel) {
@@ -65,7 +61,7 @@ export const TableFooterMenuItem = observer<Props>(function TableFooterMenuItem(
         onClick={() => menuItem.onClick?.()}
       >
         {translate(menuItem.title)}
-      </ToolsAction>
+      </ToolsAction>,
     );
   }
 
@@ -85,6 +81,6 @@ export const TableFooterMenuItem = observer<Props>(function TableFooterMenuItem(
         </menu-trigger-icon>
       )}
       {menuItem.title && <menu-trigger-title>{translate(menuItem.title)}</menu-trigger-title>}
-    </MenuTrigger>
+    </MenuTrigger>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuService.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuService.ts
index 05be962005..1383711e0c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuService.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
-import { ContextMenuService, IMenuContext, IContextMenuItem, IMenuItem } from '@cloudbeaver/core-dialogs';
+import { ContextMenuService, IContextMenuItem, IMenuContext, IMenuItem } from '@cloudbeaver/core-dialogs';
 
 import { DatabaseEditAction } from '../../../DatabaseDataModel/Actions/DatabaseEditAction';
 import { DatabaseSelectAction } from '../../../DatabaseDataModel/Actions/DatabaseSelectAction';
@@ -25,9 +24,7 @@ export class TableFooterMenuService {
   static nodeContextType = 'NodeWithParent';
   private readonly tableFooterMenuToken = 'tableFooterMenu';
 
-  constructor(
-    private readonly contextMenuService: ContextMenuService,
-  ) {
+  constructor(private readonly contextMenuService: ContextMenuService) {
     this.contextMenuService.addPanel(this.tableFooterMenuToken);
 
     this.registerMenuItem({
@@ -43,34 +40,25 @@ export class TableFooterMenuService {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor?.hasFeature('add');
       },
       isDisabled(context) {
         return (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         );
       },
       onClick(context) {
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         if (!editor) {
           return;
         }
 
-        const select = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseSelectAction
-        );
+        const select = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseSelectAction);
 
         editor.add(select?.getFocusedElement());
       },
@@ -88,18 +76,15 @@ export class TableFooterMenuService {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor?.hasFeature('add');
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
@@ -109,10 +94,7 @@ export class TableFooterMenuService {
         return selectedElements.length === 0;
       },
       onClick(context) {
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         if (!editor) {
           return;
@@ -136,26 +118,20 @@ export class TableFooterMenuService {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor?.hasFeature('delete');
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         if (!editor) {
           return true;
@@ -170,10 +146,7 @@ export class TableFooterMenuService {
         return !selectedElements.some(key => editor.getElementState(key) !== DatabaseEditChangeType.delete);
       },
       onClick(context) {
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         const selectedElements = getActiveElements(context.data.model, context.data.resultIndex);
 
@@ -193,33 +166,27 @@ export class TableFooterMenuService {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor;
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         const selectedElements = getActiveElements(context.data.model, context.data.resultIndex);
 
         return (
-          !editor
-          || selectedElements.length === 0
-          || !selectedElements.some(key => {
+          !editor ||
+          selectedElements.length === 0 ||
+          !selectedElements.some(key => {
             const state = editor.getElementState(key);
 
             if (state === DatabaseEditChangeType.add) {
@@ -231,10 +198,7 @@ export class TableFooterMenuService {
         );
       },
       onClick(context) {
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         const selectedElements = getActiveElements(context.data.model, context.data.resultIndex);
 
@@ -254,17 +218,14 @@ export class TableFooterMenuService {
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor?.isEdited();
       },
@@ -285,25 +246,19 @@ export class TableFooterMenuService {
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
 
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
 
         return !editor?.isEdited();
       },
       onClick: context => {
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
         editor?.clear();
       },
     });
@@ -325,10 +280,7 @@ export class TableFooterMenuService {
 }
 
 function getActiveElements(model: IDatabaseDataModel, resultIndex: number): unknown[] {
-  const select = model.source.getActionImplementation(
-    resultIndex,
-    DatabaseSelectAction
-  );
+  const select = model.source.getActionImplementation(resultIndex, DatabaseSelectAction);
 
   return select?.getActiveElements() ?? [];
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx
index 079aad24f3..a0a8684f62 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -33,18 +32,8 @@ const styles = css`
   }
 `;
 
-export const TableGrid = observer<Props>(function TableGrid({
-  model,
-  actions,
-  dataFormat,
-  presentation,
-  resultIndex,
-  simple,
-}) {
-  if (
-    (presentation.dataFormat !== undefined && dataFormat !== presentation.dataFormat)
-    || !model.source.hasResult(resultIndex)
-  ) {
+export const TableGrid = observer<Props>(function TableGrid({ model, actions, dataFormat, presentation, resultIndex, simple }) {
+  if ((presentation.dataFormat !== undefined && dataFormat !== presentation.dataFormat) || !model.source.hasResult(resultIndex)) {
     if (model.isLoading()) {
       return null;
     }
@@ -61,7 +50,5 @@ export const TableGrid = observer<Props>(function TableGrid({
     return <TableStatistics model={model} resultIndex={resultIndex} />;
   }
 
-  return styled(styles)(
-    <Presentation dataFormat={dataFormat} model={model} actions={actions} resultIndex={resultIndex} simple={simple} />
-  );
+  return styled(styles)(<Presentation dataFormat={dataFormat} model={model} actions={actions} resultIndex={resultIndex} simple={simple} />);
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_CONTEXT_DATA_VIEWER_SIMPLE.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_CONTEXT_DATA_VIEWER_SIMPLE.ts
index a08677bb8d..86de5ecb3e 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_CONTEXT_DATA_VIEWER_SIMPLE.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_CONTEXT_DATA_VIEWER_SIMPLE.ts
@@ -5,7 +5,6 @@
  * 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_DATA_VIEWER_SIMPLE = createDataContext<boolean>('data-viewer-database-simple');
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_VIEWER_DATA_MODEL_TOOLS_MENU.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_VIEWER_DATA_MODEL_TOOLS_MENU.ts
index 541a5791bc..07a1fb85f5 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_VIEWER_DATA_MODEL_TOOLS_MENU.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/DATA_VIEWER_DATA_MODEL_TOOLS_MENU.ts
@@ -5,7 +5,6 @@
  * 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 DATA_VIEWER_DATA_MODEL_TOOLS_MENU = createMenu('data-viewer-data-model-tools', 'Data viewer data model tools menu');
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
index 0ba60c4a7e..44c8d8c43c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -34,17 +33,12 @@ interface Props {
   className?: string;
 }
 
-export const TableHeader = observer<Props>(function TableHeader({
-  model,
-  resultIndex,
-  simple,
-  className,
-}) {
+export const TableHeader = observer<Props>(function TableHeader({ model, resultIndex, simple, className }) {
   const service = useService(TableHeaderService);
 
   return styled(styles)(
     <table-header className={className}>
       <Placeholder container={service.tableHeaderPlaceholder} model={model} resultIndex={resultIndex} simple={simple} />
-    </table-header>
+    </table-header>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderMenu.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderMenu.tsx
index 6e148e8eb2..ad452c9c20 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderMenu.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderMenu.tsx
@@ -5,7 +5,6 @@
  * 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 { css } from 'reshadow';
 
@@ -20,74 +19,70 @@ import { DATA_VIEWER_DATA_MODEL_TOOLS_MENU } from './DATA_VIEWER_DATA_MODEL_TOOL
 import type { ITableHeaderPlaceholderProps } from './TableHeaderService';
 
 const TABLE_HEADER_MENU_BAR_STYLES = css`
-    menu-bar {
-      composes: theme-border-color-background theme-background-surface theme-text-on-surface theme-typography--body2 from global;
-      display: flex;
-      margin-left: 8px;
-      box-sizing: border-box;
-      border: 1px solid;
-      height: 24px;
+  menu-bar {
+    composes: theme-border-color-background theme-background-surface theme-text-on-surface theme-typography--body2 from global;
+    display: flex;
+    margin-left: 8px;
+    box-sizing: border-box;
+    border: 1px solid;
+    height: 24px;
+  }
+
+  menu-bar-item {
+    composes: theme-ripple from global;
+    padding: 4px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    background: transparent;
+    outline: none;
+    color: inherit;
+
+    &[use|hidden] {
+      display: none;
     }
 
-    menu-bar-item {
-      composes: theme-ripple from global;
-      padding: 4px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      background: transparent;
-      outline: none;
-      color: inherit;
-
-      &[use|hidden] {
-        display: none;
-      }
-
-      & IconOrImage {
-          display: block;
-          width: 16px;
-      }
-
-      & Loader {
-          width: 16px;
-      }
-
-      & menu-bar-item-label {
-          display: block;
-          text-transform: uppercase;
-          font-weight: 700;
-      }
-
-      & IconOrImage + menu-bar-item-label, & Loader + menu-bar-item-label {
-          padding-left: 8px
-      }
+    & IconOrImage {
+      display: block;
+      width: 16px;
     }
-    
-    MenuSeparator {
-      composes: theme-border-color-background from global;
-      height: 100%;
-      margin: 0;
-      border: 0 !important;
-      border-right: 1px solid !important;
 
-      &:first-child, &:last-child {
-        display: none;
-      }
+    & Loader {
+      width: 16px;
     }
-  `;
 
-export const TableHeaderMenu: PlaceholderComponent<ITableHeaderPlaceholderProps> = observer(function TableHeaderMenu({
-  model,
-  simple,
-  resultIndex,
-}) {
+    & menu-bar-item-label {
+      display: block;
+      text-transform: uppercase;
+      font-weight: 700;
+    }
+
+    & IconOrImage + menu-bar-item-label,
+    & Loader + menu-bar-item-label {
+      padding-left: 8px;
+    }
+  }
+
+  MenuSeparator {
+    composes: theme-border-color-background from global;
+    height: 100%;
+    margin: 0;
+    border: 0 !important;
+    border-right: 1px solid !important;
+
+    &:first-child,
+    &:last-child {
+      display: none;
+    }
+  }
+`;
+
+export const TableHeaderMenu: PlaceholderComponent<ITableHeaderPlaceholderProps> = observer(function TableHeaderMenu({ model, simple, resultIndex }) {
   const menu = useMenu({ menu: DATA_VIEWER_DATA_MODEL_TOOLS_MENU });
 
   menu.context.set(DATA_CONTEXT_DV_DDM, model);
   menu.context.set(DATA_CONTEXT_DV_DDM_RESULT_INDEX, resultIndex);
   menu.context.set(DATA_CONTEXT_DATA_VIEWER_SIMPLE, simple);
 
-  return (
-    <MenuBar menu={menu} style={TABLE_HEADER_MENU_BAR_STYLES} />
-  );
+  return <MenuBar menu={menu} style={TABLE_HEADER_MENU_BAR_STYLES} />;
 });
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 26e129b420..db37b5c963 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeaderService.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
-import { MenuService, ActionService, DATA_CONTEXT_MENU } from '@cloudbeaver/core-view';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 
 import { DATA_VIEWER_CONSTRAINTS_DELETE_ACTION } from '../../DatabaseDataModel/Actions/ResultSet/Actions/DATA_VIEWER_CONSTRAINTS_DELETE_ACTION';
 import { ResultSetConstraintAction } from '../../DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction';
@@ -38,10 +37,7 @@ export interface ITableHeaderPlaceholderProps {
 export class TableHeaderService extends Bootstrap {
   readonly tableHeaderPlaceholder = new PlaceholderContainer<ITableHeaderPlaceholderProps>();
 
-  constructor(
-    private readonly menuService: MenuService,
-    private readonly actionService: ActionService
-  ) {
+  constructor(private readonly menuService: MenuService, private readonly actionService: ActionService) {
     super();
   }
 
@@ -109,15 +105,10 @@ export class TableHeaderService extends Bootstrap {
     });
 
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === DATA_VIEWER_DATA_MODEL_TOOLS_MENU
-      ),
-      getItems: (context, items) => [
-        ...items,
-        DATA_VIEWER_CONSTRAINTS_DELETE_ACTION,
-      ],
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === DATA_VIEWER_DATA_MODEL_TOOLS_MENU,
+      getItems: (context, items) => [...items, DATA_VIEWER_CONSTRAINTS_DELETE_ACTION],
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableWhereFilter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableWhereFilter.tsx
index 777cca3834..a9cb264328 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableWhereFilter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableWhereFilter.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -16,17 +15,14 @@ import type { ITableHeaderPlaceholderProps } from './TableHeaderService';
 import { useWhereFilter } from './useWhereFilter';
 
 const styles = css`
-    InlineEditor {
-      composes: theme-background-surface theme-text-on-surface from global;
-      flex: 1;
-      height: 24px;
-    }
-  `;
+  InlineEditor {
+    composes: theme-background-surface theme-text-on-surface from global;
+    flex: 1;
+    height: 24px;
+  }
+`;
 
-export const TableWhereFilter: PlaceholderComponent<ITableHeaderPlaceholderProps> = observer(function TableWhereFilter({
-  model,
-  resultIndex,
-}) {
+export const TableWhereFilter: PlaceholderComponent<ITableHeaderPlaceholderProps> = observer(function TableWhereFilter({ model, resultIndex }) {
   const translate = useTranslate();
   const state = useWhereFilter(model, resultIndex);
 
@@ -35,13 +31,13 @@ export const TableWhereFilter: PlaceholderComponent<ITableHeaderPlaceholderProps
       name="data_where"
       value={state.filter}
       placeholder={translate(state.constraints?.supported ? 'table_header_sql_expression' : 'table_header_sql_expression_not_supported')}
-      controlsPosition='inside'
+      controlsPosition="inside"
       edited={!!state.filter}
       disableSave={!state.applicableFilter}
       disabled={state.disabled}
       simple
       onSave={state.apply}
       onChange={state.set}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
index ec5d3d022e..4aea107f4b 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed } from 'mobx';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -25,56 +24,57 @@ interface IState {
   apply: () => Promise<void>;
 }
 
-export function useWhereFilter(
-  model: IDatabaseDataModel<IDatabaseDataOptions, any>,
-  resultIndex: number
-): Readonly<IState> {
-  return useObservableRef(() => ({
-    get filter() {
-      if (this.constraints?.filterConstraints.length && this.model.source.requestInfo.requestFilter) {
-        return this.model.requestInfo.requestFilter;
-      }
+export function useWhereFilter(model: IDatabaseDataModel<IDatabaseDataOptions, any>, resultIndex: number): Readonly<IState> {
+  return useObservableRef(
+    () => ({
+      get filter() {
+        if (this.constraints?.filterConstraints.length && this.model.source.requestInfo.requestFilter) {
+          return this.model.requestInfo.requestFilter;
+        }
 
-      return this.model.source.options?.whereFilter ?? '';
-    },
-    get constraints() {
-      if (!this.model.source.hasResult(this.resultIndex)) {
-        return null;
-      }
+        return this.model.source.options?.whereFilter ?? '';
+      },
+      get constraints() {
+        if (!this.model.source.hasResult(this.resultIndex)) {
+          return null;
+        }
 
-      return this.model.source.tryGetAction(this.resultIndex, ResultSetConstraintAction) ?? null;
-    },
-    get disabled() {
-      const supported = this.constraints?.supported ?? false;
-      return !supported || this.model.isLoading() || this.model.isDisabled(resultIndex);
-    },
-    get applicableFilter() {
-      return this.model.source.prevOptions?.whereFilter !== this.model.source.options?.whereFilter
-        || this.model.source.options?.whereFilter !== this.model.source.requestInfo.requestFilter;
-    },
-    set(value: string) {
-      if (!this.constraints) {
-        return;
-      }
+        return this.model.source.tryGetAction(this.resultIndex, ResultSetConstraintAction) ?? null;
+      },
+      get disabled() {
+        const supported = this.constraints?.supported ?? false;
+        return !supported || this.model.isLoading() || this.model.isDisabled(resultIndex);
+      },
+      get applicableFilter() {
+        return (
+          this.model.source.prevOptions?.whereFilter !== this.model.source.options?.whereFilter ||
+          this.model.source.options?.whereFilter !== this.model.source.requestInfo.requestFilter
+        );
+      },
+      set(value: string) {
+        if (!this.constraints) {
+          return;
+        }
 
-      this.constraints.deleteFilters();
-      this.constraints.setWhereFilter(value);
-    },
-    async apply() {
-      if (!this.applicableFilter || this.model.isLoading() || this.model.isDisabled(this.resultIndex)) {
-        return;
-      }
+        this.constraints.deleteFilters();
+        this.constraints.setWhereFilter(value);
+      },
+      async apply() {
+        if (!this.applicableFilter || this.model.isLoading() || this.model.isDisabled(this.resultIndex)) {
+          return;
+        }
 
-      await this.model.request();
+        await this.model.request();
+      },
+    }),
+    {
+      filter: computed,
+      constraints: computed,
+      disabled: computed,
+      applicableFilter: computed,
+      set: action.bound,
+      apply: action.bound,
     },
-  }),
-  {
-    filter: computed,
-    constraints: computed,
-    disabled: computed,
-    applicableFilter: computed,
-    set: action.bound,
-    apply: action.bound,
-  },
-  { model, resultIndex });
+    { model, resultIndex },
+  );
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/PresentationTab.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/PresentationTab.tsx
index c9cc2d100b..ffb041bcdf 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/PresentationTab.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/PresentationTab.tsx
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { VERTICAL_ROTATED_TAB_STYLES, Tab, TabIcon, TabTitle, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, Tab, TabIcon, TabTitle, VERTICAL_ROTATED_TAB_STYLES } from '@cloudbeaver/core-ui';
 
 import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel';
 import type { IDataPresentationOptions } from '../../DataPresentationService';
@@ -26,13 +24,7 @@ interface Props {
   onClick: (tabId: string) => void;
 }
 
-export const PresentationTab = observer<Props>(function PresentationTab({
-  model,
-  presentation,
-  className,
-  style,
-  onClick,
-}) {
+export const PresentationTab = observer<Props>(function PresentationTab({ model, presentation, className, style, onClick }) {
   const translate = useTranslate();
   const styles = useStyles(BASE_TAB_STYLES, VERTICAL_ROTATED_TAB_STYLES, style);
 
@@ -53,14 +45,9 @@ export const PresentationTab = observer<Props>(function PresentationTab({
   }
 
   return styled(styles)(
-    <Tab
-      tabId={presentation.id}
-      style={[BASE_TAB_STYLES, VERTICAL_ROTATED_TAB_STYLES, style]}
-      disabled={model.isLoading()}
-      onClick={onClick}
-    >
+    <Tab tabId={presentation.id} style={[BASE_TAB_STYLES, VERTICAL_ROTATED_TAB_STYLES, style]} disabled={model.isLoading()} onClick={onClick}>
       {presentation.icon && <TabIcon icon={presentation.icon} />}
       {presentation.title && <TabTitle>{translate(presentation.title)}</TabTitle>}
-    </Tab>
+    </Tab>,
   );
 });
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 cde8766928..49938ddf70 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
@@ -5,7 +5,6 @@
  * 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, use } from 'reshadow';
 
@@ -19,25 +18,25 @@ import { DataPresentationService, DataPresentationType } from '../../DataPresent
 import { PresentationTab } from './PresentationTab';
 
 const styles = css`
-    table-left-bar {
-      display: flex;
-    }
-    Tab {
-      composes: theme-ripple theme-background-background theme-text-text-primary-on-light theme-typography--body2 from global;
-      text-transform: uppercase;
-      font-weight: normal;
+  table-left-bar {
+    display: flex;
+  }
+  Tab {
+    composes: theme-ripple theme-background-background theme-text-text-primary-on-light theme-typography--body2 from global;
+    text-transform: uppercase;
+    font-weight: normal;
 
-      &:global([aria-selected=true]) {
-        font-weight: normal !important;
-      }
+    &:global([aria-selected='true']) {
+      font-weight: normal !important;
     }
-    TabList {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    TabList[|flexible] tab-outer:only-child {
-      display: none;
-    }
-  `;
+  }
+  TabList {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  TabList[|flexible] tab-outer:only-child {
+    display: none;
+  }
+`;
 
 interface Props {
   type: DataPresentationType;
@@ -64,13 +63,7 @@ export const TablePresentationBar = observer<Props>(function TablePresentationBa
 }) {
   const style = useStyles(styles, BASE_TAB_STYLES, VERTICAL_ROTATED_TAB_STYLES, BASE_CONTAINERS_STYLES);
   const dataPresentationService = useService(DataPresentationService);
-  const presentations = dataPresentationService.getSupportedList(
-    type,
-    supportedDataFormat,
-    dataFormat,
-    model,
-    resultIndex
-  );
+  const presentations = dataPresentationService.getSupportedList(type, supportedDataFormat, dataFormat, model, resultIndex);
   const Tab = PresentationTab; // alias for styles matching
   const handleClick = (tabId: string) => {
     if (tabId === presentationId) {
@@ -89,19 +82,12 @@ export const TablePresentationBar = observer<Props>(function TablePresentationBa
   return styled(style)(
     <table-left-bar className={className}>
       <TabsState currentTabId={presentationId} autoSelect={main}>
-        <TabList aria-label='Data Presentations' {...use({ flexible: main })}>
+        <TabList aria-label="Data Presentations" {...use({ flexible: main })}>
           {presentations.map(presentation => (
-            <Tab
-              key={presentation.id}
-              presentation={presentation}
-              model={model}
-              resultIndex={resultIndex}
-              style={styles}
-              onClick={handleClick}
-            />
+            <Tab key={presentation.id} presentation={presentation} model={model} resultIndex={resultIndex} style={styles} onClick={handleClick} />
           ))}
         </TabList>
       </TabsState>
-    </table-left-bar>
+    </table-left-bar>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
index dd6b7c60b3..ad748ff3ac 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -29,21 +28,21 @@ const styles = css`
   }
 `;
 
-export const TableStatistics = observer<Props>(function TableStatistics({
-  model,
-  resultIndex,
-}) {
+export const TableStatistics = observer<Props>(function TableStatistics({ model, resultIndex }) {
   const translate = useTranslate();
   const source = model.source;
   const result = model.getResult(resultIndex);
 
   return styled(styles)(
     <statistics>
-      {translate('data_viewer_statistics_status')} {source.requestInfo.requestMessage}<br />
-      {translate('data_viewer_statistics_duration')} {source.requestInfo.requestDuration} ms<br />
-      {translate('data_viewer_statistics_updated_rows')} {result?.updateRowCount || 0}<br />
+      {translate('data_viewer_statistics_status')} {source.requestInfo.requestMessage}
+      <br />
+      {translate('data_viewer_statistics_duration')} {source.requestInfo.requestDuration} ms
+      <br />
+      {translate('data_viewer_statistics_updated_rows')} {result?.updateRowCount || 0}
+      <br />
       <br />
       <pre>{source.requestInfo.source}</pre>
-    </statistics>
+    </statistics>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx
index 95f24af3c6..f58af5d320 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -32,14 +31,7 @@ const styles = css`
   }
 `;
 
-export const TableToolsPanel = observer<Props>(function TableToolsPanel({
-  model,
-  actions,
-  dataFormat,
-  presentation,
-  resultIndex,
-  simple,
-}) {
+export const TableToolsPanel = observer<Props>(function TableToolsPanel({ model, actions, dataFormat, presentation, resultIndex, simple }) {
   const translate = useTranslate();
 
   const result = model.getResult(resultIndex);
@@ -59,7 +51,5 @@ export const TableToolsPanel = observer<Props>(function TableToolsPanel({
     return <TextPlaceholder>{translate('data_viewer_nodata_message')}</TextPlaceholder>;
   }
 
-  return styled(styles)(
-    <Presentation dataFormat={dataFormat} model={model} actions={actions} resultIndex={resultIndex} simple={simple} />
-  );
+  return styled(styles)(<Presentation dataFormat={dataFormat} model={model} actions={actions} resultIndex={resultIndex} simple={simple} />);
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
index 062b6e580a..6e4347d504 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
@@ -5,13 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useEffect, forwardRef } from 'react';
+import { forwardRef, useEffect } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, Loader, Pane, ResizerControls, Split, splitStyles, TextPlaceholder, useObjectRef, useObservableRef, useSplitUserState } from '@cloudbeaver/core-blocks';
+import {
+  getComputed,
+  Loader,
+  Pane,
+  ResizerControls,
+  Split,
+  splitStyles,
+  TextPlaceholder,
+  useObjectRef,
+  useObservableRef,
+  useSplitUserState,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import type { IDataContext } from '@cloudbeaver/core-view';
@@ -28,59 +38,61 @@ import { TableToolsPanel } from './TableToolsPanel';
 import { TableViewerStorageService } from './TableViewerStorageService';
 
 const viewerStyles = css`
-    pane-content {
-      composes: theme-background-surface theme-text-on-surface from global;
+  pane-content {
+    composes: theme-background-surface theme-text-on-surface from global;
 
-      &[|grid] {
-        border-radius: var(--theme-group-element-radius);
-      }
+    &[|grid] {
+      border-radius: var(--theme-group-element-radius);
     }
-    table-viewer {
-      composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  table-viewer {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  table-content {
+    display: flex;
+    flex: 1;
+    overflow: hidden;
+  }
+  table-data {
+    gap: 8px;
+  }
+  table-data,
+  Pane,
+  pane-content {
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  Split:not([disable]) {
+    gap: 8px;
+  }
+  Pane {
+    &:first-child {
       position: relative;
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
     }
-    table-content {
-      display: flex;
-      flex: 1;
-      overflow: hidden;
+  }
+  TablePresentationBar {
+    margin-top: 32px;
+    &:first-child {
+      margin-right: 4px;
     }
-    table-data {
-      gap: 8px;
+    &:last-child {
+      margin-left: 4px;
     }
-    table-data, Pane, pane-content {
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: hidden;
-    }
-    Split:not([disable]) {
-      gap: 8px;
-    }
-    Pane {
-      &:first-child {
-        position: relative;
-      }
-    }
-    TablePresentationBar {
-      margin-top: 32px;
-      &:first-child {
-        margin-right: 4px;
-      }
-      &:last-child {
-        margin-left: 4px;
-      }
-    }
-    Loader {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-    }
-  `;
+  }
+  Loader {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+`;
 
 interface Props {
   tableId: string;
@@ -94,244 +106,227 @@ interface Props {
   onValuePresentationChange: (id: string | null) => void;
 }
 
-export const TableViewer = observer<Props, HTMLDivElement>(forwardRef(function TableViewer({
-  tableId,
-  resultIndex = 0,
-  presentationId,
-  valuePresentationId,
-  simple = false,
-  context,
-  className,
-  onPresentationChange,
-  onValuePresentationChange,
-}, ref) {
-  const dataPresentationService = useService(DataPresentationService);
-  const tableViewerStorageService = useService(TableViewerStorageService);
-  const dataModel = tableViewerStorageService.get(tableId);
-  const result = dataModel?.getResult(resultIndex);
-  const loading = dataModel?.isLoading() ?? true;
-  const dataFormat = result?.dataFormat || ResultDataFormat.Resultset;
-  const splitState = useSplitUserState('table-viewer');
-
-  const localActions = useObjectRef({
-    clearConstraints() {
-      const constraints = dataModel?.source.tryGetAction(resultIndex, ResultSetConstraintAction);
-
-      if (constraints) {
-        constraints.deleteAll();
-      }
-    },
-  });
-
-  const dataTableActions = useObservableRef<IDataTableActionsPrivate>(() => ({
-    setPresentation(id: string) {
-      const presentation = dataPresentationService.get(id);
-
-      if (presentation) {
-        if (
-          presentation.dataFormat !== undefined
-          && presentation.dataFormat !== this.dataModel?.source.dataFormat
-        ) {
-          localActions.clearConstraints();
-          this.dataModel?.setDataFormat(presentation.dataFormat).reload();
-        }
-
-        this.onPresentationChange(id);
-      }
-    },
-
-    setValuePresentation(id: string | null) {
-      if (id === this.valuePresentationId) {
-        return;
-      }
-
-      if (id === null) {
-        this.onValuePresentationChange(null);
-        return;
-      }
-
-      let presentation = dataPresentationService.get(id);
-
-      if (!presentation && this.dataModel) {
-        presentation = dataPresentationService.getSupported(
-          DataPresentationType.toolsPanel,
-          this.dataFormat,
-          undefined,
-          this.dataModel,
-          this.resultIndex
-        ) ?? undefined;
-      }
-
-      if (presentation) {
-        this.onValuePresentationChange(presentation.id);
-      }
-    },
-    switchValuePresentation(id: string | null) {
-      if (id === this.valuePresentationId) {
-        this.onValuePresentationChange(null);
-        return;
-      }
-
-      this.setValuePresentation(id);
-    },
-    closeValuePresentation() {
-      this.onValuePresentationChange(null);
-    },
-  }), {
-    presentationId: observable,
-    valuePresentationId: observable,
-    dataFormat: observable,
-    resultIndex: observable,
-    dataModel: observable.ref,
-  }, {
-    presentationId,
-    valuePresentationId,
-    dataModel,
-    resultIndex,
-    dataFormat,
-    onPresentationChange,
-    onValuePresentationChange,
-  }, ['setPresentation', 'setValuePresentation', 'switchValuePresentation', 'closeValuePresentation']);
-
-  const needRefresh = getComputed(() => (
-    dataModel?.source.error === null
-    && dataModel.source.results.length === 0
-    && dataModel.source.outdated
-    && dataModel.source.isLoadable()
-  ));
-
-  useEffect(() => {
-    if (needRefresh) {
-      dataModel?.request();
-    }
-  }, [needRefresh]);
-
-  // TODO: seems this code is not working because of setting dataFormat in presentation change
-  // useEffect(() => {
-  //   if (!presentationId || !dataModel) {
-  //     return;
-  //   }
-
-  //   const presentation = dataPresentationService.get(presentationId);
-
-  //   if (presentation?.dataFormat && !dataModel.supportedDataFormats.includes(presentation.dataFormat)) {
-  //     // localActions.clearConstraints();
-  //     onPresentationChange(dataFormat);
-  //   }
-  // }, [dataFormat]);
-
-  if (!dataModel) {
-    return <Loader />;
-  }
-
-  const presentation = dataPresentationService.getSupported(
-    DataPresentationType.main,
-    dataFormat,
-    presentationId,
-    dataModel,
-    resultIndex
-  );
-
-  if (!presentation) {
-    return <TextPlaceholder>There are no available presentation for data format: {dataFormat}</TextPlaceholder>;
-  }
-
-  const valuePresentation = valuePresentationId
-    ? dataPresentationService.getSupported(
-      DataPresentationType.toolsPanel,
-      dataFormat,
+export const TableViewer = observer<Props, HTMLDivElement>(
+  forwardRef(function TableViewer(
+    {
+      tableId,
+      resultIndex = 0,
+      presentationId,
       valuePresentationId,
-      dataModel,
-      resultIndex
-    )
-    : null;
+      simple = false,
+      context,
+      className,
+      onPresentationChange,
+      onValuePresentationChange,
+    },
+    ref,
+  ) {
+    const dataPresentationService = useService(DataPresentationService);
+    const tableViewerStorageService = useService(TableViewerStorageService);
+    const dataModel = tableViewerStorageService.get(tableId);
+    const result = dataModel?.getResult(resultIndex);
+    const loading = dataModel?.isLoading() ?? true;
+    const dataFormat = result?.dataFormat || ResultDataFormat.Resultset;
+    const splitState = useSplitUserState('table-viewer');
 
-  const resultExist = dataModel.source.hasResult(resultIndex);
-  const overlay = dataModel.source.results.length > 0 && presentation.dataFormat === dataFormat;
-  const valuePanelDisplayed = (
-    valuePresentation
-    && (valuePresentation.dataFormat === undefined
-    || valuePresentation.dataFormat === dataFormat)
-    && overlay
-    && resultExist
-    && !simple
-  );
+    const localActions = useObjectRef({
+      clearConstraints() {
+        const constraints = dataModel?.source.tryGetAction(resultIndex, ResultSetConstraintAction);
 
-  return styled(viewerStyles, splitStyles)(
-    <table-viewer ref={ref} className={className}>
-      <table-content>
-        <TablePresentationBar
-          type={DataPresentationType.main}
-          presentationId={presentation.id}
-          dataFormat={dataFormat}
-          supportedDataFormat={dataModel.supportedDataFormats}
-          model={dataModel}
-          resultIndex={resultIndex}
-          onPresentationChange={dataTableActions.setPresentation}
-        />
-        <table-data>
-          <TableHeader model={dataModel} resultIndex={resultIndex} simple={simple} />
-          <Split
-            {...splitState}
-            sticky={30}
-            mode={valuePanelDisplayed ? splitState.mode : 'minimize'}
-            disable={!valuePanelDisplayed}
-            keepRatio
-          >
-            <Pane>
-              <pane-content {...use({ grid: true })}>
-                <Loader suspense>
-                  <TableGrid
-                    model={dataModel}
-                    actions={dataTableActions}
-                    dataFormat={dataFormat}
-                    presentation={presentation}
-                    resultIndex={resultIndex}
-                    simple={simple}
-                  />
-                </Loader>
-                <TableError model={dataModel} loading={loading} />
-                <Loader
-                  loading={loading}
-                  cancelDisabled={!dataModel.source.canCancel}
-                  overlay={overlay}
-                  onCancel={() => dataModel.source.cancel()}
-                />
-              </pane-content>
-            </Pane>
-            <ResizerControls />
-            <Pane basis='30%' main>
-              <Loader suspense>
-                <pane-content>
-                  {resultExist && (
-                    <TableToolsPanel
+        if (constraints) {
+          constraints.deleteAll();
+        }
+      },
+    });
+
+    const dataTableActions = useObservableRef<IDataTableActionsPrivate>(
+      () => ({
+        setPresentation(id: string) {
+          const presentation = dataPresentationService.get(id);
+
+          if (presentation) {
+            if (presentation.dataFormat !== undefined && presentation.dataFormat !== this.dataModel?.source.dataFormat) {
+              localActions.clearConstraints();
+              this.dataModel?.setDataFormat(presentation.dataFormat).reload();
+            }
+
+            this.onPresentationChange(id);
+          }
+        },
+
+        setValuePresentation(id: string | null) {
+          if (id === this.valuePresentationId) {
+            return;
+          }
+
+          if (id === null) {
+            this.onValuePresentationChange(null);
+            return;
+          }
+
+          let presentation = dataPresentationService.get(id);
+
+          if (!presentation && this.dataModel) {
+            presentation =
+              dataPresentationService.getSupported(DataPresentationType.toolsPanel, this.dataFormat, undefined, this.dataModel, this.resultIndex) ??
+              undefined;
+          }
+
+          if (presentation) {
+            this.onValuePresentationChange(presentation.id);
+          }
+        },
+        switchValuePresentation(id: string | null) {
+          if (id === this.valuePresentationId) {
+            this.onValuePresentationChange(null);
+            return;
+          }
+
+          this.setValuePresentation(id);
+        },
+        closeValuePresentation() {
+          this.onValuePresentationChange(null);
+        },
+      }),
+      {
+        presentationId: observable,
+        valuePresentationId: observable,
+        dataFormat: observable,
+        resultIndex: observable,
+        dataModel: observable.ref,
+      },
+      {
+        presentationId,
+        valuePresentationId,
+        dataModel,
+        resultIndex,
+        dataFormat,
+        onPresentationChange,
+        onValuePresentationChange,
+      },
+      ['setPresentation', 'setValuePresentation', 'switchValuePresentation', 'closeValuePresentation'],
+    );
+
+    const needRefresh = getComputed(
+      () => dataModel?.source.error === null && dataModel.source.results.length === 0 && dataModel.source.outdated && dataModel.source.isLoadable(),
+    );
+
+    useEffect(() => {
+      if (needRefresh) {
+        dataModel?.request();
+      }
+    }, [needRefresh]);
+
+    // TODO: seems this code is not working because of setting dataFormat in presentation change
+    // useEffect(() => {
+    //   if (!presentationId || !dataModel) {
+    //     return;
+    //   }
+
+    //   const presentation = dataPresentationService.get(presentationId);
+
+    //   if (presentation?.dataFormat && !dataModel.supportedDataFormats.includes(presentation.dataFormat)) {
+    //     // localActions.clearConstraints();
+    //     onPresentationChange(dataFormat);
+    //   }
+    // }, [dataFormat]);
+
+    if (!dataModel) {
+      return <Loader />;
+    }
+
+    const presentation = dataPresentationService.getSupported(DataPresentationType.main, dataFormat, presentationId, dataModel, resultIndex);
+
+    if (!presentation) {
+      return <TextPlaceholder>There are no available presentation for data format: {dataFormat}</TextPlaceholder>;
+    }
+
+    const valuePresentation = valuePresentationId
+      ? dataPresentationService.getSupported(DataPresentationType.toolsPanel, dataFormat, valuePresentationId, dataModel, resultIndex)
+      : null;
+
+    const resultExist = dataModel.source.hasResult(resultIndex);
+    const overlay = dataModel.source.results.length > 0 && presentation.dataFormat === dataFormat;
+    const valuePanelDisplayed =
+      valuePresentation &&
+      (valuePresentation.dataFormat === undefined || valuePresentation.dataFormat === dataFormat) &&
+      overlay &&
+      resultExist &&
+      !simple;
+
+    return styled(
+      viewerStyles,
+      splitStyles,
+    )(
+      <table-viewer ref={ref} className={className}>
+        <table-content>
+          <TablePresentationBar
+            type={DataPresentationType.main}
+            presentationId={presentation.id}
+            dataFormat={dataFormat}
+            supportedDataFormat={dataModel.supportedDataFormats}
+            model={dataModel}
+            resultIndex={resultIndex}
+            onPresentationChange={dataTableActions.setPresentation}
+          />
+          <table-data>
+            <TableHeader model={dataModel} resultIndex={resultIndex} simple={simple} />
+            <Split {...splitState} sticky={30} mode={valuePanelDisplayed ? splitState.mode : 'minimize'} disable={!valuePanelDisplayed} keepRatio>
+              <Pane>
+                <pane-content {...use({ grid: true })}>
+                  <Loader suspense>
+                    <TableGrid
                       model={dataModel}
                       actions={dataTableActions}
                       dataFormat={dataFormat}
-                      presentation={valuePresentation}
+                      presentation={presentation}
                       resultIndex={resultIndex}
                       simple={simple}
                     />
-                  )}
+                  </Loader>
+                  <TableError model={dataModel} loading={loading} />
+                  <Loader
+                    loading={loading}
+                    cancelDisabled={!dataModel.source.canCancel}
+                    overlay={overlay}
+                    onCancel={() => dataModel.source.cancel()}
+                  />
                 </pane-content>
-              </Loader>
-            </Pane>
-          </Split>
-        </table-data>
-        {!simple && (
-          <TablePresentationBar
-            type={DataPresentationType.toolsPanel}
-            presentationId={valuePresentationId ?? null}
-            dataFormat={dataFormat}
-            supportedDataFormat={[dataFormat]}
-            model={dataModel}
-            resultIndex={resultIndex}
-            onPresentationChange={dataTableActions.setValuePresentation}
-            onClose={dataTableActions.closeValuePresentation}
-          />
-        )}
-      </table-content>
-      <TableFooter model={dataModel} resultIndex={resultIndex} simple={simple} context={context} />
-    </table-viewer>
-  );
-}));
+              </Pane>
+              <ResizerControls />
+              <Pane basis="30%" main>
+                <Loader suspense>
+                  <pane-content>
+                    {resultExist && (
+                      <TableToolsPanel
+                        model={dataModel}
+                        actions={dataTableActions}
+                        dataFormat={dataFormat}
+                        presentation={valuePresentation}
+                        resultIndex={resultIndex}
+                        simple={simple}
+                      />
+                    )}
+                  </pane-content>
+                </Loader>
+              </Pane>
+            </Split>
+          </table-data>
+          {!simple && (
+            <TablePresentationBar
+              type={DataPresentationType.toolsPanel}
+              presentationId={valuePresentationId ?? null}
+              dataFormat={dataFormat}
+              supportedDataFormat={[dataFormat]}
+              model={dataModel}
+              resultIndex={resultIndex}
+              onPresentationChange={dataTableActions.setValuePresentation}
+              onClose={dataTableActions.closeValuePresentation}
+            />
+          )}
+        </table-content>
+        <TableFooter model={dataModel} resultIndex={resultIndex} simple={simple} context={context} />
+      </table-viewer>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerLoader.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerLoader.ts
index f429ee7ec9..82492390ee 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerLoader.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const TableViewerLoader = React.lazy(async () => {
   const { TableViewer } = await import('./TableViewer');
   return { default: TableViewer };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
index 3911003f6f..66a773c7ac 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, makeObservable, computed } from 'mobx';
+import { computed, makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -45,9 +44,7 @@ export class TableViewerStorageService {
     return this.tableModelMap.get(tableId) as any;
   }
 
-  add<TOptions, TResult extends IDatabaseDataResult>(
-    model: IDatabaseDataModel<TOptions, TResult>
-  ): IDatabaseDataModel<TOptions, TResult> {
+  add<TOptions, TResult extends IDatabaseDataResult>(model: IDatabaseDataModel<TOptions, TResult>): IDatabaseDataModel<TOptions, TResult> {
     if (this.tableModelMap.has(model.id)) {
       return model;
     }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelBootstrap.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelBootstrap.ts
index 4e0d826ee8..4d56bcbfa8 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -21,10 +20,7 @@ export const ValuePanel = React.lazy(async () => {
 
 @injectable()
 export class DataValuePanelBootstrap extends Bootstrap {
-  constructor(
-    private readonly dataPresentationService: DataPresentationService,
-    private readonly dataValuePanelService: DataValuePanelService
-  ) {
+  constructor(private readonly dataPresentationService: DataPresentationService, private readonly dataValuePanelService: DataValuePanelService) {
     super();
   }
 
@@ -34,22 +30,17 @@ export class DataValuePanelBootstrap extends Bootstrap {
       type: DataPresentationType.toolsPanel,
       title: 'data_viewer_presentation_value_title',
       icon: 'value-panel',
-      hidden: (
-        dataFormat,
-        model,
-        resultIndex
-      ) => {
+      hidden: (dataFormat, model, resultIndex) => {
         if (!model.source.hasResult(resultIndex)) {
           return true;
         }
 
         const data = model.source.tryGetAction(resultIndex, ResultSetDataAction);
-        return data?.empty
-          || this.dataValuePanelService.getDisplayed({ model, resultIndex, dataFormat }).length === 0;
+        return data?.empty || this.dataValuePanelService.getDisplayed({ model, resultIndex, dataFormat }).length === 0;
       },
       getPresentationComponent: () => ValuePanel,
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelService.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelService.ts
index 7fd1f28cea..87ea12ad2c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/DataValuePanelService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import { ITabInfo, ITabInfoOptions, TabsContainer } from '@cloudbeaver/core-ui';
@@ -37,11 +36,9 @@ export class DataValuePanelService {
 
   getDisplayed(props?: IDataValuePanelProps<any>): Array<ITabInfo<IDataValuePanelProps<any>, IDataValuePanelOptions>> {
     return this.tabs.tabInfoList.filter(
-      info => (
-        ((props?.dataFormat === undefined || props.dataFormat === null)
-        || info.options?.dataFormat.includes(props.dataFormat))
-        && !info.isHidden?.(info.key, props)
-      )
+      info =>
+        (props?.dataFormat === undefined || props.dataFormat === null || info.options?.dataFormat.includes(props.dataFormat)) &&
+        !info.isHidden?.(info.key, props),
     );
   }
 
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/ValuePanel.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/ValuePanel.tsx
index 2e09893b1c..f9a6e6a40c 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/ValuePanel.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/ValuePanel/ValuePanel.tsx
@@ -5,7 +5,6 @@
  * 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 { useRef, useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -18,47 +17,44 @@ import type { DataPresentationComponent } from '../../DataPresentationService';
 import { DataValuePanelService } from './DataValuePanelService';
 
 const styles = css`
-    table-left-bar {
-      display: flex;
-    }
-    Tab {
-      composes: theme-ripple from theme-typography--body2 from global;
-      text-transform: uppercase;
-      font-weight: normal;
+  table-left-bar {
+    display: flex;
+  }
+  Tab {
+    composes: theme-ripple from theme-typography--body2 from global;
+    text-transform: uppercase;
+    font-weight: normal;
 
-      &:global([aria-selected=true]) {
-        font-weight: normal !important;
-      }
+    &:global([aria-selected='true']) {
+      font-weight: normal !important;
     }
-    TabList {
-      composes: theme-border-color-background from global;
-      position: relative;
-      
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    TabList tab-outer:only-child {
-      display: none;
-    }
-    TabPanel {
-      padding-top: 8px;
-    }
-    TabList, TabPanel {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-  `;
+  }
+  TabList {
+    composes: theme-border-color-background from global;
+    position: relative;
 
-export const ValuePanel: DataPresentationComponent<any, IDatabaseResultSet> = observer(function ValuePanel({
-  dataFormat,
-  model,
-  resultIndex,
-}) {
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
+    }
+  }
+  TabList tab-outer:only-child {
+    display: none;
+  }
+  TabPanel {
+    padding-top: 8px;
+  }
+  TabList,
+  TabPanel {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+`;
+
+export const ValuePanel: DataPresentationComponent<any, IDatabaseResultSet> = observer(function ValuePanel({ dataFormat, model, resultIndex }) {
   const service = useService(DataValuePanelService);
   const [currentTabId, setCurrentTabId] = useState('');
   const lastTabId = useRef('');
@@ -73,7 +69,11 @@ export const ValuePanel: DataPresentationComponent<any, IDatabaseResultSet> = ob
     }
   }
 
-  return styled(BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES)(
+  return styled(
+    BASE_TAB_STYLES,
+    styles,
+    UNDERLINE_TAB_STYLES,
+  )(
     <TabsState
       currentTabId={currentTabId}
       container={service.tabs}
@@ -85,6 +85,6 @@ export const ValuePanel: DataPresentationComponent<any, IDatabaseResultSet> = ob
     >
       <TabList style={[BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES]} />
       <TabPanelList style={[BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES]} />
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentation.tsx b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentation.tsx
index a7e53bb36e..6a4d9cdf8c 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentation.tsx
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentation.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -30,75 +29,54 @@ const styles = css`
   }
 `;
 
-export const BooleanValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(function BooleanValuePresentation({
-  model,
-  resultIndex,
-}) {
-  const translate = useTranslate();
-  const selection = model.source.getAction(resultIndex, ResultSetSelectAction);
-  const focusCell = selection.getFocusedElement();
+export const BooleanValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(
+  function BooleanValuePresentation({ model, resultIndex }) {
+    const translate = useTranslate();
+    const selection = model.source.getAction(resultIndex, ResultSetSelectAction);
+    const focusCell = selection.getFocusedElement();
 
-  if (!selection.elements.length && !focusCell) {
-    return null;
-  }
+    if (!selection.elements.length && !focusCell) {
+      return null;
+    }
 
-  let value: boolean | null | undefined;
+    let value: boolean | null | undefined;
 
-  const view = model.source.getAction(resultIndex, ResultSetViewAction);
-  const editor = model.source.getAction(resultIndex, ResultSetEditAction);
+    const view = model.source.getAction(resultIndex, ResultSetViewAction);
+    const editor = model.source.getAction(resultIndex, ResultSetEditAction);
 
-  const firstSelectedCell = selection.elements[0] || focusCell;
-  const cellValue = view.getCellValue(firstSelectedCell);
+    const firstSelectedCell = selection.elements[0] || focusCell;
+    const cellValue = view.getCellValue(firstSelectedCell);
 
-  if (typeof cellValue === 'string' && isStringifiedBoolean(cellValue)) {
-    value = cellValue.toLowerCase() === 'true';
-  } else if (typeof cellValue === 'boolean' || cellValue === null) {
-    value = cellValue;
-  }
+    if (typeof cellValue === 'string' && isStringifiedBoolean(cellValue)) {
+      value = cellValue.toLowerCase() === 'true';
+    } else if (typeof cellValue === 'boolean' || cellValue === null) {
+      value = cellValue;
+    }
 
-  if (value === undefined) {
-    return <TextPlaceholder>{translate('data_viewer_presentation_value_boolean_placeholder')}</TextPlaceholder>;
-  }
+    if (value === undefined) {
+      return <TextPlaceholder>{translate('data_viewer_presentation_value_boolean_placeholder')}</TextPlaceholder>;
+    }
 
-  const format = model.source.getAction(resultIndex, ResultSetFormatAction);
+    const format = model.source.getAction(resultIndex, ResultSetFormatAction);
 
-  const column = view.getColumn(firstSelectedCell.column);
-  const nullable = column?.required === false;
-  const readonly = model.isReadonly(resultIndex)
-    || model.isDisabled(resultIndex)
-    || format.isReadOnly(firstSelectedCell);
+    const column = view.getColumn(firstSelectedCell.column);
+    const nullable = column?.required === false;
+    const readonly = model.isReadonly(resultIndex) || model.isDisabled(resultIndex) || format.isReadOnly(firstSelectedCell);
 
-  return styled(styles)(
-    <container>
-      <Radio
-        id='true_value'
-        mod={['primary']}
-        checked={value === true}
-        disabled={readonly}
-        onClick={() => editor.set(firstSelectedCell, true)}
-      >
-        TRUE
-      </Radio>
-      <Radio
-        id='false_value'
-        mod={['primary']}
-        checked={value === false}
-        disabled={readonly}
-        onClick={() => editor.set(firstSelectedCell, false)}
-      >
-        FALSE
-      </Radio>
-      {nullable && (
-        <Radio
-          id='null_value'
-          mod={['primary']}
-          checked={value === null}
-          disabled={readonly}
-          onClick={() => editor.set(firstSelectedCell, null)}
-        >
-        NULL
+    return styled(styles)(
+      <container>
+        <Radio id="true_value" mod={['primary']} checked={value === true} disabled={readonly} onClick={() => editor.set(firstSelectedCell, true)}>
+          TRUE
         </Radio>
-      )}
-    </container>
-  );
-});
+        <Radio id="false_value" mod={['primary']} checked={value === false} disabled={readonly} onClick={() => editor.set(firstSelectedCell, false)}>
+          FALSE
+        </Radio>
+        {nullable && (
+          <Radio id="null_value" mod={['primary']} checked={value === null} disabled={readonly} onClick={() => editor.set(firstSelectedCell, null)}>
+            NULL
+          </Radio>
+        )}
+      </container>,
+    );
+  },
+);
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentationBootstrap.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentationBootstrap.ts
index 05db58938c..5901e98157 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentationBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/BooleanValuePresentationBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ResultDataFormat } from '@cloudbeaver/core-sdk';
 
@@ -57,5 +56,5 @@ export class BooleanValuePresentationBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/isBooleanValuePresentationAvailable.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/isBooleanValuePresentationAvailable.ts
index 61eb8fedf6..c54ff41941 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/isBooleanValuePresentationAvailable.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/BooleanValue/isBooleanValuePresentationAvailable.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { SqlResultColumn } from '@cloudbeaver/core-sdk';
 
 import type { IResultSetValue } from '../../DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction';
@@ -15,10 +14,8 @@ export function isStringifiedBoolean(value: string): boolean {
 }
 
 export function isBooleanValuePresentationAvailable(cellValue: IResultSetValue, column: SqlResultColumn): boolean {
-  return column.dataKind?.toLowerCase() === 'boolean'
-    && (
-      typeof cellValue === 'boolean'
-      || cellValue === null
-      || (typeof cellValue === 'string' && isStringifiedBoolean(cellValue))
-    );
+  return (
+    column.dataKind?.toLowerCase() === 'boolean' &&
+    (typeof cellValue === 'boolean' || cellValue === null || (typeof cellValue === 'string' && isStringifiedBoolean(cellValue)))
+  );
 }
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx
index 8802cf70f9..3b652df219 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import styled, { css, use } from 'reshadow';
@@ -46,7 +45,7 @@ const styles = css`
     flex: 1;
     flex-direction: column;
   }
-  
+
   image {
     flex: 1;
     display: flex;
@@ -73,150 +72,142 @@ const Tools = observer<IToolsProps>(function Tools({ loading, stretch, onToggleS
       )}
       {onToggleStretch && (
         <tools>
-          <tools-action
-            as='button'
-            title={translate('data_viewer_presentation_value_image_fit')}
-            disabled={stretch}
-            onClick={onToggleStretch}
-          >
-            <IconOrImage icon='img-fit-size' />
+          <tools-action as="button" title={translate('data_viewer_presentation_value_image_fit')} disabled={stretch} onClick={onToggleStretch}>
+            <IconOrImage icon="img-fit-size" />
           </tools-action>
           <tools-action
-            as='button'
+            as="button"
             title={translate('data_viewer_presentation_value_image_original_size')}
             disabled={!stretch}
             onClick={onToggleStretch}
           >
-            <IconOrImage icon='img-original-size' />
+            <IconOrImage icon="img-original-size" />
           </tools-action>
         </tools>
       )}
-    </tools-container>
+    </tools-container>,
   );
 });
 
-export const ImageValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(function ImageValuePresentation({
-  model,
-  resultIndex,
-}) {
-  const translate = useTranslate();
-  const notificationService = useService(NotificationService);
-  const quotasService = useService(QuotasService);
-  const style = useStyles(styles);
+export const ImageValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(
+  function ImageValuePresentation({ model, resultIndex }) {
+    const translate = useTranslate();
+    const notificationService = useService(NotificationService);
+    const quotasService = useService(QuotasService);
+    const style = useStyles(styles);
 
-  const content = model.source.getAction(resultIndex, ResultSetDataContentAction);
+    const content = model.source.getAction(resultIndex, ResultSetDataContentAction);
 
-  const state = useObservableRef(() => ({
-    get selectedCell() {
-      const selection = this.model.source.getAction(this.resultIndex, ResultSetSelectAction);
-      const focusCell = selection.getFocusedElement();
+    const state = useObservableRef(
+      () => ({
+        get selectedCell() {
+          const selection = this.model.source.getAction(this.resultIndex, ResultSetSelectAction);
+          const focusCell = selection.getFocusedElement();
 
-      return selection.elements[0] || focusCell;
-    },
-    get cellValue() {
-      const view = this.model.source.getAction(this.resultIndex, ResultSetViewAction);
-      const cellValue = view.getCellValue(this.selectedCell);
+          return selection.elements[0] || focusCell;
+        },
+        get cellValue() {
+          const view = this.model.source.getAction(this.resultIndex, ResultSetViewAction);
+          const cellValue = view.getCellValue(this.selectedCell);
 
-      return cellValue;
-    },
-    get src() {
-      if (this.savedSrc) {
-        return this.savedSrc;
-      }
+          return cellValue;
+        },
+        get src() {
+          if (this.savedSrc) {
+            return this.savedSrc;
+          }
 
-      if (isResultSetContentValue(this.cellValue) && this.cellValue.binary) {
-        return `data:${getMIME(this.cellValue.binary)};base64,${this.cellValue.binary}`;
-      } else if (typeof this.cellValue === 'string' && isValidUrl(this.cellValue) && isImageFormat(this.cellValue)) {
-        return this.cellValue;
-      }
+          if (isResultSetContentValue(this.cellValue) && this.cellValue.binary) {
+            return `data:${getMIME(this.cellValue.binary)};base64,${this.cellValue.binary}`;
+          } else if (typeof this.cellValue === 'string' && isValidUrl(this.cellValue) && isImageFormat(this.cellValue)) {
+            return this.cellValue;
+          }
 
-      return '';
-    },
-    get savedSrc() {
-      return content.retrieveFileDataUrlFromCache(this.selectedCell);
-    },
-    get canSave() {
-      if (this.truncated) {
-        return content.isDownloadable(this.selectedCell);
-      }
+          return '';
+        },
+        get savedSrc() {
+          return content.retrieveFileDataUrlFromCache(this.selectedCell);
+        },
+        get canSave() {
+          if (this.truncated) {
+            return content.isDownloadable(this.selectedCell);
+          }
 
-      return !!this.src;
-    },
-    get truncated() {
-      return isResultSetContentValue(this.cellValue) && content.isContentTruncated(this.cellValue);
-    },
-    stretch: false,
-    toggleStretch() {
-      this.stretch = !this.stretch;
-    },
-    async save() {
-      try {
-        if (this.truncated) {
-          await content.downloadFileData(this.selectedCell);
-        } else {
-          download(this.src, '', true);
+          return !!this.src;
+        },
+        get truncated() {
+          return isResultSetContentValue(this.cellValue) && content.isContentTruncated(this.cellValue);
+        },
+        stretch: false,
+        toggleStretch() {
+          this.stretch = !this.stretch;
+        },
+        async save() {
+          try {
+            if (this.truncated) {
+              await content.downloadFileData(this.selectedCell);
+            } else {
+              download(this.src, '', true);
+            }
+          } catch (exception: any) {
+            this.notificationService.logException(exception, 'data_viewer_presentation_value_content_download_error');
+          }
+        },
+      }),
+      {
+        selectedCell: computed,
+        cellValue: computed,
+        src: computed,
+        savedSrc: computed,
+        canSave: computed,
+        truncated: computed,
+        stretch: observable.ref,
+        toggleStretch: action.bound,
+        save: action.bound,
+      },
+      { model, resultIndex, notificationService },
+    );
+
+    const save = state.canSave ? state.save : undefined;
+    const loading = model.isLoading();
+
+    if (state.truncated && !state.savedSrc) {
+      const limit = bytesToSize(quotasService.getQuota('sqlBinaryPreviewMaxLength'));
+      const valueSize = bytesToSize((state.cellValue as unknown as IResultSetContentValue).contentLength ?? 0);
+
+      const load = async () => {
+        try {
+          await content.resolveFileDataUrl(state.selectedCell);
+        } catch (exception: any) {
+          notificationService.logException(exception, 'data_viewer_presentation_value_content_download_error');
         }
-      } catch (exception: any) {
-        this.notificationService.logException(exception, 'data_viewer_presentation_value_content_download_error');
-      }
-    },
-  }), {
-    selectedCell: computed,
-    cellValue: computed,
-    src: computed,
-    savedSrc: computed,
-    canSave: computed,
-    truncated: computed,
-    stretch: observable.ref,
-    toggleStretch: action.bound,
-    save: action.bound,
-  }, { model, resultIndex, notificationService });
+      };
 
-  const save = state.canSave ? state.save : undefined;
-  const loading = model.isLoading();
-
-  if (state.truncated && !state.savedSrc) {
-    const limit = bytesToSize(quotasService.getQuota('sqlBinaryPreviewMaxLength'));
-    const valueSize = bytesToSize((state.cellValue as unknown as IResultSetContentValue).contentLength ?? 0);
-
-    const load = async () => {
-      try {
-        await content.resolveFileDataUrl(state.selectedCell);
-      } catch (exception: any) {
-        notificationService.logException(exception, 'data_viewer_presentation_value_content_download_error');
-      }
-    };
+      return styled(style)(
+        <container>
+          <QuotaPlaceholder limit={limit} size={valueSize}>
+            {content.isDownloadable(state.selectedCell) && (
+              <Button
+                disabled={loading}
+                loading={!!content.activeElement && ResultSetDataKeysUtils.isElementsKeyEqual(content.activeElement, state.selectedCell)}
+                onClick={load}
+              >
+                {translate('ui_view')}
+              </Button>
+            )}
+          </QuotaPlaceholder>
+          <Tools loading={loading} onSave={save} />
+        </container>,
+      );
+    }
 
     return styled(style)(
       <container>
-        <QuotaPlaceholder limit={limit} size={valueSize}>
-          {content.isDownloadable(state.selectedCell) && (
-            <Button
-              disabled={loading}
-              loading={!!content.activeElement && ResultSetDataKeysUtils.isElementsKeyEqual(
-                content.activeElement, state.selectedCell)}
-              onClick={load}
-            >
-              {translate('ui_view')}
-            </Button>
-          )}
-        </QuotaPlaceholder>
-        <Tools loading={loading} onSave={save} />
-      </container>
+        <image>
+          <img src={state.src} {...use({ stretch: state.stretch })} />
+        </image>
+        <Tools loading={loading} stretch={state.stretch} onToggleStretch={state.toggleStretch} onSave={save} />
+      </container>,
     );
-  }
-
-  return styled(style)(
-    <container>
-      <image>
-        <img src={state.src} {...use({ stretch: state.stretch })} />
-      </image>
-      <Tools
-        loading={loading}
-        stretch={state.stretch}
-        onToggleStretch={state.toggleStretch}
-        onSave={save}
-      />
-    </container>
-  );
-});
\ No newline at end of file
+  },
+);
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentationBootstrap.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentationBootstrap.ts
index 2a10cbd8d6..eccdc1a70d 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentationBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentationBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import { getMIME, isImageFormat, isValidUrl } from '@cloudbeaver/core-utils';
@@ -47,10 +46,7 @@ export class ImageValuePresentationBootstrap extends Bootstrap {
 
           const cellValue = view.getCellValue(firstSelectedCell);
 
-          return !(
-            this.isImageUrl(cellValue)
-            || (isResultSetContentValue(cellValue) && this.isImage(cellValue))
-          );
+          return !(this.isImageUrl(cellValue) || (isResultSetContentValue(cellValue) && this.isImage(cellValue)));
         }
 
         return true;
@@ -58,7 +54,7 @@ export class ImageValuePresentationBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 
   private isImage(value: IResultSetContentValue | null) {
     if (value !== null && 'binary' in value) {
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx
index 736e0221c8..b8349351bd 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -40,12 +39,7 @@ const style = css`
   }
 `;
 
-export const QuotaPlaceholder: React.FC<React.PropsWithChildren<Props>> = observer(function QuotaPlaceholder({
-  limit,
-  size,
-  className,
-  children,
-}) {
+export const QuotaPlaceholder: React.FC<React.PropsWithChildren<Props>> = observer(function QuotaPlaceholder({ limit, size, className, children }) {
   const translate = useTranslate();
   const admin = usePermission(EAdminPermission.admin);
 
@@ -57,10 +51,12 @@ export const QuotaPlaceholder: React.FC<React.PropsWithChildren<Props>> = observ
           {translate('data_viewer_presentation_value_content_truncated_placeholder') + ' '}
           <limit-word>
             {admin ? (
-              <Link href='https://dbeaver.com/docs/cloudbeaver/Server-configuration/#resource-quotas' target='_blank' indicator>
+              <Link href="https://dbeaver.com/docs/cloudbeaver/Server-configuration/#resource-quotas" target="_blank" indicator>
                 {translate('ui_limit')}
               </Link>
-            ) : translate('ui_limit')}
+            ) : (
+              translate('ui_limit')
+            )}
           </limit-word>
         </reason>
         {limit && `${translate('ui_limit')}: ${limit}`}
@@ -68,6 +64,6 @@ export const QuotaPlaceholder: React.FC<React.PropsWithChildren<Props>> = observ
         {size && `${translate('data_viewer_presentation_value_content_value_size')}: ${size}`}
       </p>
       {children}
-    </container>
+    </container>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentation.tsx b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentation.tsx
index 73b32628d4..2d0ccc900b 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentation.tsx
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentation.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
@@ -65,146 +64,149 @@ const styles = css`
     & Tab {
       border-bottom: 0;
 
-      &:global([aria-selected="false"]) {
+      &:global([aria-selected='false']) {
         border-bottom: 0 !important;
       }
     }
   }
 `;
 
-export const TextValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(function TextValuePresentation({
-  model,
-  resultIndex,
-}) {
-  const translate = useTranslate();
-  const notificationService = useService(NotificationService);
-  const quotasService = useService(QuotasService);
-  const textValuePresentationService = useService(TextValuePresentationService);
-  const style = useStyles(styles, BASE_CONTAINERS_STYLES, UNDERLINE_TAB_STYLES, VALUE_PANEL_TOOLS_STYLES);
+export const TextValuePresentation: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = observer(
+  function TextValuePresentation({ model, resultIndex }) {
+    const translate = useTranslate();
+    const notificationService = useService(NotificationService);
+    const quotasService = useService(QuotasService);
+    const textValuePresentationService = useService(TextValuePresentationService);
+    const style = useStyles(styles, BASE_CONTAINERS_STYLES, UNDERLINE_TAB_STYLES, VALUE_PANEL_TOOLS_STYLES);
 
-  const state = useObservableRef(() => ({
-    currentContentType: 'text/plain',
-    lastContentType: 'text/plain',
+    const state = useObservableRef(
+      () => ({
+        currentContentType: 'text/plain',
+        lastContentType: 'text/plain',
 
-    setContentType(type: string) {
-      this.currentContentType = type;
-    },
-    setDefaultContentType(type: string) {
-      this.currentContentType = type;
-      this.lastContentType = type;
-    },
-  }), {
-    currentContentType: observable.ref,
-    lastContentType: observable.ref,
-  }, false, ['setContentType', 'setDefaultContentType']);
+        setContentType(type: string) {
+          this.currentContentType = type;
+        },
+        setDefaultContentType(type: string) {
+          this.currentContentType = type;
+          this.lastContentType = type;
+        },
+      }),
+      {
+        currentContentType: observable.ref,
+        lastContentType: observable.ref,
+      },
+      false,
+      ['setContentType', 'setDefaultContentType'],
+    );
 
-  const selection = model.source.getAction(resultIndex, ResultSetSelectAction);
-  const editor = model.source.getAction(resultIndex, ResultSetEditAction);
-  const content = model.source.getAction(resultIndex, ResultSetDataContentAction);
+    const selection = model.source.getAction(resultIndex, ResultSetSelectAction);
+    const editor = model.source.getAction(resultIndex, ResultSetEditAction);
+    const content = model.source.getAction(resultIndex, ResultSetDataContentAction);
 
-  const focusCell = selection.getFocusedElement();
+    const focusCell = selection.getFocusedElement();
 
-  let stringValue = '';
-  let contentType = 'text/plain';
-  let firstSelectedCell: IResultSetElementKey | undefined;
-  let readonly = true;
-  let valueTruncated = false;
-  let limit: string | undefined;
-  let valueSize: string | undefined;
+    let stringValue = '';
+    let contentType = 'text/plain';
+    let firstSelectedCell: IResultSetElementKey | undefined;
+    let readonly = true;
+    let valueTruncated = false;
+    let limit: string | undefined;
+    let valueSize: string | undefined;
 
-  if (selection.elements.length > 0 || focusCell) {
-    const view = model.source.getAction(resultIndex, ResultSetViewAction);
-    const format = model.source.getAction(resultIndex, ResultSetFormatAction);
+    if (selection.elements.length > 0 || focusCell) {
+      const view = model.source.getAction(resultIndex, ResultSetViewAction);
+      const format = model.source.getAction(resultIndex, ResultSetFormatAction);
 
-    firstSelectedCell = selection.elements[0] || focusCell;
+      firstSelectedCell = selection.elements[0] || focusCell;
 
-    const value = view.getCellValue(firstSelectedCell) ?? '';
+      const value = view.getCellValue(firstSelectedCell) ?? '';
 
-    stringValue = format.getText(value) ?? '';
-    readonly = format.isReadOnly(firstSelectedCell);
+      stringValue = format.getText(value) ?? '';
+      readonly = format.isReadOnly(firstSelectedCell);
 
+      if (isResultSetContentValue(value)) {
+        valueTruncated = content.isContentTruncated(value);
 
-    if (isResultSetContentValue(value)) {
-      valueTruncated = content.isContentTruncated(value);
-
-      if (valueTruncated) {
-        limit = bytesToSize(quotasService.getQuota('sqlBinaryPreviewMaxLength'));
-        valueSize = bytesToSize(value.contentLength ?? 0);
-      }
-
-      if (value.contentType) {
-        contentType = value.contentType;
-
-        if (contentType === 'text/json') {
-          contentType = 'application/json';
+        if (valueTruncated) {
+          limit = bytesToSize(quotasService.getQuota('sqlBinaryPreviewMaxLength'));
+          valueSize = bytesToSize(value.contentLength ?? 0);
         }
 
-        if (!textValuePresentationService.tabs.has(contentType)) {
-          contentType = 'text/plain';
+        if (value.contentType) {
+          contentType = value.contentType;
+
+          if (contentType === 'text/json') {
+            contentType = 'application/json';
+          }
+
+          if (!textValuePresentationService.tabs.has(contentType)) {
+            contentType = 'text/plain';
+          }
         }
       }
     }
-  }
 
-  readonly = model.isReadonly(resultIndex) || model.isDisabled(resultIndex) || readonly;
+    readonly = model.isReadonly(resultIndex) || model.isDisabled(resultIndex) || readonly;
 
-  if (contentType !== state.lastContentType) {
-    state.setDefaultContentType(contentType);
-  }
-
-  const formatter = useAutoFormat();
-
-  function handleChange(newValue: string) {
-    if (firstSelectedCell && !readonly) {
-      editor.set(firstSelectedCell, newValue);
-    }
-  }
-
-  async function save() {
-    if (!firstSelectedCell) {
-      return;
+    if (contentType !== state.lastContentType) {
+      state.setDefaultContentType(contentType);
     }
 
-    try {
-      await content.downloadFileData(firstSelectedCell);
-    } catch (exception) {
-      notificationService.logException(exception as any, 'data_viewer_presentation_value_content_download_error');
+    const formatter = useAutoFormat();
+
+    function handleChange(newValue: string) {
+      if (firstSelectedCell && !readonly) {
+        editor.set(firstSelectedCell, newValue);
+      }
     }
-  }
 
-  const autoFormat = !!firstSelectedCell && !editor.isElementEdited(firstSelectedCell);
-  const canSave = !!firstSelectedCell && content.isDownloadable(firstSelectedCell);
-  const typeExtension = useMemo(() => getTypeExtension(state.currentContentType) ?? [], [state.currentContentType]);
+    async function save() {
+      if (!firstSelectedCell) {
+        return;
+      }
 
-  const value = autoFormat ? formatter.format(state.currentContentType, stringValue) : stringValue;
+      try {
+        await content.downloadFileData(firstSelectedCell);
+      } catch (exception) {
+        notificationService.logException(exception as any, 'data_viewer_presentation_value_content_download_error');
+      }
+    }
 
-  return styled(style)(
-    <container>
-      <actions>
-        <TabsState
-          container={textValuePresentationService.tabs}
-          currentTabId={state.currentContentType}
-          lazy
-          onChange={tab => state.setContentType(tab.tabId)}
-        >
-          <TabList style={[BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES]} />
-        </TabsState>
-      </actions>
-      <EditorLoader
-        key={readonly ? '1' : '0'}
-        value={value}
-        readonly={readonly}
-        extensions={[typeExtension]}
-        onChange={value => handleChange(value)}
-      />
-      {valueTruncated && <QuotaPlaceholder limit={limit} size={valueSize} />}
-      {canSave && (
-        <tools-container>
-          <Button disabled={model.isLoading()} onClick={save}>
-            {translate('ui_download')}
-          </Button>
-        </tools-container>
-      )}
-    </container>
-  );
-});
+    const autoFormat = !!firstSelectedCell && !editor.isElementEdited(firstSelectedCell);
+    const canSave = !!firstSelectedCell && content.isDownloadable(firstSelectedCell);
+    const typeExtension = useMemo(() => getTypeExtension(state.currentContentType) ?? [], [state.currentContentType]);
+
+    const value = autoFormat ? formatter.format(state.currentContentType, stringValue) : stringValue;
+
+    return styled(style)(
+      <container>
+        <actions>
+          <TabsState
+            container={textValuePresentationService.tabs}
+            currentTabId={state.currentContentType}
+            lazy
+            onChange={tab => state.setContentType(tab.tabId)}
+          >
+            <TabList style={[BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES]} />
+          </TabsState>
+        </actions>
+        <EditorLoader
+          key={readonly ? '1' : '0'}
+          value={value}
+          readonly={readonly}
+          extensions={[typeExtension]}
+          onChange={value => handleChange(value)}
+        />
+        {valueTruncated && <QuotaPlaceholder limit={limit} size={valueSize} />}
+        {canSave && (
+          <tools-container>
+            <Button disabled={model.isLoading()} onClick={save}>
+              {translate('ui_download')}
+            </Button>
+          </tools-container>
+        )}
+      </container>,
+    );
+  },
+);
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationBootstrap.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationBootstrap.ts
index 9ecd3685aa..a3faaf8720 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationBootstrap.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React, { lazy } from 'react';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -23,7 +22,7 @@ const TextValuePresentation = lazy(async () => {
 export class TextValuePresentationBootstrap extends Bootstrap {
   constructor(
     private readonly textValuePresentationService: TextValuePresentationService,
-    private readonly dataValuePanelService: DataValuePanelService
+    private readonly dataValuePanelService: DataValuePanelService,
   ) {
     super();
   }
@@ -63,5 +62,5 @@ export class TextValuePresentationBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationService.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationService.ts
index b83b9f2482..5d08269de2 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationService.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/TextValuePresentationService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ITabInfo, ITabInfoOptions, TabsContainer } from '@cloudbeaver/core-ui';
 
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/getTypeExtension.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/getTypeExtension.ts
index c09e335c32..69fddfa9ab 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/getTypeExtension.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/getTypeExtension.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { HTML_EDITOR, JSON_EDITOR, XML_EDITOR } from '@cloudbeaver/plugin-codemirror6';
 
 // @TODO These imports are quite heavy
@@ -20,4 +19,4 @@ export function getTypeExtension(type: string) {
     default:
       return;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/useAutoFormat.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/useAutoFormat.ts
index da2b1a3771..80a7f8b711 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/useAutoFormat.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/TextValue/useAutoFormat.ts
@@ -5,25 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from '@cloudbeaver/core-blocks';
 
 export function useAutoFormat() {
-  return useObjectRef(() => ({
-    format(type: string, value: string) {
-      try {
-        switch (type) {
-          case 'application/json':
-            return JSON.stringify(JSON.parse(value), null, 2);
-          case 'text/xml':
-          case 'text/html':
-            return value;
-          default:
-            return value;
+  return useObjectRef(
+    () => ({
+      format(type: string, value: string) {
+        try {
+          switch (type) {
+            case 'application/json':
+              return JSON.stringify(JSON.parse(value), null, 2);
+            case 'text/xml':
+            case 'text/html':
+              return value;
+            default:
+              return value;
+          }
+        } catch {
+          return value;
         }
-      } catch {
-        return value;
-      }
-    },
-  }), false);
+      },
+    }),
+    false,
+  );
 }
diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ValuePanelTools/VALUE_PANEL_TOOLS_STYLES.ts b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ValuePanelTools/VALUE_PANEL_TOOLS_STYLES.ts
index 20a0276987..1a446d8ec9 100644
--- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ValuePanelTools/VALUE_PANEL_TOOLS_STYLES.ts
+++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/ValuePanelTools/VALUE_PANEL_TOOLS_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const VALUE_PANEL_TOOLS_STYLES = css`
@@ -33,4 +32,4 @@ export const VALUE_PANEL_TOOLS_STYLES = css`
     width: 100%;
     height: 100%;
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/plugin-data-viewer/src/index.ts b/webapp/packages/plugin-data-viewer/src/index.ts
index eb5509a2a9..d67774cee5 100644
--- a/webapp/packages/plugin-data-viewer/src/index.ts
+++ b/webapp/packages/plugin-data-viewer/src/index.ts
@@ -59,4 +59,4 @@ export * from './DataPresentationService';
 export * from './DataViewerDataChangeConfirmationService';
 export * from './useDataModel';
 export * from './ValuePanelPresentation/BooleanValue/isBooleanValuePresentationAvailable';
-export * from './DataViewerSettingsService';
\ No newline at end of file
+export * from './DataViewerSettingsService';
diff --git a/webapp/packages/plugin-data-viewer/src/manifest.ts b/webapp/packages/plugin-data-viewer/src/manifest.ts
index 8e3bcc2c27..07f2004bbf 100644
--- a/webapp/packages/plugin-data-viewer/src/manifest.ts
+++ b/webapp/packages/plugin-data-viewer/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DataPresentationService } from './DataPresentationService';
diff --git a/webapp/packages/plugin-data-viewer/src/useDataModel.ts b/webapp/packages/plugin-data-viewer/src/useDataModel.ts
index 6dd6b5d675..a2a2e450eb 100644
--- a/webapp/packages/plugin-data-viewer/src/useDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/useDataModel.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 
 import type { IDatabaseDataModel } from './DatabaseDataModel/IDatabaseDataModel';
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 635053c03b..359304a574 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
@@ -5,14 +5,28 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppAuthService } from '@cloudbeaver/core-authentication';
-import { compareConnectionsInfo, ConnectionInfoResource, ConnectionsManagerService, ConnectionsSettingsService, ContainerResource, createConnectionParam, serializeConnectionParam } from '@cloudbeaver/core-connections';
+import {
+  compareConnectionsInfo,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  ConnectionsSettingsService,
+  ContainerResource,
+  createConnectionParam,
+  serializeConnectionParam,
+} from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { EObjectFeature, NodeManagerUtils } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
-import { DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, MenuBaseItem, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
+import {
+  DATA_CONTEXT_LOADABLE_STATE,
+  DATA_CONTEXT_MENU,
+  MenuBaseItem,
+  menuExtractItems,
+  MenuSeparatorItem,
+  MenuService,
+} from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
 import { ConnectionSchemaManagerService } from './ConnectionSchemaManagerService';
@@ -21,14 +35,10 @@ import type { IConnectionSelectorExtraProps } from './ConnectionSelector/IConnec
 import { MENU_CONNECTION_DATA_CONTAINER_SELECTOR } from './MENU_CONNECTION_DATA_CONTAINER_SELECTOR';
 import { MENU_CONNECTION_SELECTOR } from './MENU_CONNECTION_SELECTOR';
 
-
 @injectable()
 export class ConnectionSchemaManagerBootstrap extends Bootstrap {
   get connectionSelectorLoading(): boolean {
-    return (
-      this.connectionSchemaManagerService.isChangingConnection
-      || this.connectionsManagerService.containerContainers.isLoading()
-    );
+    return this.connectionSchemaManagerService.isChangingConnection || this.connectionsManagerService.containerContainers.isLoading();
   }
 
   constructor(
@@ -47,20 +57,20 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
   register(): void {
     this.addTopAppMenuItems();
 
-    this.connectionInfoResource.onDataUpdate
-      .addHandler(this.connectionSchemaManagerService.onConnectionUpdate.bind(this.connectionSchemaManagerService));
+    this.connectionInfoResource.onDataUpdate.addHandler(
+      this.connectionSchemaManagerService.onConnectionUpdate.bind(this.connectionSchemaManagerService),
+    );
 
     this.menuService.setHandler<IConnectionSelectorExtraProps>({
       id: 'connection-selector-base',
       isApplicable: context => context.hasValue(DATA_CONTEXT_MENU, MENU_CONNECTION_SELECTOR),
       isLoading: () => this.connectionSelectorLoading,
       isHidden: () => this.isHidden() || !this.appAuthService.authenticated,
-      isDisabled: () => (
-        !this.connectionSchemaManagerService.isConnectionChangeable
-        || this.connectionSelectorLoading
-        || !this.connectionsManagerService.hasAnyConnection()
-        || this.connectionSchemaManagerService.isChangingConnectionContainer
-      ),
+      isDisabled: () =>
+        !this.connectionSchemaManagerService.isConnectionChangeable ||
+        this.connectionSelectorLoading ||
+        !this.connectionsManagerService.hasAnyConnection() ||
+        this.connectionSchemaManagerService.isChangingConnectionContainer,
       getInfo: (context, menu) => {
         const connection = this.connectionSchemaManagerService.currentConnection;
         const label = connection?.name || 'plugin_datasource_context_switch_select_connection';
@@ -80,39 +90,37 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          menu.id,
-          () => {
-            if (!this.connectionSchemaManagerService.activeConnectionKey) {
-              return this.appAuthService.loaders;
-            }
-            return [
-              ...this.appAuthService.loaders,
-              getCachedMapResourceLoaderState(this.containerResource, {
+        return state.getState(menu.id, () => {
+          if (!this.connectionSchemaManagerService.activeConnectionKey) {
+            return this.appAuthService.loaders;
+          }
+          return [
+            ...this.appAuthService.loaders,
+            getCachedMapResourceLoaderState(
+              this.containerResource,
+              {
                 ...this.connectionSchemaManagerService.activeConnectionKey,
                 catalogId: this.connectionSchemaManagerService.activeObjectCatalogId,
-              }, undefined),
-            ];
-          }
-        );
+              },
+              undefined,
+            ),
+          ];
+        });
       },
     });
 
     this.menuService.addCreator({
       menus: [MENU_CONNECTION_SELECTOR],
-      isApplicable: () => (
-        this.connectionsManagerService.hasAnyConnection()
-        && this.connectionSchemaManagerService.isConnectionChangeable
-      ),
+      isApplicable: () => this.connectionsManagerService.hasAnyConnection() && this.connectionSchemaManagerService.isConnectionChangeable,
       getItems: (context, items) => {
         items = [...items];
 
         const connections = this.connectionsManagerService.projectConnections
           .filter(connection => {
             if (
-              !this.connectionSchemaManagerService.isProjectChangeable
-              && this.connectionSchemaManagerService.activeProjectId
-              && connection.projectId !== this.connectionSchemaManagerService.activeProjectId
+              !this.connectionSchemaManagerService.isProjectChangeable &&
+              this.connectionSchemaManagerService.activeProjectId &&
+              connection.projectId !== this.connectionSchemaManagerService.activeProjectId
             ) {
               return false;
             }
@@ -127,34 +135,31 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
             return Number(b.connected) - Number(a.connected);
           });
 
-
         for (const connection of connections) {
           const connectionKey = createConnectionParam(connection);
 
-          items.push(new MenuBaseItem<IConnectionSelectorExtraProps>(
-            {
-              id: serializeConnectionParam(connectionKey),
-              label: connection.name,
-              tooltip: connection.description,
-            },
-            {
-              onSelect: () => {
-                this.connectionSchemaManagerService.selectConnection(connectionKey);
+          items.push(
+            new MenuBaseItem<IConnectionSelectorExtraProps>(
+              {
+                id: serializeConnectionParam(connectionKey),
+                label: connection.name,
+                tooltip: connection.description,
               },
-            },
-            {
-              iconComponent: () => ConnectionIcon,
-              isDisabled: () => (
-                this.connectionSchemaManagerService.currentConnectionKey !== null
-                && this.connectionSchemaManagerService.currentConnectionKey !== undefined
-                && this.connectionInfoResource.isKeyEqual(
-                  this.connectionSchemaManagerService.currentConnectionKey,
-                  connectionKey
-                )
-              ),
-              getExtraProps: () => ({ connectionKey }),
-            }
-          ));
+              {
+                onSelect: () => {
+                  this.connectionSchemaManagerService.selectConnection(connectionKey);
+                },
+              },
+              {
+                iconComponent: () => ConnectionIcon,
+                isDisabled: () =>
+                  this.connectionSchemaManagerService.currentConnectionKey !== null &&
+                  this.connectionSchemaManagerService.currentConnectionKey !== undefined &&
+                  this.connectionInfoResource.isKeyEqual(this.connectionSchemaManagerService.currentConnectionKey, connectionKey),
+                getExtraProps: () => ({ connectionKey }),
+              },
+            ),
+          );
         }
 
         return items;
@@ -164,34 +169,22 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
     this.menuService.setHandler({
       id: 'connection-data-container-selector-base',
       isApplicable: context => context.hasValue(DATA_CONTEXT_MENU, MENU_CONNECTION_DATA_CONTAINER_SELECTOR),
-      isDisabled: () => (
-        !this.connectionSchemaManagerService.currentConnection?.connected
-        || this.connectionSelectorLoading
-        || this.connectionSchemaManagerService.isChangingConnectionContainer
-        || (
-          !this.connectionSchemaManagerService.isObjectCatalogChangeable
-          && !this.connectionSchemaManagerService.isObjectSchemaChangeable
-        )
-      ),
-      isLoading: () => (
-        !this.connectionSelectorLoading
-        && this.connectionSchemaManagerService.isChangingConnectionContainer
-      ),
-      isHidden: () => (
-        this.isHidden()
-        || !this.appAuthService.authenticated
-        || !this.connectionSchemaManagerService.objectContainerList
-        || (
-          this.connectionSchemaManagerService.currentObjectSchemaId === undefined
-          && this.connectionSchemaManagerService.currentObjectCatalogId === undefined
-          && !this.connectionSchemaManagerService.isObjectCatalogChangeable
-          && !this.connectionSchemaManagerService.isObjectSchemaChangeable
-        )
-        || (
-          this.connectionSchemaManagerService.objectContainerList.schemaList.length === 0
-          && this.connectionSchemaManagerService.objectContainerList.catalogList.length === 0
-        )
-      ),
+      isDisabled: () =>
+        !this.connectionSchemaManagerService.currentConnection?.connected ||
+        this.connectionSelectorLoading ||
+        this.connectionSchemaManagerService.isChangingConnectionContainer ||
+        (!this.connectionSchemaManagerService.isObjectCatalogChangeable && !this.connectionSchemaManagerService.isObjectSchemaChangeable),
+      isLoading: () => !this.connectionSelectorLoading && this.connectionSchemaManagerService.isChangingConnectionContainer,
+      isHidden: () =>
+        this.isHidden() ||
+        !this.appAuthService.authenticated ||
+        !this.connectionSchemaManagerService.objectContainerList ||
+        (this.connectionSchemaManagerService.currentObjectSchemaId === undefined &&
+          this.connectionSchemaManagerService.currentObjectCatalogId === undefined &&
+          !this.connectionSchemaManagerService.isObjectCatalogChangeable &&
+          !this.connectionSchemaManagerService.isObjectSchemaChangeable) ||
+        (this.connectionSchemaManagerService.objectContainerList.schemaList.length === 0 &&
+          this.connectionSchemaManagerService.objectContainerList.catalogList.length === 0),
       getLoader: (context, menu) => {
         if (this.isHidden()) {
           return [];
@@ -199,10 +192,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          menu.id,
-          () => this.appAuthService.loaders
-        );
+        return state.getState(menu.id, () => this.appAuthService.loaders);
       },
       hideIfEmpty: () => false,
       getInfo: (context, menu) => {
@@ -212,30 +202,22 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
         let label = NodeManagerUtils.concatSchemaAndCatalog(
           connectionSchemaManagerService.currentObjectCatalogId,
-          connectionSchemaManagerService.currentObjectSchemaId
+          connectionSchemaManagerService.currentObjectSchemaId,
         );
 
         if (!label) {
           label = 'plugin_datasource_context_switch_select_container';
         }
 
-        if (
-          !connectionSchemaManagerService.currentObjectSchema
-          && !connectionSchemaManagerService.currentObjectCatalog
-        ) {
+        if (!connectionSchemaManagerService.currentObjectSchema && !connectionSchemaManagerService.currentObjectCatalog) {
           icon = undefined;
-        } else if (
-          connectionSchemaManagerService.currentObjectSchema?.object?.features?.includes(EObjectFeature.schema)
-        ) {
+        } else if (connectionSchemaManagerService.currentObjectSchema?.object?.features?.includes(EObjectFeature.schema)) {
           // TODO move such kind of icon paths to a set of constants
           icon = '/icons/plugin_datasource_context_switch_schema_m.svg';
-        } else if (
-          connectionSchemaManagerService.currentObjectCatalog?.object?.features?.includes(EObjectFeature.catalog)
-        ) {
+        } else if (connectionSchemaManagerService.currentObjectCatalog?.object?.features?.includes(EObjectFeature.catalog)) {
           icon = '/icons/plugin_datasource_context_switch_database_m.svg';
         }
 
-
         return {
           ...menu,
           icon,
@@ -246,10 +228,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
     this.menuService.addCreator({
       menus: [MENU_CONNECTION_DATA_CONTAINER_SELECTOR],
-      isApplicable: () => (
-        this.connectionSchemaManagerService.isObjectCatalogChangeable
-        && !!this.connectionSchemaManagerService.objectContainerList
-      ),
+      isApplicable: () => this.connectionSchemaManagerService.isObjectCatalogChangeable && !!this.connectionSchemaManagerService.objectContainerList,
       getItems: (context, items) => {
         items = [...items];
 
@@ -257,41 +236,37 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
           return [];
         }
 
-        const schemaList = this.connectionSchemaManagerService.objectContainerList.schemaList
-          .slice()
-          .sort((a, b) => {
-            if (a.name === b.name) {
-              return 0;
-            }
-
-            if (a.name === this.connectionSchemaManagerService.currentObjectSchemaId) {
-              return -1;
-            }
-
-            if (b.name === this.connectionSchemaManagerService.currentObjectSchemaId) {
-              return 1;
-            }
-
+        const schemaList = this.connectionSchemaManagerService.objectContainerList.schemaList.slice().sort((a, b) => {
+          if (a.name === b.name) {
             return 0;
-          });
+          }
 
-        const catalogList = this.connectionSchemaManagerService.objectContainerList.catalogList
-          .slice()
-          .sort((a, b) => {
-            if (a.catalog.name === b.catalog.name) {
-              return 0;
-            }
+          if (a.name === this.connectionSchemaManagerService.currentObjectSchemaId) {
+            return -1;
+          }
 
-            if (a.catalog.name === this.connectionSchemaManagerService.currentObjectCatalogId) {
-              return -1;
-            }
+          if (b.name === this.connectionSchemaManagerService.currentObjectSchemaId) {
+            return 1;
+          }
 
-            if (b.catalog.name === this.connectionSchemaManagerService.currentObjectCatalogId) {
-              return 1;
-            }
+          return 0;
+        });
 
+        const catalogList = this.connectionSchemaManagerService.objectContainerList.catalogList.slice().sort((a, b) => {
+          if (a.catalog.name === b.catalog.name) {
             return 0;
-          });
+          }
+
+          if (a.catalog.name === this.connectionSchemaManagerService.currentObjectCatalogId) {
+            return -1;
+          }
+
+          if (b.catalog.name === this.connectionSchemaManagerService.currentObjectCatalogId) {
+            return 1;
+          }
+
+          return 0;
+        });
 
         let previousSelected: boolean | null = null;
 
@@ -309,22 +284,24 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
           previousSelected = selected;
 
-          items.push(new MenuBaseItem(
-            {
-              id: title,
-              label: title,
-              tooltip: title,
-              icon: '/icons/plugin_datasource_context_switch_schema_sm.svg',
-            },
-            {
-              onSelect: async () => {
-                await this.connectionSchemaManagerService.selectSchema(title);
+          items.push(
+            new MenuBaseItem(
+              {
+                id: title,
+                label: title,
+                tooltip: title,
+                icon: '/icons/plugin_datasource_context_switch_schema_sm.svg',
               },
-            },
-            {
-              isDisabled: () => this.connectionSchemaManagerService.currentObjectSchemaId === title,
-            }
-          ));
+              {
+                onSelect: async () => {
+                  await this.connectionSchemaManagerService.selectSchema(title);
+                },
+              },
+              {
+                isDisabled: () => this.connectionSchemaManagerService.currentObjectSchemaId === title,
+              },
+            ),
+          );
         }
 
         for (const catalogData of catalogList) {
@@ -342,22 +319,24 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
           previousSelected = selected;
 
           if (catalogData.schemaList.length === 0) {
-            items.push(new MenuBaseItem(
-              {
-                id: catalog.name,
-                label: catalog.name,
-                tooltip: catalog.name,
-                icon: '/icons/plugin_datasource_context_switch_database_sm.svg',
-              },
-              {
-                onSelect: async () => {
-                  await this.connectionSchemaManagerService.selectCatalog(catalog.name!);
+            items.push(
+              new MenuBaseItem(
+                {
+                  id: catalog.name,
+                  label: catalog.name,
+                  tooltip: catalog.name,
+                  icon: '/icons/plugin_datasource_context_switch_database_sm.svg',
                 },
-              },
-              {
-                isDisabled: () => this.connectionSchemaManagerService.currentObjectCatalogId === catalog.name,
-              }
-            ));
+                {
+                  onSelect: async () => {
+                    await this.connectionSchemaManagerService.selectCatalog(catalog.name!);
+                  },
+                },
+                {
+                  isDisabled: () => this.connectionSchemaManagerService.currentObjectCatalogId === catalog.name,
+                },
+              ),
+            );
           }
 
           for (const schema of catalogData.schemaList) {
@@ -365,30 +344,28 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
               continue;
             }
 
-            const title = NodeManagerUtils.concatSchemaAndCatalog(
-              catalog.name,
-              schema.name
-            );
+            const title = NodeManagerUtils.concatSchemaAndCatalog(catalog.name, schema.name);
 
-            items.push(new MenuBaseItem(
-              {
-                id: title,
-                label: title,
-                tooltip: title,
-                icon: '/icons/plugin_datasource_context_switch_schema_sm.svg',
-              },
-              {
-                onSelect: async () => {
-                  await this.connectionSchemaManagerService.selectSchema(schema.name!, catalog.name!);
+            items.push(
+              new MenuBaseItem(
+                {
+                  id: title,
+                  label: title,
+                  tooltip: title,
+                  icon: '/icons/plugin_datasource_context_switch_schema_sm.svg',
                 },
-              },
-              {
-                isDisabled: () => (
-                  this.connectionSchemaManagerService.currentObjectSchemaId === schema.name
-                  && this.connectionSchemaManagerService.currentObjectCatalogId === catalog.name
-                ),
-              }
-            ));
+                {
+                  onSelect: async () => {
+                    await this.connectionSchemaManagerService.selectSchema(schema.name!, catalog.name!);
+                  },
+                },
+                {
+                  isDisabled: () =>
+                    this.connectionSchemaManagerService.currentObjectSchemaId === schema.name &&
+                    this.connectionSchemaManagerService.currentObjectCatalogId === catalog.name,
+                },
+              ),
+            );
           }
         }
 
@@ -397,27 +374,20 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 
   private isHidden(): boolean {
     return (
-      this.connectionsSettingsService.settings.getValue('disabled')
-      || this.optionsPanelService.active
-      || (
-        !this.connectionSchemaManagerService.isConnectionChangeable
-        && !this.connectionSchemaManagerService.currentConnectionKey
-      )
+      this.connectionsSettingsService.settings.getValue('disabled') ||
+      this.optionsPanelService.active ||
+      (!this.connectionSchemaManagerService.isConnectionChangeable && !this.connectionSchemaManagerService.currentConnectionKey)
     );
   }
 
   private addTopAppMenuItems() {
     this.menuService.addCreator({
       menus: [MENU_APP_ACTIONS],
-      getItems: (context, items) => [
-        ...items,
-        MENU_CONNECTION_SELECTOR,
-        MENU_CONNECTION_DATA_CONTAINER_SELECTOR,
-      ],
+      getItems: (context, items) => [...items, MENU_CONNECTION_SELECTOR, MENU_CONNECTION_DATA_CONTAINER_SELECTOR],
       orderItems: (context, items) => {
         const extracted = menuExtractItems(items, [MENU_CONNECTION_SELECTOR, MENU_CONNECTION_DATA_CONTAINER_SELECTOR]);
 
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
index 95825805c6..b44ac7f382 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
@@ -5,19 +5,45 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
 
-import { computed, observable, makeObservable, action, runInAction } from 'mobx';
-
-import { ConnectionInfoResource, ConnectionsManagerService, ObjectContainer, DBDriverResource, isConnectionProvider, IConnectionProvider, isConnectionSetter, IConnectionSetter, IStructContainers, Connection, IConnectionInfoParams, serializeConnectionParam, IObjectCatalogProvider, IObjectCatalogSetter, IObjectSchemaProvider, IObjectSchemaSetter, isObjectCatalogProvider, isObjectCatalogSetter, isObjectSchemaProvider, isObjectSchemaSetter } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  DBDriverResource,
+  IConnectionInfoParams,
+  IConnectionProvider,
+  IConnectionSetter,
+  IObjectCatalogProvider,
+  IObjectCatalogSetter,
+  IObjectSchemaProvider,
+  IObjectSchemaSetter,
+  isConnectionProvider,
+  isConnectionSetter,
+  isObjectCatalogProvider,
+  isObjectCatalogSetter,
+  isObjectSchemaProvider,
+  isObjectSchemaSetter,
+  IStructContainers,
+  ObjectContainer,
+  serializeConnectionParam,
+} from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ExtensionUtils, IExtension } from '@cloudbeaver/core-extensions';
-import { type IObjectNavNodeProvider, type IDataContextActiveNode, isObjectNavNodeProvider } from '@cloudbeaver/core-navigation-tree';
-import { IProjectProvider, IProjectSetter, IProjectSetterState, isProjectProvider, isProjectSetter, isProjectSetterState } from '@cloudbeaver/core-projects';
+import { type IDataContextActiveNode, type IObjectNavNodeProvider, isObjectNavNodeProvider } from '@cloudbeaver/core-navigation-tree';
+import {
+  IProjectProvider,
+  IProjectSetter,
+  IProjectSetterState,
+  isProjectProvider,
+  isProjectSetter,
+  isProjectSetterState,
+} from '@cloudbeaver/core-projects';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import { ITab, NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
 
-
 export interface IConnectionInfo {
   name?: string;
   driverIcon?: string;
@@ -41,7 +67,6 @@ interface IActiveItem<T> {
 @injectable()
 export class ConnectionSchemaManagerService {
   get activeNavNode(): IDataContextActiveNode | null | undefined {
-
     if (!this.activeItem?.getCurrentNavNode) {
       return null;
     }
@@ -50,7 +75,6 @@ export class ConnectionSchemaManagerService {
   }
 
   get activeProjectId(): string | null | undefined {
-
     if (!this.activeItem?.getCurrentProjectId) {
       return null;
     }
@@ -59,7 +83,6 @@ export class ConnectionSchemaManagerService {
   }
 
   get activeConnectionKey(): IConnectionInfoParams | null | undefined {
-
     if (!this.activeItem?.getCurrentConnectionId) {
       return null;
     }
@@ -123,10 +146,7 @@ export class ConnectionSchemaManagerService {
       return;
     }
 
-    return this.connectionsManagerService.getObjectContainerById(
-      this.currentConnectionKey,
-      this.currentObjectCatalogId
-    );
+    return this.connectionsManagerService.getObjectContainerById(this.currentConnectionKey, this.currentObjectCatalogId);
   }
 
   get currentObjectSchema(): ObjectContainer | undefined {
@@ -134,11 +154,7 @@ export class ConnectionSchemaManagerService {
       return;
     }
 
-    return this.connectionsManagerService.getObjectContainerById(
-      this.currentConnectionKey,
-      this.currentObjectCatalogId,
-      this.currentObjectSchemaId
-    );
+    return this.connectionsManagerService.getObjectContainerById(this.currentConnectionKey, this.currentObjectCatalogId, this.currentObjectSchemaId);
   }
 
   get objectContainerList(): IStructContainers | undefined {
@@ -161,17 +177,11 @@ export class ConnectionSchemaManagerService {
   }
 
   get isObjectCatalogChangeable(): boolean {
-    return (
-      !!this.activeItem?.changeCatalogId
-      && !!this.objectContainerList?.supportsCatalogChange
-    );
+    return !!this.activeItem?.changeCatalogId && !!this.objectContainerList?.supportsCatalogChange;
   }
 
   get isObjectSchemaChangeable(): boolean {
-    return (
-      !!this.activeItem?.changeSchemaId
-      && !!this.objectContainerList?.supportsSchemaChange
-    );
+    return !!this.activeItem?.changeSchemaId && !!this.objectContainerList?.supportsSchemaChange;
   }
 
   get isChangingProject(): boolean {
@@ -220,7 +230,7 @@ export class ConnectionSchemaManagerService {
     private readonly connectionInfo: ConnectionInfoResource,
     private readonly connectionsManagerService: ConnectionsManagerService,
     private readonly dbDriverResource: DBDriverResource,
-    private readonly notificationService: NotificationService
+    private readonly notificationService: NotificationService,
   ) {
     this.changingProjectId = false;
     this.changingConnection = false;
@@ -231,16 +241,16 @@ export class ConnectionSchemaManagerService {
     this.pendingSchemaId = null;
 
     makeObservable<
-    ConnectionSchemaManagerService,
-    'activeItem'
-    | 'changingProjectId'
-    | 'changingConnection'
-    | 'changingConnectionContainer'
-    | 'pendingProjectId'
-    | 'pendingConnectionKey'
-    | 'pendingCatalogId'
-    | 'pendingSchemaId'
-    | 'setExtensions'
+      ConnectionSchemaManagerService,
+      | 'activeItem'
+      | 'changingProjectId'
+      | 'changingConnection'
+      | 'changingConnectionContainer'
+      | 'pendingProjectId'
+      | 'pendingConnectionKey'
+      | 'pendingCatalogId'
+      | 'pendingSchemaId'
+      | 'setExtensions'
     >(this, {
       currentObjectCatalog: computed,
       currentObjectSchema: computed,
@@ -326,7 +336,6 @@ export class ConnectionSchemaManagerService {
     }
 
     try {
-
       runInAction(() => {
         this.changingConnectionContainer = true;
         this.pendingCatalogId = catalogId;
@@ -399,7 +408,7 @@ export class ConnectionSchemaManagerService {
     try {
       await this.dbDriverResource.load(CachedMapAllKey);
     } catch (exception: any) {
-      this.notificationService.logException(exception, 'Can\'t load database drivers', '', true);
+      this.notificationService.logException(exception, "Can't load database drivers", '', true);
     }
 
     if (!connection.connected) {
@@ -409,27 +418,42 @@ export class ConnectionSchemaManagerService {
     try {
       await this.connectionsManagerService.loadObjectContainer(key, catalogId);
     } catch (exception: any) {
-      this.notificationService.logException(
-        exception,
-        `Can't load objectContainers for ${serializeConnectionParam(key)}@${catalogId}`,
-        '',
-        true
-      );
+      this.notificationService.logException(exception, `Can't load objectContainers for ${serializeConnectionParam(key)}@${catalogId}`, '', true);
     }
   }
 
   private setExtensions<T>(item: IActiveItem<T>, extensions: Array<IExtension<T>>) {
     ExtensionUtils.from(extensions)
-      .on(isObjectNavNodeProvider, extension => { item.getCurrentNavNode = extension; })
-      .on(isProjectSetterState, extension => { item.getProjectSetterState = extension; })
-      .on(isProjectProvider, extension => { item.getCurrentProjectId = extension; })
-      .on(isConnectionProvider, extension => { item.getCurrentConnectionId = extension; })
-      .on(isObjectCatalogProvider, extension => { item.getCurrentCatalogId = extension; })
-      .on(isObjectSchemaProvider, extension => { item.getCurrentSchemaId = extension; })
+      .on(isObjectNavNodeProvider, extension => {
+        item.getCurrentNavNode = extension;
+      })
+      .on(isProjectSetterState, extension => {
+        item.getProjectSetterState = extension;
+      })
+      .on(isProjectProvider, extension => {
+        item.getCurrentProjectId = extension;
+      })
+      .on(isConnectionProvider, extension => {
+        item.getCurrentConnectionId = extension;
+      })
+      .on(isObjectCatalogProvider, extension => {
+        item.getCurrentCatalogId = extension;
+      })
+      .on(isObjectSchemaProvider, extension => {
+        item.getCurrentSchemaId = extension;
+      })
 
-      .on(isProjectSetter, extension => { item.changeProjectId = extension; })
-      .on(isConnectionSetter, extension => { item.changeConnectionId = extension; })
-      .on(isObjectCatalogSetter, extension => { item.changeCatalogId = extension; })
-      .on(isObjectSchemaSetter, extension => { item.changeSchemaId = extension; });
+      .on(isProjectSetter, extension => {
+        item.changeProjectId = extension;
+      })
+      .on(isConnectionSetter, extension => {
+        item.changeConnectionId = extension;
+      })
+      .on(isObjectCatalogSetter, extension => {
+        item.changeCatalogId = extension;
+      })
+      .on(isObjectSchemaSetter, extension => {
+        item.changeSchemaId = extension;
+      });
   }
 }
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionIcon.tsx b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionIcon.tsx
index 51c9a22e55..97f9c78694 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionIcon.tsx
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/ConnectionIcon.tsx
@@ -5,12 +5,11 @@
  * 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, use } from 'reshadow';
 
 import { ConnectionImageWithMask, useResource, useStyles } from '@cloudbeaver/core-blocks';
-import { DBDriverResource, ConnectionInfoResource } from '@cloudbeaver/core-connections';
+import { ConnectionInfoResource, DBDriverResource } from '@cloudbeaver/core-connections';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -38,19 +37,10 @@ interface Props extends IConnectionSelectorExtraProps {
   className?: string;
 }
 
-export const ConnectionIcon: React.FC<Props> = observer(function ConnectionIcon({
-  connectionKey,
-  small = true,
-  style,
-  className,
-}) {
+export const ConnectionIcon: React.FC<Props> = observer(function ConnectionIcon({ connectionKey, small = true, style, className }) {
   const styles = useStyles(style, connectionIconStyle);
 
-  const connection = useResource(
-    ConnectionIcon,
-    ConnectionInfoResource,
-    connectionKey ?? null
-  );
+  const connection = useResource(ConnectionIcon, ConnectionInfoResource, connectionKey ?? null);
 
   const drivers = useResource(ConnectionIcon, DBDriverResource, CachedMapAllKey);
 
@@ -66,7 +56,14 @@ export const ConnectionIcon: React.FC<Props> = observer(function ConnectionIcon(
 
   return styled(styles)(
     <icon className={className}>
-      <ConnectionImageWithMask icon={driver.icon} connected={connection.data.connected} maskId="connection-icon" size={24} paddingSize={4} {...use({ small })} />
-    </icon>
+      <ConnectionImageWithMask
+        icon={driver.icon}
+        connected={connection.data.connected}
+        maskId="connection-icon"
+        size={24}
+        paddingSize={4}
+        {...use({ small })}
+      />
+    </icon>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/IConnectionSelectorExtraProps.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/IConnectionSelectorExtraProps.ts
index 1506ac802f..307694acb7 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/IConnectionSelectorExtraProps.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSelector/IConnectionSelectorExtraProps.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 
 export interface IConnectionSelectorExtraProps {
   connectionKey?: IConnectionInfoParams | null;
   small?: boolean;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_DATA_CONTAINER_SELECTOR.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_DATA_CONTAINER_SELECTOR.ts
index 00b4728984..e6275028c6 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_DATA_CONTAINER_SELECTOR.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_DATA_CONTAINER_SELECTOR.ts
@@ -5,7 +5,6 @@
  * 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_CONNECTION_DATA_CONTAINER_SELECTOR = createMenu('connection-data-container-selector', 'Connection data container selector');
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_SELECTOR.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_SELECTOR.ts
index 447bec007c..e7a6479ca5 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_SELECTOR.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/MENU_CONNECTION_SELECTOR.ts
@@ -5,7 +5,6 @@
  * 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_CONNECTION_SELECTOR = createMenu('connection-selector', 'Connection selector');
diff --git a/webapp/packages/plugin-datasource-context-switch/src/LocaleService.ts b/webapp/packages/plugin-datasource-context-switch/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/LocaleService.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-datasource-context-switch/src/PluginBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/PluginBootstrap.ts
index 58ab8b4d15..5cb98d6fdd 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/PluginBootstrap.ts
@@ -5,17 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
-
 @injectable()
 export class PluginBootstrap extends Bootstrap {
   constructor() {
     super();
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-datasource-context-switch/src/index.ts b/webapp/packages/plugin-datasource-context-switch/src/index.ts
index e82d8d4f6d..b013c543a9 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/index.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/index.ts
@@ -1,5 +1,6 @@
-export * from './ConnectionSchemaManager/ConnectionSchemaManagerBootstrap';
-export * from './ConnectionSchemaManager/ConnectionSchemaManagerService';
 import { datasourceContextSwitchPluginManifest } from './manifest';
 
+export * from './ConnectionSchemaManager/ConnectionSchemaManagerBootstrap';
+export * from './ConnectionSchemaManager/ConnectionSchemaManagerService';
+
 export default datasourceContextSwitchPluginManifest;
diff --git a/webapp/packages/plugin-datasource-context-switch/src/manifest.ts b/webapp/packages/plugin-datasource-context-switch/src/manifest.ts
index e6f14c5d4f..9ce76d9ff2 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/manifest.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionSchemaManagerBootstrap } from './ConnectionSchemaManager/ConnectionSchemaManagerBootstrap';
@@ -13,16 +12,10 @@ import { ConnectionSchemaManagerService } from './ConnectionSchemaManager/Connec
 import { LocaleService } from './LocaleService';
 import { PluginBootstrap } from './PluginBootstrap';
 
-
 export const datasourceContextSwitchPluginManifest: PluginManifest = {
   info: {
     name: 'Datasource context switch plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    ConnectionSchemaManagerService,
-    ConnectionSchemaManagerBootstrap,
-    LocaleService,
-  ],
+  providers: [PluginBootstrap, ConnectionSchemaManagerService, ConnectionSchemaManagerBootstrap, LocaleService],
 };
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_NODE.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_NODE.ts
index 5d1a1dcceb..c6e5724c41 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_NODE.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_NODE.ts
@@ -5,7 +5,6 @@
  * 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_DDL_VIEWER_NODE = createDataContext<string>('ddl-node');
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_VALUE.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_VALUE.ts
index 762c3104c9..b9fa3043e1 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_VALUE.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DATA_CONTEXT_DDL_VIEWER_VALUE.ts
@@ -5,7 +5,6 @@
  * 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_DDL_VIEWER_VALUE = createDataContext<string>('ddl-value');
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
index d875c3b3c1..ced80f0a16 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerFooterService.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { download, generateFileName } from '@cloudbeaver/core-utils';
-import { ActionService, ACTION_SAVE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
+import { ACTION_SAVE, ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { LocalStorageSqlDataSource } from '@cloudbeaver/plugin-sql-editor';
 import { ACTION_SQL_EDITOR_OPEN, SqlEditorNavigatorService } from '@cloudbeaver/plugin-sql-editor-navigation-tab';
 
@@ -25,8 +24,8 @@ export class DDLViewerFooterService {
     private readonly actionsService: ActionService,
     private readonly menuService: MenuService,
     private readonly sqlEditorNavigatorService: SqlEditorNavigatorService,
-    private readonly connectionInfoResource: ConnectionInfoResource
-  ) { }
+    private readonly connectionInfoResource: ConnectionInfoResource,
+  ) {}
 
   register(): void {
     this.actionsService.addHandler({
@@ -103,11 +102,7 @@ export class DDLViewerFooterService {
 
     this.menuService.addCreator({
       isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_DDL_VIEWER_FOOTER,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_SAVE,
-        ACTION_SQL_EDITOR_OPEN,
-      ],
+      getItems: (context, items) => [...items, ACTION_SAVE, ACTION_SQL_EDITOR_OPEN],
     });
   }
 }
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTab.tsx b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTab.tsx
index 0dd5c9fe3c..3a623fcc08 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTab.tsx
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTab.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,16 +14,13 @@ import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigati
 
 import { NAV_NODE_DDL_ID } from '../NAV_NODE_DDL_ID';
 
-export const DDLViewerTab: NavNodeTransformViewComponent = observer(function DDLViewerTab({
-  folderId,
-  style,
-}) {
+export const DDLViewerTab: NavNodeTransformViewComponent = observer(function DDLViewerTab({ folderId, style }) {
   const title = folderId.startsWith(NAV_NODE_DDL_ID) ? 'DDL' : 'Body';
 
   return styled(useStyles(style))(
     <Tab tabId={folderId} title={title}>
       <TabIcon icon="/icons/DDL.svg" />
       <TabTitle>{title}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTabPanel.tsx b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTabPanel.tsx
index 2ff66a6834..d483bc033e 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTabPanel.tsx
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DDLViewerTabPanel.tsx
@@ -5,13 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { useResource, useStyles } from '@cloudbeaver/core-blocks';
-import { ConnectionDialectResource, ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
-import { MenuBar, MENU_BAR_DEFAULT_STYLES } from '@cloudbeaver/core-ui';
+import {
+  ConnectionDialectResource,
+  ConnectionInfoActiveProjectKey,
+  ConnectionInfoResource,
+  createConnectionParam,
+} from '@cloudbeaver/core-connections';
+import { MENU_BAR_DEFAULT_STYLES, MenuBar } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigation-tree';
 import { SQLCodeEditorLoader, useSqlDialectExtension } from '@cloudbeaver/plugin-sql-editor-new';
@@ -39,12 +43,8 @@ export const DDLViewerTabPanel: NavNodeTransformViewComponent = observer(functio
 
   return styled(style)(
     <wrapper>
-      <SQLCodeEditorLoader
-        value={ddlResource.data ?? ''}
-        extensions={[sqlDialect]}
-        readonly
-      />
+      <SQLCodeEditorLoader value={ddlResource.data ?? ''} extensions={[sqlDialect]} readonly />
       <MenuBar menu={menu} style={MENU_BAR_DEFAULT_STYLES} />
-    </wrapper>
+    </wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlResource.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlResource.ts
index d9f5a08ff9..a4cb20baae 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlResource.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlResource.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
-import { CachedMapResource, ResourceKey, ResourceKeyUtils, isResourceAlias, GraphQLService } from '@cloudbeaver/core-sdk';
+import { CachedMapResource, GraphQLService, isResourceAlias, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class DdlResource extends CachedMapResource<string, string> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    private readonly navNodeInfoResource: NavNodeInfoResource,
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly navNodeInfoResource: NavNodeInfoResource) {
     super();
 
     this.navNodeInfoResource.outdateResource(this);
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/MENU_DDL_VIEWER_FOOTER.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/MENU_DDL_VIEWER_FOOTER.ts
index 1839e6ef9d..4a3100bd3b 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/MENU_DDL_VIEWER_FOOTER.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/MENU_DDL_VIEWER_FOOTER.ts
@@ -5,7 +5,6 @@
  * 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_DDL_VIEWER_FOOTER = createMenu('ddl-viewer-footer', 'DDL viewer footer menu');
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
index 5e54521125..3308dd09e3 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
@@ -5,9 +5,8 @@
  * 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 { NavNodeInfoResource, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
+import { EObjectFeature, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree';
 
 import { DDLViewerFooterService } from './DdlViewer/DDLViewerFooterService';
@@ -22,7 +21,7 @@ export class DdlViewerBootstrap extends Bootstrap {
   constructor(
     private readonly navNodeViewService: NavNodeViewService,
     private readonly navNodeInfoResource: NavNodeInfoResource,
-    private readonly ddlViewerFooterService: DDLViewerFooterService
+    private readonly ddlViewerFooterService: DDLViewerFooterService,
   ) {
     super();
   }
@@ -59,12 +58,12 @@ export class DdlViewerBootstrap extends Bootstrap {
           ids.push(NAV_NODE_EXTENDED_DDL_ID);
         }
 
-        return [...children || [], ...ids];
+        return [...(children || []), ...ids];
       },
     });
 
     this.ddlViewerFooterService.register();
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLResource.ts b/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLResource.ts
index 67b63af20b..aec7f9b57e 100644
--- a/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLResource.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLResource.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
-import { GraphQLService, CachedMapResource, ResourceKey, ResourceKeyUtils, isResourceAlias } from '@cloudbeaver/core-sdk';
+import { CachedMapResource, GraphQLService, isResourceAlias, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class ExtendedDDLResource extends CachedMapResource<string, string> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    private readonly navNodeInfoResource: NavNodeInfoResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly navNodeInfoResource: NavNodeInfoResource) {
     super();
 
     this.navNodeInfoResource.outdateResource(this);
diff --git a/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLViewerTabPanel.tsx b/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLViewerTabPanel.tsx
index 951966f8c6..191561d84c 100644
--- a/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLViewerTabPanel.tsx
+++ b/webapp/packages/plugin-ddl-viewer/src/ExtendedDDLViewer/ExtendedDDLViewerTabPanel.tsx
@@ -5,13 +5,17 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { useResource, useStyles } from '@cloudbeaver/core-blocks';
-import { ConnectionDialectResource, ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
-import { MenuBar, MENU_BAR_DEFAULT_STYLES } from '@cloudbeaver/core-ui';
+import {
+  ConnectionDialectResource,
+  ConnectionInfoActiveProjectKey,
+  ConnectionInfoResource,
+  createConnectionParam,
+} from '@cloudbeaver/core-connections';
+import { MENU_BAR_DEFAULT_STYLES, MenuBar } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigation-tree';
 import { SQLCodeEditorLoader, useSqlDialectExtension } from '@cloudbeaver/plugin-sql-editor-new';
@@ -22,19 +26,13 @@ import { MENU_DDL_VIEWER_FOOTER } from '../DdlViewer/MENU_DDL_VIEWER_FOOTER';
 import { TAB_PANEL_STYLES } from '../TAB_PANEL_STYLES';
 import { ExtendedDDLResource } from './ExtendedDDLResource';
 
-export const ExtendedDDLViewerTabPanel: NavNodeTransformViewComponent = observer(function ExtendedDDLViewerTabPanel({
-  nodeId, folderId,
-}) {
+export const ExtendedDDLViewerTabPanel: NavNodeTransformViewComponent = observer(function ExtendedDDLViewerTabPanel({ nodeId, folderId }) {
   const style = useStyles(TAB_PANEL_STYLES);
   const menu = useMenu({ menu: MENU_DDL_VIEWER_FOOTER });
 
   const extendedDDLResource = useResource(ExtendedDDLViewerTabPanel, ExtendedDDLResource, nodeId);
 
-  const connectionInfoResource = useResource(
-    ExtendedDDLViewerTabPanel,
-    ConnectionInfoResource,
-    ConnectionInfoActiveProjectKey
-  );
+  const connectionInfoResource = useResource(ExtendedDDLViewerTabPanel, ConnectionInfoResource, ConnectionInfoActiveProjectKey);
   const connection = connectionInfoResource.resource.getConnectionForNode(nodeId);
   const connectionParam = connection ? createConnectionParam(connection) : null;
   const connectionDialectResource = useResource(ExtendedDDLViewerTabPanel, ConnectionDialectResource, connectionParam);
@@ -45,12 +43,8 @@ export const ExtendedDDLViewerTabPanel: NavNodeTransformViewComponent = observer
 
   return styled(style)(
     <wrapper>
-      <SQLCodeEditorLoader
-        value={extendedDDLResource.data ?? ''}
-        extensions={[sqlDialect]}
-        readonly
-      />
+      <SQLCodeEditorLoader value={extendedDDLResource.data ?? ''} extensions={[sqlDialect]} readonly />
       <MenuBar menu={menu} style={MENU_BAR_DEFAULT_STYLES} />
-    </wrapper>
+    </wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_DDL_ID.ts b/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_DDL_ID.ts
index c3ac54b1d4..9aa910ef9c 100644
--- a/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_DDL_ID.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_DDL_ID.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_DDL_ID = 'object-viewer://ddl';
\ No newline at end of file
+export const NAV_NODE_DDL_ID = 'object-viewer://ddl';
diff --git a/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_EXTENDED_DDL_ID.ts b/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_EXTENDED_DDL_ID.ts
index d1ef7c23fa..911f01d731 100644
--- a/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_EXTENDED_DDL_ID.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/NAV_NODE_EXTENDED_DDL_ID.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const NAV_NODE_EXTENDED_DDL_ID = 'object-viewer://extended-ddl';
\ No newline at end of file
+export const NAV_NODE_EXTENDED_DDL_ID = 'object-viewer://extended-ddl';
diff --git a/webapp/packages/plugin-ddl-viewer/src/TAB_PANEL_STYLES.ts b/webapp/packages/plugin-ddl-viewer/src/TAB_PANEL_STYLES.ts
index 4d08641afb..c376211ae2 100644
--- a/webapp/packages/plugin-ddl-viewer/src/TAB_PANEL_STYLES.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/TAB_PANEL_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const TAB_PANEL_STYLES = css`
diff --git a/webapp/packages/plugin-ddl-viewer/src/manifest.ts b/webapp/packages/plugin-ddl-viewer/src/manifest.ts
index 1c63ed9fc7..9ed9f2be61 100644
--- a/webapp/packages/plugin-ddl-viewer/src/manifest.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DdlResource } from './DdlViewer/DdlResource';
@@ -18,10 +17,5 @@ export const manifest: PluginManifest = {
     name: 'DDL Viewer Plugin',
   },
 
-  providers: [
-    DdlViewerBootstrap,
-    DDLViewerFooterService,
-    ExtendedDDLResource,
-    DdlResource,
-  ],
+  providers: [DdlViewerBootstrap, DDLViewerFooterService, ExtendedDDLResource, DdlResource],
 };
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
index 4ce283230f..f85befec58 100644
--- a/webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/DATA_CONTEXT_MENU_SEARCH.ts
@@ -5,7 +5,6 @@
  * 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
index 1d2bf706ee..c16c751b71 100644
--- a/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItem.ts
@@ -5,7 +5,6 @@
  * 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';
 
@@ -18,4 +17,4 @@ export class SearchResourceMenuItem extends MenuCustomItem<IContextMenuItemProps
       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
index bf3af89f65..d2518955ad 100644
--- a/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx
+++ b/webapp/packages/plugin-devtools/src/ContextMenu/SearchResourceMenuItemComponent.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -37,12 +36,12 @@ export const SearchResourceMenuItemComponent: ICustomMenuItemComponent<IContextM
   return styled(useStyles(style, styles))(
     <search-box dir="ltr" className={className}>
       <input
-        name='search'
-        placeholder='Search for resource...'
+        name="search"
+        placeholder="Search for resource..."
         value={value}
         autoComplete="off"
         onChange={event => handleChange(event.target.value)}
       />
-    </search-box>
+    </search-box>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-devtools/src/DevToolsService.ts b/webapp/packages/plugin-devtools/src/DevToolsService.ts
index ca7b94ff97..9d0f33e5cf 100644
--- a/webapp/packages/plugin-devtools/src/DevToolsService.ts
+++ b/webapp/packages/plugin-devtools/src/DevToolsService.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -31,10 +30,7 @@ export class DevToolsService {
 
   private readonly settings: IDevToolsSettings;
 
-  constructor(
-    private readonly serverConfigResource: ServerConfigResource,
-    private readonly autoSaveService: LocalStorageSaveService,
-  ) {
+  constructor(private readonly serverConfigResource: ServerConfigResource, private readonly autoSaveService: LocalStorageSaveService) {
     this.settings = getDefaultDevToolsSettings();
 
     makeObservable<this, 'settings'>(this, {
@@ -68,4 +64,4 @@ function getDefaultDevToolsSettings(): IDevToolsSettings {
     enabled: false,
     distributed: false,
   };
-}
\ 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 0767c0f444..c0fd979d96 100644
--- a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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-authentication';
 import { App, Bootstrap, DIService, injectable, IServiceConstructor } from '@cloudbeaver/core-di';
 import { PermissionsService } from '@cloudbeaver/core-root';
@@ -35,7 +34,7 @@ export class PluginBootstrap extends Bootstrap {
     private readonly menuService: MenuService,
     private readonly actionService: ActionService,
     private readonly devToolsService: DevToolsService,
-    private readonly permissionsService: PermissionsService
+    private readonly permissionsService: PermissionsService,
   ) {
     super();
   }
@@ -48,13 +47,9 @@ export class PluginBootstrap extends Bootstrap {
         }
         return context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU;
       },
-      getItems: (context, items) => [
-        ACTION_DEVTOOLS,
-        ...items,
-      ],
+      getItems: (context, items) => [ACTION_DEVTOOLS, ...items],
     });
 
-
     // this.actionService.addHandler({
     //   id: 'devtools',
     //   isActionApplicable: (context, action) => [
@@ -87,10 +82,7 @@ export class PluginBootstrap extends Bootstrap {
         }
         return context.get(DATA_CONTEXT_MENU) === MENU_USER_PROFILE;
       },
-      getItems: (context, items) => [
-        MENU_DEVTOOLS,
-        ...items,
-      ],
+      getItems: (context, items) => [MENU_DEVTOOLS, ...items],
     });
 
     this.menuService.addCreator({
@@ -99,21 +91,13 @@ export class PluginBootstrap extends Bootstrap {
         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()))),
+            ...this.getResources(this.app.getServices().filter(service => service.name.toLocaleLowerCase().includes(search.toLocaleLowerCase()))),
           ];
         }
 
-        return [
-          new SearchResourceMenuItem(),
-          ACTION_DEVTOOLS_MODE_DISTRIBUTED,
-          MENU_PLUGINS,
-          ...items,
-        ];
+        return [new SearchResourceMenuItem(), ACTION_DEVTOOLS_MODE_DISTRIBUTED, MENU_PLUGINS, ...items];
       },
     });
 
@@ -150,17 +134,11 @@ export class PluginBootstrap extends Bootstrap {
 
         return false;
       },
-      getItems: (_, items) => [
-        MENU_RESOURCES,
-        ...items,
-      ],
+      getItems: (_, items) => [MENU_RESOURCES, ...items],
     });
 
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === MENU_RESOURCES
-        && context.has(DATA_CONTEXT_SUBMENU_ITEM)
-      ),
+      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);
 
@@ -168,26 +146,19 @@ export class PluginBootstrap extends Bootstrap {
           return items;
         }
 
-        const plugin = this.app
-          .getPlugins()
-          .find(plugin => plugin.info.name === item.id);
+        const plugin = this.app.getPlugins().find(plugin => plugin.info.name === item.id);
 
         if (!plugin) {
           return items;
         }
 
-        return [
-          ...this.getResources(plugin.providers),
-          ...items,
-        ];
+        return [...this.getResources(plugin.providers), ...items];
       },
     });
 
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === MENU_RESOURCE
-        && context.get(DATA_CONTEXT_SUBMENU_ITEM) instanceof ResourceSubMenuItem
-      ),
+      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;
 
@@ -200,13 +171,10 @@ export class PluginBootstrap extends Bootstrap {
             },
             {
               onSelect: () => {
-                const instance = this.diService.serviceInjector
-                  .getServiceByClass<CachedResource<any, any, any, any, any>>(
-                  item.resource
-                );
+                const instance = this.diService.serviceInjector.getServiceByClass<CachedResource<any, any, any, any, any>>(item.resource);
                 instance.markOutdated(undefined);
               },
-            }
+            },
           ),
           ...items,
         ];
@@ -214,8 +182,7 @@ export class PluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> {
-  }
+  load(): void | Promise<void> {}
 
   private getResources(providers: IServiceConstructor<any>[]): ResourceSubMenuItem[] {
     return providers
@@ -223,4 +190,4 @@ export class PluginBootstrap extends Bootstrap {
       .sort((a, b) => a.name.localeCompare(b.name))
       .map(resource => new ResourceSubMenuItem(resource));
   }
-}
\ 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
index 63a724b219..59ed47c79a 100644
--- a/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts
+++ b/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS.ts
@@ -5,11 +5,10 @@
  * 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/actions/ACTION_DEVTOOLS_MODE_DISTRIBUTED.ts b/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS_MODE_DISTRIBUTED.ts
index ddd4317c8c..d8083d44e7 100644
--- a/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS_MODE_DISTRIBUTED.ts
+++ b/webapp/packages/plugin-devtools/src/actions/ACTION_DEVTOOLS_MODE_DISTRIBUTED.ts
@@ -5,11 +5,10 @@
  * 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_MODE_DISTRIBUTED = createAction('devtools-mode-distributed', {
   type: 'checkbox',
   label: 'Distributed mode',
   tooltip: 'Enable distributed mode',
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-devtools/src/index.ts b/webapp/packages/plugin-devtools/src/index.ts
index 6326667c9f..fd325378da 100644
--- a/webapp/packages/plugin-devtools/src/index.ts
+++ b/webapp/packages/plugin-devtools/src/index.ts
@@ -3,4 +3,4 @@ import { devToolsPlugin } from './manifest';
 export { devToolsPlugin };
 export default devToolsPlugin;
 
-export * from './DevToolsService';
\ No newline at end of file
+export * from './DevToolsService';
diff --git a/webapp/packages/plugin-devtools/src/manifest.ts b/webapp/packages/plugin-devtools/src/manifest.ts
index 29733b2da1..8c8f433ec1 100644
--- a/webapp/packages/plugin-devtools/src/manifest.ts
+++ b/webapp/packages/plugin-devtools/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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';
@@ -15,8 +14,5 @@ export const devToolsPlugin: PluginManifest = {
   info: {
     name: 'DevTools plugin',
   },
-  providers: [
-    PluginBootstrap,
-    DevToolsService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, DevToolsService],
+};
diff --git a/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts b/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
index 9a30d3c18a..d933a40386 100644
--- a/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_DEVTOOLS.ts
@@ -5,10 +5,6 @@
  * 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'
-);
+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
index 8e97d766d1..9014e075ca 100644
--- a/webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGIN.ts
@@ -5,10 +5,6 @@
  * 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'
-);
+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
index 5799b2ed94..ed63a4c876 100644
--- a/webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_PLUGINS.ts
@@ -5,10 +5,6 @@
  * 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'
-);
+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
index 368ad30a43..4a95db6cde 100644
--- a/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCE.ts
@@ -5,12 +5,6 @@
  * 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'
-);
+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
index 864540dbcf..5dba7c317d 100644
--- a/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts
+++ b/webapp/packages/plugin-devtools/src/menu/MENU_RESOURCES.ts
@@ -5,12 +5,6 @@
  * 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'
-);
+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
index c9c391e096..5027ff9bb7 100644
--- a/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts
+++ b/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts
@@ -5,7 +5,6 @@
  * 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';
 
@@ -23,4 +22,4 @@ export class PluginSubMenuItem extends MenuSubMenuItem {
       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
index c71fdf4f17..44f7b6482a 100644
--- a/webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts
+++ b/webapp/packages/plugin-devtools/src/menu/ResourceSubMenuItem.ts
@@ -5,7 +5,6 @@
  * 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';
 
@@ -23,4 +22,4 @@ export class ResourceSubMenuItem extends MenuSubMenuItem {
       id: resource.name,
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-gis-viewer/src/CrsInput.tsx b/webapp/packages/plugin-gis-viewer/src/CrsInput.tsx
index d3e4836764..9ea822cff5 100644
--- a/webapp/packages/plugin-gis-viewer/src/CrsInput.tsx
+++ b/webapp/packages/plugin-gis-viewer/src/CrsInput.tsx
@@ -28,23 +28,13 @@ interface Props {
   onChange: (value: CrsKey) => void;
 }
 
-const items: CrsKey[] = [
-  'Simple',
-  'EPSG3395',
-  'EPSG3857',
-  'EPSG4326',
-  'EPSG900913',
-];
+const items: CrsKey[] = ['Simple', 'EPSG3395', 'EPSG3857', 'EPSG4326', 'EPSG900913'];
 
 export function CrsInput(props: Props) {
   return styled(styles)(
     <root>
       <label>CRS:</label>
-      <Combobox
-        items={items}
-        value={props.value}
-        onSelect={props.onChange}
-      />
-    </root>
+      <Combobox items={items} value={props.value} onSelect={props.onChange} />
+    </root>,
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-gis-viewer/src/GISValuePresentation.tsx b/webapp/packages/plugin-gis-viewer/src/GISValuePresentation.tsx
index 9d70a408be..fb9528ff4b 100644
--- a/webapp/packages/plugin-gis-viewer/src/GISValuePresentation.tsx
+++ b/webapp/packages/plugin-gis-viewer/src/GISValuePresentation.tsx
@@ -11,10 +11,17 @@ import styled, { css } from 'reshadow';
 import wellknown from 'wellknown';
 
 import { TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks';
-import { IDatabaseResultSet, ResultSetSelectAction, IResultSetElementKey, IDatabaseDataModel, ResultSetViewAction, ResultSetDataKeysUtils } from '@cloudbeaver/plugin-data-viewer';
+import {
+  IDatabaseDataModel,
+  IDatabaseResultSet,
+  IResultSetElementKey,
+  ResultSetDataKeysUtils,
+  ResultSetSelectAction,
+  ResultSetViewAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import { CrsInput } from './CrsInput';
-import { IGeoJSONFeature, IAssociatedValue, LeafletMap, CrsKey } from './LeafletMap';
+import { CrsKey, IAssociatedValue, IGeoJSONFeature, LeafletMap } from './LeafletMap';
 import { ResultSetGISAction } from './ResultSetGISAction';
 
 function getCrsKey(feature?: IGeoJSONFeature): CrsKey {
@@ -56,10 +63,7 @@ interface Props {
   resultIndex: number;
 }
 
-export const GISValuePresentation = observer<Props>(function GISValuePresentation({
-  model,
-  resultIndex,
-}) {
+export const GISValuePresentation = observer<Props>(function GISValuePresentation({ model, resultIndex }) {
   const translate = useTranslate();
 
   const selection = model.source.getAction(resultIndex, ResultSetSelectAction);
@@ -99,28 +103,30 @@ export const GISValuePresentation = observer<Props>(function GISValuePresentatio
     return result;
   }, [selectedCells, gis]);
 
-  const getAssociatedValues = useCallback((cell: IResultSetElementKey): IAssociatedValue[] => {
-    const values: IAssociatedValue[] = [];
+  const getAssociatedValues = useCallback(
+    (cell: IResultSetElementKey): IAssociatedValue[] => {
+      const values: IAssociatedValue[] = [];
 
-    for (const column of view.columnKeys) {
-      if (ResultSetDataKeysUtils.isEqual(column, cell.column)) {
-        continue;
+      for (const column of view.columnKeys) {
+        if (ResultSetDataKeysUtils.isEqual(column, cell.column)) {
+          continue;
+        }
+
+        const value = view.getCellValue({ ...cell, column });
+        const columnInfo = view.getColumn(column);
+
+        if (value && columnInfo?.name) {
+          values.push({
+            key: columnInfo.name,
+            value,
+          });
+        }
       }
 
-      const value = view.getCellValue({ ...cell, column });
-      const columnInfo = view.getColumn(column);
-
-      if (value && columnInfo?.name) {
-        values.push({
-          key: columnInfo.name,
-          value,
-        });
-      }
-    }
-
-    return values;
-  }, [view]);
-
+      return values;
+    },
+    [view],
+  );
 
   const defaultCrsKey = getCrsKey(parsedGISData[0]);
   const [crsKey, setCrsKey] = useState(defaultCrsKey);
@@ -135,11 +141,8 @@ export const GISValuePresentation = observer<Props>(function GISValuePresentatio
         <LeafletMap key={crsKey} geoJSON={parsedGISData} crsKey={crsKey} getAssociatedValues={getAssociatedValues} />
       </map>
       <toolbar>
-        <CrsInput
-          value={crsKey}
-          onChange={setCrsKey}
-        />
+        <CrsInput value={crsKey} onChange={setCrsKey} />
       </toolbar>
-    </root>
+    </root>,
   );
 });
diff --git a/webapp/packages/plugin-gis-viewer/src/GISViewer.tsx b/webapp/packages/plugin-gis-viewer/src/GISViewer.tsx
index 243627080c..31c4e9f3f3 100644
--- a/webapp/packages/plugin-gis-viewer/src/GISViewer.tsx
+++ b/webapp/packages/plugin-gis-viewer/src/GISViewer.tsx
@@ -5,14 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
-import type { IDataValuePanelProps, IDatabaseResultSet } from '@cloudbeaver/plugin-data-viewer';
+import type { IDatabaseResultSet, IDataValuePanelProps } from '@cloudbeaver/plugin-data-viewer';
 
 import { GISValuePresentation } from './GISValuePresentation';
 
 export const GISViewer: TabContainerPanelComponent<IDataValuePanelProps<any, IDatabaseResultSet>> = function GISViewer({ model, resultIndex }) {
-  return (
-    <GISValuePresentation model={model} resultIndex={resultIndex} />
-  );
+  return <GISValuePresentation model={model} resultIndex={resultIndex} />;
 };
diff --git a/webapp/packages/plugin-gis-viewer/src/GISViewerBootstrap.ts b/webapp/packages/plugin-gis-viewer/src/GISViewerBootstrap.ts
index 4af0c3e4f7..f67bdf60d2 100644
--- a/webapp/packages/plugin-gis-viewer/src/GISViewerBootstrap.ts
+++ b/webapp/packages/plugin-gis-viewer/src/GISViewerBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { lazy } from 'react';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -55,5 +54,5 @@ export class GISViewerBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-gis-viewer/src/IDatabaseDataGISAction.ts b/webapp/packages/plugin-gis-viewer/src/IDatabaseDataGISAction.ts
index 83261f5c8f..a7cd711f43 100644
--- a/webapp/packages/plugin-gis-viewer/src/IDatabaseDataGISAction.ts
+++ b/webapp/packages/plugin-gis-viewer/src/IDatabaseDataGISAction.ts
@@ -5,13 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import type { IDatabaseDataResult, IDatabaseDataAction, IResultSetElementKey } from '@cloudbeaver/plugin-data-viewer';
+import type { IDatabaseDataAction, IDatabaseDataResult, IResultSetElementKey } from '@cloudbeaver/plugin-data-viewer';
 
 import type { IGISType } from './ResultSetGISAction';
 
-export interface IDatabaseDataGISAction<TKey, TResult extends IDatabaseDataResult>
-  extends IDatabaseDataAction<any, TResult> {
+export interface IDatabaseDataGISAction<TKey, TResult extends IDatabaseDataResult> extends IDatabaseDataAction<any, TResult> {
   getGISDataFor: (selectedCells: IResultSetElementKey[]) => IResultSetElementKey[];
   getCellValue: (cell: IResultSetElementKey) => IGISType | undefined;
   isGISFormat: (cell: IResultSetElementKey) => boolean;
diff --git a/webapp/packages/plugin-gis-viewer/src/LeafletMap.tsx b/webapp/packages/plugin-gis-viewer/src/LeafletMap.tsx
index 2286ed3fe4..38fd93e9c9 100644
--- a/webapp/packages/plugin-gis-viewer/src/LeafletMap.tsx
+++ b/webapp/packages/plugin-gis-viewer/src/LeafletMap.tsx
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="./react-leaflet.d.ts" />
-
 import type geojson from 'geojson';
 import leaflet from 'leaflet';
 import { useCallback, useEffect, useState } from 'react';
-import { MapContainer, GeoJSON, LayersControl, TileLayer } from 'react-leaflet';
+import { GeoJSON, LayersControl, MapContainer, TileLayer } from 'react-leaflet';
 import type { TileLayerProps } from 'react-leaflet';
 import styled, { css } from 'reshadow';
 
@@ -60,9 +58,10 @@ const baseTiles: Record<'street' | 'topography', IBaseTile> = {
   },
   topography: {
     name: 'gis_presentation_base_tile_topography_name',
-    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>,'
-    + ' &copy; <a href="http://viewfinderpanoramas.org" target="_blank">SRTM</a>,'
-    + ' &copy; <a href="https://opentopomap.org" target="_blank">OpenTopoMap</a>',
+    attribution:
+      '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>,' +
+      ' &copy; <a href="http://viewfinderpanoramas.org" target="_blank">SRTM</a>,' +
+      ' &copy; <a href="https://opentopomap.org" target="_blank">OpenTopoMap</a>',
     url: 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
     maxZoom: 17,
   },
@@ -122,25 +121,28 @@ export const LeafletMap: React.FC<Props> = function LeafletMap({ geoJSON, crsKey
 
   const crs = getCRS(crsKey);
 
-  const onEachFeature = useCallback((feature: IGeoJSONFeature, layer: leaflet.Layer) => {
-    const associatedValues = getAssociatedValues(feature.properties.associatedCell);
-    if (associatedValues.length > 0) {
-      let popupContent = '';
+  const onEachFeature = useCallback(
+    (feature: IGeoJSONFeature, layer: leaflet.Layer) => {
+      const associatedValues = getAssociatedValues(feature.properties.associatedCell);
+      if (associatedValues.length > 0) {
+        let popupContent = '';
 
-      popupContent += '<table>';
-      for (let i = 0; i < associatedValues.length; i++) {
-        const { key, value } = associatedValues[i];
+        popupContent += '<table>';
+        for (let i = 0; i < associatedValues.length; i++) {
+          const { key, value } = associatedValues[i];
 
-        if (value === undefined || typeof value === 'object') {
-          continue;
+          if (value === undefined || typeof value === 'object') {
+            continue;
+          }
+
+          popupContent += '<tr><td>' + key + '</td><td>' + value + '</td></tr>';
         }
-
-        popupContent += '<tr><td>' + key + '</td><td>' + value + '</td></tr>';
+        popupContent += '</table>';
+        layer.bindPopup(popupContent, popupOption);
       }
-      popupContent += '</table>';
-      layer.bindPopup(popupContent, popupOption);
-    }
-  }, [getAssociatedValues]);
+    },
+    [getAssociatedValues],
+  );
 
   useEffect(() => {
     if (geoJSONLayerRef && mapRef) {
@@ -182,7 +184,10 @@ export const LeafletMap: React.FC<Props> = function LeafletMap({ geoJSON, crsKey
     }
   }, [split.state.isResizing, split.state.mode, crs, mapRef]);
 
-  return styled(styles, baseStyles)(
+  return styled(
+    styles,
+    baseStyles,
+  )(
     <MapContainer ref={setMapRef} crs={crs} zoom={12}>
       <GeoJSON
         // data is not optional property, see react-leaflet.d.ts
@@ -194,10 +199,7 @@ export const LeafletMap: React.FC<Props> = function LeafletMap({ geoJSON, crsKey
       />
       {crs !== leaflet.CRS.Simple && (
         <LayersControl>
-          <LayersControl.BaseLayer
-            name={translate(baseTiles.street.name)}
-            checked={baseTiles.street.checked}
-          >
+          <LayersControl.BaseLayer name={translate(baseTiles.street.name)} checked={baseTiles.street.checked}>
             <TileLayer
               attribution={baseTiles.street.attribution}
               url={baseTiles.street.url}
@@ -205,10 +207,7 @@ export const LeafletMap: React.FC<Props> = function LeafletMap({ geoJSON, crsKey
               id={baseTiles.street.id}
             />
           </LayersControl.BaseLayer>
-          <LayersControl.BaseLayer
-            name={translate(baseTiles.topography.name)}
-            checked={baseTiles.topography.checked}
-          >
+          <LayersControl.BaseLayer name={translate(baseTiles.topography.name)} checked={baseTiles.topography.checked}>
             <TileLayer
               attribution={baseTiles.topography.attribution}
               url={baseTiles.topography.url}
@@ -218,6 +217,6 @@ export const LeafletMap: React.FC<Props> = function LeafletMap({ geoJSON, crsKey
           </LayersControl.BaseLayer>
         </LayersControl>
       )}
-    </MapContainer>
+    </MapContainer>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-gis-viewer/src/LocaleService.ts b/webapp/packages/plugin-gis-viewer/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-gis-viewer/src/LocaleService.ts
+++ b/webapp/packages/plugin-gis-viewer/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-gis-viewer/src/ResultSetGISAction.ts b/webapp/packages/plugin-gis-viewer/src/ResultSetGISAction.ts
index 71b9f700a0..2618ae2a5b 100644
--- a/webapp/packages/plugin-gis-viewer/src/ResultSetGISAction.ts
+++ b/webapp/packages/plugin-gis-viewer/src/ResultSetGISAction.ts
@@ -5,9 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ResultDataFormat } from '@cloudbeaver/core-sdk';
-import { databaseDataAction, IResultSetElementKey, type IDatabaseResultSet, DatabaseDataAction, type IDatabaseDataSource, ResultSetViewAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  databaseDataAction,
+  DatabaseDataAction,
+  type IDatabaseDataSource,
+  type IDatabaseResultSet,
+  IResultSetElementKey,
+  ResultSetViewAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 import type { IDatabaseDataGISAction } from './IDatabaseDataGISAction';
 
@@ -19,8 +25,10 @@ export interface IGISType {
   properties: Record<string, any> | null;
 }
 @databaseDataAction()
-export class ResultSetGISAction extends DatabaseDataAction<any, IDatabaseResultSet>
-  implements IDatabaseDataGISAction<IResultSetElementKey, IDatabaseResultSet> {
+export class ResultSetGISAction
+  extends DatabaseDataAction<any, IDatabaseResultSet>
+  implements IDatabaseDataGISAction<IResultSetElementKey, IDatabaseResultSet>
+{
   private readonly GISValueType = 'geometry';
 
   static dataFormat = [ResultDataFormat.Resultset];
@@ -35,11 +43,7 @@ export class ResultSetGISAction extends DatabaseDataAction<any, IDatabaseResultS
   isGISFormat(cell: IResultSetElementKey): boolean {
     const value = this.view.getCellValue(cell);
 
-    if (
-      value !== null
-      && typeof value === 'object'
-      && '$type' in value
-    ) {
+    if (value !== null && typeof value === 'object' && '$type' in value) {
       return value.$type === this.GISValueType;
     }
 
diff --git a/webapp/packages/plugin-gis-viewer/src/locales/zh.ts b/webapp/packages/plugin-gis-viewer/src/locales/zh.ts
index c80aabb8ee..baa1f3c7cf 100644
--- a/webapp/packages/plugin-gis-viewer/src/locales/zh.ts
+++ b/webapp/packages/plugin-gis-viewer/src/locales/zh.ts
@@ -1,6 +1,6 @@
 export default [
-    ['gis_presentation_title', '地图'],
-    ['gis_presentation_placeholder', '无可用数据'],
-    ['gis_presentation_base_tile_street_name', '街道'],
-    ['gis_presentation_base_tile_topography_name', '地形'],
-  ];
+  ['gis_presentation_title', '地图'],
+  ['gis_presentation_placeholder', '无可用数据'],
+  ['gis_presentation_base_tile_street_name', '街道'],
+  ['gis_presentation_base_tile_topography_name', '地形'],
+];
diff --git a/webapp/packages/plugin-gis-viewer/src/manifest.ts b/webapp/packages/plugin-gis-viewer/src/manifest.ts
index a0a8113b5b..7346bbfbce 100644
--- a/webapp/packages/plugin-gis-viewer/src/manifest.ts
+++ b/webapp/packages/plugin-gis-viewer/src/manifest.ts
@@ -7,8 +7,5 @@ export const manifest: PluginManifest = {
   info: {
     name: 'GIS Viewer plugin',
   },
-  providers: [
-    GISViewerBootstrap,
-    LocaleService,
-  ],
+  providers: [GISViewerBootstrap, LocaleService],
 };
diff --git a/webapp/packages/plugin-help/src/LocaleService.ts b/webapp/packages/plugin-help/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-help/src/LocaleService.ts
+++ b/webapp/packages/plugin-help/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-help/src/PluginBootstrap.ts b/webapp/packages/plugin-help/src/PluginBootstrap.ts
index 6f1ebdfcee..3aaa838b30 100644
--- a/webapp/packages/plugin-help/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-help/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppScreenService } from '@cloudbeaver/core-app';
 import { ActionSnackbar } from '@cloudbeaver/core-blocks';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -34,7 +33,7 @@ export class PluginBootstrap extends Bootstrap {
     this.errorNotification = null;
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   register(): void {
     this.addTopAppMenuItems();
@@ -46,24 +45,25 @@ export class PluginBootstrap extends Bootstrap {
       if (this.errorNotification) {
         return;
       }
-      if (
-        this.screenService.isActive(AppScreenService.screenName)
-        && this.localStorageSaveService.storage === 'session'
-      ) {
-        this.errorNotification = this.notificationService.customNotification(() => ActionSnackbar, {
-          actionText: 'plugin_help_multi_tab_support_load_settings',
-          onAction: () => {
-            this.localStorageSaveService.updateStorage('local');
-            this.errorNotification?.close(false);
+      if (this.screenService.isActive(AppScreenService.screenName) && this.localStorageSaveService.storage === 'session') {
+        this.errorNotification = this.notificationService.customNotification(
+          () => ActionSnackbar,
+          {
+            actionText: 'plugin_help_multi_tab_support_load_settings',
+            onAction: () => {
+              this.localStorageSaveService.updateStorage('local');
+              this.errorNotification?.close(false);
+            },
           },
-        }, {
-          type: ENotificationType.Error,
-          title: 'plugin_help_multi_tab_support_title',
-          message: 'plugin_help_multi_tab_support_description',
-          onClose: () => {
-            this.errorNotification = null;
+          {
+            type: ENotificationType.Error,
+            title: 'plugin_help_multi_tab_support_title',
+            message: 'plugin_help_multi_tab_support_description',
+            onClose: () => {
+              this.errorNotification = null;
+            },
           },
-        });
+        );
       }
     };
     this.localStorageSaveService.onStorageChange.addHandler(displayErrorMessage);
@@ -74,10 +74,7 @@ export class PluginBootstrap extends Bootstrap {
   private addTopAppMenuItems() {
     this.menuService.addCreator({
       menus: [MENU_APP_STATE],
-      getItems: (context, items) => [
-        ...items,
-        ACTION_APP_HELP,
-      ],
+      getItems: (context, items) => [...items, ACTION_APP_HELP],
       orderItems: (context, items) => {
         const extracted = menuExtractItems(items, [ACTION_APP_HELP]);
 
@@ -89,9 +86,7 @@ export class PluginBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'app-help',
-      isActionApplicable: (context, action) => [
-        ACTION_APP_HELP,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_APP_HELP].includes(action),
       handler: async (context, action) => {
         switch (action) {
           case ACTION_APP_HELP: {
diff --git a/webapp/packages/plugin-help/src/Shortcuts/IShortcut.ts b/webapp/packages/plugin-help/src/Shortcuts/IShortcut.ts
index 9a9d1b9033..64d2f4b2b2 100644
--- a/webapp/packages/plugin-help/src/Shortcuts/IShortcut.ts
+++ b/webapp/packages/plugin-help/src/Shortcuts/IShortcut.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { TLocalizationToken } from '@cloudbeaver/core-localization';
 
 export interface IShortcut {
   label: TLocalizationToken;
   code: string[];
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-help/src/Shortcuts/SHORTCUTS_DATA.ts b/webapp/packages/plugin-help/src/Shortcuts/SHORTCUTS_DATA.ts
index bd04ff8741..495b601fa2 100644
--- a/webapp/packages/plugin-help/src/Shortcuts/SHORTCUTS_DATA.ts
+++ b/webapp/packages/plugin-help/src/Shortcuts/SHORTCUTS_DATA.ts
@@ -5,10 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { KEY_BINDING_OPEN_IN_TAB, KEY_BINDING_REDO, KEY_BINDING_UNDO } from '@cloudbeaver/core-view';
-import { KEY_BINDING_ENABLE_FILTER, KEY_BINDING_COLLAPSE_ALL, KEY_BINDING_LINK_OBJECT } from '@cloudbeaver/plugin-navigation-tree';
-import { KEY_BINDING_SQL_EDITOR_EXECUTE, KEY_BINDING_SQL_EDITOR_EXECUTE_NEW, KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT, KEY_BINDING_SQL_EDITOR_FORMAT, KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN } from '@cloudbeaver/plugin-sql-editor';
+import { KEY_BINDING_COLLAPSE_ALL, KEY_BINDING_ENABLE_FILTER, KEY_BINDING_LINK_OBJECT } from '@cloudbeaver/plugin-navigation-tree';
+import {
+  KEY_BINDING_SQL_EDITOR_EXECUTE,
+  KEY_BINDING_SQL_EDITOR_EXECUTE_NEW,
+  KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT,
+  KEY_BINDING_SQL_EDITOR_FORMAT,
+  KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN,
+} from '@cloudbeaver/plugin-sql-editor';
 
 import type { IShortcut } from './IShortcut';
 
@@ -98,5 +103,5 @@ function transformKeys(keys: string | string[]): string[] {
     keys = [keys];
   }
 
-  return keys.map(key => key.toLocaleUpperCase().replace(/\+/ig, ' + '));
-}
\ No newline at end of file
+  return keys.map(key => key.toLocaleUpperCase().replace(/\+/gi, ' + '));
+}
diff --git a/webapp/packages/plugin-help/src/Shortcuts/Shortcut.tsx b/webapp/packages/plugin-help/src/Shortcuts/Shortcut.tsx
index d97b41a8ed..3ef3a7691d 100644
--- a/webapp/packages/plugin-help/src/Shortcuts/Shortcut.tsx
+++ b/webapp/packages/plugin-help/src/Shortcuts/Shortcut.tsx
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 import type { IShortcut } from './IShortcut';
 
@@ -17,31 +16,31 @@ interface Props {
 }
 
 const style = css`
-    shortcut-container {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-    }
-    shortcut-label {
-      margin-right: 8px;
-    }
-    shortcut-content {
-      display: flex;
-      align-items: center;
-      gap: 4px;
-    }
-    shortcut-code {
-      composes: theme-form-element-radius theme-background-secondary theme-text-on-secondary from global;
-      flex-shrink: 0;
-      font-family: monospace;
-      font-weight: bold;
-      width: max-content;
-      padding: 4px 8px;
-    }
-    span {
-      white-space: nowrap;
-      text-transform: lowercase;
-    }
+  shortcut-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  shortcut-label {
+    margin-right: 8px;
+  }
+  shortcut-content {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+  }
+  shortcut-code {
+    composes: theme-form-element-radius theme-background-secondary theme-text-on-secondary from global;
+    flex-shrink: 0;
+    font-family: monospace;
+    font-weight: bold;
+    width: max-content;
+    padding: 4px 8px;
+  }
+  span {
+    white-space: nowrap;
+    text-transform: lowercase;
+  }
 `;
 
 export const Shortcut: React.FC<Props> = function Shortcut({ shortcut }) {
@@ -49,19 +48,15 @@ export const Shortcut: React.FC<Props> = function Shortcut({ shortcut }) {
 
   return styled(style)(
     <shortcut-container>
-      <shortcut-label>
-        {translate(shortcut.label)}
-      </shortcut-label>
+      <shortcut-label>{translate(shortcut.label)}</shortcut-label>
       <shortcut-content>
         {shortcut.code.map((code, index) => (
           <>
             {index > 0 && <span>{translate('ui_or')}</span>}
-            <shortcut-code>
-              {code}
-            </shortcut-code>
+            <shortcut-code>{code}</shortcut-code>
           </>
         ))}
       </shortcut-content>
-    </shortcut-container>
+    </shortcut-container>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx
index 7dfb8cb040..1693d080b3 100644
--- a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx
+++ b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { BASE_CONTAINERS_STYLES, Button, Container, Group, GroupTitle, Link, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
@@ -14,7 +13,6 @@ import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogW
 import { Shortcut } from './Shortcut';
 import { DATA_VIEWER_SHORTCUTS, NAVIGATION_TREE_SHORTCUTS, SQL_EDITOR_SHORTCUTS } from './SHORTCUTS_DATA';
 
-
 const style = css`
   Button {
     margin-left: auto;
@@ -26,7 +24,8 @@ const style = css`
   Group {
     gap: 16px;
   }
-  GroupTitle, Group {
+  GroupTitle,
+  Group {
     padding: 0 !important;
   }
   GroupTitle {
@@ -34,51 +33,52 @@ const style = css`
   }
 `;
 
-export const ShortcutsDialog: DialogComponent<null> = function ShortcutsDialog({
-  rejectDialog,
-}) {
+export const ShortcutsDialog: DialogComponent<null> = function ShortcutsDialog({ rejectDialog }) {
   const translate = useTranslate();
   const styles = useStyles(BASE_CONTAINERS_STYLES, style);
 
   return styled(styles)(
-    <CommonDialogWrapper size='large'>
-      <CommonDialogHeader
-        title={translate('shortcuts_title')}
-        onReject={rejectDialog}
-      />
+    <CommonDialogWrapper size="large">
+      <CommonDialogHeader title={translate('shortcuts_title')} onReject={rejectDialog} />
       <CommonDialogBody>
         <Container wrap overflow>
           <Group overflow>
             <GroupTitle>
-              <Link href='https://dbeaver.com/docs/cloudbeaver/Data-editor/' target='_blank' wrapper indicator>
-              Data Viewer
+              <Link href="https://dbeaver.com/docs/cloudbeaver/Data-editor/" target="_blank" wrapper indicator>
+                Data Viewer
               </Link>
             </GroupTitle>
-            {DATA_VIEWER_SHORTCUTS.map(shortcut => <Shortcut key={shortcut.label} shortcut={shortcut} />)}
+            {DATA_VIEWER_SHORTCUTS.map(shortcut => (
+              <Shortcut key={shortcut.label} shortcut={shortcut} />
+            ))}
           </Group>
           <Group overflow>
             <GroupTitle>
-              <Link href='https://dbeaver.com/docs/cloudbeaver/SQL-Editor/' target='_blank' wrapper indicator>
-              SQL Editor
+              <Link href="https://dbeaver.com/docs/cloudbeaver/SQL-Editor/" target="_blank" wrapper indicator>
+                SQL Editor
               </Link>
             </GroupTitle>
-            {SQL_EDITOR_SHORTCUTS.map(shortcut => <Shortcut key={shortcut.label} shortcut={shortcut} />)}
+            {SQL_EDITOR_SHORTCUTS.map(shortcut => (
+              <Shortcut key={shortcut.label} shortcut={shortcut} />
+            ))}
           </Group>
           <Group overflow>
             <GroupTitle>
-              <Link href='https://dbeaver.com/docs/cloudbeaver/Database-Navigator/' target='_blank' wrapper indicator>
-              Navigation Tree
+              <Link href="https://dbeaver.com/docs/cloudbeaver/Database-Navigator/" target="_blank" wrapper indicator>
+                Navigation Tree
               </Link>
             </GroupTitle>
-            {NAVIGATION_TREE_SHORTCUTS.map(shortcut => <Shortcut key={shortcut.label} shortcut={shortcut} />)}
+            {NAVIGATION_TREE_SHORTCUTS.map(shortcut => (
+              <Shortcut key={shortcut.label} shortcut={shortcut} />
+            ))}
           </Group>
         </Container>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button type='button' mod={['outlined']} onClick={rejectDialog}>
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
           {translate('ui_close')}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-help/src/actions/ACTION_APP_HELP.ts b/webapp/packages/plugin-help/src/actions/ACTION_APP_HELP.ts
index 7c275283f2..fecc5ed07d 100644
--- a/webapp/packages/plugin-help/src/actions/ACTION_APP_HELP.ts
+++ b/webapp/packages/plugin-help/src/actions/ACTION_APP_HELP.ts
@@ -5,11 +5,10 @@
  * 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_APP_HELP = createAction('app-help', {
   label: 'shortcuts_title',
   tooltip: 'shortcuts_title',
   icon: '/icons/plugin_help_m.svg',
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-help/src/index.ts b/webapp/packages/plugin-help/src/index.ts
index 15bc2512af..e2e38fb300 100644
--- a/webapp/packages/plugin-help/src/index.ts
+++ b/webapp/packages/plugin-help/src/index.ts
@@ -1,3 +1,3 @@
 import { manifest } from './manifest';
 
-export default manifest;
\ No newline at end of file
+export default manifest;
diff --git a/webapp/packages/plugin-help/src/locales/en.ts b/webapp/packages/plugin-help/src/locales/en.ts
index 49ebb1253b..8ccebf6fcc 100644
--- a/webapp/packages/plugin-help/src/locales/en.ts
+++ b/webapp/packages/plugin-help/src/locales/en.ts
@@ -21,9 +21,12 @@ export default [
   ['navigation_tree_shortcut_enable_filter', 'Enable filtering'],
 
   ['plugin_help_multi_tab_support_title', 'Multi-tab is not supported'],
-  ['plugin_help_multi_tab_support_description', `The data is not connected to other browser tabs.
+  [
+    'plugin_help_multi_tab_support_description',
+    `The data is not connected to other browser tabs.
   Any opened application tabs will not be saved and will most likely be lost after the tab is closed.
   Your local application settings will be lost after the browser tab is closed.
-  You can load tabs and settings for this tab`],
+  You can load tabs and settings for this tab`,
+  ],
   ['plugin_help_multi_tab_support_load_settings', 'Load tabs ans settings'],
 ];
diff --git a/webapp/packages/plugin-help/src/manifest.ts b/webapp/packages/plugin-help/src/manifest.ts
index 9f06b53f3a..f1f6e586ac 100644
--- a/webapp/packages/plugin-help/src/manifest.ts
+++ b/webapp/packages/plugin-help/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -16,8 +15,5 @@ export const manifest: PluginManifest = {
     name: 'Help plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-  ],
+  providers: [PluginBootstrap, LocaleService],
 };
diff --git a/webapp/packages/plugin-localization/src/LOCALIZATION_MENU.ts b/webapp/packages/plugin-localization/src/LOCALIZATION_MENU.ts
index f1f06dba8d..08435b100c 100644
--- a/webapp/packages/plugin-localization/src/LOCALIZATION_MENU.ts
+++ b/webapp/packages/plugin-localization/src/LOCALIZATION_MENU.ts
@@ -5,7 +5,6 @@
  * 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 LOCALIZATION_MENU = createMenu('localization-menu', 'app_shared_settingsMenu_lang');
diff --git a/webapp/packages/plugin-localization/src/PluginBootstrap.ts b/webapp/packages/plugin-localization/src/PluginBootstrap.ts
index 947ae89888..d973802f3a 100644
--- a/webapp/packages/plugin-localization/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-localization/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
@@ -19,7 +18,7 @@ export class PluginBootstrap extends Bootstrap {
   constructor(
     private readonly localizationService: LocalizationService,
     private readonly menuService: MenuService,
-    private readonly serverConfigResource: ServerConfigResource
+    private readonly serverConfigResource: ServerConfigResource,
   ) {
     super();
   }
@@ -33,15 +32,10 @@ export class PluginBootstrap extends Bootstrap {
     });
 
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU
-        && !!this.serverConfigResource.data?.supportedLanguages.length
-      ),
+      isApplicable: context =>
+        context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU && !!this.serverConfigResource.data?.supportedLanguages.length,
       getItems(context, items) {
-        return [
-          ...items,
-          LOCALIZATION_MENU,
-        ];
+        return [...items, LOCALIZATION_MENU];
       },
     });
 
@@ -64,17 +58,14 @@ export class PluginBootstrap extends Bootstrap {
               tooltip: label,
             },
             { onSelect: () => this.localizationService.changeLocaleAsync(lang.isoCode) },
-            { isDisabled: () => this.localizationService.currentLanguage === lang.isoCode }
+            { isDisabled: () => this.localizationService.currentLanguage === lang.isoCode },
           );
         });
 
-        return [
-          ...items,
-          ...languages,
-        ];
+        return [...items, ...languages];
       },
     });
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-localization/src/index.ts b/webapp/packages/plugin-localization/src/index.ts
index e327083077..0151f07209 100644
--- a/webapp/packages/plugin-localization/src/index.ts
+++ b/webapp/packages/plugin-localization/src/index.ts
@@ -2,4 +2,4 @@ import { localizationPlugin } from './manifest';
 
 export default localizationPlugin;
 
-export * from './LOCALIZATION_MENU';
\ No newline at end of file
+export * from './LOCALIZATION_MENU';
diff --git a/webapp/packages/plugin-localization/src/manifest.ts b/webapp/packages/plugin-localization/src/manifest.ts
index 030184c049..19196ab410 100644
--- a/webapp/packages/plugin-localization/src/manifest.ts
+++ b/webapp/packages/plugin-localization/src/manifest.ts
@@ -5,14 +5,11 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
 
 export const localizationPlugin: PluginManifest = {
   info: { name: 'Localization plugin' },
-  providers: [
-    PluginBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap],
+};
diff --git a/webapp/packages/plugin-log-viewer/src/Actions/ACTION_LOG_VIEWER_ENABLE.ts b/webapp/packages/plugin-log-viewer/src/Actions/ACTION_LOG_VIEWER_ENABLE.ts
index 7c3dd02bb1..e535b4e43c 100644
--- a/webapp/packages/plugin-log-viewer/src/Actions/ACTION_LOG_VIEWER_ENABLE.ts
+++ b/webapp/packages/plugin-log-viewer/src/Actions/ACTION_LOG_VIEWER_ENABLE.ts
@@ -5,13 +5,9 @@
  * 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_LOG_VIEWER_ENABLE = createAction(
-  'log-viewer-enable',
-  {
-    label: 'plugin_log_viewer_action_enable_label',
-    type: 'checkbox',
-  }
-);
+export const ACTION_LOG_VIEWER_ENABLE = createAction('log-viewer-enable', {
+  label: 'plugin_log_viewer_action_enable_label',
+  type: 'checkbox',
+});
diff --git a/webapp/packages/plugin-log-viewer/src/LocaleService.ts b/webapp/packages/plugin-log-viewer/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-log-viewer/src/LocaleService.ts
+++ b/webapp/packages/plugin-log-viewer/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/ILogEntry.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/ILogEntry.ts
index 9b5e0f8780..39343075ab 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/ILogEntry.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/ILogEntry.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { LogEntry } from '@cloudbeaver/core-sdk';
 
 export interface ILogEntry extends LogEntry {
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx
index c3b57d106e..f6b4d10a9b 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx
@@ -5,7 +5,6 @@
  * 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, use } from 'reshadow';
 
@@ -58,12 +57,7 @@ const style = css`
   }
 `;
 
-export const LogEntry = observer<Props>(function LogEntry({
-  item,
-  onSelect,
-  selected = false,
-  className,
-}) {
+export const LogEntry = observer<Props>(function LogEntry({ item, onSelect, selected = false, className }) {
   const translate = useTranslate();
 
   const isError = !!item.stackTrace;
@@ -87,18 +81,14 @@ export const LogEntry = observer<Props>(function LogEntry({
       <TableColumnValue title={item.type} centerContent flex {...use({ icon: true })}>
         <icon-box>{icon && <IconOrImage icon={icon} />}</icon-box>
       </TableColumnValue>
-      <TableColumnValue title={fullTime} ellipsis>{displayTime}</TableColumnValue>
+      <TableColumnValue title={fullTime} ellipsis>
+        {displayTime}
+      </TableColumnValue>
       <TableColumnValue>
         <message-cell>
-          <message title={message}>
-            {isError ? (
-              <Link onClick={() => onSelect(item)}>
-                {message}
-              </Link>
-            ) : message}
-          </message>
+          <message title={message}>{isError ? <Link onClick={() => onSelect(item)}>{message}</Link> : message}</message>
         </message-cell>
       </TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx
index 6135263b04..a49568d019 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
@@ -17,16 +16,17 @@ import { LogViewerTable } from './LogViewerTable';
 import { useLogViewer } from './useLogViewer';
 
 const styles = css`
-    Pane {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    log-view-wrapper, Pane {
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: hidden;
-    }
+  Pane {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  log-view-wrapper,
+  Pane {
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: hidden;
+  }
 `;
 
 export const LogViewer = observer(function LogViewer() {
@@ -45,12 +45,7 @@ export const LogViewer = observer(function LogViewer() {
 
   return styled(style)(
     <log-view-wrapper>
-      <Split
-        {...splitState}
-        mode={logViewerState.selectedItem ? splitState.mode : 'minimize'}
-        disable={!logViewerState.selectedItem}
-        keepRatio
-      >
+      <Split {...splitState} mode={logViewerState.selectedItem ? splitState.mode : 'minimize'} disable={!logViewerState.selectedItem} keepRatio>
         <Pane>
           <LogViewerTable
             items={logViewerState.logItems}
@@ -60,15 +55,10 @@ export const LogViewer = observer(function LogViewer() {
           />
         </Pane>
         <ResizerControls />
-        <Pane basis='40%' main>
-          {logViewerState.selectedItem && (
-            <LogViewerInfoPanel
-              selectedItem={logViewerState.selectedItem}
-              onClose={closeInfoPanel}
-            />
-          )}
+        <Pane basis="40%" main>
+          {logViewerState.selectedItem && <LogViewerInfoPanel selectedItem={logViewerState.selectedItem} onClose={closeInfoPanel} />}
         </Pane>
       </Split>
-    </log-view-wrapper>
+    </log-view-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerBootstrap.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerBootstrap.ts
index 453fbcf0f2..3c285ef8cc 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerBootstrap.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerBootstrap.ts
@@ -5,23 +5,21 @@
  * 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 { MenuService, ActionService, DATA_CONTEXT_MENU, menuExtractItems } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from '@cloudbeaver/core-view';
 import { MENU_TOOLS, ToolsPanelService } from '@cloudbeaver/plugin-tools-panel';
 
 import { ACTION_LOG_VIEWER_ENABLE } from '../Actions/ACTION_LOG_VIEWER_ENABLE';
 import { LogViewer } from './LogViewer';
 import { LogViewerService } from './LogViewerService';
 
-
 @injectable()
 export class LogViewerBootstrap extends Bootstrap {
   constructor(
     private readonly toolsPanelService: ToolsPanelService,
     private readonly menuService: MenuService,
     private readonly actionService: ActionService,
-    private readonly logViewerService: LogViewerService
+    private readonly logViewerService: LogViewerService,
   ) {
     super();
   }
@@ -29,10 +27,7 @@ export class LogViewerBootstrap extends Bootstrap {
   register(): void {
     this.menuService.addCreator({
       isApplicable: context => context.tryGet(DATA_CONTEXT_MENU) === MENU_TOOLS,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_LOG_VIEWER_ENABLE,
-      ],
+      getItems: (context, items) => [...items, ACTION_LOG_VIEWER_ENABLE],
       orderItems: (context, items) => {
         const extracted = menuExtractItems(items, [ACTION_LOG_VIEWER_ENABLE]);
         return [...items, ...extracted];
@@ -41,9 +36,7 @@ export class LogViewerBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'log-viewer-base',
-      isActionApplicable: (context, action) => [
-        ACTION_LOG_VIEWER_ENABLE,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_LOG_VIEWER_ENABLE].includes(action),
       isChecked: () => this.logViewerService.isActive,
       isHidden: () => this.logViewerService.disabled,
       handler: (context, action) => {
@@ -66,5 +59,5 @@ export class LogViewerBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx
index 671c0280bb..9443c438ab 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
 import { MenuBarSmallItem, Textarea, useClipboard, useTranslate } from '@cloudbeaver/core-blocks';
 
-
 import type { ILogEntry } from './ILogEntry';
 
 const styles = css`
@@ -50,12 +48,13 @@ const styles = css`
     min-height: 40px;
     max-height: 96px;
   }
-  type, message {
+  type,
+  message {
     margin-bottom: 12px;
   }
   Textarea {
     flex: 1;
-  } 
+  }
 `;
 
 interface Props {
@@ -64,11 +63,7 @@ interface Props {
   className?: string;
 }
 
-export const LogViewerInfoPanel = observer<Props>(function LogViewerInfoPanel({
-  selectedItem,
-  onClose,
-  className,
-}) {
+export const LogViewerInfoPanel = observer<Props>(function LogViewerInfoPanel({ selectedItem, onClose, className }) {
   const translate = useTranslate();
   const copy = useClipboard();
 
@@ -81,30 +76,18 @@ export const LogViewerInfoPanel = observer<Props>(function LogViewerInfoPanel({
   return styled(styles)(
     <panel-wrapper className={className}>
       <buttons>
-        <MenuBarSmallItem
-          title={translate('ui_copy_to_clipboard')}
-          onClick={copyMessage}
-        >
+        <MenuBarSmallItem title={translate('ui_copy_to_clipboard')} onClick={copyMessage}>
           {translate('ui_copy_to_clipboard')}
         </MenuBarSmallItem>
-        <MenuBarSmallItem
-          title={translate('ui_close')}
-          onClick={onClose}
-        >
+        <MenuBarSmallItem title={translate('ui_close')} onClick={onClose}>
           {translate('ui_close')}
         </MenuBarSmallItem>
       </buttons>
       <content-wrapper>
-        <type as='h2'>{typeInfo}</type>
+        <type as="h2">{typeInfo}</type>
         <message title={selectedItem.message}>{selectedItem.message}</message>
-        <Textarea
-          name="value"
-          rows={3}
-          value={selectedItem.stackTrace}
-          readOnly
-          embedded
-        />
+        <Textarea name="value" rows={3} value={selectedItem.stackTrace} readOnly embedded />
       </content-wrapper>
-    </panel-wrapper>
+    </panel-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
index dee8aadd6e..38f8b81869 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { makeObservable, computed } from 'mobx';
+import { computed, makeObservable } from 'mobx';
 
 import { UserDataService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
@@ -39,12 +38,10 @@ export class LogViewerService {
     private readonly toolsPanelService: ToolsPanelService,
     private readonly logViewerSettingsService: LogViewerSettingsService,
   ) {
-
     makeObservable<LogViewerService>(this, {
       settings: computed,
       disabled: computed,
     });
-
   }
 
   toggle(): void {
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.test.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.test.ts
index debd82bdc8..5bd9258d16 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.test.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { CoreSettingsService } from '@cloudbeaver/core-app';
@@ -24,17 +23,9 @@ import { logViewerPlugin } from '../manifest';
 import { LogViewerSettings, LogViewerSettingsService } from './LogViewerSettingsService';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  administrationPlugin,
-  topAppBarPlugin,
-  toolsPanel,
-  logViewerPlugin
-);
+const app = createApp(administrationPlugin, topAppBarPlugin, toolsPanel, logViewerPlugin);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -65,9 +56,7 @@ test('New settings equal deprecated settings', async () => {
   const coreSettings = app.injector.getServiceByClass(CoreSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
@@ -80,4 +69,4 @@ test('New settings equal deprecated settings', async () => {
   expect(coreSettings.settings.getValue('app.logViewer.maxLogRecords')).toBe(2);
   expect(coreSettings.settings.getValue('app.logViewer.logBatchSize')).toBe(3);
   expect(coreSettings.settings.getValue('app.logViewer.maxFailedRequests')).toBe(4);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.ts b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.ts
index 14d50c3442..4d3f1f1a6c 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.ts
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx
index 40b1df7633..f372a3487a 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx
@@ -5,52 +5,60 @@
  * 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, use } from 'reshadow';
 
-import { BASE_TABLE_STYLES, MenuBarSmallItem, Table, TableBody, TableColumnHeader, TableHeader, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  BASE_TABLE_STYLES,
+  MenuBarSmallItem,
+  Table,
+  TableBody,
+  TableColumnHeader,
+  TableHeader,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 
 import type { ILogEntry } from './ILogEntry';
 import { LogEntry } from './LogEntry';
 
 const styles = css`
-    wrapper {
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-    }
-    Table {
-      flex: 1 1 auto;
-      width: 100%;
-    }
-    table-wrapper {
-      overflow: auto;
-    }
-    message-title-box {
-      display: flex;
-      align-items: center;
+  wrapper {
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  Table {
+    flex: 1 1 auto;
+    width: 100%;
+  }
+  table-wrapper {
+    overflow: auto;
+  }
+  message-title-box {
+    display: flex;
+    align-items: center;
 
-      & message-title {
-        flex: 1;
-      }
+    & message-title {
+      flex: 1;
     }
-    [|buttons] {
-      text-align: right;
-    }
-    TableColumnHeader {
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    TableColumnHeader[min] {
-      width: 32px;
-    }
-    [|timestamp] {
-      width: 200px;
-      min-width: 200px;
-    }
-  `;
+  }
+  [|buttons] {
+    text-align: right;
+  }
+  TableColumnHeader {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  TableColumnHeader[min] {
+    width: 32px;
+  }
+  [|timestamp] {
+    width: 200px;
+    min-width: 200px;
+  }
+`;
 
 interface Props {
   items: ILogEntry[];
@@ -73,12 +81,7 @@ export const LogViewerTable = observer<Props>(function LogViewerTable({ items, s
             <TableColumnHeader>
               <message-title-box>
                 <message-title>{translate('plugin_log_viewer_entry_message')}</message-title>
-                <MenuBarSmallItem
-                  name='trash'
-                  viewBox='0 0 24 24'
-                  title={translate('plugin_log_viewer_clear_log')}
-                  onClick={onClear}
-                >
+                <MenuBarSmallItem name="trash" viewBox="0 0 24 24" title={translate('plugin_log_viewer_clear_log')} onClick={onClear}>
                   {translate('ui_clear')}
                 </MenuBarSmallItem>
               </message-title-box>
@@ -86,16 +89,11 @@ export const LogViewerTable = observer<Props>(function LogViewerTable({ items, s
           </TableHeader>
           <TableBody>
             {items.map(item => (
-              <LogEntry
-                key={item.id}
-                item={item}
-                selected={item.id === selectedItem?.id}
-                onSelect={onItemSelect}
-              />
+              <LogEntry key={item.id} item={item} selected={item.id === selectedItem?.id} onSelect={onItemSelect} />
             ))}
           </TableBody>
         </Table>
       </table-wrapper>
-    </wrapper>
+    </wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
index 6f409bef0c..3792a7cff7 100644
--- a/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
+++ b/webapp/packages/plugin-log-viewer/src/LogViewer/useLogViewer.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import { useObjectRef, useObservableRef, useResource } from '@cloudbeaver/core-blocks';
@@ -24,32 +23,31 @@ export function useLogViewer() {
   const sessionLogsLoader = useResource(useLogViewer, SessionLogsResource, undefined);
   const logViewerService = useService(LogViewerService);
 
-  const props: Props = useObservableRef(
-    () => ({ selectedItem: null }),
-    { selectedItem: observable.ref },
-    { logViewerService },
-  );
+  const props: Props = useObservableRef(() => ({ selectedItem: null }), { selectedItem: observable.ref }, { logViewerService });
 
-  return useObjectRef(() => ({
-    get selectedItem() {
-      return props.selectedItem;
-    },
-    selectItem(item: ILogEntry | null) {
-      if (item?.id === props.selectedItem?.id) {
-        props.selectedItem = null;
-        return;
-      }
-      props.selectedItem = item;
-    },
-    get isActive() {
-      return props.logViewerService.isActive;
-    },
-    get logItems() {
-      return sessionLogsLoader.tryGetData;
-    },
-    clearLog() {
-      sessionLogsLoader.resource.clear();
-      this.selectItem(null);
-    },
-  }), false);
+  return useObjectRef(
+    () => ({
+      get selectedItem() {
+        return props.selectedItem;
+      },
+      selectItem(item: ILogEntry | null) {
+        if (item?.id === props.selectedItem?.id) {
+          props.selectedItem = null;
+          return;
+        }
+        props.selectedItem = item;
+      },
+      get isActive() {
+        return props.logViewerService.isActive;
+      },
+      get logItems() {
+        return sessionLogsLoader.tryGetData;
+      },
+      clearLog() {
+        sessionLogsLoader.resource.clear();
+        this.selectItem(null);
+      },
+    }),
+    false,
+  );
 }
diff --git a/webapp/packages/plugin-log-viewer/src/SessionLogsEventHandler.ts b/webapp/packages/plugin-log-viewer/src/SessionLogsEventHandler.ts
index 3750b2aa05..018820ec9f 100644
--- a/webapp/packages/plugin-log-viewer/src/SessionLogsEventHandler.ts
+++ b/webapp/packages/plugin-log-viewer/src/SessionLogsEventHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ISessionEvent, SessionEventSource, SessionEventTopic, TopicEventHandler } from '@cloudbeaver/core-root';
 import type { CbSessionLogEvent as ISessionLogEvent } from '@cloudbeaver/core-sdk';
@@ -14,9 +13,7 @@ export { type ISessionLogEvent };
 
 @injectable()
 export class SessionLogsEventHandler extends TopicEventHandler<ISessionLogEvent, ISessionEvent> {
-  constructor(
-    sessionEventSource: SessionEventSource
-  ) {
+  constructor(sessionEventSource: SessionEventSource) {
     super(SessionEventTopic.CbSessionLog, sessionEventSource);
   }
 
diff --git a/webapp/packages/plugin-log-viewer/src/SessionLogsResource.ts b/webapp/packages/plugin-log-viewer/src/SessionLogsResource.ts
index 26d2d5974d..d7c0a675a3 100644
--- a/webapp/packages/plugin-log-viewer/src/SessionLogsResource.ts
+++ b/webapp/packages/plugin-log-viewer/src/SessionLogsResource.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { runInAction } from 'mobx';
 
 import { CoreSettingsService } from '@cloudbeaver/core-app';
 import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { ServerEventId, SessionDataResource } from '@cloudbeaver/core-root';
-import { GraphQLService, CachedDataResource, LogEntry } from '@cloudbeaver/core-sdk';
+import { CachedDataResource, GraphQLService, LogEntry } from '@cloudbeaver/core-sdk';
 import { uuid } from '@cloudbeaver/core-utils';
 
 import { LogViewerSettingsService } from './LogViewer/LogViewerSettingsService';
@@ -33,16 +32,25 @@ export class SessionLogsResource extends CachedDataResource<ILogEntry[]> {
     sessionLogsEventHandler: SessionLogsEventHandler,
   ) {
     super(() => []);
-    this.sync(sessionDataResource, () => { }, () => { });
+    this.sync(
+      sessionDataResource,
+      () => {},
+      () => {},
+    );
     sessionDataResource.onDataUpdate.addHandler(() => {
       this.clear();
     });
 
     appAuthService.requireAuthentication(this);
 
-    sessionLogsEventHandler.onEvent(ServerEventId.CbSessionLogUpdated, () => {
-      this.markOutdated();
-    }, undefined, this);
+    sessionLogsEventHandler.onEvent(
+      ServerEventId.CbSessionLogUpdated,
+      () => {
+        this.markOutdated();
+      },
+      undefined,
+      this,
+    );
   }
 
   protected async loader(): Promise<ILogEntry[]> {
diff --git a/webapp/packages/plugin-log-viewer/src/index.ts b/webapp/packages/plugin-log-viewer/src/index.ts
index 1f1f2bffdd..f679167ad0 100644
--- a/webapp/packages/plugin-log-viewer/src/index.ts
+++ b/webapp/packages/plugin-log-viewer/src/index.ts
@@ -1,8 +1,8 @@
+import { logViewerPlugin } from './manifest';
+
 export * from './LogViewer/LogViewerBootstrap';
 export * from './LogViewer/LogViewerService';
 export * from './LogViewer/LogViewerSettingsService';
 
-import { logViewerPlugin } from './manifest';
-
 export { logViewerPlugin };
-export default logViewerPlugin;
\ No newline at end of file
+export default logViewerPlugin;
diff --git a/webapp/packages/plugin-log-viewer/src/manifest.ts b/webapp/packages/plugin-log-viewer/src/manifest.ts
index f9984587b6..58211be379 100644
--- a/webapp/packages/plugin-log-viewer/src/manifest.ts
+++ b/webapp/packages/plugin-log-viewer/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -17,12 +16,5 @@ import { SessionLogsResource } from './SessionLogsResource';
 
 export const logViewerPlugin: PluginManifest = {
   info: { name: 'Log viewer plugin' },
-  providers: [
-    LogViewerBootstrap,
-    LogViewerService,
-    LocaleService,
-    LogViewerSettingsService,
-    SessionLogsResource,
-    SessionLogsEventHandler,
-  ],
-};
\ No newline at end of file
+  providers: [LogViewerBootstrap, LogViewerService, LocaleService, LogViewerSettingsService, SessionLogsResource, SessionLogsEventHandler],
+};
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 e69a742411..c49f604c84 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -5,7 +5,6 @@
  * 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, useEffect } from 'react';
 import styled, { css } from 'reshadow';
@@ -13,7 +12,7 @@ import styled, { css } from 'reshadow';
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
 import { TextPlaceholder, useExecutor, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { TabsBox, TabPanel, BASE_TAB_STYLES, ITabData } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, ITabData, TabPanel, TabsBox } from '@cloudbeaver/core-ui';
 import { CaptureView } from '@cloudbeaver/core-view';
 
 import { NavigationTabsService } from '../NavigationTabsService';
@@ -21,21 +20,21 @@ import { TabHandlerPanel } from './Tabs/TabHandlerPanel';
 import { TabHandlerTab } from './Tabs/TabHandlerTab';
 
 const styles = css`
-    Tab {
-      composes: theme-ripple theme-background-background theme-text-text-primary-on-light from global;
-    }
-    tabs {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    TabsBox {
-      outline: none;
-    }
-    CaptureView {
-      flex: 1;
-      display: flex;
-      overflow: auto;
-    }
-  `;
+  Tab {
+    composes: theme-ripple theme-background-background theme-text-text-primary-on-light from global;
+  }
+  tabs {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  TabsBox {
+    outline: none;
+  }
+  CaptureView {
+    flex: 1;
+    display: flex;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   className?: string;
@@ -80,11 +79,7 @@ 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)(
@@ -107,6 +102,6 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
           </TabPanel>
         ))}
       </TabsBox>
-    </CaptureView>
+    </CaptureView>,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerPanel.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerPanel.tsx
index 90b93d55b5..574cbd03fa 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerPanel.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerPanel.tsx
@@ -5,7 +5,6 @@
  * 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 type { TabElementProps } from '@cloudbeaver/core-ui';
@@ -13,9 +12,7 @@ import type { TabElementProps } from '@cloudbeaver/core-ui';
 import { useTab } from './useTab';
 import { useTabHandler } from './useTabHandler';
 
-export const TabHandlerPanel = observer<TabElementProps>(function TabHandlerPanel({
-  tabId,
-}) {
+export const TabHandlerPanel = observer<TabElementProps>(function TabHandlerPanel({ tabId }) {
   const tab = useTab(tabId);
   const handler = useTabHandler(tab.handlerId);
 
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx
index ca21d0e38c..6b4faa872b 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx
@@ -5,7 +5,6 @@
  * 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 type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -20,9 +19,7 @@ interface IProps {
   style: ComponentStyle;
 }
 
-export const TabHandlerTab = observer<IProps>(function TabHandlerTab({
-  tabId, onSelect, onClose, style,
-}) {
+export const TabHandlerTab = observer<IProps>(function TabHandlerTab({ tabId, onSelect, onClose, style }) {
   const tab = useTab(tabId);
   const handler = useTabHandler(tab.handlerId);
 
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTab.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTab.ts
index c06182c889..414f794d49 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTab.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTab.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 
 import { NavigationTabsService } from '../../NavigationTabsService';
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTabHandler.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTabHandler.ts
index 90e6445fa9..63f5286f58 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTabHandler.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/useTabHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 
 import { NavigationTabsService } from '../../NavigationTabsService';
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsService.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsService.ts
index fcf37984aa..4eb9afc3eb 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsService.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, action, computed, makeObservable, runInAction } from 'mobx';
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
 
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { AppAuthService, UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -20,8 +19,8 @@ import { isArraysEqual, MetadataMap, TempMap } from '@cloudbeaver/core-utils';
 import { ACTION_OPEN_IN_TAB, IActiveView, View } from '@cloudbeaver/core-view';
 
 import type { ITab, ITabMetadata } from './ITab';
-import { TabHandler, TabHandlerOptions, TabHandlerEvent, TabSyncHandlerEvent } from './TabHandler';
-import { TabNavigationContext, ITabNavigationContext } from './TabNavigationContext';
+import { TabHandler, TabHandlerEvent, TabHandlerOptions, TabSyncHandlerEvent } from './TabHandler';
+import { ITabNavigationContext, TabNavigationContext } from './TabNavigationContext';
 
 interface INavigatorHistory {
   history: string[];
@@ -38,7 +37,6 @@ const NAVIGATION_TABS_BASE_KEY = 'navigation_tabs';
 
 @injectable()
 export class NavigationTabsService extends View<ITab> {
-
   get currentTab(): ITab | undefined {
     if (this.currentTabId) {
       return this.getTab(this.currentTabId);
@@ -47,10 +45,7 @@ export class NavigationTabsService extends View<ITab> {
   }
 
   get currentTabId(): string | null {
-    if (
-      this.history.currentId !== null
-      && this.tabIdList.includes(this.history.currentId)
-    ) {
+    if (this.history.currentId !== null && this.tabIdList.includes(this.history.currentId)) {
       return this.history.currentId;
     }
 
@@ -59,14 +54,12 @@ export class NavigationTabsService extends View<ITab> {
 
   get tabIdList(): string[] {
     return Array.from(this.tabsMap.values())
-      .filter(tab => (
-        this.getTabMetadata(tab.id).restored
-        && tab.userId === this.userInfoResource.getId()
-        && (
-          tab.projectId === null
-          || this.projectsService.activeProjects.some(project => project.id === tab.projectId)
-        )
-      ))
+      .filter(
+        tab =>
+          this.getTabMetadata(tab.id).restored &&
+          tab.userId === this.userInfoResource.getId() &&
+          (tab.projectId === null || this.projectsService.activeProjects.some(project => project.id === tab.projectId)),
+      )
       .map(tab => tab.id);
   }
 
@@ -78,10 +71,13 @@ export class NavigationTabsService extends View<ITab> {
     }
 
     if (!this.tempHistoryState.has(projectId)) {
-      this.tempHistoryState.set(projectId, observable({
-        history: [],
-        currentId: null,
-      }));
+      this.tempHistoryState.set(
+        projectId,
+        observable({
+          history: [],
+          currentId: null,
+        }),
+      );
     }
 
     return this.tempHistoryState.get(projectId)!;
@@ -118,7 +114,7 @@ export class NavigationTabsService extends View<ITab> {
     private readonly userInfoResource: UserInfoResource,
     private readonly projectsService: ProjectsService,
     private readonly administrationScreenService: AdministrationScreenService,
-    private readonly appAuthService: AppAuthService
+    private readonly appAuthService: AppAuthService,
   ) {
     super();
 
@@ -163,16 +159,16 @@ export class NavigationTabsService extends View<ITab> {
       map => {
         for (const [key, value] of Array.from(map.entries())) {
           if (
-            typeof value.id !== 'string'
-            || typeof value.handlerId !== 'string'
-            || typeof value.userId !== 'string'
-            || !['object', 'string'].includes(typeof value.projectId)
+            typeof value.id !== 'string' ||
+            typeof value.handlerId !== 'string' ||
+            typeof value.userId !== 'string' ||
+            !['object', 'string'].includes(typeof value.projectId)
           ) {
             map.delete(key);
           }
         }
         return map;
-      }
+      },
     );
 
     this.autoSaveService.withAutoSave(
@@ -181,15 +177,12 @@ export class NavigationTabsService extends View<ITab> {
       () => new Map(),
       map => {
         for (const [key, value] of Array.from(map.entries())) {
-          if (
-            !['object', 'string'].includes(typeof value.currentId)
-            || !Array.isArray(value.history)
-          ) {
+          if (!['object', 'string'].includes(typeof value.currentId) || !Array.isArray(value.history)) {
             map.delete(key);
           }
         }
         return map;
-      }
+      },
     );
 
     this.autoSaveService.withAutoSave(
@@ -198,14 +191,12 @@ export class NavigationTabsService extends View<ITab> {
       () => new Map(),
       map => {
         for (const [key, value] of Array.from(map.entries())) {
-          if (
-            !Array.isArray(value.tabs)
-          ) {
+          if (!Array.isArray(value.tabs)) {
             map.delete(key);
           }
         }
         return map;
-      }
+      },
     );
 
     this.userInfoResource.onUserChange.addHandler(this.unloadTabs.bind(this));
@@ -233,10 +224,7 @@ export class NavigationTabsService extends View<ITab> {
       return;
     }
 
-    if (
-      !this.userTabsState.tabs.includes(tabId)
-      || !this.tabIdList.includes(tabId)
-    ) {
+    if (!this.userTabsState.tabs.includes(tabId) || !this.tabIdList.includes(tabId)) {
       return;
     }
 
@@ -364,11 +352,7 @@ export class NavigationTabsService extends View<ITab> {
   findTab(predicate: (tab: ITab) => boolean): ITab | null;
   findTab(predicate: (tab: ITab) => boolean): ITab | null {
     for (const tab of this.tabsMap.values()) {
-      if (
-        this.getTabMetadata(tab.id).restored
-        && tab.userId === this.userInfoResource.getId()
-        && predicate(tab)
-      ) {
+      if (this.getTabMetadata(tab.id).restored && tab.userId === this.userInfoResource.getId() && predicate(tab)) {
         return tab;
       }
     }
@@ -377,13 +361,9 @@ export class NavigationTabsService extends View<ITab> {
 
   findTabs(predicate: (tab: ITab) => boolean): Generator<ITab>;
   findTabs<S>(predicate: (tab: ITab) => tab is ITab<S>): Generator<ITab<S>>;
-  * findTabs(predicate: (tab: ITab) => boolean): Generator<ITab> {
+  *findTabs(predicate: (tab: ITab) => boolean): Generator<ITab> {
     for (const tab of this.tabsMap.values()) {
-      if (
-        this.getTabMetadata(tab.id).restored
-        && tab.userId === this.userInfoResource.getId()
-        && predicate(tab)
-      ) {
+      if (this.getTabMetadata(tab.id).restored && tab.userId === this.userInfoResource.getId() && predicate(tab)) {
         yield tab;
       }
     }
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts
index 8b9d46c6b1..bcd6cb4d95 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IExtension } from '@cloudbeaver/core-extensions';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabNavigationContext.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabNavigationContext.ts
index 80451b80ea..1c03b344a2 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabNavigationContext.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabNavigationContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
 import type { UserInfoResource } from '@cloudbeaver/core-authentication';
@@ -39,10 +38,7 @@ export class TabNavigationContext implements ITabNavigationContext {
   private readonly _handlerPriority = 0;
   private _tab: ITab | null = null;
 
-  constructor(
-    private readonly navigationTabsService: NavigationTabsService,
-    private readonly userInfoResource: UserInfoResource
-  ) { }
+  constructor(private readonly navigationTabsService: NavigationTabsService, private readonly userInfoResource: UserInfoResource) {}
 
   openNewTab<T = any>(options: ITabOptions<T>): ITab<T> {
     this._tab = observable<ITab<T>>({
diff --git a/webapp/packages/plugin-navigation-tabs/src/PluginBootstrap.ts b/webapp/packages/plugin-navigation-tabs/src/PluginBootstrap.ts
index 484c40a93e..5cb98d6fdd 100644
--- a/webapp/packages/plugin-navigation-tabs/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,7 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-navigation-tabs/src/index.ts b/webapp/packages/plugin-navigation-tabs/src/index.ts
index 6be51681e1..a542d8fb6e 100644
--- a/webapp/packages/plugin-navigation-tabs/src/index.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/index.ts
@@ -1,4 +1,5 @@
 import { navigationTabsPlugin } from './manifest';
+
 export * from './NavigationTabs/NavigationTabsService';
 export * from './NavigationTabs/TabNavigationContext';
 export * from './NavigationTabs/ITab';
@@ -6,4 +7,4 @@ export * from './NavigationTabs/TabHandler';
 export * from './NavigationTabs/NavigationTabsBar/Tabs/useTab';
 export * from './NavigationTabs/NavigationTabsBar';
 
-export default navigationTabsPlugin;
\ No newline at end of file
+export default navigationTabsPlugin;
diff --git a/webapp/packages/plugin-navigation-tabs/src/manifest.ts b/webapp/packages/plugin-navigation-tabs/src/manifest.ts
index f9da4a2255..56f17cdd39 100644
--- a/webapp/packages/plugin-navigation-tabs/src/manifest.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { NavigationTabsService } from './NavigationTabs/NavigationTabsService';
@@ -13,8 +12,5 @@ import { PluginBootstrap } from './PluginBootstrap';
 
 export const navigationTabsPlugin: PluginManifest = {
   info: { name: 'Navigation tabs plugin' },
-  providers: [
-    PluginBootstrap,
-    NavigationTabsService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, NavigationTabsService],
+};
diff --git a/webapp/packages/plugin-navigation-tree/src/LocaleService.ts b/webapp/packages/plugin-navigation-tree/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-navigation-tree/src/LocaleService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupFilter.ts
index 8626535107..3cc6721896 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupFilter.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { type NavNode, ENodeFeature, EObjectFeature, type NavNodeInfoResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
+import { ENodeFeature, EObjectFeature, type NavNode, type NavNodeInfoResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 
 import type { IElementsTreeFilter } from '../ElementsTree/useElementsTree';
@@ -23,7 +22,6 @@ function isDefined<T>(val: T | undefined | null): val is T {
 
 function sortManageable(): (nodeA: NavNode, nodeB: NavNode) => number {
   return (nodeA: NavNode, nodeB: NavNode): number => {
-
     const nodeAShared = nodeA.features?.includes(ENodeFeature.shared);
     const nodeBShared = nodeB.features?.includes(ENodeFeature.shared);
 
@@ -43,18 +41,13 @@ function sortManageable(): (nodeA: NavNode, nodeB: NavNode) => number {
   };
 }
 
-export function navigationTreeConnectionGroupFilter(
-  resource: NavNodeInfoResource
-): IElementsTreeFilter {
+export function navigationTreeConnectionGroupFilter(resource: NavNodeInfoResource): IElementsTreeFilter {
   return (tree, filter, node, children) => {
     if (node.id !== ROOT_NODE_PATH) {
       return children;
     }
 
-    const nodes = resource
-      .get(resourceKeyList(children))
-      .filter(isDefined)
-      .sort(sortManageable());
+    const nodes = resource.get(resourceKeyList(children)).filter(isDefined).sort(sortManageable());
 
     let groupedChildren: string[] = [];
     let lastGroup = NAVIGATION_TREE_CONNECTION_GROUPS.unsorted;
@@ -82,9 +75,8 @@ export function navigationTreeConnectionGroupFilter(
     }
 
     if (groups === 1) {
-      groupedChildren = groupedChildren.filter(id =>
-        id !== NAVIGATION_TREE_CONNECTION_GROUPS.manageable
-        && id !== NAVIGATION_TREE_CONNECTION_GROUPS.unmanageable
+      groupedChildren = groupedChildren.filter(
+        id => id !== NAVIGATION_TREE_CONNECTION_GROUPS.manageable && id !== NAVIGATION_TREE_CONNECTION_GROUPS.unmanageable,
       );
     }
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx
index a373280ebf..f0a41a16b4 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Translate } from '@cloudbeaver/core-blocks';
@@ -14,8 +13,7 @@ import type { NavigationNodeRendererComponent } from '../ElementsTree/Navigation
 import { NAVIGATION_TREE_CONNECTION_GROUPS } from './navigationTreeConnectionGroupFilter';
 
 export function navigationTreeConnectionGroupRenderer(nodeId: string): NavigationNodeRendererComponent | undefined {
-  if (nodeId !== NAVIGATION_TREE_CONNECTION_GROUPS.manageable
-  && nodeId !== NAVIGATION_TREE_CONNECTION_GROUPS.unmanageable) {
+  if (nodeId !== NAVIGATION_TREE_CONNECTION_GROUPS.manageable && nodeId !== NAVIGATION_TREE_CONNECTION_GROUPS.unmanageable) {
     return;
   }
 
@@ -27,19 +25,27 @@ export function navigationTreeConnectionGroupRenderer(nodeId: string): Navigatio
 }
 
 const styles = css`
-    connection-group {
-      composes: theme-text-text-hint-on-light theme-typography--caption from global;
-      padding: 4px 12px;
+  connection-group {
+    composes: theme-text-text-hint-on-light theme-typography--caption from global;
+    padding: 4px 12px;
 
-      &:not(:first-child) {
-        margin-top: 8px;
-      }
+    &:not(:first-child) {
+      margin-top: 8px;
     }
-  `;
+  }
+`;
 
 const ManageableGroup: NavigationNodeRendererComponent = function ManageableGroup() {
-  return styled(styles)(<connection-group><Translate token='app_navigationTree_connection_group_user' /></connection-group>);
+  return styled(styles)(
+    <connection-group>
+      <Translate token="app_navigationTree_connection_group_user" />
+    </connection-group>,
+  );
 };
 const UnManageableGroup: NavigationNodeRendererComponent = function UnManageableGroup() {
-  return styled(styles)(<connection-group><Translate token='app_navigationTree_connection_group_shared' /></connection-group>);
+  return styled(styles)(
+    <connection-group>
+      <Translate token="app_navigationTree_connection_group_shared" />
+    </connection-group>,
+  );
 };
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ACTION_LINK_OBJECT.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ACTION_LINK_OBJECT.ts
index 2431f988b0..2173573082 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ACTION_LINK_OBJECT.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ACTION_LINK_OBJECT.ts
@@ -5,10 +5,8 @@
  * 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_LINK_OBJECT = createAction('link-object', {
   label: 'link-object',
   icon: '/icons/link_editor_sm.svg',
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/DATA_CONTEXT_ELEMENTS_TREE.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/DATA_CONTEXT_ELEMENTS_TREE.ts
index 4b53984471..7f41c5c263 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/DATA_CONTEXT_ELEMENTS_TREE.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/DATA_CONTEXT_ELEMENTS_TREE.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { IElementsTree } from './useElementsTree';
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 169f0f1c1b..6090ce3c7f 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
@@ -5,20 +5,35 @@
  * 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 { useMemo, useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { EventTreeNodeClickFlag, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, FolderExplorer, FolderExplorerPath, Loader, PlaceholderElement, Translate, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES, useFolderExplorer, useResource, useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
+import {
+  EventTreeNodeClickFlag,
+  EventTreeNodeExpandFlag,
+  EventTreeNodeSelectFlag,
+  FolderExplorer,
+  FolderExplorerPath,
+  Loader,
+  PlaceholderElement,
+  Translate,
+  TREE_NODE_STYLES,
+  TreeNodeNested,
+  TreeNodeNestedMessage,
+  useFolderExplorer,
+  useObjectRef,
+  useResource,
+  useStyles,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
-import { type NavNode, ROOT_NODE_PATH, NavTreeResource, NavNodeInfoResource, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
+import { EObjectFeature, type NavNode, NavNodeInfoResource, NavTreeResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { useNavTreeDropBox } from '../useNavTreeDropBox';
 import { ElementsTreeContentLoader } from './ElementsTreeContentLoader';
-import { IElementsTreeContext, ElementsTreeContext } from './ElementsTreeContext';
+import { ElementsTreeContext, IElementsTreeContext } from './ElementsTreeContext';
 import { elementsTreeNameFilter } from './elementsTreeNameFilter';
 import { ElementsTreeTools } from './ElementsTreeTools/ElementsTreeTools';
 import type { IElementsTreeSettingsProps } from './ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService';
@@ -140,16 +155,12 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
 
   const root = folderExplorer.state.folder;
 
-  const limitFilter = useMemo(() => elementsTreeLimitFilter(
-    navTreeResource,
-    limit
-  ), [navTreeResource, limit]);
+  const limitFilter = useMemo(() => elementsTreeLimitFilter(navTreeResource, limit), [navTreeResource, limit]);
 
-  const nameFilter = useMemo(() => elementsTreeNameFilter(
-    navTreeResource,
-    navNodeInfoResource,
-    navNodeFilterCompare
-  ), [navTreeResource, navNodeInfoResource, navNodeFilterCompare]);
+  const nameFilter = useMemo(
+    () => elementsTreeNameFilter(navTreeResource, navNodeInfoResource, navNodeFilterCompare),
+    [navTreeResource, navNodeInfoResource, navNodeFilterCompare],
+  );
 
   const dndBox = useNavTreeDropBox(navNodeInfoResource.get(root));
   const dropOutside = useDropOutside(dndBox);
@@ -185,34 +196,25 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
       control,
       getTreeRoot: () => treeRootRef.current,
     }),
-    [tree, folderExplorer, selectionTree, control]
+    [tree, folderExplorer, selectionTree, control],
   );
 
-  const getName = useCallback(
-    (folder: string) => navNodeInfoResource.get(folder)?.name || 'Not found',
-    [navNodeInfoResource]
-  );
+  const getName = useCallback((folder: string) => navNodeInfoResource.get(folder)?.name || 'Not found', [navNodeInfoResource]);
 
   const canSkip = useCallback(
     (folder: string) => {
       const features = navNodeInfoResource.get(folder)?.objectFeatures;
       return !(
-        features?.includes(EObjectFeature.schema)
-        || features?.includes(EObjectFeature.catalog)
-        || features?.includes(EObjectFeature.dataSource)
+        features?.includes(EObjectFeature.schema) ||
+        features?.includes(EObjectFeature.catalog) ||
+        features?.includes(EObjectFeature.dataSource)
       );
     },
-    [navNodeInfoResource]
+    [navNodeInfoResource],
   );
 
   function handleClick(event: React.MouseEvent<HTMLDivElement>) {
-    if (EventContext.has(
-      event,
-      EventTreeNodeExpandFlag,
-      EventTreeNodeSelectFlag,
-      EventTreeNodeClickFlag,
-      EventStopPropagationFlag
-    )) {
+    if (EventContext.has(event, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, EventTreeNodeClickFlag, EventStopPropagationFlag)) {
       return;
     }
 
@@ -237,14 +239,12 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
                   })}
                 >
                   <TreeNodeNested root>
-                    <TreeNodeNestedMessage><Translate token='app_navigationTree_drop_here' /></TreeNodeNestedMessage>
+                    <TreeNodeNestedMessage>
+                      <Translate token="app_navigationTree_drop_here" />
+                    </TreeNodeNestedMessage>
                   </TreeNodeNested>
                 </drop-outside>
-                <ElementsTreeContentLoader
-                  context={context}
-                  emptyPlaceholder={emptyPlaceholder}
-                  childrenState={tree}
-                >
+                <ElementsTreeContentLoader context={context} emptyPlaceholder={emptyPlaceholder} childrenState={tree}>
                   <tree-elements>
                     <NavigationNodeNested
                       ref={dropOutside.nestedRef}
@@ -260,6 +260,6 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
           </box>
         </ElementsTreeContext.Provider>
       </tree-box>
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContentLoader.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContentLoader.tsx
index bbb14d571b..44bc19b279 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContentLoader.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContentLoader.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { getComputed, Loader, Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { getComputed, Loader, Translate, TREE_NODE_STYLES, TreeNodeNestedMessage } from '@cloudbeaver/core-blocks';
 import type { ILoadableState } from '@cloudbeaver/core-utils';
 
 import type { IElementsTreeContext } from './ElementsTreeContext';
@@ -28,30 +27,21 @@ export const ElementsTreeContentLoader = observer<React.PropsWithChildren<Props>
 }) {
   const hasChildren = getComputed(() => context.tree.getNodeChildren(context.tree.root).length > 0);
 
-  const loading = getComputed(() => (
-    childrenState.isLoading()
-    || context.tree.loading
-  ) && !context.tree.isLoaded());
+  const loading = getComputed(() => (childrenState.isLoading() || context.tree.loading) && !context.tree.isLoaded());
 
   if (!hasChildren) {
     if (loading) {
-      return (
-        <Loader />
-      );
+      return <Loader />;
     } else if (context.tree.filtering) {
       return styled(TREE_NODE_STYLES)(
         <TreeNodeNestedMessage>
-          <Translate token='app_navigationTree_node_no_results' filter={context.tree.filter} />
-        </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 />}</>;
     }
   }
 
-  return (
-    <Loader suspense>
-      {children}
-    </Loader>
-  );
+  return <Loader suspense>{children}</Loader>;
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContext.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContext.ts
index 1ba49ae8b1..aedbe7ada3 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContext.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { IFolderExplorerContext } from '@cloudbeaver/core-blocks';
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.ts
index 26bef5d9d1..9b94741c94 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const ElementsTreeLoader = React.lazy(async () => {
   const { ElementsTree } = await import('./ElementsTree');
   return { default: ElementsTree };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx
index 332a958725..e1063fb1ea 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -15,12 +14,12 @@ import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import type { IElementsTree } from '../useElementsTree';
 
 const filterStyle = css`
-    filter-box {
-      composes: theme-background-surface from global;
-      padding: 8px 12px;
-      flex: 0 0 auto;
-    }
-  `;
+  filter-box {
+    composes: theme-background-surface from global;
+    padding: 8px 12px;
+    flex: 0 0 auto;
+  }
+`;
 
 interface Props {
   tree: IElementsTree;
@@ -28,11 +27,7 @@ interface Props {
   className?: string;
 }
 
-export const ElementsTreeFilter = observer<Props>(function ElementsTreeFilter({
-  tree,
-  style,
-  className,
-}) {
+export const ElementsTreeFilter = observer<Props>(function ElementsTreeFilter({ tree, style, className }) {
   const [focusedRef] = useFocus<HTMLDivElement>({ focusFirstChild: true });
   const translate = useTranslate();
   const styles = useStyles(filterStyle, style);
@@ -42,13 +37,8 @@ export const ElementsTreeFilter = observer<Props>(function ElementsTreeFilter({
   }
 
   return styled(styles)(
-    <filter-box ref={focusedRef} className={className} as='div'>
-      <Filter
-        placeholder={translate('app_navigationTree_search')}
-        value={tree.filter}
-        max
-        onFilter={value => tree.setFilter(value as string)}
-      />
-    </filter-box>
+    <filter-box ref={focusedRef} className={className} as="div">
+      <Filter placeholder={translate('app_navigationTree_search')} value={tree.filter} max onFilter={value => tree.setFilter(value as string)} />
+    </filter-box>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
index 110a69d77f..9d1e1e0d63 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx
@@ -5,7 +5,6 @@
  * 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 React, { useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -23,45 +22,48 @@ import type { IElementsTreeSettingsProps } from './NavigationTreeSettings/Elemen
 import { NavigationTreeSettings } from './NavigationTreeSettings/NavigationTreeSettings';
 
 const toolsStyles = css`
-    [|primary] {
-      composes: theme-text-primary from global;
+  [|primary] {
+    composes: theme-text-primary from global;
+  }
+  tools {
+    composes: theme-background-surface from global;
+    display: block;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+  }
+  actions {
+    display: flex;
+    flex-direction: row;
+  }
+  fill {
+    flex: 1;
+  }
+  IconButton {
+    & Icon,
+    & StaticImage {
+      transition: transform 0.3s ease-in-out;
     }
-    tools {
-      composes: theme-background-surface from global;
-      display: block;
-      position: sticky;
-      top: 0;
-      z-index: 1;
-    }
-    actions {
-      display: flex;
-      flex-direction: row;
-    }
-    fill {
-      flex: 1;
-    }
-    IconButton {
-      & Icon, & StaticImage {
-        transition: transform .3s ease-in-out;
-      }
 
-      &[|opened] Icon, &[|opened] StaticImage {
-        transform: rotate(180deg);
-      }
+    &[|opened] Icon,
+    &[|opened] StaticImage {
+      transform: rotate(180deg);
+    }
 
-      &[|loading] Icon, &[|loading] StaticImage {
-        animation: rotating 1.5s linear infinite;
-      }
+    &[|loading] Icon,
+    &[|loading] StaticImage {
+      animation: rotating 1.5s linear infinite;
     }
-    @keyframes rotating {
-      from {
-        transform: rotate(0deg);
-      }
-      to {
-        transform: rotate(360deg);
-      }
+  }
+  @keyframes rotating {
+    from {
+      transform: rotate(0deg);
     }
-  `;
+    to {
+      transform: rotate(360deg);
+    }
+  }
+`;
 
 interface Props {
   tree: IElementsTree;
@@ -69,12 +71,7 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(function ElementsTreeTools({
-  tree,
-  settingsElements,
-  style,
-  children,
-}) {
+export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(function ElementsTreeTools({ tree, settingsElements, style, children }) {
   const root = tree.root;
   const translate = useTranslate();
   const [opened, setOpen] = useState(false);
@@ -92,7 +89,7 @@ export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(functi
       <actions>
         {tree.settings?.configurable && (
           <IconButton
-            name='/icons/settings_cog_sm.svg'
+            name="/icons/settings_cog_sm.svg"
             title={translate('ui_settings')}
             style={toolsStyles}
             img
@@ -103,7 +100,7 @@ export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(functi
         <fill />
         <ElementsTreeToolsMenu tree={tree} />
         <IconButton
-          name='/icons/refresh_sm.svg#root'
+          name="/icons/refresh_sm.svg#root"
           title={translate('app_navigationTree_refresh')}
           style={toolsStyles}
           disabled={loading}
@@ -112,11 +109,9 @@ export const ElementsTreeTools = observer<React.PropsWithChildren<Props>>(functi
           {...use({ primary: true, loading })}
         />
       </actions>
-      {tree.settings && opened && (
-        <NavigationTreeSettings tree={tree} elements={settingsElements} style={style} />
-      )}
+      {tree.settings && opened && <NavigationTreeSettings tree={tree} elements={settingsElements} style={style} />}
       <ElementsTreeFilter tree={tree} style={style} />
       {children}
-    </tools>
+    </tools>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenu.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenu.tsx
index fb14db4ee1..e58a624bf0 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenu.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenu.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -46,19 +45,19 @@ const MENU_STYLES = css`
     }
 
     & IconOrImage {
-        display: block;
-        width: 16px;
+      display: block;
+      width: 16px;
     }
 
     & menu-bar-item-label {
-        display: none;
+      display: none;
     }
 
     & Loader {
-        width: 16px;
+      width: 16px;
     }
   }
-  
+
   MenuSeparator {
     composes: theme-border-color-background from global;
     height: 100%;
@@ -66,7 +65,8 @@ const MENU_STYLES = css`
     border: 0 !important;
     border-right: 1px solid !important;
 
-    &:first-child, &:last-child {
+    &:first-child,
+    &:last-child {
       display: none;
     }
   }
@@ -92,6 +92,6 @@ export const ElementsTreeToolsMenu = observer<Props>(function ElementsTreeToolsM
   return styled(style)(
     <menu-wrapper className={className}>
       <MenuBar menu={menu} style={[MENU_STYLES]} />
-    </menu-wrapper>
+    </menu-wrapper>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService.ts
index 8e9f81a28f..b8ddd8956b 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService.ts
@@ -5,11 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { UserDataService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { ActionService, ACTION_COLLAPSE_ALL, ACTION_FILTER, DATA_CONTEXT_MENU, IAction, IDataContextProvider, KeyBindingService, MenuService } from '@cloudbeaver/core-view';
+import {
+  ACTION_COLLAPSE_ALL,
+  ACTION_FILTER,
+  ActionService,
+  DATA_CONTEXT_MENU,
+  IAction,
+  IDataContextProvider,
+  KeyBindingService,
+  MenuService,
+} from '@cloudbeaver/core-view';
 import { ConnectionSchemaManagerService } from '@cloudbeaver/plugin-datasource-context-switch';
 
 import { getNavigationTreeUserSettingsId } from '../../getNavigationTreeUserSettingsId';
@@ -31,7 +39,7 @@ export class ElementsTreeToolsMenuService {
     private readonly connectionSchemaManagerService: ConnectionSchemaManagerService,
     private readonly menuService: MenuService,
     private readonly localizationService: LocalizationService,
-  ) { }
+  ) {}
 
   register() {
     this.actionService.addHandler({
@@ -85,11 +93,7 @@ export class ElementsTreeToolsMenuService {
 
     this.menuService.addCreator({
       isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_ELEMENTS_TREE_TOOLS,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_LINK_OBJECT,
-        ACTION_COLLAPSE_ALL,
-      ],
+      getItems: (context, items) => [...items, ACTION_LINK_OBJECT, ACTION_COLLAPSE_ALL],
     });
 
     this.registerBindings();
@@ -98,10 +102,7 @@ export class ElementsTreeToolsMenuService {
   private registerBindings() {
     this.actionService.addHandler({
       id: 'nav-tree-filter',
-      isActionApplicable: (contexts, action) => (
-        action === ACTION_FILTER
-        && contexts.has(DATA_CONTEXT_NAV_TREE_ROOT)
-      ),
+      isActionApplicable: (contexts, action) => action === ACTION_FILTER && contexts.has(DATA_CONTEXT_NAV_TREE_ROOT),
       handler: this.switchFilter.bind(this),
     });
 
@@ -155,7 +156,7 @@ export class ElementsTreeToolsMenuService {
     const state = this.userDataService.getUserData(
       getNavigationTreeUserSettingsId(context),
       createElementsTreeSettings,
-      validateElementsTreeSettings
+      validateElementsTreeSettings,
     );
 
     state.filter = !state.filter;
@@ -182,4 +183,4 @@ export class ElementsTreeToolsMenuService {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/MENU_ELEMENTS_TREE_TOOLS.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/MENU_ELEMENTS_TREE_TOOLS.ts
index 72849e2e5d..7e069ce783 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/MENU_ELEMENTS_TREE_TOOLS.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/MENU_ELEMENTS_TREE_TOOLS.ts
@@ -5,7 +5,6 @@
  * 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_ELEMENTS_TREE_TOOLS = createMenu('elements-tree-tools', 'Tree tools menu');
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT.ts
index 13ef0dfe91..2d85c00fde 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT.ts
@@ -5,7 +5,6 @@
  * 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_NAV_TREE_ROOT = createDataContext<string | undefined>('nav-tree-root');
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx
index c5797e672e..1cd7a24041 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx
@@ -5,15 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, GroupTitle, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, GroupTitle, type PlaceholderComponent, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 
 import type { IElementsTreeSettingsProps } from './ElementsTreeSettingsService';
 
-export const ElementsTreeBaseSettingsForm: PlaceholderComponent<IElementsTreeSettingsProps>  = observer(function ElementsTreeBaseSettingsForm({
+export const ElementsTreeBaseSettingsForm: PlaceholderComponent<IElementsTreeSettingsProps> = observer(function ElementsTreeBaseSettingsForm({
   tree: { root, settings },
   style,
 }) {
@@ -71,6 +70,6 @@ export const ElementsTreeBaseSettingsForm: PlaceholderComponent<IElementsTreeSet
       >
         {translate('app_navigationTree_settings_folders_title')}
       </Switch>
-    </>
+    </>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService.ts
index d02c2a14ea..28f6a3ccc9 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/KEY_BINDING_ENABLE_FILTER.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/KEY_BINDING_ENABLE_FILTER.ts
index abf6834bfe..6cd98f220c 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/KEY_BINDING_ENABLE_FILTER.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/KEY_BINDING_ENABLE_FILTER.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
 export const KEY_BINDING_ENABLE_FILTER = createKeyBinding({
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx
index 8d360a83e9..d720cf80ec 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -34,12 +33,7 @@ interface Props extends IElementsTreeSettingsProps {
   className?: string;
 }
 
-export const NavigationTreeSettings = observer<Props>(function NavigationTreeSettings({
-  elements,
-  tree,
-  style,
-  className,
-}) {
+export const NavigationTreeSettings = observer<Props>(function NavigationTreeSettings({ elements, tree, style, className }) {
   const styles = useStyles(BASE_CONTAINERS_STYLES, expandStyles, style);
   const elementsTreeSettingsService = useService(ElementsTreeSettingsService);
 
@@ -47,14 +41,9 @@ export const NavigationTreeSettings = observer<Props>(function NavigationTreeSet
     <settings className={className}>
       <Group keepSize form gap dense>
         <Loader suspense>
-          <Placeholder
-            container={elementsTreeSettingsService.placeholder}
-            elements={elements}
-            tree={tree}
-            style={style}
-          />
+          <Placeholder container={elementsTreeSettingsService.placeholder} elements={elements} tree={tree} style={style} />
         </Loader>
       </Group>
-    </settings>
+    </settings>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
index 682c6fad48..d49312e361 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IElementsTreeSettings } from '../../useElementsTree';
 
 export function createElementsTreeSettings(defaults?: Partial<IElementsTreeSettings>): IElementsTreeSettings {
@@ -24,14 +23,14 @@ export function createElementsTreeSettings(defaults?: Partial<IElementsTreeSetti
 
 export function validateElementsTreeSettings(data: any): boolean {
   return (
-    typeof data === 'object'
-    && typeof data.filterAll === 'boolean'
-    && typeof data.filter === 'boolean'
-    && typeof data.saveFilter === 'boolean'
-    && typeof data.saveExpanded === 'boolean'
-    && typeof data.foldersTree === 'boolean'
-    && typeof data.showFolderExplorerPath === 'boolean'
-    && typeof data.configurable === 'boolean'
-    && typeof data.projects === 'boolean'
+    typeof data === 'object' &&
+    typeof data.filterAll === 'boolean' &&
+    typeof data.filter === 'boolean' &&
+    typeof data.saveFilter === 'boolean' &&
+    typeof data.saveExpanded === 'boolean' &&
+    typeof data.foldersTree === 'boolean' &&
+    typeof data.showFolderExplorerPath === 'boolean' &&
+    typeof data.configurable === 'boolean' &&
+    typeof data.projects === 'boolean'
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/IElementsTreeAction.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/IElementsTreeAction.ts
index b4447bfe53..5b052ebaa6 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/IElementsTreeAction.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/IElementsTreeAction.ts
@@ -9,4 +9,4 @@
 export interface IElementsTreeAction {
   type: 'show';
   nodeId: string;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_COLLAPSE_ALL.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_COLLAPSE_ALL.ts
index d1549cd46f..15fb38117f 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_COLLAPSE_ALL.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_COLLAPSE_ALL.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_COLLAPSE_ALL = createKeyBinding({
   id: 'collapse-all',
   label: 'Ctrl + Shift + /',
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_LINK_OBJECT.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_LINK_OBJECT.ts
index aeb97c5292..8d2ad2db83 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_LINK_OBJECT.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/KEY_BINDING_LINK_OBJECT.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_LINK_OBJECT = createKeyBinding({
   id: 'link-object',
   label: 'Ctrl + Shift + ,',
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/MENU_NAV_TREE.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/MENU_NAV_TREE.ts
index 3a3892f317..c1c9ec9d58 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/MENU_NAV_TREE.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/MENU_NAV_TREE.ts
@@ -5,7 +5,6 @@
  * 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_NAV_TREE = createMenu('nav-tree', 'Menu');
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavNodeFilterCompareFn.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavNodeFilterCompareFn.ts
index 6345d3706c..ea00648d26 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavNodeFilterCompareFn.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavNodeFilterCompareFn.ts
@@ -5,14 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavNode } from '@cloudbeaver/core-navigation-tree';
 
-
 export enum EEquality {
   none,
   partially,
-  full
+  full,
 }
 
-export type NavNodeFilterCompareFn = (node: NavNode, filter: string)=> EEquality;
\ No newline at end of file
+export type NavNodeFilterCompareFn = (node: NavNode, filter: string) => EEquality;
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitFilter.ts
index ce8d30c85d..3b2bad6d13 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitFilter.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 
 import type { IElementsTreeFilter } from '../useElementsTree';
@@ -14,10 +13,7 @@ export const NAVIGATION_TREE_LIMIT = {
   limit: 'nav-tree://limit',
 };
 
-export function elementsTreeLimitFilter(
-  navTreeResource: NavTreeResource,
-  limit?: number
-): IElementsTreeFilter {
+export function elementsTreeLimitFilter(navTreeResource: NavTreeResource, limit?: number): IElementsTreeFilter {
   return (tree, filter, node, children) => {
     limit = limit ?? navTreeResource.childrenLimit;
     const nextChildren = children.slice(0, limit);
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx
index ab8e7553d1..22d8c46e11 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -25,13 +24,17 @@ export function elementsTreeLimitRenderer(nodeId: string): NavigationNodeRendere
 }
 
 const styles = css`
-    connection-group {
-      composes: theme-text-text-hint-on-light theme-typography--caption from global;
-      padding: 4px 32px;
-    }
-  `;
+  connection-group {
+    composes: theme-text-text-hint-on-light theme-typography--caption from global;
+    padding: 4px 32px;
+  }
+`;
 
 const ManageableGroup: NavigationNodeRendererComponent = observer(function ManageableGroup() {
   const navTreeResource = useService(NavTreeResource);
-  return styled(styles)(<connection-group><Translate token='app_navigationTree_limited' limit={navTreeResource.childrenLimit} /></connection-group>);
+  return styled(styles)(
+    <connection-group>
+      <Translate token="app_navigationTree_limited" limit={navTreeResource.childrenLimit} />
+    </connection-group>,
+  );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationNodeComponent.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationNodeComponent.ts
index 735b5a908d..4b9b016f9c 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationNodeComponent.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationNodeComponent.ts
@@ -5,13 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type React from 'react';
 
 import type { NavNode } from '@cloudbeaver/core-navigation-tree';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
-
 export type NavTreeNodeComponent = React.FC<{
   nodeId: string;
   path: string[];
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx
index ba49acd40c..afc9b36562 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx
@@ -5,14 +5,13 @@
  * 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 { useDeferredValue, useEffect } from 'react';
-import styled, { use, css } from 'reshadow';
+import styled, { css, use } from 'reshadow';
 
 import { getComputed, TreeNode, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { NavNodeManagerService, DATA_CONTEXT_NAV_NODE, DATA_CONTEXT_NAV_NODES } from '@cloudbeaver/core-navigation-tree';
+import { DATA_CONTEXT_NAV_NODE, DATA_CONTEXT_NAV_NODES, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { useDNDData } from '@cloudbeaver/core-ui';
 import { useDataContext } from '@cloudbeaver/core-view';
 
@@ -85,9 +84,12 @@ export const NavigationNode: NavigationNodeComponent = observer(function Navigat
   const hasNodes = getComputed(() => !!dndBox.state.context && dndBox.state.canDrop && dndBox.state.isOverCurrent);
   const expanded = useDeferredValue(navNode.expanded || externalExpanded);
 
-  useEffect(() => () => {
-    navNode.setDnDState(dndData, false);
-  }, []);
+  useEffect(
+    () => () => {
+      navNode.setDnDState(dndData, false);
+    },
+    [],
+  );
 
   return styled(useStyles(style, styles))(
     <TreeNode
@@ -117,13 +119,7 @@ export const NavigationNode: NavigationNodeComponent = observer(function Navigat
         style={style}
         node={node}
       />
-      {expanded && (
-        <NavigationNodeNested
-          nodeId={node.id}
-          path={path}
-          component={component}
-        />
-      )}
-    </TreeNode>
+      {expanded && <NavigationNodeNested nodeId={node.id} path={path} component={component} />}
+    </TreeNode>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/DATA_ATTRIBUTE_NODE_EDITING.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/DATA_ATTRIBUTE_NODE_EDITING.ts
index ba3b388e35..ec9a2bc7c8 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/DATA_ATTRIBUTE_NODE_EDITING.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/DATA_ATTRIBUTE_NODE_EDITING.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const DATA_ATTRIBUTE_NODE_EDITING = 'data-editing';
\ No newline at end of file
+export const DATA_ATTRIBUTE_NODE_EDITING = 'data-editing';
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
index de9da61746..37327ef165 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
@@ -5,15 +5,26 @@
  * 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 React, { forwardRef, useContext, useDeferredValue, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { ConnectionImageWithMask, getComputed, TreeNodeContext, TreeNodeControl, TreeNodeExpand, TreeNodeIcon, TreeNodeName, TREE_NODE_STYLES, useObjectRef, useMouseContextMenu, Loader } from '@cloudbeaver/core-blocks';
+import {
+  ConnectionImageWithMask,
+  getComputed,
+  Loader,
+  TREE_NODE_STYLES,
+  TreeNodeContext,
+  TreeNodeControl,
+  TreeNodeExpand,
+  TreeNodeIcon,
+  TreeNodeName,
+  useMouseContextMenu,
+  useObjectRef,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
-import { NavNodeInfoResource, NavTreeResource, EObjectFeature, type INodeActions } from '@cloudbeaver/core-navigation-tree';
+import { EObjectFeature, type INodeActions, NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 
 import { ElementsTreeContext } from '../../ElementsTreeContext';
 import type { NavTreeControlComponent, NavTreeControlProps } from '../../NavigationNodeComponent';
@@ -21,7 +32,6 @@ import { TreeNodeMenuLoader } from '../TreeNodeMenu/TreeNodeMenuLoader';
 import { DATA_ATTRIBUTE_NODE_EDITING } from './DATA_ATTRIBUTE_NODE_EDITING';
 import { NavigationNodeEditorLoader } from './NavigationNodeLoaders';
 
-
 const styles = css`
   TreeNodeControl {
     transition: opacity 0.3s ease;
@@ -31,8 +41,8 @@ const styles = css`
       opacity: 0.5;
     }
   }
-  TreeNodeControl:hover > portal, 
-  TreeNodeControl:global([aria-selected=true]) > portal,
+  TreeNodeControl:hover > portal,
+  TreeNodeControl:global([aria-selected='true']) > portal,
   portal:focus-within {
     visibility: visible;
   }
@@ -47,7 +57,7 @@ const styles = css`
       overflow: visible;
       margin-left: 2px;
     }
-  } 
+  }
   portal {
     position: relative;
     box-sizing: border-box;
@@ -61,88 +71,77 @@ const styles = css`
   }
 `;
 
-export const NavigationNodeControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(forwardRef(function NavigationNodeControl({
-  node,
-  dndElement,
-  dndPlaceholder,
-}, ref) {
-  const mouseContextMenu = useMouseContextMenu();
-  const treeNodeContext = useContext(TreeNodeContext);
-  const treeContext = useContext(ElementsTreeContext);
-  const navNodeInfoResource = useService(NavNodeInfoResource);
-  const navTreeResource = useService(NavTreeResource);
-  const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
-  const error = getComputed(() => (
-    !!navNodeInfoResource.getException(node.id)
-    || !!navTreeResource.getException(node.id)
-  ));
-  const connected = getComputed(() => node.objectFeatures.includes(EObjectFeature.dataSourceConnected));
-  const selected = treeNodeContext.selected;
+export const NavigationNodeControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(
+  forwardRef(function NavigationNodeControl({ node, dndElement, dndPlaceholder }, ref) {
+    const mouseContextMenu = useMouseContextMenu();
+    const treeNodeContext = useContext(TreeNodeContext);
+    const treeContext = useContext(ElementsTreeContext);
+    const navNodeInfoResource = useService(NavNodeInfoResource);
+    const navTreeResource = useService(NavTreeResource);
+    const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
+    const error = getComputed(() => !!navNodeInfoResource.getException(node.id) || !!navTreeResource.getException(node.id));
+    const connected = getComputed(() => node.objectFeatures.includes(EObjectFeature.dataSourceConnected));
+    const selected = treeNodeContext.selected;
 
-  const [editing, setEditing] = useState(false);
+    const [editing, setEditing] = useState(false);
 
-  const nodeActions = useObjectRef<INodeActions>({
-    rename: () => {
-      setEditing(true);
-    },
-  });
+    const nodeActions = useObjectRef<INodeActions>({
+      rename: () => {
+        setEditing(true);
+      },
+    });
 
-  let icon = node.icon;
+    let icon = node.icon;
 
-  if (error) {
-    icon = '/icons/error_icon_sm.svg';
-  }
+    if (error) {
+      icon = '/icons/error_icon_sm.svg';
+    }
 
-  function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
-    EventContext.set(event, EventStopPropagationFlag);
-    treeNodeContext.select();
-  }
+    function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
+      EventContext.set(event, EventStopPropagationFlag);
+      treeNodeContext.select();
+    }
 
-  function onClickHandler(event: React.MouseEvent<HTMLDivElement>) {
-    treeNodeContext.select(event.ctrlKey || event.metaKey);
-  }
+    function onClickHandler(event: React.MouseEvent<HTMLDivElement>) {
+      treeNodeContext.select(event.ctrlKey || event.metaKey);
+    }
 
-  function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
-    mouseContextMenu.handleContextMenuOpen(event);
-    treeNodeContext.select();
-  }
+    function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
+      mouseContextMenu.handleContextMenuOpen(event);
+      treeNodeContext.select();
+    }
 
-  const expandable = useDeferredValue(getComputed(() => treeContext?.tree.isNodeExpandable(node.id) ?? true));
-  const filterActive = useDeferredValue(getComputed(() => treeContext?.tree.filtering));
+    const expandable = useDeferredValue(getComputed(() => treeContext?.tree.isNodeExpandable(node.id) ?? true));
+    const filterActive = useDeferredValue(getComputed(() => treeContext?.tree.filtering));
 
-  const attributes = { [DATA_ATTRIBUTE_NODE_EDITING]: editing };
+    const attributes = { [DATA_ATTRIBUTE_NODE_EDITING]: editing };
 
-  return styled(TREE_NODE_STYLES, styles)(
-    <TreeNodeControl
-      ref={ref}
-      {...attributes}
-      onClick={onClickHandler}
-      onContextMenu={handleContextMenuOpen}
-      {...use({ outdated, editing, dragging: dndElement })}
-    >
-      {expandable && <TreeNodeExpand filterActive={filterActive} />}
-      <TreeNodeIcon {...use({ connected })}>
-        <ConnectionImageWithMask icon={icon} connected={connected} maskId="tree-node-icon" />
-      </TreeNodeIcon>
-      <TreeNodeName title={node.name} {...use({ editing })}>
-        <Loader suspense inline fullSize>
-          {editing ? (
-            <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} />
-          ) : (
-            <name-box>{node.name}</name-box>
-          )}
-        </Loader>
-      </TreeNodeName>
-      {!editing && !dndPlaceholder && (
-        <portal onClick={handlePortalClick}>
-          <TreeNodeMenuLoader
-            mouseContextMenu={mouseContextMenu}
-            node={node}
-            actions={nodeActions}
-            selected={selected}
-          />
-        </portal>
-      )}
-    </TreeNodeControl>
-  );
-}));
+    return styled(
+      TREE_NODE_STYLES,
+      styles,
+    )(
+      <TreeNodeControl
+        ref={ref}
+        {...attributes}
+        onClick={onClickHandler}
+        onContextMenu={handleContextMenuOpen}
+        {...use({ outdated, editing, dragging: dndElement })}
+      >
+        {expandable && <TreeNodeExpand filterActive={filterActive} />}
+        <TreeNodeIcon {...use({ connected })}>
+          <ConnectionImageWithMask icon={icon} connected={connected} maskId="tree-node-icon" />
+        </TreeNodeIcon>
+        <TreeNodeName title={node.name} {...use({ editing })}>
+          <Loader suspense inline fullSize>
+            {editing ? <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} /> : <name-box>{node.name}</name-box>}
+          </Loader>
+        </TreeNodeName>
+        {!editing && !dndPlaceholder && (
+          <portal onClick={handlePortalClick}>
+            <TreeNodeMenuLoader mouseContextMenu={mouseContextMenu} node={node} actions={nodeActions} selected={selected} />
+          </portal>
+        )}
+      </TreeNodeControl>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeEditor.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeEditor.tsx
index f37361b81b..ae11996402 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeEditor.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeEditor.tsx
@@ -5,7 +5,6 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -63,7 +62,7 @@ export const NavigationNodeEditor = observer<Props>(function NavigationNodeEdito
     <InlineEditor
       value={name}
       disabled={loading}
-      controlsPosition='inside'
+      controlsPosition="inside"
       style={styles}
       simple
       autofocus
@@ -73,6 +72,6 @@ export const NavigationNodeEditor = observer<Props>(function NavigationNodeEdito
       onReject={onClose}
       onBlur={onClose}
       onClick={stopPropagation}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeLoaders.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeLoaders.ts
index 71ff889d9f..2e534badc5 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeLoaders.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeLoaders.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const NavigationNodeControlLoader = React.lazy(async () => {
@@ -16,4 +15,4 @@ export const NavigationNodeControlLoader = React.lazy(async () => {
 export const NavigationNodeEditorLoader = React.lazy(async () => {
   const { NavigationNodeEditor } = await import('./NavigationNodeEditor');
   return { default: NavigationNodeEditor };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
index 21106f4b70..3f5766e145 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
@@ -5,12 +5,11 @@
  * 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 { forwardRef, useContext, useDeferredValue, useMemo } from 'react';
 import styled from 'reshadow';
 
-import { getComputed, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES, useTranslate } from '@cloudbeaver/core-blocks';
+import { getComputed, TREE_NODE_STYLES, TreeNodeNested, TreeNodeNestedMessage, useTranslate } from '@cloudbeaver/core-blocks';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 import { ElementsTreeContext } from '../../ElementsTreeContext';
@@ -24,63 +23,47 @@ interface Props {
   className?: string;
 }
 
-export const NavigationNodeNested = observer(forwardRef<HTMLDivElement, Props>(function NavigationNodeNested({
-  nodeId,
-  component,
-  path,
-  root,
-  className,
-}, ref) {
-  const treeContext = useContext(ElementsTreeContext);
-  const translate = useTranslate();
+export const NavigationNodeNested = observer(
+  forwardRef<HTMLDivElement, Props>(function NavigationNodeNested({ nodeId, component, path, root, className }, ref) {
+    const treeContext = useContext(ElementsTreeContext);
+    const translate = useTranslate();
 
-  const NavigationNode = component;
-  const nextPath = useMemo(() => [...path, nodeId].filter((a): a is string => a !== undefined), [path, nodeId]);
-  let children: string[] = [];
-  let empty = true;
-  let rootFolder = false;
+    const NavigationNode = component;
+    const nextPath = useMemo(() => [...path, nodeId].filter((a): a is string => a !== undefined), [path, nodeId]);
+    let children: string[] = [];
+    let empty = true;
+    let rootFolder = false;
 
-  if (nodeId !== undefined) {
-    rootFolder = getComputed(() => (
-      !!root && treeContext?.folderExplorer.state.folder !== treeContext?.folderExplorer.root
-    ));
+    if (nodeId !== undefined) {
+      rootFolder = getComputed(() => !!root && treeContext?.folderExplorer.state.folder !== treeContext?.folderExplorer.root);
 
-    if (!rootFolder) {
-      children = getComputed(
-        () => treeContext?.tree.getNodeChildren(nodeId) || [],
-        (a, b) => isArraysEqual(a, b, undefined, true));
-      empty = getComputed(() => (
-        children.length === 0 && (
-          !treeContext?.tree.filtering
-        || !!treeContext.tree.getNodeState(nodeId).showInFilter
-        )
-      ));
+      if (!rootFolder) {
+        children = getComputed(
+          () => treeContext?.tree.getNodeChildren(nodeId) || [],
+          (a, b) => isArraysEqual(a, b, undefined, true),
+        );
+        empty = getComputed(() => children.length === 0 && (!treeContext?.tree.filtering || !!treeContext.tree.getNodeState(nodeId).showInFilter));
+      }
     }
-  }
 
-  children = useDeferredValue(children);
-  empty = useDeferredValue(empty);
+    children = useDeferredValue(children);
+    empty = useDeferredValue(empty);
+
+    if (nodeId !== undefined && rootFolder) {
+      return styled(TREE_NODE_STYLES)(<NavigationNode nodeId={nodeId} path={path} expanded />);
+    }
 
-  if (nodeId !== undefined && rootFolder) {
     return styled(TREE_NODE_STYLES)(
-      <NavigationNode nodeId={nodeId} path={path} expanded />
+      <TreeNodeNested ref={ref} root={root} className={className}>
+        {children.map(child => (
+          <NavigationNode key={child} nodeId={child} path={nextPath} />
+        ))}
+        {empty && (
+          <TreeNodeNestedMessage>
+            {translate(nodeId === undefined ? 'app_navigationTree_connection_group_user' : 'app_navigationTree_node_empty')}
+          </TreeNodeNestedMessage>
+        )}
+      </TreeNodeNested>,
     );
-  }
-
-  return styled(TREE_NODE_STYLES)(
-    <TreeNodeNested ref={ref} root={root} className={className}>
-      {children.map(child => (
-        <NavigationNode key={child} nodeId={child} path={nextPath} />
-      ))}
-      {empty && (
-        <TreeNodeNestedMessage>
-          {translate(
-            nodeId === undefined
-              ? 'app_navigationTree_connection_group_user'
-              : 'app_navigationTree_node_empty'
-          )}
-        </TreeNodeNestedMessage>
-      )}
-    </TreeNodeNested>
-  );
-}));
+  }),
+);
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.tsx
index a3a7e15f0e..a6b7d29c15 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef, useContext, useDeferredValue, useEffect, useRef, useState } from 'react';
 
@@ -26,68 +25,58 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const NavigationNodeControlRenderer = observer<Props, HTMLDivElement>(forwardRef(function NavigationNodeControlRenderer({
-  node,
-  navNode,
-  dragging,
-  control: externalControl,
-  style,
-}, ref) {
-  const elementRef = useRef<HTMLDivElement | null>(null);
-  const [size, setSize] = useState(24);
-  const contextRef = useObjectRef({
-    context: useContext(ElementsTreeContext),
-  });
-  const Control = navNode.control || externalControl || NavigationNodeControlLoader;
-  const observer = useRef<IntersectionObserver | null>(null);
+export const NavigationNodeControlRenderer = observer<Props, HTMLDivElement>(
+  forwardRef(function NavigationNodeControlRenderer({ node, navNode, dragging, control: externalControl, style }, ref) {
+    const elementRef = useRef<HTMLDivElement | null>(null);
+    const [size, setSize] = useState(24);
+    const contextRef = useObjectRef({
+      context: useContext(ElementsTreeContext),
+    });
+    const Control = navNode.control || externalControl || NavigationNodeControlLoader;
+    const observer = useRef<IntersectionObserver | null>(null);
 
-  useEffect(() => {
-    if (elementRef.current) {
-      observer.current = new IntersectionObserver(entries => {
-        for (const entry of entries) {
-          if (entry.target === elementRef.current) {
-            if (entry.isIntersecting) {
-              setSize(-1);
-            } else {
-              setSize(elementRef.current.offsetHeight);
+    useEffect(() => {
+      if (elementRef.current) {
+        observer.current = new IntersectionObserver(
+          entries => {
+            for (const entry of entries) {
+              if (entry.target === elementRef.current) {
+                if (entry.isIntersecting) {
+                  setSize(-1);
+                } else {
+                  setSize(elementRef.current.offsetHeight);
+                }
+              }
             }
-          }
+          },
+          {
+            root: contextRef.context?.getTreeRoot(),
+            threshold: 0,
+          },
+        );
+        observer.current.observe(elementRef.current);
+      }
+      return () => observer.current?.disconnect();
+    });
+
+    function setRef(element: HTMLDivElement | null) {
+      elementRef.current = element;
+
+      if (ref) {
+        if (typeof ref === 'function') {
+          ref(element);
+        } else {
+          ref.current = element;
         }
-      }, {
-        root: contextRef.context?.getTreeRoot(),
-        threshold: 0,
-      });
-      observer.current.observe(elementRef.current);
-    }
-    return () => observer.current?.disconnect();
-  });
-
-  function setRef(element: HTMLDivElement | null) {
-    elementRef.current = element;
-
-    if (ref) {
-      if (typeof ref === 'function') {
-        ref(element);
-      } else {
-        ref.current = element;
       }
     }
-  }
 
-  const displayed = useDeferredValue(size !== -1);
+    const displayed = useDeferredValue(size !== -1);
 
-  if (displayed) {
-    return (
-      <div ref={setRef} style={{ height:`${size}px` }} />
-    );
-  }
+    if (displayed) {
+      return <div ref={setRef} style={{ height: `${size}px` }} />;
+    }
 
-  return (
-    <Control
-      ref={setRef}
-      dndElement={dragging}
-      style={style}
-      node={node}
-    />
-  );
-}));
\ No newline at end of file
+    return <Control ref={setRef} dndElement={dragging} style={style} node={node} />;
+  }),
+);
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx
index 3903d3f6dd..ebc9a7b3d2 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx
@@ -5,24 +5,17 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
 
 import { getComputed, TreeNode, useObjectRef, useStyles } from '@cloudbeaver/core-blocks';
 
-
 import { ElementsTreeContext } from '../ElementsTreeContext';
 import type { NavigationNodeComponent } from '../NavigationNodeComponent';
 import { NavigationNodeControlLoader } from './NavigationNode/NavigationNodeLoaders';
 
-export const NavigationNodeDragged: NavigationNodeComponent = observer(function NavigationNode({
-  node,
-  className,
-  control: externalControl,
-  style,
-}) {
+export const NavigationNodeDragged: NavigationNodeComponent = observer(function NavigationNode({ node, className, control: externalControl, style }) {
   const contextRef = useObjectRef({
     context: useContext(ElementsTreeContext),
   });
@@ -34,6 +27,6 @@ export const NavigationNodeDragged: NavigationNodeComponent = observer(function
     <TreeNode externalExpanded={false} className={className} leaf>
       {/* <DNDPreview data={dndData} src="/icons/empty.svg" /> */}
       <Control node={node} dndPlaceholder />
-    </TreeNode>
+    </TreeNode>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx
index 1a75efc522..1b4e1d0fd4 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx
@@ -5,12 +5,11 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
 
-import { Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { Translate, TREE_NODE_STYLES, TreeNodeNestedMessage } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 
@@ -18,13 +17,7 @@ import { ElementsTreeContext } from '../ElementsTreeContext';
 import type { NavTreeNodeComponent } from '../NavigationNodeComponent';
 import { NavigationNodeRendererLoader } from './NavigationNodeRendererLoader';
 
-export const NavigationNodeElement: NavTreeNodeComponent = observer(function NavigationNodeElement({
-  nodeId,
-  path,
-  expanded,
-  dragging,
-  className,
-}) {
+export const NavigationNodeElement: NavTreeNodeComponent = observer(function NavigationNodeElement({ nodeId, path, expanded, dragging, className }) {
   const context = useContext(ElementsTreeContext);
   const navNodeInfoResource = useService(NavNodeInfoResource);
 
@@ -52,8 +45,8 @@ export const NavigationNodeElement: NavTreeNodeComponent = observer(function Nav
   if (!node) {
     return styled(TREE_NODE_STYLES)(
       <TreeNodeNestedMessage>
-        <Translate token='app_navigationTree_node_not_found' />
-      </TreeNodeNestedMessage>
+        <Translate token="app_navigationTree_node_not_found" />
+      </TreeNodeNestedMessage>,
     );
   }
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRenderer.tsx
index 7035845757..0773ba2bb8 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRenderer.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRenderer.tsx
@@ -5,21 +5,16 @@
  * 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 type { NavigationNodeComponent } from '../NavigationNodeComponent';
 import { NavigationNode } from './NavigationNode';
 import { NavigationNodeDragged } from './NavigationNodeDragged';
 
-export const NavigationNodeRenderer: NavigationNodeComponent = observer(function NavigationNodeRenderer({
-  dragging,
-  ...rest
-}) {
-
+export const NavigationNodeRenderer: NavigationNodeComponent = observer(function NavigationNodeRenderer({ dragging, ...rest }) {
   if (dragging) {
     return <NavigationNodeDragged {...rest} />;
   }
 
   return <NavigationNode {...rest} />;
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRendererLoader.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRendererLoader.ts
index 466dd90032..ff052c5888 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRendererLoader.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeRendererLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const NavigationNodeRendererLoader = React.lazy(async () => {
   const { NavigationNodeRenderer } = await import('./NavigationNodeRenderer');
   return { default: NavigationNodeRenderer };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/DATA_CONTEXT_NAV_NODE_ACTIONS.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/DATA_CONTEXT_NAV_NODE_ACTIONS.ts
index 5dc52277be..131a777b62 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/DATA_CONTEXT_NAV_NODE_ACTIONS.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/DATA_CONTEXT_NAV_NODE_ACTIONS.ts
@@ -5,9 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { INodeActions } from '@cloudbeaver/core-navigation-tree';
 import { createDataContext } from '@cloudbeaver/core-view';
 
-
 export const DATA_CONTEXT_NAV_NODE_ACTIONS = createDataContext<INodeActions>('nav-node-actions');
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.tsx
index 9030fc268f..682b4a13dd 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.tsx
@@ -5,14 +5,13 @@
  * 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, { use } from 'reshadow';
 
 import { getComputed, Icon, IMouseContextMenu } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
-import { type NavNode, type INodeActions, DATA_CONTEXT_NAV_NODE } from '@cloudbeaver/core-navigation-tree';
+import { DATA_CONTEXT_NAV_NODE, type INodeActions, type NavNode } from '@cloudbeaver/core-navigation-tree';
 import { ContextMenu } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_CONNECTION } from '@cloudbeaver/plugin-connections';
@@ -29,13 +28,7 @@ interface Props {
   onClose?: () => void;
 }
 
-export const TreeNodeMenu = observer<Props>(function TreeNodeMenu({
-  node,
-  actions,
-  selected,
-  mouseContextMenu,
-  onClose,
-}) {
+export const TreeNodeMenu = observer<Props>(function TreeNodeMenu({ node, actions, selected, mouseContextMenu, onClose }) {
   const connectionsInfoResource = useService(ConnectionInfoResource);
   const menu = useMenu({ menu: MENU_NAV_TREE });
   menu.context.set(DATA_CONTEXT_NAV_NODE, node);
@@ -54,14 +47,8 @@ export const TreeNodeMenu = observer<Props>(function TreeNodeMenu({
   }
 
   return styled(treeNodeMenuStyles)(
-    <ContextMenu
-      menu={menu}
-      mouseContextMenu={mouseContextMenu}
-      onVisibleSwitch={handleVisibleSwitch}
-      {...use({ selected })}
-      modal
-    >
+    <ContextMenu menu={menu} mouseContextMenu={mouseContextMenu} onVisibleSwitch={handleVisibleSwitch} {...use({ selected })} modal>
       <Icon name="snack" viewBox="0 0 16 10" />
-    </ContextMenu>
+    </ContextMenu>,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenuLoader.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenuLoader.ts
index 68290a6677..48da61c359 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenuLoader.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenuLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const TreeNodeMenuLoader = React.lazy(async () => {
   const { TreeNodeMenu } = await import('./TreeNodeMenu');
   return { default: TreeNodeMenu };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/treeNodeMenuStyles.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/treeNodeMenuStyles.ts
index e34b647136..aee194e05b 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/treeNodeMenuStyles.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/treeNodeMenuStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const treeNodeMenuStyles = css`
@@ -25,8 +24,8 @@ export const treeNodeMenuStyles = css`
       fill: #dedede;
     }
 
-    &[|selected] Icon, 
-    &:hover Icon, 
+    &[|selected] Icon,
+    &:hover Icon,
     &:focus Icon {
       fill: #338fcc;
     }
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/isDraggingInsideProject.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/isDraggingInsideProject.ts
index 2ddb22b435..f2e9248763 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/isDraggingInsideProject.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/isDraggingInsideProject.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getNodesFromContext } from '@cloudbeaver/core-navigation-tree';
 import type { IDNDData } from '@cloudbeaver/core-ui';
 
@@ -24,4 +23,4 @@ export function isDraggingInsideProject(projectId: string, data: IDNDData[]) {
   }
 
   return false;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/useNavigationNode.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/useNavigationNode.ts
index df65d66f70..e30ba7b53c 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/useNavigationNode.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/useNavigationNode.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React, { useContext, useEffect, useRef } from 'react';
 
 import { getComputed, useExecutor, useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { SyncExecutor } from '@cloudbeaver/core-executor';
-import { type NavNode, NavNodeInfoResource, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
+import { EObjectFeature, type NavNode, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import type { IDNDData } from '@cloudbeaver/core-ui';
 
@@ -22,7 +21,6 @@ import type { IElementsTreeAction } from '../IElementsTreeAction';
 import type { NavTreeControlComponent } from '../NavigationNodeComponent';
 import type { IElementsTree } from '../useElementsTree';
 
-
 export interface INavigationNode {
   ref: React.RefObject<HTMLDivElement>;
   control?: NavTreeControlComponent;
@@ -66,32 +64,28 @@ export function useNavigationNode(node: NavNode, path: string[]): INavigationNod
   const control = getComputed(() => contextRef.context?.control);
   const disabled = getComputed(() => contextRef.context?.tree.disabled || false);
   const selected = getComputed(() => contextRef.context?.tree.isNodeSelected(node.id) || false);
-  const getSelected = () => navNodeInfoResource
-    .get(resourceKeyList(contextRef.context?.tree.getSelected() || []))
-    .filter(Boolean) as NavNode[];
-  const indeterminateSelected = getComputed(
-    () => contextRef.context?.tree.isNodeIndeterminateSelected(node.id) || false
-  );
+  const getSelected = () => navNodeInfoResource.get(resourceKeyList(contextRef.context?.tree.getSelected() || [])).filter(Boolean) as NavNode[];
+  const indeterminateSelected = getComputed(() => contextRef.context?.tree.isNodeIndeterminateSelected(node.id) || false);
 
   const handleClick = async (leaf: boolean) => await contextRef.context?.tree.click(node, path, leaf);
   const handleOpen = async (leaf: boolean) => await contextRef.context?.tree.open(node, path, leaf);
   const handleExpand = async () => await contextRef.context?.tree.expand(node, !expanded);
-  const handleSelect = async (
-    multiple = false,
-    nested = false
-  ) => await contextRef.context?.tree.select(node, multiple, nested);
+  const handleSelect = async (multiple = false, nested = false) => await contextRef.context?.tree.select(node, multiple, nested);
 
   function setDnDState(data: IDNDData, dragging: boolean): void {
     contextRef.context?.tree.setDnDData(data, dragging);
   }
 
-  useEffect(() => () => {
-    if (!contextRef.context?.selectionTree) {
-      if (contextRef.context?.tree.isNodeSelected(node.id)) {
-        contextRef.context.tree.select(node, true, false);
+  useEffect(
+    () => () => {
+      if (!contextRef.context?.selectionTree) {
+        if (contextRef.context?.tree.isNodeSelected(node.id)) {
+          contextRef.context.tree.select(node, true, false);
+        }
       }
-    }
-  }, [node]);
+    },
+    [node],
+  );
 
   useEffect(() => {
     if (contextRef.context?.tree.isNodeSelected(node.id)) {
@@ -101,11 +95,13 @@ export function useNavigationNode(node: NavNode, path: string[]): INavigationNod
 
   useExecutor({
     executor: contextRef.context?.tree.actions || new SyncExecutor<IElementsTreeAction>(),
-    handlers: [function refreshRoot({ type, nodeId }) {
-      if (type === 'show' && nodeId === node.id) {
-        elementRef.current?.scrollIntoView();
-      }
-    }],
+    handlers: [
+      function refreshRoot({ type, nodeId }) {
+        if (type === 'show' && nodeId === node.id) {
+          elementRef.current?.scrollIntoView();
+        }
+      },
+    ],
   });
 
   return useObjectRef({
@@ -131,19 +127,10 @@ export function useNavigationNode(node: NavNode, path: string[]): INavigationNod
   });
 }
 
-export function isLeaf(
-  node: NavNode,
-  children: string[] | undefined,
-  tree: IElementsTree | undefined,
-  outdated: boolean
-): boolean {
+export function isLeaf(node: NavNode, children: string[] | undefined, tree: IElementsTree | undefined, outdated: boolean): boolean {
   if (node.folder && tree?.settings?.foldersTree) {
     return false;
   }
 
-  return (
-    node.objectFeatures.includes(EObjectFeature.entity)
-    || !node.hasChildren
-    || (children?.length === 0 && !outdated)
-  );
+  return node.objectFeatures.includes(EObjectFeature.entity) || !node.hasChildren || (children?.length === 0 && !outdated);
 }
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/elementsTreeNameFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/elementsTreeNameFilter.ts
index 17c20be3cf..b8d0459de6 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/elementsTreeNameFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/elementsTreeNameFilter.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import type { NavTreeResource, NavNodeInfoResource, NavNode } from '@cloudbeaver/core-navigation-tree';
+import type { NavNode, NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import type { MetadataMap } from '@cloudbeaver/core-utils';
 
@@ -20,7 +19,7 @@ function isDefined<T>(val: T | undefined | null): val is T {
 export function elementsTreeNameFilter(
   navTreeResource: NavTreeResource,
   navNodeInfoResource: NavNodeInfoResource,
-  compare: NavNodeFilterCompareFn = elementsTreeNameFilterNode
+  compare: NavNodeFilterCompareFn = elementsTreeNameFilterNode,
 ): IElementsTreeFilter {
   return (tree, filter, node, children, state) => {
     const nodeState = state.get(node.id);
@@ -32,14 +31,7 @@ export function elementsTreeNameFilter(
     const nodes = navNodeInfoResource
       .get(resourceKeyList(children))
       .filter(isDefined)
-      .filter(child => filterNode(
-        navTreeResource,
-        navNodeInfoResource,
-        compare,
-        filter,
-        child,
-        state
-      ));
+      .filter(child => filterNode(navTreeResource, navNodeInfoResource, compare, filter, child, state));
 
     return nodes.map(node => node.id);
   };
@@ -51,11 +43,10 @@ function filterNode(
   compare: NavNodeFilterCompareFn,
   filter: string,
   node: NavNode,
-  state: MetadataMap<string, ITreeNodeState>
+  state: MetadataMap<string, ITreeNodeState>,
 ): boolean {
   const nodeState = state.get(node.id);
 
-
   if (compare(node, filter) !== EEquality.none || nodeState.showInFilter) {
     return true;
   }
@@ -66,14 +57,7 @@ function filterNode(
   return navNodeInfoResource
     .get(resourceKeyList(children))
     .filter(isDefined)
-    .some(child => filterNode(
-      navTreeResource,
-      navNodeInfoResource,
-      compare,
-      filter,
-      child,
-      state
-    ));
+    .some(child => filterNode(navTreeResource, navNodeInfoResource, compare, filter, child, state));
   // }
 
   // return false;
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useDropOutside.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useDropOutside.ts
index 3dfd3599a5..8165c83e66 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useDropOutside.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useDropOutside.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useRef } from 'react';
 
 import { getComputed, useMouse, useStateDelay } from '@cloudbeaver/core-blocks';
@@ -19,10 +18,7 @@ export function useDropOutside(dndBox: IDNDBox) {
     state: false,
     bottom: false,
   });
-  let showDropOutside = getComputed(() => (
-    !!dndBox.state.context
-    && dndBox.state.canDrop
-  ));
+  let showDropOutside = getComputed(() => !!dndBox.state.context && dndBox.state.canDrop);
   let bottom = false;
 
   const box = nestedRef.current?.getBoundingClientRect();
@@ -55,4 +51,4 @@ export function useDropOutside(dndBox: IDNDBox) {
     bottom,
     nestedRef,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
index 7954dbc44e..ca7c363d16 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable, runInAction } from 'mobx';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { IFolderExplorerContext, useExecutor, useResource, useObjectRef, useObservableRef, useUserData, getComputed } from '@cloudbeaver/core-blocks';
+import { getComputed, IFolderExplorerContext, useExecutor, useObjectRef, useObservableRef, useResource, useUserData } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -30,18 +29,14 @@ export interface IElementsTreeNodeExpandedInfo {
   expandable?: boolean;
 }
 
-export type IElementsTreeNodeExpandInfoGetter = (
-  tree: IElementsTree,
-  nodeId: string,
-  state: ITreeNodeState
-) => IElementsTreeNodeExpandedInfo | null;
+export type IElementsTreeNodeExpandInfoGetter = (tree: IElementsTree, nodeId: string, state: ITreeNodeState) => IElementsTreeNodeExpandedInfo | null;
 
 export type IElementsTreeFilter = (
   tree: IElementsTree,
   filter: string,
   node: NavNode,
   children: string[],
-  state: MetadataMap<string, ITreeNodeState>
+  state: MetadataMap<string, ITreeNodeState>,
 ) => string[];
 
 export interface ITreeNodeState {
@@ -136,11 +131,14 @@ export function useElementsTree(options: IOptions): IElementsTree {
   const navTreeResource = useService(NavTreeResource);
   const connectionInfoResource = useService(ConnectionInfoResource);
 
-  const [localTreeNodesState] = useState(() => new MetadataMap<string, ITreeNodeState>(() => ({
-    selected: false,
-    expanded: false,
-    showInFilter: false,
-  })));
+  const [localTreeNodesState] = useState(
+    () =>
+      new MetadataMap<string, ITreeNodeState>(() => ({
+        selected: false,
+        expanded: false,
+        showInFilter: false,
+      })),
+  );
 
   options = useObjectRef(options);
   options.renderers = useMemo(() => options.renderers || [], [...(options.renderers || [])]);
@@ -170,49 +168,51 @@ export function useElementsTree(options: IOptions): IElementsTree {
         while (children.length > 0) {
           const nextChildren: string[] = [];
 
-          await Promise.all(children.map(async child => {
-            await projectInfoResource.waitLoad();
-            await connectionInfoResource.waitLoad();
-            await navTreeResource.waitLoad();
-            await navNodeInfoResource.waitLoad();
+          await Promise.all(
+            children.map(async child => {
+              await projectInfoResource.waitLoad();
+              await connectionInfoResource.waitLoad();
+              await navTreeResource.waitLoad();
+              await navNodeInfoResource.waitLoad();
 
-            const expanded = elementsTree.isNodeExpanded(child, true);
-            if (!expanded && child !== options.root) {
-              if (navNodeInfoResource.isOutdated(child)) {
+              const expanded = elementsTree.isNodeExpanded(child, true);
+              if (!expanded && child !== options.root) {
+                if (navNodeInfoResource.isOutdated(child)) {
+                  const node = navNodeInfoResource.get(child);
+
+                  if (node?.parentId !== undefined && !navTreeResource.isOutdated(node.parentId)) {
+                    await navNodeInfoResource.load(child);
+                  }
+                }
+                return;
+              }
+
+              const loaded = await options.loadChildren(child, false);
+
+              if (!loaded) {
                 const node = navNodeInfoResource.get(child);
 
-                if (node?.parentId !== undefined && !navTreeResource.isOutdated(node.parentId)) {
-                  await navNodeInfoResource.load(child);
+                if (node) {
+                  await elementsTree.expand(node, false);
+                }
+                return;
+              }
+
+              if (
+                elementsTree.settings?.foldersTree &&
+                options.folderExplorer.options.expandFoldersWithSingleElement &&
+                child === options.root &&
+                elementsTree.getNodeChildren(child).length === 1
+              ) {
+                const nextNode = elementsTree.getNodeChildren(child)[0];
+
+                if (elementsTree.isNodeExpandable(nextNode) || elementsTree.isNodeExpanded(nextNode)) {
+                  options.folderExplorer.open(navNodeInfoResource.getParents(nextNode), nextNode);
                 }
               }
-              return;
-            }
-
-            const loaded = await options.loadChildren(child, false);
-
-            if (!loaded) {
-              const node = navNodeInfoResource.get(child);
-
-              if (node) {
-                await elementsTree.expand(node, false);
-              }
-              return;
-            }
-
-            if (
-              elementsTree.settings?.foldersTree
-              && options.folderExplorer.options.expandFoldersWithSingleElement
-              && child === options.root
-              && elementsTree.getNodeChildren(child).length === 1
-            ) {
-              const nextNode = elementsTree.getNodeChildren(child)[0];
-
-              if (elementsTree.isNodeExpandable(nextNode) || elementsTree.isNodeExpanded(nextNode)) {
-                options.folderExplorer.open(navNodeInfoResource.getParents(nextNode), nextNode);
-              }
-            }
-            nextChildren.push(...(navTreeResource.get(child) || []));
-          }));
+              nextChildren.push(...(navTreeResource.get(child) || []));
+            }),
+          );
 
           children = nextChildren;
         }
@@ -232,10 +232,7 @@ export function useElementsTree(options: IOptions): IElementsTree {
         const pathIndex = folderExplorer.state.fullPath.indexOf(nodeId);
 
         if (pathIndex >= 0) {
-          folderExplorer.open(
-            folderExplorer.state.fullPath.slice(0, pathIndex - 1),
-            folderExplorer.state.fullPath[pathIndex - 1]
-          );
+          folderExplorer.open(folderExplorer.state.fullPath.slice(0, pathIndex - 1), folderExplorer.state.fullPath[pathIndex - 1]);
         }
       });
     },
@@ -274,9 +271,7 @@ export function useElementsTree(options: IOptions): IElementsTree {
     async clearSelection(nodeId: string) {
       const node = navNodeInfoResource.get(nodeId);
 
-      const ignore = node && options.isGroup?.(node)
-        ? this.getNestedChildren(nodeId)
-        : [];
+      const ignore = node && options.isGroup?.(node) ? this.getNestedChildren(nodeId) : [];
 
       for (const [id, nodeState] of state) {
         if (nodeState.selected && id !== nodeId && !ignore.includes(id)) {
@@ -326,10 +321,11 @@ export function useElementsTree(options: IOptions): IElementsTree {
 
   const userData = useUserData<IElementsTreeUserState>(
     `elements-tree-${options.baseRoot}`,
-    () => observable<IElementsTreeUserState>({
-      nodeState: [],
-      filter: '',
-    }),
+    () =>
+      observable<IElementsTreeUserState>({
+        nodeState: [],
+        filter: '',
+      }),
     async data => {
       if (!options.settings?.saveFilter) {
         data.filter = '';
@@ -343,322 +339,321 @@ export function useElementsTree(options: IOptions): IElementsTree {
 
       await functionsRef.loadTree(options.root);
     },
-    data => (
-      typeof data === 'object'
-      && typeof data.filter === 'string'
-      && Array.isArray(data.nodeState)
-    )
+    data => typeof data === 'object' && typeof data.filter === 'string' && Array.isArray(data.nodeState),
   );
 
-  const elementsTree = useObservableRef<IElementsTree>(() => ({
-    actions: new SyncExecutor(),
-    activeDnDData: [],
-    loading: options.settings?.saveExpanded || false,
-    get filter(): string {
-      return this.userData.filter;
-    },
-    get filtering(): boolean {
-      return this.filter !== '';
-    },
-    isLoading(): boolean {
-      return this.loading;
-    },
-    isLoaded(): boolean {
-      return navNodeInfoResource.isLoaded(this.root);
-    },
-    getNodeState(nodeId: string) {
-      return this.state.get(nodeId);
-    },
-    isNodeExpanded(nodeId: string, ignoreFilter?: boolean): boolean {
-      if (nodeId === this.root) {
-        return true;
-      }
+  const elementsTree = useObservableRef<IElementsTree>(
+    () => ({
+      actions: new SyncExecutor(),
+      activeDnDData: [],
+      loading: options.settings?.saveExpanded || false,
+      get filter(): string {
+        return this.userData.filter;
+      },
+      get filtering(): boolean {
+        return this.filter !== '';
+      },
+      isLoading(): boolean {
+        return this.loading;
+      },
+      isLoaded(): boolean {
+        return navNodeInfoResource.isLoaded(this.root);
+      },
+      getNodeState(nodeId: string) {
+        return this.state.get(nodeId);
+      },
+      isNodeExpanded(nodeId: string, ignoreFilter?: boolean): boolean {
+        if (nodeId === this.root) {
+          return true;
+        }
 
-      if (this.filtering && this.settings?.filterAll && !ignoreFilter) {
-        return this.getNodeChildren(nodeId).length > 0;
-      }
+        if (this.filtering && this.settings?.filterAll && !ignoreFilter) {
+          return this.getNodeChildren(nodeId).length > 0;
+        }
 
-      const nodeState = this.getNodeState(nodeId);
-      const expanded = nodeState.expanded || nodeState.showInFilter;
-
-      if (!expanded && options.expandStateGetters?.length) {
-        return options
-          .expandStateGetters
-          .map(getExpandState => getExpandState(this, nodeId, nodeState))
-          .filter(stateInfo => stateInfo !== null)
-          .some(stateInfo => stateInfo?.expanded);
-      }
-
-      return expanded;
-    },
-    isNodeExpandable(nodeId: string): boolean {
-      if (nodeId === this.root) {
-        return true;
-      }
-
-      if (options.expandStateGetters?.length) {
         const nodeState = this.getNodeState(nodeId);
+        const expanded = nodeState.expanded || nodeState.showInFilter;
 
-        return options
-          .expandStateGetters
-          .map(getExpandState => getExpandState(this, nodeId, nodeState))
-          .filter(stateInfo => stateInfo !== null)
-          .every(stateInfo => stateInfo?.expandable !== false);
-      }
+        if (!expanded && options.expandStateGetters?.length) {
+          return options.expandStateGetters
+            .map(getExpandState => getExpandState(this, nodeId, nodeState))
+            .filter(stateInfo => stateInfo !== null)
+            .some(stateInfo => stateInfo?.expanded);
+        }
 
-      return true;
-    },
-    getExpanded(): string[] {
-      return Array.from(this.state).filter(([key, state]) => state.expanded).map(([key]) => key);
-    },
-    getSelected(): string[] {
-      return Array.from(this.state).filter(([key, state]) => state.selected).map(([key]) => key);
-    },
-    isNodeSelected(nodeId: string): boolean {
-      const node = navNodeInfoResource.get(nodeId);
+        return expanded;
+      },
+      isNodeExpandable(nodeId: string): boolean {
+        if (nodeId === this.root) {
+          return true;
+        }
 
-      if (node && elementsTree.isGroup?.(node)) {
-        const children = this.getNodeChildren(nodeId);
+        if (options.expandStateGetters?.length) {
+          const nodeState = this.getNodeState(nodeId);
 
-        if (children.length > 0) {
-          return children.every(child => this.isNodeSelected(child));
+          return options.expandStateGetters
+            .map(getExpandState => getExpandState(this, nodeId, nodeState))
+            .filter(stateInfo => stateInfo !== null)
+            .every(stateInfo => stateInfo?.expandable !== false);
+        }
+
+        return true;
+      },
+      getExpanded(): string[] {
+        return Array.from(this.state)
+          .filter(([key, state]) => state.expanded)
+          .map(([key]) => key);
+      },
+      getSelected(): string[] {
+        return Array.from(this.state)
+          .filter(([key, state]) => state.selected)
+          .map(([key]) => key);
+      },
+      isNodeSelected(nodeId: string): boolean {
+        const node = navNodeInfoResource.get(nodeId);
+
+        if (node && elementsTree.isGroup?.(node)) {
+          const children = this.getNodeChildren(nodeId);
+
+          if (children.length > 0) {
+            return children.every(child => this.isNodeSelected(child));
+          }
+
+          return false;
+        }
+
+        return this.getNodeState(nodeId).selected;
+      },
+      isNodeIndeterminateSelected(nodeId: string): boolean {
+        if (this.isNodeSelected(nodeId)) {
+          return false;
+        }
+
+        const node = navNodeInfoResource.get(nodeId);
+
+        if (node && elementsTree.isGroup?.(node)) {
+          const children = options.getChildren(nodeId) || [];
+
+          if (children.length > 0) {
+            return children.some(child => this.isNodeSelected(child) || this.isNodeIndeterminateSelected(child));
+          }
+
+          return false;
         }
 
         return false;
-      }
-
-      return this.getNodeState(nodeId).selected;
-    },
-    isNodeIndeterminateSelected(nodeId: string): boolean {
-      if (this.isNodeSelected(nodeId)) {
-        return false;
-      }
-
-      const node = navNodeInfoResource.get(nodeId);
-
-      if (node && elementsTree.isGroup?.(node)) {
+      },
+      getNodeChildren(nodeId: string): string[] {
+        const node = navNodeInfoResource.get(nodeId);
         const children = options.getChildren(nodeId) || [];
 
-        if (children.length > 0) {
-          return children.some(child => this.isNodeSelected(child) || this.isNodeIndeterminateSelected(child));
+        if (!node) {
+          return []; // Maybe filter should accept nodeId, so we be able to apply filters to empty node
         }
 
-        return false;
-      }
-
-      return false;
-    },
-    getNodeChildren(nodeId: string): string[] {
-      const node = navNodeInfoResource.get(nodeId);
-      const children = options.getChildren(nodeId) || [];
-
-      if (!node) {
-        return []; // Maybe filter should accept nodeId, so we be able to apply filters to empty node
-      }
-
-      return (options.filters || [])
-        .reduce(
-          (children, filter) => filter(elementsTree, elementsTree.filter, node, children, this.state),
-          children
-        );
-    },
-    async setFilter(value: string) {
-      runInAction(() => {
-        this.userData.filter = value;
-
-        for (const nodeState of this.state.values()) {
-          nodeState.showInFilter = false;
-        }
-      });
-
-      await options.onFilter?.(value);
-    },
-    collapse() {
-      for (const state of this.state.values()) {
-        state.expanded = false;
-        state.showInFilter = false;
-      }
-    },
-    async refresh(nodeId: string): Promise<void> {
-      try {
-        await navTreeResource.refreshTree(nodeId);
-      } catch (exception: any) {
-        notificationService.logException(exception, 'app_navigationTree_refresh_error');
-      }
-    },
-    async show(nodeId: string, path: string[]): Promise<void> {
-      const preloaded = await this.loadPath(path, nodeId);
-
-      if (preloaded !== nodeId) {
-        notificationService.logError({
-          title: 'app_navigationTree_node_not_found',
-          message: nodeId,
-        });
-      } else {
+        return (options.filters || []).reduce((children, filter) => filter(elementsTree, elementsTree.filter, node, children, this.state), children);
+      },
+      async setFilter(value: string) {
         runInAction(() => {
-          for (const parent of path) {
-            const state = this.getNodeState(parent);
-            state.expanded = true;
+          this.userData.filter = value;
+
+          for (const nodeState of this.state.values()) {
+            nodeState.showInFilter = false;
           }
-
-          const node = navNodeInfoResource.get(nodeId)!;
-
-          this.select(node, false, false);
-          this.actions.execute({ type: 'show', nodeId });
         });
 
-        if (path.length > 0) {
-          await functionsRef.loadTree(path[0]);
+        await options.onFilter?.(value);
+      },
+      collapse() {
+        for (const state of this.state.values()) {
+          state.expanded = false;
+          state.showInFilter = false;
         }
-      }
-    },
-    async click(node: NavNode, path: string[], leaf: boolean) {
-      await options.onClick?.(node);
-    },
-    async open(node: NavNode, path: string[], leaf: boolean) {
-      const expandableOrExpanded = this.isNodeExpandable(node.id) || this.isNodeExpanded(node.id);
-      if (!leaf && this.settings?.foldersTree && expandableOrExpanded) {
-        const nodeId = node.id;
-
-        const loaded = await options.loadChildren(node.id, true);
-        if (loaded) {
-          this.setFilter('');
-          options.folderExplorer.open(path, nodeId);
+      },
+      async refresh(nodeId: string): Promise<void> {
+        try {
+          await navTreeResource.refreshTree(nodeId);
+        } catch (exception: any) {
+          notificationService.logException(exception, 'app_navigationTree_refresh_error');
         }
-      }
+      },
+      async show(nodeId: string, path: string[]): Promise<void> {
+        const preloaded = await this.loadPath(path, nodeId);
 
-      const folder = !leaf && this.settings?.foldersTree || false;
-      await options.onOpen?.(node, folder);
-    },
-    async expand(node: NavNode, state: boolean) {
-      if (!this.isNodeExpandable(node.id)) {
-        return;
-      }
-
-      const treeNodeState = this.state.get(node.id);
-
-      try {
-        if (state || (this.filtering && !treeNodeState.showInFilter)) {
-          state = await options.loadChildren(node.id, true);
-        }
-
-        if (this.filtering) {
-          treeNodeState.showInFilter = !treeNodeState.showInFilter && state;
-
-          if (!treeNodeState.showInFilter) {
-            const nested = functionsRef.getNestedChildren(node.id);
-
-            for (const nodeId of nested) {
-              const treeNodeState = this.state.get(nodeId);
-              treeNodeState.showInFilter = false;
-            }
-          }
+        if (preloaded !== nodeId) {
+          notificationService.logError({
+            title: 'app_navigationTree_node_not_found',
+            message: nodeId,
+          });
         } else {
-          await options.onExpand?.(node, state);
-          treeNodeState.expanded = state && this.getNodeChildren(node.id).length > 0;
+          runInAction(() => {
+            for (const parent of path) {
+              const state = this.getNodeState(parent);
+              state.expanded = true;
+            }
+
+            const node = navNodeInfoResource.get(nodeId)!;
+
+            this.select(node, false, false);
+            this.actions.execute({ type: 'show', nodeId });
+          });
+
+          if (path.length > 0) {
+            await functionsRef.loadTree(path[0]);
+          }
+        }
+      },
+      async click(node: NavNode, path: string[], leaf: boolean) {
+        await options.onClick?.(node);
+      },
+      async open(node: NavNode, path: string[], leaf: boolean) {
+        const expandableOrExpanded = this.isNodeExpandable(node.id) || this.isNodeExpanded(node.id);
+        if (!leaf && this.settings?.foldersTree && expandableOrExpanded) {
+          const nodeId = node.id;
+
+          const loaded = await options.loadChildren(node.id, true);
+          if (loaded) {
+            this.setFilter('');
+            options.folderExplorer.open(path, nodeId);
+          }
         }
 
-        if (state) {
-          await functionsRef.loadTree(node.id);
-        }
-      } catch {
-        treeNodeState.expanded = false;
-
-        if (this.filtering) {
-          treeNodeState.showInFilter = false;
-        }
-      }
-    },
-    async select(node: NavNode, multiple: boolean, nested: boolean) {
-      if (options.customSelect) {
-        await options.customSelect(node, multiple, nested);
-        return;
-      }
-
-      if (options.beforeSelect) {
-        await options.beforeSelect(node, multiple, nested);
-      }
-
-      const selected = this.isNodeSelected(node.id);
-
-      if (!multiple) {
-        await functionsRef.clearSelection(node.id);
-
-        if (selected) {
+        const folder = (!leaf && this.settings?.foldersTree) || false;
+        await options.onOpen?.(node, folder);
+      },
+      async expand(node: NavNode, state: boolean) {
+        if (!this.isNodeExpandable(node.id)) {
           return;
         }
-      }
 
-      await functionsRef.setSelection(node.id, !selected);
-    },
-    async resetSelection(): Promise<void> {
-      if (options.customSelectReset) {
-        await options.customSelectReset();
-        return;
-      }
-      await functionsRef.resetSelection();
-    },
-    async loadPath(path: string[], lastNode?: string): Promise<string | undefined> {
-      let lastLoadedNode: string | undefined;
-      for (const nodeId of path) {
-        const loaded = await options.loadChildren(nodeId, false);
+        const treeNodeState = this.state.get(node.id);
 
-        if (!loaded) {
-          return lastLoadedNode;
+        try {
+          if (state || (this.filtering && !treeNodeState.showInFilter)) {
+            state = await options.loadChildren(node.id, true);
+          }
+
+          if (this.filtering) {
+            treeNodeState.showInFilter = !treeNodeState.showInFilter && state;
+
+            if (!treeNodeState.showInFilter) {
+              const nested = functionsRef.getNestedChildren(node.id);
+
+              for (const nodeId of nested) {
+                const treeNodeState = this.state.get(nodeId);
+                treeNodeState.showInFilter = false;
+              }
+            }
+          } else {
+            await options.onExpand?.(node, state);
+            treeNodeState.expanded = state && this.getNodeChildren(node.id).length > 0;
+          }
+
+          if (state) {
+            await functionsRef.loadTree(node.id);
+          }
+        } catch {
+          treeNodeState.expanded = false;
+
+          if (this.filtering) {
+            treeNodeState.showInFilter = false;
+          }
         }
-        lastLoadedNode = nodeId;
-      }
-
-      if (
-        lastNode !== undefined
-        && lastLoadedNode !== undefined
-        && options.getChildren(lastLoadedNode)?.includes(lastNode)) {
-        return lastNode;
-      }
-
-      return lastLoadedNode;
-    },
-    setDnDData(data: IDNDData, dragging: boolean) {
-      if (dragging) {
-        if (!this.activeDnDData.includes(data)) {
-          this.activeDnDData.push(data);
+      },
+      async select(node: NavNode, multiple: boolean, nested: boolean) {
+        if (options.customSelect) {
+          await options.customSelect(node, multiple, nested);
+          return;
         }
-      } else {
-        this.activeDnDData = this.activeDnDData.filter(d => d !== data);
-      }
+
+        if (options.beforeSelect) {
+          await options.beforeSelect(node, multiple, nested);
+        }
+
+        const selected = this.isNodeSelected(node.id);
+
+        if (!multiple) {
+          await functionsRef.clearSelection(node.id);
+
+          if (selected) {
+            return;
+          }
+        }
+
+        await functionsRef.setSelection(node.id, !selected);
+      },
+      async resetSelection(): Promise<void> {
+        if (options.customSelectReset) {
+          await options.customSelectReset();
+          return;
+        }
+        await functionsRef.resetSelection();
+      },
+      async loadPath(path: string[], lastNode?: string): Promise<string | undefined> {
+        let lastLoadedNode: string | undefined;
+        for (const nodeId of path) {
+          const loaded = await options.loadChildren(nodeId, false);
+
+          if (!loaded) {
+            return lastLoadedNode;
+          }
+          lastLoadedNode = nodeId;
+        }
+
+        if (lastNode !== undefined && lastLoadedNode !== undefined && options.getChildren(lastLoadedNode)?.includes(lastNode)) {
+          return lastNode;
+        }
+
+        return lastLoadedNode;
+      },
+      setDnDData(data: IDNDData, dragging: boolean) {
+        if (dragging) {
+          if (!this.activeDnDData.includes(data)) {
+            this.activeDnDData.push(data);
+          }
+        } else {
+          this.activeDnDData = this.activeDnDData.filter(d => d !== data);
+        }
+      },
+    }),
+    {
+      state: observable.ref,
+      settings: observable.ref,
+      isGroup: observable.ref,
+      disabled: observable.ref,
+      activeDnDData: observable.shallow,
+      root: observable.ref,
+      filter: computed,
+      filtering: computed,
+      loading: observable.ref,
+      renderers: observable.ref,
+      baseRoot: observable.ref,
+      collapse: action.bound,
+      userData: observable.ref,
     },
-  }), {
-    state: observable.ref,
-    settings: observable.ref,
-    isGroup: observable.ref,
-    disabled: observable.ref,
-    activeDnDData: observable.shallow,
-    root: observable.ref,
-    filter: computed,
-    filtering: computed,
-    loading: observable.ref,
-    renderers: observable.ref,
-    baseRoot: observable.ref,
-    collapse: action.bound,
-    userData: observable.ref,
-  }, {
-    state,
-    isGroup: options.isGroup,
-    disabled: options.disabled,
-    root: options.root,
-    settings: options.settings,
-    baseRoot: options.baseRoot,
-    renderers: options.renderers,
-    userData,
-  }, ['isLoading', 'isLoaded']);
+    {
+      state,
+      isGroup: options.isGroup,
+      disabled: options.disabled,
+      root: options.root,
+      settings: options.settings,
+      baseRoot: options.baseRoot,
+      renderers: options.renderers,
+      userData,
+    },
+    ['isLoading', 'isLoaded'],
+  );
 
   useEffect(() => {
     functionsRef.loadTree(options.root);
   }, [options.root]);
 
-  const loadTreeThreshold = useCallback(throttle(function refreshRoot() {
-    functionsRef.loadTree(options.root);
-  }, 100), []);
+  const loadTreeThreshold = useCallback(
+    throttle(function refreshRoot() {
+      functionsRef.loadTree(options.root);
+    }, 100),
+    [],
+  );
 
   useResource(useElementsTree, navTreeResource, options.baseRoot, {
     onData: () => loadTreeThreshold(),
@@ -679,11 +674,13 @@ export function useElementsTree(options: IOptions): IElementsTree {
   //       we want to have abstraction
   useExecutor({
     executor: projectsService.onActiveProjectChange,
-    handlers: [data => {
-      if (data.type === 'after') {
-        loadTreeThreshold();
-      }
-    }],
+    handlers: [
+      data => {
+        if (data.type === 'after') {
+          loadTreeThreshold();
+        }
+      },
+    ],
   });
 
   useExecutor({
@@ -693,44 +690,49 @@ export function useElementsTree(options: IOptions): IElementsTree {
 
   useExecutor({
     executor: navTreeResource.onItemUpdate,
-    handlers: [function exitFolder(key) {
-      ResourceKeyUtils.forEach(key, key => {
-        const children = navTreeResource.get(key);
+    handlers: [
+      function exitFolder(key) {
+        ResourceKeyUtils.forEach(key, key => {
+          const children = navTreeResource.get(key);
 
-        if (!children) {
-          functionsRef.exitNodeFolder(key);
-        }
-      });
-    }],
+          if (!children) {
+            functionsRef.exitNodeFolder(key);
+          }
+        });
+      },
+    ],
   });
 
   useExecutor({
     executor: navNodeInfoResource.onItemDelete,
-    handlers: [function deleteNodeState(key) {
-      runInAction(() => {
-        ResourceKeyUtils.forEach(key, key => {
-          state.delete(key);
+    handlers: [
+      function deleteNodeState(key) {
+        runInAction(() => {
+          ResourceKeyUtils.forEach(key, key => {
+            state.delete(key);
+          });
         });
-      });
-    }],
+      },
+    ],
   });
 
   useExecutor({
     executor: navTreeResource.onItemDelete,
-    handlers: [async function collapseDeletedTree(key) {
-      await ResourceKeyUtils.forEachAsync(key, async key => {
-        const node = navNodeInfoResource.get(key);
+    handlers: [
+      async function collapseDeletedTree(key) {
+        await ResourceKeyUtils.forEachAsync(key, async key => {
+          const node = navNodeInfoResource.get(key);
 
-        if (node) {
-          await elementsTree.expand(node, false);
+          if (node) {
+            await elementsTree.expand(node, false);
 
-          functionsRef.exitNodeFolder(key);
-        }
-      });
-    }],
+            functionsRef.exitNodeFolder(key);
+          }
+        });
+      },
+    ],
   });
 
-
   // sync settings
   const filterDisabled = getComputed(() => !options.settings?.filter && elementsTree.filtering);
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTreeFolderExplorer.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTreeFolderExplorer.ts
index 189b4367c5..b81847c2bd 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTreeFolderExplorer.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTreeFolderExplorer.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import { getComputed, useFolderExplorer } from '@cloudbeaver/core-blocks';
 
 import type { IElementsTreeSettings } from './useElementsTree';
 
-export function useElementsTreeFolderExplorer(
-  baseRoot: string,
-  settings: IElementsTreeSettings | undefined
-) {
+export function useElementsTreeFolderExplorer(baseRoot: string, settings: IElementsTreeSettings | undefined) {
   const folderExplorer = useFolderExplorer(baseRoot, {
     saveState: settings?.saveExpanded,
   });
@@ -29,4 +25,4 @@ export function useElementsTreeFolderExplorer(
   });
 
   return folderExplorer;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx
index d4f8899613..5555342140 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx
@@ -5,7 +5,6 @@
  * 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 { useMemo } from 'react';
 import styled, { css } from 'reshadow';
@@ -21,7 +20,10 @@ import { NavNodeViewService } from '../NodesManager/NavNodeView/NavNodeViewServi
 import { navigationTreeConnectionGroupFilter } from './ConnectionGroup/navigationTreeConnectionGroupFilter';
 import { navigationTreeConnectionGroupRenderer } from './ConnectionGroup/navigationTreeConnectionGroupRenderer';
 import { ElementsTree } from './ElementsTree/ElementsTree';
-import { createElementsTreeSettings, validateElementsTreeSettings } from './ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings';
+import {
+  createElementsTreeSettings,
+  validateElementsTreeSettings,
+} from './ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings';
 import type { IElementsTreeSettings } from './ElementsTree/useElementsTree';
 import { getNavigationTreeUserSettingsId } from './getNavigationTreeUserSettingsId';
 import { navigationTreeDuplicateFilter } from './navigationTreeDuplicateIdFilter';
@@ -66,14 +68,14 @@ const navigationTreeStyles = css`
 `;
 
 const elementsTreeStyles = css`
-    tools {
-      composes: theme-border-color-background from global;
-    }
-    tools > *:last-child:not(:first-child) {
-      border-bottom: solid 1px;
-      border-color: inherit;
-    }
-  `;
+  tools {
+    composes: theme-border-color-background from global;
+  }
+  tools > *:last-child:not(:first-child) {
+    border-bottom: solid 1px;
+    border-color: inherit;
+  }
+`;
 
 export const NavigationTree = observer(function NavigationTree() {
   const projectsNavNodeService = useService(ProjectsNavNodeService);
@@ -86,32 +88,27 @@ export const NavigationTree = observer(function NavigationTree() {
   const root = ROOT_NODE_PATH;
   const { handleOpen, handleSelect, handleSelectReset } = useNavigationTree();
 
-  const connectionGroupFilter = useMemo(() => navigationTreeConnectionGroupFilter(
-    navNodeInfoResource
-  ), [navNodeInfoResource]);
+  const connectionGroupFilter = useMemo(() => navigationTreeConnectionGroupFilter(navNodeInfoResource), [navNodeInfoResource]);
 
   const settings = useUserData<IElementsTreeSettings>(
     getNavigationTreeUserSettingsId(root),
     createElementsTreeSettings,
-    () => { },
-    validateElementsTreeSettings
+    () => {},
+    validateElementsTreeSettings,
   );
 
   const duplicateFilter = useMemo(() => navigationTreeDuplicateFilter(navNodeViewService), [navNodeViewService]);
-  const projectsRendererRenderer = useMemo(
-    () => navigationTreeProjectsRendererRenderer(navNodeInfoResource),
-    [navNodeInfoResource]
-  );
+  const projectsRendererRenderer = useMemo(() => navigationTreeProjectsRendererRenderer(navNodeInfoResource), [navNodeInfoResource]);
   const projectsExpandStateGetter = useMemo(
     () => navigationTreeProjectsExpandStateGetter(navNodeInfoResource, projectsService, projectsNavNodeService),
-    [navNodeInfoResource, projectsService, projectsNavNodeService]
+    [navNodeInfoResource, projectsService, projectsNavNodeService],
   );
   const projectFilter = useMemo(
     () => navigationTreeProjectFilter(projectsNavNodeService, projectsService, navNodeInfoResource, navTreeResource),
-    [projectsNavNodeService, projectsService, navNodeInfoResource, navTreeResource]
+    [projectsNavNodeService, projectsService, navNodeInfoResource, navTreeResource],
   );
 
-  const settingsElements = useMemo(() => ([ProjectsSettingsPlaceholderElement]), []);
+  const settingsElements = useMemo(() => [ProjectsSettingsPlaceholderElement], []);
 
   return styled(navigationTreeStyles)(
     <CaptureView view={navTreeService}>
@@ -123,13 +120,15 @@ export const NavigationTree = observer(function NavigationTree() {
         navNodeFilterCompare={navigationTreeProjectSearchCompare}
         expandStateGetters={[projectsExpandStateGetter]}
         settingsElements={settingsElements}
-        emptyPlaceholder={() => styled(navigationTreeStyles)(
-          <center>
-            <message>
-              <Translate token='app_navigationTree_empty_placeholder' />
-            </message>
-          </center>
-        )}
+        emptyPlaceholder={() =>
+          styled(navigationTreeStyles)(
+            <center>
+              <message>
+                <Translate token="app_navigationTree_empty_placeholder" />
+              </message>
+            </center>,
+          )
+        }
         customSelect={handleSelect}
         customSelectReset={handleSelectReset}
         settings={settings}
@@ -138,6 +137,6 @@ export const NavigationTree = observer(function NavigationTree() {
         loadChildren={navTreeService.loadNestedNodes}
         onOpen={handleOpen}
       />
-    </CaptureView>
+    </CaptureView>,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeBootstrap.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeBootstrap.ts
index 07b142df4d..ad490e2647 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { LeftBarPanelService } from '@cloudbeaver/core-ui';
 
@@ -18,7 +17,7 @@ export class NavigationTreeBootstrap extends Bootstrap {
   constructor(
     private readonly navigationTreeSettingsService: NavigationTreeSettingsService,
     private readonly elementsTreeToolsMenuService: ElementsTreeToolsMenuService,
-    private readonly leftBarPanelService: LeftBarPanelService
+    private readonly leftBarPanelService: LeftBarPanelService,
   ) {
     super();
   }
@@ -34,5 +33,5 @@ export class NavigationTreeBootstrap extends Bootstrap {
     });
   }
 
-  async load(): Promise<void> { }
-}
\ No newline at end of file
+  async load(): Promise<void> {}
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeLoader.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeLoader.ts
index 4730c1eb6d..5073a603e6 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeLoader.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const NavigationTreeLoader = React.lazy(async () => {
   const { NavigationTree } = await import('./NavigationTree');
   return { default: NavigationTree };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreePanel.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreePanel.tsx
index 4597aee420..0e3efecb3e 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreePanel.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreePanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -26,6 +25,6 @@ export const NavigationTreePanel: TabContainerPanelComponent = observer(function
   return styled(styles)(
     <container>
       <NavigationTreeLoader />
-    </container>
+    </container>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeService.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeService.ts
index eaae37e67d..b18dd4571a 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTreeService.ts
@@ -5,14 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 
-import { ConnectionInfoResource, ConnectionsManagerService, createConnectionParam, IConnectionInfoParams, NavNodeExtensionsService } from '@cloudbeaver/core-connections';
+import {
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  createConnectionParam,
+  IConnectionInfoParams,
+  NavNodeExtensionsService,
+} from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
-import { NavNodeManagerService, NavTreeResource, ROOT_NODE_PATH, EObjectFeature, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
+import { EObjectFeature, NavNodeInfoResource, NavNodeManagerService, NavTreeResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 import { ResourceKey, resourceKeyList } from '@cloudbeaver/core-sdk';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 import { ACTION_COLLAPSE_ALL, ACTION_FILTER, IActiveView, View } from '@cloudbeaver/core-view';
@@ -37,7 +42,7 @@ export class NavigationTreeService extends View<string> {
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly navNodeExtensionsService: NavNodeExtensionsService,
     private readonly navNodeInfoResource: NavNodeInfoResource,
-    private readonly navTreeResource: NavTreeResource
+    private readonly navTreeResource: NavTreeResource,
   ) {
     super();
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.tsx
index 73775d1adb..d9d9bb6553 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.tsx
@@ -5,15 +5,22 @@
  * 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 React, { forwardRef, useContext, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, TreeNodeContext, TreeNodeControl, TreeNodeName, TREE_NODE_STYLES, useObjectRef, useMouseContextMenu } from '@cloudbeaver/core-blocks';
+import {
+  getComputed,
+  TREE_NODE_STYLES,
+  TreeNodeContext,
+  TreeNodeControl,
+  TreeNodeName,
+  useMouseContextMenu,
+  useObjectRef,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
-import { NavNodeInfoResource, type INodeActions } from '@cloudbeaver/core-navigation-tree';
+import { type INodeActions, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 
 import { ElementsTreeContext } from '../ElementsTree/ElementsTreeContext';
 import type { NavTreeControlComponent, NavTreeControlProps } from '../ElementsTree/NavigationNodeComponent';
@@ -30,8 +37,8 @@ const styles = css`
       opacity: 0.5;
     }
   }
-  TreeNodeControl:hover > portal, 
-  TreeNodeControl:global([aria-selected=true]) > portal,
+  TreeNodeControl:hover > portal,
+  TreeNodeControl:global([aria-selected='true']) > portal,
   portal:focus-within {
     visibility: visible;
   }
@@ -41,7 +48,7 @@ const styles = css`
     max-width: 250px;
     overflow: hidden;
     text-overflow: ellipsis;
-  } 
+  }
   portal {
     position: relative;
     box-sizing: border-box;
@@ -55,83 +62,74 @@ const styles = css`
   }
 `;
 
-export const NavigationNodeProjectControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(forwardRef(function NavigationNodeProjectControl({
-  node,
-  dndElement,
-  dndPlaceholder,
-  className,
-}, ref) {
-  const mouseContextMenu = useMouseContextMenu();
-  const treeNodeContext = useContext(TreeNodeContext);
-  const elementsTreeContext = useContext(ElementsTreeContext);
-  const navNodeInfoResource = useService(NavNodeInfoResource);
-  const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
-  const selected = treeNodeContext.selected;
+export const NavigationNodeProjectControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(
+  forwardRef(function NavigationNodeProjectControl({ node, dndElement, dndPlaceholder, className }, ref) {
+    const mouseContextMenu = useMouseContextMenu();
+    const treeNodeContext = useContext(TreeNodeContext);
+    const elementsTreeContext = useContext(ElementsTreeContext);
+    const navNodeInfoResource = useService(NavNodeInfoResource);
+    const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
+    const selected = treeNodeContext.selected;
 
-  const [editing, setEditing] = useState(false);
+    const [editing, setEditing] = useState(false);
 
-  const nodeActions = useObjectRef<INodeActions>({
-    rename: () => {
-      setEditing(true);
-    },
-  });
+    const nodeActions = useObjectRef<INodeActions>({
+      rename: () => {
+        setEditing(true);
+      },
+    });
 
-  const isDragging = getComputed(() => {
-    if (!node.projectId || !elementsTreeContext?.tree.activeDnDData) {
-      return false;
+    const isDragging = getComputed(() => {
+      if (!node.projectId || !elementsTreeContext?.tree.activeDnDData) {
+        return false;
+      }
+
+      return isDraggingInsideProject(node.projectId, elementsTreeContext.tree.activeDnDData);
+    });
+
+    function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
+      EventContext.set(event, EventStopPropagationFlag);
+      treeNodeContext.select();
     }
 
-    return isDraggingInsideProject(node.projectId, elementsTreeContext.tree.activeDnDData);
-  });
+    function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
+      mouseContextMenu.handleContextMenuOpen(event);
+      treeNodeContext.select();
+    }
 
-  function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
-    EventContext.set(event, EventStopPropagationFlag);
-    treeNodeContext.select();
-  }
+    function handleClick(event: React.MouseEvent<HTMLDivElement>) {
+      treeNodeContext.select(event.ctrlKey || event.metaKey);
+    }
 
-  function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
-    mouseContextMenu.handleContextMenuOpen(event);
-    treeNodeContext.select();
-  }
+    function handleDbClick(event: React.MouseEvent<HTMLDivElement>) {
+      elementsTreeContext?.tree.open(node, navNodeInfoResource.getParents(node.id), false);
+    }
 
-  function handleClick(event: React.MouseEvent<HTMLDivElement>) {
-    treeNodeContext.select(event.ctrlKey || event.metaKey);
-  }
+    if (elementsTreeContext?.tree.settings?.projects === false && !isDragging) {
+      return null;
+    }
 
-  function handleDbClick(event: React.MouseEvent<HTMLDivElement>) {
-    elementsTreeContext?.tree.open(node, navNodeInfoResource.getParents(node.id), false);
-  }
-
-  if (elementsTreeContext?.tree.settings?.projects === false && !isDragging) {
-    return null;
-  }
-
-  return styled(TREE_NODE_STYLES, styles)(
-    <TreeNodeControl
-      ref={ref}
-      onClick={handleClick}
-      onDoubleClick={handleDbClick}
-      onContextMenu={handleContextMenuOpen}
-      {...use({ outdated, editing, dragging: dndElement })}
-      className={className}
-    >
-      <TreeNodeName title={node.name}>
-        {editing ? (
-          <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} />
-        ) : (
-          <name-box>{node.name}</name-box>
+    return styled(
+      TREE_NODE_STYLES,
+      styles,
+    )(
+      <TreeNodeControl
+        ref={ref}
+        onClick={handleClick}
+        onDoubleClick={handleDbClick}
+        onContextMenu={handleContextMenuOpen}
+        {...use({ outdated, editing, dragging: dndElement })}
+        className={className}
+      >
+        <TreeNodeName title={node.name}>
+          {editing ? <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} /> : <name-box>{node.name}</name-box>}
+        </TreeNodeName>
+        {!editing && !dndPlaceholder && (
+          <portal onClick={handlePortalClick}>
+            <TreeNodeMenuLoader mouseContextMenu={mouseContextMenu} node={node} actions={nodeActions} selected={selected} />
+          </portal>
         )}
-      </TreeNodeName>
-      {!editing && !dndPlaceholder && (
-        <portal onClick={handlePortalClick}>
-          <TreeNodeMenuLoader
-            mouseContextMenu={mouseContextMenu}
-            node={node}
-            actions={nodeActions}
-            selected={selected}
-          />
-        </portal>
-      )}
-    </TreeNodeControl>
-  );
-}));
+      </TreeNodeControl>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx
index 01617deb06..44bf29732b 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx
@@ -5,18 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, Switch, PlaceholderElement, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, type PlaceholderComponent, PlaceholderElement, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 
 import type { IElementsTreeSettingsProps } from '../ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService';
 
-
-export const ProjectsSettingsForm: PlaceholderComponent<IElementsTreeSettingsProps>  = observer(function ProjectsSettingsForm({
+export const ProjectsSettingsForm: PlaceholderComponent<IElementsTreeSettingsProps> = observer(function ProjectsSettingsForm({
   tree: { root, settings },
   style,
 }) {
@@ -41,7 +39,7 @@ export const ProjectsSettingsForm: PlaceholderComponent<IElementsTreeSettingsPro
       >
         {translate('plugin_navigation_tree_settings_projects_title')}
       </Switch>
-    </>
+    </>,
   );
 });
 
@@ -49,4 +47,4 @@ export const ProjectsSettingsPlaceholderElement: PlaceholderElement<IElementsTre
   id: 'settings-project',
   component: ProjectsSettingsForm,
   order: 1,
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
index 1c6facfa4d..09493215d6 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectFilter.ts
@@ -5,8 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import { NavNode, NavNodeInfoResource, NavTreeResource, ProjectsNavNodeService, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 import { NAV_NODE_TYPE_PROJECT, ProjectsService } from '@cloudbeaver/core-projects';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
index 6b7f87f5ea..52e329a98f 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
@@ -5,19 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { NAV_NODE_TYPE_PROJECT } from '@cloudbeaver/core-projects';
 
 import { elementsTreeNameFilterNode } from '../ElementsTree/elementsTreeNameFilter';
-import { type NavNodeFilterCompareFn, EEquality } from '../ElementsTree/NavNodeFilterCompareFn';
+import { EEquality, type NavNodeFilterCompareFn } from '../ElementsTree/NavNodeFilterCompareFn';
 
-export const navigationTreeProjectSearchCompare: NavNodeFilterCompareFn = function navigationTreeProjectSearchCompare(
-  node,
-  filter
-) {
+export const navigationTreeProjectSearchCompare: NavNodeFilterCompareFn = function navigationTreeProjectSearchCompare(node, filter) {
   if (node.nodeType === NAV_NODE_TYPE_PROJECT) {
     return EEquality.none;
   }
 
   return elementsTreeNameFilterNode(node, filter);
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
index be06dbd7a5..24df03cfc0 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
@@ -5,19 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavNodeInfoResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 import { NAV_NODE_TYPE_PROJECT, ProjectsService } from '@cloudbeaver/core-projects';
 
 import type { IElementsTreeNodeExpandInfoGetter } from '../ElementsTree/useElementsTree';
 
-
 export function navigationTreeProjectsExpandStateGetter(
   navNodeInfoResource: NavNodeInfoResource,
   projectsService: ProjectsService,
-  projectsNavNodeService: ProjectsNavNodeService
+  projectsNavNodeService: ProjectsNavNodeService,
 ): IElementsTreeNodeExpandInfoGetter {
-
   return (tree, nodeId) => {
     const node = navNodeInfoResource.get(nodeId);
 
@@ -36,4 +33,4 @@ export function navigationTreeProjectsExpandStateGetter(
       expandable: false,
     };
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
index 99b6b42eeb..35dd96334a 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
@@ -5,12 +5,11 @@
  * 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 { useContext } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { getComputed, Translate, TREE_NODE_STYLES, TreeNodeNestedMessage } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { NAV_NODE_TYPE_PROJECT, ProjectsService } from '@cloudbeaver/core-projects';
@@ -42,10 +41,7 @@ const nestedStyles = css`
   }
 `;
 
-export function navigationTreeProjectsRendererRenderer(
-  navNodeInfoResource: NavNodeInfoResource
-): IElementsTreeCustomRenderer {
-
+export function navigationTreeProjectsRendererRenderer(navNodeInfoResource: NavNodeInfoResource): IElementsTreeCustomRenderer {
   return nodeId => {
     const node = navNodeInfoResource.get(nodeId);
 
@@ -84,8 +80,8 @@ const ProjectRenderer: NavigationNodeRendererComponent = observer(function Manag
   if (!node) {
     return styled(TREE_NODE_STYLES)(
       <TreeNodeNestedMessage>
-        <Translate token='app_navigationTree_node_not_found' />
-      </TreeNodeNestedMessage>
+        <Translate token="app_navigationTree_node_not_found" />
+      </TreeNodeNestedMessage>,
     );
   }
 
@@ -102,6 +98,6 @@ const ProjectRenderer: NavigationNodeRendererComponent = observer(function Manag
       style={nestedStyles}
       component={component}
       {...use({ hideProjects, project })}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/getNavigationTreeUserSettingsId.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/getNavigationTreeUserSettingsId.ts
index 12389ee91c..5ae3cb3b72 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/getNavigationTreeUserSettingsId.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/getNavigationTreeUserSettingsId.ts
@@ -8,4 +8,4 @@
 
 export function getNavigationTreeUserSettingsId(root: string) {
   return `navigation-tree-${root}`;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/navigationTreeDuplicateIdFilter.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/navigationTreeDuplicateIdFilter.ts
index 0e182d2163..049be9ef25 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/navigationTreeDuplicateIdFilter.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/navigationTreeDuplicateIdFilter.ts
@@ -5,15 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { untracked } from 'mobx';
 
 import type { NavNodeViewService } from '../NodesManager/NavNodeView/NavNodeViewService';
 import type { IElementsTreeFilter } from './ElementsTree/useElementsTree';
 
-export function navigationTreeDuplicateFilter(
-  navNodeViewService: NavNodeViewService,
-): IElementsTreeFilter {
+export function navigationTreeDuplicateFilter(navNodeViewService: NavNodeViewService): IElementsTreeFilter {
   return (tree, filter, node, children) => {
     const { nodes, duplicates } = navNodeViewService.filterDuplicates(children);
 
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavTreeDropBox.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavTreeDropBox.ts
index 661eedb77e..33acf9f0bd 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavTreeDropBox.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavTreeDropBox.ts
@@ -5,30 +5,25 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback, useEffect } from 'react';
 
 import { useStateDelay } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { type NavNode, NavNodeManagerService, ENodeMoveType } from '@cloudbeaver/core-navigation-tree';
+import { ENodeMoveType, type NavNode, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { IDNDBox, useDNDBox } from '@cloudbeaver/core-ui';
 import { throttleAsync } from '@cloudbeaver/core-utils';
 import type { IDataContextProvider } from '@cloudbeaver/core-view';
 
-
 interface INodeState {
   expanded: boolean;
   expand: () => void;
 }
 
 export function useNavTreeDropBox(targetNode: NavNode | undefined, nodeState?: INodeState): IDNDBox {
-  const updateCanMove = useCallback(throttleAsync(
-    (targetNode: NavNode, moveContexts: IDataContextProvider) => navNodeManagerService.canMove(
-      targetNode,
-      moveContexts,
-    ),
-    300
-  ), []);
+  const updateCanMove = useCallback(
+    throttleAsync((targetNode: NavNode, moveContexts: IDataContextProvider) => navNodeManagerService.canMove(targetNode, moveContexts), 300),
+    [],
+  );
   const navNodeManagerService = useService(NavNodeManagerService);
   const dndBox = useDNDBox({
     canDrop(moveContexts) {
@@ -36,8 +31,7 @@ export function useNavTreeDropBox(targetNode: NavNode | undefined, nodeState?: I
         return false;
       }
 
-      updateCanMove(targetNode, moveContexts)
-        .catch(() => {});
+      updateCanMove(targetNode, moveContexts).catch(() => {});
 
       return navNodeManagerService.getNavNodeCache(targetNode.id).canMove;
     },
@@ -61,4 +55,4 @@ export function useNavTreeDropBox(targetNode: NavNode | undefined, nodeState?: I
   }, [hover]);
 
   return dndBox;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavigationTree.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavigationTree.ts
index 96e15df423..3bb9aa7512 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavigationTree.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/useNavigationTree.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { NavNode } from '@cloudbeaver/core-navigation-tree';
@@ -24,18 +23,22 @@ const bindActions: Array<keyof INavigationTree> = ['handleOpen', 'handleSelect',
 export function useNavigationTree(): INavigationTree {
   const navigationTreeService = useService(NavigationTreeService);
 
-  return useObjectRef<INavigationTree>(() => ({
-    navigationTreeService,
-    async handleOpen(node: NavNode, folder: boolean) {
-      if (!folder) {
-        await  this.navigationTreeService.navToNode(node.id, node.parentId);
-      }
-    },
-    handleSelect(node: NavNode, state: boolean) {
-      return this.navigationTreeService.selectNode(node.id, state);
-    },
-    handleSelectReset() {
-      this.navigationTreeService.unselectAll();
-    },
-  }), { navigationTreeService }, bindActions);
+  return useObjectRef<INavigationTree>(
+    () => ({
+      navigationTreeService,
+      async handleOpen(node: NavNode, folder: boolean) {
+        if (!folder) {
+          await this.navigationTreeService.navToNode(node.id, node.parentId);
+        }
+      },
+      handleSelect(node: NavNode, state: boolean) {
+        return this.navigationTreeService.selectNode(node.id, state);
+      },
+      handleSelectReset() {
+        this.navigationTreeService.unselectAll();
+      },
+    }),
+    { navigationTreeService },
+    bindActions,
+  );
 }
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTreeSettingsService.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTreeSettingsService.ts
index 161fa179a8..eccd3ea201 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTreeSettingsService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTreeSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
index cac799ec9d..36f5003116 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { untracked } from 'mobx';
 
 import { CoreSettingsService } from '@cloudbeaver/core-app';
@@ -14,9 +13,30 @@ import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult, Ren
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { type NavNode, type INodeActions, NavNodeManagerService, NavTreeResource, NavNodeInfoResource, NavTreeSettingsService, nodeDeleteContext, DATA_CONTEXT_NAV_NODE, ENodeFeature, getNodeDisplayName } from '@cloudbeaver/core-navigation-tree';
+import {
+  DATA_CONTEXT_NAV_NODE,
+  ENodeFeature,
+  getNodeDisplayName,
+  type INodeActions,
+  type NavNode,
+  NavNodeInfoResource,
+  NavNodeManagerService,
+  NavTreeResource,
+  NavTreeSettingsService,
+  nodeDeleteContext,
+} from '@cloudbeaver/core-navigation-tree';
 import { ResourceKeyUtils } from '@cloudbeaver/core-sdk';
-import { ActionService, ACTION_DELETE, ACTION_OPEN, ACTION_REFRESH, ACTION_RENAME, DATA_CONTEXT_MENU_NESTED, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
+import {
+  ACTION_DELETE,
+  ACTION_OPEN,
+  ACTION_REFRESH,
+  ACTION_RENAME,
+  ActionService,
+  DATA_CONTEXT_MENU_NESTED,
+  menuExtractItems,
+  MenuSeparatorItem,
+  MenuService,
+} from '@cloudbeaver/core-view';
 
 import { DATA_CONTEXT_NAV_NODE_ACTIONS } from '../NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/DATA_CONTEXT_NAV_NODE_ACTIONS';
 
@@ -37,7 +57,7 @@ export class NavNodeContextMenuService extends Bootstrap {
     private readonly coreSettingsService: CoreSettingsService,
     private readonly localizationService: LocalizationService,
     private readonly navNodeInfoResource: NavNodeInfoResource,
-    private readonly navTreeSettingsService: NavTreeSettingsService
+    private readonly navTreeSettingsService: NavTreeSettingsService,
   ) {
     super();
   }
@@ -54,9 +74,7 @@ export class NavNodeContextMenuService extends Bootstrap {
         return;
       }
 
-      const nodes = ResourceKeyUtils
-        .mapArray(data, nodeId => this.navNodeInfoResource.get(nodeId))
-        .filter<NavNode>(Boolean as any);
+      const nodes = ResourceKeyUtils.mapArray(data, nodeId => this.navNodeInfoResource.get(nodeId)).filter<NavNode>(Boolean as any);
 
       const name = nodes.map(node => node.name).join(', ');
       const folder = nodes.some(node => node.folder);
@@ -120,10 +138,7 @@ export class NavNodeContextMenuService extends Bootstrap {
           return this.navNodeManagerService.getNavNodeCache(node.id).canOpen;
         }
 
-        return [
-          ACTION_OPEN,
-          ACTION_REFRESH,
-        ].includes(action);
+        return [ACTION_OPEN, ACTION_REFRESH].includes(action);
       },
       handler: async (context, action) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE);
@@ -172,7 +187,10 @@ export class NavNodeContextMenuService extends Bootstrap {
             try {
               await this.navTreeResource.deleteNode(node.id);
             } catch (exception: any) {
-              this.notificationService.logException(exception, this.localizationService.translate('app_navigationTree_node_delete_error', undefined, { name }));
+              this.notificationService.logException(
+                exception,
+                this.localizationService.translate('app_navigationTree_node_delete_error', undefined, { name }),
+              );
             }
             break;
           }
@@ -182,27 +200,14 @@ export class NavNodeContextMenuService extends Bootstrap {
 
     this.menuService.addCreator({
       isApplicable: context => context.has(DATA_CONTEXT_NAV_NODE) && !context.has(DATA_CONTEXT_MENU_NESTED),
-      getItems: (context, items) => [
-        ...items,
-        ACTION_OPEN,
-        ACTION_RENAME,
-        ACTION_DELETE,
-        ACTION_REFRESH,
-      ],
+      getItems: (context, items) => [...items, ACTION_OPEN, ACTION_RENAME, ACTION_DELETE, ACTION_REFRESH],
 
       orderItems: (context, items) => {
-        const actionsOpen = menuExtractItems(items, [
-          ACTION_OPEN,
-        ]);
+        const actionsOpen = menuExtractItems(items, [ACTION_OPEN]);
 
-        const actionsManage = menuExtractItems(items, [
-          ACTION_RENAME,
-          ACTION_DELETE,
-        ]);
+        const actionsManage = menuExtractItems(items, [ACTION_RENAME, ACTION_DELETE]);
 
-        const actionsRefresh = menuExtractItems(items, [
-          ACTION_REFRESH,
-        ]);
+        const actionsRefresh = menuExtractItems(items, [ACTION_REFRESH]);
 
         items.unshift(...actionsOpen);
 
@@ -220,5 +225,5 @@ export class NavNodeContextMenuService extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/IFolderTransform.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/IFolderTransform.ts
index 34a9cdeb09..d147eccf17 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/IFolderTransform.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/IFolderTransform.ts
@@ -5,7 +5,6 @@
  * 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';
 
 export type NavNodeTransformViewComponent = React.FC<{
@@ -15,16 +14,9 @@ export type NavNodeTransformViewComponent = React.FC<{
   style?: ComponentStyle;
 }>;
 
-export type NavNodeTransformView = (
-  nodeId: string,
-  folderId: string,
-  parents: string[]
-) => NavNodeTransformViewComponent | undefined;
+export type NavNodeTransformView = (nodeId: string, folderId: string, parents: string[]) => NavNodeTransformViewComponent | undefined;
 
-export type NavNodeFolderTransformFn = (
-  nodeId: string,
-  children: string[] | undefined
-) => string[] | undefined;
+export type NavNodeFolderTransformFn = (nodeId: string, children: string[] | undefined) => string[] | undefined;
 
 export interface INavNodeFolderTransform {
   order?: number;
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.test.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.test.ts
index 54a11c86f9..7ca249dec4 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.test.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -27,13 +26,10 @@ const app = createApp(
   // topAppBarPlugin,
   datasourceContextSwitchPlugin,
   navigationTabsPlugin,
-  navigationTreePlugin
+  navigationTreePlugin,
 );
 
-mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -72,4 +68,4 @@ describe('filterDuplicates', () => {
     expect(nodes).toEqual([]);
     expect(duplicates).toEqual(['0', '1', '2', '3']);
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.ts
index 4cff4cdfee..59064721c7 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeView/NavNodeViewService.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { untracked } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 
-import type { NavNodeTransformView, INavNodeFolderTransform, NavNodeFolderTransformFn } from './IFolderTransform';
+import type { INavNodeFolderTransform, NavNodeFolderTransformFn, NavNodeTransformView } from './IFolderTransform';
 
 export interface INodeDuplicateList {
   nodes: string[];
@@ -41,18 +40,13 @@ export class NavNodeViewService {
   }
 
   get transformations(): NavNodeFolderTransformFn[] {
-    return this.transformers
-      .sort(sortTransformations)
-      .map(transform => transform.transformer);
+    return this.transformers.sort(sortTransformations).map(transform => transform.transformer);
   }
 
   private readonly transformers: INavNodeFolderTransform[];
   private readonly duplicationNotify: Set<string>;
 
-  constructor(
-    private readonly navTreeResource: NavTreeResource,
-    private readonly notificationService: NotificationService
-  ) {
+  constructor(private readonly navTreeResource: NavTreeResource, private readonly notificationService: NotificationService) {
     this.transformers = [];
     this.duplicationNotify = new Set();
 
@@ -81,10 +75,7 @@ export class NavNodeViewService {
 
     const limited = this.limit(children);
 
-    return this.transformations.reduce(
-      (children, transform) => transform(nodeId, children),
-      limited.nodes as string[] | undefined
-    );
+    return this.transformations.reduce((children, transform) => transform(nodeId, children), limited.nodes as string[] | undefined);
   }
 
   addTransform(transform: INavNodeFolderTransform): void {
@@ -142,10 +133,7 @@ export class NavNodeViewService {
   }
 }
 
-function sortTransformations(
-  { order: orderA }: INavNodeFolderTransform,
-  { order: orderB }: INavNodeFolderTransform
-): number {
+function sortTransformations({ order: orderA }: INavNodeFolderTransform, { order: orderB }: INavNodeFolderTransform): number {
   if (orderA === orderB) {
     return 0;
   }
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLink.tsx b/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLink.tsx
index 61343e1c29..33b9706ccf 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLink.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLink.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
@@ -15,7 +14,6 @@ import { parseNodeParentId } from '@cloudbeaver/core-navigation-tree';
 
 import { NavigationTreeService } from '../NavigationTree/NavigationTreeService';
 
-
 const style = css`
   Link {
     cursor: pointer;
@@ -35,9 +33,7 @@ export const NodeLink: React.FC<React.PropsWithChildren<Props>> = function NodeL
     if (nodeId) {
       navigationTreeService.navToNode(nodeId, parseNodeParentId(nodeId));
     }
-  },
-  [nodeId, navigationTreeService]
-  );
+  }, [nodeId, navigationTreeService]);
 
   if (nodeId) {
     return styled(style)(<Link onClick={handleClick}>{children}</Link>);
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLinkLoader.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLinkLoader.ts
index 4133b874ee..4a2e2ab731 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLinkLoader.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NodeLinkLoader.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 export const NodeLinkLoader = React.lazy(async () => {
   const { NodeLink } = await import('./NodeLink');
   return { default: NodeLink };
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/useChildren.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/useChildren.ts
index c5d900c99d..2fc91c1217 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/useChildren.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/useChildren.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
-import { ROOT_NODE_PATH, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
+import { NavTreeResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 
 import { NavigationTreeService } from '../NavigationTree/NavigationTreeService';
 import { NavNodeViewService } from './NavNodeView/NavNodeViewService';
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/useDatabaseObjectInfo.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/useDatabaseObjectInfo.ts
index 0b4daa4df0..2776db8735 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/useDatabaseObjectInfo.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/useDatabaseObjectInfo.ts
@@ -5,11 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 import { DBObjectResource } from '@cloudbeaver/core-navigation-tree';
 
-
 export function useDatabaseObjectInfo(navNodeId: string) {
   const dbObjectResource = useService(DBObjectResource);
   const dbObject = dbObjectResource.get(navNodeId);
diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/useNode.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/useNode.ts
index 1fb12de215..60b6e5bea4 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/useNode.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/useNode.ts
@@ -5,12 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { type NavNode, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 
-
 interface IUseNodeHook {
   navNodeId: string;
   node: NavNode | undefined;
@@ -25,20 +23,24 @@ export function useNode(navNodeId: string): IUseNodeHook {
   const navNodeInfoResource = useService(NavNodeInfoResource);
   const node = navNodeInfoResource.get(navNodeId);
 
-  return useObjectRef<IUseNodeHook>(() => ({
-    navNodeId,
-    node,
-    isLoading() {
-      return navNodeInfoResource.isLoading(this.navNodeId);
+  return useObjectRef<IUseNodeHook>(
+    () => ({
+      navNodeId,
+      node,
+      isLoading() {
+        return navNodeInfoResource.isLoading(this.navNodeId);
+      },
+      isLoaded() {
+        return navNodeInfoResource.isLoaded(this.navNodeId);
+      },
+      isOutdated() {
+        return navNodeInfoResource.isOutdated(this.navNodeId);
+      },
+    }),
+    {
+      navNodeId,
+      node,
     },
-    isLoaded() {
-      return navNodeInfoResource.isLoaded(this.navNodeId);
-    },
-    isOutdated() {
-      return navNodeInfoResource.isOutdated(this.navNodeId);
-    },
-  }), {
-    navNodeId,
-    node,
-  }, bindActions);
+    bindActions,
+  );
 }
diff --git a/webapp/packages/plugin-navigation-tree/src/index.ts b/webapp/packages/plugin-navigation-tree/src/index.ts
index 25e3507218..584565255d 100644
--- a/webapp/packages/plugin-navigation-tree/src/index.ts
+++ b/webapp/packages/plugin-navigation-tree/src/index.ts
@@ -1,3 +1,5 @@
+import { navigationTreePlugin } from './manifest';
+
 export * from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings';
 export * from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT';
 export * from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/KEY_BINDING_ENABLE_FILTER';
@@ -40,7 +42,5 @@ export * from './NodesManager/NodeLinkLoader';
 
 export * from './NavigationTreeSettingsService';
 
-import { navigationTreePlugin } from './manifest';
-
 export { navigationTreePlugin };
-export default navigationTreePlugin;
\ No newline at end of file
+export default navigationTreePlugin;
diff --git a/webapp/packages/plugin-navigation-tree/src/manifest.ts b/webapp/packages/plugin-navigation-tree/src/manifest.ts
index 05ab37cfb0..a6c87d5c80 100644
--- a/webapp/packages/plugin-navigation-tree/src/manifest.ts
+++ b/webapp/packages/plugin-navigation-tree/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -17,7 +16,6 @@ import { NavigationTreeSettingsService } from './NavigationTreeSettingsService';
 import { NavNodeContextMenuService } from './NodesManager/NavNodeContextMenuService';
 import { NavNodeViewService } from './NodesManager/NavNodeView/NavNodeViewService';
 
-
 export const navigationTreePlugin: PluginManifest = {
   info: { name: 'Navigation Tree plugin' },
   providers: [
@@ -30,4 +28,4 @@ export const navigationTreePlugin: PluginManifest = {
     ElementsTreeSettingsService,
     NavigationTreeSettingsService,
   ],
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-object-viewer/src/IObjectViewerTabContext.ts b/webapp/packages/plugin-object-viewer/src/IObjectViewerTabContext.ts
index 519d04c5cc..3a343d7b8d 100644
--- a/webapp/packages/plugin-object-viewer/src/IObjectViewerTabContext.ts
+++ b/webapp/packages/plugin-object-viewer/src/IObjectViewerTabContext.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { INodeNavigationContext } from '@cloudbeaver/core-navigation-tree';
-import type { ITabNavigationContext, ITab } from '@cloudbeaver/plugin-navigation-tabs';
+import type { ITab, ITabNavigationContext } from '@cloudbeaver/plugin-navigation-tabs';
 
 import type { IObjectViewerTabState } from './IObjectViewerTabState';
 import type { ObjectPage } from './ObjectPage/ObjectPage';
diff --git a/webapp/packages/plugin-object-viewer/src/IObjectViewerTabState.ts b/webapp/packages/plugin-object-viewer/src/IObjectViewerTabState.ts
index d46b68d572..c7ed801cf2 100644
--- a/webapp/packages/plugin-object-viewer/src/IObjectViewerTabState.ts
+++ b/webapp/packages/plugin-object-viewer/src/IObjectViewerTabState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
 
 export interface IObjectViewerTabState {
diff --git a/webapp/packages/plugin-object-viewer/src/LocaleService.ts b/webapp/packages/plugin-object-viewer/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-object-viewer/src/LocaleService.ts
+++ b/webapp/packages/plugin-object-viewer/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPagePanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPagePanel.tsx
index 1acccdae96..16ce637acf 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPagePanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPagePanel.tsx
@@ -5,15 +5,11 @@
  * 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 type { ObjectPagePanelComponent } from './ObjectPage';
 
-export const DBObjectPagePanel: ObjectPagePanelComponent = observer(function DBObjectPagePanel({
-  tab,
-  page,
-}) {
+export const DBObjectPagePanel: ObjectPagePanelComponent = observer(function DBObjectPagePanel({ tab, page }) {
   const Panel = page.getPanelComponent();
   return <Panel tab={tab} page={page} />;
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageService.ts
index 2bf0f9e3b5..7c4f48e0d5 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageService.ts
@@ -5,14 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, action, computed, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 import type { ITab } from '@cloudbeaver/plugin-navigation-tabs';
 
 import type { IObjectViewerTabState } from '../IObjectViewerTabState';
-import { ObjectPage, ObjectPageOptions, ObjectPageCallback } from './ObjectPage';
+import { ObjectPage, ObjectPageCallback, ObjectPageOptions } from './ObjectPage';
 
 @injectable()
 export class DBObjectPageService {
@@ -28,8 +27,7 @@ export class DBObjectPageService {
   }
 
   get orderedPages(): Array<ObjectPage<any>> {
-    return Array.from(this.pages.values())
-      .sort(this.comparePages.bind(this));
+    return Array.from(this.pages.values()).sort(this.comparePages.bind(this));
   }
 
   register<T>(options: ObjectPageOptions<T>): ObjectPage<T> {
@@ -102,10 +100,7 @@ export class DBObjectPageService {
     await this.callHandlerCallback(tab, page => page.onClose);
   }
 
-  private async callHandlerCallback<T>(
-    tab: ITab<IObjectViewerTabState>,
-    selector: (page: ObjectPage<T>) => ObjectPageCallback<T> | undefined
-  ) {
+  private async callHandlerCallback<T>(tab: ITab<IObjectViewerTabState>, selector: (page: ObjectPage<T>) => ObjectPageCallback<T> | undefined) {
     for (const page of this.pages.values()) {
       const callback = selector(page);
       if (callback) {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageTab.tsx
index 630fefd80a..570d17c543 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPage/DBObjectPageTab.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 
@@ -22,9 +21,7 @@ interface IProps {
   style: ComponentStyle;
 }
 
-export const DBObjectPageTab = observer<IProps>(function DBObjectPageTab({
-  tab, page, onSelect, style,
-}) {
+export const DBObjectPageTab = observer<IProps>(function DBObjectPageTab({ tab, page, onSelect, style }) {
   const handleSelect = useCallback(() => onSelect(tab, page), [tab, page, onSelect]);
   const TabComponent = page.getTabComponent();
   return <TabComponent tab={tab} page={page} style={style} onSelect={handleSelect} />;
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPage/ObjectPage.ts b/webapp/packages/plugin-object-viewer/src/ObjectPage/ObjectPage.ts
index 6480755f15..09db72ce36 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPage/ObjectPage.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPage/ObjectPage.ts
@@ -5,8 +5,7 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import type { ITab } from '@cloudbeaver/plugin-navigation-tabs';
@@ -29,10 +28,7 @@ export type ObjectPagePanelComponent<T = unknown> = React.FunctionComponent<Obje
 
 export type ObjectPageCloseCallback<T> = (tab: ITab<IObjectViewerTabState>, pageState: T) => Promise<boolean> | boolean;
 export type ObjectPageCallback<T> = (tab: ITab<IObjectViewerTabState>, pageState: T) => void;
-export type ObjectPageRestoreCallback<T> = (
-  tab: ITab<IObjectViewerTabState>,
-  pageState: T
-) => Promise<boolean> | boolean;
+export type ObjectPageRestoreCallback<T> = (tab: ITab<IObjectViewerTabState>, pageState: T) => Promise<boolean> | boolean;
 
 export interface ObjectPageOptions<T = unknown> {
   key: string;
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderContext.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderContext.ts
index 51b99814d2..8cdd399f06 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderContext.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 import type { TabStateReturn } from 'reakit';
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderPanelRenderer.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderPanelRenderer.tsx
index 61f40f5c61..cabeb807f8 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderPanelRenderer.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderPanelRenderer.tsx
@@ -5,7 +5,6 @@
  * 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 { useService } from '@cloudbeaver/core-di';
@@ -21,12 +20,7 @@ interface IFolderPanelRendererProps {
   style?: ComponentStyle;
 }
 
-export const FolderPanelRenderer = observer<IFolderPanelRendererProps>(function FolderPanelRenderer({
-  nodeId,
-  folderId,
-  parents,
-  style,
-}) {
+export const FolderPanelRenderer = observer<IFolderPanelRendererProps>(function FolderPanelRenderer({ nodeId, folderId, parents, style }) {
   const navNodeViewService = useService(NavNodeViewService);
 
   for (const panel of navNodeViewService.panels) {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx
index bb582a1e8f..6e65467fb2 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,7 +14,7 @@ import { DBObjectResource } from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
-import { NavNodeViewService, useNode, useChildren } from '@cloudbeaver/plugin-navigation-tree';
+import { NavNodeViewService, useChildren, useNode } from '@cloudbeaver/plugin-navigation-tree';
 
 interface IFolderTabRendererProps {
   nodeId: string;
@@ -24,12 +23,7 @@ interface IFolderTabRendererProps {
   style?: ComponentStyle;
 }
 
-export const FolderTabRenderer = observer<IFolderTabRendererProps>(function FolderTabRenderer({
-  nodeId,
-  folderId,
-  parents,
-  style,
-}) {
+export const FolderTabRenderer = observer<IFolderTabRendererProps>(function FolderTabRenderer({ nodeId, folderId, parents, style }) {
   const navNodeViewService = useService(NavNodeViewService);
 
   for (const tab of navNodeViewService.tabs) {
@@ -54,19 +48,23 @@ const NavNodeTab = observer<INavNodeTabProps>(function NavNodeTab({ nodeId, styl
   const dbObjectResource = useService(DBObjectResource);
   const childrenList = resourceKeyList(children.children || []);
 
-  const loading = useStateDelay(getComputed(() => (
-    nodeInfo.isLoaded() && nodeInfo.isLoading()
-  ) || (
-    children.isLoaded() && children.isLoading()
-  ) || (
-    dbObjectResource.isLoaded(childrenList) && dbObjectResource.isLoading(childrenList)
-  )), 300);
+  const loading = useStateDelay(
+    getComputed(
+      () =>
+        (nodeInfo.isLoaded() && nodeInfo.isLoading()) ||
+        (children.isLoaded() && children.isLoading()) ||
+        (dbObjectResource.isLoaded(childrenList) && dbObjectResource.isLoading(childrenList)),
+    ),
+    300,
+  );
 
   return styled(useStyles(style))(
     <Tab tabId={nodeId} title={nodeInfo.node?.name}>
       {nodeInfo.node?.icon && <TabIcon icon={nodeInfo.node.icon} />}
       <TabTitle>{nodeInfo.node?.name}</TabTitle>
-      <tab-loader><Loader loading={loading} small /></tab-loader>
-    </Tab>
+      <tab-loader>
+        <Loader loading={loading} small />
+      </tab-loader>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataPanel.tsx
index 14f2202c2e..248cda2977 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataPanel.tsx
@@ -5,14 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigation-tree';
 
 import { ObjectProperties } from './ObjectProperties';
 
-export const NavNodeMetadataPanel: NavNodeTransformViewComponent = function NavNodeMetadataPanel({
-  nodeId,
-}) {
+export const NavNodeMetadataPanel: NavNodeTransformViewComponent = function NavNodeMetadataPanel({ nodeId }) {
   return <ObjectProperties objectId={nodeId} />;
 };
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx
index cdcabdf3c9..4b185a132d 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx
@@ -5,19 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 import { type NavNodeTransformViewComponent, useNode } from '@cloudbeaver/plugin-navigation-tree';
 
-export const NavNodeMetadataTab: NavNodeTransformViewComponent = observer(function NavNodeMetadataTab({
-  folderId,
-  nodeId,
-  style,
-}) {
+export const NavNodeMetadataTab: NavNodeTransformViewComponent = observer(function NavNodeMetadataTab({ folderId, nodeId, style }) {
   const translate = useTranslate();
   const styles = useStyles(style);
   const nodeInfo = useNode(nodeId);
@@ -33,6 +28,6 @@ export const NavNodeMetadataTab: NavNodeTransformViewComponent = observer(functi
     <Tab tabId={folderId} title={title}>
       <TabIcon icon={icon} />
       <TabTitle>{title}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataViewBootstrap.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataViewBootstrap.ts
index 9faa718fe5..4f0ac69ae6 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataViewBootstrap.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataViewBootstrap.ts
@@ -5,9 +5,8 @@
  * 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 { NavNodeInfoResource, ENodeFeature } from '@cloudbeaver/core-navigation-tree';
+import { ENodeFeature, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree';
 
 import { NavNodeMetadataPanel } from './NavNodeMetadataPanel';
@@ -17,10 +16,7 @@ const navNodeMetadataId = 'object-viewer://metadata';
 
 @injectable()
 export class NavNodeMetadataViewBootstrap extends Bootstrap {
-  constructor(
-    private readonly navNodeViewService: NavNodeViewService,
-    private readonly navNodeInfoResource: NavNodeInfoResource
-  ) {
+  constructor(private readonly navNodeViewService: NavNodeViewService, private readonly navNodeInfoResource: NavNodeInfoResource) {
     super();
   }
 
@@ -41,19 +37,16 @@ export class NavNodeMetadataViewBootstrap extends Bootstrap {
       },
       transformer: (nodeId, children) => {
         const node = this.navNodeInfoResource.get(nodeId);
-        const isDatabaseObject = (
-          node?.features?.includes(ENodeFeature.item)
-          || node?.features?.includes(ENodeFeature.container)
-        );
+        const isDatabaseObject = node?.features?.includes(ENodeFeature.item) || node?.features?.includes(ENodeFeature.container);
 
         if (!isDatabaseObject) {
           return children;
         }
 
-        return [navNodeMetadataId, ...children || []];
+        return [navNodeMetadataId, ...(children || [])];
       },
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx
index 96abfc427a..4f80bec478 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx
@@ -5,12 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { ColoredContainer, TextPlaceholder, useObjectPropertyCategories, GroupTitle, ObjectPropertyInfoForm, Group, useResource, BASE_CONTAINERS_STYLES, useTranslate } from '@cloudbeaver/core-blocks';
-import { NavTreeResource, DBObjectResource } from '@cloudbeaver/core-navigation-tree';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Group,
+  GroupTitle,
+  ObjectPropertyInfoForm,
+  TextPlaceholder,
+  useObjectPropertyCategories,
+  useResource,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
+import { DBObjectResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
 interface Props {
@@ -19,17 +28,13 @@ interface Props {
 
 const emptyArray: ObjectPropertyInfo[] = [];
 
-export const ObjectProperties = observer<Props>(function ObjectProperties({
-  objectId,
-}) {
+export const ObjectProperties = observer<Props>(function ObjectProperties({ objectId }) {
   const translate = useTranslate();
   const children = useResource(ObjectProperties, NavTreeResource, objectId);
   const dbObject = useResource(ObjectProperties, DBObjectResource, objectId, {
     preload: [children],
   });
-  const { categories, isUncategorizedExists } = useObjectPropertyCategories(
-    dbObject.data?.object?.properties ?? emptyArray
-  );
+  const { categories, isUncategorizedExists } = useObjectPropertyCategories(dbObject.data?.object?.properties ?? emptyArray);
   const properties = dbObject.data?.object?.properties;
 
   return styled(BASE_CONTAINERS_STYLES)(
@@ -40,27 +45,17 @@ export const ObjectProperties = observer<Props>(function ObjectProperties({
         <ColoredContainer overflow parent gap>
           {isUncategorizedExists && (
             <Group gap large>
-              <ObjectPropertyInfoForm
-                properties={properties}
-                category={null}
-                small
-                readOnly
-              />
+              <ObjectPropertyInfoForm properties={properties} category={null} small readOnly />
             </Group>
           )}
           {categories.map(category => (
             <Group key={category} gap large>
               <GroupTitle>{category}</GroupTitle>
-              <ObjectPropertyInfoForm
-                properties={properties}
-                category={category}
-                small
-                readOnly
-              />
+              <ObjectPropertyInfoForm properties={properties} category={category} small readOnly />
             </Group>
           ))}
         </ColoredContainer>
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperty.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperty.tsx
index 2532345932..edb71fbf6a 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperty.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperty.tsx
@@ -5,7 +5,6 @@
  * 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 { FieldCheckbox, InputField } from '@cloudbeaver/core-blocks';
@@ -13,40 +12,36 @@ import { FieldCheckbox, InputField } from '@cloudbeaver/core-blocks';
 import type { ObjectPropertyProps } from '../../formControls';
 import { additionalProps, filterProperty, getValue, matchType } from '../../helpers';
 
-export const ObjectProperty = observer<ObjectPropertyProps>(function ObjectProperty({
-  objectProperty,
-  className,
-}) {
+export const ObjectProperty = observer<ObjectPropertyProps>(function ObjectProperty({ objectProperty, className }) {
   if (!objectProperty || !filterProperty(objectProperty)) {
     return null;
   }
 
   return (
     <>
-      {matchType(objectProperty.dataType) === 'checkbox'
-        ? (
-          <FieldCheckbox
-            className={className}
-            title={objectProperty.description}
-            name={objectProperty.id}
-            value={getValue(objectProperty.value)}
-            disabled
-            {...additionalProps(objectProperty)}
-          >
-            {objectProperty.displayName}
-          </FieldCheckbox>
-        )
-        : (
-          <InputField
-            className={className}
-            title={objectProperty.description}
-            name={objectProperty.id}
-            value={getValue(objectProperty.value)}
-            readOnly
-            {...additionalProps(objectProperty)}
-          >{objectProperty.displayName}
-          </InputField>
-        )}
+      {matchType(objectProperty.dataType) === 'checkbox' ? (
+        <FieldCheckbox
+          className={className}
+          title={objectProperty.description}
+          name={objectProperty.id}
+          value={getValue(objectProperty.value)}
+          disabled
+          {...additionalProps(objectProperty)}
+        >
+          {objectProperty.displayName}
+        </FieldCheckbox>
+      ) : (
+        <InputField
+          className={className}
+          title={objectProperty.description}
+          name={objectProperty.id}
+          value={getValue(objectProperty.value)}
+          readOnly
+          {...additionalProps(objectProperty)}
+        >
+          {objectProperty.displayName}
+        </InputField>
+      )}
     </>
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx
index d5ee5ce790..3e413ff8c8 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { untracked } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
@@ -13,7 +12,7 @@ import styled, { css } from 'reshadow';
 
 import { TextPlaceholder, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { NavNodeInfoResource, NavTreeResource, DBObjectResource, type DBObject, DBObjectParentKey } from '@cloudbeaver/core-navigation-tree';
+import { type DBObject, DBObjectParentKey, DBObjectResource, NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 import { type NavNodeTransformViewComponent, NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree';
 
 import { TableLoader } from '../../ObjectPropertyTable/Table/TableLoader';
@@ -29,10 +28,7 @@ const style = css`
   }
 `;
 
-export const VirtualFolderPanel: NavNodeTransformViewComponent = observer(function VirtualFolderPanel({
-  folderId,
-  nodeId,
-}) {
+export const VirtualFolderPanel: NavNodeTransformViewComponent = observer(function VirtualFolderPanel({ folderId, nodeId }) {
   const translate = useTranslate();
   const nodeType = VirtualFolderUtils.getNodeType(folderId);
   const navNodeViewService = useService(NavNodeViewService);
@@ -51,12 +47,9 @@ export const VirtualFolderPanel: NavNodeTransformViewComponent = observer(functi
     navNodeViewService.logDuplicates(nodeId, duplicates);
   });
 
-  const objects = dbObject.data
-    .filter(object => (
-      object
-      && nodes.includes(object.id)
-      && navNodeInfoResource.get(object.id)?.nodeType === nodeType
-    )) as DBObject[];
+  const objects = dbObject.data.filter(
+    object => object && nodes.includes(object.id) && navNodeInfoResource.get(object.id)?.nodeType === nodeType,
+  ) as DBObject[];
 
   return styled(style)(
     <>
@@ -67,6 +60,6 @@ export const VirtualFolderPanel: NavNodeTransformViewComponent = observer(functi
           <TableLoader objects={objects} truncated={limited.truncated > 0} />
         </tab-wrapper>
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx
index bce17524fb..c5d0935948 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-blocks';
@@ -14,10 +13,7 @@ import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigati
 
 import { VirtualFolderUtils } from './VirtualFolderUtils';
 
-export const VirtualFolderTab: NavNodeTransformViewComponent = function VirtualFolderTab({
-  folderId,
-  style,
-}) {
+export const VirtualFolderTab: NavNodeTransformViewComponent = function VirtualFolderTab({ folderId, style }) {
   const nodeType = VirtualFolderUtils.getNodeType(folderId);
   const styles = useStyles(style);
   const icon = 'platform:/plugin/org.jkiss.dbeaver.model/icons/tree/folder.png';
@@ -26,6 +22,6 @@ export const VirtualFolderTab: NavNodeTransformViewComponent = function VirtualF
     <Tab tabId={folderId} title={nodeType}>
       <TabIcon icon={icon} />
       <TabTitle>{nodeType}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 };
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderViewBootstrap.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderViewBootstrap.ts
index 88e7c9846c..65af507c03 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderViewBootstrap.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderViewBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree';
@@ -16,10 +15,7 @@ import { VirtualFolderUtils } from './VirtualFolderUtils';
 
 @injectable()
 export class VirtualFolderViewBootstrap extends Bootstrap {
-  constructor(
-    private readonly navNodeViewService: NavNodeViewService,
-    private readonly navNodeInfoResource: NavNodeInfoResource
-  ) {
+  constructor(private readonly navNodeViewService: NavNodeViewService, private readonly navNodeInfoResource: NavNodeInfoResource) {
     super();
   }
 
@@ -67,5 +63,5 @@ export class VirtualFolderViewBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx
index 1b871695ac..03614f44af 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx
@@ -5,7 +5,6 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
@@ -72,13 +71,7 @@ export const ObjectFolders = observer<IProps>(function ObjectFolders({ tab }) {
   const children = useResource(ObjectFolders, NavTreeResource, nodeId);
 
   const folders = navNodeViewService.getFolders(nodeId, children.data) || [];
-  const wrongFolder = (
-    !folders.includes(folderId)
-    && folders.length > 0
-    && children.isLoaded()
-    && !children.isLoading()
-    && !children.isOutdated()
-  );
+  const wrongFolder = !folders.includes(folderId) && folders.length > 0 && children.isLoaded() && !children.isLoading() && !children.isOutdated();
 
   if (wrongFolder) {
     folderId = folders[0];
@@ -101,28 +94,16 @@ export const ObjectFolders = observer<IProps>(function ObjectFolders({ tab }) {
   return styled(style)(
     <>
       {folders.length > 0 ? (
-        <TabsState currentTabId={folderId} orientation='vertical' localState={innerTabState} lazy onChange={openFolder}>
+        <TabsState currentTabId={folderId} orientation="vertical" localState={innerTabState} lazy onChange={openFolder}>
           <vertical-tabs>
             <TabList aria-label="Object folders">
               {folders.map(folderId => (
-                <FolderTabRenderer
-                  key={folderId}
-                  nodeId={nodeId}
-                  folderId={folderId}
-                  parents={parents}
-                  style={tabStyles}
-                />
+                <FolderTabRenderer key={folderId} nodeId={nodeId} folderId={folderId} parents={parents} style={tabStyles} />
               ))}
             </TabList>
             {folders.map(folderId => (
               <TabPanel key={folderId} tabId={folderId}>
-                <FolderPanelRenderer
-                  key={folderId}
-                  nodeId={nodeId}
-                  folderId={folderId}
-                  parents={parents}
-                  style={tabStyles}
-                />
+                <FolderPanelRenderer key={folderId} nodeId={nodeId} folderId={folderId} parents={parents} style={tabStyles} />
               </TabPanel>
             ))}
           </vertical-tabs>
@@ -130,6 +111,6 @@ export const ObjectFolders = observer<IProps>(function ObjectFolders({ tab }) {
       ) : (
         <TextPlaceholder>{translate('plugin_object_viewer_table_no_items')}</TextPlaceholder>
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx
index f8afaeff15..0488ae9c4e 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -13,21 +12,19 @@ import type { ObjectPagePanelComponent } from '../ObjectPage/ObjectPage';
 import { ObjectFolders } from './ObjectFolders';
 
 const viewerStyles = css`
-    wrapper {
-      composes: theme-background-surface from global;
-      display: flex;
-      width: 100%;
-      flex: 1 1 auto;
-      padding-top: 16px; /* TODO: must be refactored */
-    }
-  `;
+  wrapper {
+    composes: theme-background-surface from global;
+    display: flex;
+    width: 100%;
+    flex: 1 1 auto;
+    padding-top: 16px; /* TODO: must be refactored */
+  }
+`;
 
-export const ObjectPropertiesPagePanel: ObjectPagePanelComponent = observer(function ObjectPropertiesPagePanel({
-  tab,
-}) {
+export const ObjectPropertiesPagePanel: ObjectPagePanelComponent = observer(function ObjectPropertiesPagePanel({ tab }) {
   return styled(viewerStyles)(
     <wrapper>
       <ObjectFolders tab={tab} />
-    </wrapper>
+    </wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
index 62dab727ec..e1ff47ddc0 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
-import { NavNodeManagerService, type INodeNavigationData, NavigationType } from '@cloudbeaver/core-navigation-tree';
+import { type INodeNavigationData, NavigationType, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 
 import { DBObjectPageService } from '../ObjectPage/DBObjectPageService';
 import type { ObjectPage } from '../ObjectPage/ObjectPage';
@@ -25,9 +24,8 @@ export class ObjectPropertiesPageService {
     private readonly navNodeManagerService: NavNodeManagerService,
     private readonly notificationService: NotificationService,
     private readonly objectViewerTabService: ObjectViewerTabService,
-    private readonly dbObjectPageService: DBObjectPageService
-  ) {
-  }
+    private readonly dbObjectPageService: DBObjectPageService,
+  ) {}
 
   registerDBObjectPage(): void {
     this.page = this.dbObjectPageService.register({
@@ -45,7 +43,8 @@ export class ObjectPropertiesPageService {
       return;
     }
 
-    if (!this.page) { // TODO: it will be never true, because navHandler registers after page creation
+    if (!this.page) {
+      // TODO: it will be never true, because navHandler registers after page creation
       return;
     }
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
index fe870b679b..a2f08b3f18 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
@@ -5,23 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
-import { TabIcon, Tab, TabTitle } from '@cloudbeaver/core-ui';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 
 import type { ObjectPageTabComponent } from '../ObjectPage/ObjectPage';
 
-export const ObjectPropertiesPageTab: ObjectPageTabComponent = observer(function ObjectPropertiesPageTab({
-  page, onSelect, style,
-}) {
+export const ObjectPropertiesPageTab: ObjectPageTabComponent = observer(function ObjectPropertiesPageTab({ page, onSelect, style }) {
   const translate = useTranslate();
   return styled(useStyles(style))(
     <Tab tabId={page.key} style={style} onOpen={onSelect}>
-      <TabIcon icon='/icons/properties.svg' viewBox="0 0 16 16" />
+      <TabIcon icon="/icons/properties.svg" viewBox="0 0 16 16" />
       <TabTitle>{translate('plugin_object_viewer_properties_tab')}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
index d06c1d895a..1efda51528 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
@@ -5,14 +5,13 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
 import { TextPlaceholder, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { NavTreeResource, DBObjectResource, type DBObject, DBObjectParentKey } from '@cloudbeaver/core-navigation-tree';
+import { type DBObject, DBObjectParentKey, DBObjectResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
 import { NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree';
 
 import { TableLoader } from './Table/TableLoader';
@@ -31,10 +30,7 @@ interface ObjectPropertyTableProps {
   parentId?: string;
 }
 
-export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function ObjectPropertyTable({
-  objectId,
-  parentId,
-}) {
+export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function ObjectPropertyTable({ objectId, parentId }) {
   const translate = useTranslate();
   const navNodeViewService = useService(NavNodeViewService);
   const children = useResource(ObjectPropertyTable, NavTreeResource, parentId ?? null);
@@ -65,6 +61,6 @@ export const ObjectPropertyTable = observer<ObjectPropertyTableProps>(function O
           <TableLoader objects={objects} truncated={limited.truncated > 0} />
         </div>
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooter.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooter.tsx
index 23b5397126..bf29dfffa7 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooter.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooter.tsx
@@ -5,7 +5,6 @@
  * 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 { TableState, ToolsPanel } from '@cloudbeaver/core-blocks';
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx
index afbaac5b51..59cbd80d31 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx
@@ -5,7 +5,6 @@
  * 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 type { ButtonHTMLAttributes } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -18,39 +17,36 @@ type Props = ButtonHTMLAttributes<any> & {
 };
 
 const style = css`
-    Menu {
-      composes: theme-text-on-surface from global;
-    }
-    MenuTrigger {
-      composes: theme-ripple from global;
-      height: 100%;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      &[|hidden] {
-        display: none;
-      }
-    }
-    ToolsAction[|hidden] {
+  Menu {
+    composes: theme-text-on-surface from global;
+  }
+  MenuTrigger {
+    composes: theme-ripple from global;
+    height: 100%;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    &[|hidden] {
       display: none;
     }
-    menu-trigger-icon IconOrImage {
-      display: block;
-      width: 24px;
-    }
-    menu-trigger-title {
-      display: block;
-    }
-    menu-trigger-icon + menu-trigger-title {
-      padding-left: 8px;
-    }
-  `;
+  }
+  ToolsAction[|hidden] {
+    display: none;
+  }
+  menu-trigger-icon IconOrImage {
+    display: block;
+    width: 24px;
+  }
+  menu-trigger-title {
+    display: block;
+  }
+  menu-trigger-icon + menu-trigger-title {
+    padding-left: 8px;
+  }
+`;
 
-export const ObjectPropertyTableFooterItem = observer<Props>(function ObjectPropertyTableFooterItem({
-  menuItem,
-  ...props
-}) {
+export const ObjectPropertyTableFooterItem = observer<Props>(function ObjectPropertyTableFooterItem({ menuItem, ...props }) {
   const translate = useTranslate();
 
   if (!menuItem.panel) {
@@ -65,7 +61,7 @@ export const ObjectPropertyTableFooterItem = observer<Props>(function ObjectProp
         onClick={() => menuItem.onClick?.()}
       >
         {translate(menuItem.title)}
-      </ToolsAction>
+      </ToolsAction>,
     );
   }
 
@@ -85,6 +81,6 @@ export const ObjectPropertyTableFooterItem = observer<Props>(function ObjectProp
         </menu-trigger-icon>
       )}
       {menuItem.title && <menu-trigger-title>{translate(menuItem.title)}</menu-trigger-title>}
-    </MenuTrigger>
+    </MenuTrigger>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
index 156922c5bc..14265d7fa1 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
@@ -5,16 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { CoreSettingsService } from '@cloudbeaver/core-app';
 import type { TableState } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 import {
-  ContextMenuService, IMenuContext, IContextMenuItem, IMenuItem,
-  CommonDialogService, DialogueStateResult, ConfirmationDialogDelete
+  CommonDialogService,
+  ConfirmationDialogDelete,
+  ContextMenuService,
+  DialogueStateResult,
+  IContextMenuItem,
+  IMenuContext,
+  IMenuItem,
 } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { NavTreeResource, NavNodeInfoResource, NavTreeSettingsService, ENodeFeature, getNodeDisplayName, type NavNode } from '@cloudbeaver/core-navigation-tree';
+import {
+  ENodeFeature,
+  getNodeDisplayName,
+  type NavNode,
+  NavNodeInfoResource,
+  NavTreeResource,
+  NavTreeSettingsService,
+} from '@cloudbeaver/core-navigation-tree';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 
 interface IObjectPropertyTableFooterContext {
@@ -34,7 +45,7 @@ export class ObjectPropertyTableFooterService {
     private readonly notificationService: NotificationService,
     private readonly commonDialogService: CommonDialogService,
     private readonly coreSettingsService: CoreSettingsService,
-    private readonly navTreeSettingsService: NavTreeSettingsService
+    private readonly navTreeSettingsService: NavTreeSettingsService,
   ) {
     this.contextMenuService.addPanel(this.objectPropertyTableFooterToken);
 
@@ -47,21 +58,20 @@ export class ObjectPropertyTableFooterService {
       isPresent(context) {
         return context.contextType === ObjectPropertyTableFooterService.objectPropertyContextType;
       },
-      isHidden: () => !(this.navTreeSettingsService.settings.isValueDefault('deleting')
-        ? this.coreSettingsService.settings.getValue('app.metadata.deleting')
-        : this.navTreeSettingsService.settings.getValue('deleting')),
+      isHidden: () =>
+        !(this.navTreeSettingsService.settings.isValueDefault('deleting')
+          ? this.coreSettingsService.settings.getValue('app.metadata.deleting')
+          : this.navTreeSettingsService.settings.getValue('deleting')),
       isDisabled: context => {
         if (context.data.tableState.selectedList.length === 0) {
           return true;
         }
 
         const selectedNodes = this.getSelectedNodes(context.data.tableState.selectedList);
-        return !selectedNodes.some(node => node.features?.includes(ENodeFeature.canDelete))
-          || this.navTreeResource.isLoading();
+        return !selectedNodes.some(node => node.features?.includes(ENodeFeature.canDelete)) || this.navTreeResource.isLoading();
       },
       onClick: async context => {
-        const nodes = this.getSelectedNodes(context.data.tableState.selectedList)
-          .filter(node => node.features?.includes(ENodeFeature.canDelete));
+        const nodes = this.getSelectedNodes(context.data.tableState.selectedList).filter(node => node.features?.includes(ENodeFeature.canDelete));
 
         try {
           await this.navTreeResource.deleteNode(resourceKeyList(nodes.map(node => node.id)));
@@ -73,9 +83,7 @@ export class ObjectPropertyTableFooterService {
   }
 
   registerMenuItem(options: IContextMenuItem<IObjectPropertyTableFooterContext>): void {
-    this.contextMenuService.addMenuItem<IObjectPropertyTableFooterContext>(
-      this.objectPropertyTableFooterToken, options
-    );
+    this.contextMenuService.addMenuItem<IObjectPropertyTableFooterContext>(this.objectPropertyTableFooterToken, options);
   }
 
   constructMenuWithContext(nodeIds: string[], tableState: TableState): IMenuItem[] {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/CellFormatter.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/CellFormatter.tsx
index 1166b17b08..7d43547c61 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/CellFormatter.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/CellFormatter.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext, useState } from 'react';
 import styled, { css, use } from 'reshadow';
@@ -13,7 +12,7 @@ import styled, { css, use } from 'reshadow';
 import { getComputed, Icon, useMouse, useStateDelay } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
-import { type NavNode, NavNodeManagerService, DATA_CONTEXT_NAV_NODE, type DBObject } from '@cloudbeaver/core-navigation-tree';
+import { DATA_CONTEXT_NAV_NODE, type DBObject, type NavNode, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { ContextMenu } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_CONNECTION } from '@cloudbeaver/plugin-connections';
@@ -72,29 +71,31 @@ export const Menu = observer<Props>(function Menu({ value, node }) {
 
   const mouseEnter = useStateDelay(mouse.state.mouseEnter, 33); // track mouse update only 30 times per second
 
-  const menuEmpty = !menuOpened && getComputed(() => {
-    if (!mouseEnter) {
-      return true;
-    }
+  const menuEmpty =
+    !menuOpened &&
+    getComputed(() => {
+      if (!mouseEnter) {
+        return true;
+      }
 
-    return !menu.available;
-  });
+      return !menu.available;
+    });
 
   return styled(menuStyles)(
-    <menu-container
-      ref={mouse.reference}
-      onDoubleClick={openNode}
-      {...use({ menuEmpty, menuOpened })}
-    >
+    <menu-container ref={mouse.reference} onDoubleClick={openNode} {...use({ menuEmpty, menuOpened })}>
       <menu-box>
-        <value className='cell-formatter__value' title={value}>{value}</value>
+        <value className="cell-formatter__value" title={value}>
+          {value}
+        </value>
         {!menuEmpty && (
           <ContextMenu menu={menu} modal disclosure onVisibleSwitch={switchState}>
-            <menu-icon><Icon name="snack" viewBox="0 0 16 10" /></menu-icon>
+            <menu-icon>
+              <Icon name="snack" viewBox="0 0 16 10" />
+            </menu-icon>
           </ContextMenu>
         )}
       </menu-box>
-    </menu-container>
+    </menu-container>,
   );
 });
 
@@ -112,8 +113,8 @@ export const CellFormatter = observer<FormatterProps<DBObject>>(function CellFor
   const value = property ? getValue(property.value) : '';
 
   return (
-    <div className='cell-formatter' title={value}>
-      {columnIdx === 0 && !!node ? <Menu node={node} value={value} /> : <span className='cell-formatter__value'>{value}</span>}
+    <div className="cell-formatter" title={value}>
+      {columnIdx === 0 && !!node ? <Menu node={node} value={value} /> : <span className="cell-formatter__value">{value}</span>}
     </div>
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Column.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Column.ts
index 4b9359ac81..ebf4ff1bc1 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Column.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Column.ts
@@ -5,15 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { DBObject } from '@cloudbeaver/core-navigation-tree';
 import type { Column as DataGridColumn } from '@cloudbeaver/plugin-react-data-grid';
 
-
 export interface IDataColumn extends DataGridColumn<DBObject> {
   description?: string;
 }
 
 export interface ICustomColumn extends IDataColumn {
   order?: number;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/ColumnIcon.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/ColumnIcon.ts
index 2c7ca1478c..cf06baa2f2 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/ColumnIcon.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/ColumnIcon.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ICustomColumn } from '../../Column';
 import { IconFormatter } from './IconFormatter';
 
@@ -19,4 +18,4 @@ export const ColumnIcon: ICustomColumn = {
   frozen: true,
   formatter: IconFormatter,
   order: 1,
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/IconFormatter.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/IconFormatter.tsx
index b8d246197a..72cd818aef 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/IconFormatter.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnIcon/IconFormatter.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -29,9 +28,5 @@ const styles = css`
 export const IconFormatter = observer<FormatterProps<DBObject>>(function IconFormatter(props) {
   const { node } = useNode(props.row.id);
 
-  return styled(styles)(
-    <icon>
-      {node?.icon && <StaticImage icon={node.icon} />}
-    </icon>
-  );
-});
\ No newline at end of file
+  return styled(styles)(<icon>{node?.icon && <StaticImage icon={node.icon} />}</icon>);
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/ColumnSelect.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/ColumnSelect.ts
index 839964a70a..c799ef81ec 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/ColumnSelect.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/ColumnSelect.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ICustomColumn } from '../../Column';
 import { SelectorFormatter } from './SelectorFormatter';
 
@@ -19,4 +18,4 @@ export const ColumnSelect: ICustomColumn = {
   frozen: true,
   formatter: SelectorFormatter,
   order: 0,
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/SelectorFormatter.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/SelectorFormatter.tsx
index 8694aa5a4a..884acfc708 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/SelectorFormatter.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Columns/ColumnSelect/SelectorFormatter.tsx
@@ -1,4 +1,3 @@
-
 /*
  * CloudBeaver - Cloud Database Manager
  * Copyright (C) 2020-2023 DBeaver Corp and others
@@ -6,7 +5,6 @@
  * 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, useContext } from 'react';
 import styled, { css } from 'reshadow';
@@ -42,6 +40,6 @@ export const SelectorFormatter = observer<FormatterProps<DBObject>>(function Sel
   return styled(styles)(
     <container>
       <Checkbox checked={selected} onClick={select} />
-    </container>
+    </container>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/HeaderRenderer.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/HeaderRenderer.tsx
index e4fb368f7d..18aa8c2583 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/HeaderRenderer.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/HeaderRenderer.tsx
@@ -5,23 +5,17 @@
  * 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 { useContext } from 'react';
 
 import type { DBObject } from '@cloudbeaver/core-navigation-tree';
 import type { HeaderRendererProps } from '@cloudbeaver/plugin-react-data-grid';
 
-
 import { TableContext } from './TableContext';
 
 export const HeaderRenderer = observer<HeaderRendererProps<DBObject>>(function HeaderRenderer(props) {
   const tableContext = useContext(TableContext);
   const dataColumn = tableContext.tableData?.columns.find(column => column.key === props.column.key);
 
-  return (
-    <div title={dataColumn?.description}>
-      {props.column.name}
-    </div>
-  );
-});
\ No newline at end of file
+  return <div title={dataColumn?.description}>{props.column.name}</div>;
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
index a3dc0deeda..b654ecca54 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
@@ -5,7 +5,6 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -31,25 +30,25 @@ import { TableContext } from './TableContext';
 import { useTableData } from './useTableData';
 
 const style = css`
-    wrapper {
-      composes: theme-typography--body2 from global;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-    }
-    DataGrid {
-      width: 100%;
-      height: 100%;
-    }
-    data-info {
-      padding: 4px 12px;
-    }
-    ObjectPropertyTableFooter {
-      composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
-      border-top: 1px solid;
-    }
-  `;
+  wrapper {
+    composes: theme-typography--body2 from global;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  DataGrid {
+    width: 100%;
+    height: 100%;
+  }
+  data-info {
+    padding: 4px 12px;
+  }
+  ObjectPropertyTableFooter {
+    composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
+    border-top: 1px solid;
+  }
+`;
 
 interface Props {
   objects: DBObject[];
@@ -85,10 +84,7 @@ function getMeasuredCells(columns: ObjectPropertyInfo[], rows: DBObject[]) {
 
 const CUSTOM_COLUMNS = [ColumnSelect, ColumnIcon];
 
-export const Table = observer<Props>(function Table({
-  objects,
-  truncated,
-}) {
+export const Table = observer<Props>(function Table({ objects, truncated }) {
   const [tableContainer, setTableContainerRef] = useState<HTMLDivElement | null>(null);
   const navTreeResource = useService(NavTreeResource);
   const styles = useStyles(style, baseStyles, tableStyles);
@@ -98,9 +94,7 @@ export const Table = observer<Props>(function Table({
   const scrollBox = (tableContainer?.firstChild as HTMLDivElement | undefined) ?? null;
   useControlledScroll(scrollBox, tabLocalState);
 
-  const baseObject = objects
-    .slice()
-    .sort((a, b) => (b.object?.properties?.length || 0) - (a.object?.properties?.length || 0));
+  const baseObject = objects.slice().sort((a, b) => (b.object?.properties?.length || 0) - (a.object?.properties?.length || 0));
 
   const nodeIds = objects.map(object => object.id);
   const properties = baseObject[0]?.object?.properties ?? [];
@@ -126,21 +120,15 @@ export const Table = observer<Props>(function Table({
 
   return styled(styles)(
     <TableContext.Provider value={{ tableData, tableState }}>
-      <wrapper ref={setTableContainerRef} className='metadata-grid-container'>
-        <DataGrid
-          className='cb-metadata-grid-theme'
-          rows={objects}
-          rowKeyGetter={row => row.id}
-          columns={tableData.columns}
-          rowHeight={40}
-        />
+      <wrapper ref={setTableContainerRef} className="metadata-grid-container">
+        <DataGrid className="cb-metadata-grid-theme" rows={objects} rowKeyGetter={row => row.id} columns={tableData.columns} rowHeight={40} />
         {truncated && (
           <data-info>
-            <Translate token='app_navigationTree_limited' limit={navTreeResource.childrenLimit} />
+            <Translate token="app_navigationTree_limited" limit={navTreeResource.childrenLimit} />
           </data-info>
         )}
         <ObjectPropertyTableFooter nodeIds={nodeIds} tableState={tableState} />
       </wrapper>
-    </TableContext.Provider>
+    </TableContext.Provider>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableContext.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableContext.ts
index 9e7670d4b8..d23179d6cc 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableContext.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { TableState } from '@cloudbeaver/core-blocks';
@@ -20,4 +19,4 @@ interface ITableContext {
 export const TableContext = createContext<ITableContext>({
   tableData: null,
   tableState: null,
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableLoader.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableLoader.tsx
index a1761db391..6d2ae4977f 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableLoader.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/TableLoader.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ComplexLoader, createComplexLoader } from '@cloudbeaver/core-blocks';
 import type { DBObject } from '@cloudbeaver/core-navigation-tree';
 
@@ -20,11 +19,5 @@ interface Props {
 }
 
 export const TableLoader: React.FC<Props> = function TableLoader(props) {
-  return (
-    <ComplexLoader loader={loader}>
-      {({ Table }) => (
-        <Table {...props} />
-      )}
-    </ComplexLoader>
-  );
+  return <ComplexLoader loader={loader}>{({ Table }) => <Table {...props} />}</ComplexLoader>;
 };
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/styles/styles.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/styles/styles.ts
index 1c613b49f7..2a9f66ebd1 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/styles/styles.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/styles/styles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ThemeSelector } from '@cloudbeaver/core-theming';
 
 export const tableStyles: ThemeSelector = async theme => {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/useTableData.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/useTableData.ts
index 786305106e..52f6d6bde0 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/useTableData.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/useTableData.ts
@@ -5,15 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
-
 import { useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import type { DBObject } from '@cloudbeaver/core-navigation-tree';
 import type { CalculatedColumn as GridCalculatedColumn } from '@cloudbeaver/plugin-react-data-grid';
 
-import type { IDataColumn, ICustomColumn } from './Column';
+import type { ICustomColumn, IDataColumn } from './Column';
 
 type CalculatedColumn = GridCalculatedColumn<DBObject>;
 
@@ -24,18 +22,21 @@ export interface ITableData {
 }
 
 export function useTableData(dataColumns: IDataColumn[], customColumns: ICustomColumn[]): ITableData {
-  return useObjectRef(() => ({
-    get columns() {
-      return this.customColumns
-        .slice()
-        .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
-        .concat(this.dataColumns);
-    },
-    isCustomColumn(column: CalculatedColumn) {
-      return this.customColumns.some(c => c.key === column.key);
-    },
-    getColumnIdx(column: CalculatedColumn) {
-      return this.isCustomColumn(column) ? column.idx : column.idx - this.customColumns.length;
-    },
-  }), { dataColumns, customColumns });
-}
\ No newline at end of file
+  return useObjectRef(
+    () => ({
+      get columns() {
+        return this.customColumns
+          .slice()
+          .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
+          .concat(this.dataColumns);
+      },
+      isCustomColumn(column: CalculatedColumn) {
+        return this.customColumns.some(c => c.key === column.key);
+      },
+      getColumnIdx(column: CalculatedColumn) {
+        return this.isCustomColumn(column) ? column.idx : column.idx - this.customColumns.length;
+      },
+    }),
+    { dataColumns, customColumns },
+  );
+}
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
index 45dd69c146..c79dfd8525 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
@@ -5,13 +5,11 @@
  * 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 { Checkbox, useStyles } from '@cloudbeaver/core-blocks';
 
-
 import { additionalProps, getValue, matchType } from '../helpers';
 import type { ObjectPropertyProps } from './ObjectPropertyProps';
 
@@ -44,9 +42,7 @@ const styles = css`
   }
 `;
 
-export const ObjectPropertyCheckbox = observer<ObjectPropertyProps>(function ObjectPropertyCheckbox({
-  objectProperty,
-}) {
+export const ObjectPropertyCheckbox = observer<ObjectPropertyProps>(function ObjectPropertyCheckbox({ objectProperty }) {
   const style = useStyles(styles);
   if (!objectProperty) {
     return null;
@@ -55,15 +51,13 @@ export const ObjectPropertyCheckbox = observer<ObjectPropertyProps>(function Obj
   return styled(style)(
     <form-checkbox as="div">
       <label-wrapper as="div">
-        <label htmlFor={objectProperty.id} title={objectProperty.displayName}>{objectProperty.displayName}</label>
+        <label htmlFor={objectProperty.id} title={objectProperty.displayName}>
+          {objectProperty.displayName}
+        </label>
       </label-wrapper>
       <input-wrapper as="div">
         {matchType(objectProperty.dataType) === 'checkbox' ? (
-          <Checkbox
-            value={getValue(objectProperty.value as any)}
-            {...additionalProps(objectProperty)}
-            readOnly
-          />
+          <Checkbox value={getValue(objectProperty.value as any)} {...additionalProps(objectProperty)} readOnly />
         ) : (
           <input
             type={matchType(objectProperty.dataType)}
@@ -73,6 +67,6 @@ export const ObjectPropertyCheckbox = observer<ObjectPropertyProps>(function Obj
           />
         )}
       </input-wrapper>
-    </form-checkbox>
+    </form-checkbox>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyInput.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyInput.tsx
index 07de5c87a1..5a1f52353b 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyInput.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyInput.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -47,20 +46,13 @@ export const ObjectPropertyInput = observer<ObjectPropertyProps>(function Object
   return styled(style)(
     <form-input>
       <label-wrapper>
-        <label
-          htmlFor={objectProperty.id}
-          title={objectProperty.displayName}
-        >{objectProperty.displayName}
+        <label htmlFor={objectProperty.id} title={objectProperty.displayName}>
+          {objectProperty.displayName}
         </label>
       </label-wrapper>
       <input-wrapper>
-        <input
-          type={matchType(objectProperty.dataType)}
-          value={getValue(objectProperty.value)}
-          {...additionalProps(objectProperty)}
-          readOnly
-        />
+        <input type={matchType(objectProperty.dataType)} value={getValue(objectProperty.value)} {...additionalProps(objectProperty)} readOnly />
       </input-wrapper>
-    </form-input>
+    </form-input>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyProps.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyProps.ts
index 2be8c631e1..165fb8c3b4 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyProps.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ILayoutSizeProps } from '@cloudbeaver/core-blocks';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/helpers.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/helpers.ts
index 6b586b5ce3..cb24e6199c 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/helpers.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/helpers.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
 type Value = string | null | undefined | { displayName: string } | string[];
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
index 22f44f0af2..9f819d4345 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ObjectPropertiesPageService } from './ObjectPropertiesPage/ObjectPropertiesPageService';
@@ -25,5 +24,5 @@ export class ObjectViewerBootstrap extends Bootstrap {
     this.objectPropertiesPageService.registerDBObjectPage();
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
index e7a5792cf1..446e1e33dd 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
@@ -5,17 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Loader, TextPlaceholder, Button, useResource, useObservableRef, getComputed, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Button, getComputed, Loader, TextPlaceholder, useObservableRef, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource, ConnectionsManagerService } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeInfoResource, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
-import { TabsBox, TabPanel, useTabLocalState, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, TabPanel, TabsBox, useTabLocalState } from '@cloudbeaver/core-ui';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 import type { TabHandlerPanelComponent } from '@cloudbeaver/plugin-navigation-tabs';
 
@@ -36,9 +35,7 @@ const styles = css`
   }
 `;
 
-export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState> = observer(function ObjectViewerPanel({
-  tab,
-}) {
+export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState> = observer(function ObjectViewerPanel({ tab }) {
   const translate = useTranslate();
   const style = useStyles(BASE_TAB_STYLES, styles);
   const dbObjectPagesService = useService(DBObjectPageService);
@@ -49,13 +46,17 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
   const objectId = tab.handlerState.objectId;
   const connectionKey = tab.handlerState.connectionKey || null;
 
-  const state = useObservableRef(() => ({
-    connecting: false,
-    notFound: false,
-  }), {
-    connecting: observable.ref,
-    notFound: observable.ref,
-  }, false);
+  const state = useObservableRef(
+    () => ({
+      connecting: false,
+      notFound: false,
+    }),
+    {
+      connecting: observable.ref,
+      notFound: observable.ref,
+    },
+    false,
+  );
 
   const connection = useResource(ObjectViewerPanel, ConnectionInfoResource, connectionKey);
   const connected = getComputed(() => connection.data?.connected || false);
@@ -100,7 +101,9 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
 
     return (
       <TextPlaceholder>
-        <Button type="button" mod={['unelevated']} onClick={handleConnect}>{translate('connections_connection_connect')}</Button>
+        <Button type="button" mod={['unelevated']} onClick={handleConnect}>
+          {translate('connections_connection_connect')}
+        </Button>
       </TextPlaceholder>
     );
   }
@@ -115,13 +118,7 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
         <TabsBox
           currentTabId={tab.handlerState.pageId}
           tabs={pages.map(page => (
-            <DBObjectPageTab
-              key={page.key}
-              tab={tab}
-              page={page}
-              style={styles}
-              onSelect={dbObjectPagesService.selectPage}
-            />
+            <DBObjectPageTab key={page.key} tab={tab} page={page} style={styles} onSelect={dbObjectPagesService.selectPage} />
           ))}
           localState={innerTabState}
           style={styles}
@@ -135,6 +132,6 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
       ) : (
         <TextPlaceholder>{translate('plugin_object_viewer_table_no_items')}</TextPlaceholder>
       )}
-    </>
+    </>,
   );
 });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx
index bab84a94ec..100e95a159 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx
@@ -5,13 +5,12 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-blocks';
-import { TabIcon, Tab, TabTitle, ITabData } from '@cloudbeaver/core-ui';
+import { ITabData, Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 import { CaptureViewContext, useDataContext } from '@cloudbeaver/core-view';
 import type { TabHandlerTabComponent } from '@cloudbeaver/plugin-navigation-tabs';
 import { useNode } from '@cloudbeaver/plugin-navigation-tree';
@@ -19,7 +18,11 @@ import { useNode } from '@cloudbeaver/plugin-navigation-tree';
 import type { IObjectViewerTabState } from './IObjectViewerTabState';
 
 export const ObjectViewerTab: TabHandlerTabComponent<IObjectViewerTabState> = observer(function ObjectViewerTab({
-  tab, handler, onSelect, onClose, style,
+  tab,
+  handler,
+  onSelect,
+  onClose,
+  style,
 }) {
   // const connectionsInfoResource = useService(ConnectionInfoResource);
   const viewContext = useContext(CaptureViewContext);
@@ -39,17 +42,9 @@ export const ObjectViewerTab: TabHandlerTabComponent<IObjectViewerTabState> = ob
   // }
 
   return styled(useStyles(style))(
-    <Tab
-      tabId={tab.id}
-      style={style}
-      title={title}
-      menuContext={tabMenuContext}
-      onOpen={handleSelect}
-      onClose={handleClose}
-    >
+    <Tab tabId={tab.id} style={style} title={title} menuContext={tabMenuContext} onOpen={handleSelect} onClose={handleClose}>
       <TabIcon icon={node?.icon || tab.handlerState.tabIcon} />
       <TabTitle>{title}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 });
-
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
index f95040e60e..fc2a370f7b 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
@@ -5,17 +5,32 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, runInAction } from 'mobx';
 
-import { connectionProvider, ConnectionInfoResource, Connection, createConnectionParam, IConnectionInfoParams, ConnectionNavNodeService, objectCatalogProvider, objectSchemaProvider, ConnectionInfoActiveProjectKey } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionInfoActiveProjectKey,
+  ConnectionInfoResource,
+  ConnectionNavNodeService,
+  connectionProvider,
+  createConnectionParam,
+  IConnectionInfoParams,
+  objectCatalogProvider,
+  objectSchemaProvider,
+} from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { IAsyncContextLoader, IExecutionContextProvider } from '@cloudbeaver/core-executor';
-import { NavNodeManagerService, objectNavNodeProvider, type INodeNavigationData, NodeManagerUtils, NavigationType } from '@cloudbeaver/core-navigation-tree';
+import {
+  type INodeNavigationData,
+  NavigationType,
+  NavNodeManagerService,
+  NodeManagerUtils,
+  objectNavNodeProvider,
+} from '@cloudbeaver/core-navigation-tree';
 import { projectProvider } from '@cloudbeaver/core-projects';
 import { ResourceKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
-import { NavigationTabsService, ITab, TabHandler } from '@cloudbeaver/plugin-navigation-tabs';
+import { ITab, NavigationTabsService, TabHandler } from '@cloudbeaver/plugin-navigation-tabs';
 
 import type { IObjectViewerTabContext } from './IObjectViewerTabContext';
 import type { IObjectViewerTabState } from './IObjectViewerTabState';
@@ -37,8 +52,7 @@ export class ObjectViewerTabService {
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly connectionNavNodeService: ConnectionNavNodeService,
   ) {
-    this.tabHandler = this.navigationTabsService
-      .registerTabHandler<IObjectViewerTabState>({
+    this.tabHandler = this.navigationTabsService.registerTabHandler<IObjectViewerTabState>({
       key: objectViewerTabHandlerKey,
       getTabComponent: () => ObjectViewerTab,
       getPanelComponent: () => ObjectViewerPanel,
@@ -75,18 +89,13 @@ export class ObjectViewerTabService {
     return tab.handlerState.pageId === page.key;
   }
 
-  objectViewerTabContext: IAsyncContextLoader<IObjectViewerTabContext, INodeNavigationData> = async (
-    contexts,
-    data
-  ) => {
+  objectViewerTabContext: IAsyncContextLoader<IObjectViewerTabContext, INodeNavigationData> = async (contexts, data) => {
     const tabInfo = contexts.getContext(this.navigationTabsService.navigationTabContext);
     const nodeInfo = contexts.getContext(this.navNodeManagerService.navigationNavNodeContext);
     const connection = await contexts.getContext(this.connectionNavNodeService.navigationNavNodeConnectionContext);
 
     // check if tab already exist for object
-    const tab = this.navigationTabsService.findTab(
-      isObjectViewerTab(tab => tab.handlerState.objectId === nodeInfo.nodeId)
-    );
+    const tab = this.navigationTabsService.findTab(isObjectViewerTab(tab => tab.handlerState.objectId === nodeInfo.nodeId));
 
     if (tab) {
       tab.handlerState.tabIcon = nodeInfo.icon;
@@ -143,9 +152,7 @@ export class ObjectViewerTabService {
       page: getPage(),
     };
 
-    const canSwitchPage = (
-      page: ObjectPage<any>
-    ) => !tabToSwitch.page || this.dbObjectPageService.canSwitchPage(tabToSwitch.page, page);
+    const canSwitchPage = (page: ObjectPage<any>) => !tabToSwitch.page || this.dbObjectPageService.canSwitchPage(tabToSwitch.page, page);
 
     const trySwitchPage = <T>(page: ObjectPage<T>, state?: T) => {
       if (!tabToSwitch.page || this.dbObjectPageService.canSwitchPage(tabToSwitch.page, page)) {
@@ -164,11 +171,7 @@ export class ObjectViewerTabService {
         return false;
       }
 
-      return this.dbObjectPageService.trySwitchPage(
-        tabInfo.tab,
-        page || tabToSwitch.page!,
-        state || tabToSwitch.state
-      );
+      return this.dbObjectPageService.trySwitchPage(tabInfo.tab, page || tabToSwitch.page!, state || tabToSwitch.state);
     };
 
     const isPageActive = (page: ObjectPage) => page === getPage();
@@ -197,16 +200,11 @@ export class ObjectViewerTabService {
   private closeConnectionTabs(key: ResourceKeySimple<IConnectionInfoParams>) {
     const tabs = Array.from(
       this.navigationTabsService.findTabs(
-        isObjectViewerTab(tab => (
-          tab.handlerState.connectionKey !== undefined
-          && this.connectionInfoResource.isIntersect(
-            key,
-            tab.handlerState.connectionKey
-          )
-        ))
-      )
-    )
-      .map(tab => tab.id);
+        isObjectViewerTab(
+          tab => tab.handlerState.connectionKey !== undefined && this.connectionInfoResource.isIntersect(key, tab.handlerState.connectionKey),
+        ),
+      ),
+    ).map(tab => tab.id);
 
     this.navigationTabsService.closeTabSilent(resourceKeyList(tabs), true);
   }
@@ -214,14 +212,12 @@ export class ObjectViewerTabService {
   private updateConnectionTabs(key: ResourceKeySimple<IConnectionInfoParams>) {
     ResourceKeyUtils.forEach(key, key => {
       const tab = this.navigationTabsService.findTab(
-        isObjectViewerTab(tab =>
-          tab.id === this.navigationTabsService.currentTabId
-          && tab.handlerState.connectionKey !== undefined
-          && this.connectionInfoResource.isKeyEqual(
-            tab.handlerState.connectionKey,
-            key
-          )
-        )
+        isObjectViewerTab(
+          tab =>
+            tab.id === this.navigationTabsService.currentTabId &&
+            tab.handlerState.connectionKey !== undefined &&
+            this.connectionInfoResource.isKeyEqual(tab.handlerState.connectionKey, key),
+        ),
       );
 
       if (tab) {
@@ -232,12 +228,14 @@ export class ObjectViewerTabService {
 
   private closeConnectionInfoTabs(connection: Connection) {
     if (!connection.connected) {
-      const tabs = Array.from(this.navigationTabsService.findTabs(
-        isObjectViewerTab(tab => (
-          tab.handlerState.connectionKey?.projectId === connection.projectId
-          && tab.handlerState.connectionKey.connectionId === connection.id
-        ))
-      )).map(tab => tab.id);
+      const tabs = Array.from(
+        this.navigationTabsService.findTabs(
+          isObjectViewerTab(
+            tab =>
+              tab.handlerState.connectionKey?.projectId === connection.projectId && tab.handlerState.connectionKey.connectionId === connection.id,
+          ),
+        ),
+      ).map(tab => tab.id);
 
       this.navigationTabsService.closeTabSilent(resourceKeyList(tabs), true);
     }
@@ -249,9 +247,7 @@ export class ObjectViewerTabService {
     await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
 
     ResourceKeyUtils.forEach(key, key => {
-      const tab = this.navigationTabsService.findTab(
-        isObjectViewerTab(tab => tab.handlerState.objectId === key)
-      );
+      const tab = this.navigationTabsService.findTab(isObjectViewerTab(tab => tab.handlerState.objectId === key));
 
       if (tab) {
         if (tab.handlerState.connectionKey) {
@@ -293,8 +289,7 @@ export class ObjectViewerTabService {
   }
 
   private getDBObjectCatalog(context: ITab<IObjectViewerTabState>) {
-    const nodeInfo = this.navNodeManagerService
-      .getNodeContainerInfo(context.handlerState.objectId);
+    const nodeInfo = this.navNodeManagerService.getNodeContainerInfo(context.handlerState.objectId);
 
     if (!nodeInfo.catalogId) {
       return;
@@ -303,8 +298,7 @@ export class ObjectViewerTabService {
   }
 
   private getDBObjectSchema(context: ITab<IObjectViewerTabState>) {
-    const nodeInfo = this.navNodeManagerService
-      .getNodeContainerInfo(context.handlerState.objectId);
+    const nodeInfo = this.navNodeManagerService.getNodeContainerInfo(context.handlerState.objectId);
 
     if (!nodeInfo.schemaId) {
       return;
@@ -335,17 +329,17 @@ export class ObjectViewerTabService {
 
   private async restoreObjectTab(tab: ITab<IObjectViewerTabState>) {
     if (
-      typeof tab.handlerState.folderId === 'string'
-      && ['string', 'undefined'].includes(typeof tab.handlerState.parentId)
-      && ['object', 'undefined'].includes(typeof tab.handlerState.connectionKey)
-      && ['string', 'undefined'].includes(typeof tab.handlerState.projectId)
-      && Array.isArray(tab.handlerState.parents)
-      && typeof tab.handlerState.objectId === 'string'
-      && typeof tab.handlerState.pagesState === 'object'
-      && typeof tab.handlerState.error === 'boolean'
-      && typeof tab.handlerState.childrenError === 'boolean'
-      && (!tab.handlerState.tabIcon || typeof tab.handlerState.tabIcon === 'string')
-      && (!tab.handlerState.tabTitle || typeof tab.handlerState.tabTitle === 'string')
+      typeof tab.handlerState.folderId === 'string' &&
+      ['string', 'undefined'].includes(typeof tab.handlerState.parentId) &&
+      ['object', 'undefined'].includes(typeof tab.handlerState.connectionKey) &&
+      ['string', 'undefined'].includes(typeof tab.handlerState.projectId) &&
+      Array.isArray(tab.handlerState.parents) &&
+      typeof tab.handlerState.objectId === 'string' &&
+      typeof tab.handlerState.pagesState === 'object' &&
+      typeof tab.handlerState.error === 'boolean' &&
+      typeof tab.handlerState.childrenError === 'boolean' &&
+      (!tab.handlerState.tabIcon || typeof tab.handlerState.tabIcon === 'string') &&
+      (!tab.handlerState.tabTitle || typeof tab.handlerState.tabTitle === 'string')
     ) {
       if (tab.handlerState.connectionKey) {
         await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
@@ -389,9 +383,9 @@ export class ObjectViewerTabService {
       if (tab) {
         runInAction(() => {
           if (
-            !tab.handlerState.folderId
-            || (data.folderId && tab.handlerState.folderId !== data.folderId)
-            || (tab.handlerState.folderId !== nodeInfo.folderId)
+            !tab.handlerState.folderId ||
+            (data.folderId && tab.handlerState.folderId !== data.folderId) ||
+            tab.handlerState.folderId !== nodeInfo.folderId
           ) {
             tab.handlerState.childrenError = false;
             tab.handlerState.folderId = data.folderId || nodeInfo.folderId;
@@ -404,10 +398,7 @@ export class ObjectViewerTabService {
     }
   }
 
-  private async navigationPostHandler(
-    data: INodeNavigationData,
-    contexts: IExecutionContextProvider<INodeNavigationData>
-  ) {
+  private async navigationPostHandler(data: INodeNavigationData, contexts: IExecutionContextProvider<INodeNavigationData>) {
     if (data.type !== NavigationType.open) {
       return;
     }
@@ -426,11 +417,9 @@ export class ObjectViewerTabService {
 }
 
 export function isObjectViewerTab(tab: ITab): tab is ITab<IObjectViewerTabState>;
+export function isObjectViewerTab(predicate: (tab: ITab<IObjectViewerTabState>) => boolean): (tab: ITab) => tab is ITab<IObjectViewerTabState>;
 export function isObjectViewerTab(
-  predicate: (tab: ITab<IObjectViewerTabState>) => boolean
-): (tab: ITab) => tab is ITab<IObjectViewerTabState>;
-export function isObjectViewerTab(
-  tab: ITab | ((tab: ITab<IObjectViewerTabState>) => boolean)
+  tab: ITab | ((tab: ITab<IObjectViewerTabState>) => boolean),
 ): boolean | ((tab: ITab) => tab is ITab<IObjectViewerTabState>) {
   if (typeof tab === 'function') {
     const predicate = tab;
diff --git a/webapp/packages/plugin-object-viewer/src/index.ts b/webapp/packages/plugin-object-viewer/src/index.ts
index 980892b217..4543e9a376 100644
--- a/webapp/packages/plugin-object-viewer/src/index.ts
+++ b/webapp/packages/plugin-object-viewer/src/index.ts
@@ -6,4 +6,4 @@ export default manifest;
 export * from './ObjectPage/DBObjectPageService';
 export * from './ObjectPage/ObjectPage';
 export * from './ObjectViewerTabService';
-export * from './IObjectViewerTabState';
\ No newline at end of file
+export * from './IObjectViewerTabState';
diff --git a/webapp/packages/plugin-object-viewer/src/locales/zh.ts b/webapp/packages/plugin-object-viewer/src/locales/zh.ts
index 937daf01ac..eaef767334 100644
--- a/webapp/packages/plugin-object-viewer/src/locales/zh.ts
+++ b/webapp/packages/plugin-object-viewer/src/locales/zh.ts
@@ -1,7 +1,7 @@
 export default [
-    ['plugin_object_viewer_properties_tab', '属性'],
-    ['plugin_object_viewer_object_info_tab', '信息'],
-    ['plugin_object_viewer_table_name', '名称'],
-    ['plugin_object_viewer_table_no_items', '没有要显示的项目'],
-    ['plugin_object_viewer_error', '选项卡加载时出错'],
-  ];
+  ['plugin_object_viewer_properties_tab', '属性'],
+  ['plugin_object_viewer_object_info_tab', '信息'],
+  ['plugin_object_viewer_table_name', '名称'],
+  ['plugin_object_viewer_table_no_items', '没有要显示的项目'],
+  ['plugin_object_viewer_error', '选项卡加载时出错'],
+];
diff --git a/webapp/packages/plugin-object-viewer/src/manifest.ts b/webapp/packages/plugin-object-viewer/src/manifest.ts
index 17d911ee2a..fcaf4c7896 100644
--- a/webapp/packages/plugin-object-viewer/src/manifest.ts
+++ b/webapp/packages/plugin-object-viewer/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
diff --git a/webapp/packages/plugin-product/src/LocaleService.ts b/webapp/packages/plugin-product/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-product/src/LocaleService.ts
+++ b/webapp/packages/plugin-product/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-product/src/ProductBootstrap.ts b/webapp/packages/plugin-product/src/ProductBootstrap.ts
index e657e17e30..347b154587 100644
--- a/webapp/packages/plugin-product/src/ProductBootstrap.ts
+++ b/webapp/packages/plugin-product/src/ProductBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
@@ -26,10 +25,7 @@ export class ProductBootstrap extends Bootstrap {
 
   register(): void | Promise<void> {
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU
-        && !!this.serverConfigResource.data?.productInfo
-      ),
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU && !!this.serverConfigResource.data?.productInfo,
       getItems: (context, items) => [
         ...items,
         new MenuBaseItem(
@@ -40,12 +36,11 @@ export class ProductBootstrap extends Bootstrap {
           },
           {
             onSelect: () => this.commonDialogService.open(ProductInfoDialog, null),
-          }
+          },
         ),
       ],
-
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
index a0b59ab414..6e1c0c71ce 100644
--- a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
+++ b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx
@@ -5,11 +5,20 @@
  * 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 { BASE_CONTAINERS_STYLES, Button, ColoredContainer, FormFieldDescription, Group, IconOrImage, Link, TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  Button,
+  ColoredContainer,
+  FormFieldDescription,
+  Group,
+  IconOrImage,
+  Link,
+  TextPlaceholder,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponentProps } from '@cloudbeaver/core-dialogs';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
@@ -17,86 +26,79 @@ import { ThemeService } from '@cloudbeaver/core-theming';
 import { useAppVersion } from '@cloudbeaver/plugin-version';
 
 const productInfoDialogStyles = css`
-    contacts-info {
-      display: flex;
-      white-space: pre-wrap;
-    }
-    FormFieldDescription {
-      white-space: pre-wrap;
-    }
-    IconOrImage {
-      max-width: 154px;
-      height: 32px;
-    }
-    CommonDialogFooter {
-      align-items: center;
-      justify-content: flex-end;
-    }
+  contacts-info {
+    display: flex;
+    white-space: pre-wrap;
+  }
+  FormFieldDescription {
+    white-space: pre-wrap;
+  }
+  IconOrImage {
+    max-width: 154px;
+    height: 32px;
+  }
+  CommonDialogFooter {
+    align-items: center;
+    justify-content: flex-end;
+  }
 `;
 
-export const ProductInfoDialog = observer<DialogComponentProps<null>>(
-  function ProductInfoDialog(props) {
-    const translate = useTranslate();
-    const serverConfigResource = useService(ServerConfigResource);
-    const themeService = useService(ThemeService);
+export const ProductInfoDialog = observer<DialogComponentProps<null>>(function ProductInfoDialog(props) {
+  const translate = useTranslate();
+  const serverConfigResource = useService(ServerConfigResource);
+  const themeService = useService(ThemeService);
 
-    const version = useAppVersion();
+  const version = useAppVersion();
 
-    const productInfo = serverConfigResource.data?.productInfo;
-    const logoIcon = themeService.currentThemeId === 'light' ? '/icons/product-logo_light.svg' : '/icons/product-logo_dark.svg';
+  const productInfo = serverConfigResource.data?.productInfo;
+  const logoIcon = themeService.currentThemeId === 'light' ? '/icons/product-logo_light.svg' : '/icons/product-logo_dark.svg';
 
-    return styled(BASE_CONTAINERS_STYLES, productInfoDialogStyles)(
-      <CommonDialogWrapper size='large'>
-        <CommonDialogHeader
-          title="app_product_info"
-          onReject={props.rejectDialog}
-        />
-        <CommonDialogBody>
-          <ColoredContainer>
-            <Group gap compact box>
-              {!productInfo ? (
-                <TextPlaceholder>{translate('app_product_info_placeholder')}</TextPlaceholder>
-              ) : (
-                <>
-                  <IconOrImage icon={logoIcon} />
-                  <FormFieldDescription label={translate('app_product_info_name')}>
-                    {productInfo.name}
-                  </FormFieldDescription>
-                  <FormFieldDescription label={translate('app_product_info_description')}>
-                    {productInfo.description}
-                  </FormFieldDescription>
-                  {productInfo.licenseInfo && (
-                    <FormFieldDescription label={translate('app_product_info_license_info')}>
-                      {productInfo.licenseInfo}
-                    </FormFieldDescription>
-                  )}
-                  <FormFieldDescription label={translate('app_product_info_build_time')}>
-                    {productInfo.buildTime}
-                  </FormFieldDescription>
-                  <FormFieldDescription label="Backend version">
-                    {productInfo.version}
-                  </FormFieldDescription>
-                  <FormFieldDescription label="Frontend version">
-                    {version.frontendVersion}
-                  </FormFieldDescription>
-                  <FormFieldDescription label={translate('app_product_info_contacts')}>
-                    <contacts-info>You can contact us via our
-                      <Link href="https://cloudbeaver.io/contact/" target='_blank' rel='noopener noreferrer'> Site </Link>
+  return styled(
+    BASE_CONTAINERS_STYLES,
+    productInfoDialogStyles,
+  )(
+    <CommonDialogWrapper size="large">
+      <CommonDialogHeader title="app_product_info" onReject={props.rejectDialog} />
+      <CommonDialogBody>
+        <ColoredContainer>
+          <Group gap compact box>
+            {!productInfo ? (
+              <TextPlaceholder>{translate('app_product_info_placeholder')}</TextPlaceholder>
+            ) : (
+              <>
+                <IconOrImage icon={logoIcon} />
+                <FormFieldDescription label={translate('app_product_info_name')}>{productInfo.name}</FormFieldDescription>
+                <FormFieldDescription label={translate('app_product_info_description')}>{productInfo.description}</FormFieldDescription>
+                {productInfo.licenseInfo && (
+                  <FormFieldDescription label={translate('app_product_info_license_info')}>{productInfo.licenseInfo}</FormFieldDescription>
+                )}
+                <FormFieldDescription label={translate('app_product_info_build_time')}>{productInfo.buildTime}</FormFieldDescription>
+                <FormFieldDescription label="Backend version">{productInfo.version}</FormFieldDescription>
+                <FormFieldDescription label="Frontend version">{version.frontendVersion}</FormFieldDescription>
+                <FormFieldDescription label={translate('app_product_info_contacts')}>
+                  <contacts-info>
+                    You can contact us via our
+                    <Link href="https://cloudbeaver.io/contact/" target="_blank" rel="noopener noreferrer">
+                      {' '}
+                      Site{' '}
+                    </Link>
                     or
-                      <Link href="https://github.com/dbeaver/cloudbeaver" target='_blank' rel='noopener noreferrer'> Github</Link>
-                    </contacts-info>
-                  </FormFieldDescription>
-                </>
-              )}
-            </Group>
-          </ColoredContainer>
-        </CommonDialogBody>
-        <CommonDialogFooter>
-          <Button type="button" mod={['outlined']} onClick={props.rejectDialog}>
-            {translate('ui_processing_ok')}
-          </Button>
-        </CommonDialogFooter>
-      </CommonDialogWrapper>
-    );
-  }
-);
+                    <Link href="https://github.com/dbeaver/cloudbeaver" target="_blank" rel="noopener noreferrer">
+                      {' '}
+                      Github
+                    </Link>
+                  </contacts-info>
+                </FormFieldDescription>
+              </>
+            )}
+          </Group>
+        </ColoredContainer>
+      </CommonDialogBody>
+      <CommonDialogFooter>
+        <Button type="button" mod={['outlined']} onClick={props.rejectDialog}>
+          {translate('ui_processing_ok')}
+        </Button>
+      </CommonDialogFooter>
+    </CommonDialogWrapper>,
+  );
+});
diff --git a/webapp/packages/plugin-product/src/locales/zh.ts b/webapp/packages/plugin-product/src/locales/zh.ts
index 0b84fd6cc7..68d53a0e55 100644
--- a/webapp/packages/plugin-product/src/locales/zh.ts
+++ b/webapp/packages/plugin-product/src/locales/zh.ts
@@ -1,9 +1,9 @@
 export default [
-    ['app_product_info', '产品信息'],
-    ['app_product_info_name', '产品名称'],
-    ['app_product_info_description', '产品描述'],
-    ['app_product_info_license_info', '许可证信息'],
-    ['app_product_info_build_time', '构建时间'],
-    ['app_product_info_contacts', '联系人'],
-    ['app_product_info_placeholder', '没有可显示的信息'],
-  ];
+  ['app_product_info', '产品信息'],
+  ['app_product_info_name', '产品名称'],
+  ['app_product_info_description', '产品描述'],
+  ['app_product_info_license_info', '许可证信息'],
+  ['app_product_info_build_time', '构建时间'],
+  ['app_product_info_contacts', '联系人'],
+  ['app_product_info_placeholder', '没有可显示的信息'],
+];
diff --git a/webapp/packages/plugin-product/src/manifest.ts b/webapp/packages/plugin-product/src/manifest.ts
index 12c89d5e02..4d38c99230 100644
--- a/webapp/packages/plugin-product/src/manifest.ts
+++ b/webapp/packages/plugin-product/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
diff --git a/webapp/packages/plugin-projects/src/FolderDialog.tsx b/webapp/packages/plugin-projects/src/FolderDialog.tsx
index 035f05727f..f5fc7d3d2c 100644
--- a/webapp/packages/plugin-projects/src/FolderDialog.tsx
+++ b/webapp/packages/plugin-projects/src/FolderDialog.tsx
@@ -5,13 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Button, Container, InputField, SubmittingForm, Translate, useFocus, useObservableRef, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  Button,
+  Container,
+  InputField,
+  SubmittingForm,
+  Translate,
+  useFocus,
+  useObservableRef,
+  useResource,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { createPath, throttleAsync } from '@cloudbeaver/core-utils';
@@ -71,18 +81,7 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
   const translate = useTranslate();
   const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
 
-  const {
-    icon,
-    folder,
-    bigIcon,
-    viewBox,
-    value,
-    projectId,
-    selectProject,
-    objectName,
-    create,
-    confirmActionText,
-  } = payload;
+  const { icon, folder, bigIcon, viewBox, value, projectId, selectProject, objectName, create, confirmActionText } = payload;
   let { title } = payload;
 
   if (!title) {
@@ -95,51 +94,52 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
     title += ` ${translate(objectName)}`;
   }
 
-  const state = useObservableRef<IFolderDialogState>(() => ({
-    value,
-    projectId,
-    folder,
-    message: undefined,
-    valid: true,
-    validationInProgress: false,
-    validate: throttleAsync(async () => {
-      const { folder, value, projectId } = state;
-      state.message = undefined;
-      state.validationInProgress = true;
-      let valid: boolean | undefined;
-      try {
-        valid = await state.payload.validation?.(
-          { folder, name: value, projectId },
-          (message: string) => {
+  const state = useObservableRef<IFolderDialogState>(
+    () => ({
+      value,
+      projectId,
+      folder,
+      message: undefined,
+      valid: true,
+      validationInProgress: false,
+      validate: throttleAsync(async () => {
+        const { folder, value, projectId } = state;
+        state.message = undefined;
+        state.validationInProgress = true;
+        let valid: boolean | undefined;
+        try {
+          valid = await state.payload.validation?.({ folder, name: value, projectId }, (message: string) => {
             if (state.folder === folder && state.value === value && state.projectId === projectId) {
               state.setMessage(message);
             }
-          }
-        );
-      } catch {}
+          });
+        } catch {}
 
-      if (state.folder === folder && state.value === value && state.projectId === projectId) {
-        state.valid = valid ?? true;
-        state.validationInProgress = false;
-      }
-    }, 300),
-    setMessage(message) {
-      this.message = message;
+        if (state.folder === folder && state.value === value && state.projectId === projectId) {
+          state.valid = valid ?? true;
+          state.validationInProgress = false;
+        }
+      }, 300),
+      setMessage(message) {
+        this.message = message;
+      },
+      setProjectId(projectId) {
+        this.projectId = projectId;
+        this.folder = undefined;
+      },
+    }),
+    {
+      value: observable.ref,
+      projectId: observable.ref,
+      validationInProgress: observable.ref,
+      folder: observable.ref,
+      valid: observable.ref,
+      message: observable.ref,
     },
-    setProjectId(projectId) {
-      this.projectId = projectId;
-      this.folder = undefined;
+    {
+      payload,
     },
-  }), {
-    value: observable.ref,
-    projectId: observable.ref,
-    validationInProgress: observable.ref,
-    folder: observable.ref,
-    valid: observable.ref,
-    message: observable.ref,
-  }, {
-    payload,
-  });
+  );
 
   const projectInfoLoader = useResource(FolderDialog, ProjectInfoResource, state.projectId);
 
@@ -157,27 +157,18 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
   const errorMessage = state.valid ? ' ' : translate(state.message ?? 'ui_rename_taken_or_invalid');
   const subTitle = createPath(projectInfoLoader.data?.name ?? state.projectId, state.folder);
 
-  return styled(style, BASE_CONTAINERS_STYLES)(
-    <CommonDialogWrapper size='small' className={className} fixedWidth>
-      <CommonDialogHeader
-        subTitle={subTitle}
-        title={title}
-        icon={icon}
-        viewBox={viewBox}
-        bigIcon={bigIcon}
-        onReject={rejectDialog}
-      />
+  return styled(
+    style,
+    BASE_CONTAINERS_STYLES,
+  )(
+    <CommonDialogWrapper size="small" className={className} fixedWidth>
+      <CommonDialogHeader subTitle={subTitle} title={title} icon={icon} viewBox={viewBox} bigIcon={bigIcon} onReject={rejectDialog} />
       <CommonDialogBody>
         <SubmittingForm ref={focusedRef} onSubmit={resolveHandler}>
           <Container center gap>
-            {selectProject && (
-              <ProjectSelect
-                value={state.projectId}
-                onChange={projectId => state.setProjectId(projectId)}
-              />
-            )}
+            {selectProject && <ProjectSelect value={state.projectId} onChange={projectId => state.setProjectId(projectId)} />}
             <InputField
-              name='value'
+              name="value"
               state={state}
               error={!state.valid}
               description={errorMessage}
@@ -190,23 +181,14 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
         </SubmittingForm>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['outlined']}
-          onClick={rejectDialog}
-        >
-          <Translate token='ui_processing_cancel' />
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
+          <Translate token="ui_processing_cancel" />
         </Button>
         <fill />
-        <Button
-          type="button"
-          mod={['unelevated']}
-          disabled={!state.valid}
-          onClick={resolveHandler}
-        >
+        <Button type="button" mod={['unelevated']} disabled={!state.valid} onClick={resolveHandler}>
           <Translate token={confirmActionText || (create ? 'ui_create' : 'ui_rename')} />
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-projects/src/LocaleService.ts b/webapp/packages/plugin-projects/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-projects/src/LocaleService.ts
+++ b/webapp/packages/plugin-projects/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-projects/src/PluginBootstrap.ts b/webapp/packages/plugin-projects/src/PluginBootstrap.ts
index a41b4baf1f..616bb4963c 100644
--- a/webapp/packages/plugin-projects/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-projects/src/PluginBootstrap.ts
@@ -5,18 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-  ) {
+  constructor() {
     super();
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
-  register(): void {
-  }
+  register(): void {}
 }
diff --git a/webapp/packages/plugin-projects/src/ProjectSelect.tsx b/webapp/packages/plugin-projects/src/ProjectSelect.tsx
index 4b66f57821..d87ad3074c 100644
--- a/webapp/packages/plugin-projects/src/ProjectSelect.tsx
+++ b/webapp/packages/plugin-projects/src/ProjectSelect.tsx
@@ -37,20 +37,13 @@ export const ProjectSelect = observer(function ProjectSelect({
 
   const projectsService = useService(ProjectsService);
 
-  const projects = projectsService.activeProjects
-    .slice()
-    .sort(projectInfoSortByName);
+  const projects = projectsService.activeProjects.slice().sort(projectInfoSortByName);
 
-  const possibleOptions = projects
-    .filter(filter)
-    .map(project => project.id);
+  const possibleOptions = projects.filter(filter).map(project => project.id);
 
   const projectsLoader = useResource(ProjectSelect, ProjectInfoResource, CachedMapAllKey, {
     onData: () => {
-      if (
-        (!value && possibleOptions.length > 0)
-        || (value && !possibleOptions.includes(value))
-      ) {
+      if ((!value && possibleOptions.length > 0) || (value && !possibleOptions.includes(value))) {
         onChange(possibleOptions[0]);
       }
     },
@@ -70,7 +63,7 @@ export const ProjectSelect = observer(function ProjectSelect({
 
   return (
     <Combobox
-      name='projectId'
+      name="projectId"
       value={value ?? ''}
       items={projects}
       keySelector={project => project.id}
@@ -90,4 +83,4 @@ export const ProjectSelect = observer(function ProjectSelect({
       {translate('plugin_projects_project_select_label')}
     </Combobox>
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-projects/src/index.ts b/webapp/packages/plugin-projects/src/index.ts
index 7211905f88..687285f5c1 100644
--- a/webapp/packages/plugin-projects/src/index.ts
+++ b/webapp/packages/plugin-projects/src/index.ts
@@ -1,5 +1,6 @@
 import { manifest } from './manifest';
+
 export * from './FolderDialog';
 export * from './ProjectSelect';
 
-export default manifest;
\ No newline at end of file
+export default manifest;
diff --git a/webapp/packages/plugin-projects/src/locales/en.ts b/webapp/packages/plugin-projects/src/locales/en.ts
index 08a24cdde4..5c3f491d2a 100644
--- a/webapp/packages/plugin-projects/src/locales/en.ts
+++ b/webapp/packages/plugin-projects/src/locales/en.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_projects_project_select_label', 'Project'],
-];
+export default [['plugin_projects_project_select_label', 'Project']];
diff --git a/webapp/packages/plugin-projects/src/locales/it.ts b/webapp/packages/plugin-projects/src/locales/it.ts
index 08a24cdde4..5c3f491d2a 100644
--- a/webapp/packages/plugin-projects/src/locales/it.ts
+++ b/webapp/packages/plugin-projects/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_projects_project_select_label', 'Project'],
-];
+export default [['plugin_projects_project_select_label', 'Project']];
diff --git a/webapp/packages/plugin-projects/src/locales/ru.ts b/webapp/packages/plugin-projects/src/locales/ru.ts
index 774a04bef4..e7d10bf889 100644
--- a/webapp/packages/plugin-projects/src/locales/ru.ts
+++ b/webapp/packages/plugin-projects/src/locales/ru.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_projects_project_select_label', 'Проект'],
-];
+export default [['plugin_projects_project_select_label', 'Проект']];
diff --git a/webapp/packages/plugin-projects/src/locales/zh.ts b/webapp/packages/plugin-projects/src/locales/zh.ts
index 08a24cdde4..5c3f491d2a 100644
--- a/webapp/packages/plugin-projects/src/locales/zh.ts
+++ b/webapp/packages/plugin-projects/src/locales/zh.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_projects_project_select_label', 'Project'],
-];
+export default [['plugin_projects_project_select_label', 'Project']];
diff --git a/webapp/packages/plugin-projects/src/manifest.ts b/webapp/packages/plugin-projects/src/manifest.ts
index 6a09b00480..3f209a7730 100644
--- a/webapp/packages/plugin-projects/src/manifest.ts
+++ b/webapp/packages/plugin-projects/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -16,8 +15,5 @@ export const manifest: PluginManifest = {
     name: 'Projects plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-  ],
+  providers: [PluginBootstrap, LocaleService],
 };
diff --git a/webapp/packages/plugin-react-data-grid/lib/lib/index.d.ts b/webapp/packages/plugin-react-data-grid/lib/lib/index.d.ts
index d48ae35a3d..10c16b013b 100644
--- a/webapp/packages/plugin-react-data-grid/lib/lib/index.d.ts
+++ b/webapp/packages/plugin-react-data-grid/lib/lib/index.d.ts
@@ -6,201 +6,209 @@ import type { ReactElement } from 'react';
 import { RefAttributes } from 'react';
 
 export declare interface CalculatedColumn<TRow, TSummaryRow = unknown> extends Column<TRow, TSummaryRow> {
-    readonly idx: number;
-    readonly minWidth: number;
-    readonly resizable: boolean;
-    readonly sortable: boolean;
-    readonly frozen: boolean;
-    readonly isLastFrozenColumn: boolean;
-    readonly rowGroup: boolean;
-    readonly formatter: ComponentType<FormatterProps<TRow, TSummaryRow>>;
+  readonly idx: number;
+  readonly minWidth: number;
+  readonly resizable: boolean;
+  readonly sortable: boolean;
+  readonly frozen: boolean;
+  readonly isLastFrozenColumn: boolean;
+  readonly rowGroup: boolean;
+  readonly formatter: ComponentType<FormatterProps<TRow, TSummaryRow>>;
 }
 
 export declare const Cell: <R, SR>(props: CellRendererProps<R, SR> & RefAttributes<HTMLDivElement>) => JSX.Element;
 
 export declare type CellNavigationMode = 'NONE' | 'CHANGE_ROW' | 'LOOP_OVER_ROW';
 
-export declare interface CellRendererProps<TRow, TSummaryRow> extends Pick<RowRendererProps<TRow, TSummaryRow>, 'onRowClick' | 'onRowDoubleClick' | 'selectCell'>, Omit_2<React.HTMLAttributes<HTMLDivElement>, 'style' | 'children'> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    colSpan: number | undefined;
-    row: TRow;
-    isScrolling: boolean;
-    isCopied: boolean;
-    isDraggedOver: boolean;
-    isCellSelected: boolean;
-    dragHandle: ReactElement<React.HTMLAttributes<HTMLDivElement>> | undefined;
-    onRowChange: (newRow: TRow) => void;
+export declare interface CellRendererProps<TRow, TSummaryRow>
+  extends Pick<RowRendererProps<TRow, TSummaryRow>, 'onRowClick' | 'onRowDoubleClick' | 'selectCell'>,
+    Omit_2<React.HTMLAttributes<HTMLDivElement>, 'style' | 'children'> {
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  colSpan: number | undefined;
+  row: TRow;
+  isScrolling: boolean;
+  isCopied: boolean;
+  isDraggedOver: boolean;
+  isCellSelected: boolean;
+  dragHandle: ReactElement<React.HTMLAttributes<HTMLDivElement>> | undefined;
+  onRowChange: (newRow: TRow) => void;
 }
 
 export declare const CheckboxFormatter: ForwardRefExoticComponent<CheckboxFormatterProps & RefAttributes<HTMLInputElement>>;
 
-export declare interface CheckboxFormatterProps extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'aria-label' | 'aria-labelledby' | 'checked' | 'tabIndex' | 'disabled'> {
-    onChange: (checked: boolean, shift: boolean) => void;
+export declare interface CheckboxFormatterProps
+  extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'aria-label' | 'aria-labelledby' | 'checked' | 'tabIndex' | 'disabled'> {
+  onChange: (checked: boolean, shift: boolean) => void;
 }
 
-export declare type ColSpanArgs<TRow, TSummaryRow> = {
-    type: 'HEADER';
-} | {
-    type: 'ROW';
-    row: TRow;
-} | {
-    type: 'SUMMARY';
-    row: TSummaryRow;
-};
+export declare type ColSpanArgs<TRow, TSummaryRow> =
+  | {
+      type: 'HEADER';
+    }
+  | {
+      type: 'ROW';
+      row: TRow;
+    }
+  | {
+      type: 'SUMMARY';
+      row: TSummaryRow;
+    };
 
 export declare interface Column<TRow, TSummaryRow = unknown> {
-    /** The name of the column. By default it will be displayed in the header cell */
-    readonly name: string | ReactElement;
-    /** A unique key to distinguish each column */
-    readonly key: string;
-    /** Column width. If not specified, it will be determined automatically based on grid width and specified widths of other columns */
-    readonly width?: Maybe<number | string>;
-    /** Minimum column width in px. */
-    readonly minWidth?: Maybe<number>;
-    /** Maximum column width in px. */
-    readonly maxWidth?: Maybe<number>;
-    readonly cellClass?: Maybe<string | ((row: TRow) => Maybe<string>)>;
-    readonly headerCellClass?: Maybe<string>;
-    readonly summaryCellClass?: Maybe<string | ((row: TSummaryRow) => Maybe<string>)>;
-    /** Formatter to be used to render the cell content */
-    readonly formatter?: Maybe<ComponentType<FormatterProps<TRow, TSummaryRow>>>;
-    /** Formatter to be used to render the summary cell content */
-    readonly summaryFormatter?: Maybe<ComponentType<SummaryFormatterProps<TSummaryRow, TRow>>>;
-    /** Formatter to be used to render the group cell content */
-    readonly groupFormatter?: Maybe<ComponentType<GroupFormatterProps<TRow, TSummaryRow>>>;
-    /** If false cell can't be selected */
-    readonly selectable?: Maybe<boolean>;
-    /** Enables cell editing. If set and no editor property specified, then a textinput will be used as the cell editor */
-    readonly editable?: Maybe<boolean | ((row: TRow) => boolean)>;
-    readonly colSpan?: Maybe<(args: ColSpanArgs<TRow, TSummaryRow>) => Maybe<number>>;
-    /** Determines whether column is frozen or not */
-    readonly frozen?: Maybe<boolean>;
-    /** Enable resizing of a column */
-    readonly resizable?: Maybe<boolean>;
-    /** Enable sorting of a column */
-    readonly sortable?: Maybe<boolean>;
-    /** Sets the column sort order to be descending instead of ascending the first time the column is sorted */
-    readonly sortDescendingFirst?: Maybe<boolean>;
-    /** Editor to be rendered when cell of column is being edited. If set, then the column is automatically set to be editable */
-    readonly editor?: Maybe<ComponentType<EditorProps<TRow, TSummaryRow>>>;
-    readonly editorOptions?: Maybe<{
-        /** @default false */
-        readonly renderFormatter?: Maybe<boolean>;
-        /** @default false */
-        readonly editOnClick?: Maybe<boolean>;
-        /** @default true */
-        readonly commitOnOutsideClick?: Maybe<boolean>;
-        /** Prevent default to cancel editing */
-        readonly onCellKeyDown?: Maybe<(event: React.KeyboardEvent<HTMLDivElement>) => void>;
-        /** Control the default cell navigation behavior while the editor is open */
-        readonly onNavigation?: Maybe<(event: React.KeyboardEvent<HTMLDivElement>) => boolean>;
-    }>;
-    /** Header renderer for each header cell */
-    readonly headerRenderer?: Maybe<ComponentType<HeaderRendererProps<TRow, TSummaryRow>>>;
+  /** The name of the column. By default it will be displayed in the header cell */
+  readonly name: string | ReactElement;
+  /** A unique key to distinguish each column */
+  readonly key: string;
+  /** Column width. If not specified, it will be determined automatically based on grid width and specified widths of other columns */
+  readonly width?: Maybe<number | string>;
+  /** Minimum column width in px. */
+  readonly minWidth?: Maybe<number>;
+  /** Maximum column width in px. */
+  readonly maxWidth?: Maybe<number>;
+  readonly cellClass?: Maybe<string | ((row: TRow) => Maybe<string>)>;
+  readonly headerCellClass?: Maybe<string>;
+  readonly summaryCellClass?: Maybe<string | ((row: TSummaryRow) => Maybe<string>)>;
+  /** Formatter to be used to render the cell content */
+  readonly formatter?: Maybe<ComponentType<FormatterProps<TRow, TSummaryRow>>>;
+  /** Formatter to be used to render the summary cell content */
+  readonly summaryFormatter?: Maybe<ComponentType<SummaryFormatterProps<TSummaryRow, TRow>>>;
+  /** Formatter to be used to render the group cell content */
+  readonly groupFormatter?: Maybe<ComponentType<GroupFormatterProps<TRow, TSummaryRow>>>;
+  /** If false cell can't be selected */
+  readonly selectable?: Maybe<boolean>;
+  /** Enables cell editing. If set and no editor property specified, then a textinput will be used as the cell editor */
+  readonly editable?: Maybe<boolean | ((row: TRow) => boolean)>;
+  readonly colSpan?: Maybe<(args: ColSpanArgs<TRow, TSummaryRow>) => Maybe<number>>;
+  /** Determines whether column is frozen or not */
+  readonly frozen?: Maybe<boolean>;
+  /** Enable resizing of a column */
+  readonly resizable?: Maybe<boolean>;
+  /** Enable sorting of a column */
+  readonly sortable?: Maybe<boolean>;
+  /** Sets the column sort order to be descending instead of ascending the first time the column is sorted */
+  readonly sortDescendingFirst?: Maybe<boolean>;
+  /** Editor to be rendered when cell of column is being edited. If set, then the column is automatically set to be editable */
+  readonly editor?: Maybe<ComponentType<EditorProps<TRow, TSummaryRow>>>;
+  readonly editorOptions?: Maybe<{
+    /** @default false */
+    readonly renderFormatter?: Maybe<boolean>;
+    /** @default false */
+    readonly editOnClick?: Maybe<boolean>;
+    /** @default true */
+    readonly commitOnOutsideClick?: Maybe<boolean>;
+    /** Prevent default to cancel editing */
+    readonly onCellKeyDown?: Maybe<(event: React.KeyboardEvent<HTMLDivElement>) => void>;
+    /** Control the default cell navigation behavior while the editor is open */
+    readonly onNavigation?: Maybe<(event: React.KeyboardEvent<HTMLDivElement>) => boolean>;
+  }>;
+  /** Header renderer for each header cell */
+  readonly headerRenderer?: Maybe<ComponentType<HeaderRendererProps<TRow, TSummaryRow>>>;
 }
 
 declare interface Components<TRow, TSummaryRow> {
-    sortIcon?: Maybe<ComponentType<SortIconProps>>;
-    checkboxFormatter?: Maybe<ForwardRefExoticComponent<CheckboxFormatterProps & RefAttributes<HTMLOrSVGElement>> | ComponentType<CheckboxFormatterProps>>;
-    cellRenderer?: Maybe<ComponentType<CellRendererProps<TRow, TSummaryRow>>>;
-    rowRenderer?: Maybe<ComponentType<RowRendererProps<TRow, TSummaryRow>>>;
-    noRowsFallback?: Maybe<React.ReactNode>;
+  sortIcon?: Maybe<ComponentType<SortIconProps>>;
+  checkboxFormatter?: Maybe<
+    ForwardRefExoticComponent<CheckboxFormatterProps & RefAttributes<HTMLOrSVGElement>> | ComponentType<CheckboxFormatterProps>
+  >;
+  cellRenderer?: Maybe<ComponentType<CellRendererProps<TRow, TSummaryRow>>>;
+  rowRenderer?: Maybe<ComponentType<RowRendererProps<TRow, TSummaryRow>>>;
+  noRowsFallback?: Maybe<React.ReactNode>;
 }
 
 export declare interface CopyEvent<TRow> {
-    sourceColumnKey: string;
-    sourceRow: TRow;
+  sourceColumnKey: string;
+  sourceRow: TRow;
 }
 
 export declare const DataGridDefaultComponentsProvider: Provider<Maybe<Components<any, any>>>;
 
 export declare interface DataGridHandle {
-    element: HTMLDivElement | null;
-    selectedCell: Position;
-    scrollToColumn: (colIdx: number) => void;
-    scrollToRow: (rowIdx: number) => void;
-    selectCell: (position: Position, enableEditor?: Maybe<boolean>) => void;
+  element: HTMLDivElement | null;
+  selectedCell: Position;
+  scrollToColumn: (colIdx: number) => void;
+  scrollToRow: (rowIdx: number) => void;
+  selectCell: (position: Position, enableEditor?: Maybe<boolean>) => void;
 }
 
 export declare interface DataGridProps<R, SR = unknown, K extends Key = Key> extends SharedDivProps {
-    /**
-     * Grid and data Props
-     */
-    /** An array of objects representing each column on the grid */
-    columns: readonly Column<R, SR>[];
-    /** A function called for each rendered row that should return a plain key/value pair object */
-    rows: readonly R[];
-    /**
-     * Rows to be pinned at the bottom of the rows view for summary, the vertical scroll bar will not scroll these rows.
-     * Bottom horizontal scroll bar can move the row left / right. Or a customized row renderer can be used to disabled the scrolling support.
-     */
-    summaryRows?: Maybe<readonly SR[]>;
-    /** The getter should return a unique key for each row */
-    rowKeyGetter?: Maybe<(row: R) => K>;
-    onRowsChange?: Maybe<(rows: R[], data: RowsChangeData<R, SR>) => void>;
-    /**
-     * Dimensions props
-     */
-    /**
-     * The height of each row in pixels
-     * @default 35
-     */
-    rowHeight?: Maybe<number | ((args: RowHeightArgs<R>) => number)>;
-    /**
-     * The height of the header row in pixels
-     * @default 35
-     */
-    headerRowHeight?: Maybe<number>;
-    /**
-     * The height of each summary row in pixels
-     * @default 35
-     */
-    summaryRowHeight?: Maybe<number>;
-    /**
-     * Feature props
-     */
-    /** Set of selected row keys */
-    selectedRows?: Maybe<ReadonlySet<K>>;
-    /** Function called whenever cell selection is changed */
-    onSelectedCellChange?: Maybe<(selectedCell: Position) => void>;
-    /** Function called whenever row selection is changed */
-    onSelectedRowsChange?: Maybe<(selectedRows: Set<K>) => void>;
-    /** Used for multi column sorting */
-    sortColumns?: Maybe<readonly SortColumn[]>;
-    onSortColumnsChange?: Maybe<(sortColumns: SortColumn[]) => void>;
-    defaultColumnOptions?: Maybe<DefaultColumnOptions<R, SR>>;
-    groupBy?: Maybe<readonly string[]>;
-    rowGrouper?: Maybe<(rows: readonly R[], columnKey: string) => Record<string, readonly R[]>>;
-    expandedGroupIds?: Maybe<ReadonlySet<unknown>>;
-    onExpandedGroupIdsChange?: Maybe<(expandedGroupIds: Set<unknown>) => void>;
-    onFill?: Maybe<(event: FillEvent<R>) => R>;
-    onCopy?: Maybe<(event: CopyEvent<R>) => void>;
-    onPaste?: Maybe<(event: PasteEvent<R>) => R>;
-    /**
-     * Event props
-     */
-    /** Function called whenever a row is clicked */
-    onRowClick?: Maybe<(row: R, column: CalculatedColumn<R, SR>) => void>;
-    /** Function called whenever a row is double clicked */
-    onRowDoubleClick?: Maybe<(row: R, column: CalculatedColumn<R, SR>) => void>;
-    /** Called when the grid is scrolled */
-    onScroll?: Maybe<(event: React.UIEvent<HTMLDivElement>) => void>;
-    /** Called when a column is resized */
-    onColumnResize?: Maybe<(idx: number, width: number) => void>;
-    /**
-     * Toggles and modes
-     */
-    /** @default 'NONE' */
-    cellNavigationMode?: Maybe<CellNavigationMode>;
-    /** @default true */
-    enableVirtualization?: Maybe<boolean>;
-    /**
-     * Miscellaneous
-     */
-    components?: Maybe<Components<R, SR>>;
-    rowClass?: Maybe<(row: R) => Maybe<string>>;
-    direction?: Maybe<Direction>;
-    'data-testid'?: Maybe<string>;
+  /**
+   * Grid and data Props
+   */
+  /** An array of objects representing each column on the grid */
+  columns: readonly Column<R, SR>[];
+  /** A function called for each rendered row that should return a plain key/value pair object */
+  rows: readonly R[];
+  /**
+   * Rows to be pinned at the bottom of the rows view for summary, the vertical scroll bar will not scroll these rows.
+   * Bottom horizontal scroll bar can move the row left / right. Or a customized row renderer can be used to disabled the scrolling support.
+   */
+  summaryRows?: Maybe<readonly SR[]>;
+  /** The getter should return a unique key for each row */
+  rowKeyGetter?: Maybe<(row: R) => K>;
+  onRowsChange?: Maybe<(rows: R[], data: RowsChangeData<R, SR>) => void>;
+  /**
+   * Dimensions props
+   */
+  /**
+   * The height of each row in pixels
+   * @default 35
+   */
+  rowHeight?: Maybe<number | ((args: RowHeightArgs<R>) => number)>;
+  /**
+   * The height of the header row in pixels
+   * @default 35
+   */
+  headerRowHeight?: Maybe<number>;
+  /**
+   * The height of each summary row in pixels
+   * @default 35
+   */
+  summaryRowHeight?: Maybe<number>;
+  /**
+   * Feature props
+   */
+  /** Set of selected row keys */
+  selectedRows?: Maybe<ReadonlySet<K>>;
+  /** Function called whenever cell selection is changed */
+  onSelectedCellChange?: Maybe<(selectedCell: Position) => void>;
+  /** Function called whenever row selection is changed */
+  onSelectedRowsChange?: Maybe<(selectedRows: Set<K>) => void>;
+  /** Used for multi column sorting */
+  sortColumns?: Maybe<readonly SortColumn[]>;
+  onSortColumnsChange?: Maybe<(sortColumns: SortColumn[]) => void>;
+  defaultColumnOptions?: Maybe<DefaultColumnOptions<R, SR>>;
+  groupBy?: Maybe<readonly string[]>;
+  rowGrouper?: Maybe<(rows: readonly R[], columnKey: string) => Record<string, readonly R[]>>;
+  expandedGroupIds?: Maybe<ReadonlySet<unknown>>;
+  onExpandedGroupIdsChange?: Maybe<(expandedGroupIds: Set<unknown>) => void>;
+  onFill?: Maybe<(event: FillEvent<R>) => R>;
+  onCopy?: Maybe<(event: CopyEvent<R>) => void>;
+  onPaste?: Maybe<(event: PasteEvent<R>) => R>;
+  /**
+   * Event props
+   */
+  /** Function called whenever a row is clicked */
+  onRowClick?: Maybe<(row: R, column: CalculatedColumn<R, SR>) => void>;
+  /** Function called whenever a row is double clicked */
+  onRowDoubleClick?: Maybe<(row: R, column: CalculatedColumn<R, SR>) => void>;
+  /** Called when the grid is scrolled */
+  onScroll?: Maybe<(event: React.UIEvent<HTMLDivElement>) => void>;
+  /** Called when a column is resized */
+  onColumnResize?: Maybe<(idx: number, width: number) => void>;
+  /**
+   * Toggles and modes
+   */
+  /** @default 'NONE' */
+  cellNavigationMode?: Maybe<CellNavigationMode>;
+  /** @default true */
+  enableVirtualization?: Maybe<boolean>;
+  /**
+   * Miscellaneous
+   */
+  components?: Maybe<Components<R, SR>>;
+  rowClass?: Maybe<(row: R) => Maybe<string>>;
+  direction?: Maybe<Direction>;
+  'data-testid'?: Maybe<string>;
 }
 
 declare const _default: <R, SR = unknown, K extends Key = Key>(props: DataGridProps<R, SR, K> & RefAttributes<DataGridHandle>) => JSX.Element;
@@ -211,59 +219,59 @@ declare type DefaultColumnOptions<R, SR> = Pick<Column<R, SR>, 'formatter' | 'wi
 declare type Direction = 'ltr' | 'rtl';
 
 export declare interface EditorProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TRow;
-    onRowChange: (row: TRow, commitChanges?: boolean) => void;
-    onClose: (commitChanges?: boolean) => void;
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  row: TRow;
+  onRowChange: (row: TRow, commitChanges?: boolean) => void;
+  onClose: (commitChanges?: boolean) => void;
 }
 
 export declare interface FillEvent<TRow> {
-    columnKey: string;
-    sourceRow: TRow;
-    targetRow: TRow;
+  columnKey: string;
+  sourceRow: TRow;
+  targetRow: TRow;
 }
 
 export declare interface FormatterProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TRow;
-    isScrolling: boolean;
-    isCellSelected: boolean;
-    onRowChange: (row: TRow) => void;
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  row: TRow;
+  isScrolling: boolean;
+  isCellSelected: boolean;
+  onRowChange: (row: TRow) => void;
 }
 
 export declare interface GroupFormatterProps<TRow, TSummaryRow = unknown> {
-    groupKey: unknown;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: GroupRow<TRow>;
-    childRows: readonly TRow[];
-    isScrolling: boolean;
-    isExpanded: boolean;
-    isCellSelected: boolean;
-    toggleGroup: () => void;
+  groupKey: unknown;
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  row: GroupRow<TRow>;
+  childRows: readonly TRow[];
+  isScrolling: boolean;
+  isExpanded: boolean;
+  isCellSelected: boolean;
+  toggleGroup: () => void;
 }
 
 declare interface GroupRow<TRow> {
-    readonly childRows: readonly TRow[];
-    readonly id: string;
-    readonly parentId: unknown;
-    readonly groupKey: unknown;
-    readonly isExpanded: boolean;
-    readonly level: number;
-    readonly posInSet: number;
-    readonly setSize: number;
-    readonly startRowIndex: number;
+  readonly childRows: readonly TRow[];
+  readonly id: string;
+  readonly parentId: unknown;
+  readonly groupKey: unknown;
+  readonly isExpanded: boolean;
+  readonly level: number;
+  readonly posInSet: number;
+  readonly setSize: number;
+  readonly startRowIndex: number;
 }
 
 export declare function HeaderRenderer<R, SR>({ column, sortDirection, priority, onSort, isCellSelected }: HeaderRendererProps<R, SR>): JSX.Element;
 
 export declare interface HeaderRendererProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    sortDirection: SortDirection | undefined;
-    priority: number | undefined;
-    onSort: (ctrlClick: boolean) => void;
-    allRowsSelected: boolean;
-    onAllRowsSelectionChange: (checked: boolean) => void;
-    isCellSelected: boolean;
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  sortDirection: SortDirection | undefined;
+  priority: number | undefined;
+  onSort: (ctrlClick: boolean) => void;
+  allRowsSelected: boolean;
+  onAllRowsSelectionChange: (checked: boolean) => void;
+  isCellSelected: boolean;
 }
 
 declare type Maybe<T> = T | undefined | null;
@@ -271,91 +279,103 @@ declare type Maybe<T> = T | undefined | null;
 declare type Omit_2<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export declare interface PasteEvent<TRow> {
-    sourceColumnKey: string;
-    sourceRow: TRow;
-    targetColumnKey: string;
-    targetRow: TRow;
+  sourceColumnKey: string;
+  sourceRow: TRow;
+  targetColumnKey: string;
+  targetRow: TRow;
 }
 
 export declare interface Position {
-    readonly idx: number;
-    readonly rowIdx: number;
+  readonly idx: number;
+  readonly rowIdx: number;
 }
 
 export declare const Row: <R, SR>(props: RowRendererProps<R, SR> & RefAttributes<HTMLDivElement>) => JSX.Element;
 
-export declare type RowHeightArgs<TRow> = {
-    type: 'ROW';
-    row: TRow;
-} | {
-    type: 'GROUP';
-    row: GroupRow<TRow>;
-};
+export declare type RowHeightArgs<TRow> =
+  | {
+      type: 'ROW';
+      row: TRow;
+    }
+  | {
+      type: 'GROUP';
+      row: GroupRow<TRow>;
+    };
 
 export declare interface RowRendererProps<TRow, TSummaryRow = unknown> extends Omit_2<React.HTMLAttributes<HTMLDivElement>, 'style' | 'children'> {
-    viewportColumns: readonly CalculatedColumn<TRow, TSummaryRow>[];
-    row: TRow;
-    rowIdx: number;
-    selectedCellIdx: number | undefined;
-    copiedCellIdx: number | undefined;
-    draggedOverCellIdx: number | undefined;
-    lastFrozenColumnIndex: number;
-    isRowSelected: boolean;
-    isScrolling: boolean;
-    gridRowStart: number;
-    height: number;
-    selectedCellEditor: ReactElement<EditorProps<TRow>> | undefined;
-    selectedCellDragHandle: ReactElement<React.HTMLAttributes<HTMLDivElement>> | undefined;
-    onRowChange: (rowIdx: number, newRow: TRow) => void;
-    onRowClick: Maybe<(row: TRow, column: CalculatedColumn<TRow, TSummaryRow>) => void>;
-    onRowDoubleClick: Maybe<(row: TRow, column: CalculatedColumn<TRow, TSummaryRow>) => void>;
-    rowClass: Maybe<(row: TRow) => Maybe<string>>;
-    setDraggedOverRowIdx: ((overRowIdx: number) => void) | undefined;
-    selectCell: (row: TRow, column: CalculatedColumn<TRow, TSummaryRow>, enableEditor?: Maybe<boolean>) => void;
+  viewportColumns: readonly CalculatedColumn<TRow, TSummaryRow>[];
+  row: TRow;
+  rowIdx: number;
+  selectedCellIdx: number | undefined;
+  copiedCellIdx: number | undefined;
+  draggedOverCellIdx: number | undefined;
+  lastFrozenColumnIndex: number;
+  isRowSelected: boolean;
+  isScrolling: boolean;
+  gridRowStart: number;
+  height: number;
+  selectedCellEditor: ReactElement<EditorProps<TRow>> | undefined;
+  selectedCellDragHandle: ReactElement<React.HTMLAttributes<HTMLDivElement>> | undefined;
+  onRowChange: (rowIdx: number, newRow: TRow) => void;
+  onRowClick: Maybe<(row: TRow, column: CalculatedColumn<TRow, TSummaryRow>) => void>;
+  onRowDoubleClick: Maybe<(row: TRow, column: CalculatedColumn<TRow, TSummaryRow>) => void>;
+  rowClass: Maybe<(row: TRow) => Maybe<string>>;
+  setDraggedOverRowIdx: ((overRowIdx: number) => void) | undefined;
+  selectCell: (row: TRow, column: CalculatedColumn<TRow, TSummaryRow>, enableEditor?: Maybe<boolean>) => void;
 }
 
 export declare interface RowsChangeData<R, SR = unknown> {
-    indexes: number[];
-    column: CalculatedColumn<R, SR>;
+  indexes: number[];
+  column: CalculatedColumn<R, SR>;
 }
 
-export declare const SELECT_COLUMN_KEY = "select-row";
+export declare const SELECT_COLUMN_KEY = 'select-row';
 
-export declare function SelectCellFormatter({ value, isCellSelected, disabled, onChange, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledBy }: SelectCellFormatterProps): JSX.Element;
+export declare function SelectCellFormatter({
+  value,
+  isCellSelected,
+  disabled,
+  onChange,
+  'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledBy,
+}: SelectCellFormatterProps): JSX.Element;
 
 declare interface SelectCellFormatterProps extends SharedInputProps {
-    isCellSelected: boolean;
-    value: boolean;
-    onChange: (value: boolean, isShiftClick: boolean) => void;
+  isCellSelected: boolean;
+  value: boolean;
+  onChange: (value: boolean, isShiftClick: boolean) => void;
 }
 
 export declare const SelectColumn: Column<any, any>;
 
 export declare interface SelectRowEvent<TRow> {
-    row: TRow;
-    checked: boolean;
-    isShiftClick: boolean;
+  row: TRow;
+  checked: boolean;
+  isShiftClick: boolean;
 }
 
-declare type SharedDivProps = Pick<React.HTMLAttributes<HTMLDivElement>, 'aria-label' | 'aria-labelledby' | 'aria-describedby' | 'className' | 'style'>;
+declare type SharedDivProps = Pick<
+  React.HTMLAttributes<HTMLDivElement>,
+  'aria-label' | 'aria-labelledby' | 'aria-describedby' | 'className' | 'style'
+>;
 
 declare type SharedInputProps = Pick<CheckboxFormatterProps, 'disabled' | 'aria-label' | 'aria-labelledby'>;
 
 export declare interface SortColumn {
-    readonly columnKey: string;
-    readonly direction: SortDirection;
+  readonly columnKey: string;
+  readonly direction: SortDirection;
 }
 
 export declare type SortDirection = 'ASC' | 'DESC';
 
 export declare interface SortIconProps {
-    sortDirection: SortDirection | undefined;
+  sortDirection: SortDirection | undefined;
 }
 
 export declare interface SummaryFormatterProps<TSummaryRow, TRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TSummaryRow;
-    isCellSelected: boolean;
+  column: CalculatedColumn<TRow, TSummaryRow>;
+  row: TSummaryRow;
+  isCellSelected: boolean;
 }
 
 export declare function TextEditor<TRow, TSummaryRow>({ row, column, onRowChange, onClose }: EditorProps<TRow, TSummaryRow>): JSX.Element;
@@ -366,4 +386,4 @@ export declare function useRowSelection<R>(): [boolean, (selectRowEvent: SelectR
 
 export declare function ValueFormatter<R, SR>(props: FormatterProps<R, SR>): JSX.Element | null;
 
-export { }
+export {};
diff --git a/webapp/packages/plugin-react-data-grid/src/index.ts b/webapp/packages/plugin-react-data-grid/src/index.ts
index 55b8cccdc0..a6f50d77a5 100644
--- a/webapp/packages/plugin-react-data-grid/src/index.ts
+++ b/webapp/packages/plugin-react-data-grid/src/index.ts
@@ -5,7 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import DataGrid from 'react-data-grid';
+
 export * from 'react-data-grid';
-export default DataGrid;
\ No newline at end of file
+export default DataGrid;
diff --git a/webapp/packages/plugin-resource-manager-administration/src/LocaleService.ts b/webapp/packages/plugin-resource-manager-administration/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/LocaleService.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
index 1a153ee505..6d16db2e27 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { NotificationService } from '@cloudbeaver/core-events';
 import { ExecutorInterrupter, IExecutionContextProvider } from '@cloudbeaver/core-executor';
@@ -19,7 +18,7 @@ export class PluginBootstrap extends Bootstrap {
   constructor(
     private readonly serverConfigurationService: ServerConfigurationService,
     private readonly serverConfigResource: ServerConfigResource,
-    private readonly notificationService: NotificationService
+    private readonly notificationService: NotificationService,
   ) {
     super();
 
@@ -31,7 +30,7 @@ export class PluginBootstrap extends Bootstrap {
     this.serverConfigurationService.loadConfigTask.addHandler(this.loadConfigHandler);
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   private async loadConfigHandler(data: ILoadConfigData, contexts: IExecutionContextProvider<ILoadConfigData>) {
     if (!data.reset) {
@@ -48,7 +47,7 @@ export class PluginBootstrap extends Bootstrap {
       data.state.serverConfig.resourceManagerEnabled = config.resourceManagerEnabled;
     } catch (exception) {
       ExecutorInterrupter.interrupt(contexts);
-      this.notificationService.logException(exception as any, 'Can\'t load server configuration');
+      this.notificationService.logException(exception as any, "Can't load server configuration");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx b/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
index c896feba5e..eef3fc30db 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
+++ b/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
@@ -5,30 +5,28 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { BASE_CONTAINERS_STYLES, GroupTitle, PlaceholderComponent, Switch, useTranslate } from '@cloudbeaver/core-blocks';
 import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
 
-export const ResourceManagerSettings: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(
-  function ResourceManagerSettings({ state }) {
-    const translate = useTranslate();
+export const ResourceManagerSettings: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(function ResourceManagerSettings({ state }) {
+  const translate = useTranslate();
 
-    return styled(BASE_CONTAINERS_STYLES)(
-      <>
-        <GroupTitle>{translate('plugin_resource_manager_title')}</GroupTitle>
-        <Switch
-          name='resourceManagerEnabled'
-          state={state.serverConfig}
-          description={translate('plugin_resource_manager_administration_settings_enable_description')}
-          mod={['primary']}
-          small
-          autoHide
-        >
-          {translate('plugin_resource_manager_administration_settings_enable')}
-        </Switch>
-      </>
-    );
-  });
\ No newline at end of file
+  return styled(BASE_CONTAINERS_STYLES)(
+    <>
+      <GroupTitle>{translate('plugin_resource_manager_title')}</GroupTitle>
+      <Switch
+        name="resourceManagerEnabled"
+        state={state.serverConfig}
+        description={translate('plugin_resource_manager_administration_settings_enable_description')}
+        mod={['primary']}
+        small
+        autoHide
+      >
+        {translate('plugin_resource_manager_administration_settings_enable')}
+      </Switch>
+    </>,
+  );
+});
diff --git a/webapp/packages/plugin-resource-manager-administration/src/index.ts b/webapp/packages/plugin-resource-manager-administration/src/index.ts
index 7a00070e27..12718f52dc 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/index.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/index.ts
@@ -1,3 +1,3 @@
 import { resourceManagerAdministrationPlugin } from './manifest';
 
-export default resourceManagerAdministrationPlugin;
\ No newline at end of file
+export default resourceManagerAdministrationPlugin;
diff --git a/webapp/packages/plugin-resource-manager-administration/src/locales/en.ts b/webapp/packages/plugin-resource-manager-administration/src/locales/en.ts
index 0af9d40e64..994dd48a25 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/locales/en.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_administration_settings_enable', 'Enable {alias:plugin_resource_manager_title}'],
   ['plugin_resource_manager_administration_settings_enable_description', 'Enable {alias:plugin_resource_manager_title} functionality'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager-administration/src/locales/it.ts b/webapp/packages/plugin-resource-manager-administration/src/locales/it.ts
index 0af9d40e64..994dd48a25 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/locales/it.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_administration_settings_enable', 'Enable {alias:plugin_resource_manager_title}'],
   ['plugin_resource_manager_administration_settings_enable_description', 'Enable {alias:plugin_resource_manager_title} functionality'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager-administration/src/locales/ru.ts b/webapp/packages/plugin-resource-manager-administration/src/locales/ru.ts
index 2a93554670..9082e5f21c 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/locales/ru.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/locales/ru.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_administration_settings_enable', 'Включить Менеджер ресурсов'],
   ['plugin_resource_manager_administration_settings_enable_description', 'Включает функционал Менеджера ресурсов'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager-administration/src/locales/zh.ts b/webapp/packages/plugin-resource-manager-administration/src/locales/zh.ts
index 173a50310e..88cc3b661c 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/locales/zh.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/locales/zh.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_administration_settings_enable', 'Enable SQL scripts manager'],
   ['plugin_resource_manager_administration_settings_enable_description', 'Enable SQL scripts manager functionality'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager-administration/src/manifest.ts b/webapp/packages/plugin-resource-manager-administration/src/manifest.ts
index b200116eec..c67ea4ba0f 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/manifest.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -13,8 +12,5 @@ import { PluginBootstrap } from './PluginBootstrap';
 
 export const resourceManagerAdministrationPlugin: PluginManifest = {
   info: { name: 'Resource manager administration plugin' },
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, LocaleService],
+};
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/Actions/ACTION_RESOURCE_MANAGER_SCRIPTS.ts b/webapp/packages/plugin-resource-manager-scripts/src/Actions/ACTION_RESOURCE_MANAGER_SCRIPTS.ts
index 92fd4da7ec..85405e4caf 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/Actions/ACTION_RESOURCE_MANAGER_SCRIPTS.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/Actions/ACTION_RESOURCE_MANAGER_SCRIPTS.ts
@@ -5,13 +5,9 @@
  * 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_RESOURCE_MANAGER_SCRIPTS = createAction(
-  'resource-manager-scripts-enable',
-  {
-    label: 'plugin_resource_manager_scripts_action_enable_label',
-    type: 'checkbox',
-  }
-);
+export const ACTION_RESOURCE_MANAGER_SCRIPTS = createAction('resource-manager-scripts-enable', {
+  label: 'plugin_resource_manager_scripts_action_enable_label',
+  type: 'checkbox',
+});
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/LocaleService.ts b/webapp/packages/plugin-resource-manager-scripts/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/LocaleService.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
index f6a53c6884..e54ba7fbca 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
@@ -5,12 +5,11 @@
  * 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 { ServerConfigResource } from '@cloudbeaver/core-root';
 import { getCachedDataResourceLoaderState } from '@cloudbeaver/core-sdk';
 import { SideBarPanelService } from '@cloudbeaver/core-ui';
-import { MenuService, ActionService, DATA_CONTEXT_MENU, menuExtractItems, DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from '@cloudbeaver/core-view';
 import { MENU_TOOLS } from '@cloudbeaver/plugin-tools-panel';
 
 import { ACTION_RESOURCE_MANAGER_SCRIPTS } from './Actions/ACTION_RESOURCE_MANAGER_SCRIPTS';
@@ -24,7 +23,7 @@ export class PluginBootstrap extends Bootstrap {
     private readonly resourceManagerScriptsService: ResourceManagerScriptsService,
     private readonly menuService: MenuService,
     private readonly actionService: ActionService,
-    private readonly serverConfigResource: ServerConfigResource
+    private readonly serverConfigResource: ServerConfigResource,
   ) {
     super();
   }
@@ -41,15 +40,12 @@ export class PluginBootstrap extends Bootstrap {
     });
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   private registerMenu() {
     this.menuService.addCreator({
       isApplicable: context => context.tryGet(DATA_CONTEXT_MENU) === MENU_TOOLS,
-      getItems: (context, items) => [
-        ...items,
-        ACTION_RESOURCE_MANAGER_SCRIPTS,
-      ],
+      getItems: (context, items) => [...items, ACTION_RESOURCE_MANAGER_SCRIPTS],
       orderItems: (context, items) => {
         const extracted = menuExtractItems(items, [ACTION_RESOURCE_MANAGER_SCRIPTS]);
         return [...extracted, ...items];
@@ -58,18 +54,13 @@ export class PluginBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'resource-manager-scripts-base',
-      isActionApplicable: (context, action) => [
-        ACTION_RESOURCE_MANAGER_SCRIPTS,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_RESOURCE_MANAGER_SCRIPTS].includes(action),
       isHidden: () => !this.resourceManagerScriptsService.enabled,
       isChecked: () => this.resourceManagerScriptsService.active,
       getLoader: (context, action) => {
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => getCachedDataResourceLoaderState(this.serverConfigResource, undefined, undefined)
-        );
+        return state.getState(action.id, () => getCachedDataResourceLoaderState(this.serverConfigResource, undefined, undefined));
       },
       handler: (context, action) => {
         switch (action) {
@@ -81,4 +72,4 @@ export class PluginBootstrap extends Bootstrap {
       },
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScripts.tsx b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScripts.tsx
index ec39b436e2..28986b9413 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScripts.tsx
+++ b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScripts.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -32,6 +31,6 @@ export const ResourceManagerScripts: TabContainerPanelComponent = observer(funct
       <ResourceManagerTree resourceTypeId={SCRIPTS_TYPE_ID}>
         {translate('plugin_resource_manager_scripts_no_resources_placeholder')}
       </ResourceManagerTree>
-    </container>
+    </container>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsService.ts b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsService.ts
index 6d36f00d60..ce700abdb8 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsService.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { UserDataService } from '@cloudbeaver/core-authentication';
@@ -71,24 +70,15 @@ export class ResourceManagerScriptsService {
     return this.serverConfigResource.distributed ? scriptType?.rootFolder : undefined;
   }
 
-  async createScript(
-    resourceKey: string,
-    executionContext?: IConnectionExecutionContextInfo,
-    script = ''
-  ) {
-
-    await this.resourceManagerResource.writeText(
-      resourceKey,
-      script,
-      false
-    );
+  async createScript(resourceKey: string, executionContext?: IConnectionExecutionContextInfo, script = '') {
+    await this.resourceManagerResource.writeText(resourceKey, script, false);
 
     await this.setExecutionContextInfo(resourceKey, executionContext);
   }
 
   async setExecutionContextInfo(
     path: string,
-    executionContext: IConnectionExecutionContextInfo | undefined
+    executionContext: IConnectionExecutionContextInfo | undefined,
   ): Promise<IConnectionExecutionContextInfo | undefined> {
     if (!this.enabled) {
       return undefined;
@@ -114,9 +104,7 @@ export class ResourceManagerScriptsService {
     };
   }
 
-  async getExecutionContextInfo(
-    path: string
-  ): Promise<IConnectionExecutionContextInfo | undefined> {
+  async getExecutionContextInfo(path: string): Promise<IConnectionExecutionContextInfo | undefined> {
     const resourcesInfo = await this.resourceManagerResource.load(path, ['includeProperties']);
     const properties: IResourceProperties = resourcesInfo.properties;
     const resourceKey = getRmResourceKey(path);
@@ -139,4 +127,4 @@ function getResourceManagerDefaultSettings(): ISettings {
   return {
     active: false,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsSettingsService.ts b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsSettingsService.ts
index df70a6e078..3c771a7b12 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsSettingsService.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/ResourceManagerScriptsSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/SCRIPTS_TYPE_ID.ts b/webapp/packages/plugin-resource-manager-scripts/src/SCRIPTS_TYPE_ID.ts
index 61b80ea8f7..001301188d 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/SCRIPTS_TYPE_ID.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/SCRIPTS_TYPE_ID.ts
@@ -1 +1 @@
-export const SCRIPTS_TYPE_ID = 'sql-script';
\ No newline at end of file
+export const SCRIPTS_TYPE_ID = 'sql-script';
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx b/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
index 9ed546052c..5d3ddc6082 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
+++ b/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
@@ -5,12 +5,21 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import styled, { css } from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Button, Container, InputField, SubmittingForm, Translate, useFocus, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  Button,
+  Container,
+  InputField,
+  SubmittingForm,
+  Translate,
+  useFocus,
+  useObservableRef,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import { ProjectSelect } from '@cloudbeaver/plugin-projects';
 import { RESOURCE_NAME_REGEX } from '@cloudbeaver/plugin-resource-manager';
@@ -46,80 +55,73 @@ export const SaveScriptDialog: DialogComponent<Payload, ISaveScriptDialogResult>
   const translate = useTranslate();
   const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
 
-  const state = useObservableRef<State>(() => ({
-    name: payload.defaultScriptName ?? '',
-    projectId: payload.projectId ?? null,
-    errorMessage: null,
-    validate() {
-      this.errorMessage = null;
+  const state = useObservableRef<State>(
+    () => ({
+      name: payload.defaultScriptName ?? '',
+      projectId: payload.projectId ?? null,
+      errorMessage: null,
+      validate() {
+        this.errorMessage = null;
 
-      const valid = RESOURCE_NAME_REGEX.test(this.name.trim());
+        const valid = RESOURCE_NAME_REGEX.test(this.name.trim());
 
-      if (!valid) {
-        this.errorMessage = translate('plugin_resource_manager_scripts_script_name_invalid_characters_message');
-      }
+        if (!valid) {
+          this.errorMessage = translate('plugin_resource_manager_scripts_script_name_invalid_characters_message');
+        }
+      },
+      async submit() {
+        this.validate();
+
+        if (!this.errorMessage) {
+          resolveDialog(this);
+        }
+      },
+    }),
+    {
+      name: observable.ref,
+      projectId: observable.ref,
+      errorMessage: observable.ref,
+      validate: action.bound,
+      submit: action.bound,
     },
-    async submit() {
-      this.validate();
+    false,
+  );
 
-      if (!this.errorMessage) {
-        resolveDialog(this);
-      }
-    },
-  }), {
-    name: observable.ref,
-    projectId: observable.ref,
-    errorMessage: observable.ref,
-    validate: action.bound,
-    submit: action.bound,
-  }, false);
-
-  return styled(style, BASE_CONTAINERS_STYLES)(
-    <CommonDialogWrapper size='small' className={className} fixedWidth>
-      <CommonDialogHeader
-        title={translate('plugin_resource_manager_scripts_save_script')}
-        icon='/icons/sql_script_m.svg'
-        onReject={rejectDialog}
-      />
+  return styled(
+    style,
+    BASE_CONTAINERS_STYLES,
+  )(
+    <CommonDialogWrapper size="small" className={className} fixedWidth>
+      <CommonDialogHeader title={translate('plugin_resource_manager_scripts_save_script')} icon="/icons/sql_script_m.svg" onReject={rejectDialog} />
       <CommonDialogBody>
         <SubmittingForm ref={focusedRef} onSubmit={state.submit}>
           <Container center gap>
-            <InputField
-              name='name'
-              state={state}
-              error={!!state.errorMessage}
-              description={state.errorMessage ?? undefined}
-            >
+            <InputField name="name" state={state} error={!!state.errorMessage} description={state.errorMessage ?? undefined}>
               {translate('ui_name') + ':'}
             </InputField>
             <ProjectSelect
               value={state.projectId}
-              filter={p => (p.canEditResources && p.id === (payload.projectId ?? p.id))}
-              descriptionGetter={(_, options) => options.length <= 1 ? translate('plugin_resource_manager_scripts_save_script_project_restriction_descripion') : undefined}
+              filter={p => p.canEditResources && p.id === (payload.projectId ?? p.id)}
+              descriptionGetter={(_, options) =>
+                options.length <= 1 ? translate('plugin_resource_manager_scripts_save_script_project_restriction_descripion') : undefined
+              }
               autoHide
-              onChange={projectId => { state.projectId = projectId; }}
+              onChange={projectId => {
+                state.projectId = projectId;
+              }}
             />
           </Container>
         </SubmittingForm>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['outlined']}
-          onClick={rejectDialog}
-        >
-          <Translate token='ui_processing_cancel' />
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
+          <Translate token="ui_processing_cancel" />
         </Button>
         <fill />
-        <Button
-          type="button"
-          mod={['unelevated']}
-          disabled={!state.name.trim() || state.projectId === null}
-          onClick={state.submit}
-        >
-          <Translate token='ui_processing_save' />
+        <Button type="button" mod={['unelevated']} disabled={!state.name.trim() || state.projectId === null} onClick={state.submit}>
+          <Translate token="ui_processing_save" />
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/index.ts b/webapp/packages/plugin-resource-manager-scripts/src/index.ts
index a94ca06bdc..e23fc71f49 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/index.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/index.ts
@@ -1,4 +1,5 @@
 import { resourceManagerScriptsPlugin } from './manifest';
+
 export default resourceManagerScriptsPlugin;
 
 export * from './ResourceManagerScriptsService';
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/locales/en.ts b/webapp/packages/plugin-resource-manager-scripts/src/locales/en.ts
index 78d38172fa..f703d97a0e 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/locales/en.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/locales/en.ts
@@ -3,6 +3,12 @@ export default [
   ['plugin_resource_manager_scripts_title', 'Scripts'],
   ['plugin_resource_manager_scripts_no_resources_placeholder', 'There are no scripts yet'],
   ['plugin_resource_manager_scripts_save_script', 'Save script'],
-  ['plugin_resource_manager_scripts_script_name_invalid_characters_message', 'Script\'s name may contain the following symbols "_-$.()@" and can\'t start with a dot'],
-  ['plugin_resource_manager_scripts_save_script_project_restriction_descripion', "The script's project can't be different from the connection's project"],
-];
\ No newline at end of file
+  [
+    'plugin_resource_manager_scripts_script_name_invalid_characters_message',
+    'Script\'s name may contain the following symbols "_-$.()@" and can\'t start with a dot',
+  ],
+  [
+    'plugin_resource_manager_scripts_save_script_project_restriction_descripion',
+    "The script's project can't be different from the connection's project",
+  ],
+];
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/locales/it.ts b/webapp/packages/plugin-resource-manager-scripts/src/locales/it.ts
index f444d21889..f703d97a0e 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/locales/it.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/locales/it.ts
@@ -3,7 +3,12 @@ export default [
   ['plugin_resource_manager_scripts_title', 'Scripts'],
   ['plugin_resource_manager_scripts_no_resources_placeholder', 'There are no scripts yet'],
   ['plugin_resource_manager_scripts_save_script', 'Save script'],
-  ['plugin_resource_manager_scripts_script_name_invalid_characters_message', 'Script\'s name may contain the following symbols "_-$.()@" and can\'t start with a dot'],
-  ['plugin_resource_manager_scripts_save_script_project_restriction_descripion', "The script's project can't be different from the connection's project"],
-
-];
\ No newline at end of file
+  [
+    'plugin_resource_manager_scripts_script_name_invalid_characters_message',
+    'Script\'s name may contain the following symbols "_-$.()@" and can\'t start with a dot',
+  ],
+  [
+    'plugin_resource_manager_scripts_save_script_project_restriction_descripion',
+    "The script's project can't be different from the connection's project",
+  ],
+];
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/locales/ru.ts b/webapp/packages/plugin-resource-manager-scripts/src/locales/ru.ts
index e2a0c01ef5..90fbad9804 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/locales/ru.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/locales/ru.ts
@@ -3,6 +3,9 @@ export default [
   ['plugin_resource_manager_scripts_title', 'Скрипты'],
   ['plugin_resource_manager_scripts_no_resources_placeholder', 'Скриптов нет'],
   ['plugin_resource_manager_scripts_save_script', 'Сохранить скрипт'],
-  ['plugin_resource_manager_scripts_script_name_invalid_characters_message', 'Имя скрипта может содержать следующие символы "_-$.()@" и не может начинаться с точки'],
+  [
+    'plugin_resource_manager_scripts_script_name_invalid_characters_message',
+    'Имя скрипта может содержать следующие символы "_-$.()@" и не может начинаться с точки',
+  ],
   ['plugin_resource_manager_scripts_save_script_project_restriction_descripion', 'Проект скрипта не может отличаться от проекта подключения'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/locales/zh.ts b/webapp/packages/plugin-resource-manager-scripts/src/locales/zh.ts
index c2057888a0..1840a724d2 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/locales/zh.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/locales/zh.ts
@@ -4,5 +4,8 @@ export default [
   ['plugin_resource_manager_scripts_no_resources_placeholder', 'There are no scripts yet'],
   ['plugin_resource_manager_scripts_save_script', '保存脚本'],
   ['plugin_resource_manager_scripts_script_name_invalid_characters_message', '脚本名称中可以使用字符"_-$.()@" 但不能以"."开头'],
-  ['plugin_resource_manager_scripts_save_script_project_restriction_descripion', "The script's project can't be different from the connection's project"],
+  [
+    'plugin_resource_manager_scripts_save_script_project_restriction_descripion',
+    "The script's project can't be different from the connection's project",
+  ],
 ];
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts b/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts
index 1bb50a9964..7ec9669891 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -15,10 +14,5 @@ import { ResourceManagerScriptsSettingsService } from './ResourceManagerScriptsS
 
 export const resourceManagerScriptsPlugin: PluginManifest = {
   info: { name: 'Resource manager scripts plugin' },
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-    ResourceManagerScriptsService,
-    ResourceManagerScriptsSettingsService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, LocaleService, ResourceManagerScriptsService, ResourceManagerScriptsSettingsService],
+};
diff --git a/webapp/packages/plugin-resource-manager/src/LocaleService.ts b/webapp/packages/plugin-resource-manager/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-resource-manager/src/LocaleService.ts
+++ b/webapp/packages/plugin-resource-manager/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts b/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
index 45eefa7029..f0995aa289 100644
--- a/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
@@ -5,20 +5,43 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
 import { CONNECTION_FOLDER_NAME_VALIDATION } from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
-import { DialogueStateResult, CommonDialogService } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { NavTreeResource, NavNodeManagerService, NavNodeInfoResource, type INodeMoveData, navNodeMoveContext, getNodesFromContext, ENodeMoveType, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
+import {
+  ENodeMoveType,
+  getNodesFromContext,
+  type INodeMoveData,
+  NavNodeInfoResource,
+  NavNodeManagerService,
+  navNodeMoveContext,
+  NavTreeResource,
+  ProjectsNavNodeService,
+} from '@cloudbeaver/core-navigation-tree';
 import { ProjectInfo, ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
-import { getRmResourceKey, getRmResourcePath, NAV_NODE_TYPE_RM_PROJECT, NAV_NODE_TYPE_RM_RESOURCE, ResourceManagerResource, RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
+import {
+  getRmResourceKey,
+  getRmResourcePath,
+  NAV_NODE_TYPE_RM_PROJECT,
+  NAV_NODE_TYPE_RM_RESOURCE,
+  ResourceManagerResource,
+  RESOURCES_NODE_PATH,
+} from '@cloudbeaver/core-resource-manager';
 import { CachedMapAllKey, CachedTreeChildrenKey, getCachedMapResourceLoaderState, resourceKeyList, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 import { createPath, getPathParent } from '@cloudbeaver/core-utils';
-import { ActionService, MenuService, ACTION_NEW_FOLDER, DATA_CONTEXT_MENU, IAction, IDataContextProvider, DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+import {
+  ACTION_NEW_FOLDER,
+  ActionService,
+  DATA_CONTEXT_LOADABLE_STATE,
+  DATA_CONTEXT_MENU,
+  IAction,
+  IDataContextProvider,
+  MenuService,
+} from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_ELEMENTS_TREE, MENU_ELEMENTS_TREE_TOOLS } from '@cloudbeaver/plugin-navigation-tree';
 import { FolderDialog } from '@cloudbeaver/plugin-projects';
 
@@ -37,7 +60,6 @@ interface ITargetNode {
 
 @injectable()
 export class ResourceFoldersBootstrap extends Bootstrap {
-
   constructor(
     private readonly localizationService: LocalizationService,
     private readonly navTreeResource: NavTreeResource,
@@ -65,11 +87,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
       isActionApplicable: (context, action) => {
         const tree = context.tryGet(DATA_CONTEXT_ELEMENTS_TREE);
 
-        if (
-          ![ACTION_NEW_FOLDER].includes(action)
-          || !tree?.baseRoot.startsWith(RESOURCES_NODE_PATH)
-          || !this.userInfoResource.data
-        ) {
+        if (![ACTION_NEW_FOLDER].includes(action) || !tree?.baseRoot.startsWith(RESOURCES_NODE_PATH) || !this.userInfoResource.data) {
           return false;
         }
 
@@ -78,10 +96,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
       getLoader: (context, action) => {
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey)
-        );
+        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
       },
       isDisabled: context => this.getTargetNode(context) === undefined,
       handler: this.elementsTreeActionHandler.bind(this),
@@ -91,10 +106,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
       isApplicable: context => context.get(DATA_CONTEXT_MENU) === MENU_ELEMENTS_TREE_TOOLS,
       getItems: (context, items) => {
         if (!items.includes(ACTION_NEW_FOLDER)) {
-          return [
-            ...items,
-            ACTION_NEW_FOLDER,
-          ];
+          return [...items, ACTION_NEW_FOLDER];
         }
 
         return items;
@@ -102,16 +114,9 @@ export class ResourceFoldersBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private async moveResourceToFolder(
-    {
-      type,
-      targetNode,
-      moveContexts,
-    }: INodeMoveData,
-    contexts: IExecutionContextProvider<INodeMoveData>
-  ) {
+  private async moveResourceToFolder({ type, targetNode, moveContexts }: INodeMoveData, contexts: IExecutionContextProvider<INodeMoveData>) {
     const move = contexts.getContext(navNodeMoveContext);
     const nodes = getNodesFromContext(moveContexts);
     const nodeIdList = nodes.map(node => node.id);
@@ -124,10 +129,10 @@ export class ResourceFoldersBootstrap extends Bootstrap {
 
     const supported = nodes.every(node => {
       if (
-        ![NAV_NODE_TYPE_RM_PROJECT, NAV_NODE_TYPE_RM_RESOURCE].includes(node.nodeType!)
-        || targetProject !== this.projectsNavNodeService.getProject(node.id)
-        || children.includes(node.id)
-        || targetNode.id === node.id
+        ![NAV_NODE_TYPE_RM_PROJECT, NAV_NODE_TYPE_RM_RESOURCE].includes(node.nodeType!) ||
+        targetProject !== this.projectsNavNodeService.getProject(node.id) ||
+        children.includes(node.id) ||
+        targetNode.id === node.id
       ) {
         return false;
       }
@@ -151,7 +156,6 @@ export class ResourceFoldersBootstrap extends Bootstrap {
     }
   }
 
-
   private async elementsTreeActionHandler(contexts: IDataContextProvider, action: IAction) {
     const resourceTypeId = contexts.tryGet(DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID);
     switch (action) {
@@ -209,10 +213,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
           try {
             const root = this.getResourceTypeFolder(result.projectId, resourceTypeId);
             const key = getRmResourcePath(result.projectId, result.folder ?? root);
-            await this.resourceManagerResource.create(
-              createPath(key, result.name),
-              true
-            );
+            await this.resourceManagerResource.create(createPath(key, result.name), true);
 
             this.navTreeResource.refreshTree(getRmProjectNodeId(result.projectId));
           } catch (exception: any) {
@@ -258,7 +259,6 @@ export class ResourceFoldersBootstrap extends Bootstrap {
       return;
     }
 
-
     const project = this.projectsNavNodeService.getByNodeId(projectNode.id);
 
     if (!project?.canEditResources) {
@@ -328,17 +328,18 @@ export class ResourceFoldersBootstrap extends Bootstrap {
     // ));
 
     this.resourceManagerResource.onItemUpdate.addHandler(key => {
-      const updated = resourceKeyList([...new Set(ResourceKeyUtils.mapArray(key, getResourceNodeId)
-        .map(getPathParent))]);
+      const updated = resourceKeyList([...new Set(ResourceKeyUtils.mapArray(key, getResourceNodeId).map(getPathParent))]);
       if (!this.navTreeResource.isOutdated(updated)) {
         this.navTreeResource.markTreeOutdated(updated);
       }
     });
 
     this.resourceManagerResource.onItemDelete.addHandler(key => {
-      const updated = resourceKeyList([...new Set(ResourceKeyUtils.mapArray(key, getResourceNodeId)
-        .map(getPathParent))]);
-      this.navTreeResource.deleteInNode(updated, ResourceKeyUtils.toArray(key).map(value => [value]));
+      const updated = resourceKeyList([...new Set(ResourceKeyUtils.mapArray(key, getResourceNodeId).map(getPathParent))]);
+      this.navTreeResource.deleteInNode(
+        updated,
+        ResourceKeyUtils.toArray(key).map(value => [value]),
+      );
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceKeyFromNodeId.ts b/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceKeyFromNodeId.ts
index 673f13dab0..86121dbb36 100644
--- a/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceKeyFromNodeId.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceKeyFromNodeId.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { getRmResourcePath, isRMNavNode } from '@cloudbeaver/core-resource-manager';
 import { createPath, getPathParts } from '@cloudbeaver/core-utils';
 
@@ -24,4 +23,4 @@ export function getResourceKeyFromNodeId(nodeId: string): string | undefined {
   }
 
   return getRmResourcePath(projectId, createPath(path, name));
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceNodeId.ts b/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceNodeId.ts
index d8f571f479..18af7f9530 100644
--- a/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceNodeId.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavNodes/getResourceNodeId.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { createPath } from '@cloudbeaver/core-utils';
 
 export function getResourceNodeId(key: string): string {
   return createPath(RESOURCES_NODE_PATH, key);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/NavNodes/getRmProjectNodeId.ts b/webapp/packages/plugin-resource-manager/src/NavNodes/getRmProjectNodeId.ts
index 4bb29fa285..bf05af067a 100644
--- a/webapp/packages/plugin-resource-manager/src/NavNodes/getRmProjectNodeId.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavNodes/getRmProjectNodeId.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { createPath } from '@cloudbeaver/core-utils';
 
 export function getRmProjectNodeId(projectId: string): string {
   return createPath(RESOURCES_NODE_PATH, projectId);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/NavResourceNodeService.ts b/webapp/packages/plugin-resource-manager/src/NavResourceNodeService.ts
index 2b10604695..e18ca0cb7e 100644
--- a/webapp/packages/plugin-resource-manager/src/NavResourceNodeService.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavResourceNodeService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ResourceManagerResource } from '@cloudbeaver/core-resource-manager';
 
@@ -13,9 +12,7 @@ import { getResourceNodeId } from './NavNodes/getResourceNodeId';
 
 @injectable()
 export class NavResourceNodeService {
-  constructor(
-    private readonly resourceManagerResource: ResourceManagerResource,
-  ) { }
+  constructor(private readonly resourceManagerResource: ResourceManagerResource) {}
 
   async move(key: string, newKey: string): Promise<string> {
     await this.resourceManagerResource.move(key, newKey);
@@ -32,17 +29,10 @@ export class NavResourceNodeService {
   }
 
   async write(key: string, value: string) {
-    await this.resourceManagerResource.writeText(
-      key,
-      value,
-      true
-    );
+    await this.resourceManagerResource.writeText(key, value, true);
   }
 
   async setProperties(key: string, diff: Record<string, any>): Promise<Record<string, any>> {
-    return await this.resourceManagerResource.setProperties(
-      key,
-      diff
-    );
+    return await this.resourceManagerResource.setProperties(key, diff);
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts
index de3c202484..44872f0dab 100644
--- a/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,7 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
 
-  async load(): Promise<void> { }
-}
\ No newline at end of file
+  async load(): Promise<void> {}
+}
diff --git a/webapp/packages/plugin-resource-manager/src/RESOURCE_NAME_REGEX.ts b/webapp/packages/plugin-resource-manager/src/RESOURCE_NAME_REGEX.ts
index c7f8e4cdc3..ef720dda88 100644
--- a/webapp/packages/plugin-resource-manager/src/RESOURCE_NAME_REGEX.ts
+++ b/webapp/packages/plugin-resource-manager/src/RESOURCE_NAME_REGEX.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const RESOURCE_NAME_REGEX = /^(?!\.)[\p{L}\w\-$.\s()@]+$/u;
\ No newline at end of file
+export const RESOURCE_NAME_REGEX = /^(?!\.)[\p{L}\w\-$.\s()@]+$/u;
diff --git a/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts b/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
index 2739535385..6f759e734e 100644
--- a/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
+++ b/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { AuthInfoService } from '@cloudbeaver/core-authentication';
@@ -19,11 +18,7 @@ export class ResourceManagerService {
     return !!this.serverConfigResource.data?.resourceManagerEnabled && !!this.authInfoService.userInfo;
   }
 
-  constructor(
-    private readonly authInfoService: AuthInfoService,
-    private readonly serverConfigResource: ServerConfigResource
-  ) {
-
+  constructor(private readonly authInfoService: AuthInfoService, private readonly serverConfigResource: ServerConfigResource) {
     makeObservable(this, {
       enabled: computed,
     });
@@ -34,4 +29,4 @@ export class ResourceManagerService {
 
     return this.serverConfigResource.distributed ? scriptType?.rootFolder : undefined;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.test.ts b/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.test.ts
index a8a40cbb50..15a5537daa 100644
--- a/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.test.ts
+++ b/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -20,14 +19,9 @@ import { resourceManagerPlugin } from './manifest';
 import { ResourceManagerSettings, ResourceManagerSettingsService } from './ResourceManagerSettingsService';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  resourceManagerPlugin
-);
+const app = createApp(resourceManagerPlugin);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -60,9 +54,7 @@ test('New settings equal deprecated settings A', async () => {
   const settings = app.injector.getServiceByClass(ResourceManagerSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalAConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalAConfig)));
 
   await config.refresh();
 
@@ -74,12 +66,10 @@ test('New settings equal deprecated settings B', async () => {
   const settings = app.injector.getServiceByClass(ResourceManagerSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalBConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalBConfig)));
 
   await config.refresh();
 
   expect(settings.settings.getValue('disabled')).toBe(testValueB);
   expect(settings.deprecatedSettings.getValue('disabled')).toBe(testValueB);
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.ts b/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.ts
index f7bde144ca..add03b9f29 100644
--- a/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.ts
+++ b/webapp/packages/plugin-resource-manager/src/ResourceManagerSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-resource-manager/src/ResourceProjectsResource.ts b/webapp/packages/plugin-resource-manager/src/ResourceProjectsResource.ts
index 97727e8228..fb14c22a27 100644
--- a/webapp/packages/plugin-resource-manager/src/ResourceProjectsResource.ts
+++ b/webapp/packages/plugin-resource-manager/src/ResourceProjectsResource.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { SharedProjectsResource } from '@cloudbeaver/core-resource-manager';
-import { GraphQLService, CachedDataResource, RmProject } from '@cloudbeaver/core-sdk';
+import { CachedDataResource, GraphQLService, RmProject } from '@cloudbeaver/core-sdk';
 
 export type Project = Omit<RmProject, 'creator' | 'createTime' | 'canEditConnection' | 'canEditResource'>;
 
@@ -35,4 +34,4 @@ export class ResourceProjectsResource extends CachedDataResource<Project[]> {
     const { projects } = await this.graphQLService.sdk.getResourceProjectList();
     return projects;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID.ts b/webapp/packages/plugin-resource-manager/src/Tree/DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID.ts
index dbb2ed7a7c..56a558b23e 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID.ts
@@ -5,7 +5,6 @@
  * 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_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID = createDataContext<string | undefined>('resource-manager-tree-resource-type-id');
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.tsx b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.tsx
index 334a5deb3b..c3dc4e6ef3 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.tsx
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.tsx
@@ -5,25 +5,38 @@
  * 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 React, { forwardRef, useContext, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, TreeNodeContext, TreeNodeControl, TreeNodeName, TREE_NODE_STYLES, useObjectRef, useMouseContextMenu } from '@cloudbeaver/core-blocks';
+import {
+  getComputed,
+  TREE_NODE_STYLES,
+  TreeNodeContext,
+  TreeNodeControl,
+  TreeNodeName,
+  useMouseContextMenu,
+  useObjectRef,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
-import { NavNodeInfoResource, type INodeActions } from '@cloudbeaver/core-navigation-tree';
+import { type INodeActions, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { NAV_NODE_TYPE_RM_PROJECT } from '@cloudbeaver/core-resource-manager';
 import { CaptureViewContext } from '@cloudbeaver/core-view';
-import { ElementsTreeContext, isDraggingInsideProject, NavigationNodeEditorLoader, NavTreeControlComponent, NavTreeControlProps, TreeNodeMenuLoader } from '@cloudbeaver/plugin-navigation-tree';
+import {
+  ElementsTreeContext,
+  isDraggingInsideProject,
+  NavigationNodeEditorLoader,
+  NavTreeControlComponent,
+  NavTreeControlProps,
+  TreeNodeMenuLoader,
+} from '@cloudbeaver/plugin-navigation-tree';
 
 import { getRmProjectNodeId } from '../../NavNodes/getRmProjectNodeId';
 import { ResourceManagerService } from '../../ResourceManagerService';
 import { DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID } from '../DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID';
 
-
 const styles = css`
   TreeNodeControl {
     transition: opacity 0.3s ease;
@@ -33,8 +46,8 @@ const styles = css`
       opacity: 0.5;
     }
   }
-  TreeNodeControl:hover > portal, 
-  TreeNodeControl:global([aria-selected=true]) > portal,
+  TreeNodeControl:hover > portal,
+  TreeNodeControl:global([aria-selected='true']) > portal,
   portal:focus-within {
     visibility: visible;
   }
@@ -44,7 +57,7 @@ const styles = css`
     max-width: 250px;
     overflow: hidden;
     text-overflow: ellipsis;
-  } 
+  }
   portal {
     position: relative;
     box-sizing: border-box;
@@ -58,105 +71,96 @@ const styles = css`
   }
 `;
 
-export const NavigationNodeProjectControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(forwardRef(function NavigationNodeProjectControl({
-  node,
-  dndElement,
-  dndPlaceholder,
-  className,
-}, ref) {
-  const mouseContextMenu = useMouseContextMenu();
-  const viewContext = useContext(CaptureViewContext);
-  const elementsTreeContext = useContext(ElementsTreeContext);
-  const treeNodeContext = useContext(TreeNodeContext);
+export const NavigationNodeProjectControl: NavTreeControlComponent = observer<NavTreeControlProps, HTMLDivElement>(
+  forwardRef(function NavigationNodeProjectControl({ node, dndElement, dndPlaceholder, className }, ref) {
+    const mouseContextMenu = useMouseContextMenu();
+    const viewContext = useContext(CaptureViewContext);
+    const elementsTreeContext = useContext(ElementsTreeContext);
+    const treeNodeContext = useContext(TreeNodeContext);
 
-  const projectInfoResource = useService(ProjectInfoResource);
-  const navNodeInfoResource = useService(NavNodeInfoResource);
-  const resourceManagerService = useService(ResourceManagerService);
+    const projectInfoResource = useService(ProjectInfoResource);
+    const navNodeInfoResource = useService(NavNodeInfoResource);
+    const resourceManagerService = useService(ResourceManagerService);
 
-  const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
-  const selected = treeNodeContext.selected;
-  const resourceType = viewContext?.tryGet(DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID);
+    const outdated = getComputed(() => navNodeInfoResource.isOutdated(node.id) && !treeNodeContext.loading);
+    const selected = treeNodeContext.selected;
+    const resourceType = viewContext?.tryGet(DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID);
 
-  const isDragging = getComputed(() => {
-    if (!node.projectId || !elementsTreeContext?.tree.activeDnDData) {
-      return false;
+    const isDragging = getComputed(() => {
+      if (!node.projectId || !elementsTreeContext?.tree.activeDnDData) {
+        return false;
+      }
+
+      return isDraggingInsideProject(node.projectId, elementsTreeContext.tree.activeDnDData);
+    });
+
+    const [editing, setEditing] = useState(false);
+    let name = node.name;
+
+    const nodeActions = useObjectRef<INodeActions>({
+      rename: () => {
+        setEditing(true);
+      },
+    });
+
+    function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
+      EventContext.set(event, EventStopPropagationFlag);
+      treeNodeContext.select();
     }
 
-    return isDraggingInsideProject(node.projectId, elementsTreeContext.tree.activeDnDData);
-  });
+    function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
+      mouseContextMenu.handleContextMenuOpen(event);
+      treeNodeContext.select();
+    }
 
-  const [editing, setEditing] = useState(false);
-  let name = node.name;
+    function handleClick(event: React.MouseEvent<HTMLDivElement>) {
+      treeNodeContext.select(event.ctrlKey || event.metaKey);
+    }
 
-  const nodeActions = useObjectRef<INodeActions>({
-    rename: () => {
-      setEditing(true);
-    },
-  });
+    if (node.projectId && resourceType !== undefined) {
+      if (node.nodeType === NAV_NODE_TYPE_RM_PROJECT) {
+        const project = projectInfoResource.get(node.projectId);
+        if (project) {
+          const resourceFolder = resourceManagerService.getRootFolder(project, resourceType);
 
-  function handlePortalClick(event: React.MouseEvent<HTMLDivElement>) {
-    EventContext.set(event, EventStopPropagationFlag);
-    treeNodeContext.select();
-  }
+          if (resourceFolder !== undefined) {
+            return null;
+          }
+        }
+      } else {
+        const project = getRmProjectNodeId(node.projectId);
+        const projectName = navNodeInfoResource.get(project)?.name;
 
-  function handleContextMenuOpen(event: React.MouseEvent<HTMLDivElement>) {
-    mouseContextMenu.handleContextMenuOpen(event);
-    treeNodeContext.select();
-  }
-
-  function handleClick(event: React.MouseEvent<HTMLDivElement>) {
-    treeNodeContext.select(event.ctrlKey || event.metaKey);
-  }
-
-  if (node.projectId && resourceType !== undefined) {
-    if (node.nodeType === NAV_NODE_TYPE_RM_PROJECT) {
-      const project = projectInfoResource.get(node.projectId);
-      if (project) {
-        const resourceFolder = resourceManagerService.getRootFolder(project, resourceType);
-
-        if (resourceFolder !== undefined) {
-          return null;
+        if (projectName) {
+          name = projectName;
         }
       }
-    } else {
-      const project = getRmProjectNodeId(node.projectId);
-      const projectName = navNodeInfoResource.get(project)?.name;
-
-      if (projectName) {
-        name = projectName;
-      }
     }
-  }
 
-  if (elementsTreeContext?.tree.settings?.projects === false && !isDragging) {
-    return null;
-  }
+    if (elementsTreeContext?.tree.settings?.projects === false && !isDragging) {
+      return null;
+    }
 
-  return styled(TREE_NODE_STYLES, styles)(
-    <TreeNodeControl
-      ref={ref}
-      onClick={handleClick}
-      onContextMenu={handleContextMenuOpen}
-      {...use({ outdated, editing, dragging: dndElement })}
-      className={className}
-    >
-      <TreeNodeName title={name}>
-        {editing ? (
-          <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} />
-        ) : (
-          <name-box>{name}</name-box>
+    return styled(
+      TREE_NODE_STYLES,
+      styles,
+    )(
+      <TreeNodeControl
+        ref={ref}
+        onClick={handleClick}
+        onContextMenu={handleContextMenuOpen}
+        {...use({ outdated, editing, dragging: dndElement })}
+        className={className}
+      >
+        <TreeNodeName title={name}>
+          {editing ? <NavigationNodeEditorLoader node={node} onClose={() => setEditing(false)} /> : <name-box>{name}</name-box>}
+        </TreeNodeName>
+        {!editing && !dndPlaceholder && (
+          <portal onClick={handlePortalClick}>
+            <TreeNodeMenuLoader mouseContextMenu={mouseContextMenu} node={node} actions={nodeActions} selected={selected} />
+          </portal>
         )}
-      </TreeNodeName>
-      {!editing && !dndPlaceholder && (
-        <portal onClick={handlePortalClick}>
-          <TreeNodeMenuLoader
-            mouseContextMenu={mouseContextMenu}
-            node={node}
-            actions={nodeActions}
-            selected={selected}
-          />
-        </portal>
-      )}
-    </TreeNodeControl>
-  );
-}));
+      </TreeNodeControl>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/ProjectsSettingsForm.tsx b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/ProjectsSettingsForm.tsx
index 62b00a9458..6ebf97fbf5 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/ProjectsSettingsForm.tsx
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/ProjectsSettingsForm.tsx
@@ -5,16 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, Switch, PlaceholderElement, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, type PlaceholderComponent, PlaceholderElement, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import type { IElementsTreeSettingsProps } from '@cloudbeaver/plugin-navigation-tree';
 
-
 export const ProjectsSettingsForm: PlaceholderComponent<IElementsTreeSettingsProps> = observer(function ProjectsSettingsForm({
   tree: { root, settings },
   style,
@@ -40,7 +38,7 @@ export const ProjectsSettingsForm: PlaceholderComponent<IElementsTreeSettingsPro
       >
         {translate('plugin_navigation_tree_settings_projects_title')}
       </Switch>
-    </>
+    </>,
   );
 });
 
@@ -48,4 +46,4 @@ export const ProjectsSettingsPlaceholderElement: PlaceholderElement<IElementsTre
   id: 'settings-project',
   component: ProjectsSettingsForm,
   order: 1,
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
index 2160cd5571..ee1aec3ab6 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectFilter.ts
@@ -5,11 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import type { NavNode, NavNodeInfoResource, NavTreeResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 import type { ProjectsService } from '@cloudbeaver/core-projects';
-import { RESOURCES_NODE_PATH, NAV_NODE_TYPE_RM_PROJECT } from '@cloudbeaver/core-resource-manager';
+import { NAV_NODE_TYPE_RM_PROJECT, RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { createPath, isDefined } from '@cloudbeaver/core-utils';
 import type { IElementsTreeFilter } from '@cloudbeaver/plugin-navigation-tree';
@@ -52,7 +50,6 @@ export function navigationTreeProjectFilter(
         .map(node => node.id);
 
       return nodes;
-
     }
 
     if (node.id !== RESOURCES_NODE_PATH) {
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
index 4761348054..b28892e97d 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectSearchCompare.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { NAV_NODE_TYPE_RM_PROJECT } from '@cloudbeaver/core-resource-manager';
 import { EEquality, elementsTreeNameFilterNode, NavNodeFilterCompareFn } from '@cloudbeaver/plugin-navigation-tree';
 
-export const navigationTreeProjectSearchCompare: NavNodeFilterCompareFn = function navigationTreeProjectSearchCompare(
-  node,
-  filter
-) {
+export const navigationTreeProjectSearchCompare: NavNodeFilterCompareFn = function navigationTreeProjectSearchCompare(node, filter) {
   if (node.nodeType === NAV_NODE_TYPE_RM_PROJECT) {
     return EEquality.none;
   }
 
   return elementsTreeNameFilterNode(node, filter);
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
index 6220a4d8f1..0afb9c4cc3 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsExpandStateGetter.ts
@@ -5,19 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavNodeInfoResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 import type { ProjectsService } from '@cloudbeaver/core-projects';
 import { NAV_NODE_TYPE_RM_PROJECT } from '@cloudbeaver/core-resource-manager';
 import type { IElementsTreeNodeExpandInfoGetter } from '@cloudbeaver/plugin-navigation-tree';
 
-
 export function navigationTreeProjectsExpandStateGetter(
   navNodeInfoResource: NavNodeInfoResource,
   projectsService: ProjectsService,
   projectsNavNodeService: ProjectsNavNodeService,
 ): IElementsTreeNodeExpandInfoGetter {
-
   return (tree, nodeId) => {
     const node = navNodeInfoResource.get(nodeId);
 
@@ -36,4 +33,4 @@ export function navigationTreeProjectsExpandStateGetter(
       expandable: false,
     };
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
index f6b769aa9b..de8b70d99a 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx
@@ -5,18 +5,24 @@
  * 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 { useContext } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { getComputed, Translate, TREE_NODE_STYLES, TreeNodeNestedMessage } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { NavNodeInfoResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import { NAV_NODE_TYPE_RM_PROJECT, RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { createPath } from '@cloudbeaver/core-utils';
-import { type IElementsTreeCustomRenderer, type NavigationNodeRendererComponent, useNode, NavigationNodeRendererLoader, ElementsTreeContext, isDraggingInsideProject } from '@cloudbeaver/plugin-navigation-tree';
+import {
+  ElementsTreeContext,
+  type IElementsTreeCustomRenderer,
+  isDraggingInsideProject,
+  type NavigationNodeRendererComponent,
+  NavigationNodeRendererLoader,
+  useNode,
+} from '@cloudbeaver/plugin-navigation-tree';
 
 import type { ResourceManagerService } from '../../ResourceManagerService';
 import { NavigationNodeProjectControl } from './NavigationNodeProjectControl';
@@ -46,7 +52,6 @@ export function navigationTreeProjectsRendererRenderer(
   projectsNavNodeService: ProjectsNavNodeService,
   resourceTypeId?: string,
 ): IElementsTreeCustomRenderer {
-
   return nodeId => {
     const node = navNodeInfoResource.get(nodeId);
 
@@ -102,8 +107,8 @@ const ProjectRenderer: NavigationNodeRendererComponent = observer(function Manag
   if (!node) {
     return styled(TREE_NODE_STYLES)(
       <TreeNodeNestedMessage>
-        <Translate token='app_navigationTree_node_not_found' />
-      </TreeNodeNestedMessage>
+        <Translate token="app_navigationTree_node_not_found" />
+      </TreeNodeNestedMessage>,
     );
   }
 
@@ -120,6 +125,6 @@ const ProjectRenderer: NavigationNodeRendererComponent = observer(function Manag
       style={nestedStyles}
       component={component}
       {...use({ hideProjects, project })}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeResourceTypeFilter.ts b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeResourceTypeFilter.ts
index 4410b3af80..acd912f8cc 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeResourceTypeFilter.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ProjectsRenderer/navigationTreeResourceTypeFilter.ts
@@ -5,9 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavNode, NavNodeInfoResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
-import { ProjectInfoResource, isResourceOfType } from '@cloudbeaver/core-projects';
+import { isResourceOfType, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { NAV_NODE_TYPE_RM_RESOURCE } from '@cloudbeaver/core-resource-manager';
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { isNotNullDefined } from '@cloudbeaver/core-utils';
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ResourceFolderRenderer/navigationTreeResourceExpandStateGetter.ts b/webapp/packages/plugin-resource-manager/src/Tree/ResourceFolderRenderer/navigationTreeResourceExpandStateGetter.ts
index c7e3e7b0b2..d051b22ebf 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ResourceFolderRenderer/navigationTreeResourceExpandStateGetter.ts
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ResourceFolderRenderer/navigationTreeResourceExpandStateGetter.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { NavNodeInfoResource, ProjectsNavNodeService } from '@cloudbeaver/core-navigation-tree';
 import { RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { createPath } from '@cloudbeaver/core-utils';
@@ -19,7 +18,6 @@ export function navigationTreeResourceExpandStateGetter(
   projectsNavNodeService: ProjectsNavNodeService,
   resourceTypeId?: string,
 ): IElementsTreeNodeExpandInfoGetter {
-
   return (tree, nodeId) => {
     const node = navNodeInfoResource.get(nodeId);
 
@@ -45,4 +43,4 @@ export function navigationTreeResourceExpandStateGetter(
       expandable: false,
     };
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTree.tsx b/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTree.tsx
index 5f5414b02f..0745ccb1bb 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTree.tsx
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTree.tsx
@@ -5,7 +5,6 @@
  * 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 { useMemo } from 'react';
 import styled, { css } from 'reshadow';
@@ -18,7 +17,14 @@ import { getRmResourcePath, ResourceManagerResource, RESOURCES_NODE_PATH } from
 import { resourceKeyList } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 import { CaptureView } from '@cloudbeaver/core-view';
-import { NavigationTreeService, ElementsTreeLoader, IElementsTreeSettings, createElementsTreeSettings, validateElementsTreeSettings, getNavigationTreeUserSettingsId } from '@cloudbeaver/plugin-navigation-tree';
+import {
+  createElementsTreeSettings,
+  ElementsTreeLoader,
+  getNavigationTreeUserSettingsId,
+  IElementsTreeSettings,
+  NavigationTreeService,
+  validateElementsTreeSettings,
+} from '@cloudbeaver/plugin-navigation-tree';
 
 import { ResourceManagerService } from '../ResourceManagerService';
 import { navigationTreeProjectFilter } from './ProjectsRenderer/navigationTreeProjectFilter';
@@ -66,10 +72,7 @@ interface Props extends React.PropsWithChildren {
   resourceTypeId?: string;
 }
 
-export const ResourceManagerTree: React.FC<Props> = observer(function ResourceManagerTree({
-  resourceTypeId,
-  children,
-}) {
+export const ResourceManagerTree: React.FC<Props> = observer(function ResourceManagerTree({ resourceTypeId, children }) {
   const root = RESOURCES_NODE_PATH;
 
   const projectsNavNodeService = useService(ProjectsNavNodeService);
@@ -80,96 +83,48 @@ export const ResourceManagerTree: React.FC<Props> = observer(function ResourceMa
   const resourceManagerService = useService(ResourceManagerService);
   const navTreeResource = useService(NavTreeResource);
 
-  const key = getComputed<string[]>(
-    () => projectsService.activeProjects.map(project => getRmResourcePath(project.id)),
-    isArraysEqual
-  );
+  const key = getComputed<string[]>(() => projectsService.activeProjects.map(project => getRmResourcePath(project.id)), isArraysEqual);
   useResource(ResourceManagerTree, ResourceManagerResource, resourceKeyList(key));
 
-
   const settings = useUserData<IElementsTreeSettings>(
     getNavigationTreeUserSettingsId(root),
     createElementsTreeSettings,
-    () => { },
-    validateElementsTreeSettings
+    () => {},
+    validateElementsTreeSettings,
   );
 
   const projectsRendererRenderer = useMemo(
-    () => navigationTreeProjectsRendererRenderer(
-      navNodeInfoResource,
-      resourceManagerService,
-      projectsNavNodeService,
-      resourceTypeId,
-    ),
-    [
-      navNodeInfoResource,
-      resourceManagerService,
-      projectsNavNodeService,
-      resourceTypeId,
-    ]
+    () => navigationTreeProjectsRendererRenderer(navNodeInfoResource, resourceManagerService, projectsNavNodeService, resourceTypeId),
+    [navNodeInfoResource, resourceManagerService, projectsNavNodeService, resourceTypeId],
   );
 
   const resourceExpandStateGetter = useMemo(
-    () => navigationTreeResourceExpandStateGetter(
-      navNodeInfoResource,
-      resourceManagerService,
-      projectsNavNodeService,
-      resourceTypeId
-    ),
-    [
-      navNodeInfoResource,
-      resourceManagerService,
-      projectsNavNodeService,
-      resourceTypeId,
-    ]
+    () => navigationTreeResourceExpandStateGetter(navNodeInfoResource, resourceManagerService, projectsNavNodeService, resourceTypeId),
+    [navNodeInfoResource, resourceManagerService, projectsNavNodeService, resourceTypeId],
   );
 
   const projectsExpandStateGetter = useMemo(
-    () => navigationTreeProjectsExpandStateGetter(
-      navNodeInfoResource,
-      projectsService,
-      projectsNavNodeService
-    ),
-    [
-      navNodeInfoResource,
-      projectsService,
-      projectsNavNodeService,
-    ]
+    () => navigationTreeProjectsExpandStateGetter(navNodeInfoResource, projectsService, projectsNavNodeService),
+    [navNodeInfoResource, projectsService, projectsNavNodeService],
   );
   const projectFilter = useMemo(
-    () => navigationTreeProjectFilter(
-      projectsNavNodeService,
-      projectsService,
-      navNodeInfoResource,
-      navTreeResource,
-      resourceManagerService,
-      resourceTypeId,
-    ),
-    [
-      projectsNavNodeService,
-      projectsService,
-      navNodeInfoResource,
-      navTreeResource,
-      resourceManagerService,
-      resourceTypeId,
-    ]
+    () =>
+      navigationTreeProjectFilter(
+        projectsNavNodeService,
+        projectsService,
+        navNodeInfoResource,
+        navTreeResource,
+        resourceManagerService,
+        resourceTypeId,
+      ),
+    [projectsNavNodeService, projectsService, navNodeInfoResource, navTreeResource, resourceManagerService, resourceTypeId],
   );
   const resourceTypeFilter = useMemo(
-    () => navigationTreeResourceTypeFilter(
-      navNodeInfoResource,
-      projectsNavNodeService,
-      projectInfoResource,
-      resourceTypeId
-    ),
-    [
-      navNodeInfoResource,
-      projectsNavNodeService,
-      projectInfoResource,
-      resourceTypeId,
-    ]
+    () => navigationTreeResourceTypeFilter(navNodeInfoResource, projectsNavNodeService, projectInfoResource, resourceTypeId),
+    [navNodeInfoResource, projectsNavNodeService, projectInfoResource, resourceTypeId],
   );
 
-  const settingsElements = useMemo(() => ([ProjectsSettingsPlaceholderElement]), []);
+  const settingsElements = useMemo(() => [ProjectsSettingsPlaceholderElement], []);
 
   return styled(styles)(
     <CaptureView view={navTreeService}>
@@ -184,15 +139,15 @@ export const ResourceManagerTree: React.FC<Props> = observer(function ResourceMa
         expandStateGetters={[projectsExpandStateGetter, resourceExpandStateGetter]}
         navNodeFilterCompare={navigationTreeProjectSearchCompare}
         settingsElements={settingsElements}
-        emptyPlaceholder={() => styled(styles)(
-          <center>
-            <message>
-              {children}
-            </message>
-          </center>
-        )}
+        emptyPlaceholder={() =>
+          styled(styles)(
+            <center>
+              <message>{children}</message>
+            </center>,
+          )
+        }
         onOpen={node => navTreeService.navToNode(node.id, node.parentId)}
       />
-    </CaptureView>
+    </CaptureView>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTreeCaptureViewContext.tsx b/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTreeCaptureViewContext.tsx
index df5cdc93a4..1f0fd04e81 100644
--- a/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTreeCaptureViewContext.tsx
+++ b/webapp/packages/plugin-resource-manager/src/Tree/ResourceManagerTreeCaptureViewContext.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCaptureViewContext } from '@cloudbeaver/core-view';
 
 import { DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID } from './DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID';
@@ -14,12 +13,10 @@ interface Props {
   resourceTypeId?: string;
 }
 
-export const ResourceManagerTreeCaptureViewContext: React.FC<Props> = function ResourceManagerTreeCaptureViewContext({
-  resourceTypeId,
-}) {
+export const ResourceManagerTreeCaptureViewContext: React.FC<Props> = function ResourceManagerTreeCaptureViewContext({ resourceTypeId }) {
   useCaptureViewContext(context => {
     context?.set(DATA_CONTEXT_RESOURCE_MANAGER_TREE_RESOURCE_TYPE_ID, resourceTypeId);
   });
 
   return null;
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-resource-manager/src/index.ts b/webapp/packages/plugin-resource-manager/src/index.ts
index a921b38c50..22cb91e455 100644
--- a/webapp/packages/plugin-resource-manager/src/index.ts
+++ b/webapp/packages/plugin-resource-manager/src/index.ts
@@ -9,4 +9,4 @@ export * from './ResourceManagerService';
 export * from './NavNodes/getResourceKeyFromNodeId';
 export * from './NavNodes/getResourceNodeId';
 export * from './NavNodes/getRmProjectNodeId';
-export * from './Tree/ResourceManagerTree';
\ No newline at end of file
+export * from './Tree/ResourceManagerTree';
diff --git a/webapp/packages/plugin-resource-manager/src/locales/en.ts b/webapp/packages/plugin-resource-manager/src/locales/en.ts
index d1161b1306..df3a2e4a72 100644
--- a/webapp/packages/plugin-resource-manager/src/locales/en.ts
+++ b/webapp/packages/plugin-resource-manager/src/locales/en.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_title', 'Resource Manager'],
   ['plugin_resource_manager_folder_move_failed', 'Failed to move to folder'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager/src/locales/it.ts b/webapp/packages/plugin-resource-manager/src/locales/it.ts
index d1161b1306..df3a2e4a72 100644
--- a/webapp/packages/plugin-resource-manager/src/locales/it.ts
+++ b/webapp/packages/plugin-resource-manager/src/locales/it.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_title', 'Resource Manager'],
   ['plugin_resource_manager_folder_move_failed', 'Failed to move to folder'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager/src/locales/ru.ts b/webapp/packages/plugin-resource-manager/src/locales/ru.ts
index 517d38ae18..cb2a47990c 100644
--- a/webapp/packages/plugin-resource-manager/src/locales/ru.ts
+++ b/webapp/packages/plugin-resource-manager/src/locales/ru.ts
@@ -1,4 +1,4 @@
 export default [
   ['plugin_resource_manager_title', 'Менеджер ресурсов'],
   ['plugin_resource_manager_folder_move_failed', 'Ошибка перемещения в папку'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-resource-manager/src/manifest.ts b/webapp/packages/plugin-resource-manager/src/manifest.ts
index be8ab3ba67..fc4e692f3c 100644
--- a/webapp/packages/plugin-resource-manager/src/manifest.ts
+++ b/webapp/packages/plugin-resource-manager/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -14,6 +13,7 @@ import { NavResourceNodeService } from './NavResourceNodeService';
 import { PluginBootstrap } from './PluginBootstrap';
 import { ResourceManagerService } from './ResourceManagerService';
 import { ResourceManagerSettingsService } from './ResourceManagerSettingsService';
+
 // import { ResourceProjectsResource } from './ResourceProjectsResource';
 
 export const resourceManagerPlugin: PluginManifest = {
@@ -27,4 +27,4 @@ export const resourceManagerPlugin: PluginManifest = {
     ResourceFoldersBootstrap,
     // ResourceProjectsResource,
   ],
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationNotification.tsx b/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationNotification.tsx
index e27baaa5b4..952972f0f9 100644
--- a/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationNotification.tsx
+++ b/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationNotification.tsx
@@ -5,13 +5,10 @@
  * 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 {
-  Button, SnackbarWrapper, SnackbarStatus, SnackbarContent, SnackbarBody, SnackbarFooter, useTranslate
-} from '@cloudbeaver/core-blocks';
+import { Button, SnackbarBody, SnackbarContent, SnackbarFooter, SnackbarStatus, SnackbarWrapper, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { ENotificationType, NotificationComponentProps } from '@cloudbeaver/core-events';
 import { DataSynchronizationService } from '@cloudbeaver/core-root';
@@ -29,7 +26,7 @@ const styles = css`
     flex-direction: column;
     gap: 8px;
 
-    &> div {
+    & > div {
       word-break: break-word;
       white-space: pre-line;
     }
@@ -40,15 +37,10 @@ const styles = css`
   }
 `;
 
-export const DataSynchronizationNotification = observer<NotificationComponentProps>(function DataSynchronizationNotification({
-  notification,
-}) {
+export const DataSynchronizationNotification = observer<NotificationComponentProps>(function DataSynchronizationNotification({ notification }) {
   const dataSynchronizationService = useService(DataSynchronizationService);
   const translate = useTranslate();
-  const groups = objectValues(groupBy(
-    Array.from(dataSynchronizationService.queue.values()),
-    message => message.label
-  ));
+  const groups = objectValues(groupBy(Array.from(dataSynchronizationService.queue.values()), message => message.label));
 
   function applyChanges() {
     dataSynchronizationService.resolveAll(true);
@@ -75,7 +67,6 @@ export const DataSynchronizationNotification = observer<NotificationComponentPro
           </Button>
         </SnackbarFooter>
       </SnackbarContent>
-    </SnackbarWrapper>
-
+    </SnackbarWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationResolverBootstrap.ts b/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationResolverBootstrap.ts
index 08722ac59c..437f42bfb9 100644
--- a/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationResolverBootstrap.ts
+++ b/webapp/packages/plugin-root/src/DataSynchronization/DataSynchronizationResolverBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ENotificationType, INotification, NotificationService } from '@cloudbeaver/core-events';
 import { DataSynchronizationService, ServerConfigResource } from '@cloudbeaver/core-root';
@@ -19,7 +18,7 @@ export class DataSynchronizationResolverBootstrap extends Bootstrap {
   constructor(
     private readonly notificationService: NotificationService,
     private readonly serverConfigResource: ServerConfigResource,
-    private readonly dataSynchronizationService: DataSynchronizationService
+    private readonly dataSynchronizationService: DataSynchronizationService,
   ) {
     super();
     this.activeNotification = null;
@@ -29,21 +28,25 @@ export class DataSynchronizationResolverBootstrap extends Bootstrap {
     this.dataSynchronizationService.onSynchronizationRequest.addHandler(this.handleNetworkStateChange.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private handleNetworkStateChange(): void {
     if (this.activeNotification || this.serverConfigResource.configurationMode) {
       return;
     }
 
-    this.activeNotification = this.notificationService.customNotification(() => DataSynchronizationNotification, {}, {
-      title: 'plugin_root_data_sync_title',
-      message: 'plugin_root_data_sync_message',
-      type: ENotificationType.Info,
-      onClose: () => {
-        this.dataSynchronizationService.resolveAll(false);
-        this.activeNotification = null;
+    this.activeNotification = this.notificationService.customNotification(
+      () => DataSynchronizationNotification,
+      {},
+      {
+        title: 'plugin_root_data_sync_title',
+        message: 'plugin_root_data_sync_message',
+        type: ENotificationType.Info,
+        onClose: () => {
+          this.dataSynchronizationService.resolveAll(false);
+          this.activeNotification = null;
+        },
       },
-    });
+    );
   }
 }
diff --git a/webapp/packages/plugin-root/src/LocaleService.ts b/webapp/packages/plugin-root/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-root/src/LocaleService.ts
+++ b/webapp/packages/plugin-root/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-root/src/NetworkStateNotification/NetworkStateNotificationService.ts b/webapp/packages/plugin-root/src/NetworkStateNotification/NetworkStateNotificationService.ts
index 7be056ce6e..0c0db669fa 100644
--- a/webapp/packages/plugin-root/src/NetworkStateNotification/NetworkStateNotificationService.ts
+++ b/webapp/packages/plugin-root/src/NetworkStateNotification/NetworkStateNotificationService.ts
@@ -5,20 +5,15 @@
  * 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 { INotification, NotificationService } from '@cloudbeaver/core-events';
 import { NetworkStateService } from '@cloudbeaver/core-root';
 
-
 @injectable()
 export class NetworkStateNotificationService extends Bootstrap {
   private activeNotification: INotification | null;
 
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly networkStateService: NetworkStateService
-  ) {
+  constructor(private readonly notificationService: NotificationService, private readonly networkStateService: NetworkStateService) {
     super();
     this.activeNotification = null;
   }
@@ -27,7 +22,7 @@ export class NetworkStateNotificationService extends Bootstrap {
     this.networkStateService.networkStateExecutor.addHandler(this.handleNetworkStateChange.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private handleNetworkStateChange(state: boolean): void {
     if (!state) {
diff --git a/webapp/packages/plugin-root/src/PluginBootstrap.ts b/webapp/packages/plugin-root/src/PluginBootstrap.ts
index 484c40a93e..5cb98d6fdd 100644
--- a/webapp/packages/plugin-root/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-root/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,7 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialog.tsx b/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialog.tsx
index 0b329e38c1..832daf3bb5 100644
--- a/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialog.tsx
+++ b/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -25,9 +24,7 @@ const styles = css`
   }
 `;
 
-export const ServerNodeChangedDialog: DialogComponent<null, null> = observer(function ServerNodeChangedDialog({
-  rejectDialog,
-}) {
+export const ServerNodeChangedDialog: DialogComponent<null, null> = observer(function ServerNodeChangedDialog({ rejectDialog }) {
   const routerService = useService(RouterService);
   const translate = useTranslate();
   function reload() {
@@ -35,27 +32,19 @@ export const ServerNodeChangedDialog: DialogComponent<null, null> = observer(fun
   }
 
   return styled(styles)(
-    <CommonDialogWrapper size='small' fixedSize>
+    <CommonDialogWrapper size="small" fixedSize>
       <CommonDialogHeader title="app_root_server_node_changed_title" onReject={rejectDialog} />
       <CommonDialogBody noOverflow>
         <p>{translate('app_root_server_node_changed_message')}</p>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['outlined']}
-          onClick={rejectDialog}
-        >
+        <Button type="button" mod={['outlined']} onClick={rejectDialog}>
           {translate('ui_processing_cancel')}
         </Button>
-        <Button
-          type="button"
-          mod={['unelevated']}
-          onClick={reload}
-        >
+        <Button type="button" mod={['unelevated']} onClick={reload}>
           {translate('ui_processing_reload')}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialogService.ts b/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialogService.ts
index ebb212568e..356b1b729f 100644
--- a/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialogService.ts
+++ b/webapp/packages/plugin-root/src/ServerNodeChangedDialog/ServerNodeChangedDialogService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ActionSnackbar } from '@cloudbeaver/core-blocks';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
@@ -21,7 +20,7 @@ export class ServerNodeChangedDialogService extends Bootstrap {
     private readonly routerService: RouterService,
     private readonly notificationService: NotificationService,
     private readonly commonDialogService: CommonDialogService,
-    private readonly serverNodeService: ServerNodeService
+    private readonly serverNodeService: ServerNodeService,
   ) {
     super();
   }
@@ -30,16 +29,25 @@ export class ServerNodeChangedDialogService extends Bootstrap {
     this.serverNodeService.onApplicationRunIdChange.addPostHandler(this.handleServerNodeChanged.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async handleServerNodeChanged(): Promise<void> {
     const state = await this.commonDialogService.open(ServerNodeChangedDialog, null);
 
     if (state === DialogueStateResult.Rejected) {
-      this.notificationService.customNotification(() => ActionSnackbar, {
-        actionText: 'ui_processing_reload',
-        onAction: () => this.routerService.reload(),
-      }, { title: 'app_root_server_node_changed_title', message: 'app_root_server_node_changed_message', persistent: true, type: ENotificationType.Error });
+      this.notificationService.customNotification(
+        () => ActionSnackbar,
+        {
+          actionText: 'ui_processing_reload',
+          onAction: () => this.routerService.reload(),
+        },
+        {
+          title: 'app_root_server_node_changed_title',
+          message: 'app_root_server_node_changed_message',
+          persistent: true,
+          type: ENotificationType.Error,
+        },
+      );
     }
   }
 }
diff --git a/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialog.tsx b/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialog.tsx
index 5f2f42ba41..8a6b22a86d 100644
--- a/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialog.tsx
+++ b/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -25,9 +24,7 @@ const styles = css`
   }
 `;
 
-export const SessionExpiredDialog: DialogComponent<null, null> = observer(function SessionExpiredDialog({
-  rejectDialog,
-}) {
+export const SessionExpiredDialog: DialogComponent<null, null> = observer(function SessionExpiredDialog({ rejectDialog }) {
   const routerService = useService(RouterService);
   const translate = useTranslate();
   function reload() {
@@ -35,20 +32,16 @@ export const SessionExpiredDialog: DialogComponent<null, null> = observer(functi
   }
 
   return styled(styles)(
-    <CommonDialogWrapper size='small' fixedSize>
+    <CommonDialogWrapper size="small" fixedSize>
       <CommonDialogHeader title="app_root_session_expired_title" onReject={rejectDialog} />
       <CommonDialogBody noOverflow>
         <p>{translate('app_root_session_expired_message')}</p>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['unelevated']}
-          onClick={reload}
-        >
+        <Button type="button" mod={['unelevated']} onClick={reload}>
           {translate('ui_processing_reload')}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialogService.ts b/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialogService.ts
index 8720b0de48..374849907a 100644
--- a/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialogService.ts
+++ b/webapp/packages/plugin-root/src/SessionExpireDialog/SessionExpiredDialogService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ActionSnackbar } from '@cloudbeaver/core-blocks';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
@@ -21,7 +20,7 @@ export class SessionExpiredDialogService extends Bootstrap {
     private readonly routerService: RouterService,
     private readonly notificationService: NotificationService,
     private readonly commonDialogService: CommonDialogService,
-    private readonly sessionExpireService: SessionExpireService
+    private readonly sessionExpireService: SessionExpireService,
   ) {
     super();
   }
@@ -30,16 +29,20 @@ export class SessionExpiredDialogService extends Bootstrap {
     this.sessionExpireService.onSessionExpire.addPostHandler(this.handleSessionExpired.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async handleSessionExpired(): Promise<void> {
     const state = await this.commonDialogService.open(SessionExpiredDialog, null);
 
     if (state === DialogueStateResult.Rejected) {
-      this.notificationService.customNotification(() => ActionSnackbar, {
-        actionText: 'ui_processing_reload',
-        onAction: () => this.routerService.reload(),
-      }, { title: 'app_root_session_expired_title', persistent: true, type: ENotificationType.Error });
+      this.notificationService.customNotification(
+        () => ActionSnackbar,
+        {
+          actionText: 'ui_processing_reload',
+          onAction: () => this.routerService.reload(),
+        },
+        { title: 'app_root_session_expired_title', persistent: true, type: ENotificationType.Error },
+      );
     }
   }
 }
diff --git a/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialog.tsx b/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialog.tsx
index a476a202a5..5f19336889 100644
--- a/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialog.tsx
+++ b/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -22,26 +21,20 @@ const styles = css`
   }
 `;
 
-export const SessionExpireWarningDialog: DialogComponent<null, null> = observer(function SessionExpireWarningDialog({
-  rejectDialog,
-}) {
+export const SessionExpireWarningDialog: DialogComponent<null, null> = observer(function SessionExpireWarningDialog({ rejectDialog }) {
   const translate = useTranslate();
 
   return styled(styles)(
-    <CommonDialogWrapper size='small' fixedSize>
+    <CommonDialogWrapper size="small" fixedSize>
       <CommonDialogHeader title="app_root_session_expire_warning_title" onReject={rejectDialog} />
       <CommonDialogBody noOverflow>
         <p>{translate('app_root_session_expire_warning_message')}</p>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button
-          type="button"
-          mod={['unelevated']}
-          onClick={rejectDialog}
-        >
+        <Button type="button" mod={['unelevated']} onClick={rejectDialog}>
           {translate('app_root_session_expire_warning_button')}
         </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts b/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
index bfb742779d..9ac3e720dc 100644
--- a/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
+++ b/webapp/packages/plugin-root/src/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
@@ -39,14 +38,10 @@ export class SessionExpireWarningDialogService extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 
   private handleStateChange(isValid?: boolean, remainingTime?: number) {
-    if (
-      !this.serverConfigResource.anonymousAccessEnabled
-      && !this.userInfoResource.data
-      && !this.serverConfigResource.configurationMode
-    ) {
+    if (!this.serverConfigResource.anonymousAccessEnabled && !this.userInfoResource.data && !this.serverConfigResource.configurationMode) {
       return;
     }
 
diff --git a/webapp/packages/plugin-root/src/index.ts b/webapp/packages/plugin-root/src/index.ts
index 84c9f80dc5..08a4490ca3 100644
--- a/webapp/packages/plugin-root/src/index.ts
+++ b/webapp/packages/plugin-root/src/index.ts
@@ -1,5 +1,6 @@
 import { rootPlugin } from './manifest';
+
 export * from './SessionExpireDialog/SessionExpiredDialogService';
 export * from './SessionExpireWarningDialog/SessionExpireWarningDialogService';
 
-export default rootPlugin;
\ No newline at end of file
+export default rootPlugin;
diff --git a/webapp/packages/plugin-root/src/locales/en.ts b/webapp/packages/plugin-root/src/locales/en.ts
index 317563610f..471ff9ba53 100644
--- a/webapp/packages/plugin-root/src/locales/en.ts
+++ b/webapp/packages/plugin-root/src/locales/en.ts
@@ -3,4 +3,4 @@ export default [
   ['plugin_root_network_state_description', 'Application now in offline mode, some features are disabled'],
   ['plugin_root_data_sync_title', 'Data synchronization'],
   ['plugin_root_data_sync_message', 'You have data updates, do you want to apply them? Some data can be lost.'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-root/src/locales/it.ts b/webapp/packages/plugin-root/src/locales/it.ts
index 317563610f..471ff9ba53 100644
--- a/webapp/packages/plugin-root/src/locales/it.ts
+++ b/webapp/packages/plugin-root/src/locales/it.ts
@@ -3,4 +3,4 @@ export default [
   ['plugin_root_network_state_description', 'Application now in offline mode, some features are disabled'],
   ['plugin_root_data_sync_title', 'Data synchronization'],
   ['plugin_root_data_sync_message', 'You have data updates, do you want to apply them? Some data can be lost.'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-root/src/locales/ru.ts b/webapp/packages/plugin-root/src/locales/ru.ts
index 66106a1488..773ec870d4 100644
--- a/webapp/packages/plugin-root/src/locales/ru.ts
+++ b/webapp/packages/plugin-root/src/locales/ru.ts
@@ -3,4 +3,4 @@ export default [
   ['plugin_root_network_state_description', 'Приложение в автономном режиме, некоторый функционал не доступен'],
   ['plugin_root_data_sync_title', 'Синхронизация данных'],
   ['plugin_root_data_sync_message', 'У вас есть обновленные данные, хотите применить? Некоторая информация может быть потеряна.'],
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-root/src/manifest.ts b/webapp/packages/plugin-root/src/manifest.ts
index 6145e8dccf..2136498a03 100644
--- a/webapp/packages/plugin-root/src/manifest.ts
+++ b/webapp/packages/plugin-root/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { DataSynchronizationResolverBootstrap } from './DataSynchronization/DataSynchronizationResolverBootstrap';
@@ -27,4 +26,4 @@ export const rootPlugin: PluginManifest = {
     NetworkStateNotificationService,
     DataSynchronizationResolverBootstrap,
   ],
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-settings-menu-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-settings-menu-administration/src/PluginBootstrap.ts
index 4f8ad5fdb3..5cb98d6fdd 100644
--- a/webapp/packages/plugin-settings-menu-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-settings-menu-administration/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,8 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void | Promise<void> {
-  }
+  register(): void | Promise<void> {}
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-settings-menu-administration/src/index.ts b/webapp/packages/plugin-settings-menu-administration/src/index.ts
index 382e631fc7..6a5654f12e 100644
--- a/webapp/packages/plugin-settings-menu-administration/src/index.ts
+++ b/webapp/packages/plugin-settings-menu-administration/src/index.ts
@@ -1,3 +1,3 @@
 import { settingsMenuAdministrationPlugin } from './manifest';
 
-export default settingsMenuAdministrationPlugin;
\ No newline at end of file
+export default settingsMenuAdministrationPlugin;
diff --git a/webapp/packages/plugin-settings-menu-administration/src/manifest.ts b/webapp/packages/plugin-settings-menu-administration/src/manifest.ts
index 41309dc9c3..2943408ea6 100644
--- a/webapp/packages/plugin-settings-menu-administration/src/manifest.ts
+++ b/webapp/packages/plugin-settings-menu-administration/src/manifest.ts
@@ -5,14 +5,11 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
 
 export const settingsMenuAdministrationPlugin: PluginManifest = {
   info: { name: 'Settings menu administration plugin' },
-  providers: [
-    PluginBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap],
+};
diff --git a/webapp/packages/plugin-settings-menu/src/PluginBootstrap.ts b/webapp/packages/plugin-settings-menu/src/PluginBootstrap.ts
index 7fd556d2a0..fa44b1e360 100644
--- a/webapp/packages/plugin-settings-menu/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-settings-menu/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { menuExtractItems, MenuService } from '@cloudbeaver/core-view';
 import { MENU_APP_STATE } from '@cloudbeaver/plugin-top-app-bar';
@@ -14,9 +13,7 @@ import { TOP_NAV_BAR_SETTINGS_MENU } from './SettingsMenu/TOP_NAV_BAR_SETTINGS_M
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly menuService: MenuService
-  ) {
+  constructor(private readonly menuService: MenuService) {
     super();
   }
 
@@ -24,15 +21,12 @@ export class PluginBootstrap extends Bootstrap {
     this.addTopAppMenuItems();
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private addTopAppMenuItems() {
     this.menuService.addCreator({
       menus: [MENU_APP_STATE],
-      getItems: (context, items) => [
-        ...items,
-        TOP_NAV_BAR_SETTINGS_MENU,
-      ],
+      getItems: (context, items) => [...items, TOP_NAV_BAR_SETTINGS_MENU],
       orderItems: (context, items) => {
         const extracted = menuExtractItems(items, [TOP_NAV_BAR_SETTINGS_MENU]);
 
@@ -40,4 +34,4 @@ export class PluginBootstrap extends Bootstrap {
       },
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-settings-menu/src/SettingsMenu/SettingsMenu.tsx b/webapp/packages/plugin-settings-menu/src/SettingsMenu/SettingsMenu.tsx
index 3dec3ed9a6..99cc2a13c2 100644
--- a/webapp/packages/plugin-settings-menu/src/SettingsMenu/SettingsMenu.tsx
+++ b/webapp/packages/plugin-settings-menu/src/SettingsMenu/SettingsMenu.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -21,14 +20,8 @@ export const SettingsMenu = observer(function SettingsMenu() {
   const menu = useMenu({ menu: TOP_NAV_BAR_SETTINGS_MENU });
 
   return styled(settingsMenuStyles)(
-    <ContextMenu
-      menu={menu}
-      style={[topMenuStyles, settingsMenuStyles]}
-      placement='bottom-end'
-      modal
-      rtl
-    >
+    <ContextMenu menu={menu} style={[topMenuStyles, settingsMenuStyles]} placement="bottom-end" modal rtl>
       <Icon name="settings" viewBox="0 0 28 28" />
-    </ContextMenu>
+    </ContextMenu>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-settings-menu/src/SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU.ts b/webapp/packages/plugin-settings-menu/src/SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU.ts
index 4f2b7eef46..4e4430aa45 100644
--- a/webapp/packages/plugin-settings-menu/src/SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU.ts
+++ b/webapp/packages/plugin-settings-menu/src/SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU.ts
@@ -5,12 +5,6 @@
  * 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 TOP_NAV_BAR_SETTINGS_MENU = createMenu(
-  'top-nav-bar-settings',
-  'ui_settings',
-  '/icons/plugin_settings_menu_m.svg',
-  'ui_settings'
-);
\ No newline at end of file
+export const TOP_NAV_BAR_SETTINGS_MENU = createMenu('top-nav-bar-settings', 'ui_settings', '/icons/plugin_settings_menu_m.svg', 'ui_settings');
diff --git a/webapp/packages/plugin-settings-menu/src/SettingsMenu/settingsMenuStyles.ts b/webapp/packages/plugin-settings-menu/src/SettingsMenu/settingsMenuStyles.ts
index cafc64e755..499fd9de82 100644
--- a/webapp/packages/plugin-settings-menu/src/SettingsMenu/settingsMenuStyles.ts
+++ b/webapp/packages/plugin-settings-menu/src/SettingsMenu/settingsMenuStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const settingsMenuStyles = css`
@@ -26,7 +25,7 @@ export const settingsMenuStyles = css`
     height: 24px;
   }
   menu-panel-item {
-    & menu-item-text  {
+    & menu-item-text {
       text-align: right;
     }
     & Icon {
@@ -38,4 +37,4 @@ export const settingsMenuStyles = css`
       padding: 0 8px !important;
     }
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/plugin-settings-menu/src/index.ts b/webapp/packages/plugin-settings-menu/src/index.ts
index 72d060e4c2..497144bde5 100644
--- a/webapp/packages/plugin-settings-menu/src/index.ts
+++ b/webapp/packages/plugin-settings-menu/src/index.ts
@@ -3,4 +3,4 @@ import { settingsMenuPlugin } from './manifest';
 export default settingsMenuPlugin;
 
 export * from './SettingsMenu/SettingsMenu';
-export * from './SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU';
\ No newline at end of file
+export * from './SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU';
diff --git a/webapp/packages/plugin-settings-menu/src/manifest.ts b/webapp/packages/plugin-settings-menu/src/manifest.ts
index 7cd27aa689..7e690f65b0 100644
--- a/webapp/packages/plugin-settings-menu/src/manifest.ts
+++ b/webapp/packages/plugin-settings-menu/src/manifest.ts
@@ -5,14 +5,11 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
 
 export const settingsMenuPlugin: PluginManifest = {
   info: { name: 'Settings menu plugin' },
-  providers: [
-    PluginBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap],
+};
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/IResourceSqlDataSourceState.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/IResourceSqlDataSourceState.ts
index 8b16a118b0..1ce9013827 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/IResourceSqlDataSourceState.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/IResourceSqlDataSourceState.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
 
 export interface IResourceSqlDataSourceState {
   resourceKey?: string;
   executionContext?: IConnectionExecutionContextInfo;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/LocaleService.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/LocaleService.ts
index 3005f4bd55..e3649a06b4 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/LocaleService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
@@ -33,4 +32,4 @@ export class LocaleService extends Bootstrap {
         return (await import('./locales/en')).default;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
index 1ae27f909e..e6b2cfbfb4 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
@@ -5,21 +5,30 @@
  * 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 { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
-import { NavNodeManagerService, NavNodeInfoResource, type INodeNavigationData, NavigationType } from '@cloudbeaver/core-navigation-tree';
+import { type INodeNavigationData, NavigationType, NavNodeInfoResource, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { createResourceOfType, isResourceOfType, ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
 import { NAV_NODE_TYPE_RM_RESOURCE, ResourceManagerResource, RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import { createPath, getPathName } from '@cloudbeaver/core-utils';
-import { ActionService, ACTION_SAVE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
+import { ACTION_SAVE, ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
-import { NavResourceNodeService, ResourceManagerService, getResourceKeyFromNodeId } from '@cloudbeaver/plugin-resource-manager';
+import { getResourceKeyFromNodeId, NavResourceNodeService, ResourceManagerService } from '@cloudbeaver/plugin-resource-manager';
 import { ResourceManagerScriptsService, SaveScriptDialog, SCRIPTS_TYPE_ID } from '@cloudbeaver/plugin-resource-manager-scripts';
-import { DATA_CONTEXT_SQL_EDITOR_STATE, ESqlDataSourceFeatures, getSqlEditorName, ISqlDataSource, SqlDataSourceService, SqlEditorSettingsService, MemorySqlDataSource, LocalStorageSqlDataSource, SQL_EDITOR_TOOLS_MENU } from '@cloudbeaver/plugin-sql-editor';
+import {
+  DATA_CONTEXT_SQL_EDITOR_STATE,
+  ESqlDataSourceFeatures,
+  getSqlEditorName,
+  ISqlDataSource,
+  LocalStorageSqlDataSource,
+  MemorySqlDataSource,
+  SQL_EDITOR_TOOLS_MENU,
+  SqlDataSourceService,
+  SqlEditorSettingsService,
+} from '@cloudbeaver/plugin-sql-editor';
 import { isSQLEditorTab, SqlEditorNavigatorService } from '@cloudbeaver/plugin-sql-editor-navigation-tab';
 
 import { ResourceSqlDataSource } from './ResourceSqlDataSource';
@@ -68,10 +77,7 @@ export class PluginBootstrap extends Bootstrap {
 
           const dataSource = this.sqlDataSourceService.get(state.editorId);
 
-          return (
-            dataSource instanceof MemorySqlDataSource
-            || dataSource instanceof LocalStorageSqlDataSource
-          );
+          return dataSource instanceof MemorySqlDataSource || dataSource instanceof LocalStorageSqlDataSource;
         }
 
         return false;
@@ -79,9 +85,7 @@ export class PluginBootstrap extends Bootstrap {
       handler: async (context, action) => {
         const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
 
-        let dataSource: ISqlDataSource | ResourceSqlDataSource | undefined = this.sqlDataSourceService.get(
-          state.editorId
-        );
+        let dataSource: ISqlDataSource | ResourceSqlDataSource | undefined = this.sqlDataSourceService.get(state.editorId);
 
         if (!dataSource) {
           return;
@@ -125,9 +129,7 @@ export class PluginBootstrap extends Bootstrap {
 
               const scriptName = createResourceOfType(resourceType, result.name.trim());
               const scriptsRootFolder = this.resourceManagerScriptsService.getRootFolder(project);
-              const folderResourceKey = getResourceKeyFromNodeId(
-                createPath(RESOURCES_NODE_PATH, projectId, scriptsRootFolder)
-              );
+              const folderResourceKey = getResourceKeyFromNodeId(createPath(RESOURCES_NODE_PATH, projectId, scriptsRootFolder));
 
               if (!folderResourceKey) {
                 this.notificationService.logError({ title: 'ui_error', message: 'plugin_sql_editor_navigation_tab_resource_save_script_error' });
@@ -136,29 +138,23 @@ export class PluginBootstrap extends Bootstrap {
 
               const resourceKey = createPath(folderResourceKey, scriptName);
 
-              await this.resourceManagerScriptsService.createScript(
-                resourceKey,
-                dataSource.executionContext,
-                dataSource.script,
-              );
+              await this.resourceManagerScriptsService.createScript(resourceKey, dataSource.executionContext, dataSource.script);
 
-              dataSource = this.sqlDataSourceService.create(
-                state,
-                ResourceSqlDataSource.key,
-                {
-                  script: dataSource.script,
-                  executionContext: dataSource.executionContext,
-                }
-              );
+              dataSource = this.sqlDataSourceService.create(state, ResourceSqlDataSource.key, {
+                script: dataSource.script,
+                executionContext: dataSource.executionContext,
+              });
 
               (dataSource as ResourceSqlDataSource).setResourceKey(resourceKey);
 
-              this.notificationService.logSuccess({ title: 'plugin_sql_editor_navigation_tab_resource_save_script_success', message: getPathName(resourceKey) });
+              this.notificationService.logSuccess({
+                title: 'plugin_sql_editor_navigation_tab_resource_save_script_success',
+                message: getPathName(resourceKey),
+              });
 
               if (!this.resourceManagerScriptsService.active) {
                 this.resourceManagerScriptsService.togglePanel();
               }
-
             } catch (exception) {
               this.notificationService.logException(exception as any, 'plugin_sql_editor_navigation_tab_resource_save_script_error');
             }
@@ -186,24 +182,18 @@ export class PluginBootstrap extends Bootstrap {
         const dataSource = this.sqlDataSourceService.get(state.editorId);
 
         return (
-          this.resourceManagerService.enabled
-          && context.get(DATA_CONTEXT_MENU) === SQL_EDITOR_TOOLS_MENU
-          && !!dataSource?.hasFeature(ESqlDataSourceFeatures.script)
+          this.resourceManagerService.enabled &&
+          context.get(DATA_CONTEXT_MENU) === SQL_EDITOR_TOOLS_MENU &&
+          !!dataSource?.hasFeature(ESqlDataSourceFeatures.script)
         );
       },
-      getItems: (context, items) => [
-        ...items,
-        ACTION_SAVE,
-      ],
+      getItems: (context, items) => [...items, ACTION_SAVE],
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private async navigationHandler(
-    data: INodeNavigationData,
-    contexts: IExecutionContextProvider<INodeNavigationData>
-  ) {
+  private async navigationHandler(data: INodeNavigationData, contexts: IExecutionContextProvider<INodeNavigationData>) {
     if (!this.resourceManagerService.enabled) {
       return;
     }
@@ -273,10 +263,7 @@ export class PluginBootstrap extends Bootstrap {
         const context = contextProvider.getContext(this.navigationTabsService.navigationTabContext);
 
         if (context.tab && isSQLEditorTab(context.tab)) {
-          const dataSource = this.sqlDataSourceService.create(
-            context.tab.handlerState,
-            ResourceSqlDataSource.key
-          ) as ResourceSqlDataSource;
+          const dataSource = this.sqlDataSourceService.create(context.tab.handlerState, ResourceSqlDataSource.key) as ResourceSqlDataSource;
 
           dataSource.setResourceKey(resourceKey);
         }
@@ -285,4 +272,4 @@ export class PluginBootstrap extends Bootstrap {
       this.notificationService.logException(exception as any, 'plugin_sql_editor_navigation_tab_resource_open_script_error');
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceEditorSettingsService.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceEditorSettingsService.ts
index 9972d85fe8..47d79f316a 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceEditorSettingsService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceEditorSettingsService.ts
@@ -5,12 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
-const defaultSettings = {
-};
+const defaultSettings = {};
 
 export type ResourceEditorSettings = typeof defaultSettings;
 
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
index 5e5b1d7990..05af2c2eb7 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
@@ -5,10 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable, runInAction, toJS } from 'mobx';
 
-import { ConnectionInfoResource, createConnectionParam, IConnectionExecutionContextInfo, NOT_INITIALIZED_CONTEXT_ID } from '@cloudbeaver/core-connections';
+import {
+  ConnectionInfoResource,
+  createConnectionParam,
+  IConnectionExecutionContextInfo,
+  NOT_INITIALIZED_CONTEXT_ID,
+} from '@cloudbeaver/core-connections';
 import { TaskScheduler } from '@cloudbeaver/core-executor';
 import { getRmResourceKey, ResourceManagerResource } from '@cloudbeaver/core-resource-manager';
 import { isResourceAlias, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
@@ -22,21 +26,14 @@ interface IResourceInfo {
 }
 
 interface IResourceActions {
-  rename(
-    dataSource: ResourceSqlDataSource,
-    key: string,
-    newKey: string
-  ): Promise<string>;
+  rename(dataSource: ResourceSqlDataSource, key: string, newKey: string): Promise<string>;
   read(dataSource: ResourceSqlDataSource, key: string): Promise<string>;
   write(dataSource: ResourceSqlDataSource, key: string, value: string): Promise<void>;
-  getProperties(
-    dataSource: ResourceSqlDataSource,
-    key: string
-  ): Promise<IConnectionExecutionContextInfo | undefined>;
+  getProperties(dataSource: ResourceSqlDataSource, key: string): Promise<IConnectionExecutionContextInfo | undefined>;
   setProperties(
     dataSource: ResourceSqlDataSource,
     key: string,
-    executionContext: IConnectionExecutionContextInfo | undefined
+    executionContext: IConnectionExecutionContextInfo | undefined,
   ): Promise<IConnectionExecutionContextInfo | undefined>;
 }
 
@@ -69,11 +66,9 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
 
   get executionContext(): IConnectionExecutionContextInfo | undefined {
     if (
-      this.state.executionContext
-      && !this.connectionInfoResource.has(createConnectionParam(
-        this.state.executionContext.projectId,
-        this.state.executionContext.connectionId
-      ))) {
+      this.state.executionContext &&
+      !this.connectionInfoResource.has(createConnectionParam(this.state.executionContext.projectId, this.state.executionContext.connectionId))
+    ) {
       return undefined;
     }
     return this.state.executionContext;
@@ -87,17 +82,12 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
     return this.lastAction;
   }
 
-  get features():ESqlDataSourceFeatures[] {
+  get features(): ESqlDataSourceFeatures[] {
     if (this.isReadonly()) {
       return [ESqlDataSourceFeatures.script, ESqlDataSourceFeatures.query, ESqlDataSourceFeatures.executable];
     }
 
-    return [
-      ESqlDataSourceFeatures.script,
-      ESqlDataSourceFeatures.query,
-      ESqlDataSourceFeatures.executable,
-      ESqlDataSourceFeatures.setName,
-    ];
+    return [ESqlDataSourceFeatures.script, ESqlDataSourceFeatures.query, ESqlDataSourceFeatures.executable, ESqlDataSourceFeatures.setName];
   }
 
   private _script: string;
@@ -113,7 +103,7 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   constructor(
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly resourceManagerResource: ResourceManagerResource,
-    state: IResourceSqlDataSourceState
+    state: IResourceSqlDataSourceState,
   ) {
     super();
     this.state = state;
@@ -197,12 +187,7 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
 
     name = name.trim();
 
-    return (
-      !!this.actions
-      && !!this.resourceKey
-      && this.saved
-      && name.length > 0
-    );
+    return !!this.actions && !!this.resourceKey && this.saved && name.length > 0;
   }
 
   setScript(script: string): void {
@@ -250,22 +235,15 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   }
 
   setExecutionContext(executionContext?: IConnectionExecutionContextInfo): void {
-    if (
-      this.resourceKey
-      && executionContext?.projectId
-      && getRmResourceKey(this.resourceKey).projectId !== executionContext.projectId
-    ) {
+    if (this.resourceKey && executionContext?.projectId && getRmResourceKey(this.resourceKey).projectId !== executionContext.projectId) {
       throw new Error('Resource SQL Data Source and Execution context projects don\t match');
     }
 
-    if (
-      !isObjectsEqual(toJS(this.state.executionContext), toJS(executionContext))
-    ) {
-      const initNew = (
-        !isValuesEqual(executionContext?.connectionId, this.executionContext?.connectionId, undefined)
-        || !isValuesEqual(executionContext?.defaultCatalog, this.executionContext?.defaultCatalog, undefined)
-        || !isValuesEqual(executionContext?.defaultSchema, this.executionContext?.defaultSchema, undefined)
-      );
+    if (!isObjectsEqual(toJS(this.state.executionContext), toJS(executionContext))) {
+      const initNew =
+        !isValuesEqual(executionContext?.connectionId, this.executionContext?.connectionId, undefined) ||
+        !isValuesEqual(executionContext?.defaultCatalog, this.executionContext?.defaultCatalog, undefined) ||
+        !isValuesEqual(executionContext?.defaultSchema, this.executionContext?.defaultSchema, undefined);
 
       if (executionContext) {
         if (initNew) {
@@ -284,19 +262,13 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
 
       this.saveProperties();
     }
-
   }
 
   async rename(name: string | null) {
     await this.write();
 
     await this.scheduler.schedule(undefined, async () => {
-      if (
-        !this.actions
-      || !this.resourceKey
-      || !this.saved
-      || !name?.trim()
-      ) {
+      if (!this.actions || !this.resourceKey || !this.saved || !name?.trim()) {
         return;
       }
 
@@ -310,11 +282,7 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
 
       try {
         this.exception = null;
-        this.setResourceKey(await this.actions.rename(
-          this,
-          this.resourceKey,
-          createPath(getPathParent(this.resourceKey), name))
-        );
+        this.setResourceKey(await this.actions.rename(this, this.resourceKey, createPath(getPathParent(this.resourceKey), name)));
       } catch (exception: any) {
         this.exception = exception;
       } finally {
@@ -397,11 +365,7 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
         this.exception = null;
 
         if (!this.isReadonly()) {
-          const executionContext = await this.actions.setProperties(
-            this,
-            this.resourceKey,
-            this.executionContext
-          );
+          const executionContext = await this.actions.setProperties(this, this.resourceKey, this.executionContext);
 
           if (executionContext) {
             this.setExecutionContext(executionContext);
@@ -420,4 +384,4 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   private debouncedWrite() {
     this.write();
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
index b411e6b854..036734add5 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable, untracked } from 'mobx';
 
 import { ConnectionInfoResource, IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -68,18 +67,18 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
       map => {
         for (const [key, value] of Array.from(map.entries())) {
           if (
-            !['string', 'undefined'].includes(typeof value.resourceKey)
-            || !['undefined', 'object'].includes(typeof value.executionContext)
-            || !['string', 'undefined'].includes(typeof value.executionContext?.connectionId)
-            || !['string', 'undefined'].includes(typeof value.executionContext?.id)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultCatalog)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultSchema)
+            !['string', 'undefined'].includes(typeof value.resourceKey) ||
+            !['undefined', 'object'].includes(typeof value.executionContext) ||
+            !['string', 'undefined'].includes(typeof value.executionContext?.connectionId) ||
+            !['string', 'undefined'].includes(typeof value.executionContext?.id) ||
+            !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultCatalog) ||
+            !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultSchema)
           ) {
             map.delete(key);
           }
         }
         return map;
-      }
+      },
     );
   }
 
@@ -91,13 +90,7 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     this.sqlDataSourceService.register({
       key: ResourceSqlDataSource.key,
       getDataSource: (editorId, options) => {
-        const dataSource = new ResourceSqlDataSource(
-          this.connectionInfoResource,
-          this.resourceManagerResource,
-          this.createState(
-            editorId,
-          )
-        );
+        const dataSource = new ResourceSqlDataSource(this.connectionInfoResource, this.resourceManagerResource, this.createState(editorId));
 
         if (options?.executionContext) {
           dataSource.setExecutionContext(options.executionContext);
@@ -170,12 +163,9 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private createState(
-    editorId: string,
-    resourceKey?: string
-  ): IResourceSqlDataSourceState {
+  private createState(editorId: string, resourceKey?: string): IResourceSqlDataSourceState {
     let state = this.dataSourceStateState.get(editorId);
 
     if (!state) {
@@ -200,10 +190,8 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
 
     if (focused) {
       const dataSources = this.sqlDataSourceService.dataSources
-        .filter(([, dataSource]) => (
-          dataSource instanceof ResourceSqlDataSource
-        ))
-        .map(([,dataSource]) => dataSource as ResourceSqlDataSource);
+        .filter(([, dataSource]) => dataSource instanceof ResourceSqlDataSource)
+        .map(([, dataSource]) => dataSource as ResourceSqlDataSource);
 
       for (const dataSource of dataSources) {
         dataSource.markOutdated();
@@ -217,10 +205,8 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     }
 
     const dataSource = this.sqlDataSourceService.dataSources
-      .filter(([, dataSource]) => (
-        dataSource instanceof ResourceSqlDataSource
-      ))
-      .map(([,dataSource]) => dataSource as ResourceSqlDataSource)
+      .filter(([, dataSource]) => dataSource instanceof ResourceSqlDataSource)
+      .map(([, dataSource]) => dataSource as ResourceSqlDataSource)
       .find(ds => ds.resourceKey && ds.resourceKey === data.from);
 
     dataSource?.setResourceKey(data.to);
@@ -244,11 +230,7 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     this.navigationTabsService.closeTabSilent(resourceKeyList(tabs), true);
   }
 
-  private async rename(
-    dataSource: ResourceSqlDataSource,
-    resourceKey: string,
-    newResourceKey: string
-  ): Promise<string> {
+  private async rename(dataSource: ResourceSqlDataSource, resourceKey: string, newResourceKey: string): Promise<string> {
     if (!this.resourceManagerService.enabled) {
       throw new Error('Resource Manager disabled');
     }
@@ -262,17 +244,12 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     }
   }
 
-  private async write(
-    dataSource: ResourceSqlDataSource,
-    resourceKey: string,
-    value: string
-  ): Promise<void> {
+  private async write(dataSource: ResourceSqlDataSource, resourceKey: string, value: string): Promise<void> {
     if (!this.resourceManagerService.enabled) {
       return;
     }
 
     try {
-
       await this.navResourceNodeService.write(resourceKey, value);
     } catch (exception) {
       this.notificationService.logException(exception as any, 'plugin_sql_editor_navigation_tab_resource_update_script_error');
@@ -280,10 +257,7 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     }
   }
 
-  private async getProperties(
-    dataSource: ResourceSqlDataSource,
-    resourceKey: string
-  ): Promise<IConnectionExecutionContextInfo | undefined> {
+  private async getProperties(dataSource: ResourceSqlDataSource, resourceKey: string): Promise<IConnectionExecutionContextInfo | undefined> {
     try {
       return await this.resourceManagerScriptsService.getExecutionContextInfo(resourceKey);
     } catch (exception) {
@@ -295,13 +269,10 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
   private async setProperties(
     dataSource: ResourceSqlDataSource,
     resourceKey: string,
-    executionContext: IConnectionExecutionContextInfo | undefined
+    executionContext: IConnectionExecutionContextInfo | undefined,
   ): Promise<IConnectionExecutionContextInfo | undefined> {
     try {
-      return await this.resourceManagerScriptsService.setExecutionContextInfo(
-        resourceKey,
-        executionContext
-      );
+      return await this.resourceManagerScriptsService.setExecutionContextInfo(resourceKey, executionContext);
     } catch (exception) {
       this.notificationService.logException(exception as any, 'plugin_sql_editor_navigation_tab_resource_update_script_error');
       throw exception;
@@ -317,4 +288,4 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
       throw exception;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/SqlEditorTabResourceService.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/SqlEditorTabResourceService.ts
index ace7b5fd6a..5141e70d96 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/SqlEditorTabResourceService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/SqlEditorTabResourceService.ts
@@ -5,8 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-
 import { injectable } from '@cloudbeaver/core-di';
 import { SqlDataSourceService } from '@cloudbeaver/plugin-sql-editor';
 import { SqlEditorTabService } from '@cloudbeaver/plugin-sql-editor-navigation-tab';
@@ -15,22 +13,15 @@ import { ResourceSqlDataSource } from './ResourceSqlDataSource';
 
 @injectable()
 export class SqlEditorTabResourceService {
-
-  constructor(
-    private readonly sqlEditorTabService: SqlEditorTabService,
-    private readonly sqlDataSourceService: SqlDataSourceService,
-  ) {
-  }
+  constructor(private readonly sqlEditorTabService: SqlEditorTabService, private readonly sqlDataSourceService: SqlDataSourceService) {}
 
   getResourceTab(key: string) {
-    const dataSource = this.sqlDataSourceService.dataSources.find(([, dataSource]) => (
-      dataSource instanceof ResourceSqlDataSource
-      && dataSource.resourceKey === key
-    ));
+    const dataSource = this.sqlDataSourceService.dataSources.find(
+      ([, dataSource]) => dataSource instanceof ResourceSqlDataSource && dataSource.resourceKey === key,
+    );
 
-    const tab = this.sqlEditorTabService.sqlEditorTabs
-      .find(tab => dataSource && tab.handlerState.editorId === dataSource[0]);
+    const tab = this.sqlEditorTabService.sqlEditorTabs.find(tab => dataSource && tab.handlerState.editorId === dataSource[0]);
 
     return tab;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts
index 15bc2512af..e2e38fb300 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts
@@ -1,3 +1,3 @@
 import { manifest } from './manifest';
 
-export default manifest;
\ No newline at end of file
+export default manifest;
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/en.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/en.ts
index 21dc9d5d9d..68205e400e 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/en.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/en.ts
@@ -5,5 +5,8 @@ export default [
   ['plugin_sql_editor_navigation_tab_resource_update_script_error', 'Failed to update the script'],
   ['plugin_sql_editor_navigation_tab_resource_sync_script_error', "Failed to sync editor's query"],
   ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_title', 'Unable to save the script'],
-  ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message', 'Error occurred while trying to save the script. Close the tab anyway?'],
-];
\ No newline at end of file
+  [
+    'plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message',
+    'Error occurred while trying to save the script. Close the tab anyway?',
+  ],
+];
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/it.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/it.ts
index 21dc9d5d9d..68205e400e 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/it.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/it.ts
@@ -5,5 +5,8 @@ export default [
   ['plugin_sql_editor_navigation_tab_resource_update_script_error', 'Failed to update the script'],
   ['plugin_sql_editor_navigation_tab_resource_sync_script_error', "Failed to sync editor's query"],
   ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_title', 'Unable to save the script'],
-  ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message', 'Error occurred while trying to save the script. Close the tab anyway?'],
-];
\ No newline at end of file
+  [
+    'plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message',
+    'Error occurred while trying to save the script. Close the tab anyway?',
+  ],
+];
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/ru.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/ru.ts
index 40f28d3360..a41e210560 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/ru.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/ru.ts
@@ -5,5 +5,8 @@ export default [
   ['plugin_sql_editor_navigation_tab_resource_update_script_error', 'Не удалось обновить скрипт'],
   ['plugin_sql_editor_navigation_tab_resource_sync_script_error', 'Не удалось синхронизировать данные редактора'],
   ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_title', 'Не удалось сохранить скрипт'],
-  ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message', 'Возникла ошибка при попытки сохранить скрипт. Закрыть вкладку?'],
-];
\ No newline at end of file
+  [
+    'plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message',
+    'Возникла ошибка при попытки сохранить скрипт. Закрыть вкладку?',
+  ],
+];
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/zh.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/zh.ts
index 666fe6439a..0980f9c143 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/zh.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/locales/zh.ts
@@ -5,5 +5,8 @@ export default [
   ['plugin_sql_editor_navigation_tab_resource_update_script_error', '更新脚本出错'],
   ['plugin_sql_editor_navigation_tab_resource_sync_script_error', '同步查询失败'],
   ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_title', 'Unable to save the script'],
-  ['plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message', 'Error occurred while trying to save the script. Close the tab anyway?'],
-];
\ No newline at end of file
+  [
+    'plugin_sql_editor_navigation_tab_resource_save_script_error_confirmation_message',
+    'Error occurred while trying to save the script. Close the tab anyway?',
+  ],
+];
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts
index 1c9499208f..804bf79b76 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -15,10 +14,5 @@ import { SqlEditorTabResourceService } from './SqlEditorTabResourceService';
 
 export const manifest: PluginManifest = {
   info: { name: 'Sql Editor Script plugin' },
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-    SqlEditorTabResourceService,
-    ResourceSqlDataSourceBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, LocaleService, SqlEditorTabResourceService, ResourceSqlDataSourceBootstrap],
+};
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts
index 6ce6ea1c1f..2775a9ef9f 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts
@@ -5,14 +5,10 @@
  * 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_SQL_EDITOR_NEW = createAction(
-  'sql-editor-new',
-  {
-    label: 'plugin_sql_editor_navigation_tab_action_sql_editor_new',
-    icon: '/icons/plugin_sql_editor_navigation_tab_new_m.svg',
-    tooltip: 'plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_NEW = createAction('sql-editor-new', {
+  label: 'plugin_sql_editor_navigation_tab_action_sql_editor_new',
+  icon: '/icons/plugin_sql_editor_navigation_tab_new_m.svg',
+  tooltip: 'plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_OPEN.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_OPEN.ts
index 0f61354212..0bc362ce3d 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_OPEN.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_OPEN.ts
@@ -5,12 +5,8 @@
  * 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_SQL_EDITOR_OPEN = createAction(
-  'sql-editor-open',
-  {
-    label: 'sql_editor_menu',
-  }
-);
+export const ACTION_SQL_EDITOR_OPEN = createAction('sql-editor-open', {
+  label: 'sql_editor_menu',
+});
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/DATA_CONTEXT_SQL_EDITOR_TAB.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/DATA_CONTEXT_SQL_EDITOR_TAB.ts
index bf444f423f..225d21e4d5 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/DATA_CONTEXT_SQL_EDITOR_TAB.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/DATA_CONTEXT_SQL_EDITOR_TAB.ts
@@ -5,8 +5,6 @@
  * 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_SQL_EDITOR_TAB = createDataContext<boolean>('sql-editor-tab');
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/LocaleService.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/LocaleService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SESSION_ACTION_OPEN_SQL_EDITOR.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SESSION_ACTION_OPEN_SQL_EDITOR.ts
index 95da4e8a05..dc46cd10d0 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SESSION_ACTION_OPEN_SQL_EDITOR.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SESSION_ACTION_OPEN_SQL_EDITOR.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const SESSION_ACTION_OPEN_SQL_EDITOR = 'open-sql-editor';
\ No newline at end of file
+export const SESSION_ACTION_OPEN_SQL_EDITOR = 'open-sql-editor';
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SQL_EDITOR_SOURCE_ACTION.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SQL_EDITOR_SOURCE_ACTION.ts
index cae2941531..8ad2e4c430 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SQL_EDITOR_SOURCE_ACTION.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SQL_EDITOR_SOURCE_ACTION.ts
@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export const SQL_EDITOR_SOURCE_ACTION = 'action';
\ No newline at end of file
+export const SQL_EDITOR_SOURCE_ACTION = 'action';
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorBootstrap.ts
index 1369951fde..b82151540d 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorBootstrap.ts
@@ -5,8 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { Connection, ConnectionInfoResource, createConnectionParam, IConnectionInfoParams, isConnectionProvider, isObjectCatalogProvider, isObjectSchemaProvider } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionInfoResource,
+  createConnectionParam,
+  IConnectionInfoParams,
+  isConnectionProvider,
+  isObjectCatalogProvider,
+  isObjectSchemaProvider,
+} from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult, RenameDialog } from '@cloudbeaver/core-dialogs';
 import type { IExecutorHandler } from '@cloudbeaver/core-executor';
@@ -14,10 +21,18 @@ import { ExtensionUtils } from '@cloudbeaver/core-extensions';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature, NodeManagerUtils } from '@cloudbeaver/core-navigation-tree';
 import { ISessionAction, sessionActionContext, SessionActionService } from '@cloudbeaver/core-root';
-import { ActionService, ACTION_RENAME, DATA_CONTEXT_MENU_NESTED, menuExtractItems, MenuService, ViewService } from '@cloudbeaver/core-view';
+import { ACTION_RENAME, ActionService, DATA_CONTEXT_MENU_NESTED, menuExtractItems, MenuService, ViewService } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_CONNECTION, MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 import { NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
-import { DATA_CONTEXT_SQL_EDITOR_STATE, ESqlDataSourceFeatures, getSqlEditorName, LocalStorageSqlDataSource, SqlDataSourceService, SqlEditorService, SqlEditorSettingsService } from '@cloudbeaver/plugin-sql-editor';
+import {
+  DATA_CONTEXT_SQL_EDITOR_STATE,
+  ESqlDataSourceFeatures,
+  getSqlEditorName,
+  LocalStorageSqlDataSource,
+  SqlDataSourceService,
+  SqlEditorService,
+  SqlEditorSettingsService,
+} from '@cloudbeaver/plugin-sql-editor';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
 import { ACTION_SQL_EDITOR_NEW } from './ACTION_SQL_EDITOR_NEW';
@@ -59,14 +74,9 @@ export class SqlEditorBootstrap extends Bootstrap {
 
     this.menuService.addCreator({
       isApplicable: context => context.has(DATA_CONTEXT_SQL_EDITOR_STATE) && context.has(DATA_CONTEXT_SQL_EDITOR_TAB),
-      getItems: (context, items) => [
-        ...items,
-        ACTION_RENAME,
-      ],
+      getItems: (context, items) => [...items, ACTION_RENAME],
       orderItems: (context, items) => {
-        const actions = menuExtractItems(items, [
-          ACTION_RENAME,
-        ]);
+        const actions = menuExtractItems(items, [ACTION_RENAME]);
 
         if (actions.length > 0) {
           items.unshift(...actions);
@@ -90,10 +100,7 @@ export class SqlEditorBootstrap extends Bootstrap {
 
         return !context.has(DATA_CONTEXT_MENU_NESTED);
       },
-      getItems: (context, items) => [
-        ...items,
-        ACTION_SQL_EDITOR_OPEN,
-      ],
+      getItems: (context, items) => [...items, ACTION_SQL_EDITOR_OPEN],
     });
 
     this.actionService.addHandler({
@@ -110,10 +117,7 @@ export class SqlEditorBootstrap extends Bootstrap {
 
           return dataSource?.hasFeature(ESqlDataSourceFeatures.setName) ?? false;
         }
-        return (
-          action === ACTION_SQL_EDITOR_OPEN
-          && context.has(DATA_CONTEXT_CONNECTION)
-        );
+        return action === ACTION_SQL_EDITOR_OPEN && context.has(DATA_CONTEXT_CONNECTION);
       },
       handler: async (context, action) => {
         switch (action) {
@@ -135,19 +139,16 @@ export class SqlEditorBootstrap extends Bootstrap {
             }
 
             const name = getSqlEditorName(state, dataSource, connection);
-            const regexp = /^(.*?)(\.\w+)$/ig.exec(name);
+            const regexp = /^(.*?)(\.\w+)$/gi.exec(name);
 
             const result = await this.commonDialogService.open(RenameDialog, {
               value: regexp?.[1] ?? name,
               objectName: name,
               icon: '/icons/sql_script_m.svg',
-              validation: name => (
-                !this.sqlEditorTabService.sqlEditorTabs.some(tab => (
-                  tab.handlerState.order !== state.order
-                  && this.sqlEditorService.getName(tab.handlerState) === name.trim()
-                ))
-                && dataSource.canRename(name)
-              ),
+              validation: name =>
+                !this.sqlEditorTabService.sqlEditorTabs.some(
+                  tab => tab.handlerState.order !== state.order && this.sqlEditorService.getName(tab.handlerState) === name.trim(),
+                ) && dataSource.canRename(name),
             });
 
             if (result !== DialogueStateResult.Rejected && result !== DialogueStateResult.Resolved) {
@@ -177,21 +178,16 @@ export class SqlEditorBootstrap extends Bootstrap {
     });
   }
 
-  load(): void { }
+  load(): void {}
 
   private registerTopAppBarItem() {
     this.menuService.addCreator({
       menus: [MENU_APP_ACTIONS],
-      getItems: (context, items) => [
-        ...items,
-        ACTION_SQL_EDITOR_NEW,
-      ],
+      getItems: (context, items) => [...items, ACTION_SQL_EDITOR_NEW],
       orderItems: (context, items) => {
         let placeIndex = items.indexOf(ACTION_SQL_EDITOR_NEW);
 
-        const actionsOpen = menuExtractItems(items, [
-          ACTION_SQL_EDITOR_NEW,
-        ]);
+        const actionsOpen = menuExtractItems(items, [ACTION_SQL_EDITOR_NEW]);
 
         const connectionsIndex = items.indexOf(MENU_CONNECTIONS);
 
@@ -207,16 +203,11 @@ export class SqlEditorBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'sql-editor-new',
-      isActionApplicable: (context, action) => [
-        ACTION_SQL_EDITOR_NEW,
-      ].includes(action),
+      isActionApplicable: (context, action) => [ACTION_SQL_EDITOR_NEW].includes(action),
       isLabelVisible: () => false,
       getActionInfo: (context, action) => {
         const connectionContext = this.getActiveConnectionContext();
-        const schemaAndCatalog = NodeManagerUtils.concatSchemaAndCatalog(
-          connectionContext.catalogId,
-          connectionContext.schemaId
-        );
+        const schemaAndCatalog = NodeManagerUtils.concatSchemaAndCatalog(connectionContext.catalogId, connectionContext.schemaId);
 
         let tooltip = action.info.tooltip;
 
@@ -229,7 +220,7 @@ export class SqlEditorBootstrap extends Bootstrap {
               'plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip',
               {
                 connection: `${connectionInfo.name}${schemaAndCatalog ? ' ' + schemaAndCatalog : ''}`,
-              }
+              },
             );
           }
         }
@@ -264,9 +255,15 @@ export class SqlEditorBootstrap extends Bootstrap {
 
     for (const activeView of this.viewService.activeViews) {
       ExtensionUtils.from(activeView.extensions)
-        .on(isConnectionProvider, extension => { connectionKey = extension(activeView.context); })
-        .on(isObjectCatalogProvider, extension => { catalogId = extension(activeView.context); })
-        .on(isObjectSchemaProvider, extension => { schemaId = extension(activeView.context); });
+        .on(isConnectionProvider, extension => {
+          connectionKey = extension(activeView.context);
+        })
+        .on(isObjectCatalogProvider, extension => {
+          catalogId = extension(activeView.context);
+        })
+        .on(isObjectSchemaProvider, extension => {
+          schemaId = extension(activeView.context);
+        });
 
       if (connectionKey) {
         break;
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorNavigatorService.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorNavigatorService.ts
index d91ffc414d..9e5d7d430e 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorNavigatorService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorNavigatorService.ts
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionInfoResource, createConnectionParam, IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { IExecutor, Executor, IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import { Executor, IExecutionContextProvider, IExecutor } from '@cloudbeaver/core-executor';
 import { NavigationService } from '@cloudbeaver/core-ui';
 import { uuid } from '@cloudbeaver/core-utils';
 import { ITab, NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
@@ -22,7 +21,7 @@ import { SqlEditorTabService } from './SqlEditorTabService';
 enum SQLEditorNavigationAction {
   create,
   select,
-  close
+  close,
 }
 
 export interface SQLEditorActionContext {
@@ -61,12 +60,9 @@ export class SqlEditorNavigatorService {
     private readonly sqlResultTabsService: SqlResultTabsService,
     private readonly connectionInfoResource: ConnectionInfoResource,
     navigationService: NavigationService,
-    private readonly sqlDataSourceService: SqlDataSourceService
+    private readonly sqlDataSourceService: SqlDataSourceService,
   ) {
-    this.navigator = new Executor<SQLCreateAction | SQLEditorAction>(
-      null,
-      (active, current) => active.type === current.type
-    )
+    this.navigator = new Executor<SQLCreateAction | SQLEditorAction>(null, (active, current) => active.type === current.type)
       .before(navigationService.navigationTask)
       .addHandler(this.navigateHandler.bind(this));
   }
@@ -94,10 +90,7 @@ export class SqlEditorNavigatorService {
     });
   }
 
-  private async navigateHandler(
-    data: SQLCreateAction | SQLEditorAction,
-    contexts: IExecutionContextProvider<SQLCreateAction | SQLEditorAction>
-  ) {
+  private async navigateHandler(data: SQLCreateAction | SQLEditorAction, contexts: IExecutionContextProvider<SQLCreateAction | SQLEditorAction>) {
     try {
       const tabInfo = contexts.getContext(this.navigationTabsService.navigationTabContext);
 
@@ -105,19 +98,21 @@ export class SqlEditorNavigatorService {
 
       if (data.type === SQLEditorNavigationAction.create) {
         if (data.source === SQL_EDITOR_SOURCE_ACTION) {
-          tab = this.navigationTabsService.findTab(isSQLEditorTab(tab => {
-            const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
+          tab = this.navigationTabsService.findTab(
+            isSQLEditorTab(tab => {
+              const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
-            return (
-              tab.handlerState.source === SQL_EDITOR_SOURCE_ACTION
-              && dataSource?.executionContext !== undefined
-              && data.connectionKey !== undefined
-              && this.connectionInfoResource.isKeyEqual(createConnectionParam(
-                dataSource.executionContext.projectId,
-                dataSource.executionContext.connectionId
-              ), data.connectionKey)
-            );
-          }));
+              return (
+                tab.handlerState.source === SQL_EDITOR_SOURCE_ACTION &&
+                dataSource?.executionContext !== undefined &&
+                data.connectionKey !== undefined &&
+                this.connectionInfoResource.isKeyEqual(
+                  createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId),
+                  data.connectionKey,
+                )
+              );
+            }),
+          );
         }
 
         if (!tab) {
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorPanel.tsx b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorPanel.tsx
index 94d0229ac0..9f8e5727cd 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorPanel.tsx
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorPanel.tsx
@@ -5,7 +5,6 @@
  * 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 { DATA_CONTEXT_TAB_ID, useTab } from '@cloudbeaver/core-ui';
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx
index cb53c44d41..b95dbef689 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
@@ -13,16 +12,14 @@ import styled from 'reshadow';
 import { useStyles } from '@cloudbeaver/core-blocks';
 import { Connection, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
-import { TabIcon, Tab, TabTitle, ITabData } from '@cloudbeaver/core-ui';
+import { ITabData, Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 import { CaptureViewContext, useDataContext } from '@cloudbeaver/core-view';
 import type { TabHandlerTabComponent } from '@cloudbeaver/plugin-navigation-tabs';
 import { DATA_CONTEXT_SQL_EDITOR_STATE, getSqlEditorName, ISqlEditorTabState, SqlDataSourceService } from '@cloudbeaver/plugin-sql-editor';
 
 import { DATA_CONTEXT_SQL_EDITOR_TAB } from './DATA_CONTEXT_SQL_EDITOR_TAB';
 
-export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer(function SqlEditorTab({
-  tab, onSelect, onClose, style,
-}) {
+export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer(function SqlEditorTab({ tab, onSelect, onClose, style }) {
   const viewContext = useContext(CaptureViewContext);
   const tabMenuContext = useDataContext(viewContext);
 
@@ -49,16 +46,9 @@ export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer
   const handleClose = onClose ? ({ tabId }: ITabData<any>) => onClose(tabId) : undefined;
 
   return styled(useStyles(style))(
-    <Tab
-      tabId={tab.id}
-      style={style}
-      title={name}
-      menuContext={tabMenuContext}
-      onOpen={handleSelect}
-      onClose={handleClose}
-    >
+    <Tab tabId={tab.id} style={style} title={name} menuContext={tabMenuContext} onOpen={handleSelect} onClose={handleClose}>
       <TabIcon icon={icon} />
       <TabTitle>{name}</TabTitle>
-    </Tab>
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
index 5c4fbc3de5..dbb49d713b 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable, untracked } from 'mobx';
 
 import {
@@ -30,12 +29,19 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { Executor, ExecutorInterrupter, IExecutionContextProvider } from '@cloudbeaver/core-executor';
-import { objectNavNodeProvider, NodeManagerUtils, NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
+import { NavNodeInfoResource, NodeManagerUtils, objectNavNodeProvider } from '@cloudbeaver/core-navigation-tree';
 import { projectProvider, projectSetter, projectSetterState } from '@cloudbeaver/core-projects';
 import { NavNodeInfoFragment, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
-import { NavigationTabsService, TabHandler, ITab, ITabOptions } from '@cloudbeaver/plugin-navigation-tabs';
-import { SqlResultTabsService, ISqlEditorTabState, SqlEditorService, SqlDataSourceService, ESqlDataSourceFeatures, ISQLDatasourceUpdateData } from '@cloudbeaver/plugin-sql-editor';
+import { ITab, ITabOptions, NavigationTabsService, TabHandler } from '@cloudbeaver/plugin-navigation-tabs';
+import {
+  ESqlDataSourceFeatures,
+  ISQLDatasourceUpdateData,
+  ISqlEditorTabState,
+  SqlDataSourceService,
+  SqlEditorService,
+  SqlResultTabsService,
+} from '@cloudbeaver/plugin-sql-editor';
 
 import { isSQLEditorTab } from './isSQLEditorTab';
 import { SqlEditorPanel } from './SqlEditorPanel';
@@ -69,8 +75,7 @@ export class SqlEditorTabService extends Bootstrap {
 
     this.onCanClose = new Executor();
 
-    this.tabHandler = this.navigationTabsService
-      .registerTabHandler<ISqlEditorTabState>({
+    this.tabHandler = this.navigationTabsService.registerTabHandler<ISqlEditorTabState>({
       key: sqlEditorTabHandlerKey,
       getTabComponent: () => SqlEditorTab,
       getPanelComponent: () => SqlEditorPanel,
@@ -108,24 +113,12 @@ export class SqlEditorTabService extends Bootstrap {
     this.connectionExecutionContextResource.onItemDelete.addHandler(this.handleExecutionContextDelete.bind(this));
   }
 
-  load(): void { }
-
-  createNewEditor(
-    editorId: string,
-    dataSourceKey: string,
-    name?: string,
-    source?: string,
-    script?: string,
-  ): ITabOptions<ISqlEditorTabState> | null {
+  load(): void {}
 
+  createNewEditor(editorId: string, dataSourceKey: string, name?: string, source?: string, script?: string): ITabOptions<ISqlEditorTabState> | null {
     const order = this.getFreeEditorId();
 
-    const handlerState = this.sqlEditorService.getState(
-      editorId,
-      dataSourceKey,
-      order,
-      source,
-    );
+    const handlerState = this.sqlEditorService.getState(editorId, dataSourceKey, order, source);
 
     const datasource = this.sqlDataSourceService.create(handlerState, dataSourceKey, { name, script });
 
@@ -157,17 +150,14 @@ export class SqlEditorTabService extends Bootstrap {
         const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
         return !!dataSource?.executionContext;
-      })
+      }),
     );
 
     for (const tab of tabs) {
       const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
       if (dataSource?.executionContext) {
-        const contextConnection = createConnectionParam(
-          dataSource.executionContext.projectId,
-          dataSource.executionContext.connectionId
-        );
+        const contextConnection = createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
 
         if (this.connectionInfoResource.isIntersect(key, contextConnection)) {
           this.resetConnectionInfo(tab);
@@ -196,19 +186,13 @@ export class SqlEditorTabService extends Bootstrap {
     let schema: NavNodeInfoFragment | undefined;
 
     if (defaultCatalog) {
-      catalogData = this.containerResource.getCatalogData(
-        connectionKey,
-        defaultCatalog
-      );
+      catalogData = this.containerResource.getCatalogData(connectionKey, defaultCatalog);
 
       if (catalogData && defaultSchema) {
         schema = catalogData.schemaList.find(schema => schema.name === defaultSchema);
       }
     } else if (defaultSchema) {
-      schema = this.containerResource.getSchema(
-        connectionKey,
-        defaultSchema
-      );
+      schema = this.containerResource.getSchema(connectionKey, defaultSchema);
     }
 
     let nodeId = schema?.id ?? catalogData?.catalog.id;
@@ -232,11 +216,8 @@ export class SqlEditorTabService extends Bootstrap {
       isSQLEditorTab(tab => {
         const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
-        return (
-          !!dataSource?.executionContext
-          && ResourceKeyUtils.isIntersect(key, dataSource.executionContext.id)
-        );
-      })
+        return !!dataSource?.executionContext && ResourceKeyUtils.isIntersect(key, dataSource.executionContext.id);
+      }),
     );
 
     for (const tab of tabs) {
@@ -245,10 +226,7 @@ export class SqlEditorTabService extends Bootstrap {
 
       if (!executionContext?.context) {
         if (dataSource.executionContext) {
-          const contextConnection = createConnectionParam(
-            dataSource.executionContext.projectId,
-            dataSource.executionContext.connectionId
-          );
+          const contextConnection = createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
 
           if (!this.connectionInfoResource.has(contextConnection)) {
             this.resetConnectionInfo(tab);
@@ -267,22 +245,16 @@ export class SqlEditorTabService extends Bootstrap {
         const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
         return !!dataSource?.executionContext;
-      })
+      }),
     );
 
     for (const tab of tabs) {
       const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId)!;
 
       if (dataSource.executionContext) {
-        const contextConnection = createConnectionParam(
-          dataSource.executionContext.projectId,
-          dataSource.executionContext.connectionId
-        );
+        const contextConnection = createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
 
-        if (
-          ResourceKeyUtils.isIntersect(key, dataSource.executionContext!.id)
-          && !this.connectionInfoResource.has(contextConnection)
-        ) {
+        if (ResourceKeyUtils.isIntersect(key, dataSource.executionContext!.id) && !this.connectionInfoResource.has(contextConnection)) {
           this.resetConnectionInfo(tab);
         }
       }
@@ -296,35 +268,29 @@ export class SqlEditorTabService extends Bootstrap {
 
   private async handleTabRestore(tab: ITab<ISqlEditorTabState>): Promise<boolean> {
     if (
-      typeof tab.handlerState.editorId !== 'string'
-      || typeof tab.handlerState.editorId !== 'string'
-      || typeof tab.handlerState.order !== 'number'
-      || !['string', 'undefined'].includes(typeof tab.handlerState.currentTabId)
-      || !['string', 'undefined'].includes(typeof tab.handlerState.source)
-      || !['string', 'undefined'].includes(typeof tab.handlerState.currentModeId)
-      || !Array.isArray(tab.handlerState.modeState)
-      || !Array.isArray(tab.handlerState.tabs)
-      || !Array.isArray(tab.handlerState.executionPlanTabs)
-      || !Array.isArray(tab.handlerState.resultGroups)
-      || !Array.isArray(tab.handlerState.resultTabs)
-      || !Array.isArray(tab.handlerState.statisticsTabs)
+      typeof tab.handlerState.editorId !== 'string' ||
+      typeof tab.handlerState.editorId !== 'string' ||
+      typeof tab.handlerState.order !== 'number' ||
+      !['string', 'undefined'].includes(typeof tab.handlerState.currentTabId) ||
+      !['string', 'undefined'].includes(typeof tab.handlerState.source) ||
+      !['string', 'undefined'].includes(typeof tab.handlerState.currentModeId) ||
+      !Array.isArray(tab.handlerState.modeState) ||
+      !Array.isArray(tab.handlerState.tabs) ||
+      !Array.isArray(tab.handlerState.executionPlanTabs) ||
+      !Array.isArray(tab.handlerState.resultGroups) ||
+      !Array.isArray(tab.handlerState.resultTabs) ||
+      !Array.isArray(tab.handlerState.statisticsTabs)
     ) {
       await this.sqlDataSourceService.destroy(tab.handlerState.editorId);
       return false;
     }
 
-    const dataSource = this.sqlDataSourceService.create(
-      tab.handlerState,
-      tab.handlerState.datasourceKey
-    );
+    const dataSource = this.sqlDataSourceService.create(tab.handlerState, tab.handlerState.datasourceKey);
 
     if (dataSource.executionContext) {
       await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
 
-      const contextConnection = createConnectionParam(
-        dataSource.executionContext.projectId,
-        dataSource.executionContext.connectionId
-      );
+      const contextConnection = createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
 
       if (!this.connectionInfoResource.has(contextConnection)) {
         this.resetConnectionInfo(tab);
@@ -361,10 +327,7 @@ export class SqlEditorTabService extends Bootstrap {
       return undefined;
     }
 
-    return createConnectionParam(
-      dataSource.executionContext.projectId,
-      dataSource.executionContext.connectionId
-    );
+    return createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
   }
 
   private getObjectCatalogId(tab: ITab<ISqlEditorTabState>) {
@@ -388,12 +351,7 @@ export class SqlEditorTabService extends Bootstrap {
     return true;
   }
 
-  async setConnectionId(
-    tab: ITab<ISqlEditorTabState>,
-    connectionKey: IConnectionInfoParams,
-    catalogId?: string,
-    schemaId?: string
-  ) {
+  async setConnectionId(tab: ITab<ISqlEditorTabState>, connectionKey: IConnectionInfoParams, catalogId?: string, schemaId?: string) {
     const state = await this.sqlEditorService.setConnection(tab.handlerState, connectionKey, catalogId, schemaId);
 
     if (state) {
@@ -417,10 +375,7 @@ export class SqlEditorTabService extends Bootstrap {
     }
 
     try {
-      const context = await executionContext.update(
-        containerId,
-        dataSource.executionContext.defaultSchema,
-      );
+      const context = await executionContext.update(containerId, dataSource.executionContext.defaultSchema);
 
       dataSource.setExecutionContext({ ...context });
       return true;
@@ -444,10 +399,7 @@ export class SqlEditorTabService extends Bootstrap {
     }
 
     try {
-      const context = await executionContext.update(
-        dataSource.executionContext.defaultCatalog,
-        containerId
-      );
+      const context = await executionContext.update(dataSource.executionContext.defaultCatalog, containerId);
 
       dataSource.setExecutionContext({ ...context });
       return true;
@@ -465,10 +417,7 @@ export class SqlEditorTabService extends Bootstrap {
     }
   }
 
-  private async disconnectHandler(
-    data: IConnectionExecutorData,
-    contexts: IExecutionContextProvider<IConnectionExecutorData>
-  ) {
+  private async disconnectHandler(data: IConnectionExecutorData, contexts: IExecutionContextProvider<IConnectionExecutorData>) {
     const connectionsKey = resourceKeyList(data.connections);
     if (data.state === 'before') {
       for (const tab of this.sqlEditorTabs) {
@@ -478,10 +427,7 @@ export class SqlEditorTabService extends Bootstrap {
           continue;
         }
 
-        const connectionKey = createConnectionParam(
-          dataSource.executionContext.projectId,
-          dataSource.executionContext.connectionId
-        );
+        const connectionKey = createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId);
 
         if (!this.connectionInfoResource.isIntersect(connectionsKey, connectionKey)) {
           continue;
@@ -563,7 +509,5 @@ export class SqlEditorTabService extends Bootstrap {
 }
 
 function findMinimalFree(array: number[], base: number): number {
-  return array
-    .sort((a, b) => b - a)
-    .reduceRight((prev, cur) => (prev === cur ? prev + 1 : prev), base);
+  return array.sort((a, b) => b - a).reduceRight((prev, cur) => (prev === cur ? prev + 1 : prev), base);
 }
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/isSQLEditorTab.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/isSQLEditorTab.ts
index 99a056b7c6..51e08eb76f 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/isSQLEditorTab.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/isSQLEditorTab.ts
@@ -5,19 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ITab } from '@cloudbeaver/plugin-navigation-tabs';
 import type { ISqlEditorTabState } from '@cloudbeaver/plugin-sql-editor';
 
 import { sqlEditorTabHandlerKey } from './sqlEditorTabHandlerKey';
 
 export function isSQLEditorTab(tab: ITab): tab is ITab<ISqlEditorTabState>;
-export function isSQLEditorTab(
-  predicate: (tab: ITab<ISqlEditorTabState>) => boolean
-): (tab: ITab) => tab is ITab<ISqlEditorTabState>;
-export function isSQLEditorTab(
-  tab: ITab | ((tab: ITab<ISqlEditorTabState>) => boolean)
-): boolean | ((tab: ITab) => tab is ITab<ISqlEditorTabState>) {
+export function isSQLEditorTab(predicate: (tab: ITab<ISqlEditorTabState>) => boolean): (tab: ITab) => tab is ITab<ISqlEditorTabState>;
+export function isSQLEditorTab(tab: ITab | ((tab: ITab<ISqlEditorTabState>) => boolean)): boolean | ((tab: ITab) => tab is ITab<ISqlEditorTabState>) {
   if (typeof tab === 'function') {
     const predicate = tab;
     return (tab: ITab): tab is ITab<ISqlEditorTabState> => {
@@ -29,4 +24,4 @@ export function isSQLEditorTab(
     };
   }
   return tab.handlerId === sqlEditorTabHandlerKey;
-}
\ 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 0d7bf7658c..c4ad28c772 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -18,10 +17,5 @@ export const sqlEditorTabPluginManifest: PluginManifest = {
     name: 'Sql Editor Navigation Tab Plugin',
   },
 
-  providers: [
-    SqlEditorBootstrap,
-    SqlEditorTabService,
-    SqlEditorNavigatorService,
-    LocaleService,
-  ],
+  providers: [SqlEditorBootstrap, SqlEditorTabService, SqlEditorNavigatorService, LocaleService],
 };
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/sessionActionOpenSQLEditor.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/sessionActionOpenSQLEditor.ts
index 5f2db93038..1bb4f01c7d 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/sessionActionOpenSQLEditor.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/sessionActionOpenSQLEditor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISessionAction } from '@cloudbeaver/core-root';
 
 import { SESSION_ACTION_OPEN_SQL_EDITOR } from './SESSION_ACTION_OPEN_SQL_EDITOR';
@@ -19,4 +18,4 @@ export interface ISessionActionOpenSQLEditor {
 
 export function isSessionActionOpenSQLEditor(action: ISessionAction | null): action is ISessionActionOpenSQLEditor {
   return action?.action === SESSION_ACTION_OPEN_SQL_EDITOR;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/PluginBootstrap.ts b/webapp/packages/plugin-sql-editor-new/src/PluginBootstrap.ts
index 089ae33369..82f5329d89 100644
--- a/webapp/packages/plugin-sql-editor-new/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/PluginBootstrap.ts
@@ -5,16 +5,13 @@
  * 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 { SQLCodeEditorPanelService } from './SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly sqlCodeEditorPanelService: SQLCodeEditorPanelService
-  ) {
+  constructor(private readonly sqlCodeEditorPanelService: SQLCodeEditorPanelService) {
     super();
   }
 
@@ -22,5 +19,5 @@ export class PluginBootstrap extends Bootstrap {
     this.sqlCodeEditorPanelService.registerPanel();
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/ACTIVE_QUERY_EXTENSION.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/ACTIVE_QUERY_EXTENSION.ts
index 0b47a5b5f8..9535cdc160 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/ACTIVE_QUERY_EXTENSION.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/ACTIVE_QUERY_EXTENSION.ts
@@ -5,9 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { StateEffect, Decoration, StateField, EditorView, DecorationSet } from '@cloudbeaver/plugin-codemirror6';
-
+import { Decoration, DecorationSet, EditorView, StateEffect, StateField } from '@cloudbeaver/plugin-codemirror6';
 
 const ACTIVE_QUERY_EFFECT_ADD = StateEffect.define<{ from: number; to: number | undefined }>({
   map: (val, mapping) => ({
@@ -58,4 +56,4 @@ export function clearActiveQueryHighlight(view: EditorView) {
   view.dispatch({
     effects: ACTIVE_QUERY_EFFECT_CLEAR.of(null),
   });
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/QUERY_STATUS_GUTTER_EXTENSION.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/QUERY_STATUS_GUTTER_EXTENSION.ts
index f66437a9c6..72e0962f46 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/QUERY_STATUS_GUTTER_EXTENSION.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/QUERY_STATUS_GUTTER_EXTENSION.ts
@@ -5,28 +5,27 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { GutterMarker, StateEffect, StateField, RangeSet, type EditorView, gutter } from '@cloudbeaver/plugin-codemirror6';
+import { type EditorView, gutter, GutterMarker, RangeSet, StateEffect, StateField } from '@cloudbeaver/plugin-codemirror6';
 
 type QueryGutterEffectType = 'run' | 'error';
 
-const QUERY_STATUS_SIZE_MARKER = new class extends GutterMarker { };
+const QUERY_STATUS_SIZE_MARKER = new (class extends GutterMarker {})();
 
-const RUN_QUERY_MARKER = new class extends GutterMarker {
+const RUN_QUERY_MARKER = new (class extends GutterMarker {
   toDOM(): Node {
     const span = document.createElement('div');
     span.className = 'running-query-line';
     return span;
   }
-};
+})();
 
-const ERROR_QUERY_MARKER = new class extends GutterMarker {
+const ERROR_QUERY_MARKER = new (class extends GutterMarker {
   toDOM(): Node {
     const span = document.createElement('div');
     span.className = 'running-query-error-line';
     return span;
   }
-};
+})();
 
 const QUERY_GUTTER_EFFECT = StateEffect.define<{ pos: number; on: boolean; type: QueryGutterEffectType }>({
   map: (val, mapping) => ({ pos: mapping.mapPos(val.pos), on: val.on, type: val.type }),
@@ -75,4 +74,4 @@ export const QUERY_STATUS_GUTTER_EXTENSION = [
     markers: view => view.state.field(gutterExtension),
     initialSpacer: () => QUERY_STATUS_SIZE_MARKER,
   }),
-];
\ No newline at end of file
+];
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditor.tsx b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditor.tsx
index 7d7dc97292..d8597e2bff 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditor.tsx
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditor.tsx
@@ -5,12 +5,13 @@
  * 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 { forwardRef } from 'react';
 
 import { EditorLoader, IDefaultExtensions, IEditorProps, IEditorRef } from '@cloudbeaver/plugin-codemirror6';
 
-export const SQLCodeEditor = observer<IEditorProps & IDefaultExtensions, IEditorRef>(forwardRef(function SQLCodeEditor(props, ref) {
-  return <EditorLoader {...props} ref={ref} />;
-}));
\ No newline at end of file
+export const SQLCodeEditor = observer<IEditorProps & IDefaultExtensions, IEditorRef>(
+  forwardRef(function SQLCodeEditor(props, ref) {
+    return <EditorLoader {...props} ref={ref} />;
+  }),
+);
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditorLoader.tsx b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditorLoader.tsx
index d47a991539..70eb823a4c 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditorLoader.tsx
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/SQLCodeEditorLoader.tsx
@@ -5,7 +5,6 @@
  * 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 { forwardRef } from 'react';
 
@@ -17,10 +16,8 @@ const loader = createComplexLoader(async function loader() {
   return { SQLCodeEditor };
 });
 
-export const SQLCodeEditorLoader = observer<IEditorProps & IDefaultExtensions, IEditorRef>(forwardRef(function SQLCodeEditorLoader(props, ref) {
-  return (
-    <ComplexLoader loader={loader}>
-      {({ SQLCodeEditor }) => <SQLCodeEditor {...props} ref={ref} />}
-    </ComplexLoader>
-  );
-}));
+export const SQLCodeEditorLoader = observer<IEditorProps & IDefaultExtensions, IEditorRef>(
+  forwardRef(function SQLCodeEditorLoader(props, ref) {
+    return <ComplexLoader loader={loader}>{({ SQLCodeEditor }) => <SQLCodeEditor {...props} ref={ref} />}</ComplexLoader>;
+  }),
+);
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/useSQLCodeEditor.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/useSQLCodeEditor.ts
index 68719cd5cb..d0d4647b25 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/useSQLCodeEditor.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditor/useSQLCodeEditor.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useObservableRef } from '@cloudbeaver/core-blocks';
 import type { EditorState, EditorView, IEditorRef } from '@cloudbeaver/plugin-codemirror6';
 
@@ -23,47 +22,51 @@ export interface IEditor {
 }
 
 export function useSQLCodeEditor(editorRef: IEditorRef | null) {
-  const state: IEditor = useObservableRef(() => ({
-    get view() {
-      return this.editorRef?.view ?? null;
-    },
-    get state() {
-      return this.editorRef?.view?.state ?? null;
-    },
-    highlightActiveQuery(from: number, to?: number) {
-      if (!this.view) {
-        return;
-      }
+  const state: IEditor = useObservableRef(
+    () => ({
+      get view() {
+        return this.editorRef?.view ?? null;
+      },
+      get state() {
+        return this.editorRef?.view?.state ?? null;
+      },
+      highlightActiveQuery(from: number, to?: number) {
+        if (!this.view) {
+          return;
+        }
 
-      // If the 'to' parameter is provided, ensure it doesn't exceed the document length
-      if (to && to > this.view.state.doc.length) {
-        return;
-      }
+        // If the 'to' parameter is provided, ensure it doesn't exceed the document length
+        if (to && to > this.view.state.doc.length) {
+          return;
+        }
 
-      highlightActiveQuery(this.view, from, to);
-    },
-    clearActiveQueryHighlight() {
-      if (this.view) {
-        clearActiveQueryHighlight(this.view);
-      }
-    },
-    highlightExecutingLine(line: number, state: boolean) {
-      if (this.view) {
-        setGutter(this.view, line, 'run', state);
-      }
-    },
-    highlightExecutingErrorLine(line: number, state: boolean) {
-      if (this.view) {
-        setGutter(this.view, line, 'error', state);
-      }
-    },
-    resetLineStateHighlight() {
-      if (this.view) {
-        setGutter(this.view, 0, 'run', false);
-        setGutter(this.view, 0, 'error', false);
-      }
-    },
-  }), {}, { editorRef });
+        highlightActiveQuery(this.view, from, to);
+      },
+      clearActiveQueryHighlight() {
+        if (this.view) {
+          clearActiveQueryHighlight(this.view);
+        }
+      },
+      highlightExecutingLine(line: number, state: boolean) {
+        if (this.view) {
+          setGutter(this.view, line, 'run', state);
+        }
+      },
+      highlightExecutingErrorLine(line: number, state: boolean) {
+        if (this.view) {
+          setGutter(this.view, line, 'error', state);
+        }
+      },
+      resetLineStateHighlight() {
+        if (this.view) {
+          setGutter(this.view, 0, 'run', false);
+          setGutter(this.view, 0, 'error', false);
+        }
+      },
+    }),
+    {},
+    { editorRef },
+  );
 
   return state;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanel.tsx b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanel.tsx
index 36b788db88..0f290bdc88 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanel.tsx
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanel.tsx
@@ -5,7 +5,6 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -15,7 +14,7 @@ import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { DATA_CONTEXT_NAV_NODE, getNodesFromContext, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { TabContainerPanelComponent, useDNDBox } from '@cloudbeaver/core-ui';
-import { IEditorRef, closeCompletion } from '@cloudbeaver/plugin-codemirror6';
+import { closeCompletion, IEditorRef } from '@cloudbeaver/plugin-codemirror6';
 import type { ISqlEditorModeProps } from '@cloudbeaver/plugin-sql-editor';
 
 import { ACTIVE_QUERY_EXTENSION } from '../ACTIVE_QUERY_EXTENSION';
@@ -34,9 +33,7 @@ const styles = css`
   }
 `;
 
-export const SQLCodeEditorPanel: TabContainerPanelComponent<ISqlEditorModeProps> = observer(function SQLCodeEditorPanel({
-  data,
-}) {
+export const SQLCodeEditorPanel: TabContainerPanelComponent<ISqlEditorModeProps> = observer(function SQLCodeEditorPanel({ data }) {
   const notificationService = useService(NotificationService);
   const navNodeManagerService = useService(NavNodeManagerService);
 
@@ -57,21 +54,26 @@ export const SQLCodeEditorPanel: TabContainerPanelComponent<ISqlEditorModeProps>
         try {
           const pos = view.posAtCoords({ x: mouse.x, y: mouse.y }) ?? 1;
 
-          await data.executeQueryAction(data.cursorSegment, async () => {
-            const alias: string[] = [];
+          await data.executeQueryAction(
+            data.cursorSegment,
+            async () => {
+              const alias: string[] = [];
 
-            for (const node of nodes) {
-              alias.push(await navNodeManagerService.getNodeDatabaseAlias(node.id));
-            }
+              for (const node of nodes) {
+                alias.push(await navNodeManagerService.getNodeDatabaseAlias(node.id));
+              }
 
-            const replacement = alias.join(', ');
-            if (replacement) {
-              view.dispatch({
-                changes: { from: pos, to: pos, insert: replacement },
-                selection: { anchor: pos, head: pos + replacement.length },
-              });
-            }
-          }, true, true);
+              const replacement = alias.join(', ');
+              if (replacement) {
+                view.dispatch({
+                  changes: { from: pos, to: pos, insert: replacement },
+                  selection: { anchor: pos, head: pos + replacement.length },
+                });
+              }
+            },
+            true,
+            true,
+          );
         } catch (exception: any) {
           notificationService.logException(exception, 'sql_editor_alias_loading_error');
         }
@@ -81,11 +83,13 @@ export const SQLCodeEditorPanel: TabContainerPanelComponent<ISqlEditorModeProps>
 
   useExecutor({
     executor: data.onExecute,
-    handlers: [function updateHighlight() {
-      if (editor.view) {
-        closeCompletion(editor.view);
-      }
-    }],
+    handlers: [
+      function updateHighlight() {
+        if (editor.view) {
+          closeCompletion(editor.view);
+        }
+      },
+    ],
   });
 
   return styled(useStyles(styles))(
@@ -100,6 +104,6 @@ export const SQLCodeEditorPanel: TabContainerPanelComponent<ISqlEditorModeProps>
         onChange={panel.onQueryChange}
         onUpdate={panel.onUpdate}
       />
-    </box>
+    </box>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService.ts
index c3be116d58..2cee115fa3 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import React from 'react';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -18,9 +17,7 @@ const SQLCodeEditorPanel = React.lazy(async () => {
 
 @injectable()
 export class SQLCodeEditorPanelService {
-  constructor(
-    private readonly sqlEditorModeService: SqlEditorModeService,
-  ) { }
+  constructor(private readonly sqlEditorModeService: SqlEditorModeService) {}
 
   registerPanel(): void | Promise<void> {
     this.sqlEditorModeService.tabsContainer.add({
@@ -31,4 +28,4 @@ export class SQLCodeEditorPanelService {
       panel: () => SQLCodeEditorPanel,
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
index d6b366558f..c36ac3943d 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/SQLCodeEditorPanel/useSQLCodeEditorPanel.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback } from 'react';
 
 import { useExecutor, useObservableRef } from '@cloudbeaver/core-blocks';
 import { throttle } from '@cloudbeaver/core-utils';
-import type { ViewUpdate, Transaction } from '@cloudbeaver/plugin-codemirror6';
+import type { Transaction, ViewUpdate } from '@cloudbeaver/plugin-codemirror6';
 import type { ISQLEditorData } from '@cloudbeaver/plugin-sql-editor';
 
 import type { IEditor } from '../SQLCodeEditor/useSQLCodeEditor';
@@ -22,35 +21,41 @@ interface State {
 }
 
 export function useSQLCodeEditorPanel(data: ISQLEditorData, editor: IEditor) {
+  const state: State = useObservableRef(
+    () => ({
+      highlightActiveQuery() {
+        this.editor.clearActiveQueryHighlight();
 
-  const state: State = useObservableRef(() => ({
-    highlightActiveQuery() {
-      this.editor.clearActiveQueryHighlight();
+        const segment = this.data.activeSegment;
 
-      const segment = this.data.activeSegment;
+        if (segment) {
+          this.editor.highlightActiveQuery(segment.begin, segment.end);
+        }
+      },
+      onQueryChange(query: string) {
+        this.data.setQuery(query);
+      },
+      onUpdate(update: ViewUpdate) {
+        const transactions = update.transactions.filter(t => t.selection !== undefined);
+        const lastTransaction = transactions[transactions.length - 1] as Transaction | undefined;
 
-      if (segment) {
-        this.editor.highlightActiveQuery(segment.begin, segment.end);
-      }
-    },
-    onQueryChange(query: string) {
-      this.data.setQuery(query);
-    },
-    onUpdate(update: ViewUpdate) {
-      const transactions = update.transactions.filter(t => t.selection !== undefined);
-      const lastTransaction = transactions[transactions.length - 1] as Transaction | undefined;
+        if (lastTransaction) {
+          const from = lastTransaction.selection?.main.from ?? update.state.selection.main.from;
+          const to = lastTransaction.selection?.main.to ?? update.state.selection.main.to;
 
-      if (lastTransaction) {
-        const from = lastTransaction.selection?.main.from ?? update.state.selection.main.from;
-        const to = lastTransaction.selection?.main.to ?? update.state.selection.main.to;
+          this.data.setCursor(from, to);
+        }
+      },
+    }),
+    {},
+    { editor, data },
+    ['onQueryChange', 'onUpdate'],
+  );
 
-        this.data.setCursor(from, to);
-      }
-    },
-
-  }), {}, { editor, data }, ['onQueryChange', 'onUpdate']);
-
-  const updateHighlight = useCallback(throttle(() => state.highlightActiveQuery(), 1000), [state]);
+  const updateHighlight = useCallback(
+    throttle(() => state.highlightActiveQuery(), 1000),
+    [state],
+  );
 
   useExecutor({
     executor: data.onUpdate,
@@ -59,21 +64,25 @@ export function useSQLCodeEditorPanel(data: ISQLEditorData, editor: IEditor) {
 
   useExecutor({
     executor: data.onExecute,
-    handlers: [function updateHighlight() {
-      editor.resetLineStateHighlight();
-    }],
+    handlers: [
+      function updateHighlight() {
+        editor.resetLineStateHighlight();
+      },
+    ],
   });
 
   useExecutor({
     executor: data.onSegmentExecute,
-    handlers: [function highlightSegment(data) {
-      editor.highlightExecutingLine(data.segment.begin, data.type === 'start');
+    handlers: [
+      function highlightSegment(data) {
+        editor.highlightExecutingLine(data.segment.begin, data.type === 'start');
 
-      if (data.type === 'error') {
-        editor.highlightExecutingErrorLine(data.segment.begin, true);
-      }
-    }],
+        if (data.type === 'error') {
+          editor.highlightExecutingErrorLine(data.segment.begin, true);
+        }
+      },
+    ],
   });
 
   return state;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
index 3b0b820335..c264d8ee63 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 
 import { createComplexLoader, useComplexLoader, useObjectRef } from '@cloudbeaver/core-blocks';
@@ -32,23 +31,21 @@ export function useSqlDialectAutocompletion(data: ISQLEditorData): Extension[] {
   const [config] = useState<CompletionConfig>(() => {
     function getOptionsFromProposals(explicit: boolean, word: string, proposals: SQLProposal[]): SqlCompletion[] {
       const wordLowerCase = word.toLocaleLowerCase();
-      const hasSameName = proposals.some(
-        ({ displayString }) => displayString.toLocaleLowerCase() === wordLowerCase
-      );
-      const filteredProposals = proposals.filter(({ displayString }) => (
-        word === '*'
-      || (
-        displayString.toLocaleLowerCase() !== wordLowerCase
-        && displayString.toLocaleLowerCase().startsWith(wordLowerCase)
-      )
-      ))
+      const hasSameName = proposals.some(({ displayString }) => displayString.toLocaleLowerCase() === wordLowerCase);
+      const filteredProposals = proposals
+        .filter(
+          ({ displayString }) =>
+            word === '*' || (displayString.toLocaleLowerCase() !== wordLowerCase && displayString.toLocaleLowerCase().startsWith(wordLowerCase)),
+        )
         .sort((a, b) => (b.score ?? 0) - (a.score ?? 0));
 
       if (filteredProposals.length === 0 && !hasSameName && explicit) {
-        return [{
-          apply: closeCompletion,
-          label: localizationService.translate('sql_editor_hint_empty'),
-        }];
+        return [
+          {
+            apply: closeCompletion,
+            label: localizationService.translate('sql_editor_hint_empty'),
+          },
+        ];
       }
 
       return [
@@ -123,23 +120,25 @@ export function useSqlDialectAutocompletion(data: ISQLEditorData): Extension[] {
 
     return {
       override: [completionSource],
-      addToOptions: [{
-        render(completion: SqlCompletion) {
-          const icon = document.createElement('img');
-          icon.classList.add('cm-completionIcon');
-          icon.setAttribute('aria-hidden', 'true');
+      addToOptions: [
+        {
+          render(completion: SqlCompletion) {
+            const icon = document.createElement('img');
+            icon.classList.add('cm-completionIcon');
+            icon.setAttribute('aria-hidden', 'true');
 
-          if (completion.icon) {
-            icon.setAttribute('src', GlobalConstants.absoluteUrl(completion.icon));
-          }
+            if (completion.icon) {
+              icon.setAttribute('src', GlobalConstants.absoluteUrl(completion.icon));
+            }
 
-          return icon;
+            return icon;
+          },
+          position: 20,
         },
-        position: 20,
-      }],
+      ],
       icons: false, // disable native symbol based icons
     };
   });
 
   return useEditorAutocompletion(config);
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectExtension.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectExtension.ts
index c95ce07699..fcecb082ab 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectExtension.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectExtension.ts
@@ -5,12 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useMemo } from 'react';
 
-import { type IComplexLoaderData, createComplexLoader, useComplexLoader } from '@cloudbeaver/core-blocks';
+import { createComplexLoader, type IComplexLoaderData, useComplexLoader } from '@cloudbeaver/core-blocks';
 import type { SqlDialectInfo } from '@cloudbeaver/core-sdk';
-import { CassandraLoader, type Extension, MSSQLLoader, MariaSQLLoader, MySQLLoader, PLSQLLoader, PostgreSQLLoader, SQLDialect, SQLiteLoader, StandardSQLLoader } from '@cloudbeaver/plugin-codemirror6';
+import {
+  CassandraLoader,
+  type Extension,
+  MariaSQLLoader,
+  MSSQLLoader,
+  MySQLLoader,
+  PLSQLLoader,
+  PostgreSQLLoader,
+  SQLDialect,
+  SQLiteLoader,
+  StandardSQLLoader,
+} from '@cloudbeaver/plugin-codemirror6';
 
 const codemirrorComplexLoader = createComplexLoader(() => import('@cloudbeaver/plugin-codemirror6'));
 
@@ -41,16 +51,23 @@ export function useSqlDialectExtension(dialectInfo: SqlDialectInfo | undefined):
   }, [dialect, dialectInfo]);
 }
 
-
 function getDialectLoader(name?: string): IComplexLoaderData<SQLDialect> {
   switch (name) {
-    case 'PostgreSQL': return PostgreSQLLoader;
-    case 'MySQL': return MySQLLoader;
-    case 'MariaSQL': return MariaSQLLoader;
-    case 'SQLServer': return MSSQLLoader;
-    case 'SQLite': return SQLiteLoader;
-    case 'CQL': return CassandraLoader;
-    case 'PLSQL': return PLSQLLoader;
-    default: return StandardSQLLoader;
+    case 'PostgreSQL':
+      return PostgreSQLLoader;
+    case 'MySQL':
+      return MySQLLoader;
+    case 'MariaSQL':
+      return MariaSQLLoader;
+    case 'SQLServer':
+      return MSSQLLoader;
+    case 'SQLite':
+      return SQLiteLoader;
+    case 'CQL':
+      return CassandraLoader;
+    case 'PLSQL':
+      return PLSQLLoader;
+    default:
+      return StandardSQLLoader;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor-new/src/index.ts b/webapp/packages/plugin-sql-editor-new/src/index.ts
index 2136420a29..1871f16af4 100644
--- a/webapp/packages/plugin-sql-editor-new/src/index.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/index.ts
@@ -4,4 +4,4 @@ export default sqlEditorNewPlugin;
 
 export * from './SQLEditor/SQLCodeEditor/SQLCodeEditorLoader';
 export * from './SQLEditor/useSqlDialectAutocompletion';
-export * from './SQLEditor/useSqlDialectExtension';
\ No newline at end of file
+export * from './SQLEditor/useSqlDialectExtension';
diff --git a/webapp/packages/plugin-sql-editor-new/src/manifest.ts b/webapp/packages/plugin-sql-editor-new/src/manifest.ts
index 68722c878f..09ca65a455 100644
--- a/webapp/packages/plugin-sql-editor-new/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
@@ -16,8 +15,5 @@ export const sqlEditorNewPlugin: PluginManifest = {
     name: 'Sql Editor New Plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    SQLCodeEditorPanelService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, SQLCodeEditorPanelService],
+};
diff --git a/webapp/packages/plugin-sql-editor-screen/src/LocaleService.ts b/webapp/packages/plugin-sql-editor-screen/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/LocaleService.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-sql-editor-screen/src/PluginBootstrap.ts b/webapp/packages/plugin-sql-editor-screen/src/PluginBootstrap.ts
index 9e2bdc45fc..f1cd55b62e 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/PluginBootstrap.ts
@@ -5,11 +5,19 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { MENU_TAB } from '@cloudbeaver/core-ui';
-import { ActionService, ACTION_OPEN_IN_TAB, DATA_CONTEXT_MENU, IDataContextProvider, KeyBindingService, KEY_BINDING_OPEN_IN_TAB, MenuService, IAction } from '@cloudbeaver/core-view';
+import {
+  ACTION_OPEN_IN_TAB,
+  ActionService,
+  DATA_CONTEXT_MENU,
+  IAction,
+  IDataContextProvider,
+  KEY_BINDING_OPEN_IN_TAB,
+  KeyBindingService,
+  MenuService,
+} from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_SQL_EDITOR_STATE, SqlDataSourceService } from '@cloudbeaver/plugin-sql-editor';
 import { DATA_CONTEXT_SQL_EDITOR_TAB } from '@cloudbeaver/plugin-sql-editor-navigation-tab';
 
@@ -23,7 +31,7 @@ export class PluginBootstrap extends Bootstrap {
     private readonly sqlEditorScreenService: SqlEditorScreenService,
     private readonly notificationService: NotificationService,
     private readonly menuService: MenuService,
-    private readonly sqlDataSourceService: SqlDataSourceService
+    private readonly sqlDataSourceService: SqlDataSourceService,
   ) {
     super();
   }
@@ -31,10 +39,7 @@ export class PluginBootstrap extends Bootstrap {
   register(): void | Promise<void> {
     this.actionService.addHandler({
       id: 'sql-editor-screen',
-      isActionApplicable: (contexts, action) => (
-        action === ACTION_OPEN_IN_TAB
-        && contexts.has(DATA_CONTEXT_SQL_EDITOR_STATE)
-      ),
+      isActionApplicable: (contexts, action) => action === ACTION_OPEN_IN_TAB && contexts.has(DATA_CONTEXT_SQL_EDITOR_STATE),
       isDisabled: (context, action) => {
         const state = context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE);
 
@@ -56,15 +61,11 @@ export class PluginBootstrap extends Bootstrap {
     });
 
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE) !== undefined
-        && context.has(DATA_CONTEXT_SQL_EDITOR_TAB)
-        && context.get(DATA_CONTEXT_MENU) === MENU_TAB
-      ),
-      getItems: (context, items) => [
-        ACTION_OPEN_IN_TAB,
-        ...items,
-      ],
+      isApplicable: context =>
+        context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE) !== undefined &&
+        context.has(DATA_CONTEXT_SQL_EDITOR_TAB) &&
+        context.get(DATA_CONTEXT_MENU) === MENU_TAB,
+      getItems: (context, items) => [ACTION_OPEN_IN_TAB, ...items],
     });
   }
 
@@ -87,6 +88,5 @@ export class PluginBootstrap extends Bootstrap {
     window.open(url, '_blank')?.focus();
   }
 
-
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 }
diff --git a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreen.tsx b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreen.tsx
index 6952a5c19b..1a2d23e90a 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreen.tsx
+++ b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreen.tsx
@@ -5,12 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 
-import { Loader, TextPlaceholder, useResource, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks';
-import { ConnectionExecutionContextResource, ConnectionExecutionContextService, IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
+import { Loader, TextPlaceholder, useObservableRef, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  ConnectionExecutionContextResource,
+  ConnectionExecutionContextService,
+  IConnectionExecutionContextInfo,
+} from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import type { ScreenComponent } from '@cloudbeaver/core-routing';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
@@ -19,48 +22,39 @@ import { ISqlEditorTabState, MemorySqlDataSource, SqlDataSourceService, SqlEdito
 
 import type { ISqlEditorScreenParams } from './ISqlEditorScreenParams';
 
-export const SqlEditorScreen: ScreenComponent<ISqlEditorScreenParams> = observer(function SqlEditorScreen({
-  contextId,
-}) {
+export const SqlEditorScreen: ScreenComponent<ISqlEditorScreenParams> = observer(function SqlEditorScreen({ contextId }) {
   const translate = useTranslate();
-  const connectionExecutionContextResource = useResource(
-    SqlEditorScreen,
-    ConnectionExecutionContextResource,
-    CachedMapAllKey
-  );
+  const connectionExecutionContextResource = useResource(SqlEditorScreen, ConnectionExecutionContextResource, CachedMapAllKey);
   const sqlDataSourceService = useService(SqlDataSourceService);
   const sqlEditorService = useService(SqlEditorService);
   const connectionExecutionContextService = useService(ConnectionExecutionContextService);
   const context = connectionExecutionContextService.get(contextId);
 
-  const state = useObservableRef(() => ({
-    get dataSource() {
-      if (!this.state) {
-        return undefined;
-      }
+  const state = useObservableRef(
+    () => ({
+      get dataSource() {
+        if (!this.state) {
+          return undefined;
+        }
 
-      return sqlDataSourceService.get(this.state.editorId);
-    },
-    state: null as null | ISqlEditorTabState,
-    setState(contextInfo: IConnectionExecutionContextInfo | undefined) {
-      if (contextInfo) {
-        const editorId = uuid();
+        return sqlDataSourceService.get(this.state.editorId);
+      },
+      state: null as null | ISqlEditorTabState,
+      setState(contextInfo: IConnectionExecutionContextInfo | undefined) {
+        if (contextInfo) {
+          const editorId = uuid();
 
+          this.state = sqlEditorService.getState(editorId, MemorySqlDataSource.key, 0, undefined);
 
-        this.state = sqlEditorService.getState(
-          editorId,
-          MemorySqlDataSource.key,
-          0,
-          undefined,
-        );
-
-        sqlDataSourceService.create(this.state, MemorySqlDataSource.key, { script: '', executionContext:contextInfo });
-
-      } else {
-        this.state = null;
-      }
-    },
-  }), { state: observable }, false);
+          sqlDataSourceService.create(this.state, MemorySqlDataSource.key, { script: '', executionContext: contextInfo });
+        } else {
+          this.state = null;
+        }
+      },
+    }),
+    { state: observable },
+    false,
+  );
 
   if (context?.context?.id !== state.dataSource?.executionContext?.id) {
     state.setState(context?.context);
@@ -68,9 +62,7 @@ export const SqlEditorScreen: ScreenComponent<ISqlEditorScreenParams> = observer
 
   return (
     <Loader state={[connectionExecutionContextResource]}>
-      {state.state
-        ? <SqlEditor state={state.state} />
-        : <TextPlaceholder>{translate('sql_editor_screen_context_not_found')}</TextPlaceholder>}
+      {state.state ? <SqlEditor state={state.state} /> : <TextPlaceholder>{translate('sql_editor_screen_context_not_found')}</TextPlaceholder>}
     </Loader>
   );
 });
diff --git a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenBootstrap.ts b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenBootstrap.ts
index fc166678e5..910e650d4c 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenBootstrap.ts
@@ -5,18 +5,14 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ScreenService } from '@cloudbeaver/core-routing';
 
 import { SqlEditorScreenService } from './SqlEditorScreenService';
 
 @injectable()
 export class SqlEditorScreenBootstrap extends Bootstrap {
-  constructor(
-    private readonly screenService: ScreenService,
-    private readonly sqlEditorScreenService: SqlEditorScreenService
-  ) {
+  constructor(private readonly screenService: ScreenService, private readonly sqlEditorScreenService: SqlEditorScreenService) {
     super();
   }
 
@@ -24,5 +20,5 @@ export class SqlEditorScreenBootstrap extends Bootstrap {
     this.screenService.create(this.sqlEditorScreenService.screen);
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenService.ts b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenService.ts
index 3debd072a1..97094b706a 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenService.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/Screen/SqlEditorScreenService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { IScreen, ScreenService } from '@cloudbeaver/core-routing';
 
@@ -15,14 +14,10 @@ import { SqlEditorScreen } from './SqlEditorScreen';
 @injectable()
 export class SqlEditorScreenService {
   readonly screen: IScreen<ISqlEditorScreenParams>;
-  constructor(
-    private readonly screenService: ScreenService
-  ) {
+  constructor(private readonly screenService: ScreenService) {
     this.screen = {
       name: 'sql-editor',
-      routes: [
-        { name: 'sql-editor', path: '/sql-editor/:contextId' },
-      ],
+      routes: [{ name: 'sql-editor', path: '/sql-editor/:contextId' }],
       component: SqlEditorScreen,
     };
   }
diff --git a/webapp/packages/plugin-sql-editor-screen/src/locales/zh.ts b/webapp/packages/plugin-sql-editor-screen/src/locales/zh.ts
index ca1096c7b1..aa8339f3aa 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/locales/zh.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/locales/zh.ts
@@ -1,5 +1,5 @@
 export default [
-    ['sql_editor_screen_no_context_title', '在新标签页中打开时出错'],
-    ['sql_editor_screen_no_context_message', '请选择当前SQL编辑器的连接'],
-    ['sql_editor_screen_context_not_found', '未找到上下文'],
-  ];
+  ['sql_editor_screen_no_context_title', '在新标签页中打开时出错'],
+  ['sql_editor_screen_no_context_message', '请选择当前SQL编辑器的连接'],
+  ['sql_editor_screen_context_not_found', '未找到上下文'],
+];
diff --git a/webapp/packages/plugin-sql-editor-screen/src/manifest.ts b/webapp/packages/plugin-sql-editor-screen/src/manifest.ts
index 35b79440f2..99aa9385ec 100644
--- a/webapp/packages/plugin-sql-editor-screen/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor-screen/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -18,10 +17,5 @@ export const sqlEditorPagePluginManifest: PluginManifest = {
     name: 'Sql Editor Page plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-    SqlEditorScreenBootstrap,
-    SqlEditorScreenService,
-  ],
+  providers: [PluginBootstrap, LocaleService, SqlEditorScreenBootstrap, SqlEditorScreenService],
 };
diff --git a/webapp/packages/plugin-sql-editor/src/DATA_CONTEXT_SQL_EDITOR_STATE.ts b/webapp/packages/plugin-sql-editor/src/DATA_CONTEXT_SQL_EDITOR_STATE.ts
index 609dcd457c..0800d9032b 100644
--- a/webapp/packages/plugin-sql-editor/src/DATA_CONTEXT_SQL_EDITOR_STATE.ts
+++ b/webapp/packages/plugin-sql-editor/src/DATA_CONTEXT_SQL_EDITOR_STATE.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { ISqlEditorTabState } from './ISqlEditorTabState';
diff --git a/webapp/packages/plugin-sql-editor/src/LocaleService.ts b/webapp/packages/plugin-sql-editor/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-sql-editor/src/LocaleService.ts
+++ b/webapp/packages/plugin-sql-editor/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts b/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
index 709673a3ff..2652018a18 100644
--- a/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
@@ -5,9 +5,17 @@
  * 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 { ActionService, KeyBindingService, IAction, IDataContextProvider, ACTION_UNDO, ACTION_REDO, KEY_BINDING_UNDO, KEY_BINDING_REDO } from '@cloudbeaver/core-view';
+import {
+  ACTION_REDO,
+  ACTION_UNDO,
+  ActionService,
+  IAction,
+  IDataContextProvider,
+  KEY_BINDING_REDO,
+  KEY_BINDING_UNDO,
+  KeyBindingService,
+} from '@cloudbeaver/core-view';
 
 import { ACTION_SQL_EDITOR_EXECUTE } from './actions/ACTION_SQL_EDITOR_EXECUTE';
 import { ACTION_SQL_EDITOR_EXECUTE_NEW } from './actions/ACTION_SQL_EDITOR_EXECUTE_NEW';
@@ -24,10 +32,7 @@ import { DATA_CONTEXT_SQL_EDITOR_DATA } from './SqlEditor/DATA_CONTEXT_SQL_EDITO
 
 @injectable()
 export class MenuBootstrap extends Bootstrap {
-  constructor(
-    private readonly actionService: ActionService,
-    private readonly keyBindingService: KeyBindingService,
-  ) {
+  constructor(private readonly actionService: ActionService, private readonly keyBindingService: KeyBindingService) {
     super();
   }
 
@@ -41,47 +46,38 @@ export class MenuBootstrap extends Bootstrap {
           return false;
         }
 
-        if (
-          sqlEditorData.readonly
-          && [ACTION_SQL_EDITOR_FORMAT, ACTION_REDO, ACTION_UNDO].includes(action)
-        ) {
+        if (sqlEditorData.readonly && [ACTION_SQL_EDITOR_FORMAT, ACTION_REDO, ACTION_UNDO].includes(action)) {
           return false;
         }
 
         if (
-          !sqlEditorData.dataSource?.hasFeature(ESqlDataSourceFeatures.executable)
-          && [
-            ACTION_SQL_EDITOR_EXECUTE,
-            ACTION_SQL_EDITOR_EXECUTE_NEW,
-            ACTION_SQL_EDITOR_EXECUTE_SCRIPT,
-            ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN,
-          ].includes(action)
-        ) {
-          return false;
-        }
-
-        if (
-          !sqlEditorData.dataSource?.hasFeature(ESqlDataSourceFeatures.query)
-          && [
-            ACTION_SQL_EDITOR_EXECUTE,
-            ACTION_SQL_EDITOR_EXECUTE_NEW,
-            ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN,
-          ].includes(action)
-        ) {
-          return false;
-        }
-
-        return (
+          !sqlEditorData.dataSource?.hasFeature(ESqlDataSourceFeatures.executable) &&
           [
             ACTION_SQL_EDITOR_EXECUTE,
             ACTION_SQL_EDITOR_EXECUTE_NEW,
             ACTION_SQL_EDITOR_EXECUTE_SCRIPT,
-            ACTION_SQL_EDITOR_FORMAT,
-            ACTION_REDO,
-            ACTION_UNDO,
             ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN,
           ].includes(action)
-        );
+        ) {
+          return false;
+        }
+
+        if (
+          !sqlEditorData.dataSource?.hasFeature(ESqlDataSourceFeatures.query) &&
+          [ACTION_SQL_EDITOR_EXECUTE, ACTION_SQL_EDITOR_EXECUTE_NEW, ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN].includes(action)
+        ) {
+          return false;
+        }
+
+        return [
+          ACTION_SQL_EDITOR_EXECUTE,
+          ACTION_SQL_EDITOR_EXECUTE_NEW,
+          ACTION_SQL_EDITOR_EXECUTE_SCRIPT,
+          ACTION_SQL_EDITOR_FORMAT,
+          ACTION_REDO,
+          ACTION_UNDO,
+          ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN,
+        ].includes(action);
       },
       isDisabled: (context, action) => !context.has(DATA_CONTEXT_SQL_EDITOR_DATA),
       handler: this.sqlEditorActionHandler.bind(this),
@@ -106,10 +102,7 @@ export class MenuBootstrap extends Bootstrap {
       binding: KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT,
       isBindingApplicable: (contexts, action) => {
         const sqlEditorData = contexts.tryGet(DATA_CONTEXT_SQL_EDITOR_DATA);
-        return (
-          action === ACTION_SQL_EDITOR_EXECUTE_SCRIPT
-          && sqlEditorData?.dataSource?.hasFeature(ESqlDataSourceFeatures.executable) === true
-        );
+        return action === ACTION_SQL_EDITOR_EXECUTE_SCRIPT && sqlEditorData?.dataSource?.hasFeature(ESqlDataSourceFeatures.executable) === true;
       },
       handler: this.sqlEditorActionHandler.bind(this),
     });
@@ -190,5 +183,5 @@ export class MenuBootstrap extends Bootstrap {
     }
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index af58c1f5b3..7d01d02ffb 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -5,14 +5,27 @@
  * 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 { makeObservable, observable } from 'mobx';
 
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
 import type { IServiceInjector } from '@cloudbeaver/core-di';
 import type { ITask } from '@cloudbeaver/core-executor';
-import { AsyncTaskInfoService, GraphQLService, ResultDataFormat, SqlExecuteInfo, SqlQueryResults, UpdateResultsDataBatchMutationVariables } from '@cloudbeaver/core-sdk';
-import { DatabaseDataSource, DocumentEditAction, IDatabaseDataOptions, IDatabaseResultSet, IRequestInfo, ResultSetEditAction } from '@cloudbeaver/plugin-data-viewer';
+import {
+  AsyncTaskInfoService,
+  GraphQLService,
+  ResultDataFormat,
+  SqlExecuteInfo,
+  SqlQueryResults,
+  UpdateResultsDataBatchMutationVariables,
+} from '@cloudbeaver/core-sdk';
+import {
+  DatabaseDataSource,
+  DocumentEditAction,
+  IDatabaseDataOptions,
+  IDatabaseResultSet,
+  IRequestInfo,
+  ResultSetEditAction,
+} from '@cloudbeaver/plugin-data-viewer';
 
 export interface IDataQueryOptions extends IDatabaseDataOptions {
   query: string;
@@ -22,8 +35,7 @@ export interface IQueryRequestInfo extends IRequestInfo {
   query: string;
 }
 
-export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOptions>
-  extends DatabaseDataSource<TOptions, IDatabaseResultSet> {
+export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOptions> extends DatabaseDataSource<TOptions, IDatabaseResultSet> {
   currentTask: ITask<SqlExecuteInfo> | null;
   requestInfo: IQueryRequestInfo;
 
@@ -66,10 +78,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
   }
 
   isDisabled(resultIndex: number): boolean {
-    return (
-      (!this.getResult(resultIndex)?.data && this.error === null)
-      || !this.executionContext?.context
-    );
+    return (!this.getResult(resultIndex)?.data && this.error === null) || !this.executionContext?.context;
   }
 
   async cancel(): Promise<void> {
@@ -78,9 +87,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     }
   }
 
-  async save(
-    prevResults: IDatabaseResultSet[]
-  ): Promise<IDatabaseResultSet[]> {
+  async save(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
     if (!this.options || !this.executionContext?.context) {
       return prevResults;
     }
@@ -118,8 +125,9 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
         };
 
         if (editor) {
-          const responseResult = this.transformResults(executionContextInfo, response.result.results, 0)
-            .find(newResult => newResult.id === result.id);
+          const responseResult = this.transformResults(executionContextInfo, response.result.results, 0).find(
+            newResult => newResult.id === result.id,
+          );
 
           if (responseResult) {
             editor.applyUpdate(responseResult);
@@ -139,11 +147,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     return this;
   }
 
-  getResults(
-    executionContextInfo: IConnectionExecutionContextInfo,
-    response: SqlExecuteInfo,
-    limit: number
-  ): IDatabaseResultSet[] | null {
+  getResults(executionContextInfo: IConnectionExecutionContextInfo, response: SqlExecuteInfo, limit: number): IDatabaseResultSet[] | null {
     this.requestInfo = {
       originalQuery: response.fullQuery || this.options?.query || '',
       requestDuration: response.duration || 0,
@@ -160,9 +164,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     return this.transformResults(executionContextInfo, response.results, limit);
   }
 
-  async request(
-    prevResults: IDatabaseResultSet[]
-  ): Promise<IDatabaseResultSet[]> {
+  async request(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
     const options = this.options;
     const executionContext = this.executionContext;
     const executionContextInfo = this.executionContext?.context;
@@ -175,11 +177,11 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     let firstResultId: string | undefined;
 
     if (
-      prevResults.length === 1
-      && prevResults[0].contextId === executionContext.context!.id
-      && prevResults[0].connectionId === executionContext.context?.connectionId
-      && prevResults[0].id !== null
-      && this.requestInfo.query === this.options?.query
+      prevResults.length === 1 &&
+      prevResults[0].contextId === executionContext.context!.id &&
+      prevResults[0].connectionId === executionContext.context?.connectionId &&
+      prevResults[0].id !== null &&
+      this.requestInfo.query === this.options?.query
     ) {
       firstResultId = prevResults[0].id;
     }
@@ -210,7 +212,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
         return result;
       },
       () => this.asyncTaskInfoService.cancel(task.id),
-      () => this.asyncTaskInfoService.remove(task.id)
+      () => this.asyncTaskInfoService.remove(task.id),
     );
 
     try {
@@ -253,11 +255,7 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     }
   }
 
-  private transformResults(
-    executionContextInfo: IConnectionExecutionContextInfo,
-    results: SqlQueryResults[],
-    limit: number
-  ): IDatabaseResultSet[] {
+  private transformResults(executionContextInfo: IConnectionExecutionContextInfo, results: SqlQueryResults[], limit: number): IDatabaseResultSet[] {
     return results.map<IDatabaseResultSet>(result => ({
       id: result.resultSet?.id || null,
       uniqueResultId: `${executionContextInfo.connectionId}_${executionContextInfo.id}_${result.resultSet?.id || '0'}`,
diff --git a/webapp/packages/plugin-sql-editor/src/SQLParser.ts b/webapp/packages/plugin-sql-editor/src/SQLParser.ts
index 91843d133e..d663bad93c 100644
--- a/webapp/packages/plugin-sql-editor/src/SQLParser.ts
+++ b/webapp/packages/plugin-sql-editor/src/SQLParser.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable } from 'mobx';
 
 export interface IQueryInfo {
@@ -29,7 +28,6 @@ export interface ISQLScriptLine {
 }
 
 export class SQLParser {
-
   get scripts(): ISQLScriptSegment[] {
     this.update();
     return this._scripts;
@@ -98,9 +96,7 @@ export class SQLParser {
       return script;
     }
 
-    const closestScripts = this._scripts.filter(
-      script => script.begin <= position
-    );
+    const closestScripts = this._scripts.filter(script => script.begin <= position);
 
     if (closestScripts.length > 0) {
       return closestScripts[closestScripts.length - 1];
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/BaseSqlDataSource.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/BaseSqlDataSource.ts
index 3e805dbb90..946ba9600c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/BaseSqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/BaseSqlDataSource.ts
@@ -5,7 +5,6 @@
  * 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 type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -132,11 +131,7 @@ export abstract class BaseSqlDataSource implements ISqlDataSource {
   }
 
   isLoaded(): boolean {
-    if (
-      Array.isArray(this.exception)
-        ? this.exception.some(Boolean)
-        : !!this.exception
-    ) {
+    if (Array.isArray(this.exception) ? this.exception.some(Boolean) : !!this.exception) {
       return false;
     }
 
@@ -155,10 +150,10 @@ export abstract class BaseSqlDataSource implements ISqlDataSource {
     this.onUpdate.execute();
   }
 
-  save(): Promise<void> | void { }
-  load(): Promise<void> | void { }
+  save(): Promise<void> | void {}
+  load(): Promise<void> | void {}
   reset(): Promise<void> | void {
     this.saved = true;
   }
-  dispose(): void | Promise<void> { }
-}
\ No newline at end of file
+  dispose(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/ESqlDataSourceFeatures.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/ESqlDataSourceFeatures.ts
index 55e5342464..8b3494c13f 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/ESqlDataSourceFeatures.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/ESqlDataSourceFeatures.ts
@@ -11,5 +11,5 @@ export enum ESqlDataSourceFeatures {
   query,
   executable,
   setName,
-  setProject
-}
\ No newline at end of file
+  setProject,
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/ISqlDataSource.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/ISqlDataSource.ts
index 34b2299ee1..1493282663 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/ISqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/ISqlDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
 import type { ILoadableState } from '@cloudbeaver/core-utils';
@@ -57,4 +56,4 @@ export interface ISqlDataSource extends ILoadableState {
   load(): Promise<void> | void;
   reset(): Promise<void> | void;
   dispose(): Promise<void> | void;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/ILocalStorageSqlDataSourceState.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/ILocalStorageSqlDataSourceState.ts
index afd1a4d4c8..84ff895a82 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/ILocalStorageSqlDataSourceState.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/ILocalStorageSqlDataSourceState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
 
 import type { ISqlDataSourceHistoryState } from '../SqlDataSourceHistory/ISqlDataSourceHistoryState';
@@ -15,4 +14,4 @@ export interface ILocalStorageSqlDataSourceState {
   name?: string;
   executionContext?: IConnectionExecutionContextInfo;
   history: ISqlDataSourceHistoryState;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSource.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSource.ts
index ee47d5884e..0fe9d82ba9 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -30,12 +29,7 @@ export class LocalStorageSqlDataSource extends BaseSqlDataSource {
   }
 
   get features(): ESqlDataSourceFeatures[] {
-    return [
-      ESqlDataSourceFeatures.script,
-      ESqlDataSourceFeatures.query,
-      ESqlDataSourceFeatures.executable,
-      ESqlDataSourceFeatures.setName,
-    ];
+    return [ESqlDataSourceFeatures.script, ESqlDataSourceFeatures.query, ESqlDataSourceFeatures.executable, ESqlDataSourceFeatures.setName];
   }
 
   private state!: ILocalStorageSqlDataSourceState;
@@ -83,4 +77,4 @@ export class LocalStorageSqlDataSource extends BaseSqlDataSource {
     this.outdated = false;
     this.history.restore(state.history);
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSourceBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSourceBootstrap.ts
index 5ee6484952..9e4133cb09 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSourceBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/LocalStorage/LocalStorageSqlDataSourceBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
@@ -23,10 +22,7 @@ const localStorageKey = 'local-storage-sql-data-source';
 export class LocalStorageSqlDataSourceBootstrap extends Bootstrap {
   private readonly dataSourceStateState = new Map<string, ILocalStorageSqlDataSourceState>();
 
-  constructor(
-    private readonly sqlDataSourceService: SqlDataSourceService,
-    localStorageSaveService: LocalStorageSaveService,
-  ) {
+  constructor(private readonly sqlDataSourceService: SqlDataSourceService, localStorageSaveService: LocalStorageSaveService) {
     super();
     this.dataSourceStateState = new Map();
 
@@ -43,14 +39,14 @@ export class LocalStorageSqlDataSourceBootstrap extends Bootstrap {
         try {
           for (const [key, value] of Array.from(map.entries())) {
             if (
-              typeof value.script !== 'string'
-            || !['string', 'undefined', 'object'].includes(typeof value.name)
-            || !['undefined', 'object'].includes(typeof value.executionContext)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.connectionId)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.id)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultCatalog)
-            || !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultSchema)
-            || !validateSqlDataSourceHistoryState(value.history)
+              typeof value.script !== 'string' ||
+              !['string', 'undefined', 'object'].includes(typeof value.name) ||
+              !['undefined', 'object'].includes(typeof value.executionContext) ||
+              !['string', 'undefined', 'object'].includes(typeof value.executionContext?.connectionId) ||
+              !['string', 'undefined', 'object'].includes(typeof value.executionContext?.id) ||
+              !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultCatalog) ||
+              !['string', 'undefined', 'object'].includes(typeof value.executionContext?.defaultSchema) ||
+              !validateSqlDataSourceHistoryState(value.history)
             ) {
               map.delete(key);
             }
@@ -62,27 +58,21 @@ export class LocalStorageSqlDataSourceBootstrap extends Bootstrap {
         return map;
       },
       this.bindState.bind(this), // we use indexed db, so we don't need to bind state on load
-      'indexed'
+      'indexed',
     );
   }
 
   register(): void | Promise<void> {
     this.sqlDataSourceService.register({
       key: LocalStorageSqlDataSource.key,
-      getDataSource: (editorId, options) => new LocalStorageSqlDataSource(this.createState(
-        editorId,
-        options
-      )),
+      getDataSource: (editorId, options) => new LocalStorageSqlDataSource(this.createState(editorId, options)),
       onDestroy: (_, editorId) => this.deleteState(editorId),
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
-  private createState(
-    editorId: string,
-    options?: ISqlDataSourceOptions
-  ): ILocalStorageSqlDataSourceState {
+  private createState(editorId: string, options?: ISqlDataSourceOptions): ILocalStorageSqlDataSourceState {
     let state = this.dataSourceStateState.get(editorId);
 
     if (!state) {
@@ -110,4 +100,4 @@ export class LocalStorageSqlDataSourceBootstrap extends Bootstrap {
   private deleteState(editorId: string): void {
     this.dataSourceStateState.delete(editorId);
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/MemorySqlDataSource.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/MemorySqlDataSource.ts
index 54985bb179..97fadfdd64 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/MemorySqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/MemorySqlDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -29,23 +28,14 @@ export class MemorySqlDataSource extends BaseSqlDataSource {
   }
 
   get features(): ESqlDataSourceFeatures[] {
-    return [
-      ESqlDataSourceFeatures.script,
-      ESqlDataSourceFeatures.query,
-      ESqlDataSourceFeatures.executable,
-      ESqlDataSourceFeatures.setName,
-    ];
+    return [ESqlDataSourceFeatures.script, ESqlDataSourceFeatures.query, ESqlDataSourceFeatures.executable, ESqlDataSourceFeatures.setName];
   }
 
   private _name: string | null;
   private _script: string;
   private _executionContext?: IConnectionExecutionContextInfo;
 
-  constructor(
-    name: string | null = null,
-    script = '',
-    executionContext?: IConnectionExecutionContextInfo
-  ) {
+  constructor(name: string | null = null, script = '', executionContext?: IConnectionExecutionContextInfo) {
     super();
     this._name = name;
     this._script = script;
@@ -86,4 +76,4 @@ export class MemorySqlDataSource extends BaseSqlDataSource {
   canRename(name: string | null): boolean {
     return true;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistory.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistory.ts
index 36e236e8a1..f33fdbfb84 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistory.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistory.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
 
 import type { ISqlDataSourceHistoryState } from './ISqlDataSourceHistoryState';
@@ -18,4 +17,4 @@ export interface ISqlDataSourceHistory {
   redo(): void;
   restore(data: ISqlDataSourceHistoryState): void;
   clear(): void;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryData.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryData.ts
index 00bdc74131..e642695892 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryData.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryData.ts
@@ -9,4 +9,4 @@
 export interface ISqlDataSourceHistoryData {
   value: string;
   source?: string;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryState.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryState.ts
index 5d0fbfa8e1..ac09be987b 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryState.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/ISqlDataSourceHistoryState.ts
@@ -5,10 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISqlDataSourceHistoryData } from './ISqlDataSourceHistoryData';
 
 export interface ISqlDataSourceHistoryState {
   history: ISqlDataSourceHistoryData[];
   historyIndex: number;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/SqlDataSourceHistory.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/SqlDataSourceHistory.ts
index d5b8577be0..b57f742d93 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/SqlDataSourceHistory.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/SqlDataSourceHistory.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { makeAutoObservable } from 'mobx';
 
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -78,4 +77,4 @@ export class SqlDataSourceHistory implements ISqlDataSourceHistory {
   clear(): void {
     this.state = createSqlDataSourceHistoryInitialState();
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/createSqlDataSourceHistoryInitialState.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/createSqlDataSourceHistoryInitialState.ts
index f835981d5f..0ccc1f575c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/createSqlDataSourceHistoryInitialState.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/createSqlDataSourceHistoryInitialState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISqlDataSourceHistoryState } from './ISqlDataSourceHistoryState';
 
 export function createSqlDataSourceHistoryInitialState(value = ''): ISqlDataSourceHistoryState {
@@ -13,4 +12,4 @@ export function createSqlDataSourceHistoryInitialState(value = ''): ISqlDataSour
     history: [{ value, source: 'initial' }],
     historyIndex: 0,
   };
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryData.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryData.ts
index 7f22600b19..139ba24aac 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryData.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryData.ts
@@ -5,17 +5,13 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISqlDataSourceHistoryData } from './ISqlDataSourceHistoryData';
 
 export function validateSqlDataSourceHistoryData(data: any): data is ISqlDataSourceHistoryData {
   return (
-    Array.isArray(data)
-    && data.every(item => (
-      typeof item === 'object'
-      && item !== null
-      && typeof item.value === 'string'
-      && ['string', 'undefined'].includes(typeof item.source)
-    ))
+    Array.isArray(data) &&
+    data.every(
+      item => typeof item === 'object' && item !== null && typeof item.value === 'string' && ['string', 'undefined'].includes(typeof item.source),
+    )
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryState.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryState.ts
index 9b084c63c3..b4500192b3 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryState.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceHistory/validateSqlDataSourceHistoryState.ts
@@ -5,16 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISqlDataSourceHistoryState } from './ISqlDataSourceHistoryState';
 import { validateSqlDataSourceHistoryData } from './validateSqlDataSourceHistoryData';
 
 export function validateSqlDataSourceHistoryState(state: any): state is ISqlDataSourceHistoryState {
   return (
-    typeof state === 'object'
-    && validateSqlDataSourceHistoryData(state.history)
-    && typeof state.historyIndex === 'number'
-    && state.historyIndex >= 0
-    && state.historyIndex <= state.history.length
+    typeof state === 'object' &&
+    validateSqlDataSourceHistoryData(state.history) &&
+    typeof state.historyIndex === 'number' &&
+    state.historyIndex >= 0 &&
+    state.historyIndex <= state.history.length
   );
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceService.ts b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceService.ts
index 8a6b92b91a..b1aa9db07c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDataSource/SqlDataSourceService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, makeObservable, observable } from 'mobx';
 
 import type { IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -22,10 +21,7 @@ export interface ISqlDataSourceOptions {
   executionContext?: IConnectionExecutionContextInfo;
 }
 
-type ISqlDataSourceFactory = (
-  editorId: string,
-  options?: ISqlDataSourceOptions
-) => ISqlDataSource;
+type ISqlDataSourceFactory = (editorId: string, options?: ISqlDataSourceOptions) => ISqlDataSource;
 
 interface ISqlDataSourceFabric {
   key: string;
@@ -49,8 +45,7 @@ export interface ISQLDatasourceUpdateData {
 @injectable()
 export class SqlDataSourceService {
   get dataSources(): [string, ISqlDataSource][] {
-    return Array.from(this.providers.entries())
-      .map(([editorId, provider]) => [editorId, provider.dataSource]);
+    return Array.from(this.providers.entries()).map(([editorId, provider]) => [editorId, provider.dataSource]);
   }
 
   readonly onCreate: ISyncExecutor<[string, string]>;
@@ -61,8 +56,8 @@ export class SqlDataSourceService {
   constructor() {
     this.dataSourceProviders = new Map();
     this.providers = new Map();
-    this.onCreate  = new SyncExecutor();
-    this.onUpdate  = new SyncExecutor();
+    this.onCreate = new SyncExecutor();
+    this.onUpdate = new SyncExecutor();
     this.onCreate.next<ISQLDatasourceUpdateData>(this.onUpdate, ([editorId]) => ({
       editorId,
       datasource: this.get(editorId)!,
@@ -70,11 +65,7 @@ export class SqlDataSourceService {
 
     this.register({
       key: MemorySqlDataSource.key,
-      getDataSource: (editorId, options) => new MemorySqlDataSource(
-        options?.name,
-        options?.script,
-        options?.executionContext
-      ),
+      getDataSource: (editorId, options) => new MemorySqlDataSource(options?.name, options?.script, options?.executionContext),
     });
 
     makeObservable<this, 'providers'>(this, {
@@ -89,11 +80,7 @@ export class SqlDataSourceService {
     return this.providers.get(editorId)?.dataSource;
   }
 
-  create(
-    state: ISqlEditorTabState,
-    key: string,
-    options?: ISqlDataSourceOptions
-  ): ISqlDataSource {
+  create(state: ISqlEditorTabState, key: string, options?: ISqlDataSourceOptions): ISqlDataSource {
     const editorId = state.editorId;
     const provider = this.dataSourceProviders.get(key);
 
@@ -114,8 +101,7 @@ export class SqlDataSourceService {
         isActionActive: false,
       };
 
-      activeProvider.dataSource.onUpdate
-        .next<ISQLDatasourceUpdateData>(this.onUpdate, () => ({
+      activeProvider.dataSource.onUpdate.next<ISQLDatasourceUpdateData>(this.onUpdate, () => ({
         editorId,
         datasource: activeProvider!.dataSource,
       }));
@@ -127,11 +113,7 @@ export class SqlDataSourceService {
     return activeProvider.dataSource;
   }
 
-  async executeAction<T>(
-    editorId: string,
-    action: (dataSource: ISqlDataSource) => (Promise<T> | T),
-    notFound: () => void
-  ): Promise<T | undefined> {
+  async executeAction<T>(editorId: string, action: (dataSource: ISqlDataSource) => Promise<T> | T, notFound: () => void): Promise<T | undefined> {
     const provider = this.providers.get(editorId);
 
     if (!provider) {
@@ -200,4 +182,4 @@ export class SqlDataSourceService {
     await provider.provider.onDestroy?.(provider.dataSource, editorId);
     await provider.dataSource.dispose();
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts b/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
index 335578762f..61b1690d7e 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { ConnectionDialectResource, IConnectionExecutionContextInfo, IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -13,10 +12,7 @@ import type { SqlDialectInfo } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class SqlDialectInfoService {
-  constructor(
-    private readonly connectionDialectResource: ConnectionDialectResource,
-    private readonly notificationService: NotificationService
-  ) { }
+  constructor(private readonly connectionDialectResource: ConnectionDialectResource, private readonly notificationService: NotificationService) {}
 
   async formatScript(context: IConnectionExecutionContextInfo, query: string): Promise<string> {
     try {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor.tsx
index d80fbb3147..4d00012187 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor.tsx
@@ -5,11 +5,10 @@
  * 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 { splitStyles, Split, ResizerControls, Pane, splitHorizontalStyles, useSplitUserState, Loader, useStyles } from '@cloudbeaver/core-blocks';
+import { Loader, Pane, ResizerControls, Split, splitHorizontalStyles, splitStyles, useSplitUserState, useStyles } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CaptureView } from '@cloudbeaver/core-view';
 
@@ -60,7 +59,7 @@ export const SqlEditor = observer<Props>(function SqlEditor({ state }) {
             <SqlEditorLoader state={state} />
           </Pane>
           <ResizerControls />
-          <Pane basis='50%' main>
+          <Pane basis="50%" main>
             <Loader suspense>
               <SqlResultTabs state={state} />
             </Loader>
@@ -69,6 +68,6 @@ export const SqlEditor = observer<Props>(function SqlEditor({ state }) {
         <SqlEditorOverlay state={state} />
         <SqlEditorStatusBar dataSource={dataSource} />
       </CaptureView>
-    </Loader>
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/DATA_CONTEXT_SQL_EDITOR_DATA.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/DATA_CONTEXT_SQL_EDITOR_DATA.ts
index 86c65370e7..6a017f9235 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/DATA_CONTEXT_SQL_EDITOR_DATA.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/DATA_CONTEXT_SQL_EDITOR_DATA.ts
@@ -5,10 +5,8 @@
  * 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';
 
 import type { ISQLEditorData } from './ISQLEditorData';
 
-
 export const DATA_CONTEXT_SQL_EDITOR_DATA = createDataContext<ISQLEditorData>('sql-editor-data');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
index f9e251708a..9f2e7d7ca5 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISQLEditorData.ts
@@ -5,13 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncExecutor } from '@cloudbeaver/core-executor';
 import type { SqlDialectInfo } from '@cloudbeaver/core-sdk';
 
 import type { ISqlDataSource } from '../SqlDataSource/ISqlDataSource';
 import type { SQLProposal } from '../SqlEditorService';
-import type { SQLParser, ISQLScriptSegment } from '../SQLParser';
+import type { ISQLScriptSegment, SQLParser } from '../SQLParser';
 import type { ISQLEditorMode } from './SQLEditorModeContext';
 
 export interface ISegmentExecutionData {
@@ -62,6 +61,6 @@ export interface ISQLEditorData {
     segment: ISQLScriptSegment | undefined,
     action: (query: ISQLScriptSegment) => Promise<T>,
     passEmpty?: boolean,
-    passDisabled?: boolean
+    passDisabled?: boolean,
   ): Promise<T | undefined>;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISqlEditorProps.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISqlEditorProps.ts
index 19d35f84f7..86656fe337 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/ISqlEditorProps.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/ISqlEditorProps.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISqlEditorTabState } from '../ISqlEditorTabState';
 
 export interface ISqlEditorProps {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLEditorModeContext.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLEditorModeContext.ts
index 1183ecc8d7..e0c9f25c0d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLEditorModeContext.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLEditorModeContext.ts
@@ -5,13 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ISyncContextLoader } from '@cloudbeaver/core-executor';
 
 import type { ISQLScriptSegment } from '../SQLParser';
 import type { ISQLEditorData } from './ISQLEditorData';
 
-
 export interface ISQLEditorMode {
   activeSegment: ISQLScriptSegment | undefined;
   activeSegmentMode: boolean;
@@ -22,4 +20,4 @@ export const SQLEditorModeContext: ISyncContextLoader<ISQLEditorMode, ISQLEditor
     activeSegment: data.parser.getSegment(data.cursor.begin, data.cursor.end),
     activeSegmentMode: false,
   };
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU.ts
index fd763bfeb0..26a0e33bd7 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU.ts
@@ -5,7 +5,6 @@
  * 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 SQL_EDITOR_ACTIONS_MENU = createMenu('sql-editor-actions', '');
\ No newline at end of file
+export const SQL_EDITOR_ACTIONS_MENU = createMenu('sql-editor-actions', '');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU_STYLES.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU_STYLES.ts
index 354de2db6e..1bfbbb5c0c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU_STYLES.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_ACTIONS_MENU_STYLES.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const SQL_EDITOR_ACTIONS_MENU_STYLES = css`
@@ -33,7 +32,8 @@ export const SQL_EDITOR_ACTIONS_MENU_STYLES = css`
       display: none;
     }
 
-    & IconOrImage, & StaticImage {
+    & IconOrImage,
+    & StaticImage {
       height: 16px;
       width: 16px;
       cursor: pointer;
@@ -47,8 +47,9 @@ export const SQL_EDITOR_ACTIONS_MENU_STYLES = css`
       display: none;
     }
 
-    & IconOrImage + menu-bar-item-label, & Loader + menu-bar-item-label {
-        padding-left: 8px
+    & IconOrImage + menu-bar-item-label,
+    & Loader + menu-bar-item-label {
+      padding-left: 8px;
     }
   }
 
@@ -58,8 +59,9 @@ export const SQL_EDITOR_ACTIONS_MENU_STYLES = css`
     margin: 0;
     border: 1px solid !important;
 
-    &:first-child, &:last-child {
+    &:first-child,
+    &:last-child {
       display: none;
     }
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_TOOLS_MENU.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_TOOLS_MENU.ts
index ea1763b47b..fbd19d898e 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_TOOLS_MENU.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQL_EDITOR_TOOLS_MENU.ts
@@ -5,7 +5,6 @@
  * 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 SQL_EDITOR_TOOLS_MENU = createMenu('sql-editor-tools', '');
\ No newline at end of file
+export const SQL_EDITOR_TOOLS_MENU = createMenu('sql-editor-tools', '');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/ScriptImportDialog.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/ScriptImportDialog.tsx
index 8a99923b75..f5fe94a0b4 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/ScriptImportDialog.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/ScriptImportDialog.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 import { Button, Translate } from '@cloudbeaver/core-blocks';
@@ -27,43 +26,27 @@ const style = css`
   }
 `;
 
-export const ScriptImportDialog: DialogComponent<null, boolean> = function ScriptImportDialog({
-  resolveDialog,
-  rejectDialog,
-  className,
-}) {
+export const ScriptImportDialog: DialogComponent<null, boolean> = function ScriptImportDialog({ resolveDialog, rejectDialog, className }) {
   return styled(style)(
-    <CommonDialogWrapper size='small' className={className} fixedWidth>
-      <CommonDialogHeader title='ui_changes_might_be_lost' onReject={rejectDialog} />
+    <CommonDialogWrapper size="small" className={className} fixedWidth>
+      <CommonDialogHeader title="ui_changes_might_be_lost" onReject={rejectDialog} />
       <CommonDialogBody>
-        <Translate token='sql_editor_upload_script_unsaved_changes_dialog_message' />
+        <Translate token="sql_editor_upload_script_unsaved_changes_dialog_message" />
       </CommonDialogBody>
       <CommonDialogFooter>
         <container>
-          <Button
-            type="button"
-            mod={['outlined']}
-            onClick={rejectDialog}
-          >
-            <Translate token='ui_processing_cancel' />
+          <Button type="button" mod={['outlined']} onClick={rejectDialog}>
+            <Translate token="ui_processing_cancel" />
           </Button>
           <fill />
-          <Button
-            type="button"
-            mod={['outlined']}
-            onClick={() => resolveDialog(false)}
-          >
-            <Translate token='ui_no' />
+          <Button type="button" mod={['outlined']} onClick={() => resolveDialog(false)}>
+            <Translate token="ui_no" />
           </Button>
-          <Button
-            type="button"
-            mod={['unelevated']}
-            onClick={() => resolveDialog(true)}
-          >
-            <Translate token='ui_yes' />
+          <Button type="button" mod={['unelevated']} onClick={() => resolveDialog(true)}>
+            <Translate token="ui_yes" />
           </Button>
         </container>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 };
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
index 5466b80e07..71501e398d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
@@ -5,7 +5,6 @@
  * 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 { useEffect, useMemo, useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -25,58 +24,60 @@ import { SqlEditorTools } from './SqlEditorTools';
 import { useSqlEditor } from './useSqlEditor';
 
 const styles = css`
-    button, upload {
-      composes: theme-ripple from global;
-    }
-    sql-editor {
-      position: relative;
-      z-index: 0;
-      flex: 1 auto;
-      height: 100%;
-      display: flex;
-      overflow: auto;
-    }
+  button,
+  upload {
+    composes: theme-ripple from global;
+  }
+  sql-editor {
+    position: relative;
+    z-index: 0;
+    flex: 1 auto;
+    height: 100%;
+    display: flex;
+    overflow: auto;
+  }
 
-    container {
-      composes: theme-border-color-background from global;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      overflow: auto;
-      border-right: solid 1px;
-    }
-  
-    actions {
-      width: 32px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      user-select: none;
+  container {
+    composes: theme-border-color-background from global;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow: auto;
+    border-right: solid 1px;
+  }
 
-      &:empty {
-        width: initial;
-      }
+  actions {
+    width: 32px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    user-select: none;
+
+    &:empty {
+      width: initial;
     }
-  
-    button, upload {
-      background: none;
-      padding: 0;
-      margin: 0;
-      height: 32px;
-      width: 32px;
-      cursor: pointer;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-shrink: 0;
-    }
-  
-    StaticImage {
-      height: 16px;
-      width: 16px;
-      cursor: pointer;
-    }
-  `;
+  }
+
+  button,
+  upload {
+    background: none;
+    padding: 0;
+    margin: 0;
+    height: 32px;
+    width: 32px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+  }
+
+  StaticImage {
+    height: 16px;
+    width: 16px;
+    cursor: pointer;
+  }
+`;
 
 const tabStyles = css`
   tabs {
@@ -88,7 +89,7 @@ const tabStyles = css`
     text-transform: uppercase;
     font-weight: normal;
 
-    &:global([aria-selected=true]) {
+    &:global([aria-selected='true']) {
       font-weight: normal !important;
     }
   }
@@ -136,7 +137,12 @@ export const SqlEditor = observer<ISqlEditorProps>(function SqlEditor({ state, c
   const isQuery = data.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
   const isExecutable = data.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
 
-  return styled(styles, BASE_TAB_STYLES, VERTICAL_ROTATED_TAB_STYLES, tabStyles)(
+  return styled(
+    styles,
+    BASE_TAB_STYLES,
+    VERTICAL_ROTATED_TAB_STYLES,
+    tabStyles,
+  )(
     <TabsState
       currentTabId={state.currentModeId}
       container={sqlEditorModeService.tabsContainer}
@@ -153,11 +159,7 @@ export const SqlEditor = observer<ISqlEditorProps>(function SqlEditor({ state, c
               <>
                 {isQuery && (
                   <>
-                    <button
-                      disabled={disabled}
-                      title={translate('sql_editor_sql_execution_button_tooltip')}
-                      onClick={data.executeQuery}
-                    >
+                    <button disabled={disabled} title={translate('sql_editor_sql_execution_button_tooltip')} onClick={data.executeQuery}>
                       <StaticImage icon="/icons/sql_exec.svg" />
                     </button>
                     <button
@@ -178,11 +180,7 @@ export const SqlEditor = observer<ISqlEditorProps>(function SqlEditor({ state, c
                   <StaticImage icon="/icons/sql_script_exec.svg" />
                 </button>
                 {isQuery && data.dialect?.supportsExplainExecutionPlan && (
-                  <button
-                    disabled={disabled}
-                    title={translate('sql_editor_execution_plan_button_tooltip')}
-                    onClick={data.showExecutionPlan}
-                  >
+                  <button disabled={disabled} title={translate('sql_editor_execution_plan_button_tooltip')} onClick={data.showExecutionPlan}>
                     <StaticImage icon="/icons/sql_execution_plan.svg" />
                   </button>
                 )}
@@ -199,6 +197,6 @@ export const SqlEditor = observer<ISqlEditorProps>(function SqlEditor({ state, c
           </tabs>
         ) : null}
       </sql-editor>
-    </TabsState>
+    </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorActionsMenu.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorActionsMenu.tsx
index 0b2641eb6e..019047d6d9 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorActionsMenu.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorActionsMenu.tsx
@@ -5,7 +5,6 @@
  * 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 type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -27,7 +26,5 @@ export const SqlEditorActionsMenu = observer<Props>(function SqlEditorActionsMen
   const menu = useMenu({ menu: SQL_EDITOR_ACTIONS_MENU, context });
   menu.context.set(DATA_CONTEXT_SQL_EDITOR_STATE, state);
 
-  return (
-    <MenuBar style={[SQL_EDITOR_ACTIONS_MENU_STYLES, ...[style].flat(2)]} menu={menu} />
-  );
-});
\ No newline at end of file
+  return <MenuBar style={[SQL_EDITOR_ACTIONS_MENU_STYLES, ...[style].flat(2)]} menu={menu} />;
+});
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorLoader.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorLoader.tsx
index b873ef8491..a02d88444d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorLoader.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorLoader.tsx
@@ -5,7 +5,6 @@
  * 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 { ComplexLoader, createComplexLoader } from '@cloudbeaver/core-blocks';
@@ -18,9 +17,5 @@ const loader = createComplexLoader(async function loader() {
 });
 
 export const SqlEditorLoader = observer<ISqlEditorProps>(function SqlEditorLoader(props) {
-  return (
-    <ComplexLoader loader={loader}>
-      {({ SqlEditor }) => <SqlEditor {...props} />}
-    </ComplexLoader>
-  );
+  return <ComplexLoader loader={loader}>{({ SqlEditor }) => <SqlEditor {...props} />}</ComplexLoader>;
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
index dbcf682013..f71d390db6 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -24,7 +23,7 @@ const styles = css`
     display: flex;
     flex-direction: column;
     align-items: center;
-    
+
     &:empty {
       display: none;
     }
@@ -38,12 +37,7 @@ interface Props {
   className?: string;
 }
 
-export const SqlEditorTools = observer<Props>(function SqlEditorTools({
-  data,
-  state,
-  style,
-  className,
-}) {
+export const SqlEditorTools = observer<Props>(function SqlEditorTools({ data, state, style, className }) {
   const translate = useTranslate();
   const tools = useTools(state);
   const scriptEmpty = getComputed(() => data.value.length === 0);
@@ -90,18 +84,18 @@ export const SqlEditorTools = observer<Props>(function SqlEditorTools({
             hidden={isActiveSegmentMode}
             onClick={downloadScriptHandler}
           >
-            <StaticImage icon='/icons/export.svg' />
+            <StaticImage icon="/icons/export.svg" />
           </button>
           {!isActiveSegmentMode && (
             <UploadArea
-              accept='.sql'
+              accept=".sql"
               title={translate('sql_editor_upload_script_tooltip')}
               disabled={data.readonly}
               reset
               onChange={handleScriptUpload}
             >
               <upload disabled={data.readonly}>
-                <StaticImage icon='/icons/import.svg' />
+                <StaticImage icon="/icons/import.svg" />
               </upload>
             </UploadArea>
           )}
@@ -114,6 +108,6 @@ export const SqlEditorTools = observer<Props>(function SqlEditorTools({
             </button>*/}
         </>
       )}
-    </tools>
+    </tools>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorToolsMenu.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorToolsMenu.tsx
index 0289d63a08..66670b2104 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorToolsMenu.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorToolsMenu.tsx
@@ -5,7 +5,6 @@
  * 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 type { ComponentStyle } from '@cloudbeaver/core-theming';
@@ -27,7 +26,5 @@ export const SqlEditorToolsMenu = observer<Props>(function SqlEditorToolsMenu({
   const menu = useMenu({ menu: SQL_EDITOR_TOOLS_MENU, context });
   menu.context.set(DATA_CONTEXT_SQL_EDITOR_STATE, state);
 
-  return (
-    <MenuBar style={[SQL_EDITOR_ACTIONS_MENU_STYLES, ...[style].flat(2)]} menu={menu} />
-  );
-});
\ No newline at end of file
+  return <MenuBar style={[SQL_EDITOR_ACTIONS_MENU_STYLES, ...[style].flat(2)]} menu={menu} />;
+});
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
index 4954610ecf..32495dc61b 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/useSqlEditor.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { observable, computed, autorun, IReactionDisposer, action, untracked } from 'mobx';
+import { action, autorun, computed, IReactionDisposer, observable, untracked } from 'mobx';
 import { useEffect } from 'react';
 
 import { useExecutor, useObservableRef } from '@cloudbeaver/core-blocks';
@@ -15,7 +14,7 @@ import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { SyncExecutor } from '@cloudbeaver/core-executor';
 import type { SqlCompletionProposal, SqlDialectInfo } from '@cloudbeaver/core-sdk';
-import { createLastPromiseGetter, LastPromiseGetter, isObjectsEqual, throttleAsync } from '@cloudbeaver/core-utils';
+import { createLastPromiseGetter, isObjectsEqual, LastPromiseGetter, throttleAsync } from '@cloudbeaver/core-utils';
 
 import type { ISqlEditorTabState } from '../ISqlEditorTabState';
 import { ESqlDataSourceFeatures } from '../SqlDataSource/ESqlDataSourceFeatures';
@@ -66,456 +65,416 @@ export function useSqlEditor(state: ISqlEditorTabState): ISQLEditorData {
   const commonDialogService = useService(CommonDialogService);
   const sqlDataSourceService = useService(SqlDataSourceService);
 
-  const data = useObservableRef<ISQLEditorDataPrivate>(() => ({
-    get dataSource(): ISqlDataSource | undefined {
-      return sqlDataSourceService.get(this.state.editorId);
-    },
-    get dialect(): SqlDialectInfo | undefined {
-      if (!this.dataSource?.executionContext) {
-        return undefined;
-      }
-
-      return this.sqlDialectInfoService.getDialectInfo(createConnectionParam(
-        this.dataSource.executionContext.projectId,
-        this.dataSource.executionContext.connectionId
-      ));
-    },
-
-    get activeSegmentMode(): ISQLEditorMode {
-      const contexts = this.onMode.execute(this);
-      const mode = contexts.getContext(SQLEditorModeContext);
-
-      return mode;
-    },
-
-    get activeSegment(): ISQLScriptSegment | undefined {
-      return this.activeSegmentMode.activeSegment;
-    },
-
-    get cursorSegment(): ISQLScriptSegment | undefined {
-      return this.parser.getSegment(this.cursor.begin, -1);
-    },
-
-    get readonly(): boolean {
-      return (
-        this.executingScript
-        || this.readonlyState
-        || !!this.dataSource?.isOutdated()
-        || !!this.dataSource?.isReadonly()
-        || !this.editing
-      );
-    },
-
-    get editing(): boolean {
-      return this.dataSource?.isEditing() ?? false;
-    },
-
-    get isLineScriptEmpty(): boolean {
-      return !this.activeSegment?.query;
-    },
-
-    get isScriptEmpty(): boolean {
-      return this.value === '' || this.parser.scripts.length === 0;
-    },
-
-    get isDisabled(): boolean {
-      if (
-        !this.dataSource?.executionContext
-        || !this.dataSource.isLoaded()
-      ) {
-        return true;
-      }
-
-      const context = this.connectionExecutionContextService.get(this.dataSource.executionContext.id);
-
-      return context?.executing || false;
-    },
-
-    get value(): string {
-      return this.dataSource?.script ?? '';
-    },
-
-    onMode: new SyncExecutor(),
-    onExecute: new SyncExecutor(),
-    onSegmentExecute: new SyncExecutor(),
-    onUpdate: new SyncExecutor(),
-    onFormat: new SyncExecutor(),
-    parser: new SQLParser(),
-
-    cursor: { begin: 0, end: 0 },
-    readonlyState: false,
-    executingScript: false,
-    reactionDisposer: null,
-    hintsLimitIsMet: false,
-
-    init(): void {
-      if (this.reactionDisposer) {
-        return;
-      }
-
-      this.parser.setScript(this.value);
-
-      this.reactionDisposer = autorun(() => {
-        if (this.dataSource?.executionContext?.id) {
-          const context = this.connectionExecutionContextService.get(this.dataSource.executionContext.id);
-
-          if (context) {
-            const key = createConnectionParam(
-              this.dataSource.executionContext.projectId,
-              this.dataSource.executionContext.connectionId
-            );
-
-            untracked(() => {
-              this.sqlDialectInfoService
-                .loadSqlDialectInfo(key)
-                .then(async dialect => {
-                  await this.updateParserScriptsThrottle();
-                });
-            });
-          }
+  const data = useObservableRef<ISQLEditorDataPrivate>(
+    () => ({
+      get dataSource(): ISqlDataSource | undefined {
+        return sqlDataSourceService.get(this.state.editorId);
+      },
+      get dialect(): SqlDialectInfo | undefined {
+        if (!this.dataSource?.executionContext) {
+          return undefined;
         }
-      });
-    },
 
-    destruct(): void {
-      this.reactionDisposer?.();
-    },
-
-    setCursor(begin: number, end = begin): void {
-      this.cursor = {
-        begin,
-        end,
-      };
-      this.onUpdate.execute();
-    },
-
-    getLastAutocomplete: createLastPromiseGetter(),
-
-    getHintProposals: throttleAsync(async function getHintProposals(
-      this: ISQLEditorDataPrivate,
-      position,
-      simple
-    ) {
-      if (!this.dataSource?.executionContext) {
-        return [];
-      }
-
-      const { connectionId, id } = this.dataSource.executionContext;
-
-      const hints = await this.sqlEditorService.getAutocomplete(
-        connectionId, id, this.value, position, MAX_HINTS_LIMIT, simple
-      );
-
-      this.hintsLimitIsMet = hints.length >= MAX_HINTS_LIMIT;
-
-      return hints;
-    }, 1000 / 3),
-
-    async formatScript(): Promise<void> {
-      if (this.isDisabled || this.isScriptEmpty || !this.dataSource?.executionContext) {
-        return;
-      }
-
-      const query = this.value;
-      const script = this.getExecutingQuery(false);
-
-      if (!script) {
-        return;
-      }
-
-      this.onExecute.execute(true);
-      try {
-        this.readonlyState = true;
-        const formatted = await this.sqlDialectInfoService.formatScript(this.dataSource.executionContext, script.query);
-
-        this.onFormat.execute([script, formatted]);
-        this.setQuery(
-          query.substring(0, script.begin)
-          + formatted
-          + query.substring(script.end)
+        return this.sqlDialectInfoService.getDialectInfo(
+          createConnectionParam(this.dataSource.executionContext.projectId, this.dataSource.executionContext.connectionId),
         );
-      } finally {
-        this.readonlyState = false;
-      }
-    },
+      },
 
-    async executeQuery(): Promise<void> {
-      const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
-      const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+      get activeSegmentMode(): ISQLEditorMode {
+        const contexts = this.onMode.execute(this);
+        const mode = contexts.getContext(SQLEditorModeContext);
 
-      if (!isQuery || !isExecutable) {
-        return;
-      }
-      const query = this.getSubQuery();
+        return mode;
+      },
 
-      await this.executeQueryAction(
-        await this.executeQueryAction(query, () => this.getResolvedSegment()),
-        query => this.sqlQueryService.executeEditorQuery(
-          this.state,
-          query.query,
-          false
-        )
-      );
-    },
+      get activeSegment(): ISQLScriptSegment | undefined {
+        return this.activeSegmentMode.activeSegment;
+      },
 
-    async loadDatabaseDataModels(): Promise<void> {
-      const query = this.getExecutingQuery(true);
+      get cursorSegment(): ISQLScriptSegment | undefined {
+        return this.parser.getSegment(this.cursor.begin, -1);
+      },
 
-      await this.executeQueryAction(
-        query,
-        async () => {
-          if (this.dataSource?.databaseModels.length) {
-            this.sqlQueryService.initDatabaseDataModels(this.state);
-          }
-        },
-        true,
-        true
-      );
-    },
+      get readonly(): boolean {
+        return this.executingScript || this.readonlyState || !!this.dataSource?.isOutdated() || !!this.dataSource?.isReadonly() || !this.editing;
+      },
 
-    async executeQueryNewTab(): Promise<void> {
-      const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
-      const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+      get editing(): boolean {
+        return this.dataSource?.isEditing() ?? false;
+      },
 
-      if (!isQuery || !isExecutable) {
-        return;
-      }
-      const query = this.getSubQuery();
+      get isLineScriptEmpty(): boolean {
+        return !this.activeSegment?.query;
+      },
 
-      await this.executeQueryAction(
-        await this.executeQueryAction(query, () => this.getResolvedSegment()),
-        query => this.sqlQueryService.executeEditorQuery(
-          this.state,
-          query.query,
-          true
-        )
-      );
-    },
+      get isScriptEmpty(): boolean {
+        return this.value === '' || this.parser.scripts.length === 0;
+      },
 
-    async showExecutionPlan(): Promise<void> {
-      const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
-      const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+      get isDisabled(): boolean {
+        if (!this.dataSource?.executionContext || !this.dataSource.isLoaded()) {
+          return true;
+        }
 
-      if (!isQuery || !isExecutable || !this.dialect?.supportsExplainExecutionPlan) {
-        return;
-      }
+        const context = this.connectionExecutionContextService.get(this.dataSource.executionContext.id);
 
-      const query = this.getSubQuery();
+        return context?.executing || false;
+      },
 
-      await this.executeQueryAction(
-        await this.executeQueryAction(query, () => this.getResolvedSegment()),
-        query => this.sqlExecutionPlanService.executeExecutionPlan(
-          this.state,
-          query.query,
-        )
-      );
-    },
+      get value(): string {
+        return this.dataSource?.script ?? '';
+      },
 
-    async switchEditing(): Promise<void> {
-      this.dataSource?.setEditing(!this.dataSource.isEditing());
-    },
+      onMode: new SyncExecutor(),
+      onExecute: new SyncExecutor(),
+      onSegmentExecute: new SyncExecutor(),
+      onUpdate: new SyncExecutor(),
+      onFormat: new SyncExecutor(),
+      parser: new SQLParser(),
 
-    async executeScript(): Promise<void> {
-      const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+      cursor: { begin: 0, end: 0 },
+      readonlyState: false,
+      executingScript: false,
+      reactionDisposer: null,
+      hintsLimitIsMet: false,
 
-      if (!isExecutable || this.isDisabled || this.isScriptEmpty) {
-        return;
-      }
-
-      if (this.state.tabs.length) {
-        const result = await this.commonDialogService.open(ConfirmationDialog, {
-          title: 'sql_editor_close_result_tabs_dialog_title',
-          message: `Do you want to close ${this.state.tabs.length} tabs before executing script?`,
-          confirmActionText: 'ui_yes',
-          extraStatus: 'no',
-        });
-
-        if (result === DialogueStateResult.Resolved) {
-          const state = await this.sqlResultTabsService.canCloseResultTabs(this.state);
-
-          if (!state) {
-            return;
-          }
-
-          this.sqlResultTabsService.removeResultTabs(this.state);
-        } else if (result === DialogueStateResult.Rejected) {
+      init(): void {
+        if (this.reactionDisposer) {
           return;
         }
-      }
 
-      this.onExecute.execute(true);
-      try {
-        this.executingScript = true;
-        await this.updateParserScripts();
-        const queries = this.parser.scripts;
+        this.parser.setScript(this.value);
 
-        await this.sqlQueryService.executeQueries(
-          this.state,
-          queries.map(query => query.query),
-          {
-            onQueryExecutionStart: (query, index) => {
-              const segment = queries[index];
-              this.onSegmentExecute.execute({ segment, type: 'start' });
-            },
-            onQueryExecuted: (query, index, success) => {
-              const segment = queries[index];
-              this.onSegmentExecute.execute({ segment, type: 'end' });
+        this.reactionDisposer = autorun(() => {
+          if (this.dataSource?.executionContext?.id) {
+            const context = this.connectionExecutionContextService.get(this.dataSource.executionContext.id);
 
-              if (!success) {
-                this.onSegmentExecute.execute({ segment, type: 'error' });
-              }
-            },
+            if (context) {
+              const key = createConnectionParam(this.dataSource.executionContext.projectId, this.dataSource.executionContext.connectionId);
+
+              untracked(() => {
+                this.sqlDialectInfoService.loadSqlDialectInfo(key).then(async dialect => {
+                  await this.updateParserScriptsThrottle();
+                });
+              });
+            }
           }
+        });
+      },
+
+      destruct(): void {
+        this.reactionDisposer?.();
+      },
+
+      setCursor(begin: number, end = begin): void {
+        this.cursor = {
+          begin,
+          end,
+        };
+        this.onUpdate.execute();
+      },
+
+      getLastAutocomplete: createLastPromiseGetter(),
+
+      getHintProposals: throttleAsync(async function getHintProposals(this: ISQLEditorDataPrivate, position, simple) {
+        if (!this.dataSource?.executionContext) {
+          return [];
+        }
+
+        const { connectionId, id } = this.dataSource.executionContext;
+
+        const hints = await this.sqlEditorService.getAutocomplete(connectionId, id, this.value, position, MAX_HINTS_LIMIT, simple);
+
+        this.hintsLimitIsMet = hints.length >= MAX_HINTS_LIMIT;
+
+        return hints;
+      }, 1000 / 3),
+
+      async formatScript(): Promise<void> {
+        if (this.isDisabled || this.isScriptEmpty || !this.dataSource?.executionContext) {
+          return;
+        }
+
+        const query = this.value;
+        const script = this.getExecutingQuery(false);
+
+        if (!script) {
+          return;
+        }
+
+        this.onExecute.execute(true);
+        try {
+          this.readonlyState = true;
+          const formatted = await this.sqlDialectInfoService.formatScript(this.dataSource.executionContext, script.query);
+
+          this.onFormat.execute([script, formatted]);
+          this.setQuery(query.substring(0, script.begin) + formatted + query.substring(script.end));
+        } finally {
+          this.readonlyState = false;
+        }
+      },
+
+      async executeQuery(): Promise<void> {
+        const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
+        const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+
+        if (!isQuery || !isExecutable) {
+          return;
+        }
+        const query = this.getSubQuery();
+
+        await this.executeQueryAction(await this.executeQueryAction(query, () => this.getResolvedSegment()), query =>
+          this.sqlQueryService.executeEditorQuery(this.state, query.query, false),
         );
-      } finally {
-        this.executingScript = false;
-      }
-    },
+      },
 
-    setQuery(query: string): void {
-      this.sqlEditorService.setQuery(query, this.state);
-      this.updateParserScriptsThrottle().catch(() => {});
-    },
+      async loadDatabaseDataModels(): Promise<void> {
+        const query = this.getExecutingQuery(true);
 
-    updateParserScriptsThrottle: throttleAsync(async function updateParserScriptsThrottle() {
-      await data.updateParserScripts();
-    }, 1000 / 2),
-
-    async updateParserScripts() {
-      if (!this.dataSource?.hasFeature(ESqlDataSourceFeatures.script)) {
-        return;
-      }
-      const connectionId = this.dataSource.executionContext?.connectionId;
-      const script = this.parser.actualScript;
-
-      if (!connectionId || !script) {
-        return;
-      }
-
-      const { queries } = await this.sqlEditorService
-        .parseSQLScript(
-          connectionId,
-          script
+        await this.executeQueryAction(
+          query,
+          async () => {
+            if (this.dataSource?.databaseModels.length) {
+              this.sqlQueryService.initDatabaseDataModels(this.state);
+            }
+          },
+          true,
+          true,
         );
+      },
 
-      if (this.parser.actualScript === script) {
-        this.parser.setQueries(queries);
-      }
-    },
+      async executeQueryNewTab(): Promise<void> {
+        const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
+        const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
 
-    async executeQueryAction<T>(
-      segment: ISQLScriptSegment | undefined,
-      action: (query: ISQLScriptSegment) => Promise<T>,
-      passEmpty?: boolean,
-      passDisabled?: boolean
-    ): Promise<T | undefined> {
-      if (!segment || (this.isDisabled && !passDisabled) || (!passEmpty && this.isLineScriptEmpty)) {
-        return;
-      }
+        if (!isQuery || !isExecutable) {
+          return;
+        }
+        const query = this.getSubQuery();
 
-      this.onExecute.execute(true);
+        await this.executeQueryAction(await this.executeQueryAction(query, () => this.getResolvedSegment()), query =>
+          this.sqlQueryService.executeEditorQuery(this.state, query.query, true),
+        );
+      },
 
-      try {
-        const id = setTimeout(() => this.onSegmentExecute.execute({ segment, type: 'start' }), 250);
-        const result = await action(segment);
-        clearTimeout(id);
-        this.onSegmentExecute.execute({ segment, type: 'end' });
-        return result;
-      } catch (exception: any) {
-        this.onSegmentExecute.execute({ segment, type: 'end' });
-        this.onSegmentExecute.execute({ segment, type: 'error' });
-        throw exception;
-      }
-    },
+      async showExecutionPlan(): Promise<void> {
+        const isQuery = this.dataSource?.hasFeature(ESqlDataSourceFeatures.query);
+        const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
 
-    getExecutingQuery(script: boolean): ISQLScriptSegment | undefined {
-      if (script) {
-        return this.parser.getScriptSegment();
-      }
+        if (!isQuery || !isExecutable || !this.dialect?.supportsExplainExecutionPlan) {
+          return;
+        }
 
-      return this.activeSegment;
-    },
+        const query = this.getSubQuery();
 
-    async getResolvedSegment(): Promise<ISQLScriptSegment | undefined> {
-      const connectionId = this.dataSource?.executionContext?.connectionId;
+        await this.executeQueryAction(await this.executeQueryAction(query, () => this.getResolvedSegment()), query =>
+          this.sqlExecutionPlanService.executeExecutionPlan(this.state, query.query),
+        );
+      },
 
-      if (!connectionId || this.cursor.begin !== this.cursor.end) {
-        return this.getSubQuery();
-      }
+      async switchEditing(): Promise<void> {
+        this.dataSource?.setEditing(!this.dataSource.isEditing());
+      },
+
+      async executeScript(): Promise<void> {
+        const isExecutable = this.dataSource?.hasFeature(ESqlDataSourceFeatures.executable);
+
+        if (!isExecutable || this.isDisabled || this.isScriptEmpty) {
+          return;
+        }
+
+        if (this.state.tabs.length) {
+          const result = await this.commonDialogService.open(ConfirmationDialog, {
+            title: 'sql_editor_close_result_tabs_dialog_title',
+            message: `Do you want to close ${this.state.tabs.length} tabs before executing script?`,
+            confirmActionText: 'ui_yes',
+            extraStatus: 'no',
+          });
+
+          if (result === DialogueStateResult.Resolved) {
+            const state = await this.sqlResultTabsService.canCloseResultTabs(this.state);
+
+            if (!state) {
+              return;
+            }
+
+            this.sqlResultTabsService.removeResultTabs(this.state);
+          } else if (result === DialogueStateResult.Rejected) {
+            return;
+          }
+        }
+
+        this.onExecute.execute(true);
+        try {
+          this.executingScript = true;
+          await this.updateParserScripts();
+          const queries = this.parser.scripts;
+
+          await this.sqlQueryService.executeQueries(
+            this.state,
+            queries.map(query => query.query),
+            {
+              onQueryExecutionStart: (query, index) => {
+                const segment = queries[index];
+                this.onSegmentExecute.execute({ segment, type: 'start' });
+              },
+              onQueryExecuted: (query, index, success) => {
+                const segment = queries[index];
+                this.onSegmentExecute.execute({ segment, type: 'end' });
+
+                if (!success) {
+                  this.onSegmentExecute.execute({ segment, type: 'error' });
+                }
+              },
+            },
+          );
+        } finally {
+          this.executingScript = false;
+        }
+      },
+
+      setQuery(query: string): void {
+        this.sqlEditorService.setQuery(query, this.state);
+        this.updateParserScriptsThrottle().catch(() => {});
+      },
+
+      updateParserScriptsThrottle: throttleAsync(async function updateParserScriptsThrottle() {
+        await data.updateParserScripts();
+      }, 1000 / 2),
+
+      async updateParserScripts() {
+        if (!this.dataSource?.hasFeature(ESqlDataSourceFeatures.script)) {
+          return;
+        }
+        const connectionId = this.dataSource.executionContext?.connectionId;
+        const script = this.parser.actualScript;
+
+        if (!connectionId || !script) {
+          return;
+        }
+
+        const { queries } = await this.sqlEditorService.parseSQLScript(connectionId, script);
+
+        if (this.parser.actualScript === script) {
+          this.parser.setQueries(queries);
+        }
+      },
+
+      async executeQueryAction<T>(
+        segment: ISQLScriptSegment | undefined,
+        action: (query: ISQLScriptSegment) => Promise<T>,
+        passEmpty?: boolean,
+        passDisabled?: boolean,
+      ): Promise<T | undefined> {
+        if (!segment || (this.isDisabled && !passDisabled) || (!passEmpty && this.isLineScriptEmpty)) {
+          return;
+        }
+
+        this.onExecute.execute(true);
+
+        try {
+          const id = setTimeout(() => this.onSegmentExecute.execute({ segment, type: 'start' }), 250);
+          const result = await action(segment);
+          clearTimeout(id);
+          this.onSegmentExecute.execute({ segment, type: 'end' });
+          return result;
+        } catch (exception: any) {
+          this.onSegmentExecute.execute({ segment, type: 'end' });
+          this.onSegmentExecute.execute({ segment, type: 'error' });
+          throw exception;
+        }
+      },
+
+      getExecutingQuery(script: boolean): ISQLScriptSegment | undefined {
+        if (script) {
+          return this.parser.getScriptSegment();
+        }
 
-      if (this.activeSegmentMode.activeSegmentMode) {
         return this.activeSegment;
-      }
+      },
 
+      async getResolvedSegment(): Promise<ISQLScriptSegment | undefined> {
+        const connectionId = this.dataSource?.executionContext?.connectionId;
 
-      const result = await this.sqlEditorService.parseSQLQuery(
-        connectionId,
-        this.value,
-        this.cursor.begin
-      );
+        if (!connectionId || this.cursor.begin !== this.cursor.end) {
+          return this.getSubQuery();
+        }
 
-      const segment = this.parser.getSegment(result.start, result.end);
+        if (this.activeSegmentMode.activeSegmentMode) {
+          return this.activeSegment;
+        }
 
-      if (!segment) {
-        throw new Error('Failed to get position');
-      }
+        const result = await this.sqlEditorService.parseSQLQuery(connectionId, this.value, this.cursor.begin);
 
-      return segment;
+        const segment = this.parser.getSegment(result.start, result.end);
+
+        if (!segment) {
+          throw new Error('Failed to get position');
+        }
+
+        return segment;
+      },
+
+      getSubQuery(): ISQLScriptSegment | undefined {
+        const query = this.getExecutingQuery(false);
+
+        if (!query) {
+          return undefined;
+        }
+
+        query.query = query.query.trim();
+
+        return query;
+      },
+    }),
+    {
+      formatScript: action.bound,
+      executeQuery: action.bound,
+      executeQueryNewTab: action.bound,
+      showExecutionPlan: action.bound,
+      executeScript: action.bound,
+      switchEditing: action.bound,
+      dialect: computed,
+      isLineScriptEmpty: computed,
+      isDisabled: computed,
+      value: computed,
+      readonly: computed,
+      hintsLimitIsMet: observable.ref,
+      cursor: observable,
+      readonlyState: observable,
+      executingScript: observable,
     },
-
-    getSubQuery(): ISQLScriptSegment | undefined {
-      const query = this.getExecutingQuery(false);
-
-      if (!query) {
-        return undefined;
-      }
-
-      query.query = query.query.trim();
-
-      return query;
+    {
+      state,
+      connectionExecutionContextService,
+      sqlQueryService,
+      sqlDialectInfoService,
+      sqlEditorService,
+      sqlExecutionPlanService,
+      sqlResultTabsService,
+      commonDialogService,
     },
-  }), {
-    formatScript: action.bound,
-    executeQuery: action.bound,
-    executeQueryNewTab: action.bound,
-    showExecutionPlan: action.bound,
-    executeScript: action.bound,
-    switchEditing: action.bound,
-    dialect: computed,
-    isLineScriptEmpty: computed,
-    isDisabled: computed,
-    value: computed,
-    readonly: computed,
-    hintsLimitIsMet: observable.ref,
-    cursor: observable,
-    readonlyState: observable,
-    executingScript: observable,
-  }, {
-    state,
-    connectionExecutionContextService,
-    sqlQueryService,
-    sqlDialectInfoService,
-    sqlEditorService,
-    sqlExecutionPlanService,
-    sqlResultTabsService,
-    commonDialogService,
-  });
+  );
 
   untracked(() => data.init());
 
   useExecutor({
     executor: data.dataSource?.onSetScript,
-    handlers: [function setScript({ script }) {
-      data.parser.setScript(script);
-      data.onUpdate.execute();
-    }],
+    handlers: [
+      function setScript({ script }) {
+        data.parser.setScript(script);
+        data.onUpdate.execute();
+      },
+    ],
   });
 
   useExecutor({
     executor: data.dataSource?.onDatabaseModelUpdate,
-    handlers: [function updateDatabaseModels() {
-      data.loadDatabaseDataModels();
-    }],
+    handlers: [
+      function updateDatabaseModels() {
+        data.loadDatabaseDataModels();
+      },
+    ],
   });
 
   useEffect(() => () => data.destruct(), []);
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
index 867fe6278b..c8931201a6 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/useTools.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action } from 'mobx';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -35,98 +34,100 @@ export function useTools(state: ISqlEditorTabState): Readonly<State> {
   const sqlEditorSettingsService = useService(SqlEditorSettingsService);
   const sqlDataSourceService = useService(SqlDataSourceService);
 
-  return useObservableRef(() => ({
-    async tryReadScript(file: File, prevScript: string) {
-      const valid = this.checkFileValidity(file);
+  return useObservableRef(
+    () => ({
+      async tryReadScript(file: File, prevScript: string) {
+        const valid = this.checkFileValidity(file);
 
-      if (!valid) {
-        return null;
-      }
-
-      if (prevScript) {
-        const result = await this.commonDialogService.open(ScriptImportDialog, null);
-
-        if (result === DialogueStateResult.Rejected) {
+        if (!valid) {
           return null;
         }
 
-        if (result !== DialogueStateResult.Resolved && result) {
-          this.downloadScript(prevScript);
+        if (prevScript) {
+          const result = await this.commonDialogService.open(ScriptImportDialog, null);
+
+          if (result === DialogueStateResult.Rejected) {
+            return null;
+          }
+
+          if (result !== DialogueStateResult.Resolved && result) {
+            this.downloadScript(prevScript);
+          }
         }
-      }
 
-      return this.readScript(file);
-    },
+        return this.readScript(file);
+      },
 
-    async readScript(file: File) {
-      let script = null;
-      try {
-        const process = getTextFileReadingProcess(file);
-        script = await process.promise;
-      } catch (exception: any) {
-        this.notificationService.logException(exception, 'Uploading script error');
-      }
+      async readScript(file: File) {
+        let script = null;
+        try {
+          const process = getTextFileReadingProcess(file);
+          script = await process.promise;
+        } catch (exception: any) {
+          this.notificationService.logException(exception, 'Uploading script error');
+        }
 
-      return script;
-    },
+        return script;
+      },
 
-    checkFileValidity(file: File) {
-      const maxSize = this.sqlEditorSettingsService.settings.isValueDefault('maxFileSize')
-        ? this.sqlEditorSettingsService.deprecatedSettings.getValue('maxFileSize')
-        : this.sqlEditorSettingsService.settings.getValue('maxFileSize');
+      checkFileValidity(file: File) {
+        const maxSize = this.sqlEditorSettingsService.settings.isValueDefault('maxFileSize')
+          ? this.sqlEditorSettingsService.deprecatedSettings.getValue('maxFileSize')
+          : this.sqlEditorSettingsService.settings.getValue('maxFileSize');
 
-      const size = Math.round(file.size / 1024); // kilobyte
-      const aboveMaxSize = size > maxSize;
+        const size = Math.round(file.size / 1024); // kilobyte
+        const aboveMaxSize = size > maxSize;
 
-      if (aboveMaxSize) {
-        this.notificationService.logInfo({
-          title: 'sql_editor_upload_script_max_size_title',
-          message: `Max size: ${maxSize}KB\nFile size: ${size}KB`,
-          autoClose: false,
+        if (aboveMaxSize) {
+          this.notificationService.logInfo({
+            title: 'sql_editor_upload_script_max_size_title',
+            message: `Max size: ${maxSize}KB\nFile size: ${size}KB`,
+            autoClose: false,
+          });
+
+          return false;
+        }
+
+        return true;
+      },
+
+      downloadScript(script: string) {
+        if (!script.trim()) {
+          return;
+        }
+
+        const blob = new Blob([script], {
+          type: 'application/sql',
         });
 
-        return false;
-      }
+        const dataSource = sqlDataSourceService.get(this.state.editorId);
 
-      return true;
+        let connection: Connection | undefined;
+
+        if (dataSource?.executionContext) {
+          connection = this.connectionInfoResource.get({
+            projectId: dataSource.executionContext.projectId,
+            connectionId: dataSource.executionContext.connectionId,
+          });
+        }
+
+        const name = getSqlEditorName(this.state, dataSource, connection);
+
+        download(blob, generateFileName(name, '.sql'));
+      },
+    }),
+    {
+      tryReadScript: action.bound,
+      readScript: action.bound,
+      checkFileValidity: action.bound,
+      downloadScript: action.bound,
     },
-
-    downloadScript(script: string) {
-      if (!script.trim()) {
-        return;
-      }
-
-      const blob = new Blob([script], {
-        type: 'application/sql',
-      });
-
-      const dataSource = sqlDataSourceService.get(this.state.editorId);
-
-      let connection: Connection | undefined;
-
-      if (dataSource?.executionContext) {
-        connection = this.connectionInfoResource.get({
-          projectId: dataSource.executionContext.projectId,
-          connectionId: dataSource.executionContext.connectionId,
-        });
-      }
-
-      const name = getSqlEditorName(this.state, dataSource, connection);
-
-      download(blob, generateFileName(name, '.sql'));
+    {
+      commonDialogService,
+      connectionInfoResource,
+      notificationService,
+      sqlEditorSettingsService,
+      state,
     },
-  }),
-  {
-    tryReadScript: action.bound,
-    readScript: action.bound,
-    checkFileValidity: action.bound,
-    downloadScript: action.bound,
-  },
-  {
-    commonDialogService,
-    connectionInfoResource,
-    notificationService,
-    sqlEditorSettingsService,
-    state,
-  });
+  );
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorModeService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorModeService.ts
index 1990f42203..d23f7ecc74 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorModeService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorModeService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { TabsContainer } from '@cloudbeaver/core-ui';
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorOverlay.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditorOverlay.tsx
index 16199e1e7a..1d982a32a1 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorOverlay.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorOverlay.tsx
@@ -5,13 +5,34 @@
  * 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 { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Overlay, OverlayMessage, OverlayActions, Button, useResource, getComputed, OverlayHeader, OverlayHeaderIcon, OverlayHeaderTitle, OverlayHeaderSubTitle, useSplitUserState, Loader, useStyles, useTranslate, useExecutor } from '@cloudbeaver/core-blocks';
-import { ConnectionExecutionContextResource, ConnectionInfoResource, createConnectionParam, DBDriverResource, getRealExecutionContextId } from '@cloudbeaver/core-connections';
+import {
+  Button,
+  getComputed,
+  Loader,
+  Overlay,
+  OverlayActions,
+  OverlayHeader,
+  OverlayHeaderIcon,
+  OverlayHeaderSubTitle,
+  OverlayHeaderTitle,
+  OverlayMessage,
+  useExecutor,
+  useResource,
+  useSplitUserState,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
+import {
+  ConnectionExecutionContextResource,
+  ConnectionInfoResource,
+  createConnectionParam,
+  DBDriverResource,
+  getRealExecutionContextId,
+} from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NodeManagerUtils } from '@cloudbeaver/core-navigation-tree';
 
@@ -41,32 +62,20 @@ export const SqlEditorOverlay = observer<Props>(function SqlEditorOverlay({ stat
   const connection = useResource(
     SqlEditorOverlay,
     ConnectionInfoResource,
-    dataSource?.executionContext
-      ? createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId)
-      : null
+    dataSource?.executionContext ? createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId) : null,
   );
   const driver = useResource(SqlEditorOverlay, DBDriverResource, connection.tryGetData?.driverId ?? null);
 
   const connected = getComputed(() => connection.tryGetData?.connected ?? false);
 
-  const context = useResource(
-    SqlEditorOverlay,
-    ConnectionExecutionContextResource,
-    getRealExecutionContextId(executionContextId),
-    {
-      active: connected,
-    }
-  );
+  const context = useResource(SqlEditorOverlay, ConnectionExecutionContextResource, getRealExecutionContextId(executionContextId), {
+    active: connected,
+  });
 
-  const initializingContext = getComputed(() => (
-    connection.isLoading()
-    || context.isLoading()
-  ));
-  const initExecutionContext = getComputed(() => (
-    context.tryGetData === undefined
-    && connection.tryGetData !== undefined
-    && dataSource?.isLoading() === false
-  ));
+  const initializingContext = getComputed(() => connection.isLoading() || context.isLoading());
+  const initExecutionContext = getComputed(
+    () => context.tryGetData === undefined && connection.tryGetData !== undefined && dataSource?.isLoading() === false,
+  );
 
   async function cancelConnection() {
     await sqlEditorService.resetExecutionContext(state);
@@ -76,10 +85,9 @@ export const SqlEditorOverlay = observer<Props>(function SqlEditorOverlay({ stat
     await sqlEditorService.initEditorConnection(state);
   }
 
-  const dataContainer = getComputed(() => NodeManagerUtils.concatSchemaAndCatalog(
-    dataSource?.executionContext?.defaultCatalog,
-    dataSource?.executionContext?.defaultSchema
-  ));
+  const dataContainer = getComputed(() =>
+    NodeManagerUtils.concatSchemaAndCatalog(dataSource?.executionContext?.defaultCatalog, dataSource?.executionContext?.defaultSchema),
+  );
 
   useEffect(() => {
     if (initExecutionContext && connected) {
@@ -96,24 +104,13 @@ export const SqlEditorOverlay = observer<Props>(function SqlEditorOverlay({ stat
       </OverlayHeader>
       <OverlayMessage>{translate('sql_editor_restore_message')}</OverlayMessage>
       <OverlayActions>
-        <Button
-          type="button"
-          mod={['outlined']}
-          loader
-          onClick={cancelConnection}
-        >
+        <Button type="button" mod={['outlined']} loader onClick={cancelConnection}>
           {translate('ui_processing_cancel')}
         </Button>
-        <Button
-          type="button"
-          mod={['unelevated']}
-          loading={initializingContext}
-          loader
-          onClick={init}
-        >
+        <Button type="button" mod={['unelevated']} loading={initializingContext} loader onClick={init}>
           {translate('sql_editor_restore')}
         </Button>
       </OverlayActions>
-    </Overlay>
+    </Overlay>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorService.ts
index 7b607afecc..70793a6744 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorService.ts
@@ -5,10 +5,20 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observable } from 'mobx';
 
-import { Connection, ConnectionExecutionContextProjectKey, ConnectionExecutionContextResource, ConnectionExecutionContextService, ConnectionInfoResource, ConnectionsManagerService, createConnectionParam, IConnectionExecutionContext, IConnectionExecutionContextInfo, IConnectionInfoParams } from '@cloudbeaver/core-connections';
+import {
+  Connection,
+  ConnectionExecutionContextProjectKey,
+  ConnectionExecutionContextResource,
+  ConnectionExecutionContextService,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  createConnectionParam,
+  IConnectionExecutionContext,
+  IConnectionExecutionContextInfo,
+  IConnectionInfoParams,
+} from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
@@ -38,17 +48,12 @@ export class SqlEditorService {
     private readonly connectionExecutionContextService: ConnectionExecutionContextService,
     private readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
     private readonly connectionInfoResource: ConnectionInfoResource,
-    private readonly sqlDataSourceService: SqlDataSourceService
+    private readonly sqlDataSourceService: SqlDataSourceService,
   ) {
     this.onQueryChange = new SyncExecutor();
   }
 
-  getState(
-    editorId: string,
-    datasourceKey: string,
-    order: number,
-    source?: string,
-  ): ISqlEditorTabState {
+  getState(editorId: string, datasourceKey: string, order: number, source?: string): ISqlEditorTabState {
     return observable({
       editorId,
       datasourceKey,
@@ -64,10 +69,7 @@ export class SqlEditorService {
     });
   }
 
-  async parseSQLScript(
-    connectionId: string,
-    script: string
-  ): Promise<SqlScriptInfoFragment> {
+  async parseSQLScript(connectionId: string, script: string): Promise<SqlScriptInfoFragment> {
     const result = await this.graphQLService.sdk.parseSQLScript({
       connectionId,
       script,
@@ -76,11 +78,7 @@ export class SqlEditorService {
     return result.scriptInfo;
   }
 
-  async parseSQLQuery(
-    connectionId: string,
-    script: string,
-    position: number,
-  ) {
+  async parseSQLQuery(connectionId: string, script: string, position: number) {
     const result = await this.graphQLService.sdk.parseSQLQuery({
       connectionId,
       script,
@@ -153,12 +151,7 @@ export class SqlEditorService {
     }
   }
 
-  async setConnection(
-    state: ISqlEditorTabState,
-    connectionKey: IConnectionInfoParams,
-    catalogId?: string,
-    schemaId?: string
-  ): Promise<boolean> {
+  async setConnection(state: ISqlEditorTabState, connectionKey: IConnectionInfoParams, catalogId?: string, schemaId?: string): Promise<boolean> {
     try {
       const executionContext = await this.initContext(connectionKey, catalogId, schemaId);
       const dataSource = this.sqlDataSourceService.get(state.editorId);
@@ -190,21 +183,16 @@ export class SqlEditorService {
           return;
         }
 
-        await this.connectionExecutionContextResource.load(
-          ConnectionExecutionContextProjectKey(dataSource.executionContext.projectId)
-        );
+        await this.connectionExecutionContextResource.load(ConnectionExecutionContextProjectKey(dataSource.executionContext.projectId));
 
         if (this.connectionExecutionContextResource.has(dataSource.executionContext.id)) {
           return this.connectionExecutionContextService.get(dataSource.executionContext.id);
         }
 
         const context = await this.initContext(
-          createConnectionParam(
-            dataSource.executionContext.projectId,
-            dataSource.executionContext.connectionId
-          ),
+          createConnectionParam(dataSource.executionContext.projectId, dataSource.executionContext.connectionId),
           dataSource.executionContext.defaultCatalog,
-          dataSource.executionContext.defaultSchema
+          dataSource.executionContext.defaultSchema,
         );
 
         if (!context?.context) {
@@ -218,9 +206,8 @@ export class SqlEditorService {
       },
       () => {
         console.error('executeEditorQuery executionContext is not provided');
-      }
+      },
     );
-
   }
 
   async canDestroy(state: ISqlEditorTabState): Promise<boolean> {
@@ -231,11 +218,7 @@ export class SqlEditorService {
     await this.sqlDataSourceService.destroy(state.editorId);
   }
 
-  async initContext(
-    connectionKey: IConnectionInfoParams,
-    catalogId?: string,
-    schemaId?: string
-  ): Promise<IConnectionExecutionContext | null> {
+  async initContext(connectionKey: IConnectionInfoParams, catalogId?: string, schemaId?: string): Promise<IConnectionExecutionContext | null> {
     const connection = await this.connectionsManagerService.requireConnection(connectionKey);
 
     if (!connection) {
@@ -245,10 +228,7 @@ export class SqlEditorService {
     try {
       return await this.connectionExecutionContextService.create(connectionKey, catalogId, schemaId);
     } catch (exception: any) {
-      this.notificationService.logException(
-        exception,
-        `Failed to create context for ${connection.name} connection`,
-      );
+      this.notificationService.logException(exception, `Failed to create context for ${connection.name} connection`);
       return null;
     }
   }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.test.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.test.ts
index 798196c1a9..c55b363d38 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.test.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.test.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import '@testing-library/jest-dom';
 
 import { mockAuthentication } from '@cloudbeaver/core-authentication/mocks/mockAuthentication';
@@ -25,19 +24,9 @@ import { sqlEditorPluginManifest } from './manifest';
 import { SqlEditorSettings, SqlEditorSettingsService } from './SqlEditorSettingsService';
 
 const endpoint = createGQLEndpoint();
-const app = createApp(
-  datasourceContextSwitch,
-  navigationTabs,
-  navigationTree,
-  objectViewer,
-  dataViewer,
-  sqlEditorPluginManifest
-);
+const app = createApp(datasourceContextSwitch, navigationTabs, navigationTree, objectViewer, dataViewer, sqlEditorPluginManifest);
 
-const server = mockGraphQL(
-  ...mockAppInit(endpoint),
-  ...mockAuthentication(endpoint)
-);
+const server = mockGraphQL(...mockAppInit(endpoint), ...mockAuthentication(endpoint));
 
 beforeAll(() => app.init());
 
@@ -62,9 +51,7 @@ test('New settings equal deprecated settings', async () => {
   const settings = app.injector.getServiceByClass(SqlEditorSettingsService);
   const config = app.injector.getServiceByClass(ServerConfigResource);
 
-  server.use(
-    endpoint.query('serverConfig', mockServerConfig(equalConfig)),
-  );
+  server.use(endpoint.query('serverConfig', mockServerConfig(equalConfig)));
 
   await config.refresh();
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.ts
index 722ef153bb..35cd2263e6 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorStatusBar.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditorStatusBar.tsx
index b29af76937..a09e3b8be5 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorStatusBar.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorStatusBar.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -32,7 +31,5 @@ interface Props {
 }
 
 export const SqlEditorStatusBar = observer<Props>(function SqlEditorStatusBar({ dataSource }) {
-  return styled(viewerStyles)(
-    <Loader state={dataSource} message={dataSource?.message} small inline inlineException />
-  );
+  return styled(viewerStyles)(<Loader state={dataSource} message={dataSource?.message} small inline inlineException />);
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorView.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorView.ts
index 5826cb1fdd..8494880bcb 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorView.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorView.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { ACTION_REDO, ACTION_UNDO, IActiveView, View } from '@cloudbeaver/core-view';
 import { ITab, NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
@@ -18,9 +17,7 @@ import { ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN } from './actions/ACTION_SQL_EDIT
 
 @injectable()
 export class SqlEditorView extends View<ITab> {
-  constructor(
-    private readonly navigationTabsService: NavigationTabsService
-  ) {
+  constructor(private readonly navigationTabsService: NavigationTabsService) {
     super();
     this.registerAction(
       ACTION_SQL_EDITOR_EXECUTE_NEW,
@@ -29,12 +26,11 @@ export class SqlEditorView extends View<ITab> {
       ACTION_SQL_EDITOR_FORMAT,
       ACTION_UNDO,
       ACTION_REDO,
-      ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN
+      ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN,
     );
   }
 
   getView(): IActiveView<ITab> | null {
     return this.navigationTabsService.getView();
   }
-
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/DATA_CONTEXT_SQL_EDITOR_RESULT_ID.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/DATA_CONTEXT_SQL_EDITOR_RESULT_ID.ts
index 53c04ae51d..79e9db1227 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/DATA_CONTEXT_SQL_EDITOR_RESULT_ID.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/DATA_CONTEXT_SQL_EDITOR_RESULT_ID.ts
@@ -5,7 +5,6 @@
  * 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';
 
 import type { ISqlEditorResultTab } from '../ISqlEditorTabState';
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeBlock.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeBlock.tsx
index 823a9851a6..f691fbfe5c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeBlock.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeBlock.tsx
@@ -5,13 +5,22 @@
  * 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 {
-  Split, Pane, ResizerControls, splitStyles, TextPlaceholder,
-  Table, TableHeader, TableColumnHeader, TableBody, Textarea, useSplitUserState, useTranslate
+  Pane,
+  ResizerControls,
+  Split,
+  splitStyles,
+  Table,
+  TableBody,
+  TableColumnHeader,
+  TableHeader,
+  Textarea,
+  TextPlaceholder,
+  useSplitUserState,
+  useTranslate,
 } from '@cloudbeaver/core-blocks';
 import type { SqlExecutionPlanNode } from '@cloudbeaver/core-sdk';
 
@@ -19,21 +28,21 @@ import { NestedNode } from './NestedNode';
 import { useExecutionPlanTreeState } from './useExecutionPlanTreeState';
 
 const styles = css`
-    Pane {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Split {
-      height: 100%;
-      flex-direction: column;
-    }
-    ResizerControls {
-      width: 100%;
-      height: 2px;
-    }
-    Textarea > :global(textarea) {
-      border: none !important;
-    }
-  `;
+  Pane {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Split {
+    height: 100%;
+    flex-direction: column;
+  }
+  ResizerControls {
+    width: 100%;
+    height: 2px;
+  }
+  Textarea > :global(textarea) {
+    border: none !important;
+  }
+`;
 
 interface Props {
   nodeList: SqlExecutionPlanNode[];
@@ -42,21 +51,16 @@ interface Props {
   className?: string;
 }
 
-export const ExecutionPlanTreeBlock = observer<Props>(function ExecutionPlanTreeBlock({
-  nodeList, query, onNodeSelect, className,
-}) {
+export const ExecutionPlanTreeBlock = observer<Props>(function ExecutionPlanTreeBlock({ nodeList, query, onNodeSelect, className }) {
   const translate = useTranslate();
   const splitState = useSplitUserState('execution-plan-block');
   const state = useExecutionPlanTreeState(nodeList, onNodeSelect);
 
-  return styled(styles, splitStyles)(
-    <Split
-      {...splitState}
-      className={className}
-      sticky={30}
-      split='horizontal'
-      keepRatio
-    >
+  return styled(
+    styles,
+    splitStyles,
+  )(
+    <Split {...splitState} className={className} sticky={30} split="horizontal" keepRatio>
       <Pane>
         {state.nodes.length && state.columns.length ? (
           <Table selectedItems={state.selectedNodes} onSelect={state.selectNode}>
@@ -73,28 +77,18 @@ export const ExecutionPlanTreeBlock = observer<Props>(function ExecutionPlanTree
             </TableHeader>
             <TableBody>
               {state.nodes.map(node => (
-                <NestedNode
-                  key={node.id}
-                  columns={state.columns}
-                  node={node}
-                  depth={0}
-                />
+                <NestedNode key={node.id} columns={state.columns} node={node} depth={0} />
               ))}
             </TableBody>
           </Table>
-        ) : <TextPlaceholder>{translate('sql_execution_plan_placeholder')}</TextPlaceholder>}
+        ) : (
+          <TextPlaceholder>{translate('sql_execution_plan_placeholder')}</TextPlaceholder>
+        )}
       </Pane>
       <ResizerControls />
-      <Pane basis='30%' main>
-        <Textarea
-          className={className}
-          name='value'
-          rows={3}
-          value={query}
-          readOnly
-          embedded
-        />
+      <Pane basis="30%" main>
+        <Textarea className={className} name="value" rows={3} value={query} readOnly embedded />
       </Pane>
-    </Split>
+    </Split>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeContext.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeContext.ts
index 561e046d8f..7a8cf523fd 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeContext.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/ExecutionPlanTreeContext.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createContext } from 'react';
 
 import type { ObjectPropertyInfo, SqlExecutionPlanNode } from '@cloudbeaver/core-sdk';
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.tsx
index 562c6c1b72..7cb91082fb 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css, use } from 'reshadow';
 
 import { Icon } from '@cloudbeaver/core-blocks';
@@ -17,28 +16,20 @@ interface Props {
 }
 
 const styles = css`
-    Icon {
-      composes: theme-text-on-surface from global;
-      width: 100%;
-      height: 100%;
-      cursor: pointer;
-      opacity: 0.5;
-      transform: rotate(-90deg);
-      transition: transform 0.15s ease-in-out;
-      &[|expanded] {
-        transform: rotate(0deg);
-      }
+  Icon {
+    composes: theme-text-on-surface from global;
+    width: 100%;
+    height: 100%;
+    cursor: pointer;
+    opacity: 0.5;
+    transform: rotate(-90deg);
+    transition: transform 0.15s ease-in-out;
+    &[|expanded] {
+      transform: rotate(0deg);
     }
-  `;
+  }
+`;
 
 export const Expand: React.FC<Props> = function Expand({ expanded, onClick, className }) {
-  return styled(styles)(
-    <Icon
-      className={className}
-      name='arrow'
-      viewBox='0 0 16 16'
-      onClick={onClick}
-      {...use({ expanded })}
-    />
-  );
+  return styled(styles)(<Icon className={className} name="arrow" viewBox="0 0 16 16" onClick={onClick} {...use({ expanded })} />);
 };
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/NestedNode.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/NestedNode.tsx
index db93e961ef..255a0be8b2 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/NestedNode.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/NestedNode.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useCallback, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { TableItem, TableColumnValue, EventTableItemSelectionFlag } from '@cloudbeaver/core-blocks';
+import { EventTableItemSelectionFlag, TableColumnValue, TableItem } from '@cloudbeaver/core-blocks';
 import { EventContext } from '@cloudbeaver/core-events';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
@@ -63,11 +62,7 @@ export const NestedNode: React.FC<Props> = function NestedNode({ columns, node,
                 {idx === 0 && (
                   <>
                     <span>{`${'\t'.repeat(depth)}`}</span>
-                    <expand-container>
-                      {hasChildren && (
-                        <Expand expanded={expanded} onClick={expand} />
-                      )}
-                    </expand-container>
+                    <expand-container>{hasChildren && <Expand expanded={expanded} onClick={expand} />}</expand-container>
                   </>
                 )}
                 {value}
@@ -76,14 +71,7 @@ export const NestedNode: React.FC<Props> = function NestedNode({ columns, node,
           );
         })}
       </TableItem>
-      {expanded && node.children.map(child => (
-        <NestedNode
-          key={child.id}
-          columns={columns}
-          node={child}
-          depth={depth + 1}
-        />
-      ))}
-    </>
+      {expanded && node.children.map(child => <NestedNode key={child.id} columns={columns} node={child} depth={depth + 1} />)}
+    </>,
   );
 };
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx
index 0e844363a1..d99ba6674f 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
 
-import { Table, TableHeader, TableColumnHeader, TableBody, TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks';
+import { Table, TableBody, TableColumnHeader, TableHeader, TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ObjectPropertyInfo, SqlExecutionPlanNode } from '@cloudbeaver/core-sdk';
 
 import { isVisibleProperty } from '../useExecutionPlanTreeState';
@@ -25,26 +24,30 @@ interface Props {
 export const PropertiesPanel = observer<Props>(function PropertiesPanel({ selectedNode, nodeList, className }) {
   const translate = useTranslate();
 
-  const { general, details } = useMemo(() => computed(() => {
-    const general: ObjectPropertyInfo[] = [];
-    const details: ObjectPropertyInfo[] = [];
+  const { general, details } = useMemo(
+    () =>
+      computed(() => {
+        const general: ObjectPropertyInfo[] = [];
+        const details: ObjectPropertyInfo[] = [];
 
-    const node = nodeList.find(node => node.id === selectedNode);
+        const node = nodeList.find(node => node.id === selectedNode);
 
-    if (!node) {
-      return { general, details };
-    }
+        if (!node) {
+          return { general, details };
+        }
 
-    for (const property of node.properties) {
-      if (isVisibleProperty(property)) {
-        general.push(property);
-      } else {
-        details.push(property);
-      }
-    }
+        for (const property of node.properties) {
+          if (isVisibleProperty(property)) {
+            general.push(property);
+          } else {
+            details.push(property);
+          }
+        }
 
-    return { general, details };
-  }), [selectedNode, nodeList]).get();
+        return { general, details };
+      }),
+    [selectedNode, nodeList],
+  ).get();
 
   if (!general.length && !details.length) {
     return <TextPlaceholder>{translate('sql_execution_plan_properties_panel_placeholder')}</TextPlaceholder>;
@@ -56,12 +59,8 @@ export const PropertiesPanel = observer<Props>(function PropertiesPanel({ select
   return (
     <Table className={className}>
       <TableHeader fixed>
-        <TableColumnHeader title={nameColumnTitle}>
-          {nameColumnTitle}
-        </TableColumnHeader>
-        <TableColumnHeader title={valueColumnTitle}>
-          {valueColumnTitle}
-        </TableColumnHeader>
+        <TableColumnHeader title={nameColumnTitle}>{nameColumnTitle}</TableColumnHeader>
+        <TableColumnHeader title={valueColumnTitle}>{valueColumnTitle}</TableColumnHeader>
       </TableHeader>
       <TableBody>
         {!!general.length && <PropertiesPanelItemsGroup properties={general} name={translate('sql_execution_plan_properties_panel_general')} />}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanelItemsGroup.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanelItemsGroup.tsx
index 07983d3c33..786488f654 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanelItemsGroup.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanelItemsGroup.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { TableItem, TableColumnValue } from '@cloudbeaver/core-blocks';
+import { TableColumnValue, TableItem } from '@cloudbeaver/core-blocks';
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
 import { Expand } from '../Expand';
@@ -53,21 +52,18 @@ export const PropertiesPanelItemsGroup: React.FC<Props> = function PropertiesPan
         </TableColumnValue>
         <TableColumnValue />
       </TableItem>
-      {expanded && properties.map(property => {
-        const name = property.displayName;
-        const tooltip = `${name} ${property.description ? '(' + property.description + ')' : ''}`;
-        const value = getPropertyValue(property);
-        return (
-          <TableItem key={property.id} item={property.id} selectDisabled>
-            <TableColumnValue title={tooltip}>
-              {'\t\t' + name}
-            </TableColumnValue>
-            <TableColumnValue title={value}>
-              {value}
-            </TableColumnValue>
-          </TableItem>
-        );
-      })}
-    </>
+      {expanded &&
+        properties.map(property => {
+          const name = property.displayName;
+          const tooltip = `${name} ${property.description ? '(' + property.description + ')' : ''}`;
+          const value = getPropertyValue(property);
+          return (
+            <TableItem key={property.id} item={property.id} selectDisabled>
+              <TableColumnValue title={tooltip}>{'\t\t' + name}</TableColumnValue>
+              <TableColumnValue title={value}>{value}</TableColumnValue>
+            </TableItem>
+          );
+        })}
+    </>,
   );
 };
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx
index 0dca31c09b..b548e6596b 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx
@@ -5,12 +5,11 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { Split, Pane, ResizerControls, splitStyles, Loader, useSplitUserState } from '@cloudbeaver/core-blocks';
+import { Loader, Pane, ResizerControls, Split, splitStyles, useSplitUserState } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
 import type { IExecutionPlanTab } from '../../ISqlEditorTabState';
@@ -19,53 +18,40 @@ import { PropertiesPanel } from './PropertiesPanel/PropertiesPanel';
 import { SqlExecutionPlanService } from './SqlExecutionPlanService';
 
 const styles = css`
-    Pane {
-      composes: theme-background-surface theme-text-on-surface from global;
-    }
-    Pane:first-child {
-      overflow: hidden;
-    }
- `;
+  Pane {
+    composes: theme-background-surface theme-text-on-surface from global;
+  }
+  Pane:first-child {
+    overflow: hidden;
+  }
+`;
 
 interface Props {
   executionPlanTab: IExecutionPlanTab;
 }
 
-export const SqlExecutionPlanPanel = observer<Props>(function SqlExecutionPlanPanel({
-  executionPlanTab,
-}) {
+export const SqlExecutionPlanPanel = observer<Props>(function SqlExecutionPlanPanel({ executionPlanTab }) {
   const sqlExecutionPlanService = useService(SqlExecutionPlanService);
   const data = sqlExecutionPlanService.data.get(executionPlanTab.tabId);
   const [selectedNode, setSelectedNode] = useState<string | null>(null);
   const splitState = useSplitUserState('execution-plan');
 
   if (data?.task.executing || !data?.executionPlan) {
-    return (
-      <Loader
-        cancelDisabled={!data?.task.cancellable}
-        onCancel={() => data?.task.cancel()}
-      />
-    );
+    return <Loader cancelDisabled={!data?.task.cancellable} onCancel={() => data?.task.cancel()} />;
   }
 
-  return styled(styles, splitStyles)(
-    <Split
-      {...splitState}
-      mode={selectedNode ? splitState.mode : 'minimize'}
-      disable={!selectedNode}
-      sticky={30}
-    >
+  return styled(
+    styles,
+    splitStyles,
+  )(
+    <Split {...splitState} mode={selectedNode ? splitState.mode : 'minimize'} disable={!selectedNode} sticky={30}>
       <Pane>
-        <ExecutionPlanTreeBlock
-          nodeList={data.executionPlan.nodes}
-          query={data.executionPlan.query}
-          onNodeSelect={setSelectedNode}
-        />
+        <ExecutionPlanTreeBlock nodeList={data.executionPlan.nodes} query={data.executionPlan.query} onNodeSelect={setSelectedNode} />
       </Pane>
       <ResizerControls />
-      <Pane basis='30%' main>
+      <Pane basis="30%" main>
         {selectedNode && <PropertiesPanel selectedNode={selectedNode} nodeList={data.executionPlan.nodes} />}
       </Pane>
-    </Split>
+    </Split>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanService.ts
index a83926cb1c..7658b2e16f 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanService.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionExecutionContextService } from '@cloudbeaver/core-connections';
@@ -32,7 +31,7 @@ export class SqlExecutionPlanService {
     private readonly notificationService: NotificationService,
     private readonly asyncTaskInfoService: AsyncTaskInfoService,
     private readonly connectionExecutionContextService: ConnectionExecutionContextService,
-    private readonly sqlDataSourceService: SqlDataSourceService
+    private readonly sqlDataSourceService: SqlDataSourceService,
   ) {
     this.data = new Map();
 
@@ -41,10 +40,7 @@ export class SqlExecutionPlanService {
     });
   }
 
-  async executeExecutionPlan(
-    editorState: ISqlEditorTabState,
-    query: string,
-  ): Promise<void> {
+  async executeExecutionPlan(editorState: ISqlEditorTabState, query: string): Promise<void> {
     const dataSource = this.sqlDataSourceService.get(editorState.editorId);
     const contextInfo = dataSource?.executionContext;
 
@@ -77,7 +73,7 @@ export class SqlExecutionPlanService {
         return result;
       },
       () => this.asyncTaskInfoService.cancel(asyncTask.id),
-      () => this.asyncTaskInfoService.remove(asyncTask.id)
+      () => this.asyncTaskInfoService.remove(asyncTask.id),
     );
 
     this.data.set(tabId, {
@@ -90,7 +86,8 @@ export class SqlExecutionPlanService {
 
       const tab = editorState.tabs.find(tab => tab.id === tabId);
 
-      if (!tab) { // tab can be closed before we get result
+      if (!tab) {
+        // tab can be closed before we get result
         return;
       }
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/getPropertyValue.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/getPropertyValue.ts
index 36b7abb93e..f560f609b2 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/getPropertyValue.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/getPropertyValue.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
 export function getPropertyValue(property: ObjectPropertyInfo): string {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/useExecutionPlanTreeState.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/useExecutionPlanTreeState.ts
index f5359c4c0a..7894cda91e 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/useExecutionPlanTreeState.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/useExecutionPlanTreeState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -17,55 +16,57 @@ export function isVisibleProperty(property: ObjectPropertyInfo): boolean {
   return property.features.includes('viewable');
 }
 
-export function useExecutionPlanTreeState(
-  nodeList: SqlExecutionPlanNode[], onNodeSelect: (nodeId: string) => void
-): IExecutionPlanTreeContext {
-  return useObservableRef(() => ({
-    selectedNodes: new Map(),
-    get columns() {
-      const columns: ObjectPropertyInfo[] = [];
+export function useExecutionPlanTreeState(nodeList: SqlExecutionPlanNode[], onNodeSelect: (nodeId: string) => void): IExecutionPlanTreeContext {
+  return useObservableRef(
+    () => ({
+      selectedNodes: new Map(),
+      get columns() {
+        const columns: ObjectPropertyInfo[] = [];
 
-      for (const node of this.nodeList) {
-        for (const property of node.properties) {
-          if (property.id && isVisibleProperty(property) && !columns.find(column => column.id === property.id)) {
-            columns.push(property);
+        for (const node of this.nodeList) {
+          for (const property of node.properties) {
+            if (property.id && isVisibleProperty(property) && !columns.find(column => column.id === property.id)) {
+              columns.push(property);
+            }
           }
         }
-      }
 
-      return columns;
-    },
-    get nodes() {
-      const map: Map<string, number> = new Map();
+        return columns;
+      },
+      get nodes() {
+        const map: Map<string, number> = new Map();
 
-      const tree: IExecutionPlanNode[] = this.nodeList
-        .map((node, idx) => {
+        const tree: IExecutionPlanNode[] = this.nodeList.map((node, idx) => {
           map.set(node.id, idx);
-          return ({ ...node, children: [] });
+          return { ...node, children: [] };
         });
 
-      const nodes: IExecutionPlanNode[] = [];
+        const nodes: IExecutionPlanNode[] = [];
 
-      for (const node of tree) {
-        if (node.parentId) {
-          const parent = map.get(node.parentId)!;
-          tree[parent].children.push(node);
-        } else {
-          nodes.push(node);
+        for (const node of tree) {
+          if (node.parentId) {
+            const parent = map.get(node.parentId)!;
+            tree[parent].children.push(node);
+          } else {
+            nodes.push(node);
+          }
         }
-      }
 
-      return nodes;
+        return nodes;
+      },
+      selectNode(nodeId: string) {
+        this.selectedNodes.clear();
+        this.selectedNodes.set(nodeId, true);
+        this.onNodeSelect(nodeId);
+      },
+    }),
+    {
+      selectedNodes: observable,
+      nodeList: observable.ref,
+      columns: computed,
+      nodes: computed,
     },
-    selectNode(nodeId: string) {
-      this.selectedNodes.clear();
-      this.selectedNodes.set(nodeId, true);
-      this.onNodeSelect(nodeId);
-    },
-  }), {
-    selectedNodes: observable,
-    nodeList: observable.ref,
-    columns: computed,
-    nodes: computed,
-  }, { nodeList, onNodeSelect }, ['selectNode']);
+    { nodeList, onNodeSelect },
+    ['selectNode'],
+  );
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
index badffed0bc..3e368a99f4 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { uuid } from '@cloudbeaver/core-utils';
 import { IDatabaseDataModel, IDatabaseResultSet, TableViewerStorageService } from '@cloudbeaver/plugin-data-viewer';
@@ -15,9 +14,7 @@ import type { IDataQueryOptions } from '../QueryDataSource';
 
 @injectable()
 export class SqlQueryResultService {
-  constructor(
-    private readonly tableViewerStorageService: TableViewerStorageService
-  ) { }
+  constructor(private readonly tableViewerStorageService: TableViewerStorageService) {}
 
   getSelectedGroup(editorState: ISqlEditorTabState): IResultGroup | null {
     const currentTab = editorState.tabs.find(tab => tab.id === editorState.currentTabId);
@@ -27,31 +24,19 @@ export class SqlQueryResultService {
       return null;
     }
 
-    return editorState.resultGroups
-      .find(group => group.groupId === resultTab.groupId)
-    || null;
+    return editorState.resultGroups.find(group => group.groupId === resultTab.groupId) || null;
   }
 
-  getGroups(
-    editorState: ISqlEditorTabState
-  ): IResultGroup[] {
+  getGroups(editorState: ISqlEditorTabState): IResultGroup[] {
     return editorState.resultGroups;
   }
 
-  getGroup(
-    editorState: ISqlEditorTabState,
-    groupId: string
-  ): IResultGroup | undefined {
-    return editorState.resultGroups
-      .find(group => group.groupId === groupId);
+  getGroup(editorState: ISqlEditorTabState, groupId: string): IResultGroup | undefined {
+    return editorState.resultGroups.find(group => group.groupId === groupId);
   }
 
-  getModelGroup(
-    editorState: ISqlEditorTabState,
-    modelId: string
-  ): IResultGroup | undefined {
-    return editorState.resultGroups
-      .find(group => group.modelId === modelId);
+  getModelGroup(editorState: ISqlEditorTabState, modelId: string): IResultGroup | undefined {
+    return editorState.resultGroups.find(group => group.modelId === modelId);
   }
 
   updateGroupTabs(
@@ -60,7 +45,7 @@ export class SqlQueryResultService {
     groupId: string,
     selectFirstResult?: boolean,
     statisticsIndex?: number,
-    queryIndex?: number
+    queryIndex?: number,
   ): void {
     const group = this.getGroup(editorState, groupId);
 
@@ -72,28 +57,19 @@ export class SqlQueryResultService {
 
     const tabsToRemove = editorState.resultTabs
       .filter(
-        resultTab => resultTab.groupId === groupId
-          && resultTab.indexInResultSet !== 0
-          && resultTab.indexInResultSet >= model.source.results.length
-
+        resultTab => resultTab.groupId === groupId && resultTab.indexInResultSet !== 0 && resultTab.indexInResultSet >= model.source.results.length,
       )
       .map(tab => tab.tabId);
 
-    editorState.tabs = editorState.tabs
-      .filter(resultTab => !tabsToRemove.includes(resultTab.id));
-    editorState.resultTabs = editorState.resultTabs
-      .filter(resultTab => !tabsToRemove.includes(resultTab.tabId));
+    editorState.tabs = editorState.tabs.filter(resultTab => !tabsToRemove.includes(resultTab.id));
+    editorState.resultTabs = editorState.resultTabs.filter(resultTab => !tabsToRemove.includes(resultTab.tabId));
 
     if (selectFirstResult) {
       this.selectFirstResult(editorState, groupId);
     }
   }
 
-  createGroup(
-    tabState: ISqlEditorTabState,
-    modelId: string,
-    query: string,
-  ): IResultGroup {
+  createGroup(tabState: ISqlEditorTabState, modelId: string, query: string): IResultGroup {
     const nameOrder = Math.max(1, ...tabState.resultGroups.map(group => group.nameOrder + 1));
     const order = Math.max(0, ...tabState.tabs.map(tab => tab.order + 1));
     const groupId = uuid();
@@ -197,9 +173,8 @@ export class SqlQueryResultService {
   }
 
   selectResult(editorState: ISqlEditorTabState, groupId: string, resultIndex: number) {
-    const resultTab = editorState.resultTabs.filter(
-      resultTab => resultTab.groupId === groupId
-    )
+    const resultTab = editorState.resultTabs
+      .filter(resultTab => resultTab.groupId === groupId)
       .sort((a, b) => {
         if (a.indexInResultSet === resultIndex) {
           return -1;
@@ -211,10 +186,7 @@ export class SqlQueryResultService {
   }
 
   selectFirstResult(editorState: ISqlEditorTabState, groupId: string) {
-    const mainTab = editorState.resultTabs.filter(
-      resultTab => resultTab.groupId === groupId
-    )
-      .sort((a, b) => a.indexInResultSet - b.indexInResultSet);
+    const mainTab = editorState.resultTabs.filter(resultTab => resultTab.groupId === groupId).sort((a, b) => a.indexInResultSet - b.indexInResultSet);
 
     editorState.currentTabId = mainTab[0].tabId;
   }
@@ -224,7 +196,7 @@ export class SqlQueryResultService {
     group: IResultGroup,
     model: IDatabaseDataModel<IDataQueryOptions, IDatabaseResultSet>,
     statisticsIndex?: number,
-    queryIndex?: number
+    queryIndex?: number,
   ) {
     this.updateResultTab(state, group, model, 0, statisticsIndex, queryIndex);
 
@@ -239,32 +211,17 @@ export class SqlQueryResultService {
     model: IDatabaseDataModel<IDataQueryOptions, IDatabaseResultSet>,
     indexInResultSet: number,
     statisticsIndex?: number,
-    queryIndex?: number
+    queryIndex?: number,
   ) {
-    const resultTab = state.resultTabs.find(
-      tab => tab.groupId === group.groupId && tab.indexInResultSet === indexInResultSet
-    );
+    const resultTab = state.resultTabs.find(tab => tab.groupId === group.groupId && tab.indexInResultSet === indexInResultSet);
 
     if (!resultTab) {
-      this.createResultTab(
-        state,
-        group,
-        indexInResultSet,
-        model.source.results.length,
-        statisticsIndex,
-        queryIndex
-      );
+      this.createResultTab(state, group, indexInResultSet, model.source.results.length, statisticsIndex, queryIndex);
     } else {
       const tab = state.tabs.find(tab => tab.id === resultTab.tabId);
 
       if (tab) {
-        tab.name = this.getTabNameForOrder(
-          group.nameOrder,
-          indexInResultSet,
-          model.source.results.length,
-          statisticsIndex,
-          queryIndex
-        );
+        tab.name = this.getTabNameForOrder(group.nameOrder, indexInResultSet, model.source.results.length, statisticsIndex, queryIndex);
       }
     }
   }
@@ -275,7 +232,7 @@ export class SqlQueryResultService {
     indexInResultSet: number,
     results: number,
     statisticsIndex?: number,
-    queryIndex?: number
+    queryIndex?: number,
   ) {
     const id = uuid();
 
@@ -287,25 +244,13 @@ export class SqlQueryResultService {
 
     state.tabs.push({
       id,
-      name: this.getTabNameForOrder(
-        group.nameOrder,
-        indexInResultSet,
-        results,
-        statisticsIndex,
-        queryIndex
-      ),
+      name: this.getTabNameForOrder(group.nameOrder, indexInResultSet, results, statisticsIndex, queryIndex),
       icon: 'table-icon',
       order: group.order,
     });
   }
 
-  getTabNameForOrder(
-    order: number,
-    indexInResultSet: number,
-    results: number,
-    statisticsIndex?: number,
-    queryIndex?: number
-  ) {
+  getTabNameForOrder(order: number, indexInResultSet: number, results: number, statisticsIndex?: number, queryIndex?: number) {
     let name = `Result - ${statisticsIndex ?? order}`;
 
     if (queryIndex) {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
index cda1900d71..58ca739f4e 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryService.ts
@@ -5,7 +5,6 @@
  * 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 { ConnectionExecutionContextService, ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
@@ -13,9 +12,15 @@ import { App, injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
 import {
-  DatabaseDataAccessMode, DatabaseDataModel, DatabaseEditAction, DataViewerDataChangeConfirmationService,
-  IDatabaseDataModel, IDatabaseResultSet, DataViewerService, TableViewerStorageService,
-  DataViewerSettingsService
+  DatabaseDataAccessMode,
+  DatabaseDataModel,
+  DatabaseEditAction,
+  DataViewerDataChangeConfirmationService,
+  DataViewerService,
+  DataViewerSettingsService,
+  IDatabaseDataModel,
+  IDatabaseResultSet,
+  TableViewerStorageService,
 } from '@cloudbeaver/plugin-data-viewer';
 
 import type { IResultGroup, ISqlEditorTabState } from '../ISqlEditorTabState';
@@ -52,7 +57,7 @@ export class SqlQueryService {
     private readonly dataViewerDataChangeConfirmationService: DataViewerDataChangeConfirmationService,
     private readonly dataViewerService: DataViewerService,
     private readonly sqlDataSourceService: SqlDataSourceService,
-    private readonly dataViewerSettingsService: DataViewerSettingsService
+    private readonly dataViewerSettingsService: DataViewerSettingsService,
   ) {
     this.statisticsMap = new Map();
 
@@ -73,9 +78,7 @@ export class SqlQueryService {
       return;
     }
 
-    const groups = this.sqlQueryResultService
-      .getGroups(editorState)
-      .filter(group => !databaseModels.some(model => model.id === group.modelId));
+    const groups = this.sqlQueryResultService.getGroups(editorState).filter(group => !databaseModels.some(model => model.id === group.modelId));
 
     for (const group of groups) {
       this.sqlQueryResultService.removeGroup(editorState, group.groupId);
@@ -107,11 +110,7 @@ export class SqlQueryService {
     }
   }
 
-  async executeEditorQuery(
-    editorState: ISqlEditorTabState,
-    query: string,
-    inNewTab: boolean
-  ): Promise<void> {
+  async executeEditorQuery(editorState: ISqlEditorTabState, query: string, inNewTab: boolean): Promise<void> {
     const dataSource = this.sqlDataSourceService.get(editorState.editorId);
     const contextInfo = dataSource?.executionContext;
     const executionContext = contextInfo && this.connectionExecutionContextService.get(contextInfo.id);
@@ -131,11 +130,7 @@ export class SqlQueryService {
     let tabGroup = this.sqlQueryResultService.getSelectedGroup(editorState);
 
     if (inNewTab || !tabGroup) {
-      source = new QueryDataSource(
-        this.app.getServiceInjector(),
-        this.graphQLService,
-        this.asyncTaskInfoService,
-      );
+      source = new QueryDataSource(this.app.getServiceInjector(), this.graphQLService, this.asyncTaskInfoService);
       model = this.tableViewerStorageService.add(new DatabaseDataModel(source));
       this.dataViewerDataChangeConfirmationService.trackTableDataUpdate(model.id);
       tabGroup = this.sqlQueryResultService.createGroup(editorState, model.id, query);
@@ -157,23 +152,15 @@ export class SqlQueryService {
         constraints: [],
         whereFilter: '',
       })
-      .source
-      .setExecutionContext(executionContext)
+      .source.setExecutionContext(executionContext)
       .setSupportedDataFormats(connectionInfo.supportedDataFormats);
 
     this.sqlQueryResultService.updateGroupTabs(editorState, model, tabGroup.groupId, true);
 
     try {
-      await model
-        .setCountGain(this.dataViewerSettingsService.getDefaultRowsCount())
-        .setSlice(0)
-        .request();
+      await model.setCountGain(this.dataViewerSettingsService.getDefaultRowsCount()).setSlice(0).request();
 
-      model.setName(this.sqlQueryResultService.getTabNameForOrder(
-        tabGroup.nameOrder,
-        0,
-        model.getResults().length
-      ));
+      model.setName(this.sqlQueryResultService.getTabNameForOrder(tabGroup.nameOrder, 0, model.getResults().length));
       this.sqlQueryResultService.updateGroupTabs(editorState, model, tabGroup.groupId);
     } catch (exception: any) {
       // remove group if execution was cancelled
@@ -187,11 +174,7 @@ export class SqlQueryService {
     }
   }
 
-  async executeQueries(
-    editorState: ISqlEditorTabState,
-    queries: string[],
-    options?: IQueryExecutionOptions
-  ): Promise<void> {
+  async executeQueries(editorState: ISqlEditorTabState, queries: string[], options?: IQueryExecutionOptions): Promise<void> {
     const dataSource = this.sqlDataSourceService.get(editorState.editorId);
     const contextInfo = dataSource?.executionContext;
     const executionContext = contextInfo && this.connectionExecutionContextService.get(contextInfo.id);
@@ -228,11 +211,7 @@ export class SqlQueryService {
       options?.onQueryExecutionStart?.(query, i);
 
       if (!model || !source) {
-        source = new QueryDataSource(
-          this.app.getServiceInjector(),
-          this.graphQLService,
-          this.asyncTaskInfoService,
-        );
+        source = new QueryDataSource(this.app.getServiceInjector(), this.graphQLService, this.asyncTaskInfoService);
         model = this.tableViewerStorageService.add(new DatabaseDataModel(source));
         this.dataViewerDataChangeConfirmationService.trackTableDataUpdate(model.id);
       }
@@ -247,15 +226,11 @@ export class SqlQueryService {
           constraints: [],
           whereFilter: '',
         })
-        .source
-        .setExecutionContext(executionContext)
+        .source.setExecutionContext(executionContext)
         .setSupportedDataFormats(connectionInfo.supportedDataFormats);
 
       try {
-        await model
-          .setCountGain(this.dataViewerSettingsService.getDefaultRowsCount())
-          .setSlice(0)
-          .request();
+        await model.setCountGain(this.dataViewerSettingsService.getDefaultRowsCount()).setSlice(0).request();
 
         const cancelled = model.source.cancelled;
 
@@ -268,22 +243,9 @@ export class SqlQueryService {
 
         if (source.results.some(result => result.data)) {
           const tabGroup = this.sqlQueryResultService.createGroup(editorState, model.id, query);
-          model.setName(this.sqlQueryResultService.getTabNameForOrder(
-            tabGroup.nameOrder,
-            0,
-            model.getResults().length,
-            statisticsTab.order,
-            i + 1
-          ));
+          model.setName(this.sqlQueryResultService.getTabNameForOrder(tabGroup.nameOrder, 0, model.getResults().length, statisticsTab.order, i + 1));
           this.switchTabToActiveRequest(editorState, tabGroup, model);
-          this.sqlQueryResultService.updateGroupTabs(
-            editorState,
-            model,
-            tabGroup.groupId,
-            false,
-            statisticsTab.order,
-            i + 1
-          );
+          this.sqlQueryResultService.updateGroupTabs(editorState, model, tabGroup.groupId, false, statisticsTab.order, i + 1);
 
           model = source = undefined;
         }
@@ -293,18 +255,10 @@ export class SqlQueryService {
         if (cancelled) {
           break;
         }
-
       } catch (exception: any) {
         if (model) {
           const tabGroup = this.sqlQueryResultService.createGroup(editorState, model.id, query);
-          this.sqlQueryResultService.updateGroupTabs(
-            editorState,
-            model,
-            tabGroup.groupId,
-            true,
-            statisticsTab.order,
-            i + 1
-          );
+          this.sqlQueryResultService.updateGroupTabs(editorState, model, tabGroup.groupId, true, statisticsTab.order, i + 1);
 
           model = source = undefined;
         }
@@ -328,25 +282,18 @@ export class SqlQueryService {
   private switchTabToActiveRequest(
     editorState: ISqlEditorTabState,
     tabGroup: IResultGroup,
-    model: IDatabaseDataModel<IDataQueryOptions, IDatabaseResultSet>
+    model: IDatabaseDataModel<IDataQueryOptions, IDatabaseResultSet>,
   ) {
     model.onRequest.addPostHandler(({ type }) => {
       if (type === 'on') {
         const activeGroupId = this.sqlQueryResultService.getSelectedGroup(editorState)?.groupId;
         for (const result of model.getResults()) {
-          const editor = model.source.getActionImplementation(
-            result,
-            DatabaseEditAction
-          );
+          const editor = model.source.getActionImplementation(result, DatabaseEditAction);
 
           const edited = editor?.isEdited() && model.source.executionContext?.context;
 
           if (edited && activeGroupId !== tabGroup.groupId) {
-            this.sqlQueryResultService.selectResult(
-              editorState,
-              tabGroup.groupId,
-              model.getResults().indexOf(result)
-            );
+            this.sqlQueryResultService.selectResult(editorState, tabGroup.groupId, model.getResults().indexOf(result));
             return;
           }
         }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel.tsx
index 3039407013..523fa6876d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -36,7 +35,7 @@ export const SqlResultPanel = observer<Props>(function SqlResultPanel({ state, i
     return styled(style)(
       <result-panel>
         <SqlResultSetPanel resultTab={resultTab} group={group} />
-      </result-panel>
+      </result-panel>,
     );
   }
 
@@ -46,7 +45,7 @@ export const SqlResultPanel = observer<Props>(function SqlResultPanel({ state, i
     return styled(style)(
       <result-panel>
         <SqlExecutionPlanPanel executionPlanTab={executionPlanTab} />
-      </result-panel>
+      </result-panel>,
     );
   }
 
@@ -56,7 +55,7 @@ export const SqlResultPanel = observer<Props>(function SqlResultPanel({ state, i
     return styled(style)(
       <result-panel>
         <SqlScriptStatisticsPanel tab={statisticsTab} />
-      </result-panel>
+      </result-panel>,
     );
   }
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultSetPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultSetPanel.tsx
index 2d86b906ea..37dea8c58f 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultSetPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultSetPanel.tsx
@@ -5,7 +5,6 @@
  * 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 { useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -26,10 +25,7 @@ interface Props {
   resultTab: IResultTab;
 }
 
-export const SqlResultSetPanel = observer<Props>(function SqlResultSetPanel({
-  group,
-  resultTab,
-}) {
+export const SqlResultSetPanel = observer<Props>(function SqlResultSetPanel({ group, resultTab }) {
   const [presentationId, setPresentation] = useState('');
   const [valuePresentationId, setValuePresentation] = useState<string | null>(null);
 
@@ -41,6 +37,6 @@ export const SqlResultSetPanel = observer<Props>(function SqlResultSetPanel({
       valuePresentationId={valuePresentationId}
       onPresentationChange={setPresentation}
       onValuePresentationChange={setValuePresentation}
-    />
+    />,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx
index 6817ae4503..258b5463d9 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx
@@ -5,7 +5,6 @@
  * 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 { useContext } from 'react';
 import styled from 'reshadow';
@@ -25,29 +24,16 @@ interface Props {
   onClose?: (tab: ITabData) => Promise<void>;
 }
 
-export const SqlResultTab = observer<Props>(function SqlResultTab({
-  result,
-  className,
-  style,
-  onClose,
-}) {
+export const SqlResultTab = observer<Props>(function SqlResultTab({ result, className, style, onClose }) {
   const viewContext = useContext(CaptureViewContext);
   const tabMenuContext = useDataContext(viewContext);
 
   tabMenuContext.set(DATA_CONTEXT_SQL_EDITOR_RESULT_ID, result);
 
   return styled(useStyles(style))(
-    <Tab
-      key={result.id}
-      tabId={result.id}
-      style={style}
-      title={result.name}
-      menuContext={tabMenuContext}
-      className={className}
-      onClose={onClose}
-    >
+    <Tab key={result.id} tabId={result.id} style={style} title={result.name} menuContext={tabMenuContext} className={className} onClose={onClose}>
       <TabIcon icon={result.icon} />
       <TabTitle>{result.name}</TabTitle>
-    </Tab>
+    </Tab>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
index f3ad558be4..609691fd4c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
@@ -5,13 +5,12 @@
  * 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, use } from 'reshadow';
 
 import { getComputed, TextPlaceholder, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { ITabData, TabsState, TabList, TabPanel, BASE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import { BASE_TAB_STYLES, ITabData, TabList, TabPanel, TabsState } from '@cloudbeaver/core-ui';
 
 import type { ISqlEditorTabState } from '../ISqlEditorTabState';
 import { ESqlDataSourceFeatures } from '../SqlDataSource/ESqlDataSourceFeatures';
@@ -21,35 +20,35 @@ import { SqlResultTab } from './SqlResultTab';
 import { SqlResultTabsService } from './SqlResultTabsService';
 
 const styles = css`
-    Tab {
-      composes: theme-ripple theme-background-surface theme-text-text-primary-on-light from global;
-    }
-    TabIcon {
-      composes: theme-text-surface from global;
-    }
-    wrapper {
-      overflow: auto;
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      position: relative;
-    }
-    TabsBox {
-      height: 100%;
-    }
-    TabList {
-      composes: theme-background-background theme-text-text-primary-on-light from global;
-      display: flex;
-      overflow: auto;
-    }
-    TabList:not([|executable]) tab-outer:only-child {
-      display: none;
-    }
-    TextPlaceholder {
-      padding: 24px;
-    }
-  `;
+  Tab {
+    composes: theme-ripple theme-background-surface theme-text-text-primary-on-light from global;
+  }
+  TabIcon {
+    composes: theme-text-surface from global;
+  }
+  wrapper {
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    position: relative;
+  }
+  TabsBox {
+    height: 100%;
+  }
+  TabList {
+    composes: theme-background-background theme-text-text-primary-on-light from global;
+    display: flex;
+    overflow: auto;
+  }
+  TabList:not([|executable]) tab-outer:only-child {
+    display: none;
+  }
+  TextPlaceholder {
+    padding: 24px;
+  }
+`;
 
 interface Props {
   state: ISqlEditorTabState;
@@ -64,18 +63,16 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
   const sqlDataSourceService = useService(SqlDataSourceService);
   const dataSource = getComputed(() => sqlDataSourceService.get(state.editorId));
 
-  const orderedTabs = state.tabs
-    .slice()
-    .sort((tabA, tabB) => {
-      const resultTabA = state.resultTabs.find(tab => tab.tabId === tabA.id);
-      const resultTabB = state.resultTabs.find(tab => tab.tabId === tabB.id);
+  const orderedTabs = state.tabs.slice().sort((tabA, tabB) => {
+    const resultTabA = state.resultTabs.find(tab => tab.tabId === tabA.id);
+    const resultTabB = state.resultTabs.find(tab => tab.tabId === tabB.id);
 
-      if (resultTabA && resultTabB && tabA.order === tabB.order) {
-        return resultTabA.indexInResultSet - resultTabB.indexInResultSet;
-      }
+    if (resultTabA && resultTabB && tabA.order === tabB.order) {
+      return resultTabA.indexInResultSet - resultTabB.indexInResultSet;
+    }
 
-      return tabA.order - tabB.order;
-    });
+    return tabA.order - tabB.order;
+  });
 
   function handleSelect(tab: ITabData) {
     sqlResultTabsService.selectResultTab(state, tab.tabId);
@@ -119,13 +116,9 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
         onChange={handleSelect}
         onClose={handleClose}
       >
-        <TabList aria-label='SQL Results' {...use({ executable })} style={styles}>
+        <TabList aria-label="SQL Results" {...use({ executable })} style={styles}>
           {orderedTabs.map(result => (
-            <SqlResultTab
-              key={result.id}
-              result={result}
-              style={styles}
-            />
+            <SqlResultTab key={result.id} result={result} style={styles} />
           ))}
         </TabList>
         {orderedTabs.map(result => (
@@ -134,6 +127,6 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
           </TabPanel>
         ))}
       </TabsState>
-    </wrapper>
+    </wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
index 35b67c68c5..2c2a214b20 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
 
-import type { ISqlEditorTabState, ISqlEditorResultTab } from '../ISqlEditorTabState';
+import type { ISqlEditorResultTab, ISqlEditorTabState } from '../ISqlEditorTabState';
 import { SqlExecutionPlanService } from './ExecutionPlan/SqlExecutionPlanService';
 import { SqlQueryResultService } from './SqlQueryResultService';
 import { SqlQueryService } from './SqlQueryService';
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlScriptStatisticsPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlScriptStatisticsPanel.tsx
index f53593654d..b923e1bbb6 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlScriptStatisticsPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlScriptStatisticsPanel.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -44,9 +43,7 @@ const styles = css`
   }
 `;
 
-export const SqlScriptStatisticsPanel = observer<IProps>(function SqlScriptStatisticsPanel({
-  tab,
-}) {
+export const SqlScriptStatisticsPanel = observer<IProps>(function SqlScriptStatisticsPanel({ tab }) {
   const sqlQueryService = useService(SqlQueryService);
   const tableViewerStorageService = useService(TableViewerStorageService);
   const statistics = sqlQueryService.getStatistics(tab.tabId);
@@ -57,25 +54,23 @@ export const SqlScriptStatisticsPanel = observer<IProps>(function SqlScriptStati
   }
 
   const source: QueryDataSource | undefined = statistics.modelId
-    ? tableViewerStorageService.get(statistics.modelId)?.source as QueryDataSource
+    ? (tableViewerStorageService.get(statistics.modelId)?.source as QueryDataSource)
     : undefined;
 
   return styled(styles)(
     <statistics>
-      {translate('sql_editor_sql_execution_executed_queries')} {statistics.executedQueries} / {statistics.queries}<br />
-      {translate('data_viewer_statistics_duration')} {statistics.executeTime} ms<br />
-      {translate('data_viewer_statistics_updated_rows')} {statistics.updatedRows}<br />
+      {translate('sql_editor_sql_execution_executed_queries')} {statistics.executedQueries} / {statistics.queries}
+      <br />
+      {translate('data_viewer_statistics_duration')} {statistics.executeTime} ms
+      <br />
+      {translate('data_viewer_statistics_updated_rows')} {statistics.updatedRows}
+      <br />
       {source && (
         <>
-          <Loader
-            message='sql_editor_sql_execution_executing'
-            cancelDisabled={!source.canCancel}
-            inline
-            onCancel={() => source.cancel()}
-          />
+          <Loader message="sql_editor_sql_execution_executing" cancelDisabled={!source.canCancel} inline onCancel={() => source.cancel()} />
           <pre>{source.options?.query}</pre>
         </>
       )}
-    </statistics>
+    </statistics>,
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE.ts b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE.ts
index 050362ef3d..7bc1d0aa65 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE.ts
@@ -5,13 +5,9 @@
  * 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_SQL_EDITOR_EXECUTE = createAction(
-  'sql-editor-execute',
-  {
-    icon: '/icons/sql_exec.svg',
-    label: 'sql_editor_sql_execution_button_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_EXECUTE = createAction('sql-editor-execute', {
+  icon: '/icons/sql_exec.svg',
+  label: 'sql_editor_sql_execution_button_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_NEW.ts b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_NEW.ts
index dd399e30b3..6b7da3f255 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_NEW.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_NEW.ts
@@ -5,13 +5,9 @@
  * 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_SQL_EDITOR_EXECUTE_NEW = createAction(
-  'sql-editor-execute-new',
-  {
-    icon: '/icons/sql_exec_new.svg',
-    label: 'sql_editor_sql_execution_new_tab_button_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_EXECUTE_NEW = createAction('sql-editor-execute-new', {
+  icon: '/icons/sql_exec_new.svg',
+  label: 'sql_editor_sql_execution_new_tab_button_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_SCRIPT.ts b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_SCRIPT.ts
index b2e8d9ca30..59e1846e32 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_SCRIPT.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_EXECUTE_SCRIPT.ts
@@ -5,14 +5,10 @@
  * 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_SQL_EDITOR_EXECUTE_SCRIPT = createAction(
-  'sql-editor-execute-script',
-  {
-    icon: '/icons/sql_script_exec.svg',
-    label: 'sql_editor_sql_execution_script_button_tooltip',
-    tooltip: 'sql_editor_sql_execution_script_button_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_EXECUTE_SCRIPT = createAction('sql-editor-execute-script', {
+  icon: '/icons/sql_script_exec.svg',
+  label: 'sql_editor_sql_execution_script_button_tooltip',
+  tooltip: 'sql_editor_sql_execution_script_button_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_FORMAT.ts b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_FORMAT.ts
index 0c084b1d91..c36ba2493f 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_FORMAT.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_FORMAT.ts
@@ -5,13 +5,9 @@
  * 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_SQL_EDITOR_FORMAT = createAction(
-  'sql-editor-format',
-  {
-    icon: '/icons/sql_exec.svg',
-    label: 'sql_editor_sql_execution_button_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_FORMAT = createAction('sql-editor-format', {
+  icon: '/icons/sql_exec.svg',
+  label: 'sql_editor_sql_execution_button_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
index e18aedd5fe..a4322f4716 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
@@ -5,13 +5,9 @@
  * 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_SQL_EDITOR_SHOW_EXECUTION_PLAN = createAction(
-  'sql-editor-show-execution-plan',
-  {
-    icon: '/icons/sql_execution_plan.svg',
-    label: 'sql_editor_execution_plan_button_tooltip',
-  }
-);
+export const ACTION_SQL_EDITOR_SHOW_EXECUTION_PLAN = createAction('sql-editor-show-execution-plan', {
+  icon: '/icons/sql_execution_plan.svg',
+  label: 'sql_editor_execution_plan_button_tooltip',
+});
diff --git a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE.ts b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE.ts
index fc0f1bb3c8..bd170ded65 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_SQL_EDITOR_EXECUTE = createKeyBinding({
   id: 'sql-editor-execute',
   label: 'Ctrl + Enter',
diff --git a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW.ts b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW.ts
index c50759c94a..efc9f1c434 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_SQL_EDITOR_EXECUTE_NEW = createKeyBinding({
   id: 'sql-editor-execute-new',
   label: 'Ctrl + \\ or Shift + Ctrl + Enter',
diff --git a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT.ts b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT.ts
index 1d4edec00b..a88680292e 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT = createKeyBinding({
   id: 'sql-editor-execute-script',
   label: 'Alt + X',
diff --git a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_FORMAT.ts b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_FORMAT.ts
index 8efe2d49c9..010bd367e3 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_FORMAT.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_FORMAT.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_SQL_EDITOR_FORMAT = createKeyBinding({
   id: 'sql-editor-format',
   label: 'Shift + Ctrl + F',
diff --git a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
index 2462b0177b..e724aaf390 100644
--- a/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
+++ b/webapp/packages/plugin-sql-editor/src/actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN.ts
@@ -5,10 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { createKeyBinding } from '@cloudbeaver/core-view';
 
-
 export const KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN = createKeyBinding({
   id: 'sql-editor-show-execution-plan',
   label: 'Shift + Ctrl + E',
diff --git a/webapp/packages/plugin-sql-editor/src/getSqlEditorName.ts b/webapp/packages/plugin-sql-editor/src/getSqlEditorName.ts
index e67612b2b8..df882c8b86 100644
--- a/webapp/packages/plugin-sql-editor/src/getSqlEditorName.ts
+++ b/webapp/packages/plugin-sql-editor/src/getSqlEditorName.ts
@@ -5,17 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { Connection } from '@cloudbeaver/core-connections';
 
 import type { ISqlEditorTabState } from './ISqlEditorTabState';
 import type { ISqlDataSource } from './SqlDataSource/ISqlDataSource';
 
-export function getSqlEditorName(
-  state: ISqlEditorTabState,
-  dataSource?: ISqlDataSource,
-  connection?: Connection
-): string {
+export function getSqlEditorName(state: ISqlEditorTabState, dataSource?: ISqlDataSource, connection?: Connection): string {
   if (dataSource?.name) {
     return dataSource.name;
   }
@@ -27,4 +22,4 @@ export function getSqlEditorName(
   }
 
   return name;
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-sql-editor/src/index.ts b/webapp/packages/plugin-sql-editor/src/index.ts
index 5c5947cf08..7f4a2911b8 100644
--- a/webapp/packages/plugin-sql-editor/src/index.ts
+++ b/webapp/packages/plugin-sql-editor/src/index.ts
@@ -1,4 +1,5 @@
 import { sqlEditorPluginManifest } from './manifest';
+
 export * from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW';
 export * from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT';
 export * from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE';
diff --git a/webapp/packages/plugin-sql-editor/src/locales/en.ts b/webapp/packages/plugin-sql-editor/src/locales/en.ts
index be946874ff..3c20f7b3bd 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/en.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/en.ts
@@ -23,7 +23,10 @@ export default [
   ['sql_execution_plan_properties_panel_details', 'Details'],
   ['sql_editor_upload_script_tooltip', 'Upload sql script'],
   ['sql_editor_download_script_tooltip', 'Download sql script'],
-  ['sql_editor_upload_script_unsaved_changes_dialog_message', 'Your current script will be overwritten by the uploaded script. Do you want to save it first?'],
+  [
+    'sql_editor_upload_script_unsaved_changes_dialog_message',
+    'Your current script will be overwritten by the uploaded script. Do you want to save it first?',
+  ],
   ['sql_editor_upload_script_max_size_title', 'File size exceeds max size'],
   ['sql_editor_close_result_tabs_dialog_title', 'Confirm closing tabs'],
 ];
diff --git a/webapp/packages/plugin-sql-editor/src/locales/it.ts b/webapp/packages/plugin-sql-editor/src/locales/it.ts
index 4dc15bddbf..e0649ef0a6 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/it.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/it.ts
@@ -7,8 +7,8 @@ export default [
   ['sql_editor_placeholder', 'Esegui la query con Ctrl+Enter per vedere i risultati'],
   ['sql_editor_hint_empty', 'There is no proposals...'],
   ['sql_editor_execution_plan_button_tooltip', 'Mostra il piano di esecuzione (Shift + Ctrl + E)'],
-  ['sql_editor_sql_execution_button_tooltip', 'Esegui l\'istruzione SQL (Ctrl + Enter)'],
-  ['sql_editor_sql_execution_new_tab_button_tooltip', 'Esegui l\'istruzione SQL in una nuova tab (Ctrl + \\)(Shift + Ctrl + Enter)'],
+  ['sql_editor_sql_execution_button_tooltip', "Esegui l'istruzione SQL (Ctrl + Enter)"],
+  ['sql_editor_sql_execution_new_tab_button_tooltip', "Esegui l'istruzione SQL in una nuova tab (Ctrl + \\)(Shift + Ctrl + Enter)"],
   ['sql_editor_sql_execution_script_button_tooltip', 'Esegui lo script SQL (Alt + X)'],
   ['sql_editor_sql_format_button_tooltip', 'Format SQL Script (Shift + Ctrl + F)'],
   ['sql_editor_sql_execution_script_lock_tooltip', 'Lock editor to prevent modifications'],
diff --git a/webapp/packages/plugin-sql-editor/src/manifest.ts b/webapp/packages/plugin-sql-editor/src/manifest.ts
index 8f528edd63..1118d92010 100644
--- a/webapp/packages/plugin-sql-editor/src/manifest.ts
+++ b/webapp/packages/plugin-sql-editor/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
diff --git a/webapp/packages/plugin-sql-editor/src/useDataSource.ts b/webapp/packages/plugin-sql-editor/src/useDataSource.ts
index 289db7a119..d3f5c54790 100644
--- a/webapp/packages/plugin-sql-editor/src/useDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/useDataSource.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useEffect } from 'react';
 
 import { useObservableRef } from '@cloudbeaver/core-blocks';
@@ -16,28 +15,28 @@ import { SqlEditorService } from './SqlEditorService';
 
 export function useDataSource(dataSource?: ISqlDataSource) {
   const sqlEditorService = useService(SqlEditorService);
-  const refObj = useObservableRef(() => ({
-    async load(refresh?: boolean) {
-      if (!this.dataSource || this.dataSource.isLoading()) {
-        return;
-      }
+  const refObj = useObservableRef(
+    () => ({
+      async load(refresh?: boolean) {
+        if (!this.dataSource || this.dataSource.isLoading()) {
+          return;
+        }
 
-      if (refresh) {
-        this.dataSource.markOutdated();
-      }
+        if (refresh) {
+          this.dataSource.markOutdated();
+        }
 
-      await this.dataSource.load();
+        await this.dataSource.load();
+      },
+    }),
+    {},
+    {
+      dataSource,
     },
-  }), { }, {
-    dataSource,
-  });
-
-  // TODO: getComputed skips update somehow ...
-  const outdated = dataSource && (
-    (dataSource.isOutdated() || !dataSource.isLoaded())
-    && !dataSource.isLoading()
   );
 
+  // TODO: getComputed skips update somehow ...
+  const outdated = dataSource && (dataSource.isOutdated() || !dataSource.isLoaded()) && !dataSource.isLoading();
 
   useEffect(() => {
     if (!outdated) {
@@ -51,12 +50,12 @@ export function useDataSource(dataSource?: ISqlDataSource) {
 
   const executionContextId = dataSource?.executionContext?.id;
 
-  useEffect(() => () => {
-    if (
-      executionContextId !== undefined
-      && dataSource?.executionContext?.id !== executionContextId
-    ) {
-      sqlEditorService.destroyContext({ id: executionContextId, connectionId: '', projectId: '' });
-    }
-  }, [executionContextId, dataSource]);
-}
\ No newline at end of file
+  useEffect(
+    () => () => {
+      if (executionContextId !== undefined && dataSource?.executionContext?.id !== executionContextId) {
+        sqlEditorService.destroyContext({ id: executionContextId, connectionId: '', projectId: '' });
+      }
+    },
+    [executionContextId, dataSource],
+  );
+}
diff --git a/webapp/packages/plugin-sql-generator/src/GeneratorMenuBootstrap.ts b/webapp/packages/plugin-sql-generator/src/GeneratorMenuBootstrap.ts
index 81040fd555..4fe905c901 100644
--- a/webapp/packages/plugin-sql-generator/src/GeneratorMenuBootstrap.ts
+++ b/webapp/packages/plugin-sql-generator/src/GeneratorMenuBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import { DatabaseEditAction, TableFooterMenuService } from '@cloudbeaver/plugin-data-viewer';
@@ -14,10 +13,7 @@ import { ScriptPreviewService } from './ScriptPreview/ScriptPreviewService';
 
 @injectable()
 export class GeneratorMenuBootstrap extends Bootstrap {
-  constructor(
-    private readonly scriptPreviewService: ScriptPreviewService,
-    private readonly tableFooterMenuService: TableFooterMenuService,
-  ) {
+  constructor(private readonly scriptPreviewService: ScriptPreviewService, private readonly tableFooterMenuService: TableFooterMenuService) {
     super();
   }
 
@@ -32,21 +28,20 @@ export class GeneratorMenuBootstrap extends Bootstrap {
         return context.contextType === TableFooterMenuService.nodeContextType;
       },
       isHidden(context) {
-        return context.data.model.isReadonly(context.data.resultIndex)
-          || context.data.model.source.getResult(context.data.resultIndex)?.dataFormat !== ResultDataFormat.Resultset;
+        return (
+          context.data.model.isReadonly(context.data.resultIndex) ||
+          context.data.model.source.getResult(context.data.resultIndex)?.dataFormat !== ResultDataFormat.Resultset
+        );
       },
       isDisabled(context) {
         if (
-          context.data.model.isLoading()
-          || context.data.model.isDisabled(context.data.resultIndex)
-          || !context.data.model.source.hasResult(context.data.resultIndex)
+          context.data.model.isLoading() ||
+          context.data.model.isDisabled(context.data.resultIndex) ||
+          !context.data.model.source.hasResult(context.data.resultIndex)
         ) {
           return true;
         }
-        const editor = context.data.model.source.getActionImplementation(
-          context.data.resultIndex,
-          DatabaseEditAction
-        );
+        const editor = context.data.model.source.getActionImplementation(context.data.resultIndex, DatabaseEditAction);
         return !editor?.isEdited();
       },
       onClick: async context => {
@@ -55,5 +50,5 @@ export class GeneratorMenuBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-sql-generator/src/LocaleService.ts b/webapp/packages/plugin-sql-generator/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-sql-generator/src/LocaleService.ts
+++ b/webapp/packages/plugin-sql-generator/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewDialog.tsx b/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewDialog.tsx
index 9f2a42d040..34b147d953 100644
--- a/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewDialog.tsx
+++ b/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewDialog.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -41,19 +40,17 @@ interface Payload {
   model: IDatabaseDataModel;
 }
 
-export const ScriptPreviewDialog = observer<DialogComponentProps<Payload>>(function ScriptPreviewDialog({
-  rejectDialog,
-  payload,
-}) {
+export const ScriptPreviewDialog = observer<DialogComponentProps<Payload>>(function ScriptPreviewDialog({ rejectDialog, payload }) {
   const translate = useTranslate();
   const copy = useClipboard();
 
   const connectionExecutionContextService = useService(ConnectionExecutionContextService);
   const context = connectionExecutionContextService.get(payload.model.source.executionContext?.context?.id ?? '');
   const contextInfo = context?.context;
-  const dialect = useResource(ScriptPreviewDialog, ConnectionDialectResource, contextInfo
-    ? createConnectionParam(contextInfo.projectId, contextInfo.connectionId)
-    : null
+  const dialect = useResource(
+    ScriptPreviewDialog,
+    ConnectionDialectResource,
+    contextInfo ? createConnectionParam(contextInfo.projectId, contextInfo.connectionId) : null,
   );
   const sqlDialect = useSqlDialectExtension(dialect.data);
 
@@ -63,28 +60,25 @@ export const ScriptPreviewDialog = observer<DialogComponentProps<Payload>>(funct
   };
 
   return styled(styles)(
-    <CommonDialogWrapper size='large'>
-      <CommonDialogHeader
-        title="data_viewer_script_preview_dialog_title"
-        icon='sql-script'
-        onReject={rejectDialog}
-      />
+    <CommonDialogWrapper size="large">
+      <CommonDialogHeader title="data_viewer_script_preview_dialog_title" icon="sql-script" onReject={rejectDialog} />
       <CommonDialogBody noBodyPadding noOverflow>
         <wrapper>
-          <SQLCodeEditorLoader
-            value={payload.script}
-            extensions={[sqlDialect]}
-            lineNumbers
-            readonly
-          />
+          <SQLCodeEditorLoader value={payload.script} extensions={[sqlDialect]} lineNumbers readonly />
         </wrapper>
       </CommonDialogBody>
       <CommonDialogFooter>
-        <Button mod={['unelevated']} onClick={apply}>{translate('ui_apply')}</Button>
+        <Button mod={['unelevated']} onClick={apply}>
+          {translate('ui_apply')}
+        </Button>
         <fill />
-        <Button mod={['outlined']} onClick={() => copy(payload.script, true)}>{translate('ui_copy_to_clipboard')}</Button>
-        <Button mod={['unelevated']} onClick={rejectDialog}>{translate('ui_close')}</Button>
+        <Button mod={['outlined']} onClick={() => copy(payload.script, true)}>
+          {translate('ui_copy_to_clipboard')}
+        </Button>
+        <Button mod={['unelevated']} onClick={rejectDialog}>
+          {translate('ui_close')}
+        </Button>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewService.ts b/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewService.ts
index a07d937d62..5bc6c41a16 100644
--- a/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewService.ts
+++ b/webapp/packages/plugin-sql-generator/src/ScriptPreview/ScriptPreviewService.ts
@@ -5,12 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { GraphQLService, ResultDataFormat, UpdateResultsDataBatchScriptMutationVariables } from '@cloudbeaver/core-sdk';
-import { type IDatabaseDataModel, ResultSetEditAction, DocumentEditAction } from '@cloudbeaver/plugin-data-viewer';
+import { DocumentEditAction, type IDatabaseDataModel, ResultSetEditAction } from '@cloudbeaver/plugin-data-viewer';
 
 import { ScriptPreviewDialog } from './ScriptPreviewDialog';
 
@@ -20,7 +19,7 @@ export class ScriptPreviewService {
     private readonly graphQLService: GraphQLService,
     private readonly commonDialogService: CommonDialogService,
     private readonly notificationService: NotificationService,
-  ) { }
+  ) {}
 
   async open(model: IDatabaseDataModel, resultIndex: number): Promise<void> {
     try {
@@ -35,10 +34,7 @@ export class ScriptPreviewService {
     }
   }
 
-  private async tryGetScript(
-    model: IDatabaseDataModel,
-    resultIndex: number
-  ): Promise<string> {
+  private async tryGetScript(model: IDatabaseDataModel, resultIndex: number): Promise<string> {
     const executionContext = model.source.executionContext;
 
     if (!executionContext) {
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/GeneratedSqlDialog.tsx b/webapp/packages/plugin-sql-generator/src/SqlGenerators/GeneratedSqlDialog.tsx
index 5e3d44bad2..510d3e3c6b 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/GeneratedSqlDialog.tsx
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/GeneratedSqlDialog.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
@@ -22,34 +21,34 @@ import { SQLCodeEditorLoader, useSqlDialectExtension } from '@cloudbeaver/plugin
 import { SqlGeneratorsResource } from './SqlGeneratorsResource';
 
 const styles = css`
-    footer-container {
-      display: flex;
-      width: min-content;
-      flex: 1;
-      align-items: center;
-      justify-content: flex-end;
-      gap: 24px;
-    }
-    buttons {
-      flex: 0 0 auto;
-      display: flex;
-      gap: 24px;
-    }
-    ErrorMessage {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-      flex: 1;
-    }
-    wrapper {
-      display: flex;
-      align-items: center;
-      height: 100%;
-      width: 100%;
-      overflow: auto;
-    }
-    SQLCodeEditorLoader {
-      height: 100%;
-      width: 100%;
-    }
+  footer-container {
+    display: flex;
+    width: min-content;
+    flex: 1;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 24px;
+  }
+  buttons {
+    flex: 0 0 auto;
+    display: flex;
+    gap: 24px;
+  }
+  ErrorMessage {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    flex: 1;
+  }
+  wrapper {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+  }
+  SQLCodeEditorLoader {
+    height: 100%;
+    width: 100%;
+  }
 `;
 
 interface Payload {
@@ -57,10 +56,7 @@ interface Payload {
   pathId: string;
 }
 
-export const GeneratedSqlDialog = observer<DialogComponentProps<Payload>>(function GeneratedSqlDialog({
-  rejectDialog,
-  payload,
-}) {
+export const GeneratedSqlDialog = observer<DialogComponentProps<Payload>>(function GeneratedSqlDialog({ rejectDialog, payload }) {
   const translate = useTranslate();
   const copy = useClipboard();
 
@@ -69,34 +65,38 @@ export const GeneratedSqlDialog = observer<DialogComponentProps<Payload>>(functi
   const connectionInfoResource = useService(ConnectionInfoResource);
   const connection = connectionInfoResource.getConnectionForNode(payload.pathId);
 
-  const state = useObservableRef(() => ({
-    query: '',
-    loading: true,
-    error: new GQLErrorCatcher(),
-    get dialect(): SqlDialectInfo | undefined {
-      if (!this.connection?.connected) {
-        return;
-      }
+  const state = useObservableRef(
+    () => ({
+      query: '',
+      loading: true,
+      error: new GQLErrorCatcher(),
+      get dialect(): SqlDialectInfo | undefined {
+        if (!this.connection?.connected) {
+          return;
+        }
 
-      return this.sqlDialectInfoService.getDialectInfo(createConnectionParam(this.connection));
-    },
-    async load() {
-      this.error.clear();
+        return this.sqlDialectInfoService.getDialectInfo(createConnectionParam(this.connection));
+      },
+      async load() {
+        this.error.clear();
 
-      try {
-        this.query = await sqlGeneratorsResource.generateEntityQuery(payload.generatorId, payload.pathId);
-      } catch (exception: any) {
-        this.error.catch(exception);
-      } finally {
-        this.loading = false;
-      }
+        try {
+          this.query = await sqlGeneratorsResource.generateEntityQuery(payload.generatorId, payload.pathId);
+        } catch (exception: any) {
+          this.error.catch(exception);
+        } finally {
+          this.loading = false;
+        }
+      },
+    }),
+    {
+      query: observable.ref,
+      loading: observable.ref,
+      connection: observable.ref,
+      dialect: computed,
     },
-  }), {
-    query: observable.ref,
-    loading: observable.ref,
-    connection: observable.ref,
-    dialect: computed,
-  }, { connection, sqlDialectInfoService });
+    { connection, sqlDialectInfoService },
+  );
 
   const sqlDialect = useSqlDialectExtension(state.dialect);
   const error = useErrorDetails(state.error.exception);
@@ -110,48 +110,37 @@ export const GeneratedSqlDialog = observer<DialogComponentProps<Payload>>(functi
       return;
     }
 
-    sqlDialectInfoService.loadSqlDialectInfo(createConnectionParam(connection))
-      .catch(exception => {
-        console.error(exception);
-        console.warn(`Can't get dialect for connection: '${connection.id}'. Default dialect will be used`);
-      });
+    sqlDialectInfoService.loadSqlDialectInfo(createConnectionParam(connection)).catch(exception => {
+      console.error(exception);
+      console.warn(`Can't get dialect for connection: '${connection.id}'. Default dialect will be used`);
+    });
   });
 
   return styled(styles)(
-    <CommonDialogWrapper size='large'>
-      <CommonDialogHeader
-        title='app_shared_sql_generators_dialog_title'
-        icon='sql-script'
-        onReject={rejectDialog}
-      />
+    <CommonDialogWrapper size="large">
+      <CommonDialogHeader title="app_shared_sql_generators_dialog_title" icon="sql-script" onReject={rejectDialog} />
       <CommonDialogBody noOverflow noBodyPadding>
         <wrapper>
           <Loader loading={state.loading}>
-            {() => styled(styles)(
-              <SQLCodeEditorLoader
-                value={state.query}
-                extensions={[sqlDialect]}
-                readonly
-              />
-            )}
+            {() => styled(styles)(<SQLCodeEditorLoader value={state.query} extensions={[sqlDialect]} readonly />)}
           </Loader>
         </wrapper>
       </CommonDialogBody>
       <CommonDialogFooter>
         <footer-container>
           {state.error.responseMessage && (
-            <ErrorMessage
-              text={state.error.responseMessage}
-              hasDetails={error.hasDetails}
-              onShowDetails={error.open}
-            />
+            <ErrorMessage text={state.error.responseMessage} hasDetails={error.hasDetails} onShowDetails={error.open} />
           )}
           <buttons>
-            <Button mod={['outlined']} onClick={() => copy(state.query, true)}>{translate('ui_copy_to_clipboard')}</Button>
-            <Button mod={['unelevated']} onClick={rejectDialog}>{translate('ui_close')}</Button>
+            <Button mod={['outlined']} onClick={() => copy(state.query, true)}>
+              {translate('ui_copy_to_clipboard')}
+            </Button>
+            <Button mod={['unelevated']} onClick={rejectDialog}>
+              {translate('ui_close')}
+            </Button>
           </buttons>
         </footer-container>
       </CommonDialogFooter>
-    </CommonDialogWrapper>
+    </CommonDialogWrapper>,
   );
 });
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/MENU_SQL_GENERATORS.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/MENU_SQL_GENERATORS.ts
index 8b79fb323d..ab69d16acf 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/MENU_SQL_GENERATORS.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/MENU_SQL_GENERATORS.ts
@@ -5,10 +5,6 @@
  * 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_SQL_GENERATORS = createMenu(
-  'node-sql-generators',
-  'app_shared_sql_generators_panel_title'
-);
+export const MENU_SQL_GENERATORS = createMenu('node-sql-generators', 'app_shared_sql_generators_panel_title');
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
index 4db7def8f4..df8a8b38d4 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
@@ -5,12 +5,11 @@
  * 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 { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { MenuBaseItem, DATA_CONTEXT_MENU, MenuService, DATA_CONTEXT_MENU_NESTED, DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, DATA_CONTEXT_MENU_NESTED, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { GeneratedSqlDialog } from './GeneratedSqlDialog';
 import { MENU_SQL_GENERATORS } from './MENU_SQL_GENERATORS';
@@ -39,32 +38,20 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
         const node = context.get(DATA_CONTEXT_NAV_NODE);
         const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(
-          action.id,
-          () => getCachedMapResourceLoaderState(this.sqlGeneratorsResource, node.id)
-        );
+        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.sqlGeneratorsResource, node.id));
       },
     });
     this.menuService.addCreator({
       isApplicable: context => {
         const node = context.tryGet(DATA_CONTEXT_NAV_NODE);
 
-        if (
-          !node
-          || !(
-            node.objectFeatures.includes(EObjectFeature.entity)
-            || node.objectFeatures.includes(EObjectFeature.script)
-          )
-        ) {
+        if (!node || !(node.objectFeatures.includes(EObjectFeature.entity) || node.objectFeatures.includes(EObjectFeature.script))) {
           return false;
         }
 
         return !context.hasValue(DATA_CONTEXT_MENU, MENU_SQL_GENERATORS) && !context.has(DATA_CONTEXT_MENU_NESTED);
       },
-      getItems: (context, items) => [
-        ...items,
-        MENU_SQL_GENERATORS,
-      ],
+      getItems: (context, items) => [...items, MENU_SQL_GENERATORS],
     });
 
     this.menuService.addCreator({
@@ -76,25 +63,28 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
 
         return [
           ...items,
-          ...actions.map(action => new MenuBaseItem(
-            {
-              id: action.id,
-              label: action.label,
-              tooltip: action.description,
-            },
-            {
-              onSelect: () => {
-                this.commonDialogService.open(GeneratedSqlDialog, {
-                  generatorId: action.id,
-                  pathId: node.id,
-                });
-              },
-            }
-          )),
+          ...actions.map(
+            action =>
+              new MenuBaseItem(
+                {
+                  id: action.id,
+                  label: action.label,
+                  tooltip: action.description,
+                },
+                {
+                  onSelect: () => {
+                    this.commonDialogService.open(GeneratedSqlDialog, {
+                      generatorId: action.id,
+                      pathId: node.id,
+                    });
+                  },
+                },
+              ),
+          ),
         ];
       },
     });
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsResource.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsResource.ts
index 8e108c8f00..152784bd3a 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsResource.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsResource.ts
@@ -5,37 +5,30 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree';
 import {
-  GraphQLService,
   CachedMapResource,
-  ResourceKey,
-  SqlQueryGenerator,
-  ResourceKeyUtils,
-  resourceKeyList,
+  GraphQLService,
   isResourceAlias,
+  ResourceKey,
+  resourceKeyList,
+  ResourceKeyUtils,
+  SqlQueryGenerator,
 } from '@cloudbeaver/core-sdk';
 
 export const MAX_GENERATORS_LENGTH = 15;
 
 @injectable()
 export class SqlGeneratorsResource extends CachedMapResource<string, SqlQueryGenerator[]> {
-  constructor(
-    private readonly graphQLService: GraphQLService,
-    private readonly navNodeInfoResource: NavNodeInfoResource
-  ) {
+  constructor(private readonly graphQLService: GraphQLService, private readonly navNodeInfoResource: NavNodeInfoResource) {
     super();
 
     this.navNodeInfoResource.outdateResource(this);
     this.navNodeInfoResource.deleteInResource(this);
   }
 
-  async generateEntityQuery(
-    generatorId: string,
-    nodePathList: string | string[],
-  ): Promise<string> {
+  async generateEntityQuery(generatorId: string, nodePathList: string | string[]): Promise<string> {
     const result = await this.graphQLService.sdk.sqlGenerateEntityQuery({
       generatorId,
       nodePathList,
@@ -52,9 +45,9 @@ export class SqlGeneratorsResource extends CachedMapResource<string, SqlQueryGen
     const values = new Map();
 
     await ResourceKeyUtils.forEachAsync(key, async key => {
-      const { generators } = await this.graphQLService.sdk.sqlEntityQueryGenerators(({
+      const { generators } = await this.graphQLService.sdk.sqlEntityQueryGenerators({
         nodePathList: key,
-      }));
+      });
       values.set(key, generators);
     });
 
diff --git a/webapp/packages/plugin-sql-generator/src/locales/en.ts b/webapp/packages/plugin-sql-generator/src/locales/en.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-sql-generator/src/locales/en.ts
+++ b/webapp/packages/plugin-sql-generator/src/locales/en.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-sql-generator/src/locales/it.ts b/webapp/packages/plugin-sql-generator/src/locales/it.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-sql-generator/src/locales/it.ts
+++ b/webapp/packages/plugin-sql-generator/src/locales/it.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-sql-generator/src/locales/ru.ts b/webapp/packages/plugin-sql-generator/src/locales/ru.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-sql-generator/src/locales/ru.ts
+++ b/webapp/packages/plugin-sql-generator/src/locales/ru.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-sql-generator/src/locales/zh.ts b/webapp/packages/plugin-sql-generator/src/locales/zh.ts
index 9f25cb126f..d6d1738de6 100644
--- a/webapp/packages/plugin-sql-generator/src/locales/zh.ts
+++ b/webapp/packages/plugin-sql-generator/src/locales/zh.ts
@@ -1,2 +1 @@
-export default [
-];
+export default [];
diff --git a/webapp/packages/plugin-sql-generator/src/manifest.ts b/webapp/packages/plugin-sql-generator/src/manifest.ts
index 26c63f2591..2165b9ce0e 100644
--- a/webapp/packages/plugin-sql-generator/src/manifest.ts
+++ b/webapp/packages/plugin-sql-generator/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { GeneratorMenuBootstrap } from './GeneratorMenuBootstrap';
@@ -19,11 +18,5 @@ export const sqlGeneratorPlugin: PluginManifest = {
     name: 'Sql Editor Generator plugin',
   },
 
-  providers: [
-    LocaleService,
-    SqlGeneratorsBootstrap,
-    SqlGeneratorsResource,
-    ScriptPreviewService,
-    GeneratorMenuBootstrap,
-  ],
+  providers: [LocaleService, SqlGeneratorsBootstrap, SqlGeneratorsResource, ScriptPreviewService, GeneratorMenuBootstrap],
 };
diff --git a/webapp/packages/plugin-sso/src/index.ts b/webapp/packages/plugin-sso/src/index.ts
index 8cec2e9ced..cb0ff5c3b5 100644
--- a/webapp/packages/plugin-sso/src/index.ts
+++ b/webapp/packages/plugin-sso/src/index.ts
@@ -1 +1 @@
-export {};
\ No newline at end of file
+export {};
diff --git a/webapp/packages/plugin-theme/src/PluginBootstrap.ts b/webapp/packages/plugin-theme/src/PluginBootstrap.ts
index ab0822fef5..b65ffbef3c 100644
--- a/webapp/packages/plugin-theme/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-theme/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { ThemeService } from '@cloudbeaver/core-theming';
 import { DATA_CONTEXT_MENU, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
@@ -15,24 +14,15 @@ import { THEME_MENU } from './THEME_MENU';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly menuService: MenuService,
-    private readonly themeService: ThemeService
-  ) {
+  constructor(private readonly menuService: MenuService, private readonly themeService: ThemeService) {
     super();
   }
 
   register(): void | Promise<void> {
     this.menuService.addCreator({
-      isApplicable: context => (
-        context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU
-        && this.themeService.themes.length > 0
-      ),
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === TOP_NAV_BAR_SETTINGS_MENU && this.themeService.themes.length > 0,
       getItems(context, items) {
-        return [
-          ...items,
-          THEME_MENU,
-        ];
+        return [...items, THEME_MENU];
       },
     });
 
@@ -41,27 +31,27 @@ export class PluginBootstrap extends Bootstrap {
         return context.get(DATA_CONTEXT_MENU) === THEME_MENU;
       },
       getItems: (context, items) => {
-        const themes = this.themeService.themes.map(theme => new MenuBaseItem(
-          {
-            id: theme.id,
-            label: theme.name,
-            tooltip: theme.name,
-          },
-          {
-            onSelect: () => this.themeService.changeTheme(theme.id),
-          },
-          {
-            isDisabled: () => this.themeService.currentThemeId === theme.id,
-          }
-        ));
+        const themes = this.themeService.themes.map(
+          theme =>
+            new MenuBaseItem(
+              {
+                id: theme.id,
+                label: theme.name,
+                tooltip: theme.name,
+              },
+              {
+                onSelect: () => this.themeService.changeTheme(theme.id),
+              },
+              {
+                isDisabled: () => this.themeService.currentThemeId === theme.id,
+              },
+            ),
+        );
 
-        return [
-          ...items,
-          ...themes,
-        ];
+        return [...items, ...themes];
       },
     });
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-theme/src/THEME_MENU.ts b/webapp/packages/plugin-theme/src/THEME_MENU.ts
index ae1fdf73dc..10fd8aa84b 100644
--- a/webapp/packages/plugin-theme/src/THEME_MENU.ts
+++ b/webapp/packages/plugin-theme/src/THEME_MENU.ts
@@ -5,7 +5,6 @@
  * 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 THEME_MENU = createMenu('theme-menu', 'app_shared_settingsMenu_theme');
diff --git a/webapp/packages/plugin-theme/src/index.ts b/webapp/packages/plugin-theme/src/index.ts
index eb4cbd399e..7069925912 100644
--- a/webapp/packages/plugin-theme/src/index.ts
+++ b/webapp/packages/plugin-theme/src/index.ts
@@ -2,4 +2,4 @@ import { themePlugin } from './manifest';
 
 export default themePlugin;
 
-export * from './THEME_MENU';
\ No newline at end of file
+export * from './THEME_MENU';
diff --git a/webapp/packages/plugin-theme/src/manifest.ts b/webapp/packages/plugin-theme/src/manifest.ts
index a8ffddc7c8..38de0c03cd 100644
--- a/webapp/packages/plugin-theme/src/manifest.ts
+++ b/webapp/packages/plugin-theme/src/manifest.ts
@@ -5,14 +5,11 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
 
 export const themePlugin: PluginManifest = {
   info: { name: 'Theme plugin' },
-  providers: [
-    PluginBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap],
+};
diff --git a/webapp/packages/plugin-tools-panel/src/LocaleService.ts b/webapp/packages/plugin-tools-panel/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-tools-panel/src/LocaleService.ts
+++ b/webapp/packages/plugin-tools-panel/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts b/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts
index b86e900511..fd41537a61 100644
--- a/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts
+++ b/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts
@@ -5,12 +5,6 @@
  * 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_TOOLS = createMenu(
-  'tools',
-  'plugin_tools_panel_menu_title',
-  '/icons/plugin_tools_panel_m.svg',
-  'plugin_tools_panel_menu_title'
-);
+export const MENU_TOOLS = createMenu('tools', 'plugin_tools_panel_menu_title', '/icons/plugin_tools_panel_m.svg', 'plugin_tools_panel_menu_title');
diff --git a/webapp/packages/plugin-tools-panel/src/PluginBootstrap.ts b/webapp/packages/plugin-tools-panel/src/PluginBootstrap.ts
index 4fdd3e1a7f..31e8c99c8e 100644
--- a/webapp/packages/plugin-tools-panel/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-tools-panel/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
@@ -15,20 +14,14 @@ import { ToolsPanelService } from './ToolsPanel/ToolsPanelService';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly menuService: MenuService,
-    private readonly toolsPanelService: ToolsPanelService,
-  ) {
+  constructor(private readonly menuService: MenuService, private readonly toolsPanelService: ToolsPanelService) {
     super();
   }
 
   register(): void {
     this.menuService.addCreator({
       menus: [MENU_APP_ACTIONS],
-      getItems: (context, items) => [
-        ...items,
-        MENU_TOOLS,
-      ],
+      getItems: (context, items) => [...items, MENU_TOOLS],
     });
     this.menuService.setHandler({
       id: 'tools-menu-base',
@@ -38,5 +31,5 @@ export class PluginBootstrap extends Bootstrap {
     });
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
index 7297941ec1..15f5545562 100644
--- a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
+++ b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
@@ -5,14 +5,22 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, untracked } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useRef } from 'react';
 import styled, { css } from 'reshadow';
 
 import { useStyles, useUserData } from '@cloudbeaver/core-blocks';
-import { BASE_TAB_STYLES, ITabData, ITabsContainer, TabList, TabPanelList, TabsContainer, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
+import {
+  BASE_TAB_STYLES,
+  ITabData,
+  ITabsContainer,
+  TabList,
+  TabPanelList,
+  TabsContainer,
+  TabsState,
+  UNDERLINE_TAB_STYLES,
+} from '@cloudbeaver/core-ui';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 const tabsStyles = css`
@@ -23,7 +31,7 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 32px!important;
+    height: 32px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
@@ -68,28 +76,30 @@ export const ToolsPanel = observer<Props>(function ToolsPanel({ container }) {
   const prevTabs = useRef<string[]>(tabs);
   const equal = isArraysEqual(prevTabs.current, tabs);
 
-  untracked(action(() => {
-    if (!equal) {
-      for (const id of tabs) {
-        if (!prevTabs.current.includes(id)) {
-          state.selectedTabId = id;
-          break;
+  untracked(
+    action(() => {
+      if (!equal) {
+        for (const id of tabs) {
+          if (!prevTabs.current.includes(id)) {
+            state.selectedTabId = id;
+            break;
+          }
         }
+
+        prevTabs.current = tabs;
       }
 
-      prevTabs.current = tabs;
-    }
-
-    if (state.selectedTabId) {
-      if (!tabs.includes(state.selectedTabId)) {
-        if (tabs.length > 0) {
-          state.selectedTabId = tabs[0];
-        } else {
-          state.selectedTabId = undefined;
+      if (state.selectedTabId) {
+        if (!tabs.includes(state.selectedTabId)) {
+          if (tabs.length > 0) {
+            state.selectedTabId = tabs[0];
+          } else {
+            state.selectedTabId = undefined;
+          }
         }
       }
-    }
-  }));
+    }),
+  );
 
   function handleTabChange(tab: ITabData) {
     state.selectedTabId = tab.tabId;
@@ -103,6 +113,6 @@ export const ToolsPanel = observer<Props>(function ToolsPanel({ container }) {
           <TabPanelList style={tabStyle} />
         </content-box>
       </box>
-    </TabsState>
+    </TabsState>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanelService.ts b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanelService.ts
index c47c8b49b3..cc98d47566 100644
--- a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanelService.ts
+++ b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanelService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { computed, makeObservable } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
@@ -28,4 +27,4 @@ export class ToolsPanelService {
       disabled: computed,
     });
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanelSettingsService.ts b/webapp/packages/plugin-tools-panel/src/ToolsPanelSettingsService.ts
index a5566f774b..d0eb3c938e 100644
--- a/webapp/packages/plugin-tools-panel/src/ToolsPanelSettingsService.ts
+++ b/webapp/packages/plugin-tools-panel/src/ToolsPanelSettingsService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { injectable } from '@cloudbeaver/core-di';
 import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 
diff --git a/webapp/packages/plugin-tools-panel/src/index.ts b/webapp/packages/plugin-tools-panel/src/index.ts
index f29785eb53..38d9d2fa5f 100644
--- a/webapp/packages/plugin-tools-panel/src/index.ts
+++ b/webapp/packages/plugin-tools-panel/src/index.ts
@@ -1,8 +1,8 @@
+import { toolsPanelPlugin } from './manifest';
+
 export * from './Menu/MENU_TOOLS';
 export * from './ToolsPanel/ToolsPanelService';
 export * from './ToolsPanel/ToolsPanel';
 export * from './ToolsPanelSettingsService';
 
-import { toolsPanelPlugin } from './manifest';
-
-export default toolsPanelPlugin;
\ No newline at end of file
+export default toolsPanelPlugin;
diff --git a/webapp/packages/plugin-tools-panel/src/locales/en.ts b/webapp/packages/plugin-tools-panel/src/locales/en.ts
index 6179253ae0..e760490ac3 100644
--- a/webapp/packages/plugin-tools-panel/src/locales/en.ts
+++ b/webapp/packages/plugin-tools-panel/src/locales/en.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_tools_panel_menu_title', 'Tools'],
-];
+export default [['plugin_tools_panel_menu_title', 'Tools']];
diff --git a/webapp/packages/plugin-tools-panel/src/locales/it.ts b/webapp/packages/plugin-tools-panel/src/locales/it.ts
index 81bfffa650..3e1bf8c4d7 100644
--- a/webapp/packages/plugin-tools-panel/src/locales/it.ts
+++ b/webapp/packages/plugin-tools-panel/src/locales/it.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_tools_panel_menu_title', 'Strumenti'],
-];
+export default [['plugin_tools_panel_menu_title', 'Strumenti']];
diff --git a/webapp/packages/plugin-tools-panel/src/locales/ru.ts b/webapp/packages/plugin-tools-panel/src/locales/ru.ts
index 228965f39c..adde817e71 100644
--- a/webapp/packages/plugin-tools-panel/src/locales/ru.ts
+++ b/webapp/packages/plugin-tools-panel/src/locales/ru.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_tools_panel_menu_title', 'Инструменты'],
-];
+export default [['plugin_tools_panel_menu_title', 'Инструменты']];
diff --git a/webapp/packages/plugin-tools-panel/src/locales/zh.ts b/webapp/packages/plugin-tools-panel/src/locales/zh.ts
index 54be2eb6d3..8e4722dd23 100644
--- a/webapp/packages/plugin-tools-panel/src/locales/zh.ts
+++ b/webapp/packages/plugin-tools-panel/src/locales/zh.ts
@@ -1,3 +1 @@
-export default [
-  ['plugin_tools_panel_menu_title', '工具'],
-];
+export default [['plugin_tools_panel_menu_title', '工具']];
diff --git a/webapp/packages/plugin-tools-panel/src/manifest.ts b/webapp/packages/plugin-tools-panel/src/manifest.ts
index 345bbb417b..f62e83a8fa 100644
--- a/webapp/packages/plugin-tools-panel/src/manifest.ts
+++ b/webapp/packages/plugin-tools-panel/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -13,13 +12,7 @@ import { PluginBootstrap } from './PluginBootstrap';
 import { ToolsPanelService } from './ToolsPanel/ToolsPanelService';
 import { ToolsPanelSettingsService } from './ToolsPanelSettingsService';
 
-
 export const toolsPanelPlugin: PluginManifest = {
   info: { name: 'Tools panel plugin' },
-  providers: [
-    ToolsPanelService,
-    PluginBootstrap,
-    LocaleService,
-    ToolsPanelSettingsService,
-  ],
-};
\ No newline at end of file
+  providers: [ToolsPanelService, PluginBootstrap, LocaleService, ToolsPanelSettingsService],
+};
diff --git a/webapp/packages/plugin-top-app-bar/src/PluginBootstrap.ts b/webapp/packages/plugin-top-app-bar/src/PluginBootstrap.ts
index e11b3a1dec..e5c18613f3 100644
--- a/webapp/packages/plugin-top-app-bar/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-top-app-bar/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AppScreenService } from '@cloudbeaver/core-app';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
@@ -13,9 +12,7 @@ import { TopNavBar } from './TopNavBar/TopNavBar';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly appScreenService: AppScreenService,
-  ) {
+  constructor(private readonly appScreenService: AppScreenService) {
     super();
   }
 
@@ -23,5 +20,5 @@ export class PluginBootstrap extends Bootstrap {
     this.appScreenService.placeholder.add(TopNavBar);
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
index 5a08ceba9f..021920b2a6 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { AdministrationTopAppBarService, WizardTopAppBarService } from '@cloudbeaver/plugin-administration';
 
 import { Logo } from './Logo';
@@ -15,7 +14,7 @@ import { Logo } from './Logo';
 export class AdministrationTopAppBarBootstrapService extends Bootstrap {
   constructor(
     private readonly administrationTopAppBarService: AdministrationTopAppBarService,
-    private readonly wizardTopAppBarService: WizardTopAppBarService
+    private readonly wizardTopAppBarService: WizardTopAppBarService,
   ) {
     super();
   }
@@ -25,5 +24,5 @@ export class AdministrationTopAppBarBootstrapService extends Bootstrap {
     this.wizardTopAppBarService.placeholder.add(Logo, 0);
   }
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx
index dc11af048c..967351aa7c 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -15,7 +14,7 @@ import { MenuBar } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 
 import { topMenuStyles } from '../shared/topMenuStyles';
-import { MENU_BAR_ITEM_STYLES, MENU_BAR_DISABLE_EFFECT_STYLES, MENU_BAR_STYLES } from '../styles';
+import { MENU_BAR_DISABLE_EFFECT_STYLES, MENU_BAR_ITEM_STYLES, MENU_BAR_STYLES } from '../styles';
 import { MENU_APP_STATE } from './MENU_APP_STATE';
 
 const styles = css`
@@ -46,6 +45,6 @@ export const AppStateMenu = observer(function AppStateMenu() {
         nestedMenuSettings={{ modal: true }}
         rtl
       />
-    </menu-wrapper>
+    </menu-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/MENU_APP_STATE.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/MENU_APP_STATE.ts
index 28262b2a0b..dbd3fc3c69 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/MENU_APP_STATE.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/MENU_APP_STATE.ts
@@ -5,7 +5,6 @@
  * 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_APP_STATE = createMenu('app-state', 'Application State');
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Fill.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Fill.tsx
index d012c53b2b..277c3fd4d9 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Fill.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Fill.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import styled, { css } from 'reshadow';
 
 const styles = css`
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx
index 6e8dd21eaa..ff4eebe996 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/Logo.tsx
@@ -5,7 +5,6 @@
  * 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 { AppLogo } from '@cloudbeaver/core-blocks';
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MENU_APP_ACTIONS.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MENU_APP_ACTIONS.ts
index d6e9651347..54a92b2a5c 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MENU_APP_ACTIONS.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MENU_APP_ACTIONS.ts
@@ -5,7 +5,6 @@
  * 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_APP_ACTIONS = createMenu('app-actions', 'Application Actions');
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MainMenu.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MainMenu.tsx
index 0340ac58a3..832087bccb 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MainMenu.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/MainMenu/MainMenu.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -15,7 +14,7 @@ import { MenuBar } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 
 import { topMenuStyles } from '../shared/topMenuStyles';
-import { MENU_BAR_ITEM_STYLES, MENU_BAR_DISABLE_EFFECT_STYLES, MENU_BAR_STYLES } from '../styles';
+import { MENU_BAR_DISABLE_EFFECT_STYLES, MENU_BAR_ITEM_STYLES, MENU_BAR_STYLES } from '../styles';
 import { MENU_APP_ACTIONS } from './MENU_APP_ACTIONS';
 
 export const MainMenu = observer(function MainMenu() {
@@ -33,6 +32,6 @@ export const MainMenu = observer(function MainMenu() {
         style={[topMenuStyles, MENU_BAR_ITEM_STYLES, topMenuStyles, MENU_BAR_DISABLE_EFFECT_STYLES]}
         nestedMenuSettings={{ modal: true }}
       />
-    </menu-wrapper>
+    </menu-wrapper>,
   );
 });
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavBar.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavBar.tsx
index e2cb112340..3fbbccc74c 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavBar.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavBar.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Placeholder, TopAppBar } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
@@ -23,4 +22,4 @@ export const TopNavBar: React.FC<Props> = function TopNavBar({ className }) {
       <Placeholder container={topNavService.placeholder} />
     </TopAppBar>
   );
-};
\ No newline at end of file
+};
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavService.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavService.ts
index b53eb7731f..450d2176c4 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavService.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/TopNavService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.tsx
index b8e306a918..0b9515a71a 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.tsx
@@ -5,12 +5,11 @@
  * 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 type { ButtonHTMLAttributes } from 'react';
 import styled from 'reshadow';
 
-import { useTranslate, useStyles, joinStyles } from '@cloudbeaver/core-blocks';
+import { joinStyles, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { IMenuItem, MenuTrigger } from '@cloudbeaver/core-dialogs';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
@@ -29,14 +28,7 @@ export const TopMenuItem = observer<IProps>(function TopMenuItem({ menuItem, sty
   const title = translate(menuItem.title);
 
   if (!menuItem.panel) {
-    return (
-      <TopNavButton
-        {...props}
-        title={title}
-        disabled={menuItem.isDisabled}
-        onClick={() => menuItem.onClick?.()}
-      />
-    );
+    return <TopNavButton {...props} title={title} disabled={menuItem.isDisabled} onClick={() => menuItem.onClick?.()} />;
   }
 
   return styled(styles)(
@@ -50,11 +42,7 @@ export const TopMenuItem = observer<IProps>(function TopMenuItem({ menuItem, sty
       disclosure
       onClick={() => menuItem.onClick?.()}
     >
-      <TopNavButton
-        title={title}
-        icon={menuItem.icon}
-        style={style}
-      />
-    </MenuTrigger>
+      <TopNavButton title={title} icon={menuItem.icon} style={style} />
+    </MenuTrigger>,
   );
 });
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopNavButton.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopNavButton.tsx
index ff093a305f..575206adb7 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopNavButton.tsx
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopNavButton.tsx
@@ -5,7 +5,6 @@
  * 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 { ButtonHTMLAttributes, forwardRef } from 'react';
 import { Button } from 'reakit/Button';
@@ -17,36 +16,34 @@ import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { topMenuStyles } from './topMenuStyles';
 
 const elementStyle = css`
-    Button {
-      composes: theme-ripple from global;
-      background: none;
-      border: none;
-      outline: none !important;
-      color: inherit;
-      cursor: pointer;
-    }
-    box {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      height: inherit;
-      position: relative;
-    }
-    menu-trigger-icon {
-      width: 24px;
-      height: 24px;
-      display: flex;
-      box-sizing: border-box;
-      align-items: center;
-      justify-content: center;
-    }
-    menu-trigger-icon IconOrImage {
-      display: block;
-      object-fit: contain;
-    }
-  `
-;
-
+  Button {
+    composes: theme-ripple from global;
+    background: none;
+    border: none;
+    outline: none !important;
+    color: inherit;
+    cursor: pointer;
+  }
+  box {
+    display: flex;
+    align-items: center;
+    flex: 1;
+    height: inherit;
+    position: relative;
+  }
+  menu-trigger-icon {
+    width: 24px;
+    height: 24px;
+    display: flex;
+    box-sizing: border-box;
+    align-items: center;
+    justify-content: center;
+  }
+  menu-trigger-icon IconOrImage {
+    display: block;
+    object-fit: contain;
+  }
+`;
 interface IProps extends Omit<ButtonHTMLAttributes<any>, 'style'> {
   title?: string;
   icon?: string;
@@ -56,25 +53,27 @@ interface IProps extends Omit<ButtonHTMLAttributes<any>, 'style'> {
   style?: ComponentStyle;
 }
 
-export const TopNavButton = observer<IProps, HTMLButtonElement>(forwardRef(function TopNavButton({
-  title, icon, secondary, menu, loading, style, ...props
-}, ref) {
-  const translate = useTranslate();
-  const styles = useStyles(style, topMenuStyles, elementStyle);
+export const TopNavButton = observer<IProps, HTMLButtonElement>(
+  forwardRef(function TopNavButton({ title, icon, secondary, menu, loading, style, ...props }, ref) {
+    const translate = useTranslate();
+    const styles = useStyles(style, topMenuStyles, elementStyle);
 
-  title = translate(title);
+    title = translate(title);
 
-  return styled(styles)(
-    <Button type="button" {...props} ref={ref}>
-      <box>
-        {(icon || loading) && (
-          <menu-trigger-icon {...use({ loading })}>
-            <Loader secondary={secondary} loading={loading} small>{icon && <IconOrImage icon={icon} />}</Loader>
-          </menu-trigger-icon>
-        )}
-        <menu-trigger-text title={title}>{title}</menu-trigger-text>
-        {menu && <Icon name="angle" viewBox="0 0 15 8" />}
-      </box>
-    </Button>
-  );
-}));
+    return styled(styles)(
+      <Button type="button" {...props} ref={ref}>
+        <box>
+          {(icon || loading) && (
+            <menu-trigger-icon {...use({ loading })}>
+              <Loader secondary={secondary} loading={loading} small>
+                {icon && <IconOrImage icon={icon} />}
+              </Loader>
+            </menu-trigger-icon>
+          )}
+          <menu-trigger-text title={title}>{title}</menu-trigger-text>
+          {menu && <Icon name="angle" viewBox="0 0 15 8" />}
+        </box>
+      </Button>,
+    );
+  }),
+);
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/topMenuStyles.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/topMenuStyles.ts
index 4a44174465..87970bb63a 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/topMenuStyles.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/topMenuStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const topMenuStyles = css`
@@ -17,12 +16,12 @@ export const topMenuStyles = css`
   }
   menu-box {
     composes: theme-text-on-primary from global;
-    background-color: #338ecc!important;
+    background-color: #338ecc !important;
     clip-path: inset(0px -16px -16px -16px); /* clip shadow from top edge of menu */
   }
   Menu:not([submenu]) menu-box {
-    border-top-left-radius: 0!important;
-    border-top-right-radius: 0!important;
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
   }
   menu-box menu-panel-item {
     border-color: #ffffff !important;
@@ -30,7 +29,8 @@ export const topMenuStyles = css`
   Loader {
     composes: secondary from global;
   }
-  MenuButton, MenuBarElement {
+  MenuButton,
+  MenuBarElement {
     composes: theme-ripple from global;
     background: none;
     border: none;
@@ -38,7 +38,9 @@ export const topMenuStyles = css`
     color: inherit;
     cursor: pointer;
   }
-  MenuTrigger, Button, MenuBarElement {
+  MenuTrigger,
+  Button,
+  MenuBarElement {
     height: 100%;
     padding: 0 8px !important;
     margin-right: 1px;
@@ -51,7 +53,7 @@ export const topMenuStyles = css`
       top: 8px;
       right: -1px;
       opacity: 1 !important;
-      content: "";
+      content: '';
     }
 
     & box > div {
@@ -95,7 +97,8 @@ export const topMenuStyles = css`
     & menu-bar-item-mark {
       padding-left: 0 !important;
     }
-    & menu-trigger-text, & menu-bar-item-label {
+    & menu-trigger-text,
+    & menu-bar-item-label {
       white-space: nowrap;
       max-width: 240px;
       overflow-x: hidden;
@@ -126,20 +129,25 @@ export const topMenuStyles = css`
   MenuItem,
   MenuItemCheckbox,
   MenuItemRadio {
-    &:hover, &:global([aria-expanded="true"]) {
-      background: #236EA0;
+    &:hover,
+    &:global([aria-expanded='true']) {
+      background: #236ea0;
     }
     &:before {
       display: none;
     }
   }
   MenuBarElement {
-    &:hover, &:global([aria-expanded="true"]) {
+    &:hover,
+    &:global([aria-expanded='true']) {
       background: #338ecc;
     }
   }
   @media only screen and (max-width: 1200px) {
-    MenuButton, MenuBarElement, MenuTrigger, Button {
+    MenuButton,
+    MenuBarElement,
+    MenuTrigger,
+    Button {
       padding: 0 8px !important;
     }
   }
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/styles.ts b/webapp/packages/plugin-top-app-bar/src/TopNavBar/styles.ts
index 0d9ffe63ad..92f365d5bf 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/styles.ts
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/styles.ts
@@ -5,17 +5,16 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const MENU_BAR_ITEM_STYLES = css`
   MenuBarElement {
     background: none;
-    
+
     & menu-bar-item-label {
       font-weight: 500;
     }
-      
+
     & menu-bar-item-mark {
       display: flex;
       padding-left: 6px;
@@ -29,16 +28,17 @@ export const MENU_BAR_ITEM_STYLES = css`
 
 export const MENU_BAR_DISABLE_EFFECT_STYLES = css`
   Button:disabled,
-  Button[aria-disabled="true"],
+  Button[aria-disabled='true'],
   MenuButton:disabled,
-  MenuButton[aria-disabled="true"] {
+  MenuButton[aria-disabled='true'] {
     opacity: 1;
   }
 `;
 
 export const MENU_BAR_STYLES = css`
-  menu-wrapper, MenuBar {
+  menu-wrapper,
+  MenuBar {
     display: flex;
     height: 100%;
   }
-`;
\ No newline at end of file
+`;
diff --git a/webapp/packages/plugin-top-app-bar/src/index.ts b/webapp/packages/plugin-top-app-bar/src/index.ts
index c727f3ab62..d8c4449818 100644
--- a/webapp/packages/plugin-top-app-bar/src/index.ts
+++ b/webapp/packages/plugin-top-app-bar/src/index.ts
@@ -1,3 +1,5 @@
+import { topAppBarPlugin } from './manifest';
+
 export * from './TopNavBar/AppStateMenu/AppStateMenu';
 export * from './TopNavBar/AppStateMenu/MENU_APP_STATE';
 export * from './TopNavBar/MainMenu/MENU_APP_ACTIONS';
@@ -9,6 +11,4 @@ export * from './TopNavBar/Logo';
 export * from './TopNavBar/TopNavBar';
 export * from './TopNavBar/styles';
 
-import { topAppBarPlugin } from './manifest';
-
-export default topAppBarPlugin;
\ No newline at end of file
+export default topAppBarPlugin;
diff --git a/webapp/packages/plugin-top-app-bar/src/manifest.ts b/webapp/packages/plugin-top-app-bar/src/manifest.ts
index 21bce32535..39a7523df0 100644
--- a/webapp/packages/plugin-top-app-bar/src/manifest.ts
+++ b/webapp/packages/plugin-top-app-bar/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
@@ -16,9 +15,5 @@ export const topAppBarPlugin: PluginManifest = {
   info: {
     name: 'Top App Bar plugin',
   },
-  providers: [
-    PluginBootstrap,
-    TopNavService,
-    AdministrationTopAppBarBootstrapService,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap, TopNavService, AdministrationTopAppBarBootstrapService],
+};
diff --git a/webapp/packages/plugin-user-profile-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-user-profile-administration/src/PluginBootstrap.ts
index 4283c6cdc3..a123982e53 100644
--- a/webapp/packages/plugin-user-profile-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-user-profile-administration/src/PluginBootstrap.ts
@@ -5,16 +5,13 @@
  * 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 { AdministrationTopAppBarService } from '@cloudbeaver/plugin-administration';
 import { UserMenu } from '@cloudbeaver/plugin-user-profile';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly administrationTopAppBarService: AdministrationTopAppBarService
-  ) {
+  constructor(private readonly administrationTopAppBarService: AdministrationTopAppBarService) {
     super();
   }
 
@@ -22,5 +19,5 @@ export class PluginBootstrap extends Bootstrap {
     this.administrationTopAppBarService.placeholder.add(UserMenu, 4);
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-user-profile-administration/src/manifest.ts b/webapp/packages/plugin-user-profile-administration/src/manifest.ts
index 333596dbaa..d56697fa6a 100644
--- a/webapp/packages/plugin-user-profile-administration/src/manifest.ts
+++ b/webapp/packages/plugin-user-profile-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
@@ -15,7 +14,5 @@ export const userProfileAdministrationPlugin: PluginManifest = {
     name: 'User profile administration plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-  ],
+  providers: [PluginBootstrap],
 };
diff --git a/webapp/packages/plugin-user-profile/src/LocaleService.ts b/webapp/packages/plugin-user-profile/src/LocaleService.ts
index 144237a086..e3649a06b4 100644
--- a/webapp/packages/plugin-user-profile/src/LocaleService.ts
+++ b/webapp/packages/plugin-user-profile/src/LocaleService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 
@@ -19,7 +18,7 @@ export class LocaleService extends Bootstrap {
     this.localizationService.addProvider(this.provider.bind(this));
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 
   private async provider(locale: string) {
     switch (locale) {
diff --git a/webapp/packages/plugin-user-profile/src/PluginBootstrap.ts b/webapp/packages/plugin-user-profile/src/PluginBootstrap.ts
index 5a7123fc67..51bef2ae66 100644
--- a/webapp/packages/plugin-user-profile/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-user-profile/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { TopNavService } from '@cloudbeaver/plugin-top-app-bar';
 
@@ -13,9 +12,7 @@ import { UserMenu } from './UserMenu/UserMenu';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly topNavService: TopNavService
-  ) {
+  constructor(private readonly topNavService: TopNavService) {
     super();
   }
 
@@ -23,5 +20,5 @@ export class PluginBootstrap extends Bootstrap {
     this.topNavService.placeholder.add(UserMenu, 4);
   }
 
-  load(): void { }
+  load(): void {}
 }
diff --git a/webapp/packages/plugin-user-profile/src/UserInfo.tsx b/webapp/packages/plugin-user-profile/src/UserInfo.tsx
index 197b98bd3a..68c3b36f8a 100644
--- a/webapp/packages/plugin-user-profile/src/UserInfo.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserInfo.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -24,7 +23,8 @@ const styles = css`
     padding: 0 8px;
     cursor: pointer;
 
-    &:hover, &:global([aria-expanded="true"]) {
+    &:hover,
+    &:global([aria-expanded='true']) {
       background: #338ecc;
     }
 
@@ -36,7 +36,7 @@ const styles = css`
       top: 8px;
       right: -1px;
       opacity: 1 !important;
-      content: "";
+      content: '';
     }
   }
   IconOrImage {
@@ -67,9 +67,9 @@ export const UserInfo = observer<Props>(function UserInfo({ info }) {
   return styled(styles)(
     <user title={translate('plugin_user_profile_menu')} onClick={() => userProfileService.open()}>
       <user-icon>
-        <IconOrImage icon='/icons/plugin_user_profile_m.svg' />
+        <IconOrImage icon="/icons/plugin_user_profile_m.svg" />
       </user-icon>
       <user-name>{info.displayName || info.userId}</user-name>
-    </user>
+    </user>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserMenu/MENU_USER_PROFILE.ts b/webapp/packages/plugin-user-profile/src/UserMenu/MENU_USER_PROFILE.ts
index b819b7fae4..97c80e56d4 100644
--- a/webapp/packages/plugin-user-profile/src/UserMenu/MENU_USER_PROFILE.ts
+++ b/webapp/packages/plugin-user-profile/src/UserMenu/MENU_USER_PROFILE.ts
@@ -5,10 +5,6 @@
  * 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_USER_PROFILE = createMenu(
-  'user-menu',
-  'User Menu'
-);
+export const MENU_USER_PROFILE = createMenu('user-menu', 'User Menu');
diff --git a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx
index a89871d77d..fb44f237e3 100644
--- a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -36,6 +35,6 @@ export const UserMenu = observer(function UserMenu() {
       <ContextMenu menu={menu} style={[topMenuStyles]} rtl modal>
         <Icon name="angle" viewBox="0 0 15 8" />
       </ContextMenu>
-    </Loader>
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserMenu/userMenuStyles.ts b/webapp/packages/plugin-user-profile/src/UserMenu/userMenuStyles.ts
index ca6aaab5bb..19a74e28bd 100644
--- a/webapp/packages/plugin-user-profile/src/UserMenu/userMenuStyles.ts
+++ b/webapp/packages/plugin-user-profile/src/UserMenu/userMenuStyles.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { css } from 'reshadow';
 
 export const userMenuStyles = css`
@@ -18,10 +17,10 @@ export const userMenuStyles = css`
     border: none;
     outline: none !important;
     & Icon {
-        background: #47a0dd;
-        width: 16px;
-        height: 100%;
-        padding: 0 16px;
+      background: #47a0dd;
+      width: 16px;
+      height: 100%;
+      padding: 0 16px;
     }
   }
 `;
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx
index ae9b927086..afac0b08a1 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx
@@ -5,37 +5,35 @@
  * 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 { AuthProvidersResource } from '@cloudbeaver/core-authentication';
-import { IconOrImage, Link, Cell, useResource, Loader, getComputed, useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { Cell, getComputed, IconOrImage, Link, Loader, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { resourceKeyList, UserInfo } from '@cloudbeaver/core-sdk';
 
-
 const styles = css`
-    container {
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-    }
-    list {
-      overflow: auto;
-    }
-    Cell {
-      composes: theme-border-color-secondary from global;
-      border-bottom: 1px solid;
-      padding: 0 16px;
-    }
-    IconOrImage {
-      width: 100%;
-      height: 100%;
-    }
-    provider-login-icon {
-      width: 24px;
-      height: 24px;
-    }
+  container {
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+  }
+  list {
+    overflow: auto;
+  }
+  Cell {
+    composes: theme-border-color-secondary from global;
+    border-bottom: 1px solid;
+    padding: 0 16px;
+  }
+  IconOrImage {
+    width: 100%;
+    height: 100%;
+  }
+  provider-login-icon {
+    width: 24px;
+    height: 24px;
+  }
 `;
 
 interface Props {
@@ -53,37 +51,37 @@ export const AuthProvidersList = observer<Props>(function AuthProvidersList({ us
   return styled(style)(
     <container className={className}>
       <Loader state={providersResource}>
-        {() => styled(style)(
-          <list>
-            {providersResource.data.map(provider => {
-              if (!provider) {
-                return null;
-              }
+        {() =>
+          styled(style)(
+            <list>
+              {providersResource.data.map(provider => {
+                if (!provider) {
+                  return null;
+                }
 
-              const title = `${provider.label}\n${provider.description || ''}`;
-              return (
-                <Link
-                  key={provider.id}
-                  title={title}
-                  wrapper
-                >
-                  <Cell
-                    before={provider.icon ? <IconOrImage icon={provider.icon} /> : undefined}
-                    after={activeProviders.includes(provider.id) ? (
-                      <provider-login-icon>
-                        <IconOrImage icon='/icons/success_sm.svg' title={translate('plugin_user_profile_auth_providers_active')} />
-                      </provider-login-icon>
-                    ) : undefined}
-                    description={provider.description}
-                  >
-                    {provider.label}
-                  </Cell>
-                </Link>
-              );
-            })}
-          </list>
-        )}
+                const title = `${provider.label}\n${provider.description || ''}`;
+                return (
+                  <Link key={provider.id} title={title} wrapper>
+                    <Cell
+                      before={provider.icon ? <IconOrImage icon={provider.icon} /> : undefined}
+                      after={
+                        activeProviders.includes(provider.id) ? (
+                          <provider-login-icon>
+                            <IconOrImage icon="/icons/success_sm.svg" title={translate('plugin_user_profile_auth_providers_active')} />
+                          </provider-login-icon>
+                        ) : undefined
+                      }
+                      description={provider.description}
+                    >
+                      {provider.label}
+                    </Cell>
+                  </Link>
+                );
+              })}
+            </list>,
+          )
+        }
       </Loader>
-    </container>
+    </container>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx
index eaeba47512..a8d42ce988 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -22,15 +21,11 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPanel({
-  user,
-  className,
-  style,
-}) {
+export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPanel({ user, className, style }) {
   const styles = useStyles(BASE_TAB_STYLES, style, BASE_CONTAINERS_STYLES);
 
   return styled(styles)(
-    <TabPanel tabId='auth-providers' className={className}>
+    <TabPanel tabId="auth-providers" className={className}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <Group box medium overflow>
@@ -38,6 +33,6 @@ export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPa
           </Group>
         </Container>
       </ColoredContainer>
-    </TabPanel>
+    </TabPanel>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx
index 1600dd4126..1f23918a9a 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx
@@ -5,27 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab } from '@cloudbeaver/core-ui';
 
-
 interface Props {
   className?: string;
   style?: ComponentStyle;
 }
 
-export const UserAuthProvidersTab = observer<Props>(function UserAuthProvidersTab({
-  className,
-  style,
-}) {
+export const UserAuthProvidersTab = observer<Props>(function UserAuthProvidersTab({ className, style }) {
   const translate = useTranslate();
   const styles = useStyles(style);
 
   return styled(styles)(
-    <Tab tabId='auth-providers' style={style} className={className}>{translate('plugin_user_profile_auth_providers')}</Tab>
+    <Tab tabId="auth-providers" style={style} className={className}>
+      {translate('plugin_user_profile_auth_providers')}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx
index 0eda04c962..4a0718e650 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx
@@ -5,41 +5,40 @@
  * 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 { AuthProviderConfiguration, AuthProvidersResource } from '@cloudbeaver/core-authentication';
-import { IconOrImage, Link, Cell, useResource, Loader, Button, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Cell, IconOrImage, Link, Loader, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CachedMapAllKey, UserInfo } from '@cloudbeaver/core-sdk';
 import { AuthenticationService } from '@cloudbeaver/plugin-authentication';
 
 const styles = css`
-    container {
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-    }
-    list {
-      overflow: auto;
-    }
-    Cell {
-      composes: theme-border-color-secondary from global;
-      border-bottom: 1px solid;
-      padding: 0 16px;
-    }
-    IconOrImage {
-      width: 100%;
-      height: 100%;
-    }
-    provider-login-icon {
-      width: 24px;
-      height: 24px;
-    }
-    time {
-      composes: theme-typography--caption from global;
-    }
+  container {
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+  }
+  list {
+    overflow: auto;
+  }
+  Cell {
+    composes: theme-border-color-secondary from global;
+    border-bottom: 1px solid;
+    padding: 0 16px;
+  }
+  IconOrImage {
+    width: 100%;
+    height: 100%;
+  }
+  provider-login-icon {
+    width: 24px;
+    height: 24px;
+  }
+  time {
+    composes: theme-typography--caption from global;
+  }
 `;
 
 interface Props {
@@ -70,9 +69,7 @@ export const AuthTokenList = observer<Props>(function AuthTokenList({ user, clas
             let icon = provider.icon;
 
             if (token.authConfiguration) {
-              configuration = provider.configurations?.find(
-                configuration => configuration.id === token.authConfiguration
-              );
+              configuration = provider.configurations?.find(configuration => configuration.id === token.authConfiguration);
 
               if (configuration) {
                 name = configuration.displayName;
@@ -88,21 +85,14 @@ export const AuthTokenList = observer<Props>(function AuthTokenList({ user, clas
             const title = `${name}\n${description || ''}`;
 
             return (
-              <Link
-                key={provider.id + '_' + token.authConfiguration}
-                title={title}
-                wrapper
-              >
+              <Link key={provider.id + '_' + token.authConfiguration} title={title} wrapper>
                 <Cell
                   before={icon ? <IconOrImage icon={icon} /> : undefined}
-                  after={(
-                    <Button
-                      mod={['outlined']}
-                      onClick={() => authenticationService.logout(provider.id, configuration?.id)}
-                    >
+                  after={
+                    <Button mod={['outlined']} onClick={() => authenticationService.logout(provider.id, configuration?.id)}>
                       {translate('authentication_logout')}
                     </Button>
-                  )}
+                  }
                   // after={activeProviders.includes(provider.id) && false ? (
                   //   <provider-login-icon>
                   //     <IconOrImage
@@ -111,13 +101,19 @@ export const AuthTokenList = observer<Props>(function AuthTokenList({ user, clas
                   //     />
                   //   </provider-login-icon>
                   // ) : undefined}
-                  description={(
+                  description={
                     <>
-                      {description}<br />
-                      {token.userId && (<>{token.userId}<br /></>)}
+                      {description}
+                      <br />
+                      {token.userId && (
+                        <>
+                          {token.userId}
+                          <br />
+                        </>
+                      )}
                       {date ? <time dateTime={date.toLocaleString()}>{date.toLocaleString()}</time> : undefined}
                     </>
-                  )}
+                  }
                 >
                   {name}
                 </Cell>
@@ -126,6 +122,6 @@ export const AuthTokenList = observer<Props>(function AuthTokenList({ user, clas
           })}
         </list>
       </Loader>
-    </container>
+    </container>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx
index 8e481eecb2..7231ed4baa 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -22,15 +21,11 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPanel({
-  user,
-  className,
-  style,
-}) {
+export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPanel({ user, className, style }) {
   const styles = useStyles(BASE_TAB_STYLES, style, BASE_CONTAINERS_STYLES);
 
   return styled(styles)(
-    <TabPanel tabId='auth-providers' className={className}>
+    <TabPanel tabId="auth-providers" className={className}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <Group box medium overflow>
@@ -38,6 +33,6 @@ export const UserAuthProviderPanel = observer<Props>(function UserAuthProviderPa
           </Group>
         </Container>
       </ColoredContainer>
-    </TabPanel>
+    </TabPanel>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx
index 47fa68b1a8..1f23918a9a 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx
@@ -5,11 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab } from '@cloudbeaver/core-ui';
 
@@ -18,14 +16,13 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const UserAuthProvidersTab = observer<Props>(function UserAuthProvidersTab({
-  className,
-  style,
-}) {
+export const UserAuthProvidersTab = observer<Props>(function UserAuthProvidersTab({ className, style }) {
   const translate = useTranslate();
   const styles = useStyles(style);
 
   return styled(styles)(
-    <Tab tabId='auth-providers' style={style} className={className}>{translate('plugin_user_profile_auth_providers')}</Tab>
+    <Tab tabId="auth-providers" style={style} className={className}>
+      {translate('plugin_user_profile_auth_providers')}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx
index 70eb39fada..80441b6e29 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -24,12 +23,12 @@ export const AuthenticationPanel = observer<Props>(function AuthenticationPanel(
   const styles = useStyles(BASE_TAB_STYLES, style, BASE_CONTAINERS_STYLES);
 
   return styled(styles)(
-    <TabPanel tabId='authentication' className={className}>
+    <TabPanel tabId="authentication" className={className}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <ChangePassword />
         </Container>
       </ColoredContainer>
-    </TabPanel>
+    </TabPanel>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx
index c4a2e8d140..fbfe545bd3 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab } from '@cloudbeaver/core-ui';
 
@@ -23,6 +22,8 @@ export const AuthenticationTab = observer<Props>(function AuthenticationTab({ cl
   const styles = useStyles(style);
 
   return styled(styles)(
-    <Tab tabId='authentication' style={style} className={className}>{translate('ui_authentication')}</Tab>
+    <Tab tabId="authentication" style={style} className={className}>
+      {translate('ui_authentication')}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
index df7bbada2a..a422403221 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
@@ -22,51 +21,29 @@ export const ChangePassword = observer(function ChangePassword() {
   return styled(BASE_CONTAINERS_STYLES)(
     <Group form gap>
       <GroupTitle>{translate('plugin_user_profile_authentication_change_password')}</GroupTitle>
-      <InputField
-        type='password'
-        name='oldPassword'
-        state={state.config}
-        disabled={disabled}
-        mapValue={(value => value.trim())}
-        small
-        required
-      >
+      <InputField type="password" name="oldPassword" state={state.config} disabled={disabled} mapValue={value => value.trim()} small required>
         {translate('plugin_user_profile_authentication_change_password_current_password')}
       </InputField>
       <InputField
-        type='password'
-        name='password'
-        autoComplete='new-password'
+        type="password"
+        name="password"
+        autoComplete="new-password"
         state={state.config}
         disabled={disabled}
-        mapValue={(value => value.trim())}
+        mapValue={value => value.trim()}
         small
         required
       >
         {translate('plugin_user_profile_authentication_change_password_new_password')}
       </InputField>
-      <InputField
-        type='password'
-        name='repeatedPassword'
-        state={state.config}
-        disabled={disabled}
-        mapValue={(value => value.trim())}
-        small
-        required
-      >
+      <InputField type="password" name="repeatedPassword" state={state.config} disabled={disabled} mapValue={value => value.trim()} small required>
         {translate('plugin_user_profile_authentication_change_password_repeat_password')}
       </InputField>
       <GroupItem>
-        <Button
-          disabled={disabled || !state.formFilled}
-          loading={state.submitting}
-          type="button"
-          mod={['unelevated']}
-          onClick={state.changePassword}
-        >
+        <Button disabled={disabled || !state.formFilled} loading={state.submitting} type="button" mod={['unelevated']} onClick={state.changePassword}>
           {translate('plugin_user_profile_authentication_change_password_submit_label')}
         </Button>
       </GroupItem>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/useChangePassword.ts b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/useChangePassword.ts
index 530f864029..de4f7c8b9a 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/useChangePassword.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/useChangePassword.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, computed, observable } from 'mobx';
 
 import { UsersResource } from '@cloudbeaver/core-authentication';
@@ -31,46 +30,47 @@ export function useChangePassword(): IState {
   const usersResource = useService(UsersResource);
   const notificationService = useService(NotificationService);
 
-  return useObservableRef(() => ({
-    config: {
-      oldPassword: '',
-      password: '',
-      repeatedPassword: '',
-    },
-    submitting: false,
-    get formFilled() {
-      return this.config.password.length > 0 && this.config.oldPassword.length > 0
-        && this.config.repeatedPassword.length > 0;
-    },
-    async changePassword() {
-      if (this.config.password !== this.config.repeatedPassword) {
-        this.notificationService.logError({ title: 'plugin_user_profile_authentication_change_password_passwords_not_match' });
-        return;
-      }
+  return useObservableRef(
+    () => ({
+      config: {
+        oldPassword: '',
+        password: '',
+        repeatedPassword: '',
+      },
+      submitting: false,
+      get formFilled() {
+        return this.config.password.length > 0 && this.config.oldPassword.length > 0 && this.config.repeatedPassword.length > 0;
+      },
+      async changePassword() {
+        if (this.config.password !== this.config.repeatedPassword) {
+          this.notificationService.logError({ title: 'plugin_user_profile_authentication_change_password_passwords_not_match' });
+          return;
+        }
 
-      try {
-        this.submitting = true;
-        await usersResource.updateLocalPassword(this.config.oldPassword, this.config.password);
-        notificationService.logSuccess({ title: 'plugin_user_profile_authentication_change_password_success' });
-        this.resetConfig();
-      } catch (exception: any) {
-        notificationService.logException(exception);
-      } finally {
-        this.submitting = false;
-      }
+        try {
+          this.submitting = true;
+          await usersResource.updateLocalPassword(this.config.oldPassword, this.config.password);
+          notificationService.logSuccess({ title: 'plugin_user_profile_authentication_change_password_success' });
+          this.resetConfig();
+        } catch (exception: any) {
+          notificationService.logException(exception);
+        } finally {
+          this.submitting = false;
+        }
+      },
+      resetConfig() {
+        this.config.oldPassword = '';
+        this.config.password = '';
+        this.config.repeatedPassword = '';
+      },
+    }),
+    {
+      config: observable,
+      submitting: observable.ref,
+      formFilled: computed,
+      changePassword: action.bound,
+      resetConfig: action,
     },
-    resetConfig() {
-      this.config.oldPassword = '';
-      this.config.password = '';
-      this.config.repeatedPassword = '';
-    },
-  }),
-  {
-    config: observable,
-    submitting: observable.ref,
-    formFilled: computed,
-    changePassword: action.bound,
-    resetConfig: action,
-  },
-  { usersResource, notificationService });
+    { usersResource, notificationService },
+  );
 }
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts b/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts
index 7a12368454..a4fc1c74fa 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
 export interface IUserProfileFormState {
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
index 44df8eadb4..fccfa9e343 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -27,78 +26,78 @@ const tabsStyles = css`
     align-items: center;
   }
   Tab {
-    height: 46px!important;
+    height: 46px !important;
     text-transform: uppercase;
     font-weight: 500 !important;
   }
 `;
 
 const topBarStyles = css`
-    top-bar {
-      composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-      position: relative;
-      display: flex;
-      padding-top: 16px;
+  top-bar {
+    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+    position: relative;
+    display: flex;
+    padding-top: 16px;
 
-      &:before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        border-bottom: solid 2px;
-        border-color: inherit;
-      }
-    }
-    top-bar-tabs {
-      flex: 1;
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      border-bottom: solid 2px;
+      border-color: inherit;
     }
+  }
+  top-bar-tabs {
+    flex: 1;
+  }
 
-    top-bar-actions {
-      display: flex;
-      align-items: center;
-      padding: 0 24px;
-      gap: 16px;
-    }
+  top-bar-actions {
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+    gap: 16px;
+  }
 
-    /*Button:not(:first-child) {
+  /*Button:not(:first-child) {
       margin-right: 24px;
     }*/
 
-    status-message {
-      composes: theme-typography--caption from global;
-      height: 24px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      gap: 8px;
+  status-message {
+    composes: theme-typography--caption from global;
+    height: 24px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-      & IconOrImage {
-        height: 24px;
-        width: 24px;
-      }
+    & IconOrImage {
+      height: 24px;
+      width: 24px;
     }
-  `;
+  }
+`;
 
 const formStyles = css`
-    box {
-      composes: theme-background-secondary theme-text-on-secondary from global;
-    }
-    flex-box {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      height: 100%;
-      overflow: auto;
-    }
-    content-box {
-      composes: theme-background-secondary theme-border-color-background from global;
-      position: relative;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      overflow: auto;
-    }
-  `;
+  box {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+  }
+  flex-box {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+  }
+  content-box {
+    composes: theme-background-secondary theme-border-color-background from global;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: auto;
+  }
+`;
 
 interface Props {
   user: UserInfo;
@@ -106,11 +105,7 @@ interface Props {
   onClose?: () => void;
 }
 
-export const UserForm = observer<Props>(function UserForm({
-  user,
-  state,
-  onClose,
-}) {
+export const UserForm = observer<Props>(function UserForm({ user, state, onClose }) {
   const translate = useTranslate();
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
   const styles = useStyles(style, BASE_CONTAINERS_STYLES, topBarStyles, formStyles);
@@ -125,12 +120,12 @@ export const UserForm = observer<Props>(function UserForm({
             <status-message>
               {state.info.statusMessage && (
                 <>
-                  <IconOrImage icon='/icons/info_icon.svg' />
+                  <IconOrImage icon="/icons/info_icon.svg" />
                   {translate(state.info.statusMessage)}
                 </>
               )}
             </status-message>
-            <TabList aria-label='User Settings' style={style} disabled={state.info.disabled}>
+            <TabList aria-label="User Settings" style={style} disabled={state.info.disabled}>
               <UserInfoTab style={style} />
               {localProvider && <AuthenticationTab style={style} />}
               {/* <UserAuthProvidersTab style={style} /> */}
@@ -138,11 +133,7 @@ export const UserForm = observer<Props>(function UserForm({
           </top-bar-tabs>
           <top-bar-actions>
             {onClose && (
-              <Button
-                type="button"
-                mod={['outlined']}
-                onClick={onClose}
-              >
+              <Button type="button" mod={['outlined']} onClick={onClose}>
                 {translate('ui_processing_cancel')}
               </Button>
             )}
@@ -154,6 +145,6 @@ export const UserForm = observer<Props>(function UserForm({
           {/* <UserAuthProviderPanel user={user} style={style} /> */}
         </content-box>
       </TabsState>
-    </flex-box>
+    </flex-box>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoPanel.tsx
index 97a0920cfa..7ee505ff98 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoPanel.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoPanel.tsx
@@ -5,12 +5,23 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, GroupTitle, InputField, Loader, ObjectPropertyInfoForm, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  BASE_CONTAINERS_STYLES,
+  ColoredContainer,
+  Container,
+  Group,
+  GroupTitle,
+  InputField,
+  Loader,
+  ObjectPropertyInfoForm,
+  useResource,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import type { UserInfo } from '@cloudbeaver/core-sdk';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { BASE_TAB_STYLES, TabPanel } from '@cloudbeaver/core-ui';
@@ -23,73 +34,37 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const UserInfoPanel = observer<Props>(function UserInfoPanel({
-  user,
-  className,
-  style,
-}) {
+export const UserInfoPanel = observer<Props>(function UserInfoPanel({ user, className, style }) {
   const userMetaParameters = useResource(UserInfoPanel, UserMetaParametersResource, undefined);
   const styles = useStyles(BASE_TAB_STYLES, style, BASE_CONTAINERS_STYLES);
   const translate = useTranslate();
 
   return styled(styles)(
-    <TabPanel tabId='info' className={className}>
+    <TabPanel tabId="info" className={className}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <Group form gap>
             <GroupTitle>{translate('plugin_user_profile_info')}</GroupTitle>
             <Container wrap gap>
-              <InputField
-                type='text'
-                name='userId'
-                minLength={1}
-                state={user}
-                mod='surface'
-                readOnly
-                required
-                tiny
-                fill
-              >
+              <InputField type="text" name="userId" minLength={1} state={user} mod="surface" readOnly required tiny fill>
                 {translate('plugin_user_profile_info_id')}
               </InputField>
-              <InputField
-                type='text'
-                name='displayName'
-                minLength={1}
-                state={user}
-                mod='surface'
-                readOnly
-                required
-                tiny
-                fill
-              >
+              <InputField type="text" name="displayName" minLength={1} state={user} mod="surface" readOnly required tiny fill>
                 {translate('plugin_user_profile_info_displayName')}
               </InputField>
-              <InputField
-                type='text'
-                name='authRole'
-                mod='surface'
-                state={user}
-                autoHide
-                readOnly
-                tiny
-                fill
-              >
+              <InputField type="text" name="authRole" mod="surface" state={user} autoHide readOnly tiny fill>
                 {translate('authentication_user_role')}
               </InputField>
             </Container>
             <Loader state={userMetaParameters} inline>
-              {() => userMetaParameters.data.length > 0 && styled(styles)(
-                <Container wrap gap>
-                  <ObjectPropertyInfoForm
-                    state={user.metaParameters}
-                    properties={userMetaParameters.data}
-                    readOnly
-                    tiny
-                    fill
-                  />
-                </Container>
-              )}
+              {() =>
+                userMetaParameters.data.length > 0 &&
+                styled(styles)(
+                  <Container wrap gap>
+                    <ObjectPropertyInfoForm state={user.metaParameters} properties={userMetaParameters.data} readOnly tiny fill />
+                  </Container>,
+                )
+              }
             </Loader>
           </Group>
           <Group box medium overflow>
@@ -98,6 +73,6 @@ export const UserInfoPanel = observer<Props>(function UserInfoPanel({
           </Group>
         </Container>
       </ColoredContainer>
-    </TabPanel>
+    </TabPanel>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoTab.tsx
index 6b96f4db72..e97ade2587 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoTab.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserInfo/UserInfoTab.tsx
@@ -5,11 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { useTranslate, useStyles } from '@cloudbeaver/core-blocks';
+import { useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 import { Tab } from '@cloudbeaver/core-ui';
 
@@ -18,14 +17,13 @@ interface Props {
   style?: ComponentStyle;
 }
 
-export const UserInfoTab = observer<Props>(function UserInfoTab({
-  className,
-  style,
-}) {
+export const UserInfoTab = observer<Props>(function UserInfoTab({ className, style }) {
   const translate = useTranslate();
   const styles = useStyles(style);
 
   return styled(styles)(
-    <Tab tabId='info' style={style} className={className}>{translate('plugin_user_profile_info')}</Tab>
+    <Tab tabId="info" style={style} className={className}>
+      {translate('plugin_user_profile_info')}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileForm.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileForm.tsx
index 27390df326..fa6ab701e0 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileForm.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileForm.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 import styled, { css } from 'reshadow';
@@ -39,6 +38,6 @@ export const UserProfileForm = observer(function UserProfileForm() {
   return styled(style)(
     <Loader state={userInfo}>
       {() => userInfo.data && <UserForm user={userInfo.data} state={userProfileService.formState!} onClose={close} />}
-    </Loader>
+    </Loader>,
   );
 });
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts
index 0d19b020b1..358e9cfa14 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
 import type { IUserProfileFormState } from './IUserProfileFormState';
@@ -20,11 +19,7 @@ export class UserProfileFormState implements IUserProfileFormState {
     };
   }
 
-  async validate(): Promise<void> {
+  async validate(): Promise<void> {}
 
-  }
-
-  dispose(): void {
-
-  }
+  dispose(): void {}
 }
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileService.ts b/webapp/packages/plugin-user-profile/src/UserProfileService.ts
index 9c938a3de4..ebac6e1e1f 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileService.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileService.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { action, makeObservable, observable } from 'mobx';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
diff --git a/webapp/packages/plugin-user-profile/src/index.ts b/webapp/packages/plugin-user-profile/src/index.ts
index 4be3350f23..61f245673e 100644
--- a/webapp/packages/plugin-user-profile/src/index.ts
+++ b/webapp/packages/plugin-user-profile/src/index.ts
@@ -3,4 +3,4 @@ import { userProfilePlugin } from './manifest';
 export default userProfilePlugin;
 
 export * from './UserMenu/MENU_USER_PROFILE';
-export * from './UserMenu/UserMenu';
\ No newline at end of file
+export * from './UserMenu/UserMenu';
diff --git a/webapp/packages/plugin-user-profile/src/locales/zh.ts b/webapp/packages/plugin-user-profile/src/locales/zh.ts
index 0254abe93f..e29fb5c32d 100644
--- a/webapp/packages/plugin-user-profile/src/locales/zh.ts
+++ b/webapp/packages/plugin-user-profile/src/locales/zh.ts
@@ -1,18 +1,18 @@
 export default [
-    ['plugin_user_profile_menu', '简介'],
-    ['plugin_user_profile_info', '信息'],
-    ['plugin_user_profile_info_id', '用户ID'],
-    ['plugin_user_profile_info_displayName', '显示名称'],
-    ['plugin_user_profile_auth_providers', '认证提供者'],
-    ['plugin_user_profile_info', '用户信息'],
-    ['plugin_user_profile_auth_tokens', '认证令牌'],
-    ['plugin_user_profile_auth_providers_active', '认证处于活跃状态'],
+  ['plugin_user_profile_menu', '简介'],
+  ['plugin_user_profile_info', '信息'],
+  ['plugin_user_profile_info_id', '用户ID'],
+  ['plugin_user_profile_info_displayName', '显示名称'],
+  ['plugin_user_profile_auth_providers', '认证提供者'],
+  ['plugin_user_profile_info', '用户信息'],
+  ['plugin_user_profile_auth_tokens', '认证令牌'],
+  ['plugin_user_profile_auth_providers_active', '认证处于活跃状态'],
 
-    ['plugin_user_profile_authentication_change_password', '更改密码'],
-    ['plugin_user_profile_authentication_change_password_current_password', '当前密码'],
-    ['plugin_user_profile_authentication_change_password_new_password', '新密码'],
-    ['plugin_user_profile_authentication_change_password_repeat_password', '重复密码'],
-    ['plugin_user_profile_authentication_change_password_success', '密码更改成功'],
-    ['plugin_user_profile_authentication_change_password_submit_label', '更改'],
-    ['plugin_user_profile_authentication_change_password_passwords_not_match', "密码不匹配"],
-  ];
+  ['plugin_user_profile_authentication_change_password', '更改密码'],
+  ['plugin_user_profile_authentication_change_password_current_password', '当前密码'],
+  ['plugin_user_profile_authentication_change_password_new_password', '新密码'],
+  ['plugin_user_profile_authentication_change_password_repeat_password', '重复密码'],
+  ['plugin_user_profile_authentication_change_password_success', '密码更改成功'],
+  ['plugin_user_profile_authentication_change_password_submit_label', '更改'],
+  ['plugin_user_profile_authentication_change_password_passwords_not_match', '密码不匹配'],
+];
diff --git a/webapp/packages/plugin-user-profile/src/manifest.ts b/webapp/packages/plugin-user-profile/src/manifest.ts
index 450ec87c3a..887fc9b6a7 100644
--- a/webapp/packages/plugin-user-profile/src/manifest.ts
+++ b/webapp/packages/plugin-user-profile/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { LocaleService } from './LocaleService';
@@ -17,9 +16,5 @@ export const userProfilePlugin: PluginManifest = {
     name: 'User profile plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-    LocaleService,
-    UserProfileService,
-  ],
+  providers: [PluginBootstrap, LocaleService, UserProfileService],
 };
diff --git a/webapp/packages/plugin-version-update-administration/src/Instructions.tsx b/webapp/packages/plugin-version-update-administration/src/Instructions.tsx
index 9a2383a8a1..75124de8f8 100644
--- a/webapp/packages/plugin-version-update-administration/src/Instructions.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/Instructions.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -32,16 +31,22 @@ export const Instructions = observer(function Instructions() {
     <Group gap large>
       <GroupTitle>{translate('version_update_how_to_update')}</GroupTitle>
       <GroupItem>
-        <h4>
-          The following instructions apply only when you run CloudBeaver in a Docker container.
-        </h4>
+        <h4>The following instructions apply only when you run CloudBeaver in a Docker container.</h4>
         <ol>
-          <li>Stop the existing container by running the <strong>docker stop</strong> command.</li>
-          <li>Use the <strong>docker rm</strong> command to remove it.</li>
-          <li>Use the <strong>docker pull</strong> command to download the image from the Docker Hub. </li>
-          <li>Re-create the container by executing the <strong>docker run</strong> command. </li>
+          <li>
+            Stop the existing container by running the <strong>docker stop</strong> command.
+          </li>
+          <li>
+            Use the <strong>docker rm</strong> command to remove it.
+          </li>
+          <li>
+            Use the <strong>docker pull</strong> command to download the image from the Docker Hub.{' '}
+          </li>
+          <li>
+            Re-create the container by executing the <strong>docker run</strong> command.{' '}
+          </li>
         </ol>
       </GroupItem>
-    </Group>
+    </Group>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-version-update-administration/src/PluginBootstrap.ts
index 79d618dabc..266379c5f8 100644
--- a/webapp/packages/plugin-version-update-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-version-update-administration/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { AdministrationItemService, AdministrationItemType } from '@cloudbeaver/core-administration';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
@@ -14,13 +13,11 @@ import { VersionUpdateDrawerItem } from './VersionUpdateDrawerItem';
 
 @injectable()
 export class PluginBootstrap extends Bootstrap {
-  constructor(
-    private readonly administrationItemService: AdministrationItemService
-  ) {
+  constructor(private readonly administrationItemService: AdministrationItemService) {
     super();
   }
 
-  async load(): Promise<void> { }
+  async load(): Promise<void> {}
 
   register(): void {
     this.administrationItemService.create({
diff --git a/webapp/packages/plugin-version-update-administration/src/Recommendations.tsx b/webapp/packages/plugin-version-update-administration/src/Recommendations.tsx
index 394c89f6e2..390cb16fe2 100644
--- a/webapp/packages/plugin-version-update-administration/src/Recommendations.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/Recommendations.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -22,14 +21,15 @@ const style = css`
 
 export const Recommendations = observer(function Recommendations() {
   const translate = useTranslate();
-  return styled(BASE_CONTAINERS_STYLES, style)(
+  return styled(
+    BASE_CONTAINERS_STYLES,
+    style,
+  )(
     <Group gap large>
       <GroupTitle>{translate('version_update_recommendations')}</GroupTitle>
       <GroupItem>
-        <h4>
-          We highly recommend avoiding product downgrade. We cannot guarantee the proper work of the application after this procedure.
-        </h4>
+        <h4>We highly recommend avoiding product downgrade. We cannot guarantee the proper work of the application after this procedure.</h4>
       </GroupItem>
-    </Group>
+    </Group>,
   );
-});
\ No newline at end of file
+});
diff --git a/webapp/packages/plugin-version-update-administration/src/Version.tsx b/webapp/packages/plugin-version-update-administration/src/Version.tsx
index 2c589ba5db..dc9f9e7257 100644
--- a/webapp/packages/plugin-version-update-administration/src/Version.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/Version.tsx
@@ -5,11 +5,10 @@
  * 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 { TableItem, TableColumnValue, TableItemExpand, useStyles } from '@cloudbeaver/core-blocks';
+import { TableColumnValue, TableItem, TableItemExpand, useStyles } from '@cloudbeaver/core-blocks';
 import type { IVersion } from '@cloudbeaver/core-version';
 
 import { VersionInfo } from './VersionInfo';
@@ -35,6 +34,6 @@ export const Version = observer<Props>(function Version({ version }) {
       </TableColumnValue>
       <TableColumnValue expand>{version.number}</TableColumnValue>
       <TableColumnValue>{version.date}</TableColumnValue>
-    </TableItem>
+    </TableItem>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/VersionChecker.tsx b/webapp/packages/plugin-version-update-administration/src/VersionChecker.tsx
index 3c851918c6..9ceabfd442 100644
--- a/webapp/packages/plugin-version-update-administration/src/VersionChecker.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/VersionChecker.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -30,8 +29,10 @@ export const VersionChecker = observer(function VersionChecker() {
 
   const icon = versionUpdateService.newVersionAvailable ? '/icons/info_icon.svg' : '/icons/success_icon.svg';
   const text = versionUpdateService.newVersionAvailable ? 'version_update_new_version_available' : 'version_update_version_is_up_to_date';
-  const description = versionService.current && versionResource.latest
-    ? `${translate('version_current')}: ${versionService.current}, ${translate('version_latest')}: ${versionResource.latest.number}` : '';
+  const description =
+    versionService.current && versionResource.latest
+      ? `${translate('version_current')}: ${versionService.current}, ${translate('version_latest')}: ${versionResource.latest.number}`
+      : '';
 
   return styled(styles)(
     <Cell
@@ -41,6 +42,6 @@ export const VersionChecker = observer(function VersionChecker() {
       ripple={false}
     >
       {translate(text)}
-    </Cell>
+    </Cell>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx b/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx
index 5633b47630..7994d0a221 100644
--- a/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/VersionInfo.tsx
@@ -5,7 +5,6 @@
  * 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 ReactMarkdown from 'react-markdown';
 import styled, { css } from 'reshadow';
@@ -46,6 +45,6 @@ export const VersionInfo = observer<Props>(function VersionInfo({ item }) {
           </GroupItem>
         )}
       </Group>
-    </Container>
+    </Container>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx b/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx
index e5ffbe171c..add02f432e 100644
--- a/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx
@@ -5,7 +5,6 @@
  * 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 { useEffect, useState } from 'react';
 import styled, { css } from 'reshadow';
@@ -47,7 +46,10 @@ export const VersionSelector = observer<Props>(function VersionSelector({ versio
   const version = versions.find(v => v.number === selected);
   const Instruction = versionUpdateService.instructionGetter?.();
 
-  return styled(BASE_CONTAINERS_STYLES, style)(
+  return styled(
+    BASE_CONTAINERS_STYLES,
+    style,
+  )(
     <Container gap>
       <Group gap large>
         <Combobox
@@ -67,6 +69,6 @@ export const VersionSelector = observer<Props>(function VersionSelector({ versio
         )}
       </Group>
       {version && <VersionInfo item={version.number} />}
-    </Container>
+    </Container>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/VersionUpdate.tsx b/webapp/packages/plugin-version-update-administration/src/VersionUpdate.tsx
index 9cec50215a..298e28a687 100644
--- a/webapp/packages/plugin-version-update-administration/src/VersionUpdate.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/VersionUpdate.tsx
@@ -5,7 +5,6 @@
  * 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 { gte } from 'semver';
@@ -47,6 +46,6 @@ export const VersionUpdate: AdministrationItemContentComponent = observer(functi
         </>
       )}
       <Recommendations />
-    </ColoredContainer>
+    </ColoredContainer>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/VersionUpdateDrawerItem.tsx b/webapp/packages/plugin-version-update-administration/src/VersionUpdateDrawerItem.tsx
index b192751266..215fb0e63b 100644
--- a/webapp/packages/plugin-version-update-administration/src/VersionUpdateDrawerItem.tsx
+++ b/webapp/packages/plugin-version-update-administration/src/VersionUpdateDrawerItem.tsx
@@ -5,7 +5,6 @@
  * 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';
 
@@ -13,51 +12,43 @@ import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administra
 import { Translate, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
-import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui';
+import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui';
 import { VersionResource } from '@cloudbeaver/core-version';
 import { VersionUpdateService } from '@cloudbeaver/core-version-update';
 
 const styles = css`
-    tab-container {
-      justify-content: space-between;
-    }
-    TabTitle {
-      flex: 1;
-    }
-    icon {
-      composes: theme-background-primary from global;
-      width: 8px;
-      height: 8px;
-      border-radius: 50%;
-      flex-shrink: 0;
-      margin-right: 12px;
-    }
-    IconOrImage {
-      width: 16px;
-    }
+  tab-container {
+    justify-content: space-between;
+  }
+  TabTitle {
+    flex: 1;
+  }
+  icon {
+    composes: theme-background-primary from global;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    flex-shrink: 0;
+    margin-right: 12px;
+  }
+  IconOrImage {
+    width: 16px;
+  }
 `;
 
-export const VersionUpdateDrawerItem = observer<AdministrationItemDrawerProps>(function VersionUpdateDrawerItem({
-  item, onSelect, style, disabled,
-}) {
+export const VersionUpdateDrawerItem = observer<AdministrationItemDrawerProps>(function VersionUpdateDrawerItem({ item, onSelect, style, disabled }) {
   const translate = useTranslate();
   const versionUpdateService = useService(VersionUpdateService);
 
   useResource(VersionUpdateDrawerItem, VersionResource, CachedMapAllKey);
 
   return styled(useStyles(style, styles))(
-    <Tab
-      tabId={item.name}
-      disabled={disabled}
-      title='version_update'
-      style={styles}
-      onOpen={() => onSelect(item.name)}
-    >
-      <TabIcon icon='/icons/version_update.svg' />
-      <TabTitle><Translate token='version_update' /></TabTitle>
-      {versionUpdateService.newVersionAvailable && (
-        <icon title={translate('version_update_new_version_available')} />
-      )}
-    </Tab>
+    <Tab tabId={item.name} disabled={disabled} title="version_update" style={styles} onOpen={() => onSelect(item.name)}>
+      <TabIcon icon="/icons/version_update.svg" />
+      <TabTitle>
+        <Translate token="version_update" />
+      </TabTitle>
+      {versionUpdateService.newVersionAvailable && <icon title={translate('version_update_new_version_available')} />}
+    </Tab>,
   );
 });
diff --git a/webapp/packages/plugin-version-update-administration/src/manifest.ts b/webapp/packages/plugin-version-update-administration/src/manifest.ts
index f4a543e0c2..9c834d94f2 100644
--- a/webapp/packages/plugin-version-update-administration/src/manifest.ts
+++ b/webapp/packages/plugin-version-update-administration/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
@@ -15,7 +14,5 @@ export const versionUpdatePlugin: PluginManifest = {
     name: 'Version update plugin',
   },
 
-  providers: [
-    PluginBootstrap,
-  ],
+  providers: [PluginBootstrap],
 };
diff --git a/webapp/packages/plugin-version/src/PluginBootstrap.ts b/webapp/packages/plugin-version/src/PluginBootstrap.ts
index 484c40a93e..5cb98d6fdd 100644
--- a/webapp/packages/plugin-version/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-version/src/PluginBootstrap.ts
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
 @injectable()
@@ -14,7 +13,7 @@ export class PluginBootstrap extends Bootstrap {
     super();
   }
 
-  register(): void | Promise<void> { }
+  register(): void | Promise<void> {}
 
-  load(): void | Promise<void> { }
-}
\ No newline at end of file
+  load(): void | Promise<void> {}
+}
diff --git a/webapp/packages/plugin-version/src/index.ts b/webapp/packages/plugin-version/src/index.ts
index dac9cafe44..95824d8f71 100644
--- a/webapp/packages/plugin-version/src/index.ts
+++ b/webapp/packages/plugin-version/src/index.ts
@@ -1,5 +1,5 @@
-export * from './useAppVersion';
-
 import { versionPlugin } from './manifest';
 
-export default versionPlugin;
\ No newline at end of file
+export * from './useAppVersion';
+
+export default versionPlugin;
diff --git a/webapp/packages/plugin-version/src/manifest.ts b/webapp/packages/plugin-version/src/manifest.ts
index 7a217dbe0c..4efa7a7bec 100644
--- a/webapp/packages/plugin-version/src/manifest.ts
+++ b/webapp/packages/plugin-version/src/manifest.ts
@@ -5,14 +5,11 @@
  * 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 { PluginBootstrap } from './PluginBootstrap';
 
 export const versionPlugin: PluginManifest = {
   info: { name: 'Version plugin' },
-  providers: [
-    PluginBootstrap,
-  ],
-};
\ No newline at end of file
+  providers: [PluginBootstrap],
+};
diff --git a/webapp/packages/plugin-version/src/useAppVersion.tsx b/webapp/packages/plugin-version/src/useAppVersion.tsx
index e23dbc2ce7..0c5f9375fd 100644
--- a/webapp/packages/plugin-version/src/useAppVersion.tsx
+++ b/webapp/packages/plugin-version/src/useAppVersion.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { useService } from '@cloudbeaver/core-di';
 import { VersionService } from '@cloudbeaver/core-version';
 
diff --git a/webapp/packages/prettier-config/index.json b/webapp/packages/prettier-config/index.json
new file mode 100644
index 0000000000..20148473eb
--- /dev/null
+++ b/webapp/packages/prettier-config/index.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json.schemastore.org/prettierrc",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "lf",
+  "printWidth": 150,
+  "arrowParens": "avoid",
+  "plugins": ["@trivago/prettier-plugin-sort-imports"],
+  "importOrderParserPlugins" : ["typescript", "jsx", "decorators-legacy"],
+  "importOrder": ["^@cloudbeaver/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "importOrderCaseInsensitive": true
+}
\ No newline at end of file
diff --git a/webapp/packages/prettier-config/package.json b/webapp/packages/prettier-config/package.json
new file mode 100644
index 0000000000..6e49cc809c
--- /dev/null
+++ b/webapp/packages/prettier-config/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@cloudbeaver/prettier-config",
+  "sideEffects": false,
+  "version": "0.1.0",
+  "license": "Apache-2.0",
+  "main": "index.json",
+  "devDependencies": {
+    "@trivago/prettier-plugin-sort-imports": "^4.1.1",
+    "prettier": "^2.8.8",
+    "reshadow": "^0.0.1"
+  }
+}
diff --git a/webapp/packages/product-default/src/ProductBootstrap.ts b/webapp/packages/product-default/src/ProductBootstrap.ts
index dd79acb35e..67547c35f1 100644
--- a/webapp/packages/product-default/src/ProductBootstrap.ts
+++ b/webapp/packages/product-default/src/ProductBootstrap.ts
@@ -5,7 +5,6 @@
  * 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 { VersionUpdateService } from '@cloudbeaver/core-version-update';
 
@@ -13,17 +12,13 @@ import { UpdateInstruction } from './UpdateInstruction';
 
 @injectable()
 export class ProductBootstrap extends Bootstrap {
-  constructor(
-    private readonly versionUpdateService: VersionUpdateService
-  ) {
+  constructor(private readonly versionUpdateService: VersionUpdateService) {
     super();
   }
 
-  async load() { }
+  async load() {}
 
   register() {
-    this.versionUpdateService.registerInstruction(
-      () => UpdateInstruction
-    );
+    this.versionUpdateService.registerInstruction(() => UpdateInstruction);
   }
 }
diff --git a/webapp/packages/product-default/src/ProductConfigService.ts b/webapp/packages/product-default/src/ProductConfigService.ts
index 871bcb3788..4033b585ba 100644
--- a/webapp/packages/product-default/src/ProductConfigService.ts
+++ b/webapp/packages/product-default/src/ProductConfigService.ts
@@ -5,8 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
-import { injectable, Bootstrap } from '@cloudbeaver/core-di';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ProductManagerService } from '@cloudbeaver/core-product';
 
 import productConfig from './config.json5';
@@ -21,5 +20,5 @@ export class ProductConfigService extends Bootstrap {
     this.productManager.setSettings(productConfig);
   }
 
-  load(): void | Promise<void> { }
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/product-default/src/UpdateInstruction.tsx b/webapp/packages/product-default/src/UpdateInstruction.tsx
index 93d787dc09..8d312b6fbe 100644
--- a/webapp/packages/product-default/src/UpdateInstruction.tsx
+++ b/webapp/packages/product-default/src/UpdateInstruction.tsx
@@ -5,7 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-
 import { Code } from '@cloudbeaver/core-blocks';
 import type { InstructionComponent } from '@cloudbeaver/core-version-update';
 
diff --git a/webapp/packages/product-default/src/manifest.ts b/webapp/packages/product-default/src/manifest.ts
index 9128effc6b..6ad91cadbd 100644
--- a/webapp/packages/product-default/src/manifest.ts
+++ b/webapp/packages/product-default/src/manifest.ts
@@ -5,7 +5,6 @@
  * 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 { ProductBootstrap } from './ProductBootstrap';
@@ -16,8 +15,5 @@ export const defaultProductManifest: PluginManifest = {
     name: 'Default Product',
   },
 
-  providers: [
-    ProductBootstrap,
-    ProductConfigService,
-  ],
+  providers: [ProductBootstrap, ProductConfigService],
 };
diff --git a/webapp/typings.d.ts b/webapp/typings.d.ts
index e140c45f05..c895704bd6 100644
--- a/webapp/typings.d.ts
+++ b/webapp/typings.d.ts
@@ -2,70 +2,58 @@
 /// <reference path="./node_modules/reshadow/elements.d.ts" />
 
 declare module '*.scss?raw' {
-  const classes: { readonly [key: string]: string }
-  export default classes
+  const classes: { readonly [key: string]: string };
+  export default classes;
 }
 
 declare module '*.json5' {
-  const json: any
-  export default json
+  const json: any;
+  export default json;
 }
 
 declare module '*.scss' {
-  const classes: { readonly [key: string]: string }
-  export default classes
+  const classes: { readonly [key: string]: string };
+  export default classes;
 }
 
 declare module '*.css' {
-  const classes: { readonly [key: string]: string }
-  export default classes
+  const classes: { readonly [key: string]: string };
+  export default classes;
 }
 
 declare module '*.css?raw' {
-  const classes: { readonly [key: string]: string }
-  export default classes
+  const classes: { readonly [key: string]: string };
+  export default classes;
 }
 
 declare module '*.svg' {
-  const content: string
-  export default content
+  const content: string;
+  export default content;
 }
 
 declare module 'reshadow' {
-  import { createElement, Component } from 'react'
+  import { createElement, Component } from 'react';
 
-  type StylesMap = { [key: string]: any }
+  type StylesMap = { [key: string]: any };
 
-  type IdFunction = <A extends JSX.Element>(node: A) => A
+  type IdFunction = <A extends JSX.Element>(node: A) => A;
 
-  declare function taggedStyled(
-    strs: TemplateStringsArray,
-    ...values: any[]
-  ): IdFunction
-  declare function taggedStyled<A extends JSX.Element>(node: A): A
+  declare function taggedStyled(strs: TemplateStringsArray, ...values: any[]): IdFunction;
+  declare function taggedStyled<A extends JSX.Element>(node: A): A;
 
-  declare function styled(...styles: StylesMap[]): typeof taggedStyled
-  declare function styled(
-    strs: TemplateStringsArray,
-    ...values: any[]
-  ): IdFunction
+  declare function styled(...styles: StylesMap[]): typeof taggedStyled;
+  declare function styled(strs: TemplateStringsArray, ...values: any[]): IdFunction;
 
   export declare var use: ((value: StylesMap) => {}) & {
-    [key: string]: typeof Component
-  }
+    [key: string]: typeof Component;
+  };
 
-  export declare function css(
-    strs: TemplateStringsArray,
-    ...values: any[]
-  ): StylesMap
-  export declare function keyframes(
-    strs: TemplateStringsArray,
-    ...values: any[]
-  ): string
+  export declare function css(strs: TemplateStringsArray, ...values: any[]): StylesMap;
+  export declare function keyframes(strs: TemplateStringsArray, ...values: any[]): string;
 
-  export declare function create(styles: StylesMap[]): StylesMap
+  export declare function create(styles: StylesMap[]): StylesMap;
 
-  declare var jsx: typeof createElement
+  declare var jsx: typeof createElement;
 
-  export default styled
+  export default styled;
 }
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 37b2b7cb84..5954fa56a2 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -124,6 +124,15 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
+"@babel/generator@7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
+  integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.21.0", "@babel/generator@^7.21.1", "@babel/generator@^7.5.5", "@babel/generator@^7.7.2":
   version "7.21.1"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
@@ -134,6 +143,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.17.3":
+  version "7.22.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.3.tgz#0ff675d2edb93d7596c5f6728b52615cfc0df01e"
+  integrity sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==
+  dependencies:
+    "@babel/types" "^7.22.3"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/generator@^7.21.3":
   version "7.21.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce"
@@ -204,6 +223,11 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.22.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz#ac3a56dbada59ed969d712cf527bd8271fe3eba8"
+  integrity sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==
+
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
@@ -216,7 +240,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
   integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
@@ -224,7 +248,7 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-hoist-variables@^7.18.6":
+"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
   integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
@@ -307,7 +331,7 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
@@ -319,7 +343,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-string-parser@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
+  integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
+
+"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
@@ -367,6 +396,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
   integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
 
+"@babel/parser@^7.17.3", "@babel/parser@^7.20.5":
+  version "7.22.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.3.tgz#838ae31893373222cd9062568e2192c670037e00"
+  integrity sha512-vrukxyW/ep8UD1UDzOYpTKQ6abgjFoeG6L+4ar9+c5TN9QnlqiOi6QK7LSR5ewm/ERyGkT/Ai6VboNrxhbr9Uw==
+
 "@babel/parser@^7.21.3":
   version "7.21.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3"
@@ -1122,6 +1156,22 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/traverse@7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.5.5", "@babel/traverse@^7.7.2":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
@@ -1154,6 +1204,14 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/types@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1"
@@ -1163,6 +1221,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0", "@babel/types@^7.22.3":
+  version "7.22.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.3.tgz#0cc6af178b91490acaeb4a2f70dcbf27cdf3d8f3"
+  integrity sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.21.5"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.21.3":
   version "7.21.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05"
@@ -3923,6 +3990,18 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
+"@trivago/prettier-plugin-sort-imports@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz#71c3c1ae770c3738b6fc85710714844477574ffd"
+  integrity sha512-dQ2r2uzNr1x6pJsuh/8x0IRA3CBUB+pWEW3J/7N98axqt7SQSm+2fy0FLNXvXGg77xEDC7KHxJlHfLYyi7PDcw==
+  dependencies:
+    "@babel/generator" "7.17.7"
+    "@babel/parser" "^7.20.5"
+    "@babel/traverse" "7.17.3"
+    "@babel/types" "7.17.0"
+    javascript-natural-sort "0.7.1"
+    lodash "^4.17.21"
+
 "@types/allure-js-commons@^0.0.0":
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/@types/allure-js-commons/-/allure-js-commons-0.0.0.tgz#accf21f2fa69b3c494adc3bba5ce240c0d7c159c"
@@ -7592,6 +7671,11 @@ eslint-config-airbnb-typescript@~17.0.0:
   dependencies:
     eslint-config-airbnb-base "^15.0.0"
 
+eslint-config-prettier@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
@@ -10003,6 +10087,11 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
+javascript-natural-sort@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59"
+  integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==
+
 jest-allure@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/jest-allure/-/jest-allure-0.1.3.tgz#acd669d3a5dd933aa230a1e2d5d9cafc623a9989"
@@ -13781,6 +13870,11 @@ prettier@1.18.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
   integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
+prettier@^2.8.8:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -14474,7 +14568,7 @@ reselect@^4.1.7:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
   integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
 
-reshadow@~0.0.1:
+reshadow@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/reshadow/-/reshadow-0.0.1.tgz#9a34bd7f88858836a904a22e2662ec5d1ec027b8"
   integrity sha512-/S0hIXfPV1ddD4yCsk1g2pzTMz03z13QYw7sTLhMQ00luV5vcHziuli7l2IlmkG/Fvyt3LD5cdFw6E4s476G5Q==
@@ -15165,7 +15259,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==