diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js
index b0e4d71b4f..bd27bd7bad 100644
--- a/webapp/.eslintrc.js
+++ b/webapp/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = {
   ],
 
   extends: [
-    // 'airbnb-typescript',
     "eslint:recommended",
     "plugin:react/recommended",
     "plugin:react-hooks/recommended",
@@ -17,20 +16,6 @@ module.exports = {
   ],
 
   settings: {
-    'import/parsers': {
-      '@typescript-eslint/parser': ['.ts', '.tsx'],
-    },
-
-    'import/resolver': {
-      typescript: {
-        alwaysTryTypes: true,
-      },
-    },
-
-    typescript: {
-      directory: './',
-    },
-
     react: {
       createClass: 'createReactClass',
       pragma: 'React',
@@ -49,10 +34,69 @@ module.exports = {
   },
 
   rules: {
-    'arrow-parens': ['error', 'as-needed', { 'requireForBlockBody': true }],
+    '@typescript-eslint/dot-notation': 'off',
+    '@typescript-eslint/no-throw-literal': 'off',
+    '@typescript-eslint/no-base-to-string': 'off',
+    '@typescript-eslint/no-floating-promises': 'off',
+    '@typescript-eslint/no-implied-eval': 'off',
+    '@typescript-eslint/no-misused-promises': 'off',
+    '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
+    '@typescript-eslint/no-unnecessary-type-assertion': 'off',
+    '@typescript-eslint/prefer-includes': 'off',
+    '@typescript-eslint/prefer-nullish-coalescing': 'off',
+    '@typescript-eslint/prefer-readonly': 'off',
+    '@typescript-eslint/prefer-reduce-type-parameter': 'off',
+    '@typescript-eslint/promise-function-async': 'off',
+    '@typescript-eslint/require-array-sort-compare': 'off',
+    '@typescript-eslint/restrict-plus-operands': 'off',
+    '@typescript-eslint/restrict-template-expressions': 'off',
+    '@typescript-eslint/return-await': 'off',
+    '@typescript-eslint/strict-boolean-expressions': 'off',
+
+
+    'import/no-duplicates': 'off',
+    'import/export': 'off',
+    'standard/no-callback-literal': 'off',
+    'no-empty': 'off',
     'curly': ['error', 'all'],
-    'class-methods-use-this': 'off',
-    'default-case': 'off',
+    'arrow-body-style': ['error', 'as-needed'],
+    'function-call-argument-newline': ['error', 'consistent'],
+    'prefer-arrow-callback': [
+      'error',
+      {
+        'allowNamedFunctions': true
+      }
+    ],
+    'operator-linebreak': ['warn', 'before'],
+    'no-nested-ternary': 'warn',
+    'arrow-parens': ['error', 'as-needed'],
+    'comma-dangle': ['warn', { // the rule enforces consistent use of trailing commas in object and array literals
+      'arrays': 'always-multiline',
+      'objects': 'always-multiline',
+      'imports': 'only-multiline',
+      'exports': 'only-multiline',
+      'functions': 'only-multiline'
+    }],
+    'max-len': [
+      'error',
+      {
+        code: 120,
+        ignoreTrailingComments: true,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+        ignorePattern: "^export\\s(const\\s\\w+:?.+=.+function\\s|function\\s)\\w+\\s*\\(\\s*\\{$"
+      }
+    ],
+    'import-helpers/order-imports': [
+      'warn',
+      {
+        newlinesBetween: 'always',
+        groups: ['module', '/^@/', '/^~/', ['parent', 'sibling', 'index']],
+        alphabetize: { order: 'asc', ignoreCase: true },
+      },
+    ],
+
+    'react/destructuring-assignment': 'off',
     'react/require-render-return': 'off',
     'react/no-string-refs': 'off',
     'react/no-deprecated': 'off',
@@ -61,16 +105,23 @@ module.exports = {
     'react/display-name': 'off',
     'react/jsx-no-literals': 'off',
     'react/react-in-jsx-scope': 'off',
-    'react/jsx-max-props-per-line': [1, { "when": "multiline" }],
     'react/jsx-closing-bracket-location': 'error',
     'react/jsx-closing-tag-location': 'error',
+    'react/jsx-boolean-value': 'error',
+    'react/self-closing-comp': "error",
+    'react/jsx-curly-newline': 'error',
+    'react/jsx-curly-brace-presence': ['error', "never"],
+    'react/jsx-fragments': ['error', 'syntax'],
+    'react/jsx-equals-spacing': ['error', 'never'],
+    'react/jsx-curly-spacing': ['error', { "when": "never", "children": true }],
+    'react/jsx-first-prop-new-line': ['warn', 'multiline'],
+    'react/jsx-max-props-per-line': [1, { "when": "multiline" }],
     'react/jsx-tag-spacing': ['error', {
       "closingSlash": "never",
       "beforeSelfClosing": "always",
       "afterOpening": "never",
       "beforeClosing": "never"
     }],
-    'react/jsx-boolean-value': 'error',
     'react/jsx-wrap-multilines': ['error', {
       "declaration": "parens-new-line",
       "assignment": "parens-new-line",
@@ -80,7 +131,6 @@ module.exports = {
       "logical": "parens-new-line",
       "prop": "parens-new-line"
     }],
-    'react/self-closing-comp': ["error"],
     'react/jsx-sort-props': ['error', {
       "callbacksLast": true,
       "shorthandLast": true,
@@ -88,117 +138,15 @@ module.exports = {
       "noSortAlphabetically": true,
       "reservedFirst": true,
     }],
-    'react/destructuring-assignment': ['error'],
-    'react/jsx-curly-brace-presence': ['error', "never"],
-    'react/jsx-curly-newline': ['error'],
-    'react/jsx-curly-spacing': ['error', { "when": "never", "children": true }],
-    'react/jsx-equals-spacing': ['error', 'never'],
-    'react/jsx-first-prop-new-line': ['warn', 'multiline'],
-    'react/jsx-fragments': ['error', 'syntax'],
-    // 'brace-style': ["error", "1tbs", { "allowSingleLine": false }],
-    'operator-linebreak': ['warn', 'before'],
-    'consistent-return': 'off',
-    'comma-dangle': ['warn', { // the rule enforces consistent use of trailing commas in object and array literals
-      'arrays': 'always-multiline',
-      'objects': 'always-multiline',
-      'imports': 'only-multiline',
-      'exports': 'only-multiline',
-      'functions': 'only-multiline'
-    }],
-    "semi": "off",
-    'eqeqeq': 'warn',
-    'radix': 'off',
-    'no-unmodified-loop-condition': 'off',
-    'no-use-before-define': 'off',
-    'no-constant-condition': 'off',
-    'no-console': 'off',
-    'no-dupe-class-members': 'off',
-    'no-unreachable': 'off',
-    'no-unused-expressions': 'off',
-    'no-nested-ternary': 'warn',
-    'no-empty': 'off',
-    'no-return-assign': 'off',
-    'no-continue': 'off',
-    'no-shadow': 'off',
-    'no-restricted-syntax': 'off',
-    'no-underscore-dangle': 'off',
-    'no-undef': 'off',
-    'no-plusplus': 'off',
-    'no-param-reassign': 'off',
-    'no-await-in-loop': 'off',
-    'no-restricted-globals': 'off',
-    'no-useless-constructor': 'off',
-    'max-classes-per-file': 'off',
-    'arrow-body-style': ['error', 'as-needed'],
-    'function-call-argument-newline': ['error', 'consistent'],
-    'max-len': [
-      'error',
-      {
-        code: 120,
-        ignoreTrailingComments: true,
-        ignoreStrings: true,
-        ignoreTemplateLiterals: true,
-        ignorePattern: "^export\\s(const\\s\\w+:?.+=\\s*function\\s|function\\s)\\w+\\s*\\(\\s*\\{$"
-      }
-    ],
-    'lines-between-class-members': 'off',
-    'require-atomic-updates': 'off',
-    'prefer-destructuring': 'off',
-    'prefer-arrow-callback': [
-      'error',
-      {
-        'allowNamedFunctions': true
-      }
-    ],
-    'padded-blocks': 'off',
-    'import/no-duplicates': 'off',
-    'standard/no-callback-literal': 'off',
-    '@typescript-eslint/dot-notation': 'off',
-    '@typescript-eslint/no-throw-literal': 'off',
-    '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
-    '@typescript-eslint/prefer-includes': 'off',
-    '@typescript-eslint/prefer-nullish-coalescing': 'off',
-    '@typescript-eslint/prefer-readonly': 'off',
-    '@typescript-eslint/prefer-reduce-type-parameter': 'off',
-    '@typescript-eslint/require-array-sort-compare': 'off',
-    '@typescript-eslint/restrict-plus-operands': 'off',
-    '@typescript-eslint/return-await': 'off',
 
-    
-    '@typescript-eslint/indent': [
-      'warn', 2, {
-        'MemberExpression': 1,
-        "FunctionDeclaration": {"body": 1, "parameters": 1},
-        "FunctionExpression": {"body": 1, "parameters": 1},
-        "CallExpression": {"arguments": 1},
-        'ArrayExpression': 1,
-        'SwitchCase': 1,
-        'ObjectExpression': 1,
-        'ImportDeclaration': 1,
-        "offsetTernaryExpressions": true
-      }
-    ],
-    '@typescript-eslint/restrict-template-expressions': 'off',
-    '@typescript-eslint/no-base-to-string': 'off',
-    '@typescript-eslint/no-unnecessary-type-assertion': 'off',
-    '@typescript-eslint/no-implied-eval': 'off',
-    '@typescript-eslint/no-misused-promises': 'off',
-    '@typescript-eslint/no-floating-promises': 'off',
-    '@typescript-eslint/promise-function-async': 'off',
-    '@typescript-eslint/space-before-function-paren': ["error", { "anonymous": "always", "named": "never", "asyncArrow": "always" }],
-    '@typescript-eslint/no-empty-interface': 'off',
-    '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/no-use-before-define': 'off',
-    '@typescript-eslint/no-unused-vars': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/no-unused-vars': 'warn',
+    '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/triple-slash-reference': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/strict-boolean-expressions': ['off'],
-    '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'as', objectLiteralTypeAssertions: 'allow' }],
-    // '@typescript-eslint/no-extraneous-class': [],
+    '@typescript-eslint/no-empty-function': 'off',
     "@typescript-eslint/semi": ["error", "always"],
+    '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'as', objectLiteralTypeAssertions: 'allow' }],
+    '@typescript-eslint/space-before-function-paren': ["error", { "anonymous": "always", "named": "never", "asyncArrow": "always" }],
     "@typescript-eslint/member-delimiter-style": ['warn', {
       "multiline": {
         "delimiter": "semi",
@@ -209,23 +157,5 @@ module.exports = {
         "requireLast": false
       }
     }],
-    'import/named': 'off',
-    'import/export': 'off',
-    'import/extensions': 'off',
-    'import/no-unresolved': 'off',
-    // import/no-extraneous-dependencies off because peer dependencies are moved to builder
-    // todo probably there is a way to tune this (see packageDir option in documentation)
-    'import/no-extraneous-dependencies': 'off',
-    'import/prefer-default-export': 'off',
-    'import/no-cycle': 'off',
-    'import-helpers/order-imports': [
-      'warn',
-      {
-        newlinesBetween: 'always',
-        groups: ['module', '/^@/', '/^~/', ['parent', 'sibling', 'index']],
-        alphabetize: { order: 'asc', ignoreCase: true },
-      },
-    ],
-    'indent': 'off'
   }
 }
diff --git a/webapp/packages/core-administration/src/Administration/AdministrationTools/AdministrationTools.tsx b/webapp/packages/core-administration/src/Administration/AdministrationTools/AdministrationTools.tsx
index 019b71a522..b12542e58d 100644
--- a/webapp/packages/core-administration/src/Administration/AdministrationTools/AdministrationTools.tsx
+++ b/webapp/packages/core-administration/src/Administration/AdministrationTools/AdministrationTools.tsx
@@ -19,7 +19,6 @@ type Props = React.PropsWithChildren<{
 }>;
 
 export function AdministrationTools({ children, className }: Props) {
-
   return styled(styles)(
     <administration-tools as='div' className={className}>
       {children}
diff --git a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
index 72d194fa9c..630e70b856 100644
--- a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
+++ b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
@@ -21,7 +21,6 @@ const ADMINISTRATION_ITEMS_STATE = 'administration_items_state';
 
 @injectable()
 export class AdministrationScreenService {
-
   static screenName = 'administration';
   static itemRouteName = 'administration.item';
   static itemSubRouteName = 'administration.item.sub';
diff --git a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
index 9500f22cd9..42669377bb 100644
--- a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
+++ b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenServiceBootstrap.ts
@@ -18,7 +18,6 @@ import { ConfigurationWizardScreen } from './ConfigurationWizard/ConfigurationWi
 
 @injectable()
 export class AdministrationScreenServiceBootstrap extends Bootstrap {
-
   constructor(
     private screenService: ScreenService,
     private permissionsService: PermissionsService,
diff --git a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
index 73df9eb404..097f4fb6e6 100644
--- a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
+++ b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardService.ts
@@ -20,7 +20,6 @@ import { AdministrationScreenService } from '../AdministrationScreenService';
 
 @injectable()
 export class ConfigurationWizardService {
-
   @computed get steps(): IAdministrationItem[] {
     return this.administrationItemService.items
       .filter(filterConfigurationWizard(true))
@@ -46,7 +45,7 @@ export class ConfigurationWizardService {
   }
 
   @computed get canFinish(): boolean {
-    return this.steps.every((step) => {
+    return this.steps.every(step => {
       if (step.configurationWizardOptions?.isDone
           && !step.configurationWizardOptions?.isDone()) {
         return false;
@@ -158,7 +157,6 @@ export class ConfigurationWizardService {
 
   private async finish() {
     for (const step of this.steps) {
-
       if (step?.configurationWizardOptions?.onConfigurationFinish) {
         await step.configurationWizardOptions.onConfigurationFinish();
       }
diff --git a/webapp/packages/core-app/src/AppScreen/AppScreen.tsx b/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
index c8c2aac465..582e1eb0f6 100644
--- a/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
+++ b/webapp/packages/core-app/src/AppScreen/AppScreen.tsx
@@ -10,7 +10,6 @@ import { TopNavBar } from '../TopNavBar/TopNavBar';
 import { Main } from './Main';
 
 export function AppScreen() {
-
   return (
     <>
       <TopNavBar />
diff --git a/webapp/packages/core-app/src/AppScreen/AppScreenService.ts b/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
index 51107250d7..6189b3e9e6 100644
--- a/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
+++ b/webapp/packages/core-app/src/AppScreen/AppScreenService.ts
@@ -13,11 +13,10 @@ import { AppScreen } from './AppScreen';
 
 @injectable()
 export class AppScreenService extends Bootstrap {
-
   static screenName = 'app';
 
   constructor(
-    private screenService: ScreenService,
+    private screenService: ScreenService
   ) {
     super();
   }
diff --git a/webapp/packages/core-app/src/AppScreen/Main.tsx b/webapp/packages/core-app/src/AppScreen/Main.tsx
index a4f4554ddc..e496218353 100644
--- a/webapp/packages/core-app/src/AppScreen/Main.tsx
+++ b/webapp/packages/core-app/src/AppScreen/Main.tsx
@@ -9,7 +9,7 @@
 import styled, { css } from 'reshadow';
 
 import {
-  splitStyles, Split, ResizerControls, Pane,
+  splitStyles, Split, ResizerControls, Pane
 } from '@cloudbeaver/core-blocks';
 import { useStyles, composes } from '@cloudbeaver/core-theming';
 
diff --git a/webapp/packages/core-app/src/AppScreen/RightArea.tsx b/webapp/packages/core-app/src/AppScreen/RightArea.tsx
index ba158aa6f9..617323a0a1 100644
--- a/webapp/packages/core-app/src/AppScreen/RightArea.tsx
+++ b/webapp/packages/core-app/src/AppScreen/RightArea.tsx
@@ -10,7 +10,7 @@ import { observer } from 'mobx-react';
 import styled, { css } from 'reshadow';
 
 import {
-  Pane, ResizerControls, Split, splitHorizontalStyles, splitStyles,
+  Pane, ResizerControls, Split, splitHorizontalStyles, splitStyles
 } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 import { useStyles, composes } from '@cloudbeaver/core-theming';
diff --git a/webapp/packages/core-app/src/CoreSettingsService.ts b/webapp/packages/core-app/src/CoreSettingsService.ts
index b493d7a84a..d7b076a8c6 100644
--- a/webapp/packages/core-app/src/CoreSettingsService.ts
+++ b/webapp/packages/core-app/src/CoreSettingsService.ts
@@ -20,7 +20,6 @@ export type CoreSettings = typeof defaultSettings;
 
 @injectable()
 export class CoreSettingsService {
-
   readonly settings = this.pluginManagerService.getPluginSettings('core', defaultSettings);
 
   constructor(private pluginManagerService: PluginManagerService) { }
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts b/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
index c66f6e3f28..b442ba7007 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
@@ -45,7 +45,7 @@ export class NavigationTreeContextMenuService {
         },
         order: 1,
         title: 'app_navigationTree_openNodeTab',
-        onClick: (context) => {
+        onClick: context => {
           const node = context.data;
           this.navNodeManagerService.navToNode(node.id, node.parentId);
         },
@@ -61,7 +61,7 @@ export class NavigationTreeContextMenuService {
         },
         order: Number.MAX_SAFE_INTEGER,
         title: 'app_navigationTree_refreshNode',
-        onClick: (context) => {
+        onClick: context => {
           const node = context.data;
           this.navNodeManagerService.refreshTree(node.id);
         },
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNode.tsx b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNode.tsx
index ee463c670f..20e9c87ad9 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNode.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNode.tsx
@@ -8,7 +8,7 @@
 
 import { observer } from 'mobx-react';
 import {
-  MouseEvent, KeyboardEvent, useCallback, PropsWithChildren,
+  MouseEvent, KeyboardEvent, useCallback, PropsWithChildren
 } from 'react';
 import styled, { use } from 'reshadow';
 
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/useNavigationNode.ts b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/useNavigationNode.ts
index 1caca115c8..f78cdcca19 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/useNavigationNode.ts
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/useNavigationNode.ts
@@ -84,7 +84,7 @@ export function useNavigationNode(node: NavNode, nodeLoading: boolean, nodeLoade
       setProcessing(true);
       navigationTreeService
         .loadNestedNodes(node.id)
-        .then((state) => {
+        .then(state => {
           setProcessing(false);
           if (!state) {
             switchExpand(false);
diff --git a/webapp/packages/core-app/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts b/webapp/packages/core-app/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
index 341d35bafa..82fb62a6ef 100644
--- a/webapp/packages/core-app/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
+++ b/webapp/packages/core-app/src/TopNavBar/AdministrationTopAppBarBootstrapService.ts
@@ -14,7 +14,6 @@ import { SettingsMenu } from './SettingsMenu/SettingsMenu';
 
 @injectable()
 export class AdministrationTopAppBarBootstrapService extends Bootstrap {
-
   constructor(
     private administrationTopAppBarService: AdministrationTopAppBarService,
     private wizardTopAppBarService: WizardTopAppBarService
diff --git a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
index 6c8ccc2075..f8634df8c7 100644
--- a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
+++ b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
@@ -45,7 +45,6 @@ interface IActiveItem<T> {
 
 @injectable()
 export class ConnectionSchemaManagerService {
-
   get currentConnectionId(): string | undefined {
     if (!this.activeItem?.getCurrentConnectionId) {
       return;
@@ -121,7 +120,7 @@ export class ConnectionSchemaManagerService {
     private connectionInfo: ConnectionInfoResource,
     private connectionsManagerService: ConnectionsManagerService,
     private dbDriverResource: DBDriverResource,
-    private notificationService: NotificationService,
+    private notificationService: NotificationService
   ) {
 
   }
@@ -195,7 +194,7 @@ export class ConnectionSchemaManagerService {
       } catch (exception) {
         this.notificationService.logException(
           exception,
-          `Can't load objectContainers for ${connectionId}@${catalogId}`,
+          `Can't load objectContainers for ${connectionId}@${catalogId}`
         );
       }
     }
diff --git a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
index 8e28c4dfe0..81d8e830c4 100644
--- a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
+++ b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
@@ -22,7 +22,6 @@ import { ConnectionSchemaManagerService } from '../ConnectionSchemaManagerServic
 
 @injectable()
 export class ConnectionSelectorController {
-
   connectionMenu: IMenuItem;
   objectContainerMenu: IMenuItem;
 
@@ -79,9 +78,8 @@ export class ConnectionSelectorController {
   constructor(
     private connectionSelectorService: ConnectionSchemaManagerService,
     private dbDriverResource: DBDriverResource,
-    private connectionInfo: ConnectionInfoResource,
+    private connectionInfo: ConnectionInfoResource
   ) {
-
     this.connectionMenu = new ComputedMenuItemModel({
       id: 'connectionsDropdown',
       isDisabled: () => !this.connectionSelectorService.isConnectionChangeable,
@@ -106,7 +104,7 @@ export class ConnectionSelectorController {
   }
 
   private getConnectionItems(): IMenuItem[] {
-    return Array.from(this.connectionInfo.data.values()).map((item) => {
+    return Array.from(this.connectionInfo.data.values()).map(item => {
       const menuItem: IMenuItem = {
         id: item.id,
         title: item.name || item.id,
@@ -122,7 +120,7 @@ export class ConnectionSelectorController {
     }
     return this.connectionSelectorService.objectContainerList
       .filter(item => !!item.name)
-      .map((item) => {
+      .map(item => {
         if (item.features?.includes(EObjectFeature.catalog)) {
           const title = NodeManagerUtils.concatSchemaAndCatalog(
             item.name,
diff --git a/webapp/packages/core-app/src/TopNavBar/MainMenu/MainMenuService.ts b/webapp/packages/core-app/src/TopNavBar/MainMenu/MainMenuService.ts
index faa2af9d46..183f46c82e 100644
--- a/webapp/packages/core-app/src/TopNavBar/MainMenu/MainMenuService.ts
+++ b/webapp/packages/core-app/src/TopNavBar/MainMenu/MainMenuService.ts
@@ -18,7 +18,6 @@ export enum EMainMenu {
 
 @injectable()
 export class MainMenuService {
-
   readonly onConnectionClick: Observable<unknown>;
 
   private menuOptions = new StaticMenu();
diff --git a/webapp/packages/core-app/src/TopNavBar/SettingsMenu/SettingsMenuService.ts b/webapp/packages/core-app/src/TopNavBar/SettingsMenu/SettingsMenuService.ts
index 2ec83460fe..4615d29440 100644
--- a/webapp/packages/core-app/src/TopNavBar/SettingsMenu/SettingsMenuService.ts
+++ b/webapp/packages/core-app/src/TopNavBar/SettingsMenu/SettingsMenuService.ts
@@ -86,7 +86,7 @@ export class SettingsMenuService extends Bootstrap {
       }
     );
 
-    this.themeService.themes.forEach((theme) => {
+    this.themeService.themes.forEach(theme => {
       this.addMenuItem(
         this.themeMenuToken,
         {
@@ -94,7 +94,7 @@ export class SettingsMenuService extends Bootstrap {
           title: theme.name,
           isDisabled: () => theme.id === this.themeService.currentThemeId,
           onClick: () => this.themeService.changeThemeAsync(theme.id),
-        },
+        }
       );
     });
   }
@@ -116,7 +116,7 @@ export class SettingsMenuService extends Bootstrap {
       }
     );
 
-    config.supportedLanguages.forEach((lang) => {
+    config.supportedLanguages.forEach(lang => {
       this.addMenuItem(
         this.langMenuToken,
         {
diff --git a/webapp/packages/core-app/src/shared/InlineEditor/EditorDialog.tsx b/webapp/packages/core-app/src/shared/InlineEditor/EditorDialog.tsx
index 3940d55235..311cfc2334 100644
--- a/webapp/packages/core-app/src/shared/InlineEditor/EditorDialog.tsx
+++ b/webapp/packages/core-app/src/shared/InlineEditor/EditorDialog.tsx
@@ -8,7 +8,7 @@
 
 import { observer } from 'mobx-react';
 import {
-  useState, useCallback, ChangeEvent, useRef, useEffect,
+  useState, useCallback, ChangeEvent, useRef, useEffect
 } from 'react';
 import styled, { css } from 'reshadow';
 
diff --git a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
index 5d36d16d77..072e35b83c 100644
--- a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
+++ b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
@@ -8,7 +8,7 @@
 
 import { observer } from 'mobx-react';
 import {
-  useEffect, useRef, useCallback, ChangeEvent,
+  useEffect, useRef, useCallback, ChangeEvent
 } from 'react';
 import styled, { use } from 'reshadow';
 
diff --git a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
index fc04e9b74d..14a8b090bc 100644
--- a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
+++ b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
@@ -8,7 +8,7 @@
 
 import {
   observable, action,
-  computed, IKeyValueMap,
+  computed, IKeyValueMap
 } from 'mobx';
 import { Subject } from 'rxjs';
 
@@ -127,7 +127,7 @@ export class NavigationTabsService {
   }
 
   @action registerTabHandler<TState>(
-    options: TabHandlerOptions<TState>,
+    options: TabHandlerOptions<TState>
   ): TabHandler<TState> {
     const tabHandler = new TabHandler(options);
     this.handlers.set(options.key, tabHandler);
diff --git a/webapp/packages/core-app/src/shared/NodesManager/ConnectionDialogsService.ts b/webapp/packages/core-app/src/shared/NodesManager/ConnectionDialogsService.ts
index 066e083690..e5c5df377f 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/ConnectionDialogsService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/ConnectionDialogsService.ts
@@ -18,7 +18,6 @@ import { NodeManagerUtils } from './NodeManagerUtils';
 
 @injectable()
 export class ConnectionDialogsService {
-
   constructor(
     private mainMenuService: MainMenuService,
     private contextMenuService: ContextMenuService,
@@ -27,7 +26,6 @@ export class ConnectionDialogsService {
   ) {}
 
   registerMenuItems() {
-
     this.mainMenuService.registerMenuItem(
       EMainMenu.mainMenuConnectionsPanel,
       {
diff --git a/webapp/packages/core-app/src/shared/NodesManager/DBObjectService.ts b/webapp/packages/core-app/src/shared/NodesManager/DBObjectService.ts
index e99d0c4b90..2c33cbebae 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/DBObjectService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/DBObjectService.ts
@@ -18,7 +18,7 @@ import { NavNodeInfoResource } from './NavNodeInfoResource';
 export class DBObjectService extends CachedMapResource<string, DBObject> {
   constructor(
     private graphQLService: GraphQLService,
-    private navNodeInfoResource: NavNodeInfoResource,
+    private navNodeInfoResource: NavNodeInfoResource
   ) {
     super(new Map());
     this.navNodeInfoResource.onDataOutdated.subscribe(key => this.markOutdated(key));
diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeExtensionsService.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeExtensionsService.ts
index ae3c95b4b3..bdc58dd7d0 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeExtensionsService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeExtensionsService.ts
@@ -20,7 +20,7 @@ export class NavNodeExtensionsService {
   readonly extensions: Array<IExtension<string>>;
 
   constructor(
-    private navNodeManagerService: NavNodeManagerService,
+    private navNodeManagerService: NavNodeManagerService
   ) {
     this.extensions = [
       connectionProvider(this.getConnection.bind(this)),
diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
index 2d93120b6c..3be46fcbbf 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
@@ -99,7 +99,7 @@ export class NavNodeManagerService extends Bootstrap {
     private connectionAuthService: ConnectionAuthService,
     private notificationService: NotificationService,
     private sessionResource: SessionResource,
-    private serverService: ServerService,
+    private serverService: ServerService
   ) {
     super();
     this.activeNavigationNodes = [];
diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
index 4c09c2bd88..0658f617cc 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
@@ -23,7 +23,7 @@ import { NavNodeInfoResource } from './NavNodeInfoResource';
 export class NavTreeResource extends CachedMapResource<string, string[]> {
   constructor(
     private graphQLService: GraphQLService,
-    private navNodeInfoResource: NavNodeInfoResource,
+    private navNodeInfoResource: NavNodeInfoResource
   ) {
     super(new Map());
     this.onDataOutdated.subscribe(navNodeInfoResource.markOutdated.bind(navNodeInfoResource));
diff --git a/webapp/packages/core-app/src/shared/SessionExpireDialog/SessionExpiredDialogService.ts b/webapp/packages/core-app/src/shared/SessionExpireDialog/SessionExpiredDialogService.ts
index c0be51723d..ecc9b2b006 100644
--- a/webapp/packages/core-app/src/shared/SessionExpireDialog/SessionExpiredDialogService.ts
+++ b/webapp/packages/core-app/src/shared/SessionExpireDialog/SessionExpiredDialogService.ts
@@ -39,6 +39,5 @@ export class SessionExpiredDialogService extends Bootstrap {
         onAction: () => location.reload(),
       }, { title: 'app_root_session_expired_title', persistent: true, type: ENotificationType.Error });
     }
-
   }
 }
diff --git a/webapp/packages/core-app/src/shared/TabEntity/TabContainerEntity.ts b/webapp/packages/core-app/src/shared/TabEntity/TabContainerEntity.ts
index 26472de367..7f8ebd232f 100644
--- a/webapp/packages/core-app/src/shared/TabEntity/TabContainerEntity.ts
+++ b/webapp/packages/core-app/src/shared/TabEntity/TabContainerEntity.ts
@@ -15,9 +15,8 @@ import { ITabContainerEntity, TabContainerToken } from './TabContainerToken';
 import { TabEntity } from './TabEntity';
 
 export class TabContainerEntity extends Entity implements ITabContainer, ITabContainerEntity {
-
   @computed get tabs(): ITab[] {
-    return this.tabsOrder.map((id) => {
+    return this.tabsOrder.map(id => {
       const tabEntity = this.getTabEntity(id);
       return tabEntity.getViewModel();
     });
diff --git a/webapp/packages/core-app/src/shared/TabEntity/TabEntity.ts b/webapp/packages/core-app/src/shared/TabEntity/TabEntity.ts
index 9653bc967d..ba584ea394 100644
--- a/webapp/packages/core-app/src/shared/TabEntity/TabEntity.ts
+++ b/webapp/packages/core-app/src/shared/TabEntity/TabEntity.ts
@@ -8,14 +8,13 @@
 
 import { ITab } from '@cloudbeaver/core-blocks';
 import {
-  Entity, isConstructor, ITypedConstructor, MixinProvider,
+  Entity, isConstructor, ITypedConstructor, MixinProvider
 } from '@cloudbeaver/core-di';
 
 import { TabToken } from './TabToken';
 import { TabViewModel } from './TabViewModel';
 
 export class TabEntity extends Entity {
-
   constructor(tab: ITab | ITypedConstructor<ITab>,
     providers: Array<MixinProvider<any>> = []) {
     super(providers, isConstructor(tab) ? undefined : tab.tabId);
diff --git a/webapp/packages/core-app/src/shared/TabEntity/TabViewModel.ts b/webapp/packages/core-app/src/shared/TabEntity/TabViewModel.ts
index 8cefbc57ed..d4918ffd30 100644
--- a/webapp/packages/core-app/src/shared/TabEntity/TabViewModel.ts
+++ b/webapp/packages/core-app/src/shared/TabEntity/TabViewModel.ts
@@ -34,7 +34,6 @@ export class TabViewModel implements ITab {
   constructor(@inject(TabToken) private tabModel: ITab,
     private entity: Entity,
     @inject(TabContainerToken) private tabContainer: ITabContainerEntity) {
-
     this.tabId = this.entity.id;
     this.panel = () => TabContext(tabContainer.getTabServiceInjector(this.tabId), this.tabModel.panel);
   }
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryController.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryController.ts
index 072859a8a5..159041d26c 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryController.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryController.ts
@@ -14,7 +14,6 @@ import { LogEntryDetailsDialog } from './LogEntryDetailsDialog';
 
 @injectable()
 export class LogEntryController implements IInitializableController {
-
   get hasDetails() {
     return Boolean(this.item.stackTrace);
   }
@@ -29,5 +28,4 @@ export class LogEntryController implements IInitializableController {
   init(item: ILogEntry) {
     this.item = item;
   }
-
 }
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryDetailsDialog.tsx b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryDetailsDialog.tsx
index 5f25b6b329..d23c9f6063 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryDetailsDialog.tsx
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogEntry/LogEntryDetailsDialog.tsx
@@ -30,7 +30,6 @@ const styles = css`
 
 export const LogEntryDetailsDialog: DialogComponent<ILogEntry, null> = observer(
   function LogEntryDetailsDialog(props: DialogComponentProps<ILogEntry, null>) {
-
     return styled(useStyles(styles))(
       <CommonDialogWrapper
         title={`${props.payload.type} ${props.payload.time}`}
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewTabController.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewTabController.ts
index beaf2eaf9f..abd47326e6 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewTabController.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewTabController.ts
@@ -12,7 +12,6 @@ import { LogViewerService } from './LogViewerService';
 
 @injectable()
 export class LogViewTabController {
-
   get isActive(): boolean {
     return this.logViewerService.isActive;
   }
@@ -25,5 +24,4 @@ export class LogViewTabController {
 
   constructor(private logViewerService: LogViewerService) {
   }
-
 }
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerMenuService.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerMenuService.ts
index 1bf63f7cf4..cb16984065 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerMenuService.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerMenuService.ts
@@ -13,7 +13,6 @@ import { LogViewerService } from './LogViewerService';
 
 @injectable()
 export class LogViewerMenuService {
-
   constructor(private mainMenuService: MainMenuService,
     private logViewerService: LogViewerService) {
   }
diff --git a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerService.ts b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerService.ts
index f27f90e023..217cc86445 100644
--- a/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerService.ts
+++ b/webapp/packages/core-app/src/shared/ToolsPanel/LogViewTab/LogViewerService.ts
@@ -19,7 +19,6 @@ import { ILogEntry } from './ILogEntry';
 
 @injectable()
 export class LogViewerService {
-
   @observable _isActive = false;
 
   get isActive(): boolean {
diff --git a/webapp/packages/core-authentication/src/AuthInfoService.ts b/webapp/packages/core-authentication/src/AuthInfoService.ts
index 1c2feb6baa..4239fcbfcc 100644
--- a/webapp/packages/core-authentication/src/AuthInfoService.ts
+++ b/webapp/packages/core-authentication/src/AuthInfoService.ts
@@ -23,7 +23,7 @@ export class AuthInfoService {
     private graphQLService: GraphQLService,
     private notificationService: NotificationService,
     private authProviderService: AuthProviderService,
-    private sessionService: SessionService,
+    private sessionService: SessionService
   ) { }
 
   get userInfo(): UserAuthInfo | null {
diff --git a/webapp/packages/core-authentication/src/AuthProviderService.ts b/webapp/packages/core-authentication/src/AuthProviderService.ts
index ac17b77178..a81c457c13 100644
--- a/webapp/packages/core-authentication/src/AuthProviderService.ts
+++ b/webapp/packages/core-authentication/src/AuthProviderService.ts
@@ -14,9 +14,8 @@ import { AuthProvidersResource } from './AuthProvidersResource';
 
 @injectable()
 export class AuthProviderService {
-
   constructor(
-    private providers: AuthProvidersResource,
+    private providers: AuthProvidersResource
   ) { }
 
   async processCredentials(providerId: string, credentials: Record<string, any>) {
diff --git a/webapp/packages/core-authentication/src/RolesManagerService.ts b/webapp/packages/core-authentication/src/RolesManagerService.ts
index 258be67b8e..d75fefb202 100644
--- a/webapp/packages/core-authentication/src/RolesManagerService.ts
+++ b/webapp/packages/core-authentication/src/RolesManagerService.ts
@@ -13,7 +13,7 @@ import { RolesResource } from './RolesResource';
 @injectable()
 export class RolesManagerService {
   constructor(
-    readonly roles: RolesResource,
+    readonly roles: RolesResource
   ) {
   }
 }
diff --git a/webapp/packages/core-authentication/src/UsersResource.ts b/webapp/packages/core-authentication/src/UsersResource.ts
index f7b00999d9..f38999bc2a 100644
--- a/webapp/packages/core-authentication/src/UsersResource.ts
+++ b/webapp/packages/core-authentication/src/UsersResource.ts
@@ -15,7 +15,7 @@ import {
   isResourceKeyList,
   AdminConnectionGrantInfo
 } from '@cloudbeaver/core-sdk';
-import { MetadataMap, uuid } from '@cloudbeaver/core-utils';
+import { MetadataMap } from '@cloudbeaver/core-utils';
 
 import { AuthInfoService } from './AuthInfoService';
 import { AuthProviderService } from './AuthProviderService';
@@ -37,7 +37,7 @@ export class UsersResource extends CachedMapResource<string, AdminUserInfo> {
   constructor(
     private graphQLService: GraphQLService,
     private authProviderService: AuthProviderService,
-    private authInfoService: AuthInfoService,
+    private authInfoService: AuthInfoService
   ) {
     super(new Map());
     this.metadata = new MetadataMap(() => false);
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index 9cea07b200..de18d270f7 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -6,14 +6,12 @@
  * you may not use this file except in compliance with the License.
  */
 
-import styled, { use } from 'reshadow';
-import { css } from 'reshadow';
+import styled, { use, css } from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-theming';
 
 import { baseFormControlStyles } from '../baseFormControlStyles';
-import { Checkbox } from './Checkbox';
-import { CheckboxType, CheckboxControlledProps, CheckboxObjectProps } from './Checkbox';
+import { Checkbox, CheckboxType, CheckboxControlledProps, CheckboxObjectProps } from './Checkbox';
 
 const fieldCheckboxStyles = css`
   field {
@@ -35,7 +33,6 @@ export const FieldCheckbox: CheckboxType = function FieldCheckbox({
   onChange,
   ...rest
 }: CheckboxControlledProps | CheckboxObjectProps<any, any>) {
-
   return styled(useStyles(baseFormControlStyles, fieldCheckboxStyles))(
     <field className={className} as="div" {...use({ long })}>
       <field-label as="div">{children}</field-label>
diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
index 0778a22e45..5c501520e6 100644
--- a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx
@@ -14,7 +14,7 @@ import {
   useMenuState,
   Menu,
   MenuItem,
-  MenuButton,
+  MenuButton
 } from 'reakit/Menu';
 import styled, { css, use } from 'reshadow';
 
diff --git a/webapp/packages/core-blocks/src/FormControls/InputGroup.tsx b/webapp/packages/core-blocks/src/FormControls/InputGroup.tsx
index db5f9d711c..878a02af1e 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputGroup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputGroup.tsx
@@ -44,7 +44,6 @@ export function InputGroup({
   className,
   long,
 }: Props) {
-
   return styled(useStyles(baseFormControlStyles, styles))(
     <field as="div" className={className}>
       <field-label as='label' {...use({ long })}>{children}</field-label>
diff --git a/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx b/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
index 3bf877b434..9973d96b3d 100644
--- a/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/RadioGroup.tsx
@@ -62,7 +62,6 @@ export const RadioGroup: RadioGroupType = observer(function RadioGroup({
     if (formContext) {
       formContext.onChange(value, name);
     }
-
   }, [name, state, formContext, onChange]);
 
   const value = state ? state[name] : controlledValue ?? selfValue;
diff --git a/webapp/packages/core-blocks/src/IconOrImage.tsx b/webapp/packages/core-blocks/src/IconOrImage.tsx
index 85b48ad0a1..1dd4d62451 100644
--- a/webapp/packages/core-blocks/src/IconOrImage.tsx
+++ b/webapp/packages/core-blocks/src/IconOrImage.tsx
@@ -18,7 +18,6 @@ export interface IconOrImageProps {
 }
 
 export const IconOrImage = function IconOrImage({ icon, className, viewBox }: IconOrImageProps) {
-
   const isStaticIcon = useMemo(
     () => icon && (icon.startsWith('platform:') || icon.startsWith('/')),
     [icon]
diff --git a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
index 8fb8d9dbbb..a7652af2b5 100644
--- a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
+++ b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx
@@ -20,7 +20,6 @@ type ItemListProps = React.PropsWithChildren<{
 export function ItemList({
   children, className, styles,
 }: ItemListProps) {
-
   return styled(useStyles(...(styles || ITEM_LIST_STYLES_ARRAY)))(
     <item-list as="div" className={className}>
       <Styles.Provider value={styles || ITEM_LIST_STYLES_ARRAY}>
diff --git a/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx b/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
index 6f27f8df39..9a3a84a516 100644
--- a/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
+++ b/webapp/packages/core-blocks/src/LoadingScreen/LoadingScreen.tsx
@@ -24,12 +24,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/PropertiesTable/PropertyValueSelector.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
index 53ea66ffa1..98667dd2eb 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
@@ -12,7 +12,7 @@ import {
   useMenuState,
   Menu,
   MenuItem,
-  MenuButton,
+  MenuButton
 } from 'reakit/Menu';
 import styled, { css } from 'reshadow';
 
diff --git a/webapp/packages/core-blocks/src/SanitizedHTML/SanitizedHTML.tsx b/webapp/packages/core-blocks/src/SanitizedHTML/SanitizedHTML.tsx
index 2b6423ecbd..d9389a763d 100644
--- a/webapp/packages/core-blocks/src/SanitizedHTML/SanitizedHTML.tsx
+++ b/webapp/packages/core-blocks/src/SanitizedHTML/SanitizedHTML.tsx
@@ -5,6 +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="react-sanitized-html.d.ts" />
 
 import Sanitized from 'react-sanitized-html';
diff --git a/webapp/packages/core-blocks/src/Split/SplitControls.tsx b/webapp/packages/core-blocks/src/Split/SplitControls.tsx
index b879a078b4..8ae450952e 100644
--- a/webapp/packages/core-blocks/src/Split/SplitControls.tsx
+++ b/webapp/packages/core-blocks/src/Split/SplitControls.tsx
@@ -8,7 +8,7 @@
 
 import { SplitContext } from 'go-split';
 import {
-  useCallback, useContext, useState, useEffect,
+  useCallback, useContext, useState, useEffect
 } from 'react';
 import styled, { use } from 'reshadow';
 
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
index f1a8bed523..2a835e9563 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
@@ -8,8 +8,7 @@
 
 import { observer } from 'mobx-react';
 import { useContext, useCallback } from 'react';
-import styled from 'reshadow';
-import { css } from 'reshadow';
+import styled, { css } from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-theming';
 
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx b/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
index c40ebca5a1..89ce003bed 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSeparator.tsx
@@ -25,7 +25,6 @@ export const TableItemSeparator = observer(function TableItemSeparator({
   onClick,
   onDoubleClick,
 }: Props) {
-
   return styled(useStyles())(
     <tr {...use({ noHover: true })} className={className} onClick={onClick} onDoubleClick={onDoubleClick}>
       <td colSpan={colSpan} {...use({ expandArea: true })}>
diff --git a/webapp/packages/core-blocks/src/Tabs/TabsBox/TabsBox.tsx b/webapp/packages/core-blocks/src/Tabs/TabsBox/TabsBox.tsx
index add5141705..5d1eabff86 100644
--- a/webapp/packages/core-blocks/src/Tabs/TabsBox/TabsBox.tsx
+++ b/webapp/packages/core-blocks/src/Tabs/TabsBox/TabsBox.tsx
@@ -29,7 +29,6 @@ export const TabsBox = forwardRef<HTMLDivElement, TabsBoxProps>(function TabsBox
   className,
   style = [],
 }: TabsBoxProps, ref) {
-
   return styled(useStyles(...style))(
     <TabsState currentTabId={currentTabId}>
       <tabs-box ref={ref} as="div" className={className} tabIndex={tabIndex}>
diff --git a/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabHeader.tsx b/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabHeader.tsx
index 1d2575ad56..b845db5858 100644
--- a/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabHeader.tsx
+++ b/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabHeader.tsx
@@ -23,7 +23,6 @@ type VerticalTabHeaderProps = Omit<React.HTMLAttributes<HTMLDivElement>, 'style'
 };
 
 export const VerticalTabHeader = observer(function VerticalTabHeader({ tab, style, ...props }: VerticalTabHeaderProps) {
-
   return styled(useStyles(verticalTabStyles, ...style))(
     <Tab
       tabId={tab.tabId}
diff --git a/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabs.tsx b/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabs.tsx
index b3161e31aa..0cb8bc529d 100644
--- a/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabs.tsx
+++ b/webapp/packages/core-blocks/src/Tabs/VerticalTabs/VerticalTabs.tsx
@@ -24,7 +24,6 @@ type VerticalTabsProps = Omit<React.DOMAttributes<HTMLDivElement>, 'style'> & {
 };
 
 export const VerticalTabs = observer(function VerticalTabs({ tabContainer, style, ...props }: VerticalTabsProps) {
-
   return styled(useStyles(verticalTabStyles, ...style))(
     <TabsState currentTabId={tabContainer.currentTabId} orientation='vertical'>
       <vertical-tabs as="div" {...props}>
diff --git a/webapp/packages/core-bootstrap/src/AppBootstrap.ts b/webapp/packages/core-bootstrap/src/AppBootstrap.ts
index 2109bda9f8..e03829a520 100644
--- a/webapp/packages/core-bootstrap/src/AppBootstrap.ts
+++ b/webapp/packages/core-bootstrap/src/AppBootstrap.ts
@@ -34,7 +34,7 @@ export class AppBootstrap {
     private sessionExpireService: SessionExpireService,
     private navigationTreeContextMenuService: NavigationTreeContextMenuService,
     private navigationTabsService: NavigationTabsService,
-    private connectionSchemaManagerService: ConnectionSchemaManagerService,
+    private connectionSchemaManagerService: ConnectionSchemaManagerService
   ) { }
 
   register(): void | Promise<void> {
@@ -48,7 +48,6 @@ export class AppBootstrap {
 
   async load() {
     await this.themeService.init();
-
   }
 
   async doAfterPluginsInit() {
diff --git a/webapp/packages/core-bootstrap/src/bootstrap.ts b/webapp/packages/core-bootstrap/src/bootstrap.ts
index 3eac5e81b2..4e338eab11 100644
--- a/webapp/packages/core-bootstrap/src/bootstrap.ts
+++ b/webapp/packages/core-bootstrap/src/bootstrap.ts
@@ -5,7 +5,6 @@ import { showErrorPage } from './ErrorPage';
 import { renderLayout } from './renderLayout';
 
 export async function bootstrap(plugins: PluginManifest[]) {
-
   const app = new App(plugins);
   app.registerServices();
 
diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts
index c93d1319e5..0616d534ae 100644
--- a/webapp/packages/core-bootstrap/src/manifest.ts
+++ b/webapp/packages/core-bootstrap/src/manifest.ts
@@ -13,7 +13,7 @@ import {
   AdministrationItemService,
   ConfigurationWizardService,
   WizardTopAppBarService,
-  AdministrationScreenServiceBootstrap,
+  AdministrationScreenServiceBootstrap
 } from '@cloudbeaver/core-administration';
 import {
   ConnectionDialogsService,
@@ -43,7 +43,7 @@ import {
   AuthProvidersResource,
   RolesManagerService,
   RolesResource,
-  UsersResource,
+  UsersResource
 } from '@cloudbeaver/core-authentication';
 import { BlocksLocaleService } from '@cloudbeaver/core-blocks';
 import {
@@ -57,7 +57,7 @@ import {
   ConnectionsResource,
   ConnectionsLocaleService,
   DriverPropertiesService,
-  ConnectionsAdministrationNavService,
+  ConnectionsAdministrationNavService
 } from '@cloudbeaver/core-connections';
 import { PluginManifest } from '@cloudbeaver/core-di';
 import { CommonDialogService, ContextMenuService } from '@cloudbeaver/core-dialogs';
diff --git a/webapp/packages/core-bootstrap/src/renderLayout.tsx b/webapp/packages/core-bootstrap/src/renderLayout.tsx
index 7957fdc2dc..7757822e16 100644
--- a/webapp/packages/core-bootstrap/src/renderLayout.tsx
+++ b/webapp/packages/core-bootstrap/src/renderLayout.tsx
@@ -21,7 +21,7 @@ import ReactDOM from 'react-dom';
 import { Body } from '@cloudbeaver/core-app';
 import { AppContext, IServiceInjector } from '@cloudbeaver/core-di';
 
-export function renderLayout(serviceInjector: IServiceInjector) {
+export function renderLayout(serviceInjector: IServiceInjector): void {
   ReactDOM.render(
     <AppContext app={serviceInjector}>
       <Body />
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionAccess/Controller.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionAccess/Controller.ts
index f68166eb3e..e843f45c72 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionAccess/Controller.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionAccess/Controller.ts
@@ -31,7 +31,7 @@ implements IInitializableController {
 
   constructor(
     private usersResource: UsersResource,
-    private rolesResource: RolesResource,
+    private rolesResource: RolesResource
   ) { }
 
   init(model: IConnectionFormModel) {
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx
index 88e1b3c1ab..f125384cf4 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx
@@ -178,46 +178,46 @@ export const ConnectionForm = observer(function ConnectionForm({
           {controller.isLoading
             ? <Loader />
             : (
-                <>
-                  <TabPanel tabId='options'>
-                    <Options
-                      model={model}
-                      type={controller.connectionType}
-                      disabled={controller.isDisabled}
-                      onTypeChange={controller.setType}
-                      onSave={controller.save}
-                    />
+              <>
+                <TabPanel tabId='options'>
+                  <Options
+                    model={model}
+                    type={controller.connectionType}
+                    disabled={controller.isDisabled}
+                    onTypeChange={controller.setType}
+                    onSave={controller.save}
+                  />
+                </TabPanel>
+                {model.connection.driverId && (
+                  <TabPanel tabId='driver_properties'>
+                    {state => (
+                      <DriverProperties
+                        driverId={model.connection.driverId}
+                        state={model.connection.properties}
+                        loadProperties={state.selectedId === 'driver_properties'}
+                      />
+                    )}
                   </TabPanel>
-                  {model.connection.driverId && (
-                    <TabPanel tabId='driver_properties'>
-                      {state => (
-                        <DriverProperties
-                          driverId={model.connection.driverId}
-                          state={model.connection.properties}
-                          loadProperties={state.selectedId === 'driver_properties'}
-                        />
-                      )}
-                    </TabPanel>
-                  )}
-                  <TabPanel tabId='access'>
-                    {(state) => {
-                      if (state.selectedId === 'access') {
-                        controller.loadAccessSubjects();
-                      } else {
-                        return null;
-                      }
+                )}
+                <TabPanel tabId='access'>
+                  {state => {
+                    if (state.selectedId === 'access') {
+                      controller.loadAccessSubjects();
+                    } else {
+                      return null;
+                    }
 
-                      return (
-                        <ConnectionAccess
-                          model={model}
-                          disabled={controller.isDisabled}
-                          onChange={controller.handleAccessChange}
-                        />
-                      );
-                    }}
-                  </TabPanel>
-                </>
-              )}
+                    return (
+                      <ConnectionAccess
+                        model={model}
+                        disabled={controller.isDisabled}
+                        onChange={controller.handleAccessChange}
+                      />
+                    );
+                  }}
+                </TabPanel>
+              </>
+            )}
           {controller.error.responseMessage && (
             <ErrorMessage
               text={controller.error.responseMessage}
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Controller.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Controller.ts
index f2993619f4..98b7e0be03 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Controller.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Controller.ts
@@ -52,7 +52,7 @@ implements IInitializableController, IDestructibleController {
     private connectionsResource: ConnectionsResource,
     private notificationService: NotificationService,
     private commonDialogService: CommonDialogService,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) { }
 
   init(
@@ -112,7 +112,7 @@ implements IInitializableController, IDestructibleController {
     }
   };
 
-  handleAccessChange = () => this.accessChanged = true;
+  handleAccessChange = () => { this.accessChanged = true; };
 
   loadAccessSubjects = async () => {
     if (this.accessLoaded || this.isLoading) {
@@ -122,7 +122,6 @@ implements IInitializableController, IDestructibleController {
     this.isLoading = true;
     try {
       this.model.grantedSubjects = await this.connectionsResource.loadAccessSubjects(this.model.connection.id);
-
     } catch (exception) {
       this.notificationService.logException(exception, 'connections_connection_edit_access_load_failed');
     }
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/DriverProperties/DriverPropertiesController.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/DriverProperties/DriverPropertiesController.ts
index 784b8f10df..ae63462cf3 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/DriverProperties/DriverPropertiesController.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/DriverProperties/DriverPropertiesController.ts
@@ -49,7 +49,7 @@ export class DriverPropertiesController implements IInitializableController {
       id: uuid(),
       key: key ?? 'property',
       defaultValue: value ?? '',
-      new: !key
+      new: !key,
     });
   };
 
@@ -66,7 +66,7 @@ export class DriverPropertiesController implements IInitializableController {
         displayName: property.displayName,
         defaultValue: property.defaultValue,
         description: property.description,
-        validValues: property.validValues
+        validValues: property.validValues,
       })));
 
       for (const key of Object.keys(this.state)) {
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/OptionsController.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/OptionsController.ts
index 03d7591c89..e7206ec322 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/OptionsController.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/OptionsController.ts
@@ -18,7 +18,6 @@ import { IConnectionFormModel } from '../IConnectionFormModel';
 @injectable()
 export class OptionsController
 implements IInitializableController {
-
   @computed get drivers() {
     return Array.from(this.dbDriverResource.data.values())
       .filter(({ id }) => this.model.availableDrivers.includes(id));
@@ -45,7 +44,7 @@ implements IInitializableController {
   constructor(
     private notificationService: NotificationService,
     private dbAuthModelsResource: DatabaseAuthModelsResource,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) { }
 
   init(model: IConnectionFormModel) {
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministration.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministration.tsx
index 2a01eda8a1..1b17f3b69e 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministration.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministration.tsx
@@ -76,7 +76,7 @@ const styles = composes(
 export const ConnectionsAdministration: React.FC<AdministrationItemContentProps> = observer(function ConnectionsAdministration({
   sub,
   param,
-  configurationWizard
+  configurationWizard,
 }) {
   const controller = useController(ConnectionsAdministrationController);
 
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationNavService.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationNavService.ts
index 9a80307e9a..9c9df6c48d 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationNavService.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationNavService.ts
@@ -12,7 +12,7 @@ import { injectable } from '@cloudbeaver/core-di';
 @injectable()
 export class ConnectionsAdministrationNavService {
   constructor(
-    private administrationScreenService: AdministrationScreenService,
+    private administrationScreenService: AdministrationScreenService
   ) { }
 
   navToRoot() {
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
index f6e7305e59..59332a3b42 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
@@ -21,13 +21,12 @@ export class ConnectionsAdministrationService extends Bootstrap {
     private administrationItemService: AdministrationItemService,
     private notificationService: NotificationService,
     private connectionsResource: ConnectionsResource,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) {
     super();
   }
 
   register() {
-
     this.administrationItemService.create({
       name: 'connections',
       type: AdministrationItemType.Default,
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionEditController.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionEditController.ts
index c3b39069b3..7734eff1e7 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionEditController.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsTable/ConnectionEditController.ts
@@ -51,7 +51,7 @@ implements IInitializableController, IDestructibleController {
   constructor(
     private connectionsResource: ConnectionsResource,
     private notificationService: NotificationService,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) { }
 
   init(id: string) {
diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnectionController.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnectionController.tsx
index 5e89dcf923..ffdef85321 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnectionController.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnectionController.tsx
@@ -37,7 +37,7 @@ export class CreateConnectionController {
   constructor(
     private notificationService: NotificationService,
     private connectionsResource: ConnectionsResource,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) {
     this.credentials = {};
     this.databases = [];
diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
index fdfcde5c62..1db21e6ef6 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
@@ -31,7 +31,6 @@ export const SearchDatabase = observer(function SearchDatabase({
   onSearch,
   className,
 }: Props) {
-
   return (
     <DatabaseList
       databases={databases}
diff --git a/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts b/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
index 59f9128bfd..8acd9b677c 100644
--- a/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
+++ b/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
@@ -18,7 +18,7 @@ import {
   isResourceKeyList,
   AdminConnectionGrantInfo,
   AdminConnectionSearchInfo,
-  ObjectPropertyInfo,
+  ObjectPropertyInfo
 } from '@cloudbeaver/core-sdk';
 import { uuid, MetadataMap } from '@cloudbeaver/core-utils';
 
@@ -36,7 +36,7 @@ export class ConnectionsResource extends CachedMapResource<string, ConnectionInf
   private connectionCreateSubject: Subject<ConnectionInfo>;
 
   constructor(
-    private graphQLService: GraphQLService,
+    private graphQLService: GraphQLService
   ) {
     super(new Map());
     this.connectionCreateSubject = new Subject<ConnectionInfo>();
diff --git a/webapp/packages/core-connections/src/ConnectionAuthService.ts b/webapp/packages/core-connections/src/ConnectionAuthService.ts
index 93752ad496..1fae84afa4 100644
--- a/webapp/packages/core-connections/src/ConnectionAuthService.ts
+++ b/webapp/packages/core-connections/src/ConnectionAuthService.ts
@@ -14,10 +14,9 @@ import { DatabaseAuthDialog } from './DatabaseAuthDialog/DatabaseAuthDialog';
 
 @injectable()
 export class ConnectionAuthService {
-
   constructor(
     private connectionInfoResource: ConnectionInfoResource,
-    private commonDialogService: CommonDialogService,
+    private commonDialogService: CommonDialogService
   ) {}
 
   async auth(connectionId: string) {
diff --git a/webapp/packages/core-connections/src/ContainerResource.ts b/webapp/packages/core-connections/src/ContainerResource.ts
index c81340b4d0..4446200ca4 100644
--- a/webapp/packages/core-connections/src/ContainerResource.ts
+++ b/webapp/packages/core-connections/src/ContainerResource.ts
@@ -10,7 +10,7 @@ import { injectable } from '@cloudbeaver/core-di';
 import {
   GraphQLService,
   CachedDataResource,
-  DatabaseObjectInfo,
+  DatabaseObjectInfo
 } from '@cloudbeaver/core-sdk';
 
 export type ObjectContainer = Pick<DatabaseObjectInfo, 'name' | 'description' | 'type' | 'features'>;
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index 0a957ebd6a..95e39c9b43 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -10,7 +10,7 @@ import { injectable } from '@cloudbeaver/core-di';
 import {
   GraphQLService,
   CachedMapResource,
-  DriverInfo,
+  DriverInfo
 } from '@cloudbeaver/core-sdk';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 
@@ -54,7 +54,6 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver> {
   }
 
   compare(driverA: DBDriver, driverB: DBDriver): number {
-
     if (driverA.promotedScore === driverB.promotedScore) {
       return (driverA.name || '').localeCompare((driverB.name || ''));
     }
diff --git a/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts b/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
index ae19577527..28a27df097 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
+++ b/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
@@ -32,7 +32,7 @@ export class DBAuthDialogController implements IInitializableController, IDestru
     private notificationService: NotificationService,
     private connectionInfoResource: ConnectionInfoResource,
     private commonDialogService: CommonDialogService,
-    private dbDriverResource: DBDriverResource,
+    private dbDriverResource: DBDriverResource
   ) { }
 
   init(connectionId: string, onClose: () => void) {
diff --git a/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
index d8cf34ac3a..117a78c2e6 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
+++ b/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
@@ -81,15 +81,15 @@ export const DatabaseAuthDialog = observer(function DatabaseAuthDialog({
       {(!connection.isLoaded() || connection.isLoading())
         ? <Loader />
         : (
-            <SubmittingForm ref={focusedRef} onSubmit={controller.login}>
-              <ObjectPropertyInfoForm
-                autofillToken={`section-${connection.connectionInfo?.id || ''} section-auth`}
-                properties={connection.connectionInfo?.authProperties}
-                credentials={controller.credentials}
-                disabled={controller.isAuthenticating}
-              />
-            </SubmittingForm>
-          )}
+          <SubmittingForm ref={focusedRef} onSubmit={controller.login}>
+            <ObjectPropertyInfoForm
+              autofillToken={`section-${connection.connectionInfo?.id || ''} section-auth`}
+              properties={connection.connectionInfo?.authProperties}
+              credentials={controller.credentials}
+              disabled={controller.isAuthenticating}
+            />
+          </SubmittingForm>
+        )}
       {controller.error.responseMessage && (
         <ErrorMessage
           text={controller.error.responseMessage}
diff --git a/webapp/packages/core-connections/src/DriverPropertiesService.ts b/webapp/packages/core-connections/src/DriverPropertiesService.ts
index 1b72f9bc03..2ffce73741 100644
--- a/webapp/packages/core-connections/src/DriverPropertiesService.ts
+++ b/webapp/packages/core-connections/src/DriverPropertiesService.ts
@@ -11,9 +11,8 @@ import { GraphQLService, ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class DriverPropertiesService {
-
   constructor(
-    private graphQLService: GraphQLService,
+    private graphQLService: GraphQLService
   ) {
   }
 
diff --git a/webapp/packages/core-di/src/App.ts b/webapp/packages/core-di/src/App.ts
index 336b2221bb..841f8c940e 100644
--- a/webapp/packages/core-di/src/App.ts
+++ b/webapp/packages/core-di/src/App.ts
@@ -48,7 +48,7 @@ export class App {
         plugin.registerServices(this.getServiceCollection());
       }
       if (plugin.providers?.length) {
-        plugin.providers.forEach((provider) => {
+        plugin.providers.forEach(provider => {
           // console.log('provider', provider.name);
           this.diWrapper.collection.addServiceByClass(provider);
         });
diff --git a/webapp/packages/core-di/src/InjectionToken.ts b/webapp/packages/core-di/src/InjectionToken.ts
index 610c422674..45b68e3400 100644
--- a/webapp/packages/core-di/src/InjectionToken.ts
+++ b/webapp/packages/core-di/src/InjectionToken.ts
@@ -21,7 +21,6 @@ export type InjectionToken<T> = ITypedConstructor<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 7a0e44c1bf..bd31b608dd 100644
--- a/webapp/packages/core-di/src/PluginManifest.ts
+++ b/webapp/packages/core-di/src/PluginManifest.ts
@@ -7,7 +7,7 @@
  */
 
 import {
-  IServiceConstructor, IServiceCollection, IServiceInjector,
+  IServiceConstructor, IServiceCollection, IServiceInjector
 } from './IApp';
 
 export interface PluginManifest {
diff --git a/webapp/packages/core-di/src/entities/Entity.ts b/webapp/packages/core-di/src/entities/Entity.ts
index e017d1580e..61c9ff6dbc 100644
--- a/webapp/packages/core-di/src/entities/Entity.ts
+++ b/webapp/packages/core-di/src/entities/Entity.ts
@@ -82,7 +82,7 @@ export class Entity {
    * Destroy mixins in the reverse order of addition
    */
   destroyEntity() {
-    this.mixins.reverse().forEach((token) => {
+    this.mixins.reverse().forEach(token => {
       const mixin = this.getMixin(token) as IDestroyableMixin;
       if (mixin.destruct) {
         mixin.destruct();
@@ -91,7 +91,7 @@ export class Entity {
   }
 
   protected addProviders(providers: Array<MixinProvider<any>>) {
-    providers.forEach((provider) => {
+    providers.forEach(provider => {
       if (typeof provider === 'function') {
         this.addMixin(provider);
       } else {
@@ -114,7 +114,6 @@ export class Entity {
   getMixin<T>(token: InjectionToken<T>): T {
     return this.container.getServiceByToken<T>(token);
   }
-
 }
 
 export type MixinProvider<T extends Record<string, any>> = ITypedConstructor<T> | {
diff --git a/webapp/packages/core-di/src/entities/RootContainerService.ts b/webapp/packages/core-di/src/entities/RootContainerService.ts
index 2a9ca3e958..525673a0f3 100644
--- a/webapp/packages/core-di/src/entities/RootContainerService.ts
+++ b/webapp/packages/core-di/src/entities/RootContainerService.ts
@@ -14,7 +14,6 @@ import { Entity } from './Entity';
  * Method 'register' will be added during app bootstrap when root container is created
  */
 export class RootContainerService {
-
   private readonly register: (container: DIContainer) => void;
 
   constructor(register: (container: DIContainer) => void) {
@@ -26,5 +25,4 @@ export class RootContainerService {
     // eslint-disable-next-line dot-notation
     this.register(entity['container']);
   }
-
 }
diff --git a/webapp/packages/core-di/src/useController.ts b/webapp/packages/core-di/src/useController.ts
index 9fb42121f1..1e82dac5cb 100644
--- a/webapp/packages/core-di/src/useController.ts
+++ b/webapp/packages/core-di/src/useController.ts
@@ -7,12 +7,12 @@
  */
 
 import {
-  useContext, useEffect, useRef, useMemo,
+  useContext, useEffect, useRef, useMemo
 } from 'react';
 
 import { appContext } from './AppContext';
 import {
-  IServiceConstructor, IInitializableController, IDestructibleController, ExtractInitArgs,
+  IServiceConstructor, IInitializableController, IDestructibleController, ExtractInitArgs
 } from './IApp';
 
 export function useController<T extends IInitializableController>(
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
index 7abc15b919..dfbf0a15a3 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx
@@ -36,7 +36,6 @@ export const CommonDialogWrapper: React.FC<CommonDialogWrapperProps> = function
   onReject,
   children,
 }) {
-
   return styled(useStyles(commonDialogStyle))(
     <dialog className={className}>
       <header>
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
index 4f6bc59ca7..5cc02fd4ee 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
+++ b/webapp/packages/core-dialogs/src/CommonDialog/CommonDialogService.ts
@@ -39,7 +39,7 @@ export class CommonDialogService {
   async open<TPayload, TResult>(
     component: DialogComponent<TPayload, TResult>,
     payload: TPayload,
-    options?: DialogOptions,
+    options?: DialogOptions
   ): Promise<TResult | null> {
     return new Promise<TResult>((resolve, reject) => {
       const dialogInternal: DialogInternal = {
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx b/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
index 1d628c7317..0e59836c09 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/DialogsPortal.tsx
@@ -11,7 +11,7 @@ import { useCallback, useRef } from 'react';
 import {
   Dialog,
   DialogBackdrop,
-  useDialogState,
+  useDialogState
 } from 'reakit/Dialog';
 import styled from 'reshadow';
 
diff --git a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
index 57891b0024..4af75b8ebf 100644
--- a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
+++ b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts
@@ -44,7 +44,6 @@ export class ContextMenu {
     params: IContextMenuItem<T>,
     context: IMenuContext<T>
   ): ComputedMenuItemModel {
-
     // depends on context
     const modelOptions = new ComputedMenuItemOptionsWithContext(params, context);
     const model = new ComputedMenuItemModel(modelOptions);
@@ -60,20 +59,17 @@ export class ContextMenu {
     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)
     );
-
   }
 
   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));
@@ -118,7 +114,6 @@ class ComputedMenuItemOptionsWithContext<T> implements IComputedMenuItemOptions
 }
 
 class ContextMenuPanel implements IMenuPanel {
-
   get menuItems() {
     if (!this.items) {
       this.items = this.itemsGetter();
diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
index e09c6990d8..02324e6b9f 100644
--- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
+++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx
@@ -12,7 +12,7 @@ import {
 } from 'react';
 import {
   MenuButton,
-  Menu, MenuItem, MenuStateReturn, useMenuState,
+  Menu, MenuItem, MenuStateReturn, useMenuState
 } from 'reakit/Menu';
 import styled, { use } from 'reshadow';
 
@@ -64,7 +64,6 @@ const MenuPanel = observer(function MenuPanel({
   menu,
   style = [],
 }: MenuPanelProps) {
-
   return styled(useStyles(menuPanelStyles, ...style))(
     <Menu {...menu} aria-label={panel.id}>
       {menu.visible && panel.menuItems.map(item => (
@@ -138,7 +137,6 @@ export const MenuInnerTrigger = forwardRef(function MenuInnerTrigger(
   props: MenuInnerTriggerProps,
   ref: Ref<HTMLButtonElement>
 ) {
-
   const {
     menuItem, style = [], ...rest
   } = props;
diff --git a/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts b/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
index 517ff1f764..68a65a0df9 100644
--- a/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
+++ b/webapp/packages/core-dialogs/src/Menu/StaticMenu/StaticMenu.ts
@@ -8,7 +8,7 @@
 
 import { IMenuPanel } from '../IMenuPanel';
 import {
-  ComputedMenuItemModel, IComputedMenuItemOptions,
+  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/ComputedMenuPanelModel.ts b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
index 38e6227804..c1ddbf6c80 100644
--- a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
+++ b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuPanelModel.ts
@@ -16,7 +16,6 @@ export interface IComputedMenuPanelOptions {
 }
 
 export class ComputedMenuPanelModel implements IMenuPanel {
-
   id: string;
 
   @computed get menuItems() {
diff --git a/webapp/packages/core-events/src/EventsSettingsService.ts b/webapp/packages/core-events/src/EventsSettingsService.ts
index 8f0cbe89ee..aad30a1099 100644
--- a/webapp/packages/core-events/src/EventsSettingsService.ts
+++ b/webapp/packages/core-events/src/EventsSettingsService.ts
@@ -19,7 +19,6 @@ export type EventsSettings = typeof defaultSettings;
 
 @injectable()
 export class EventsSettingsService {
-
   readonly settings = this.pluginManagerService.getPluginSettings('core_events', defaultSettings);
 
   constructor(private pluginManagerService: PluginManagerService) { }
diff --git a/webapp/packages/core-events/src/NotificationService.ts b/webapp/packages/core-events/src/NotificationService.ts
index 313a6c8c86..3a0ec79d46 100644
--- a/webapp/packages/core-events/src/NotificationService.ts
+++ b/webapp/packages/core-events/src/NotificationService.ts
@@ -26,7 +26,7 @@ export class NotificationService {
   }
 
   constructor(
-    private settings: EventsSettingsService,
+    private settings: EventsSettingsService
   ) {}
 
   notify<TProps extends INotificationExtraProps<any> = INotificationExtraProps>(
diff --git a/webapp/packages/core-extensions/src/createExtension.ts b/webapp/packages/core-extensions/src/createExtension.ts
index ca21b9c415..b86c5b644c 100644
--- a/webapp/packages/core-extensions/src/createExtension.ts
+++ b/webapp/packages/core-extensions/src/createExtension.ts
@@ -18,7 +18,7 @@ export function createExtension<T>(
 
 export function isExtension<T>(
   obj: Record<any, any> | IExtension<T>,
-  key?: symbol,
+  key?: symbol
 ): obj is IExtension<T> {
   if (!(EXTENSION_SYMBOL in obj)) {
     return false;
diff --git a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
index 0e57527866..df2b24f9f3 100644
--- a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
+++ b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorModel.ts
@@ -19,7 +19,6 @@ export interface IErrorModelOptions {
 }
 
 export class ErrorModel {
-
   reason: string;
   errors: IErrorInfo[] = [];
   textToCopy = '';
@@ -32,7 +31,7 @@ export class ErrorModel {
       this.textToCopy = this.reason;
     } else if (error instanceof GQLError) { // GQL Error
       this.errors = (error.response?.errors || [])
-        .map((error) => {
+        .map(error => {
           const errorInfo: IErrorInfo = {
             message: error.message,
             stackTrace: error.extensions?.stackTrace || '',
@@ -49,7 +48,6 @@ export class ErrorModel {
       if (error.isTextBody) {
         this.htmlBody = error.errorText;
       }
-
     } else if (error instanceof ServerInternalError) {
       this.errors = [
         {
diff --git a/webapp/packages/core-plugin/src/PluginManagerService.ts b/webapp/packages/core-plugin/src/PluginManagerService.ts
index 7d25b07ad3..35c038ce5a 100644
--- a/webapp/packages/core-plugin/src/PluginManagerService.ts
+++ b/webapp/packages/core-plugin/src/PluginManagerService.ts
@@ -13,7 +13,6 @@ import { PluginSettings } from './PluginSettings';
 
 @injectable()
 export class PluginManagerService {
-
   constructor(private productManagerService: ProductManagerService) { }
 
   getPluginSettings<T>(scope: string, defaults: T) {
diff --git a/webapp/packages/core-root/src/PermissionsResource.ts b/webapp/packages/core-root/src/PermissionsResource.ts
index 6eacb05380..ee77c05905 100644
--- a/webapp/packages/core-root/src/PermissionsResource.ts
+++ b/webapp/packages/core-root/src/PermissionsResource.ts
@@ -19,7 +19,7 @@ export class PermissionsResource extends CachedDataResource<Set<string>, null> {
 
   constructor(
     private graphQLService: GraphQLService,
-    private sessionResource: SessionResource,
+    private sessionResource: SessionResource
   ) {
     super(new Set());
     this.loaded = false;
diff --git a/webapp/packages/core-root/src/PermissionsService.ts b/webapp/packages/core-root/src/PermissionsService.ts
index 35dc8b616a..0b2172675e 100644
--- a/webapp/packages/core-root/src/PermissionsService.ts
+++ b/webapp/packages/core-root/src/PermissionsService.ts
@@ -23,7 +23,7 @@ export class PermissionsService {
   }
 
   constructor(
-    private permissions: PermissionsResource,
+    private permissions: PermissionsResource
   ) {
   }
 
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index 57f767da4d..c1b9865021 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -15,7 +15,7 @@ import { GraphQLService, CachedDataResource, ServerConfig } from '@cloudbeaver/c
 export class ServerConfigResource extends CachedDataResource<ServerConfig | null, null> {
   @observable private loaded: boolean;
   constructor(
-    private graphQLService: GraphQLService,
+    private graphQLService: GraphQLService
   ) {
     super(null);
     this.loaded = false;
diff --git a/webapp/packages/core-root/src/ServerService.ts b/webapp/packages/core-root/src/ServerService.ts
index 253af81248..cd5de2a357 100644
--- a/webapp/packages/core-root/src/ServerService.ts
+++ b/webapp/packages/core-root/src/ServerService.ts
@@ -20,9 +20,8 @@ export class ServerService {
   private lastConfig: any = null;
   constructor(
     readonly config: ServerConfigResource,
-    private sessionService: SessionService,
+    private sessionService: SessionService
   ) {
-
     this.config.onDataUpdate.subscribe(this.refreshConfigAsync.bind(this));
   }
 
diff --git a/webapp/packages/core-root/src/SessionExpireService.ts b/webapp/packages/core-root/src/SessionExpireService.ts
index fc483de494..aa42d83543 100644
--- a/webapp/packages/core-root/src/SessionExpireService.ts
+++ b/webapp/packages/core-root/src/SessionExpireService.ts
@@ -21,7 +21,7 @@ export class SessionExpireService {
 
   onSessionExpire = new Subject();
   constructor(
-    private graphQLService: GraphQLService,
+    private graphQLService: GraphQLService
   ) {
   }
 
diff --git a/webapp/packages/core-root/src/SessionResource.ts b/webapp/packages/core-root/src/SessionResource.ts
index 65048cd7c0..66ac83ca46 100644
--- a/webapp/packages/core-root/src/SessionResource.ts
+++ b/webapp/packages/core-root/src/SessionResource.ts
@@ -41,7 +41,7 @@ export class SessionResource extends CachedDataResource<SessionState | null, nul
 
   constructor(
     private graphQLService: GraphQLService,
-    private serverConfiguration: ServerConfigResource,
+    private serverConfiguration: ServerConfigResource
   ) {
     super(null);
     this.serverConfiguration.onDataOutdated.subscribe(this.markOutdated.bind(this));
diff --git a/webapp/packages/core-root/src/SessionSettingsService.ts b/webapp/packages/core-root/src/SessionSettingsService.ts
index f7f8082a76..7d44dd0ff0 100644
--- a/webapp/packages/core-root/src/SessionSettingsService.ts
+++ b/webapp/packages/core-root/src/SessionSettingsService.ts
@@ -11,7 +11,6 @@ import { SettingsSource } from '@cloudbeaver/core-settings';
 
 @injectable()
 export class SessionSettingsService extends SettingsSource {
-
   constructor(private localStorageKey: string) {
     super();
     const state = localStorage.getItem(this.localStorageKey);
diff --git a/webapp/packages/core-routing/src/RouterService.ts b/webapp/packages/core-routing/src/RouterService.ts
index 03269199cf..bbc14da943 100644
--- a/webapp/packages/core-routing/src/RouterService.ts
+++ b/webapp/packages/core-routing/src/RouterService.ts
@@ -18,7 +18,6 @@ export type RouterState = State;
 
 @injectable()
 export class RouterService extends Bootstrap {
-
   get route() {
     return this.currentRoute;
   }
diff --git a/webapp/packages/core-routing/src/Screen/ScreenService.ts b/webapp/packages/core-routing/src/Screen/ScreenService.ts
index 269ff416e3..ada1e832a1 100644
--- a/webapp/packages/core-routing/src/Screen/ScreenService.ts
+++ b/webapp/packages/core-routing/src/Screen/ScreenService.ts
@@ -15,7 +15,6 @@ import { IScreen, ScreenRoute } from './IScreen';
 
 @injectable()
 export class ScreenService {
-
   get screen() {
     return this.getScreenByRoute(this.routerService.route);
   }
diff --git a/webapp/packages/core-sdk/src/CachedDataResource.ts b/webapp/packages/core-sdk/src/CachedDataResource.ts
index 11617b7e93..3d15643b67 100644
--- a/webapp/packages/core-sdk/src/CachedDataResource.ts
+++ b/webapp/packages/core-sdk/src/CachedDataResource.ts
@@ -15,7 +15,6 @@ export abstract class CachedDataResource<
   TData,
   TParam,
 > extends CachedResource<TData, TParam> {
-
   async refresh(param: TParam): Promise<TData> {
     await this.loadData(param, true);
     return this.data;
diff --git a/webapp/packages/core-sdk/src/CustomGraphQLClient.ts b/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
index d6bfa88b2e..4f87ae2f5d 100644
--- a/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
+++ b/webapp/packages/core-sdk/src/CustomGraphQLClient.ts
@@ -34,9 +34,7 @@ export class CustomGraphQLClient extends GraphQLClient {
   }
 
   private blockRequestsReasonHandler(): void {
-    if (!this.isRequestsBlocked) {
-
-    } else {
+    if (this.isRequestsBlocked) {
       if (this.requestsBlockedReason instanceof Error) {
         throw this.requestsBlockedReason;
       } else {
diff --git a/webapp/packages/core-sdk/src/GQLError.ts b/webapp/packages/core-sdk/src/GQLError.ts
index 070b6f02d6..eeb76d0749 100644
--- a/webapp/packages/core-sdk/src/GQLError.ts
+++ b/webapp/packages/core-sdk/src/GQLError.ts
@@ -6,6 +6,7 @@
  * 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 { GraphQLResponse, GraphQLRequestContext, ClientError } from 'graphql-request/dist/src/types';
diff --git a/webapp/packages/core-settings/src/LocalStorageSaveService.ts b/webapp/packages/core-settings/src/LocalStorageSaveService.ts
index 26b3c859a0..f2a00b4015 100644
--- a/webapp/packages/core-settings/src/LocalStorageSaveService.ts
+++ b/webapp/packages/core-settings/src/LocalStorageSaveService.ts
@@ -9,7 +9,7 @@
 import {
   autorun,
   set,
-  toJS,
+  toJS
 } from 'mobx';
 
 import { injectable } from '@cloudbeaver/core-di';
diff --git a/webapp/packages/core-settings/src/SettingsService.ts b/webapp/packages/core-settings/src/SettingsService.ts
index dc989785eb..74558da939 100644
--- a/webapp/packages/core-settings/src/SettingsService.ts
+++ b/webapp/packages/core-settings/src/SettingsService.ts
@@ -12,7 +12,6 @@ import { LocalStorageSaveService } from './LocalStorageSaveService';
 
 @injectable()
 export class SettingsService {
-
   constructor(private localStorageSaveService: LocalStorageSaveService) { }
 
   /**
diff --git a/webapp/packages/core-theming/src/ThemeService.ts b/webapp/packages/core-theming/src/ThemeService.ts
index 58c86e0a37..9130994fa9 100644
--- a/webapp/packages/core-theming/src/ThemeService.ts
+++ b/webapp/packages/core-theming/src/ThemeService.ts
@@ -33,7 +33,6 @@ const DEFAULT_THEME_ID = 'light';
 
 @injectable()
 export class ThemeService {
-
   @computed get themes(): ITheme[] {
     return Array.from(this.themeMap.values());
   }
diff --git a/webapp/packages/core-theming/src/useStyles.ts b/webapp/packages/core-theming/src/useStyles.ts
index 101829f8fd..405d6569ba 100644
--- a/webapp/packages/core-theming/src/useStyles.ts
+++ b/webapp/packages/core-theming/src/useStyles.ts
@@ -64,7 +64,7 @@ export function useStyles(
     if (themedStyles.length > 0) {
       Promise
         .all(themedStyles)
-        .then((styles) => {
+        .then(styles => {
           loadedStyles.current = flat([staticStyles, styles]);
           forceUpdate(patch + 1);
         });
diff --git a/webapp/packages/core-utils/src/Promises/Deferred.ts b/webapp/packages/core-utils/src/Promises/Deferred.ts
index 9f2e477d7e..2bc8fd1a96 100644
--- a/webapp/packages/core-utils/src/Promises/Deferred.ts
+++ b/webapp/packages/core-utils/src/Promises/Deferred.ts
@@ -100,7 +100,7 @@ export class DeferredFromPromise<T> extends Deferred<T> {
     super();
     promise.then(
       value => this.toResolved(value),
-      (err) => {
+      err => {
         if (err instanceof PromiseCancelledError) {
           this.toCancelled(err.reason);
         } else {
diff --git a/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts b/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
index 8c41d1859c..b114d78671 100644
--- a/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
+++ b/webapp/packages/core-utils/src/Promises/PromiseExecutor.ts
@@ -26,5 +26,4 @@ export class PromiseExecutor<T> {
     };
     this.promise = new Promise<T>(executor);
   }
-
 }
diff --git a/webapp/packages/core-utils/src/Promises/deferPromise.ts b/webapp/packages/core-utils/src/Promises/deferPromise.ts
index f69d2cd760..4eb907848e 100644
--- a/webapp/packages/core-utils/src/Promises/deferPromise.ts
+++ b/webapp/packages/core-utils/src/Promises/deferPromise.ts
@@ -30,7 +30,7 @@ export function deferPromise<T>(executor: PromiseExecutor<T>, timeout: number):
 }
 
 export function cancellableTimeout(timeout: number): CancellablePromise<void> {
-  return new CancellablePromise<void>((resolve) => {
+  return new CancellablePromise<void>(resolve => {
     const token = setTimeout(() => resolve(), timeout);
     return () => {
       clearTimeout(token);
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
index 48d35503f6..b2e22eb936 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ConfigurationWizardPagesBootstrapService.ts
@@ -22,7 +22,7 @@ export class ConfigurationWizardPagesBootstrapService extends Bootstrap {
   constructor(
     private administrationItemService: AdministrationItemService,
     private configurationWizardService: ConfigurationWizardService,
-    private serverConfigurationService: ServerConfigurationService,
+    private serverConfigurationService: ServerConfigurationService
   ) {
     super();
   }
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/CreateUser.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/CreateUser.tsx
index 814f5cce3c..4f9419d506 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/CreateUser.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/CreateUser.tsx
@@ -43,7 +43,6 @@ export function CreateUser({
   user,
   onCancel,
 }: Props) {
-
   return styled(useStyles(styles))(
     <user-create as='div'>
       <title-bar as='div'><Translate token='authentication_administration_user_connections_user_add' /></title-bar>
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/GrantedConnections.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/GrantedConnections.tsx
index ad5811944a..3602b48c74 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/GrantedConnections.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/GrantedConnections.tsx
@@ -78,7 +78,7 @@ export const GrantedConnections = observer(function GrantedConnections({
           <TableColumnHeader />
         </TableHeader>
         <TableBody>
-          {connections.map((connection) => {
+          {connections.map(connection => {
             const connectionPermission = getConnectionPermission(connection.id);
             const driver = driversResource.get(connection.driverId);
             const isRoleProvided = connectionPermission?.subjectType === AdminSubjectType.Role;
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserForm.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserForm.tsx
index 0f227c86a1..4a44e122d9 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserForm.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserForm.tsx
@@ -140,15 +140,15 @@ export const UserForm = observer(function UserForm({
   const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
 
   const handleLoginChange = useCallback(
-    (value: string) => controller.credentials.login = value,
+    (value: string) => { controller.credentials.login = value; },
     []
   );
   const handlePasswordChange = useCallback(
-    (value: string) => controller.credentials.password = value,
+    (value: string) => { controller.credentials.password = value; },
     []
   );
   const handlePasswordRepeatChange = useCallback(
-    (value: string) => controller.credentials.passwordRepeat = value,
+    (value: string) => { controller.credentials.passwordRepeat = value; },
     []
   );
   const handleRoleChange = useCallback(
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
index 508e86520b..6df0b0ee1f 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
@@ -115,7 +115,7 @@ export class UserFormController implements IInitializableController, IDestructib
     }
   };
 
-  handleConnectionsAccessChange = () => this.connectionAccessChanged = true;
+  handleConnectionsAccessChange = () => { this.connectionAccessChanged = true; };
 
   loadConnectionsAccess = async () => {
     if (this.isLoading || this.connectionAccessLoaded) {
@@ -194,7 +194,7 @@ export class UserFormController implements IInitializableController, IDestructib
 
   private getGrantedConnections() {
     return Array.from(this.selectedConnections.keys())
-      .filter((connectionId) => {
+      .filter(connectionId => {
         const connectionPermission = this.grantedConnections.find(
           connectionPermission => connectionPermission.connectionId === connectionId
         );
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
index 8dc5f97d70..4fd11f9e33 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
@@ -47,7 +47,7 @@ export class UsersAdministrationController {
     private notificationService: NotificationService,
     private usersResource: UsersResource,
     private commonDialogService: CommonDialogService,
-    private usersAdministrationNavigationService: UsersAdministrationNavigationService,
+    private usersAdministrationNavigationService: UsersAdministrationNavigationService
   ) { }
 
   create = () => {
@@ -109,7 +109,6 @@ export class UsersAdministrationController {
     this.isDeleting = true;
 
     try {
-
       await this.usersResource.delete(resourceKeyList(deletionList));
       this.selectedItems.clear();
 
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationNavigationService.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationNavigationService.ts
index f6fa86d41f..4c395c1cfa 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationNavigationService.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationNavigationService.ts
@@ -15,7 +15,7 @@ export class UsersAdministrationNavigationService {
   static AddItemName = 'add';
 
   constructor(
-    private administrationScreenService: AdministrationScreenService,
+    private administrationScreenService: AdministrationScreenService
   ) {}
 
   navToRoot() {
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
index 31b4d3f453..b4769aa80a 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
@@ -20,7 +20,7 @@ export class UsersAdministrationService extends Bootstrap {
   constructor(
     private administrationItemService: AdministrationItemService,
     private notificationService: NotificationService,
-    private usersResource: UsersResource,
+    private usersResource: UsersResource
   ) {
     super();
   }
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
index 249ca7406c..686c90890d 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
@@ -28,7 +28,6 @@ interface Props {
 }
 
 export const User = observer(function User({ user }: Props) {
-
   return styled(useStyles(styles))(
     <TableItem item={user.userId} expandElement={UserEdit}>
       <TableColumnValue centerContent flex>
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEdit.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEdit.tsx
index 6bf8209f82..49bf875af7 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEdit.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEdit.tsx
@@ -11,7 +11,7 @@ import { useContext, useCallback } from 'react';
 import styled, { css } from 'reshadow';
 
 import {
-  TableContext,
+  TableContext
 } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 import { composes, useStyles } from '@cloudbeaver/core-theming';
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
index 6210dbd87c..6eee1f6d25 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
@@ -31,7 +31,7 @@ implements IInitializableController, IDestructibleController {
 
   constructor(
     private notificationService: NotificationService,
-    private usersResource: UsersResource,
+    private usersResource: UsersResource
   ) { }
 
   init(id: string) {
diff --git a/webapp/packages/plugin-authentication/src/AuthMenuService.ts b/webapp/packages/plugin-authentication/src/AuthMenuService.ts
index a75a4165a0..1b03a489d6 100644
--- a/webapp/packages/plugin-authentication/src/AuthMenuService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthMenuService.ts
@@ -25,7 +25,7 @@ export class AuthMenuService extends Bootstrap {
     private settingsMenuService: SettingsMenuService,
     private notificationService: NotificationService,
     private topNavService: TopNavService,
-    private administrationTopAppBarService: AdministrationTopAppBarService,
+    private administrationTopAppBarService: AdministrationTopAppBarService
   ) {
     super();
   }
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationService.ts b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
index f476a1f5e4..f70ae197ce 100644
--- a/webapp/packages/plugin-authentication/src/AuthenticationService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
@@ -19,7 +19,7 @@ export class AuthenticationService extends Bootstrap {
     private serverService: ServerService,
     private sessionService: SessionService,
     private authDialogService: AuthDialogService,
-    private authInfoService: AuthInfoService,
+    private authInfoService: AuthInfoService
   ) {
     super();
   }
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogController.ts b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogController.ts
index e4ad420920..53be69c9c5 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogController.ts
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogController.ts
@@ -40,7 +40,7 @@ export class AuthDialogController implements IInitializableController, IDestruct
     private notificationService: NotificationService,
     private authProvidersResource: AuthProvidersResource,
     private authInfoService: AuthInfoService,
-    private commonDialogService: CommonDialogService,
+    private commonDialogService: CommonDialogService
   ) { }
 
   init(onClose: () => void) {
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
index 7ad25e84ca..4f903f8f7f 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogService.ts
@@ -14,7 +14,7 @@ import { AuthDialog } from './AuthDialog';
 @injectable()
 export class AuthDialogService {
   constructor(
-    private commonDialogService: CommonDialogService,
+    private commonDialogService: CommonDialogService
   ) { }
 
   async showLoginForm(persistent = false) {
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/ConnectionFormDialog/ConnectionFormDialog.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/ConnectionFormDialog/ConnectionFormDialog.tsx
index f533b82b75..d1344da16d 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/ConnectionFormDialog/ConnectionFormDialog.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/ConnectionFormDialog/ConnectionFormDialog.tsx
@@ -119,19 +119,19 @@ export const ConnectionFormDialog = observer(function ConnectionFormDialog({
         {controller.isLoading
           ? <Loader />
           : (
-              <SubmittingForm onSubmit={controller.onCreateConnection}>
-                <TabPanel tabId='options'>
-                  <ConnectionForm driver={driver} controller={controller} />
-                </TabPanel>
-                <TabPanel tabId='driver_properties'>
-                  <DriverProperties
-                    driver={driver}
-                    state={controller.config.properties!}
-                    loadProperties={loadProperties}
-                  />
-                </TabPanel>
-              </SubmittingForm>
-            )}
+            <SubmittingForm onSubmit={controller.onCreateConnection}>
+              <TabPanel tabId='options'>
+                <ConnectionForm driver={driver} controller={controller} />
+              </TabPanel>
+              <TabPanel tabId='driver_properties'>
+                <DriverProperties
+                  driver={driver}
+                  state={controller.config.properties!}
+                  loadProperties={loadProperties}
+                />
+              </TabPanel>
+            </SubmittingForm>
+          )}
         {controller.error.responseMessage && (
           <ErrorMessage
             text={controller.error.responseMessage}
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
index 6ffc359776..8214b6fbcb 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionController.ts
@@ -60,7 +60,6 @@ export class CustomConnectionController implements IInitializableController {
   }
 
   private sortDrivers(driverA: DBDriver, driverB: DBDriver): number {
-
     if (driverA.promotedScore === driverB.promotedScore) {
       return (driverA.name || '').localeCompare((driverB.name || ''));
     }
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 0fda0ef1e4..6f61b4d07b 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelectorDialog.tsx
@@ -41,7 +41,6 @@ export const DriverSelectorDialog = observer(
     onSelect,
     onClose,
   }: DriverSelectorDialogProps) {
-
     return styled(styles)(
       <CommonDialogWrapper
         title={title}
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts b/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts
index 0ef698d09e..396dd79172 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts
@@ -12,10 +12,9 @@ import { ConnectionConfig, GraphQLService } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class CustomConnectionService {
-
   constructor(
     private graphQLService: GraphQLService,
-    private connectionInfoResource: ConnectionInfoResource,
+    private connectionInfoResource: ConnectionInfoResource
   ) {
   }
 
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
index d48981f558..05041df958 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
@@ -17,7 +17,6 @@ import { TemplateConnectionsResource } from './TemplateConnectionsResource';
 
 @injectable()
 export class TemplateConnectionPluginBootstrap extends Bootstrap {
-
   constructor(
     private mainMenuService: MainMenuService,
     private templateConnectionsResource: TemplateConnectionsResource,
diff --git a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
index cad02995b9..112dc18bf5 100644
--- a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
@@ -22,7 +22,7 @@ export class DataExportMenuService {
   constructor(
     private commonDialogService: CommonDialogService,
     private tableFooterMenuService: TableFooterMenuService,
-    private contextMenuService: ContextMenuService,
+    private contextMenuService: ContextMenuService
   ) { }
 
   register() {
@@ -48,7 +48,7 @@ export class DataExportMenuService {
         },
         order: 2,
         title: 'data_transfer_dialog_export',
-        onClick: (context) => {
+        onClick: context => {
           const node = context.data;
           const connectionId = NodeManagerUtils.nodeIdToConnectionId(node.id);
           this.commonDialogService.open(DataExportDialog, {
diff --git a/webapp/packages/plugin-data-export/src/DataExportProcessService.ts b/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
index 068024aba5..15cb2a52f3 100644
--- a/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportProcessService.ts
@@ -33,7 +33,7 @@ export class DataExportProcessService {
 
   constructor(
     private graphQLService: GraphQLService,
-    private notificationService: NotificationService,
+    private notificationService: NotificationService
   ) { }
 
   async cancel(exportId: string): Promise<void> {
diff --git a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
index 51b5a046ba..d993f93385 100644
--- a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
+++ b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
@@ -16,7 +16,7 @@ export class DataTransferProcessorsResource extends CachedDataResource<Map<strin
   @observable private loaded = false;
 
   constructor(
-    private graphQLService: GraphQLService,
+    private graphQLService: GraphQLService
   ) {
     super(new Map());
   }
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 03c005ea05..0721fa7634 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ExportProcessorList.tsx
@@ -24,7 +24,6 @@ export const ExportProcessorList = observer(function ExportProcessorList({
   onSelect,
   className,
 }: ExportProcessorListProps) {
-
   return (
     <ItemList className={className}>
       {processors.map(processor => <ProcessorItem key={processor.id} processor={processor} onSelect={onSelect} />)}
diff --git a/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts b/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
index 5852938678..7697d4c7c1 100644
--- a/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
+++ b/webapp/packages/plugin-data-export/src/ExportFromContainerProcess.ts
@@ -8,17 +8,16 @@
 
 import { NotificationService } from '@cloudbeaver/core-events';
 import {
-  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters,
+  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters
 } from '@cloudbeaver/core-sdk';
 import {
-  CancellablePromise, cancellableTimeout, Deferred, EDeferredState,
+  CancellablePromise, cancellableTimeout, Deferred, EDeferredState
 } from '@cloudbeaver/core-utils';
 
 const DELAY_BETWEEN_TRIES = 1000;
 
 // TODO: seems we need special abstraction over async tasks to manage it
 export class ExportFromContainerProcess extends Deferred<string> {
-
   private taskId?: string;
   private timeout?: CancellablePromise<void>;
   private isCancelConfirmed = false; // true when server successfully executed cancelQueryAsync
diff --git a/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts b/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
index d5aa5cc473..4019424733 100644
--- a/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
+++ b/webapp/packages/plugin-data-export/src/ExportFromResultsProcess.ts
@@ -8,17 +8,16 @@
 
 import { NotificationService } from '@cloudbeaver/core-events';
 import {
-  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters,
+  AsyncTaskInfo, GraphQLService, ServerInternalError, DataTransferParameters
 } from '@cloudbeaver/core-sdk';
 import {
-  CancellablePromise, cancellableTimeout, Deferred, EDeferredState,
+  CancellablePromise, cancellableTimeout, Deferred, EDeferredState
 } from '@cloudbeaver/core-utils';
 
 const DELAY_BETWEEN_TRIES = 1000;
 
 // TODO: seems we need special abstraction over async tasks to manage it
 export class ExportFromResultsProcess extends Deferred<string> {
-
   private taskId?: string;
   private timeout?: CancellablePromise<void>;
   private isCancelConfirmed = false; // true when server successfully executed cancelQueryAsync
diff --git a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
index 0f04ae98ae..2cb55e4bfa 100644
--- a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
+++ b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotificationController.ts
@@ -78,7 +78,7 @@ export class ExportNotificationController implements IInitializableController {
     private commonDialogService: CommonDialogService,
     private dataExportProcessService: DataExportProcessService,
     private navNodeManagerService: NavNodeManagerService,
-    private localization: LocalizationService,
+    private localization: LocalizationService
   ) {}
 
   init(notification: INotification<{ source: string }>): void {
diff --git a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts
index 35aeb91ce9..0e5d5f8f33 100644
--- a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts
+++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts
@@ -20,7 +20,7 @@ import {
   GridOptions,
   CellClassParams,
   SortChangedEvent,
-  RowNode,
+  RowNode
 } from '@ag-grid-community/core';
 import { injectable, IInitializableController, IDestructibleController } from '@cloudbeaver/core-di';
 import {
@@ -299,7 +299,6 @@ function mapDataToColumns(columns?: IAgGridCol[]): ColDef[] {
           return 'cell-edited';
         }
         return '';
-
       },
     })),
   ];
diff --git a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx
index 3e82a6a624..8594db244c 100644
--- a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx
+++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx
@@ -7,7 +7,7 @@
  */
 
 import {
-  forwardRef, useImperativeHandle, useState, useCallback, useRef, useEffect,
+  forwardRef, useImperativeHandle, useState, useCallback, useRef, useEffect
 } from 'react';
 import styled, { css } from 'reshadow';
 
diff --git a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
index 6ff85473b7..556d5b2ac0 100644
--- a/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
+++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
@@ -31,12 +31,12 @@ import {
   AgGridEvent,
   CellPositionUtils,
   RowPositionUtils,
-  ValueService,
+  ValueService
 } from '@ag-grid-community/core';
 
 import { INDEX_COLUMN_DEF } from '../../AgGridTableController';
 import {
-  IAgColumnClickEvent, COLUMN_CLICK_EVENT_TYPE,
+  IAgColumnClickEvent, COLUMN_CLICK_EVENT_TYPE
 } from '../../TableColumnHeader/TableColumnHeader';
 import { TableSelection } from '../../TableSelection/TableSelection';
 
@@ -214,7 +214,7 @@ export class RangeController implements IRangeController {
       const isRangeSelected = this.selection?.isRangeSelected(
         this.temporaryRange!.firstRow,
         this.temporaryRange!.lastRow,
-        this.temporaryRange!.columns,
+        this.temporaryRange!.columns
       );
       return isRangeSelected ? 0 : 1;
     }
diff --git a/webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts b/webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts
index 318bdc249b..a970c50582 100644
--- a/webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts
+++ b/webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts
@@ -8,7 +8,7 @@
 
 import { ThemeSelector } from '@cloudbeaver/core-theming';
 
-export const agGridStyles: ThemeSelector = async (theme) => {
+export const agGridStyles: ThemeSelector = async theme => {
   let styles: any;
 
   switch (theme) {
diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index d454a43c27..0d1af397c9 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -114,7 +114,6 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     defaultCatalog?: string,
     defaultSchema?: string
   ): Promise<IExecutionContext> {
-
     const response = await this.graphQLService.sdk.sqlContextCreate({
       connectionId,
       defaultCatalog,
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
index e10d9f5e77..3cbb9b8630 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
@@ -10,7 +10,7 @@ import {
   NavNodeManagerService,
   INodeNavigationData,
   ITab,
-  NodeManagerUtils,
+  NodeManagerUtils
 } from '@cloudbeaver/core-app';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -35,7 +35,6 @@ export class DataViewerTabService {
     private dbObjectPageService: DBObjectPageService,
     private notificationService: NotificationService
   ) {
-
     this.page = this.dbObjectPageService.register({
       key: 'data_viewer_data',
       priority: 2,
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
index 5bd590e908..edb90c694c 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
@@ -35,7 +35,7 @@ export class DataViewerTableService {
   async create(
     tabId: string,
     connectionId: string,
-    containerNodePath = '',
+    containerNodePath = ''
   ): Promise<TableViewerModel> {
     const connectionInfo = await this.connectionInfoResource.load(connectionId);
 
@@ -66,7 +66,6 @@ export class DataViewerTableService {
     defaultCatalog?: string,
     defaultSchema?: string
   ): Promise<IExecutionContext> {
-
     const response = await this.graphQLService.sdk.sqlContextCreate({
       connectionId,
       defaultCatalog,
@@ -117,7 +116,6 @@ export class DataViewerTableService {
       throw new Error('containerNodePath must be provided for table');
     }
     if (!model.executionContext) {
-
       // it is first data request
       const executionContext: IExecutionContext = await this.createExecutionContext(model.connectionId);
       model.executionContext = executionContext;
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
index c25ff627f1..e2c133bb2e 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
@@ -145,9 +145,9 @@ export class DataModelWrapper extends DatabaseDataModel<any> {
   private getDefaultRowsCount(count?: number) {
     return count
       ? Math.max(
-          fetchingSettings.fetchMin,
-          Math.min(count, fetchingSettings.fetchMax)
-        )
+        fetchingSettings.fetchMin,
+        Math.min(count, fetchingSettings.fetchMax)
+      )
       : fetchingSettings.fetchDefault;
   }
 }
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 3fce869f88..28ce46e573 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
@@ -15,7 +15,6 @@ import { DataModelWrapper } from '../../DataModelWrapper';
 
 @injectable()
 export class TableFooterMenuService {
-
   static nodeContextType = 'NodeWithParent';
   private tableFooterMenuToken = 'tableFooterMenu';
 
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
index 69162fee8b..b31d456e06 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
@@ -310,7 +310,6 @@ export class TableViewerModel {
         isFullyLoaded: response.isFullyLoaded,
       };
       return data;
-
     } catch (e) {
       this.showError(e);
       throw e;
@@ -360,7 +359,6 @@ export class TableViewerModel {
       this.tableEditor.applyChanges(data.rows);
       this.clearErrors();
       this.updateInfo(data.statusMessage, data.duration);
-
     } finally {
       this._isLoaderVisible = false;
     }
@@ -385,9 +383,9 @@ export class TableViewerModel {
   private getDefaultRowsCount(count?: number) {
     return count
       ? Math.max(
-          fetchingSettings.fetchMin,
-          Math.min(count, fetchingSettings.fetchMax)
-        )
+        fetchingSettings.fetchMin,
+        Math.min(count, fetchingSettings.fetchMax)
+      )
       : fetchingSettings.fetchDefault;
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
index ee466890c4..7800fb2bf7 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerStorageService.ts
@@ -38,7 +38,6 @@ export class TableViewerStorageService {
     options: ITableViewerModelOptions,
     source: IDatabaseDataSource<any, any>
   ): DataModelWrapper {
-
     return this.add(new DataModelWrapper(
       this.commonDialogService,
       options,
@@ -47,7 +46,7 @@ export class TableViewerStorageService {
   }
 
   add<TOptions, TResult extends IDatabaseDataResult>(
-    model: IDatabaseDataModel<TOptions, TResult>,
+    model: IDatabaseDataModel<TOptions, TResult>
   ): IDatabaseDataModel<TOptions, TResult> {
     this.tableModelMap.set(model.id, model);
     return this.tableModelMap.get(model.id)!;
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewerController.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewerController.ts
index 6b4e8b16c4..115512d1a3 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewerController.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewer/DdlViewerController.ts
@@ -18,7 +18,6 @@ import { DdlViewerService } from '../DdlViewerService';
 
 @injectable()
 export class DdlViewerController implements IInitializableController, IDestructibleController {
-
   @observable isLoading = true;
   @observable metadata = '';
   @observable dialect?: SqlDialectInfo;
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
index e1967ce5de..8da805e2b6 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerBootstrap.ts
@@ -13,7 +13,6 @@ import { DdlViewerTabService } from './DdlViewerTabService';
 
 @injectable()
 export class DdlViewerBootstrap {
-
   constructor(private objectFoldersService: ObjectFoldersService,
     private ddlViewerTabService: DdlViewerTabService) {
   }
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerService.ts
index b680870afd..9734ff5ec4 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerService.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerService.ts
@@ -40,5 +40,4 @@ export class DdlViewerService {
     const response = await this.graphQLService.sdk.metadataGetNodeDDL({ nodeId });
     return response.metadataGetNodeDDL || '';
   }
-
 }
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
index d7cb96b5dd..80c585f609 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
@@ -22,7 +22,6 @@ const ddlViewerTabId = 'ddl-viewer';
 
 @injectable()
 export class DdlViewerTabService {
-
   constructor(
     private navNodeManagerService: NavNodeManagerService,
     private objectViewerTabService: ObjectViewerTabService,
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersController.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersController.ts
index ec945d9e30..0a96a10461 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersController.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersController.ts
@@ -17,7 +17,6 @@ import { ObjectFoldersTabContainer } from './ObjectFoldersTabsContainer/ObjectFo
 
 @injectable()
 export class ObjectFoldersController implements IInitializableController, IDestructibleController {
-
   private tabContainer!: ObjectFoldersTabContainer;
   private navigationTab!: ITab<IObjectViewerTabState>;
   private disposer!: ReturnType<typeof autorun>;
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersService.ts
index a35f6ca693..030646320c 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersService.ts
@@ -23,7 +23,6 @@ export interface ITabBuilder {
 
 @injectable()
 export class ObjectFoldersService {
-
   private tabBuilders: ITabBuilder[] = [];
 
   // todo temporary solution while only ObjectFolders supports entities
@@ -56,7 +55,7 @@ export class ObjectFoldersService {
       .forEach(tabEntity => tabContainer.addTabEntity(tabEntity));
 
     const tabs = this.getTabs(nodeId);
-    tabs.forEach((tab) => {
+    tabs.forEach(tab => {
       const tabEntity = new TabEntity(tab);
       tabContainer.addTabEntity(tabEntity);
     });
@@ -73,7 +72,7 @@ export class ObjectFoldersService {
    */
   getTabs(nodeId: string): ITab[] {
     const tabList: ITab[] = [];
-    this.tabBuilders.forEach((builder) => {
+    this.tabBuilders.forEach(builder => {
       const tab = builder.build(nodeId);
       if (tab) {
         const tabs = Array.isArray(tab) ? tab : [tab];
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFolderTabModel.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFolderTabModel.ts
index 286a013418..80443b8610 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFolderTabModel.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFolderTabModel.ts
@@ -31,5 +31,4 @@ export class ObjectFolderTabModel implements ITab {
     this.tabId = node.id;
     this.panel = () => objectPropertyTablePanel(node.parentId, node.id);
   }
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFoldersTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFoldersTabService.ts
index c719c9104f..10882cc188 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFoldersTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTab/ObjectFoldersTabService.ts
@@ -14,7 +14,6 @@ import { ObjectFolderTabModel } from './ObjectFolderTabModel';
 
 @injectable()
 export class ObjectFoldersTabService {
-
   constructor(private navNodeManagerService: NavNodeManagerService) {
   }
 
@@ -25,12 +24,12 @@ export class ObjectFoldersTabService {
   private tabBuilder(nodeId: string): ITab[] {
     const children = this.navNodeManagerService.getTree(nodeId) || [];
 
-    const folderTabs = children.filter((nodeId) => {
+    const folderTabs = children.filter(nodeId => {
       const node = this.navNodeManagerService.getNode(nodeId);
       return node ? node.folder : false;
     });
 
-    const tabList: ITab[] = folderTabs.map((nodeId) => {
+    const tabList: ITab[] = folderTabs.map(nodeId => {
       const node = this.navNodeManagerService.getNode(nodeId);
       if (!node) {
         throw Error(`node not found: ${nodeId}`);
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTabsContainer/ObjectFoldersTabContainer.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTabsContainer/ObjectFoldersTabContainer.ts
index 5c7d35bfe2..2c98fcc729 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTabsContainer/ObjectFoldersTabContainer.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFoldersTabsContainer/ObjectFoldersTabContainer.ts
@@ -11,11 +11,9 @@ import { TabContainerEntity } from '@cloudbeaver/core-app';
 import { NodePropertiesMixin } from './NodePropertiesMixin';
 
 export class ObjectFoldersTabContainer extends TabContainerEntity {
-
   constructor(nodeId: string) {
     super([], nodeId);
     const nodePropertiesMixin = new NodePropertiesMixin(nodeId);
     this.addMixin(NodePropertiesMixin, nodePropertiesMixin);
   }
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabModel.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabModel.ts
index 003e2db613..a5efc0c320 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabModel.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabModel.ts
@@ -20,5 +20,4 @@ export class ObjectInfoTabModel implements ITab {
   panel = ObjectInfoTab;
 
   onActivate = () => {};
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabService.ts
index 7044246cd3..2051a6dfef 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectInfoTabService.ts
@@ -13,9 +13,8 @@ import { ObjectInfoTabModel } from './ObjectInfoTabModel';
 
 @injectable()
 export class ObjectInfoTabService {
-
   constructor(
-    private navNodeManagerService: NavNodeManagerService,
+    private navNodeManagerService: NavNodeManagerService
   ) {}
 
   createTabEntity(navNodeId: string): TabEntity | null {
@@ -28,5 +27,4 @@ export class ObjectInfoTabService {
 
     return new TabEntity(ObjectInfoTabModel);
   }
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectProperty.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectProperty.tsx
index f6558037e4..4711c27b57 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectProperty.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectInfoTab/ObjectProperty.tsx
@@ -12,7 +12,7 @@ import styled, { css, use } from 'reshadow';
 import {
   ObjectPropertyCheckbox,
   ObjectPropertyInput,
-  ObjectPropertyProps,
+  ObjectPropertyProps
 } from '../formControls';
 import { filterProperty, matchType } from '../helpers';
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
index 53f1d86834..306d505d87 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx
@@ -17,7 +17,6 @@ import { ObjectPageTabProps } from '../ObjectPage/ObjectPage';
 export const ObjectPropertiesPageTab = observer(function ObjectPropertiesPageTab({
   page, onSelect, style,
 }: ObjectPageTabProps) {
-
   return styled(useStyles(style))(
     <Tab tabId={page.key} style={style} onOpen={onSelect}>
       <TabIcon icon='/icons/properties.svg' viewBox="0 0 16 16" />
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectChildrenPropertyTable.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectChildrenPropertyTable.tsx
index e3d7407e9f..e02e5667b7 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectChildrenPropertyTable.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectChildrenPropertyTable.tsx
@@ -21,7 +21,6 @@ interface ObjectChildrenPropertyTableProps {
 export const ObjectChildrenPropertyTable = observer(function ObjectPropertyTable({
   nodeIds,
 }: ObjectChildrenPropertyTableProps) {
-
   const firstChild = nodeIds[0] || '';
   const properties = useDatabaseObjectInfo(firstChild).dbObject?.properties;
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabMixin.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabMixin.tsx
index 2236d5468b..684069349e 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabMixin.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabMixin.tsx
@@ -15,7 +15,6 @@ import { VirtualFolderTabData } from './VirtualFolderTabData';
 
 @injectable()
 export class VirtualFolderTabMixin {
-
   @observable isActivated = false;
 
   constructor(
@@ -43,7 +42,5 @@ export class VirtualFolderTabMixin {
     } finally {
       this.isActivated = true;
     }
-
   }
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabService.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabService.tsx
index 76962bf44a..29434444f2 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabService.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/VirtualFolderTab/VirtualFolderTabService.tsx
@@ -15,7 +15,6 @@ import { VirtualFolderTabModel } from './VirtualFolderTabModel';
 
 @injectable()
 export class VirtualFolderTabService {
-
   constructor(private navNodeManagerService: NavNodeManagerService) { }
 
   createTabEntities(nodeId: string): TabEntity[] {
@@ -62,5 +61,4 @@ export class VirtualFolderTabService {
     ];
     return new TabEntity(VirtualFolderTabModel, mixins);
   }
-
 }
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
index 1247fdbe4b..260212ac66 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerBootstrap.ts
@@ -13,7 +13,6 @@ import { ObjectViewerTabService } from './ObjectViewerTabService';
 
 @injectable()
 export class ObjectViewerBootstrap {
-
   constructor(
     private objectViewerTabService: ObjectViewerTabService,
     private objectPropertiesPageService: ObjectPropertiesPageService
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
index 1d5389dedf..e888a2d804 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
@@ -34,7 +34,7 @@ const styles = composes(
     tab-outer:only-child {
       display: none;
     }
-  `,
+  `
 );
 const stylesArray = [styles];
 
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
index 4303d2b38c..92dae72d27 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
@@ -17,7 +17,7 @@ import {
   objectCatalogProvider,
   objectSchemaProvider,
   NavNodeManagerService,
-  DBObjectService,
+  DBObjectService
 } from '@cloudbeaver/core-app';
 import { connectionProvider, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
@@ -45,7 +45,6 @@ export class ObjectViewerTabService {
     private notificationService: NotificationService,
     private navigationTabsService: NavigationTabsService
   ) {
-
     this.tabHandler = this.navigationTabsService
       .registerTabHandler<IObjectViewerTabState>({
       key: objectViewerTabHandlerKey,
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index b7d1b6f825..6ff5ca9b25 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -100,7 +100,7 @@ export class QueryDataSource extends DatabaseDataSource<IDataContainerOptions, I
         constraints: this.options.constraints,
         where: this.options.whereFilter || undefined,
       },
-      this.dataFormat,
+      this.dataFormat
     );
 
     this.sqlProcess = this.metadata.resultDataProcess;
diff --git a/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts b/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
index 009dbad8c7..378d453006 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlDialectInfoService.ts
@@ -14,7 +14,6 @@ import { GraphQLService, SqlDialectInfo } from '@cloudbeaver/core-sdk';
 
 @injectable()
 export class SqlDialectInfoService {
-
   @observable private dialectInfo = new Map<string, SqlDialectInfo>();
 
   constructor(
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx
index af62803884..e686d9d9b4 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx
@@ -24,7 +24,6 @@ const COMMON_EDITOR_CONFIGURATION: EditorConfiguration = {
 
 @injectable()
 export class CodeEditorController {
-
   private dialect?: SqlDialectInfo;
   private editor?: Editor;
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx
index a02b0cc4fb..d495d30858 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx
@@ -7,7 +7,7 @@
  */
 
 import CodeMirror, {
-  EditorConfiguration, Editor, EditorChange, Position, AsyncHintFunction,
+  EditorConfiguration, Editor, EditorChange, Position, AsyncHintFunction
 } from 'codemirror';
 import { computed } from 'mobx';
 import { IControlledCodeMirror } from 'react-codemirror2';
@@ -26,7 +26,6 @@ const showHint = CodeMirror.showHint;
 
 @injectable()
 export class SqlEditorController implements IInitializableController {
-
   @computed get dialect(): SqlDialectInfo | undefined {
     return this.sqlDialectInfoService.getDialectInfo(this.tab.handlerState.connectionId);
   }
@@ -87,7 +86,7 @@ export class SqlEditorController implements IInitializableController {
   constructor(
     private sqlResultTabsService: SqlResultTabsService,
     private sqlDialectInfoService: SqlDialectInfoService,
-    private sqlEditorService: SqlEditorService,
+    private sqlEditorService: SqlEditorService
   ) { }
 
   init(tab: ITab<ISqlEditorTabState>) {
@@ -137,7 +136,7 @@ export class SqlEditorController implements IInitializableController {
           this.tab.handlerState.query,
           cursorPosition
         )
-        .then((proposals) => {
+        .then(proposals => {
           if (!proposals) {
             return;
           }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorService.ts
index 1310b9a89f..36cd044cb3 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorService.ts
@@ -11,7 +11,6 @@ import { GraphQLService, QuerySqlCompletionProposalsQuery } from '@cloudbeaver/c
 
 @injectable()
 export class SqlEditorService {
-
   constructor(private gql: GraphQLService) {
   }
 
@@ -21,7 +20,6 @@ export class SqlEditorService {
     query: string,
     cursor: number
   ): Promise<QuerySqlCompletionProposalsQuery['sqlCompletionProposals'] | null> {
-
     const result = await this.gql.sdk.querySqlCompletionProposals({
       connectionId,
       contextId,
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/theme/styles.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/theme/styles.ts
index a6172cced8..0bfbd2e370 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/theme/styles.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/theme/styles.ts
@@ -8,7 +8,7 @@
 
 import { ThemeSelector } from '@cloudbeaver/core-theming';
 
-export const SqlEditorStyles: ThemeSelector = async (theme) => {
+export const SqlEditorStyles: ThemeSelector = async theme => {
   let styles: any;
 
   switch (theme) {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorBootstrap.ts
index 7cb038824b..a6a499edfa 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorBootstrap.ts
@@ -12,7 +12,7 @@ import {
   EObjectFeature,
   NodeManagerUtils,
   NavNode, ConnectionSchemaManagerService,
-  isObjectCatalogProvider, isObjectSchemaProvider,
+  isObjectCatalogProvider, isObjectSchemaProvider
 } from '@cloudbeaver/core-app';
 import { ConnectionsManagerService, isConnectionProvider } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
@@ -31,7 +31,7 @@ export class SqlEditorBootstrap {
     private sqlEditorTabService: SqlEditorTabService,
     private sqlEditorNavigatorService: SqlEditorNavigatorService,
     private connectionSchemaManagerService: ConnectionSchemaManagerService,
-    private activeViewService: ActiveViewService,
+    private activeViewService: ActiveViewService
   ) {}
 
   async bootstrap() {
@@ -86,7 +86,7 @@ export class SqlEditorBootstrap {
         this.sqlEditorNavigatorService.openNewEditor(
           connectionId,
           catalogId,
-          schemaId,
+          schemaId
         );
         return;
       }
@@ -95,7 +95,7 @@ export class SqlEditorBootstrap {
     this.sqlEditorNavigatorService.openNewEditor(
       this.connectionSchemaManagerService.currentConnectionId,
       this.connectionSchemaManagerService.currentObjectCatalogId,
-      this.connectionSchemaManagerService.currentObjectSchemaId,
+      this.connectionSchemaManagerService.currentObjectSchemaId
     );
   }
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
index 5fb9ad35d4..47d197da8a 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
@@ -51,7 +51,6 @@ export class SqlEditorNavigatorService {
     private connectionInfoResource: ConnectionInfoResource,
     private sqlEditorTabService: SqlEditorTabService
   ) {
-
     this.navigator = new Executor<SQLCreateAction | SQLEditorAction>()
       .addHandler(this.navigateHandler.bind(this));
     this.connectionsManagerService.onCloseConnection.subscribe(this.handleConnectionClose.bind(this));
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditorPanel.tsx
index 9f39365a4e..a6f4add0c2 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorPanel.tsx
@@ -10,7 +10,7 @@ import styled, { css } from 'reshadow';
 
 import { TabHandlerPanelProps } from '@cloudbeaver/core-app';
 import {
-  splitStyles, Split, ResizerControls, Pane, splitHorizontalStyles,
+  splitStyles, Split, ResizerControls, Pane, splitHorizontalStyles
 } from '@cloudbeaver/core-blocks';
 import { useStyles } from '@cloudbeaver/core-theming';
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorTabService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorTabService.ts
index 12c978a9ad..1dfdde784e 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorTabService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorTabService.ts
@@ -16,7 +16,7 @@ import {
   objectCatalogProvider,
   objectCatalogSetter,
   objectSchemaSetter,
-  ITabOptions,
+  ITabOptions
 } from '@cloudbeaver/core-app';
 import {
   ConnectionInfoResource,
@@ -108,7 +108,6 @@ export class SqlEditorTabService {
   }
 
   private async handleTabRestore(tab: ITab<ISqlEditorTabState>): Promise<boolean> {
-
     if (typeof tab.handlerState.query !== 'string'
         || typeof tab.handlerState.connectionId !== 'string'
         || typeof tab.handlerState.contextId !== 'string'
@@ -233,7 +232,6 @@ export class SqlEditorTabService {
     defaultCatalog?: string,
     defaultSchema?: string
   ): Promise<IExecutionContext> {
-
     const response = await this.gql.sdk.sqlContextCreate({
       connectionId,
       defaultCatalog,
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SQLQueryExecutionProcess.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SQLQueryExecutionProcess.ts
index 97a115bc83..8f22e2ec6c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SQLQueryExecutionProcess.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SQLQueryExecutionProcess.ts
@@ -11,7 +11,7 @@ import {
   AsyncTaskInfo, GraphQLService, ServerInternalError, SqlExecuteInfo, SqlDataFilter, ResultDataFormat
 } from '@cloudbeaver/core-sdk';
 import {
-  CancellablePromise, cancellableTimeout, Deferred, EDeferredState,
+  CancellablePromise, cancellableTimeout, Deferred, EDeferredState
 } from '@cloudbeaver/core-utils';
 
 import { ISqlQueryParams } from '../ISqlEditorTabState';
@@ -19,7 +19,6 @@ import { ISqlQueryParams } from '../ISqlEditorTabState';
 const DELAY_BETWEEN_TRIES = 1000;
 
 export class SQLQueryExecutionProcess extends Deferred<SqlExecuteInfo> {
-
   private taskId?: string;
   private timeout?: CancellablePromise<void>;
   private isCancelConfirmed = false; // true when server successfully executed cancelQueryAsync
@@ -109,7 +108,7 @@ export class SQLQueryExecutionProcess extends Deferred<SqlExecuteInfo> {
   private async executeQueryAsync(
     sqlQueryParams: ISqlQueryParams,
     filter: SqlDataFilter,
-    dataFormat: ResultDataFormat,
+    dataFormat: ResultDataFormat
   ): Promise<AsyncTaskInfo> {
     const { taskInfo } = await this.graphQLService.sdk.asyncSqlExecuteQuery({
       connectionId: sqlQueryParams.connectionId,
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel/SqlResultPanelController.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel/SqlResultPanelController.ts
index 6e7a75ac96..b7f02e2c7c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel/SqlResultPanelController.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultPanel/SqlResultPanelController.ts
@@ -23,7 +23,7 @@ import {
   RowDiff,
   TableViewerStorageService,
   TableViewerModel,
-  DatabaseDataAccessMode,
+  DatabaseDataAccessMode
 } from '@cloudbeaver/plugin-data-viewer';
 
 import { IResultDataTab, IQueryTabGroup } from '../../ISqlEditorTabState';
@@ -43,7 +43,6 @@ export enum EPanelState {
 @injectable()
 export class SqlResultPanelController
 implements IInitializableController, IDestructibleController {
-
   @observable state: EPanelState = EPanelState.PENDING;
   @observable executionResult = '';
   @observable errorMessage?: string;
@@ -138,7 +137,6 @@ implements IInitializableController, IDestructibleController {
         tableModel.setColumns(initialState.columns);
         tableModel.updateInfo(initialState.statusMessage, initialState.duration);
       }
-
     } catch (exception) {
       if (exception instanceof PromiseCancelledError) {
         this.state = EPanelState.MESSAGE_RESULT;
@@ -240,5 +238,4 @@ implements IInitializableController, IDestructibleController {
 
     return this.sqlResultService.sqlExecuteInfoToData(response, this.panelInit.indexInResultSet);
   }
-
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultService.ts
index 6c7ebbb26b..efb88f324d 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultService.ts
@@ -14,7 +14,6 @@ import { ISqlQueryParams } from '../ISqlEditorTabState';
 
 @injectable()
 export class SqlResultService {
-
   constructor(private graphQLService: GraphQLService) { }
 
   async saveChanges(
@@ -22,7 +21,6 @@ export class SqlResultService {
     resultId: string,
     diff: RowDiff[]
   ): Promise<SqlExecuteInfo> {
-
     const response = await this.graphQLService.sdk.updateResultsDataBatch({
       connectionId: sqlQueryParams.connectionId,
       contextId: sqlQueryParams.contextId,
@@ -50,5 +48,4 @@ export class SqlResultService {
     };
     return dataResults;
   }
-
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
index ba5a6ba9cf..9557445fbe 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
@@ -23,7 +23,7 @@ export class SqlResultTabsService {
   private tabExecutionContext: MetadataMap<string, SqlExecutionState>;
 
   constructor(
-    private sqlEditorGroupMetadataService: SqlEditorGroupMetadataService,
+    private sqlEditorGroupMetadataService: SqlEditorGroupMetadataService
   ) {
     this.tabExecutionContext = new MetadataMap(() => new SqlExecutionState());
   }
@@ -148,7 +148,6 @@ export class SqlResultTabsService {
   private getTabNameForOrder(order: number, groupOrder: number) {
     return `Result - ${groupOrder} (${order})`;
   }
-
 }
 
 function findMinimalFree(array: number[], base: number): number {
diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json
index 033f035839..a824f24af7 100644
--- a/webapp/tsconfig.json
+++ b/webapp/tsconfig.json
@@ -19,7 +19,8 @@
     "importsNotUsedAsValues": "remove",
     "jsx": "preserve",
     "target": "ES6",
-    "module": "none",
+    "module": "esnext",
+    "esModuleInterop": true,
     "moduleResolution": "node",
     "declaration": true,
     "declarationMap": true,