Merge branch 'devel' into dbeaver/pro#7844-cb-lsp-server

[CB] refactor data editor features readonly states [2] (#4213 )
* dbeaver/pro#8299 adds features to data sources * adds feature flags for data sources * adds features to mobx * pr fixes * pr fixes * fixes hasFeature --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
2026-10-16 14:50:15 +08:00 · 2026-03-19 10:14:57 +01:00 · 2026-03-18 17:10:16 +01:00 · 2026-03-18 17:08:38 +01:00 · 2026-03-18 12:37:15 +01:00 · 2026-03-17 20:06:58 +01:00
3372 changed files with 73191 additions and 48667 deletions
@@ -49,21 +49,14 @@ jobs:
          node-version: "lts/*"
          cache: "yarn"
          cache-dependency-path: |
-            cloudbeaver/common-*/yarn.lock
            cloudbeaver/webapp/yarn.lock

-      - name: restore cloudbeaver-common typescript cache
-        uses: actions/cache@v4
-        with:
-          path: "cloudbeaver/common-*/**/*/lib"
-          key: ${{ runner.os }}-common-dist-${{ hashFiles('cloudbeaver/common-*/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-common-dist-
-
      - name: restore typescript cache
        uses: actions/cache@v4
        with:
-          path: "cloudbeaver/webapp/**/packages/*/dist"
+          path: |
+            "cloudbeaver/webapp/common-*/**/*/lib"
+            "cloudbeaver/webapp/**/packages/*/dist"
          key: ${{ runner.os }}-dist-${{ hashFiles('cloudbeaver/webapp/yarn.lock') }}
          restore-keys: |
            ${{ runner.os }}-dist-
@@ -71,12 +64,6 @@ jobs:
      - if: inputs.clean-cache
        run: yarn clear

-      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-typescript
-
-      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-react
-
      - run: yarn install --immutable

      - run: yarn bundle
@@ -30,10 +30,10 @@ jobs:
          cache-dependency-path: "./cloudbeaver/webapp/yarn.lock"

      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-typescript
+      #   working-directory: ./cloudbeaver/webapp/common-typescript

      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-react
+      #   working-directory: ./cloudbeaver/webapp/common-react

      - run: |
          yarn install --immutable
@@ -15,11 +15,11 @@
    "streetsidesoftware.code-spell-checker",
    "streetsidesoftware.code-spell-checker-russian",
    "syler.sass-indented",
-    "VisualStudioExptTeam.vscodeintellicode",
+    "github.copilot-chat",
    "yzhang.markdown-all-in-one",
    "GraphQL.vscode-graphql-syntax",
    "mrmlnc.vscode-json5",
    "esbenp.prettier-vscode",
    "devnaumov.licensify"
  ]
-}
+}
@@ -48,7 +48,7 @@
        "-Declipse.pde.launch=true",
        "-XstartOnFirstThread",
        "-Dfile.encoding=UTF-8",
-        "--add-modules=ALL-SYSTEM",
+        "--add-modules=ALL-DEFAULT",
        "--add-opens=java.base/java.io=ALL-UNNAMED",
        "--add-opens=java.base/java.lang=ALL-UNNAMED",
        "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
@@ -19,6 +19,26 @@
      "group": "test",
      "args": ["test"]
    },
+    {
+      "label": "Run Tests Common Typescript",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["test"],
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-typescript"
+      }
+    },
+    {
+      "label": "Run Tests Common React",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["test"],
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-react"
+      }
+    },
    {
      "label": "Run DevServer CE",
      "group": "build",
@@ -72,10 +92,10 @@
      "label": "Run Backend CE",
      "type": "shell",
      "windows": {
-        "command": "./run-server.bat"
+        "command": "./run-cloudbeaver-server.bat"
      },
      "osx": {
-        "command": "./run-server.sh"
+        "command": "./run-cloudbeaver-server.sh"
      },
      "options": {
        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
@@ -107,6 +127,24 @@
      "options": {
        "cwd": "${workspaceFolder}/webapp/packages"
      }
+    },
+    {
+      "label": "Run Ui Kit Preview",
+      "type": "shell",
+      "command": "yarn",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-react/@dbeaver/ui-kit"
+      },
+      "args": ["docs"]
+    },
+    {
+      "label": "Run Storybook",
+      "type": "shell",
+      "command": "yarn",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/packages/storybook"
+      },
+      "args": ["storybook"]
    }
  ],
  "inputs": [
@@ -4,6 +4,7 @@
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+!.yarn/sdks/**

 # Swap the comments on the following lines if you wish to use zero-installs
 # In that case, don't forget to run `yarn config set enableGlobalCache false`!
@@ -1,6 +1,6 @@
 {
  "name": "typescript",
-  "version": "5.7.3-sdk",
+  "version": "5.8.3-sdk",
  "main": "./lib/typescript.js",
  "type": "commonjs",
  "bin": {
@@ -2,6 +2,6 @@
 <?pde version="3.8"?>
 <target name="org.jkiss.cloudbeaver.tp">
 	<locations>
-		<location path="../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
+		<location path="../../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
 	</locations>
-</target>
+</target>
@@ -1,7 +1,7 @@
 {
  "name": "vscode-java-configs",
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.9.2",
  "devDependencies": {
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.3"
  }
 }
@@ -0,0 +1,34 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"typescript@npm:^5.8.3":
+  version: 5.8.3
+  resolution: "typescript@npm:5.8.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^5.8.3#optional!builtin<compat/typescript>":
+  version: 5.8.3
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
+  languageName: node
+  linkType: hard
+
+"vscode-java-configs@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "vscode-java-configs@workspace:."
+  dependencies:
+    typescript: "npm:^5.8.3"
+  languageName: unknown
+  linkType: soft
@@ -1,4 +1,4 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" align="right" width="250"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" alt="CloudBeaver logo" align="right" width="250"/>

 # CloudBeaver Community

@@ -7,7 +7,7 @@ CloudBeaver is a web server that provides a rich web interface. The server itsel
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
 See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 

-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/>
+<a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
@@ -25,55 +25,55 @@ You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io

 ## Changelog

-### 25.0.2 2025-04-07
- Data Editor: improved table rendering to scale column width depending on the content.
- Improved Navigation tree performance: lost connection does not lead to the application freezing anymore.
- Different bug fixes and enhancements have been made.
+### 26.0.0 2026-03-02

-### 25.0.1 2025-03-24
- Improved performance of the export/import functionality by optimizing disk memory consumption;
- Enhanced initial configuration on stage security: if the initial setup time exceeds 1 hour, the server must be restarted.
+### Changes since 25.3.0:

-### 25.0 2025-03-03
-### Changes since 24.3.0:
- General:
-  -    Added transaction log viewing for connections with manual commit mode. This allows users to see all modifying statements before committing;
-  -    Added an ability for all editors to reconnect if a connection has been lost;
-  -    Tooltips for metadata objects and SQL Editor tabs now include additional details about catalogs, schemas, and connections;
-  -    Added Ctrl + Shift + S (Cmd + Shift + S on Mac) shortcut for the "Save As Script" action;
-  -    Updated list of available shortcuts for macOS.
- Administration:
-  -    Added system information data to the Product Information tab in the Administration panel. This provides administrators with quick access to essential system details, such as the server deployment type (e.g., Docker, Kubernetes), install path, Java version, and Java parameters;
-  -    The global access server URL has been added to the console log, making it easier to locate server installation information directly within the logs;
-  -    New environment variables were introduced for theme styling, SQL editor, and log viewer settings. You can use them for quick setup during the initial Docker configuration stage.
- LDAP authorization:
-  -    Added the ability to match users from LDAP configuration with CloudBeaver users;
-  -    Added an option to specify a user login as an attribute parameter for LDAP providers;
-  -    CloudBeaver now uses EntityID or objectGUID to create new LDAP users in CloudBeaver to ensure uniqueness. This change enhances user identification and prevents conflicts while maintaining backward compatibility for existing users.
- Deployment:
-  -    CloudBeaver now uses JDK 21 as its base Java image. If you use standard deployment and upgrade scripts, the new Java version will be applied automatically after the product update;
-  -    Changed the permission of the Docker volumes directory to enhance security and prevent any insecure actions by the "root" user. All new deployments will use the "dbeaver" user by default. For existing deployments running as the "root" user, this update will automatically adjust file permissions to ensure they are compatible with the new security model. There will be no manual intervention, and the service will continue to run as expected with the updated permissions.
- Connections:
-  -    Enabled the possibility of switching a database connection to read-only mode. This mode can be activated in the connection dialog. Administrators can set this mode for any connection, while regular users can set it for their private connections only;
-  -    For Oracle and SQL Server connections, advanced database settings can now be used in the URL connection mode.
- Data Editor:
-  -    Auto-suggestions for column names in the Data Editor filter field were introduced to avoid typing mistakes;
-  -    Introduced the ability to insert data in tables without unique keys: you can import data from CSV files or insert entire rows directly via UI;
-  -    The collapse of the grouping panel doesn't lead to the complete panel cleaning anymore.
- Data transfer:
-  -    Added the ability to use default spreadsheet names (e.g. Sheet0, Sheet1) for exporting to XLSX;
-  -    An option to replace line break characters on any custom value was added when exporting to CSV.
- Navigator tree: 
-  -    An option to show metadata object comments was added. You can enable it in the database navigator settings panel;
-  -    Introduced the ability to create connections not only on the initial level but in folders and sub-folders directly;
-  -    Fixed the display of objects with long names (more than 32 characters) - now, such names will be displayed entirely and not in a cropped format.
- Drivers:
-  -    The MariaDB driver has been updated to version 3.5.1;
-  -    The SQLite driver has been updated to version 3.48.0.0.
-
-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
+  - Security:
+    - Enforced complete logout and screen data clearance upon session expiration;
+    - Fixed the high vulnerability (CVE-2026-25639) in the axios library. The library was updated to version 1.13.5.
+  - Administration:
+    - Added support for mapping users to CloudBeaver teams based on LDAP memberOf group membership;
+    - Change the User list settings in the Administration part to show both active and inactive users by default.
+  - SQL Editor:
+    - Added support for parameters and variables in queries. This feature allows queries to be reused by changing parameters at execution time. Enabled by default and configurable in personal preferences;
+    - Added SQL preview to the Bind parameters/variables dialog to review queries with changed values on the fly;
+    - Enabled Tab key for autocompletion in the SQL Editor alongside the Enter key;
+    - Added a new setting in the SQL Editor to highlight spaces, tabs, and other whitespace characters to help users read, debug, and maintain their scripts. It is turned off by default and can be configured in personal preferences;
+    - Dangerous query confirmation is now shown for all DROP statements, not just for tables.
+  - Data Editor:
+    - Added ability to automatically generate INSERT, SELECT, DELETE, and UPDATE statements for the selected values;
+    - Added undo and redo functionality for cell edits, row operations, and other data modifications. Retains the last 50 actions across the Data Editor, result sets, and related panels;
+    - Added "Use local formatting" setting. Users can choose how to display numbers and dates: using the OS locale, a custom locale, or keeping values unformatted. This formatting applies only to displayed values. Data in the database remains unchanged;
+    - Added column pinning to keep key columns (e.g., IDs, names) visible while horizontal scrolling through wide tables;
+    - Added status indicator icon in the top-left corner with tooltips explaining table editability. Indicates presence of primary keys, read-only connection settings, or read-only columns;
+    - Added shortcut Ctrl/Cmd + . to cancel operations in Data Editor;
+    - Fixed application freeze in canceling fetch size requests for large tables.
+  - Navigator tree:
+    - Added the ability to duplicate connection configuration in the project navigation tree. The "Clone connection" feature is available in the context menu;
+    - Added the ability for users to configure the Simple or Advanced view in the Navigation tree for all connections or for each connection separately;
+    - Added the ability to show table objects, such as columns or keys, in the Navigation tree. The setting is disabled by default and can be turned on in the Navigator settings panel;
+    - Added the ability to rename connections via context menu in the Navigation Tree;
+    - Added Connection Info tab to display basic information about the current connection for all users.
+  - General:
+    - Added support for long polling as a fallback when WebSockets are unavailable or blocked. Ensures reliable communication for metadata updates and SQL execution;
+    - Extended browser support to versions up to three years old;
+    - Redesigned the connection configuration page. Reorganized form fields and sections to provide more input space and reduce visual clutter;
+    - Expanded pointer target areas for icons in the Navigator, editors, and tabs according to the accessibility standards;
+    - Fixed a keyboard navigation issue for panels to keep the focus inside;
+    - Renamed "Database Native" authentication type to "Username/password" in the connection dialog;
+    - Fixed issue where the missing pg_dump utility caused errors during initialization or deployment updates when PostgreSQL was selected as the inner database.
+  - Databases:
+  - ClickHouse:
+    - Updated driver to version 0.9.5
+    - Added spatial data support
+    - Fixed an issue with displaying arrays of UUID, IPv4/IPv6, and Map types
+    - Fixed JSON data type reading
+    - Resolved an issue with CTE expressions
+  - DuckDB:
+    - Updated driver to version 1.4.4.0;
+    - Added support for the dollar-quoted string syntax for the SQL Editor
+  - Oracle: Added a new "Set Username to OS_USER" option in the Misc section of Oracle connection settings. Automatically uses the current database username as the operating system user identifier in session metadata when enabled;
+  - PostgreSQL: Added DDL display support for PostgreSQL policies.

 [We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
-The most significant contribution to our code for the major release 24.3.0 was made by:
-1. [cashlifei](https://github.com/cashlifei)
@@ -1,9 +0,0 @@
-{
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true,
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
-}
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/bin/prettier.cjs
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
@@ -1,7 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.5.1-sdk",
-  "main": "./index.cjs",
-  "type": "commonjs",
-  "bin": "./bin/prettier.cjs"
-}
@@ -1,10 +0,0 @@
-{
-  "name": "typescript",
-  "version": "5.7.3-sdk",
-  "main": "./lib/typescript.js",
-  "type": "commonjs",
-  "bin": {
-    "tsc": "./bin/tsc",
-    "tsserver": "./bin/tsserver"
-  }
-}
@@ -1 +0,0 @@
-!lib
@@ -1,490 +0,0 @@
-import { Context } from 'react';
-import { JSX } from 'react/jsx-runtime';
-import type { Key } from 'react';
-import type { ReactElement } from 'react';
-import { ReactNode } from 'react';
-
-declare interface BaseRenderRowProps<TRow, TSummaryRow = unknown> extends Omit_2<React.ComponentProps<'div'>, 'style' | 'children'>, Pick<DataGridProps<TRow, TSummaryRow>, 'onCellClick' | 'onCellDoubleClick' | 'onCellContextMenu'> {
-    viewportColumns: readonly CalculatedColumn<TRow, TSummaryRow>[];
-    rowIdx: number;
-    selectedCellIdx: number | undefined;
-    isRowSelectionDisabled: boolean;
-    isRowSelected: boolean;
-    gridRowStart: number;
-    selectCell: (position: Position, enableEditor?: Maybe<boolean>) => void;
-}
-
-export declare interface CalculatedColumn<TRow, TSummaryRow = unknown> extends Column<TRow, TSummaryRow> {
-    readonly parent: CalculatedColumnParent<TRow, TSummaryRow> | undefined;
-    readonly idx: number;
-    readonly level: number;
-    readonly width: number | string;
-    readonly minWidth: number;
-    readonly maxWidth: number | undefined;
-    readonly resizable: boolean;
-    readonly sortable: boolean;
-    readonly draggable: boolean;
-    readonly frozen: boolean;
-    readonly renderCell: (props: RenderCellProps<TRow, TSummaryRow>) => ReactNode;
-    readonly renderHeaderCell: (props: RenderHeaderCellProps<TRow, TSummaryRow>) => ReactNode;
-}
-
-export declare type CalculatedColumnOrColumnGroup<R, SR> = CalculatedColumnParent<R, SR> | CalculatedColumn<R, SR>;
-
-export declare interface CalculatedColumnParent<R, SR> {
-    readonly name: string | ReactElement;
-    readonly parent: CalculatedColumnParent<R, SR> | undefined;
-    readonly idx: number;
-    readonly colSpan: number;
-    readonly level: number;
-    readonly headerCellClass?: Maybe<string>;
-}
-
-export declare const Cell: <R, SR>(props: CellRendererProps<R, SR>) => React.JSX.Element;
-
-export declare interface CellClickArgs<TRow, TSummaryRow = unknown> {
-    rowIdx: number;
-    row: TRow;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    selectCell: (enableEditor?: boolean) => void;
-}
-
-declare type CellEvent<E extends React.SyntheticEvent<HTMLDivElement>> = E & {
-    preventGridDefault: () => void;
-    isGridDefaultPrevented: () => boolean;
-};
-
-export declare type CellKeyboardEvent = CellEvent<React.KeyboardEvent<HTMLDivElement>>;
-
-export declare type CellKeyDownArgs<TRow, TSummaryRow = unknown> = SelectCellKeyDownArgs<TRow, TSummaryRow> | EditCellKeyDownArgs<TRow, TSummaryRow>;
-
-export declare type CellMouseEvent = CellEvent<React.MouseEvent<HTMLDivElement>>;
-
-export declare interface CellRendererProps<TRow, TSummaryRow> extends Pick<RenderRowProps<TRow, TSummaryRow>, 'row' | 'rowIdx' | 'selectCell'>, Omit_2<React.ComponentProps<'div'>, 'children' | 'onClick' | 'onDoubleClick' | 'onContextMenu'> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    colSpan: number | undefined;
-    isCopied: boolean;
-    isDraggedOver: boolean;
-    isCellSelected: boolean;
-    onClick: RenderRowProps<TRow, TSummaryRow>['onCellClick'];
-    onDoubleClick: RenderRowProps<TRow, TSummaryRow>['onCellDoubleClick'];
-    onContextMenu: RenderRowProps<TRow, TSummaryRow>['onCellContextMenu'];
-    onRowChange: (column: CalculatedColumn<TRow, TSummaryRow>, newRow: TRow) => void;
-}
-
-export declare interface CellSelectArgs<TRow, TSummaryRow = unknown> {
-    rowIdx: number;
-    row: TRow | undefined;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-}
-
-export declare type ColSpanArgs<TRow, TSummaryRow> = {
-    type: 'HEADER';
-} | {
-    type: 'ROW';
-    row: TRow;
-} | {
-    type: 'SUMMARY';
-    row: TSummaryRow;
-};
-
-export declare interface Column<TRow, TSummaryRow = unknown> {
-    /** The name of the column. By default it will be displayed in the header cell */
-    readonly name: string | ReactElement;
-    /** A unique key to distinguish each column */
-    readonly key: string;
-    /**
-     * Column width. If not specified, it will be determined automatically based on grid width and specified widths of other columns
-     * @default 'auto'
-     */
-    readonly width?: Maybe<number | string>;
-    /**
-     * Minimum column width in px
-     * @default '50px'
-     */
-    readonly minWidth?: Maybe<number>;
-    /** Maximum column width in px. */
-    readonly maxWidth?: Maybe<number>;
-    readonly cellClass?: Maybe<string | ((row: TRow) => Maybe<string>)>;
-    readonly headerCellClass?: Maybe<string>;
-    readonly summaryCellClass?: Maybe<string | ((row: TSummaryRow) => Maybe<string>)>;
-    /** Render function used to render the content of cells */
-    readonly renderCell?: Maybe<(props: RenderCellProps<TRow, TSummaryRow>) => ReactNode>;
-    /** Render function used to render the content of the column's header cell */
-    readonly renderHeaderCell?: Maybe<(props: RenderHeaderCellProps<TRow, TSummaryRow>) => ReactNode>;
-    /** Render function used to render the content of summary cells */
-    readonly renderSummaryCell?: Maybe<(props: RenderSummaryCellProps<TSummaryRow, TRow>) => ReactNode>;
-    /** Render function used to render the content of group cells */
-    readonly renderGroupCell?: Maybe<(props: RenderGroupCellProps<TRow, TSummaryRow>) => ReactNode>;
-    /** Render function used to render the content of edit cells. When set, the column is automatically set to be editable */
-    readonly renderEditCell?: Maybe<(props: RenderEditCellProps<TRow, TSummaryRow>) => ReactNode>;
-    /** Enables cell editing. If set and no editor property specified, then a textinput will be used as the cell editor */
-    readonly editable?: Maybe<boolean | ((row: TRow) => boolean)>;
-    readonly colSpan?: Maybe<(args: ColSpanArgs<TRow, TSummaryRow>) => Maybe<number>>;
-    /** Determines whether column is frozen or not */
-    readonly frozen?: Maybe<boolean>;
-    /** Enable resizing of a column */
-    readonly resizable?: Maybe<boolean>;
-    /** Enable sorting of a column */
-    readonly sortable?: Maybe<boolean>;
-    /** Enable dragging of a column */
-    readonly draggable?: Maybe<boolean>;
-    /** Sets the column sort order to be descending instead of ascending the first time the column is sorted */
-    readonly sortDescendingFirst?: Maybe<boolean>;
-    readonly editorOptions?: Maybe<{
-        /**
-         * Render the cell content in addition to the edit cell.
-         * Enable this option when the editor is rendered outside the grid, like a modal for example.
-         * By default, the cell content is not rendered when the edit cell is open.
-         * @default false
-         */
-        readonly displayCellContent?: Maybe<boolean>;
-        /** @default true */
-        readonly commitOnOutsideClick?: Maybe<boolean>;
-    }>;
-}
-
-export declare interface ColumnGroup<R, SR = unknown> {
-    /** The name of the column group, it will be displayed in the header cell */
-    readonly name: string | ReactElement;
-    readonly headerCellClass?: Maybe<string>;
-    readonly children: readonly ColumnOrColumnGroup<R, SR>[];
-}
-
-export declare type ColumnOrColumnGroup<R, SR = unknown> = Column<R, SR> | ColumnGroup<R, SR>;
-
-export declare interface CopyEvent<TRow> {
-    sourceColumnKey: string;
-    sourceRow: TRow;
-}
-
-/**
- * Main API Component to render a data grid of rows and columns
- *
- * @example
- *
- * <DataGrid columns={columns} rows={rows} />
- */
-export declare function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridProps<R, SR, K>): JSX.Element;
-
-export declare const DataGridDefaultRenderersContext: Context<Maybe<Renderers<any, any>>>;
-
-export declare interface DataGridHandle {
-    element: HTMLDivElement | null;
-    scrollToCell: (position: PartialPosition) => void;
-    selectCell: (position: Position, enableEditor?: Maybe<boolean>) => void;
-}
-
-export declare interface DataGridProps<R, SR = unknown, K extends Key = Key> extends SharedDivProps {
-    ref?: Maybe<React.Ref<DataGridHandle>>;
-    /**
-     * Grid and data Props
-     */
-    /** An array of objects representing each column on the grid */
-    columns: readonly ColumnOrColumnGroup<NoInfer<R>, NoInfer<SR>>[];
-    /** A function called for each rendered row that should return a plain key/value pair object */
-    rows: readonly R[];
-    /**
-     * Rows to be pinned at the top of the rows view for summary, the vertical scroll bar will not scroll these rows.
-     */
-    topSummaryRows?: Maybe<readonly SR[]>;
-    /**
-     * Rows to be pinned at the bottom of the rows view for summary, the vertical scroll bar will not scroll these rows.
-     */
-    bottomSummaryRows?: Maybe<readonly SR[]>;
-    /** The getter should return a unique key for each row */
-    rowKeyGetter?: Maybe<(row: NoInfer<R>) => K>;
-    onRowsChange?: Maybe<(rows: NoInfer<R>[], data: RowsChangeData<NoInfer<R>, NoInfer<SR>>) => void>;
-    /**
-     * Dimensions props
-     */
-    /**
-     * The height of each row in pixels
-     * @default 35
-     */
-    rowHeight?: Maybe<number | ((row: NoInfer<R>) => number)>;
-    /**
-     * The height of the header row in pixels
-     * @default 35
-     */
-    headerRowHeight?: Maybe<number>;
-    /**
-     * The height of each summary row in pixels
-     * @default 35
-     */
-    summaryRowHeight?: Maybe<number>;
-    /**
-     * Feature props
-     */
-    /** Set of selected row keys */
-    selectedRows?: Maybe<ReadonlySet<K>>;
-    /** Determines if row selection is disabled, per row */
-    isRowSelectionDisabled?: Maybe<(row: NoInfer<R>) => boolean>;
-    /** Function called whenever row selection is changed */
-    onSelectedRowsChange?: Maybe<(selectedRows: Set<NoInfer<K>>) => void>;
-    /** Used for multi column sorting */
-    sortColumns?: Maybe<readonly SortColumn[]>;
-    onSortColumnsChange?: Maybe<(sortColumns: SortColumn[]) => void>;
-    defaultColumnOptions?: Maybe<DefaultColumnOptions<NoInfer<R>, NoInfer<SR>>>;
-    onFill?: Maybe<(event: FillEvent<NoInfer<R>>) => NoInfer<R>>;
-    onCopy?: Maybe<(event: CopyEvent<NoInfer<R>>) => void>;
-    onPaste?: Maybe<(event: PasteEvent<NoInfer<R>>) => NoInfer<R>>;
-    /**
-     * Event props
-     */
-    /** Function called whenever a cell is clicked */
-    onCellClick?: Maybe<(args: CellClickArgs<NoInfer<R>, NoInfer<SR>>, event: CellMouseEvent) => void>;
-    /** Function called whenever a cell is double clicked */
-    onCellDoubleClick?: Maybe<(args: CellClickArgs<NoInfer<R>, NoInfer<SR>>, event: CellMouseEvent) => void>;
-    /** Function called whenever a cell is right clicked */
-    onCellContextMenu?: Maybe<(args: CellClickArgs<NoInfer<R>, NoInfer<SR>>, event: CellMouseEvent) => void>;
-    onCellKeyDown?: Maybe<(args: CellKeyDownArgs<NoInfer<R>, NoInfer<SR>>, event: CellKeyboardEvent) => void>;
-    /** Function called whenever cell selection is changed */
-    onSelectedCellChange?: Maybe<(args: CellSelectArgs<NoInfer<R>, NoInfer<SR>>) => void>;
-    /** Called when the grid is scrolled */
-    onScroll?: Maybe<(event: React.UIEvent<HTMLDivElement>) => void>;
-    /** Called when a column is resized */
-    onColumnResize?: Maybe<(column: CalculatedColumn<R, SR>, width: number) => void>;
-    /** Called when a column is reordered */
-    onColumnsReorder?: Maybe<(sourceColumnKey: string, targetColumnKey: string) => void>;
-    /**
-     * Toggles and modes
-     */
-    /** @default true */
-    enableVirtualization?: Maybe<boolean>;
-    /**
-     * The minimum number of rows to render when virtualization is enabled
-     */
-    minimumRowsToRender?: Maybe<number>;
-    /**
-     * Miscellaneous
-     */
-    renderers?: Maybe<Renderers<NoInfer<R>, NoInfer<SR>>>;
-    rowClass?: Maybe<(row: NoInfer<R>, rowIdx: number) => Maybe<string>>;
-    /** @default 'ltr' */
-    direction?: Maybe<Direction>;
-    'data-testid'?: Maybe<string>;
-    'data-cy'?: Maybe<string>;
-}
-
-export declare type DefaultColumnOptions<R, SR> = Pick<Column<R, SR>, 'renderCell' | 'renderHeaderCell' | 'width' | 'minWidth' | 'maxWidth' | 'resizable' | 'sortable' | 'draggable'>;
-
-declare type Direction = 'ltr' | 'rtl';
-
-declare interface EditCellKeyDownArgs<TRow, TSummaryRow = unknown> {
-    mode: 'EDIT';
-    row: TRow;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    rowIdx: number;
-    navigate: () => void;
-    onClose: (commitChanges?: boolean, shouldFocusCell?: boolean) => void;
-}
-
-export declare interface FillEvent<TRow> {
-    columnKey: string;
-    sourceRow: TRow;
-    targetRow: TRow;
-}
-
-declare interface GroupRow<TRow> {
-    readonly childRows: readonly TRow[];
-    readonly id: string;
-    readonly parentId: unknown;
-    readonly groupKey: unknown;
-    readonly isExpanded: boolean;
-    readonly level: number;
-    readonly posInSet: number;
-    readonly setSize: number;
-    readonly startRowIndex: number;
-}
-
-declare type Maybe<T> = T | undefined | null;
-
-declare type Omit_2<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
-declare interface PartialPosition {
-    readonly idx?: number | undefined;
-    readonly rowIdx?: number | undefined;
-}
-
-export declare interface PasteEvent<TRow> {
-    sourceColumnKey: string;
-    sourceRow: TRow;
-    targetColumnKey: string;
-    targetRow: TRow;
-}
-
-declare interface Position {
-    readonly idx: number;
-    readonly rowIdx: number;
-}
-
-export declare interface RenderCellProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TRow;
-    rowIdx: number;
-    isCellEditable: boolean;
-    tabIndex: number;
-    onRowChange: (row: TRow) => void;
-}
-
-export declare function renderCheckbox({ onChange, indeterminate, ...props }: RenderCheckboxProps): JSX.Element;
-
-export declare interface RenderCheckboxProps extends Pick<React.ComponentProps<'input'>, 'aria-label' | 'aria-labelledby' | 'checked' | 'tabIndex' | 'disabled'> {
-    indeterminate?: boolean | undefined;
-    onChange: (checked: boolean, shift: boolean) => void;
-}
-
-export declare interface RenderEditCellProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TRow;
-    rowIdx: number;
-    onRowChange: (row: TRow, commitChanges?: boolean) => void;
-    onClose: (commitChanges?: boolean, shouldFocusCell?: boolean) => void;
-}
-
-export declare interface Renderers<TRow, TSummaryRow> {
-    renderCell?: Maybe<(key: Key, props: CellRendererProps<TRow, TSummaryRow>) => ReactNode>;
-    renderCheckbox?: Maybe<(props: RenderCheckboxProps) => ReactNode>;
-    renderRow?: Maybe<(key: Key, props: RenderRowProps<TRow, TSummaryRow>) => ReactNode>;
-    renderSortStatus?: Maybe<(props: RenderSortStatusProps) => ReactNode>;
-    noRowsFallback?: Maybe<ReactNode>;
-}
-
-export declare interface RenderGroupCellProps<TRow, TSummaryRow = unknown> {
-    groupKey: unknown;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: GroupRow<TRow>;
-    childRows: readonly TRow[];
-    isExpanded: boolean;
-    tabIndex: number;
-    toggleGroup: () => void;
-}
-
-export declare function renderHeaderCell<R, SR>({ column, sortDirection, priority }: RenderHeaderCellProps<R, SR>): string | JSX.Element;
-
-export declare interface RenderHeaderCellProps<TRow, TSummaryRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    sortDirection: SortDirection | undefined;
-    priority: number | undefined;
-    tabIndex: number;
-}
-
-export declare interface RenderRowProps<TRow, TSummaryRow = unknown> extends BaseRenderRowProps<TRow, TSummaryRow> {
-    row: TRow;
-    lastFrozenColumnIndex: number;
-    copiedCellIdx: number | undefined;
-    draggedOverCellIdx: number | undefined;
-    selectedCellEditor: ReactElement<RenderEditCellProps<TRow>> | undefined;
-    onRowChange: (column: CalculatedColumn<TRow, TSummaryRow>, rowIdx: number, newRow: TRow) => void;
-    rowClass: Maybe<(row: TRow, rowIdx: number) => Maybe<string>>;
-    setDraggedOverRowIdx: ((overRowIdx: number) => void) | undefined;
-}
-
-export declare function renderSortIcon({ sortDirection }: RenderSortIconProps): JSX.Element | null;
-
-export declare interface RenderSortIconProps {
-    sortDirection: SortDirection | undefined;
-}
-
-export declare function renderSortPriority({ priority }: RenderSortPriorityProps): number | undefined;
-
-export declare interface RenderSortPriorityProps {
-    priority: number | undefined;
-}
-
-export declare interface RenderSortStatusProps extends RenderSortIconProps, RenderSortPriorityProps {
-}
-
-export declare interface RenderSummaryCellProps<TSummaryRow, TRow = unknown> {
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    row: TSummaryRow;
-    tabIndex: number;
-}
-
-export declare function renderToggleGroup<R, SR>(props: RenderGroupCellProps<R, SR>): JSX.Element;
-
-export declare function renderValue<R, SR>(props: RenderCellProps<R, SR>): ReactNode;
-
-export declare const Row: <R, SR>(props: RenderRowProps<R, SR>) => React.JSX.Element;
-
-export declare type RowHeightArgs<TRow> = {
-    type: 'ROW';
-    row: TRow;
-} | {
-    type: 'GROUP';
-    row: GroupRow<TRow>;
-};
-
-export declare interface RowsChangeData<R, SR = unknown> {
-    indexes: number[];
-    column: CalculatedColumn<R, SR>;
-}
-
-export declare const SELECT_COLUMN_KEY = "rdg-select-column";
-
-export declare function SelectCellFormatter({ value, tabIndex, indeterminate, disabled, onChange, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledBy }: SelectCellFormatterProps): ReactNode;
-
-declare interface SelectCellFormatterProps extends SharedInputProps {
-    value: boolean;
-}
-
-declare interface SelectCellKeyDownArgs<TRow, TSummaryRow = unknown> {
-    mode: 'SELECT';
-    row: TRow;
-    column: CalculatedColumn<TRow, TSummaryRow>;
-    rowIdx: number;
-    selectCell: (position: Position, enableEditor?: Maybe<boolean>) => void;
-}
-
-export declare const SelectColumn: Column<any, any>;
-
-export declare interface SelectHeaderRowEvent {
-    checked: boolean;
-}
-
-export declare interface SelectRowEvent<TRow> {
-    row: TRow;
-    checked: boolean;
-    isShiftClick: boolean;
-}
-
-declare type SharedDivProps = Pick<React.ComponentProps<'div'>, 'role' | 'aria-label' | 'aria-labelledby' | 'aria-description' | 'aria-describedby' | 'aria-rowcount' | 'className' | 'style'>;
-
-declare type SharedInputProps = Pick<RenderCheckboxProps, 'disabled' | 'tabIndex' | 'aria-label' | 'aria-labelledby' | 'indeterminate' | 'onChange'>;
-
-export declare interface SortColumn {
-    readonly columnKey: string;
-    readonly direction: SortDirection;
-}
-
-export declare type SortDirection = 'ASC' | 'DESC';
-
-export declare function textEditor<TRow, TSummaryRow>({ row, column, onRowChange, onClose }: RenderEditCellProps<TRow, TSummaryRow>): JSX.Element;
-
-export declare function ToggleGroup<R, SR>({ groupKey, isExpanded, tabIndex, toggleGroup }: RenderGroupCellProps<R, SR>): JSX.Element;
-
-export declare function TreeDataGrid<R, SR = unknown, K extends Key = Key>({ columns: rawColumns, rows: rawRows, rowHeight: rawRowHeight, rowKeyGetter: rawRowKeyGetter, onCellKeyDown: rawOnCellKeyDown, onRowsChange, selectedRows: rawSelectedRows, onSelectedRowsChange: rawOnSelectedRowsChange, renderers, groupBy: rawGroupBy, rowGrouper, expandedGroupIds, onExpandedGroupIdsChange, ...props }: TreeDataGridProps<R, SR, K>): JSX.Element;
-
-export declare interface TreeDataGridProps<R, SR = unknown, K extends Key = Key> extends Omit_2<DataGridProps<R, SR, K>, 'columns' | 'role' | 'aria-rowcount' | 'rowHeight' | 'onFill' | 'isRowSelectionDisabled'> {
-    columns: readonly Column<NoInfer<R>, NoInfer<SR>>[];
-    rowHeight?: Maybe<number | ((args: RowHeightArgs<NoInfer<R>>) => number)>;
-    groupBy: readonly string[];
-    rowGrouper: (rows: readonly NoInfer<R>[], columnKey: string) => Record<string, readonly NoInfer<R>[]>;
-    expandedGroupIds: ReadonlySet<unknown>;
-    onExpandedGroupIdsChange: (expandedGroupIds: Set<unknown>) => void;
-}
-
-export declare function useHeaderRowSelection(): {
-    isIndeterminate: boolean;
-    isRowSelected: boolean;
-    onRowSelectionChange: (selectRowEvent: SelectHeaderRowEvent) => void;
-};
-
-export declare function useRowSelection(): {
-    isRowSelectionDisabled: boolean;
-    isRowSelected: boolean;
-    onRowSelectionChange: (selectRowEvent: SelectRowEvent<any>) => void;
-};
-
-export { }
@@ -1,81 +0,0 @@
-import { memo, use, useMemo } from 'react';
-import { Cell, type CellRendererProps } from 'react-data-grid';
-import { DataGridCellContext, type IDataGridCellRenderer } from './DataGridCellContext.js';
-import { createCellMouseEvent } from './eventUtils.js';
-import { DataGridCellInnerContext, type IDataGridCellInnerContext } from './DataGridCellInnerContext.js';
-import { useGridReactiveValue } from './useGridReactiveValue.js';
-
-export const BaseCell = memo(function BaseCell<TRow, TSummaryRow>(props: CellRendererProps<TRow, TSummaryRow>) {
-  const cellContext = use(DataGridCellContext);
-  const tooltip = useGridReactiveValue(cellContext?.cellTooltip, props.rowIdx, props.column.idx);
-
-  function handleClick(event: React.MouseEvent<HTMLDivElement>) {
-    props.onClick?.(
-      {
-        rowIdx: props.rowIdx,
-        row: props.row,
-        column: props.column,
-        selectCell(enableEditor) {
-          props.selectCell({ rowIdx: props.rowIdx, idx: props.column.idx }, enableEditor);
-        },
-      },
-      createCellMouseEvent(event),
-    );
-  }
-
-  function handleDoubleClick(event: React.MouseEvent<HTMLDivElement>) {
-    props.onDoubleClick?.(
-      {
-        rowIdx: props.rowIdx,
-        row: props.row,
-        column: props.column,
-        selectCell(enableEditor) {
-          props.selectCell({ rowIdx: props.rowIdx, idx: props.column.idx }, enableEditor);
-        },
-      },
-      createCellMouseEvent(event),
-    );
-  }
-
-  function handleContextMenu(event: React.MouseEvent<HTMLDivElement>) {
-    props.onContextMenu?.(
-      {
-        rowIdx: props.rowIdx,
-        row: props.row,
-        column: props.column,
-        selectCell(enableEditor) {
-          props.selectCell({ rowIdx: props.rowIdx, idx: props.column.idx }, enableEditor);
-        },
-      },
-      createCellMouseEvent(event),
-    );
-  }
-
-  const mappedProps = useMemo(
-    () => ({ ...props, isFocused: props.isCellSelected, onClick: handleClick, onDoubleClick: handleDoubleClick, onContextMenu: handleContextMenu }),
-    Object.values(props),
-  );
-
-  const renderDefaultCell = useMemo<IDataGridCellRenderer>(
-    () =>
-      ({ onClick, onDoubleClick, onContextMenu, ...rest }) => {
-        return (
-          <Cell
-            {...props}
-            title={tooltip}
-            onClick={(_, event) => onClick?.(event)}
-            onDoubleClick={(_, event) => onDoubleClick?.(event)}
-            onContextMenu={(_, event) => onContextMenu?.(event)}
-            {...rest}
-            isCellSelected={props.isCellSelected || rest.isFocused || false}
-          />
-        );
-      },
-    [...Object.values(props), tooltip],
-  );
-
-  const cellElement = useGridReactiveValue(cellContext?.cellElement, props.rowIdx, props.column.idx, mappedProps, renderDefaultCell);
-
-  const innerCellContext = useMemo<IDataGridCellInnerContext>(() => ({ isFocused: props.isCellSelected }), [props.isCellSelected]);
-  return <DataGridCellInnerContext value={innerCellContext}>{cellElement ?? <Cell title={tooltip} {...props} />}</DataGridCellInnerContext>;
-}) as <TRow, TSummaryRow>(props: CellRendererProps<TRow, TSummaryRow>) => React.ReactNode;
@@ -1,16 +0,0 @@
-import { Row, type RenderRowProps } from 'react-data-grid';
-import { DataGridRowContext } from './DataGridRowContext.js';
-import { memo, use, useEffect } from 'react';
-import { useGridReactiveValue } from './useGridReactiveValue.js';
-
-export const BaseRow = memo(function BaseRow<TRow, TSummaryRow>(props: RenderRowProps<TRow, TSummaryRow>) {
-  const rowContext = use(DataGridRowContext);
-  const rowsCount = useGridReactiveValue(rowContext?.onScrollToBottom ? rowContext?.rowCount : undefined);
-
-  useEffect(() => {
-    if (rowsCount === props.rowIdx + 1) {
-      rowContext?.onScrollToBottom?.();
-    }
-  }, [rowsCount]);
-  return <Row {...props} />;
-}) as <TRow, TSummaryRow>(props: RenderRowProps<TRow, TSummaryRow>) => React.ReactNode;
@@ -1,157 +0,0 @@
-import { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
-import { DataGrid as DataGridBase, type ColumnOrColumnGroup, type CellSelectArgs, type DataGridHandle } from 'react-data-grid';
-import { rowRenderer } from './renderers/rowRenderer.js';
-import { cellRenderer } from './renderers/cellRenderer.js';
-import { DataGridCellHeaderContext, type IDataGridHeaderCellContext } from './DataGridHeaderCellContext.js';
-import { DataGridCellContext, type IDataGridCellContext } from './DataGridCellContext.js';
-import type { IInnerRow } from './IInnerRow.js';
-import type { IGridReactiveValue } from './IGridReactiveValue.js';
-import { useGridReactiveValue } from './useGridReactiveValue.js';
-import { mapCellContentRenderer } from './mapCellContentRenderer.js';
-import { mapRenderHeaderCell } from './mapRenderHeaderCell.js';
-import { mapEditCellRenderer } from './mapEditCellRenderer.js';
-import { DataGridRowContext, type IDataGridRowContext } from './DataGridRowContext.js';
-import './DataGrid.css';
-
-export interface ICellPosition {
-  rowIdx: number;
-  colIdx: number;
-}
-
-export interface DataGridCellKeyboardEvent extends React.KeyboardEvent<HTMLDivElement> {
-  preventGridDefault: () => void;
-  isGridDefaultPrevented: () => boolean;
-}
-
-export interface DataGridProps extends IDataGridCellContext, IDataGridRowContext, IDataGridHeaderCellContext, React.PropsWithChildren {
-  getRowHeight?: (rowIdx: number) => number;
-  getRowId?: (rowIdx: number) => React.Key;
-  columnCount: IGridReactiveValue<number, []>;
-  getColumnKey?: (colIdx: number) => string;
-  onScroll?: (event: React.UIEvent<HTMLDivElement>) => void;
-  onFocus?: (position: ICellPosition) => void;
-  onEditorOpen?: (position: ICellPosition) => void;
-  onCellKeyDown?: (position: ICellPosition, event: DataGridCellKeyboardEvent) => void;
-  className?: string;
-}
-
-export interface DataGridRef {
-  selectCell: (position: ICellPosition) => void;
-  scrollToCell: (position: Partial<ICellPosition>) => void;
-  openEditor: (position: ICellPosition) => void;
-}
-
-export const DataGrid = forwardRef<DataGridRef, DataGridProps>(function DataGrid(
-  {
-    headerElement,
-    getHeaderWidth,
-    headerText,
-    getHeaderResizable,
-    getHeaderHeight,
-    getHeaderPinned,
-    cell,
-    cellText,
-    cellElement,
-    cellTooltip,
-    getCellEditable,
-    columnCount,
-    getColumnKey,
-    rowCount,
-    getRowId,
-    getRowHeight,
-    onScroll,
-    onScrollToBottom,
-    onFocus,
-    onCellChange,
-    children,
-    className,
-    onCellKeyDown,
-  },
-  ref,
-) {
-  const rowsCount = useGridReactiveValue(rowCount);
-  const columnsCount = useGridReactiveValue(columnCount);
-
-  const gridKey = useRef(0);
-  const rowsCountRef = useRef(rowsCount);
-  const innerGridRef = useRef<DataGridHandle>(null);
-  const columns = new Array<ColumnOrColumnGroup<IInnerRow, unknown>>(columnsCount)
-    .fill(null as any)
-    .map((_, i): ColumnOrColumnGroup<IInnerRow, unknown> => {
-      const width = getHeaderWidth?.(i) ?? 'max-content';
-      return {
-        key: getColumnKey?.(i) ?? String(i),
-        name: '',
-        resizable: getHeaderResizable?.(i) ?? true,
-        width,
-        minWidth: 26,
-        editable: row => getCellEditable?.(row.idx, i) ?? false,
-        frozen: getHeaderPinned?.(i),
-        renderHeaderCell: mapRenderHeaderCell,
-        renderCell: mapCellContentRenderer,
-        renderEditCell: mapEditCellRenderer,
-      };
-    });
-
-  useImperativeHandle(ref, () => ({
-    selectCell: (position: ICellPosition) => {
-      innerGridRef.current?.selectCell({ idx: position.colIdx, rowIdx: position.rowIdx });
-    },
-    scrollToCell: (position: Partial<ICellPosition>) => {
-      innerGridRef.current?.scrollToCell({ idx: position.colIdx, rowIdx: position.rowIdx });
-    },
-    openEditor: (position: ICellPosition) => {
-      innerGridRef.current?.selectCell({ idx: position.colIdx, rowIdx: position.rowIdx }, true);
-    },
-  }));
-
-  if (rowsCountRef.current !== rowsCount) {
-    const previousRowCount = rowsCountRef.current;
-    rowsCountRef.current = rowsCount;
-
-    if (previousRowCount === 0) {
-      // we trigger columns size recalculation when rows are added
-      gridKey.current++;
-    }
-  }
-
-  const rows = useMemo(
-    () =>
-      new Array<IInnerRow>(rowsCount).fill({ idx: 0 }).map((_, i) => ({
-        idx: i,
-      })),
-    [rowsCount],
-  );
-
-  function handleCellFocus(args: CellSelectArgs<IInnerRow, unknown>) {
-    onFocus?.({ colIdx: args.column.idx, rowIdx: args.rowIdx });
-  }
-
-  return (
-    <DataGridRowContext value={{ rowCount, onScrollToBottom }}>
-      <DataGridCellContext value={{ cell, cellText, cellElement, cellTooltip, onCellChange }}>
-        <DataGridCellHeaderContext value={{ headerElement, headerText }}>
-          <DataGridBase
-            key={gridKey.current}
-            ref={innerGridRef}
-            columns={columns}
-            rows={rows}
-            className={className}
-            headerRowHeight={getHeaderHeight?.()}
-            onScroll={onScroll}
-            rowHeight={getRowHeight ? row => getRowHeight(row.idx) : undefined}
-            rowKeyGetter={getRowId ? row => getRowId(row.idx) : undefined}
-            onSelectedCellChange={handleCellFocus}
-            onCellKeyDown={onCellKeyDown ? (args, event) => onCellKeyDown({ rowIdx: args.rowIdx, colIdx: args.column.idx }, event) : undefined}
-            renderers={{
-              renderRow: rowRenderer,
-              renderCell: cellRenderer,
-              noRowsFallback: children,
-            }}
-            minimumRowsToRender={100}
-          />
-        </DataGridCellHeaderContext>
-      </DataGridCellContext>
-    </DataGridRowContext>
-  );
-});
@@ -1,7 +0,0 @@
-import { createContext } from 'react';
-
-export interface IDataGridCellInnerContext {
-  isFocused: boolean;
-}
-
-export const DataGridCellInnerContext = createContext<IDataGridCellInnerContext | null>(null);
@@ -1,13 +0,0 @@
-import { createContext } from 'react';
-import type { IGridReactiveValue } from './IGridReactiveValue.js';
-
-export interface IDataGridHeaderCellContext {
-  headerElement?: IGridReactiveValue<React.ReactNode, [colIdx: number]>;
-  headerText?: IGridReactiveValue<string, [colIdx: number]>;
-  getHeaderWidth?: (colIdx: number) => number | string | null;
-  getHeaderResizable?: (colIdx: number) => boolean;
-  getHeaderHeight?: () => number;
-  getHeaderPinned?: (colIdx: number) => boolean;
-}
-
-export const DataGridCellHeaderContext = createContext<IDataGridHeaderCellContext | null>(null);
@@ -1,9 +0,0 @@
-import { createContext } from 'react';
-import type { IGridReactiveValue } from './IGridReactiveValue.js';
-
-export interface IDataGridRowContext {
-  rowCount: IGridReactiveValue<number, []>;
-  onScrollToBottom?: () => void;
-}
-
-export const DataGridRowContext = createContext<IDataGridRowContext | null>(null);
@@ -1,7 +0,0 @@
-import type { RenderCellProps } from 'react-data-grid';
-import type { IInnerRow } from './IInnerRow.js';
-import { CellContentRenderer } from './renderers/CellContentRenderer.js';
-
-export function mapCellContentRenderer({ rowIdx, column }: RenderCellProps<IInnerRow, unknown>) {
-  return <CellContentRenderer rowIdx={rowIdx} colIdx={column.idx} />;
-}
@@ -1,7 +0,0 @@
-import type { RenderEditCellProps } from 'react-data-grid';
-import type { IInnerRow } from './IInnerRow.js';
-import { TextEditor } from './editors/TextEditor.js';
-
-export function mapEditCellRenderer({ rowIdx, column, onClose }: RenderEditCellProps<IInnerRow, unknown>) {
-  return <TextEditor rowIdx={rowIdx} colIdx={column.idx} onClose={() => onClose()} />;
-}
@@ -1,7 +0,0 @@
-import type { RenderHeaderCellProps } from 'react-data-grid';
-import type { IInnerRow } from './IInnerRow.js';
-import { HeaderCellContentRenderer } from './renderers/HeaderCellContentRenderer.js';
-
-export function mapRenderHeaderCell({ column }: RenderHeaderCellProps<IInnerRow, unknown>) {
-  return <HeaderCellContentRenderer colIdx={column.idx} />;
-}
@@ -1,13 +0,0 @@
-import { use } from 'react';
-import { DataGridCellHeaderContext } from '../DataGridHeaderCellContext.js';
-import { useGridReactiveValue } from '../useGridReactiveValue.js';
-
-interface Props {
-  colIdx: number;
-}
-export function HeaderCellContentRenderer({ colIdx }: Props) {
-  const cellHeaderContext = use(DataGridCellHeaderContext);
-  const headerElement = useGridReactiveValue(cellHeaderContext?.headerElement, colIdx);
-  const getHeaderText = useGridReactiveValue(headerElement ? undefined : cellHeaderContext?.headerText, colIdx);
-  return headerElement ?? getHeaderText ?? '';
-}
@@ -1,2 +0,0 @@
-import '../src/index.css';
-import './global.css';
@@ -1,23 +0,0 @@
-@layer base {
-  :root {
-    /* Primary Button */
-    --dbv-kit-btn-primary-foreground: var(--tw-color-white);
-    --dbv-kit-btn-primary-background: var(--dbv-kit-color-primary-600);
-    --dbv-kit-btn-primary-background-hover: var(--dbv-kit-color-primary-700);
-    --dbv-kit-btn-primary-background-active: var(--dbv-kit-color-primary-800);
-
-    /* Secondary Button */
-    --dbv-kit-btn-secondary-foreground: var(--dbv-kit-color-primary-600);
-    --dbv-kit-btn-secondary-background: transparent;
-    --dbv-kit-btn-secondary-background-hover: var(--dbv-kit-color-primary-50);
-    --dbv-kit-btn-secondary-background-active: var(--dbv-kit-color-primary-100);
-    --dbv-kit-btn-secondary-border-color: var(--dbv-kit-color-primary-600);
-
-    /* Danger Button */
-    --dbv-kit-btn-danger-foreground: var(--tw-color-white);
-    --dbv-kit-btn-danger-background: var(--tw-color-red-600);
-    --dbv-kit-btn-danger-background-hover: var(--tw-color-red-700);
-    --dbv-kit-btn-danger-background-active: var(--tw-color-red-800);
-    --dbv-kit-btn-danger-color-outline: var(--tw-color-red-300);
-  }
-}
@@ -1,29 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-
-import { type ComponentPropsWithRef } from 'react';
-import './Input.css';
-import clsx from 'clsx';
-import { componentProviderWrapper } from '../componentProviderWrapper.js';
-
-export interface InputProps extends Omit<ComponentPropsWithRef<'input'>, 'size'> {
-  size?: 'small' | 'medium' | 'large' | 'xlarge';
-  label?: React.ReactNode;
-}
-
-export const InputBase: React.FC<InputProps> = function Input({ size, className, ...props }) {
-  const classNameToApply = clsx(`dbv-kit-input`, `dbv-kit-input--${size ?? 'medium'}`, className);
-  return (
-    <label className="dbv-kit-input-wrapper">
-      {props.label && <div className={clsx('dbv-kit-input__title', props.required && 'dbv-kit-input__title--required')}>{props.label}</div>}
-      <input className={classNameToApply} {...props} />
-    </label>
-  );
-};
-
-export const Input = componentProviderWrapper('Input', InputBase);
@@ -1,16 +0,0 @@
-import tailwindcss from '@tailwindcss/vite';
-import { assetResolverPlugin } from '@wroud/vite-plugin-asset-resolver';
-import { tscPlugin } from '@wroud/vite-plugin-tsc';
-
-/** @type {import('vite').UserConfig} */
-export default {
-  plugins: [
-    tailwindcss(),
-    assetResolverPlugin(),
-    tscPlugin({
-      tscArgs: ['-b'],
-      enableOverlay: true,
-      prebuild: true,
-    }),
-  ],
-};
@@ -1,19 +0,0 @@
-{
-  "name": "common-react",
-  "packageManager": "yarn@4.6.0",
-  "private": true,
-  "workspaces": [
-    "@dbeaver/*",
-    "../common-typescript"
-  ],
-  "scripts": {
-    "clear": "rimraf -g '@dbeaver/*/{dist,lib}'"
-  },
-  "devDependencies": {
-    "@dbeaver/prettier-config": "workspace:^",
-    "@wroud/ts-template": "^0",
-    "prettier": "^3.5.1",
-    "rimraf": "^6",
-    "typescript": "^5.7.3"
-  }
-}
@@ -1,9 +0,0 @@
-{
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
-}
@@ -1,5 +0,0 @@
-# This file is automatically generated by @yarnpkg/sdks.
-# Manual changes might be lost!
-
-integrations:
-  - vscode
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/bin/prettier.cjs
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier`));
@@ -1,7 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.5.1-sdk",
-  "main": "./index.cjs",
-  "type": "commonjs",
-  "bin": "./bin/prettier.cjs"
-}
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsc
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript/bin/tsc your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsserver
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript/bin/tsserver your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
@@ -1,10 +0,0 @@
-{
-  "name": "typescript",
-  "version": "5.7.3-sdk",
-  "main": "./lib/typescript.js",
-  "type": "commonjs",
-  "bin": {
-    "tsc": "./bin/tsc",
-    "tsserver": "./bin/tsserver"
-  }
-}
@@ -1 +0,0 @@
-export * from './ResultSetApi.js';
@@ -1,13 +0,0 @@
-{
-  "name": "common-typescript",
-  "packageManager": "yarn@4.6.0",
-  "private": true,
-  "workspaces": [
-    "@dbeaver/*"
-  ],
-  "devDependencies": {
-    "@dbeaver/prettier-config": "workspace:^",
-    "prettier": "^3.5.1",
-    "typescript": "^5.7.3"
-  }
-}
@@ -1,6 +1,7 @@
 {
    server: {
        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
+        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",

        contentRoot: "web",
        driversLocation: "drivers",
@@ -9,10 +10,11 @@

        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
        serviceURI: "/api/",
+        supportedHosts: [],

        productSettings: {
            # Global properties
-            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:light}",
+            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
@@ -21,11 +23,12 @@
            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
-            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}"
+            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
+            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
        },

        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-
+        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",

        enableSecurityManager: false,
@@ -77,7 +80,6 @@
        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",

        resourceQuotas: {
-            dataExportFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_DATA_EXPORT_FILE_SIZE_LIMIT:10000000}",
            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
@@ -3,11 +3,11 @@ set -Eeuo pipefail

 echo "Build static content"

-mkdir ./cloudbeaver/web
+mkdir -p ./cloudbeaver/web

 cd ../../cloudbeaver/webapp

-yarn
+yarn install --immutable
 cd ./packages/product-default
 yarn run bundle

@@ -28,4 +28,4 @@ echo "Copy static content"

 cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web

-echo "Cloudbeaver is ready. Run run-server.sh in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.sh in cloudbeaver folder to start the server."
@@ -72,6 +72,6 @@ echo "Copy static content"

 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL

-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.bat in cloudbeaver folder to start the server."

 pause
@@ -5,11 +5,11 @@ MAINTAINER DBeaver Corp, devops@dbeaver.com
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-    apt-get update; \
+    apt-get update && \
+    apt-get dist-upgrade -y --no-install-recommends && \
    apt-get install -y --no-install-recommends \
        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
        curl \
-        wget \
        # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
        # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
        # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
@@ -1,13 +1,11 @@
-FROM dbeaver/base-java
+ARG BASE_JAVA_TAG="stable"
+FROM dbeaver/base-java:${BASE_JAVA_TAG}

 MAINTAINER DBeaver Corp, devops@dbeaver.com

 ENV DBEAVER_GID=8978
 ENV DBEAVER_UID=8978

-RUN apt-get update && \
-    apt-get upgrade -y
-
 RUN groupadd -g $DBEAVER_GID dbeaver && \
    useradd -g $DBEAVER_GID -m -u $DBEAVER_UID -s /bin/bash dbeaver

@@ -18,6 +16,6 @@ EXPOSE 8978
 RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
 WORKDIR /opt/cloudbeaver/

-RUN chmod +x "run-server.sh" "/opt/cloudbeaver/launch-product.sh"
+RUN chmod +x "run-cloudbeaver-server.sh" "/opt/cloudbeaver/launch-product.sh"

 ENTRYPOINT ["./launch-product.sh"]
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -Eeo pipefail
+if [[ $# -eq 0 ]] ;
+  then
+    set -- "$@" -help
+fi
+set -- "$@" -cli-mode
+
+source run-cloudbeaver-server.sh "$@"
@@ -12,8 +12,8 @@ if [ "$(id -u)" -eq 0 ]; then
    TARGET_GID=${TARGET_GID:-$DBEAVER_GID}

    chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
-    # Execute run-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-server.sh"
+    # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
 else
-    exec ./run-server.sh
+    exec ./run-cloudbeaver-server.sh
 fi
@@ -17,7 +17,7 @@ If Not Defined JAVA_OPTS (

 java %JAVA_OPTS% ^
    -Dfile.encoding=UTF-8 ^
-    --add-modules=ALL-SYSTEM ^
+    --add-modules=ALL-DEFAULT ^
    --add-opens=java.base/java.io=ALL-UNNAMED ^
    --add-opens=java.base/java.lang=ALL-UNNAMED ^
    --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ^
@@ -11,7 +11,7 @@ echo "Starting Cloudbeaver Server"

 exec java ${JAVA_OPTS} \
  -Dfile.encoding=UTF-8 \
-  --add-modules=ALL-SYSTEM \
+  --add-modules=ALL-DEFAULT \
  --add-opens=java.base/java.io=ALL-UNNAMED \
  --add-opens=java.base/java.lang=ALL-UNNAMED \
  --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
@@ -36,5 +36,6 @@ exec java ${JAVA_OPTS} \
  -jar ${launcherJar} \
  -product io.cloudbeaver.product.ce.product \
  -web-config conf/cloudbeaver.conf \
+  "$@" \
  -nl en \
  -registryMultiLanguage
@@ -1,3 +1,2 @@
-SET mypath=%~dp0
-
-.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%
+@echo off
+%~dp0\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %~dp0
@@ -1 +1,6 @@
-./../idea-rcp-launch-config-generator/runGenerator.sh -f "$PWD"
+#!/usr/bin/env sh
+
+script_dir="$(realpath "$(dirname "$0")")"
+repositories_root_dir="$(realpath "$script_dir/..")"
+
+"$repositories_root_dir"/idea-rcp-launch-config-generator/runGenerator.sh "$script_dir"
@@ -1,10 +1,13 @@
 lefthook: |
  cd webapp
-  yarn lefthook
+  yarn dlx --quiet lefthook
 output: false
 pre-commit:
  commands:
    check-license:
+      skip:
+        - merge
+        - rebase
      root: webapp
      glob: "*.{ts,tsx}"
      exclude:
@@ -16,7 +16,7 @@ testLibraries=\
  org.hamcrest.core;\
  org.hamcrest
 repositories=\
-  https://p2.dev.dbeaver.com/eclipse-repo/;\
+  https://repo.dbeaver.net/p2/ce/latest/;\
  https://download.eclipse.org/releases/${eclipse-version}/;
 testBundles=\
  org.junit;\
@@ -26,7 +26,7 @@ testBundles=\
 productsPaths=\
  dbeaver/product/community/DBeaver.product;\
  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;\
-  cloudbeaver/server/product/web-server-test/CloudbeaverServerTest.product:../../opt/cloudbeaver;
+  cloudbeaver/server/product/web-server-test/CloudbeaverServerUnitTest.product:../../opt/cloudbeaver;
 ideaConfigurationFilesPaths=\
  dbeaver/.ide/.idea;
 additionalModuleRoots=\
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: DBeaver Corp
+Bundle-Name: Cloudbeaver Web Model
+Bundle-SymbolicName: io.cloudbeaver.model.cli;singleton:=true
+Bundle-Version: 1.0.7.qualifier
+Bundle-Release-Date: 20260406
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport
+Export-Package: io.cloudbeaver.model.cli
+Automatic-Module-Name: io.cloudbeaver.model.cli
+Import-Package: org.slf4j
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+    META-INF/,\
+    plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+</plugin>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+         <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.model.cli</artifactId>
+    <version>1.0.7-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>
@@ -0,0 +1,62 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.ApplicationCommandLine;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.CLIContextImpl;
+import org.jkiss.dbeaver.model.cli.CLIRunMeta;
+import picocli.CommandLine;
+
+public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationInstanceController> {
+    private final CloudBeaverMixin mixin;
+
+    public CloudBeaverCommandLine() {
+        super();
+        this.mixin = new CloudBeaverMixin();
+    }
+
+    public CloudBeaverCommandLine(
+        @NotNull CloudBeaverMixin mixin
+    ) {
+        super();
+        this.mixin = mixin;
+    }
+
+    @Override
+    protected CloudBeaverTopLevelCommand createTopLevelCommand(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta runMeta
+    ) {
+        return new CloudBeaverTopLevelCommand(applicationInstanceController, context, runMeta);
+    }
+
+    @NotNull
+    @Override
+    protected CommandLine initCommandLine(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta runMeta
+    ) {
+        var cmd = super.initCommandLine(applicationInstanceController, context, runMeta);
+        cmd.addMixin("cloudbeaver", mixin);
+        return cmd;
+    }
+}
@@ -0,0 +1,54 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceServer;
+import org.jkiss.dbeaver.model.cli.CLIProcessResult;
+
+import java.io.IOException;
+
+public class CloudBeaverInstanceServer extends ApplicationInstanceServer<ApplicationInstanceController> {
+    private final CloudBeaverCommandLine commandLine;
+
+    public CloudBeaverInstanceServer() throws IOException {
+        super(ApplicationInstanceController.class);
+        this.commandLine = new CloudBeaverCommandLine();
+    }
+
+    public CloudBeaverInstanceServer(@NotNull CloudBeaverCommandLine commandLine) throws IOException {
+        super(ApplicationInstanceController.class);
+        this.commandLine = commandLine;
+    }
+
+    @NotNull
+    @Override
+    public CLIProcessResult handleCommandLine(@NotNull String[] args) {
+        try {
+            return commandLine.executeCommandLineCommands(
+                this,
+                false,
+                false,
+                args
+            );
+        } catch (Exception e) {
+            return new CLIProcessResult(CLIProcessResult.PostAction.ERROR, "Error executing command: " + e.getMessage());
+        }
+    }
+}
@@ -0,0 +1,34 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.dbeaver.model.cli.model.NonExecutableOption;
+import picocli.CommandLine;
+
+/**
+ * CloudBeaver specific mixin options
+ */
+public class CloudBeaverMixin {
+    @NonExecutableOption
+    @CommandLine.Option(
+        names = {"-web-config"},
+        arity = "1",
+        hidden = true,
+        scope = CommandLine.ScopeType.INHERIT
+    )
+    private String webConfig;
+}
@@ -0,0 +1,46 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.CLIContextImpl;
+import org.jkiss.dbeaver.model.cli.CLIRunMeta;
+import org.jkiss.dbeaver.model.cli.command.AbstractTopLevelCommand;
+import org.jkiss.dbeaver.model.cli.model.NonExecutableOption;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "cbvr", description = "CloudBeaver commands")
+public class CloudBeaverTopLevelCommand extends AbstractTopLevelCommand {
+    @NonExecutableOption
+    @CommandLine.Option(
+        names = {NOSPASH_OPTION},
+        hidden = true,
+        scope = CommandLine.ScopeType.INHERIT
+    )
+    private boolean noSplash;
+
+    protected CloudBeaverTopLevelCommand(
+        @Nullable ApplicationInstanceController controller,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta meta
+
+    ) {
+        super(controller, context, meta);
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package io.cloudbeaver.server;
+package io.cloudbeaver.model.cli;

-public interface HttpConstants {
-    String CONTENT_TYPE = "Content-Type";
-
-    String TYPE_JSON = "application/json";
+public interface CloudbeaverCliConstants {
+    String CLI_MODE = "cliMode";
 }
@@ -3,11 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.75.qualifier
-Bundle-Release-Date: 20250421
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-Version: 1.0.98.qualifier
+Bundle-Release-Date: 20260406
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
 org.jkiss.dbeaver.model;visibility:=reexport,
 org.jkiss.dbeaver.model.sm;visibility:=reexport,
@@ -15,7 +14,8 @@ Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
 org.jkiss.dbeaver.model.nio;visibility:=reexport,
 org.jkiss.dbeaver.registry;visibility:=reexport,
 org.jkiss.dbeaver.net.ssh,
- org.jkiss.bundle.graphql.java;visibility:=reexport,
+ org.jkiss.bundle.logback;visibility:=reexport,
+ org.jkiss.bundle.graphql;visibility:=reexport,
 org.jkiss.bundle.apache.dbcp,
 com.google.gson;visibility:=reexport,
 jakarta.servlet-api;bundle-version:="6.0.0";visibility:=reexport
@@ -26,15 +26,16 @@ Export-Package: io.cloudbeaver,
 io.cloudbeaver.auth.provider.local,
 io.cloudbeaver.auth.provisioning,
 io.cloudbeaver.websocket,
+ io.cloudbeaver.websocket.event.client,
+ io.cloudbeaver.websocket.event.task,
 io.cloudbeaver.model,
 io.cloudbeaver.model.app,
 io.cloudbeaver.model.config,
- io.cloudbeaver.model.events,
+ io.cloudbeaver.model.apilog,
 io.cloudbeaver.model.fs,
 io.cloudbeaver.model.log,
 io.cloudbeaver.model.rm,
 io.cloudbeaver.model.rm.local,
- io.cloudbeaver.model.rm.lock,
 io.cloudbeaver.model.session,
 io.cloudbeaver.model.user,
 io.cloudbeaver.model.utils,
@@ -10,4 +10,10 @@ meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.deploymentType.n
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbUrl.name=Security manager database URL
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbDriverName.name=Security manager database driver name
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.name=Security manager database product name
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
+
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog
@@ -0,0 +1,2 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Garder actif (en secondes)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Pas de déconnexion automatique
@@ -0,0 +1,5 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию
@@ -0,0 +1,4 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối
@@ -0,0 +1,3 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接
@@ -25,10 +25,27 @@
                    label="Default secret controller" description="Default void secret controller"/>
    </extension>

+    <extension point="org.jkiss.dbeaver.ws.event">
+        <event topicId="cb_session_task" id="cb_session_task_info_updated"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent"/>

-    <extension point="org.jkiss.dbeaver.ws.event.handler">
-        <eventHandler class="io.cloudbeaver.model.events.WSEventHandlerWorkspaceConfigUpdate">
-            <topic id="cb_workspace_configuration"/>
-        </eventHandler>
+        <event topicId="cb_session_task" id="cb_session_task_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskConfirmationRequestEvent"/>
+        <event topicId="cb_session_task" id="cb_session_task_query_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryConfirmationRequestEvent"/>
+        <event topicId="cb_session_task" id="cb_session_task_query_params_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryParamsConfirmationEvent"/>
+
+        <clientEvent id="cb_client_session_ping" class="io.cloudbeaver.websocket.event.client.WSSessionPingClientEvent"/>
+        <clientEvent id="cb_client_topic_subscribe" class="io.cloudbeaver.websocket.event.client.WSSubscribeOnTopicClientEvent"/>
+        <clientEvent id="cb_client_topic_unsubscribe"
+                     class="io.cloudbeaver.websocket.event.client.WSUnsubscribeFromTopicClientEvent"/>
+        <clientEvent id="cb_client_projects_active"
+                     class="io.cloudbeaver.websocket.event.client.WSUpdateActiveProjectsClientEvent"/>
+        <clientEvent id="cb_client_session_task_confirmation"
+                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskConfirmationEvent"/>
+        <clientEvent id="cb_client_session_task_with_parameters_confirmation"
+                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskWithParametersConfirmationEvent"/>
    </extension>
+
 </plugin>
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.75-SNAPSHOT</version>
+    <version>1.0.98-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -17,18 +17,14 @@
 package io.cloudbeaver;

 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
-import org.jkiss.dbeaver.model.rm.RMController;
-import org.jkiss.dbeaver.model.rm.RMControllerProvider;
-import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.rm.RMProjectType;
-import org.jkiss.utils.CommonUtils;
-import org.jkiss.utils.Pair;
+import org.jkiss.dbeaver.model.rm.*;

 import java.nio.file.Path;
-import java.util.Collection;

 public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {

@@ -81,6 +77,12 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return project.getId();
    }

+    @NotNull
+    @Override
+    public String getDisplayName() {
+        return getName();
+    }
+
    @NotNull
    @Override
    public Path getAbsolutePath() {
@@ -102,52 +104,25 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return false;
    }

-    /**
-     * Method for Bulk Update of resources properties paths
-     *
-     * @param oldToNewPaths collection of OldPath to NewPath pairs
-     */
-    public void moveResourcePropertiesBatch(@NotNull Collection<Pair<String, String>> oldToNewPaths) {
-        loadMetadata();
-        synchronized (metadataSync) {
-            for (var pathsPair : oldToNewPaths) {
-                final var oldResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getFirst());
-                final var newResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getSecond());
-                final var resProps = resourceProperties.remove(oldResourcePath);
-                if (resProps != null) {
-                    resourceProperties.put(newResourcePath, resProps);
-                }
-            }
-        }
-        flushMetadata();
-    }
-
-    /**
-     * Method for Bulk Remove of resources properties
-     */
-    public boolean resetResourcesPropertiesBatch(@NotNull Collection<String> resourcesPaths) {
-        loadMetadata();
-        boolean propertiesChanged = false;
-        synchronized (metadataSync) {
-            for (var resourcePath : resourcesPaths) {
-                var removedProperties = resourceProperties.remove(CommonUtils.normalizeResourcePath(resourcePath));
-                if (removedProperties != null) {
-                    propertiesChanged = true;
-                }
-            }
-        }
-        if (propertiesChanged) {
-            flushMetadata();
-        }
-        return propertiesChanged;
-    }
-
-    public Path getMetadataFilePath() {
-        return getMetadataPath().resolve(METADATA_STORAGE_FILE);
-    }
-
    @Override
    public boolean isPrivateProject() {
        return RMProjectType.USER.equals(getRMProject().getType());
    }
+
+    @Override
+    public void updateProject(@Nullable String newName, @Nullable String description) throws DBException {
+        RMProject rmProject = getResourceController().updateProject(this.getId(), new RMProjectInfo(newName, description));
+        updateProjectInfo(rmProject.getName(), rmProject.getDescription());
+    }
+
+    public void updateProjectInfo(@Nullable String newName, @Nullable String description) {
+        this.project.setName(newName);
+        this.project.setDescription(description);
+        RMEventManager.fireEvent(
+            new RMEvent(
+                RMEvent.Action.PROJECT_UPDATE,
+                project
+            )
+        );
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,14 @@ public interface DBWConstants {
    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
    String PERMISSION_SECRET_MANAGER = "secret-manager";
+    String PERMISSION_SQL_RESULT_UPDATE = "sql-result-update";
+    String PERMISSION_SQL_EXECUTE_QUERY = "sql-execute-query";

+    String PERMISSION_FS_RESOURCE_EDIT = "fs-resource-edit";
+
+    String GLOBAL_PERMISSION_SCRIPT_EXECUTE = "permission.sql.script.execution";
+    String GLOBAL_PERMISSION_DATA_EDITOR_IMPORT = "permission.data-editor.import";
+    String GLOBAL_PERMISSION_DATA_EDITOR_EDITING = "permission.data-editor.editing";

    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
    String PERMISSION_EDIT_DATA = "edit-data";
@@ -41,7 +48,7 @@ public interface DBWConstants {
        GLOBAL,
        EMBEDDED
    }
-
+    String TASK_STATUS_FINISHED = "Finished";
    //public static final String PERMISSION_USER = "user";

 }
@@ -36,4 +36,6 @@ public interface DBWFeatureSet {

    boolean isEnabled();

+    boolean isEnabledByDefault();
+
 }
@@ -146,6 +146,8 @@ public class DBWebException extends DBException implements GraphQLError {
            } else {
                return message;
            }
+        } else if (cause.getMessage() == null && cause.getCause() != null) {
+            return message + ":\n" + cause.getCause().getClass().getSimpleName();
        }
        if (CommonUtils.isEmpty(message)) {
            if (cause.getMessage() != null) {
@@ -0,0 +1,115 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.WebConnectionConfig;
+import io.cloudbeaver.model.app.WebAppConfiguration;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.ServletAppUtils;
+import io.cloudbeaver.utils.WebDataSourceUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.utils.CommonUtils;
+
+public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C extends DataSourceDescriptor> {
+    private static final Log log = Log.getLog(WebConnectionConfigInputHandler.class);
+    protected final T input;
+    protected final DBPDataSourceRegistry registry;
+    protected final WebSession webSession;
+
+    public WebConnectionConfigInputHandler(@NotNull WebSession webSession, @NotNull DBPDataSourceRegistry registry, T configInput) {
+        this.webSession = webSession;
+        this.registry = registry;
+        this.input = configInput;
+    }
+
+    public C createDataSourceContainer() throws DBWebException {
+        String driverId = input.getDriverId();
+        if (CommonUtils.isEmpty(driverId)) {
+            throw new DBWebException("Driver must be specified");
+        }
+        DBPDriver driver = WebDataSourceUtils.getDriverById(driverId);
+
+        C newDataSource = createDataSourceContainerFromInput(driver);
+
+        if (ServletAppUtils.getServletApplication().getAppConfiguration() instanceof WebAppConfiguration webAppConfiguration) {
+            newDataSource.setNavigatorSettings(webAppConfiguration.getDefaultNavigatorSettings());
+        }
+
+        WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
+            newDataSource,
+            newDataSource.getConnectionConfiguration(),
+            input.getCredentials(),
+            input.isSaveCredentials(),
+            input.isSharedCredentials()
+        );
+        return newDataSource;
+    }
+
+    public void updateDataSource(@NotNull C dataSource) throws DBWebException {
+        dataSource.setId(dataSource.getId());
+        if (!CommonUtils.isEmpty(input.getName())) {
+            dataSource.setName(input.getName());
+        }
+
+        if (input.getDescription() != null) {
+            dataSource.setDescription(input.getDescription());
+        }
+
+        dataSource.setFolder(input.getFolder() != null ? registry.getFolder(input.getFolder()) : null);
+        if (input.isDefaultAutoCommit() != null) {
+            dataSource.getConnectionConfiguration().getBootstrap().setDefaultAutoCommit(input.isDefaultAutoCommit());
+        }
+        WebDataSourceUtils.setConnectionConfiguration(
+            dataSource.getDriver(),
+            dataSource.getConnectionConfiguration(),
+            input
+        );
+        WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
+            dataSource,
+            dataSource.getConnectionConfiguration(),
+            input.getCredentials(),
+            input.isSaveCredentials(),
+            input.isSharedCredentials()
+        );
+        dataSource.setConnectionReadOnly(input.isReadOnly());
+    }
+
+    @NotNull
+    protected C createDataSourceContainerFromInput(@NotNull DBPDriver driver) {
+        DBPConnectionConfiguration dsConfig = new DBPConnectionConfiguration();
+        WebDataSourceUtils.setConnectionConfiguration(driver, dsConfig, input);
+        C newDataSource = registry.createDataSource(driver, dsConfig);
+
+        newDataSource.setSavePassword(true);
+        newDataSource.setName(CommonUtils.notNull(input.getName(), "NewConnection"));
+        newDataSource.setDescription(input.getDescription());
+        newDataSource.setConnectionReadOnly(input.isReadOnly());
+        if (input.getFolder() != null) {
+            newDataSource.setFolder(registry.getFolder(input.getFolder()));
+        }
+        return newDataSource;
+    }
+
+
+}
@@ -0,0 +1,55 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPEvent;
+import org.jkiss.dbeaver.model.DBPEventListener;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceConnectEvent;
+
+/**
+ * Sends a WebSocket event when a data source is connected.
+ */
+public class WebDataSourceConnectEventListener implements DBPEventListener {
+
+    @NotNull
+    private final WebSession webSession;
+
+    public WebDataSourceConnectEventListener(@NotNull WebSession webSession) {
+        this.webSession = webSession;
+    }
+
+    @Override
+    public void handleDataSourceEvent(@NotNull DBPEvent event) {
+        if (!(event.getObject() instanceof DBPDataSourceContainer container)) {
+            return;
+        }
+
+        if (event.getAction() == DBPEvent.Action.AFTER_CONNECT && event.getEnabled()) {
+            webSession.addSessionEvent(
+                new WSDataSourceConnectEvent(
+                    container.getProject().getId(),
+                    container.getId(),
+                    webSession.getSessionId(),
+                    webSession.getUserId()
+                )
+            );
+        }
+    }
+}
@@ -17,6 +17,7 @@

 package io.cloudbeaver;

+import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -34,12 +35,11 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
 import org.jkiss.dbeaver.registry.DataSourceConfigurationManager;
+import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.DataSourcePersistentRegistry;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;

-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

@@ -48,12 +48,19 @@ import java.util.stream.Collectors;
 * We need to filter some data sources in case of inaccessibility (not enough permissions).
 */
 public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, DataSourcePersistentRegistry, DBPDataSourceRegistryCache {
+    @NotNull
+    private final WebSession webSession;
    @NotNull
    private final DataSourceFilter dataSourceFilter;
    @NotNull
    private final DataSourceRegistry<?> dataSourceRegistry;

-    public WebGlobalProjectRegistryProxy(@NotNull DataSourceRegistry<?> dataSourceRegistry, @NotNull DataSourceFilter filter) {
+    public WebGlobalProjectRegistryProxy(
+        @NotNull WebSession webSession,
+        @NotNull DataSourceRegistry<?> dataSourceRegistry,
+        @NotNull DataSourceFilter filter
+    ) {
+        this.webSession = webSession;
        this.dataSourceRegistry = dataSourceRegistry;
        this.dataSourceFilter = filter;
    }
@@ -181,13 +188,30 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
    @NotNull
    @Override
    public List<? extends DBPDataSourceFolder> getAllFolders() {
-        return dataSourceRegistry.getAllFolders();
+        if (webSession.hasPermission(DBWConstants.PERMISSION_ADMIN)) {
+            return dataSourceRegistry.getAllFolders();
+        }
+        Set<DBPDataSourceFolder> set = new LinkedHashSet<>();
+        for (DBPDataSourceContainer container : getDataSources()) {
+            DBPDataSourceFolder folder = container.getFolder();
+            while (folder != null) {
+                set.add(folder);
+                folder = folder.getParent();
+            }
+        }
+        return new ArrayList<>(set);
    }

    @NotNull
    @Override
    public List<? extends DBPDataSourceFolder> getRootFolders() {
-        return dataSourceRegistry.getRootFolders();
+        if (webSession.hasPermission(DBWConstants.PERMISSION_ADMIN)) {
+            return dataSourceRegistry.getRootFolders();
+        }
+        return getDataSources().stream()
+            .map(DBPDataSourceContainer::getFolder)
+            .filter(folder -> folder != null && folder.getParent() == null)
+            .toList();
    }

    @NotNull
@@ -354,7 +378,7 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
    }

    @Override
-    public boolean loadDataSources(
+    public DataSourceParseResults loadDataSources(
        @NotNull List<DBPDataSourceConfigurationStorage> storages,
        @NotNull DataSourceConfigurationManager manager,
        @Nullable Collection<String> dataSourceIds, boolean refresh,
@@ -50,6 +50,7 @@ public class WebSessionGlobalProjectImpl extends WebSessionProjectImpl {
    @Override
    protected DBPDataSourceRegistry createDataSourceRegistry() {
        return new WebGlobalProjectRegistryProxy(
+            webSession,
            createRegistryWithCredentialsProvider(),
            this::isDataSourceAccessible
        );
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,52 +16,54 @@
 */
 package io.cloudbeaver;

+import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBPAdaptable;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPObjectSettingsProvider;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.model.security.SMControllerUtils;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
+import org.jkiss.dbeaver.registry.project.BaseProjectSettings;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
+import org.jkiss.utils.CommonUtils;

 import java.nio.file.Path;
 import java.util.*;
-import java.util.stream.Collectors;

-public class WebSessionProjectImpl extends WebProjectImpl {
+public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptable {
    private static final Log log = Log.getLog(WebSessionProjectImpl.class);
+
    protected final WebSession webSession;
    private final Map<String, WebConnectionInfo> connections = new HashMap<>();
+    private final BaseProjectSettings projectSettings;
    private boolean registryIsLoaded = false;

    public WebSessionProjectImpl(
        @NotNull WebSession webSession,
        @NotNull RMProject project
    ) {
-        super(
-            webSession.getWorkspace(),
-            webSession.getRmController(),
-            webSession.getSessionContext(),
-            project,
-            webSession.getUserPreferenceStore(),
-            RMUtils.getProjectPath(project)
-        );
-        this.webSession = webSession;
+        this(webSession, project, null);
    }

    public WebSessionProjectImpl(
        @NotNull WebSession webSession,
        @NotNull RMProject project,
-        @NotNull Path path
+        @Nullable Path path
    ) {
        super(
            webSession.getWorkspace(),
@@ -69,9 +71,36 @@ public class WebSessionProjectImpl extends WebProjectImpl {
            webSession.getSessionContext(),
            project,
            webSession.getUserPreferenceStore(),
-            path
+            path == null ? RMUtils.getProjectPath(project) : path
        );
        this.webSession = webSession;
+        this.projectSettings = new BaseProjectSettings(this) {
+            @NotNull
+            @Override
+            protected Map<SMObjectType, Map<String, Map<String, String>>> loadAllProjectSettings() throws DBException {
+                if (webSession.getUser() == null) {
+                    return new LinkedHashMap<>();
+                }
+                return SMControllerUtils.getObjectSettingsMap(WebSessionProjectImpl.this, webSession.getSecurityController());
+            }
+
+            @Override
+            protected void saveProjectSettings(
+                @NotNull SMObjectType objectType,
+                @NotNull String objectId,
+                @NotNull Map<String, String> settings
+            ) throws DBException {
+                if (webSession.getUserContext().isNonAnonymousUserAuthorizedInSM()) {
+                    webSession.getSecurityController().setObjectSettings(getId(), objectType, objectId, settings);
+                }
+            }
+
+        };
+    }
+
+    @NotNull
+    public BaseProjectSettings getProjectSettings() {
+        return projectSettings;
    }

    @Nullable
@@ -80,6 +109,14 @@ public class WebSessionProjectImpl extends WebProjectImpl {
        return webSession.getNavigatorModel();
    }

+    @Override
+    public <T> T getAdapter(@NotNull Class<T> adapter) {
+        if (adapter == DBPObjectSettingsProvider.class) {
+            return adapter.cast(projectSettings);
+        }
+        return null;
+    }
+
    @NotNull
    @Override
    protected DBPDataSourceRegistry createDataSourceRegistry() {
@@ -90,6 +127,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
    protected DataSourceRegistry<?> createRegistryWithCredentialsProvider() {
        DataSourceRegistry<?> dataSourceRegistry = createRMRegistry();
        dataSourceRegistry.setAuthCredentialsProvider(webSession);
+        dataSourceRegistry.addDataSourceListener(webSession.getDataSourceConnectListener());
        return dataSourceRegistry;
    }

@@ -155,7 +193,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     */
    @NotNull
    public synchronized WebConnectionInfo addConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        WebConnectionInfo connection = new WebConnectionInfo(webSession, dataSourceContainer);
+        WebConnectionInfo connection = createConnectionInfo(dataSourceContainer);
        synchronized (connections) {
            connections.put(dataSourceContainer.getId(), connection);
        }
@@ -180,6 +218,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     *
     * @return connections from cache.
     */
+    @NotNull
    public List<WebConnectionInfo> getConnections() {
        if (!registryIsLoaded) {
            addDataSourcesToCache();
@@ -193,40 +232,31 @@ public class WebSessionProjectImpl extends WebProjectImpl {
    /**
     * updates data sources based on event in web session
     *
-     * @param dataSourceIds list of updated connections
-     * @param eventId  id of event
+     * @param event data source updated event
     */
-    public synchronized boolean updateProjectDataSources(@NotNull List<String> dataSourceIds, @NotNull String eventId) {
+    public synchronized boolean updateProjectDataSources(@NotNull WSDataSourceEvent event) {
        var sendDataSourceUpdatedEvent = false;
        DBPDataSourceRegistry registry = getDataSourceRegistry();
-        // save old connections
-        var oldDataSources = dataSourceIds.stream()
-            .map(registry::getDataSource)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toMap(
-                DBPDataSourceContainer::getId,
-                registry::createDataSource)
-            );
-        if (WSDataSourceEvent.CREATED.equals(eventId) || WSDataSourceEvent.UPDATED.equals(eventId)) {
-            registry.refreshConfig(dataSourceIds);
+        if (WSDataSourceEvent.CREATED.equals(event.getId()) || WSDataSourceEvent.UPDATED.equals(event.getId())) {
+            registry.refreshConfig(event.getDataSourceIds());
        }
-        for (String dsId : dataSourceIds) {
+        for (String dsId : event.getDataSourceIds()) {
            DataSourceDescriptor ds = (DataSourceDescriptor) registry.getDataSource(dsId);
            if (ds == null) {
                continue;
            }
-            switch (eventId) {
+            switch (event.getId()) {
                case WSDataSourceEvent.CREATED -> {
                    addConnection(ds);
                    sendDataSourceUpdatedEvent = true;
                }
                case WSDataSourceEvent.UPDATED ->  {
-                    boolean connectionUpdated = !ds.equalSettings(oldDataSources.get(dsId));
-                    if (connectionUpdated) {
-                        sendDataSourceUpdatedEvent = true;
+                    if (event.getProperty() == WSDataSourceProperty.CONFIGURATION) {
                        WebDataSourceUtils.disconnectDataSource(webSession, ds);
                    }
-                    // if settings were changed we need to send event
+                    if (event.getProperty() != WSDataSourceProperty.INTERNAL) {
+                        sendDataSourceUpdatedEvent = true;
+                    }
                }
                case WSDataSourceEvent.DELETED -> {
                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
@@ -242,4 +272,100 @@ public class WebSessionProjectImpl extends WebProjectImpl {
        }
        return sendDataSourceUpdatedEvent;
    }
+
+    @NotNull
+    public WebConnectionInfo createConnectionInfo(@NotNull DBPDataSourceContainer dataSourceDescriptor) {
+        return new WebConnectionInfo(webSession, dataSourceDescriptor);
+    }
+
+    @NotNull
+    public WebConnectionInfo createConnection(@NotNull Map<String, Object> configMap) throws DBWebException {
+        if (CommonUtils.isEmpty(configMap)) {
+            throw new DBWebException("Connection configuration parameters are missing");
+        }
+        DBPDataSourceContainer newDataSource = getDataSourceContainerFromInput(getConnectionConfigInput(configMap));
+        return addDataSourceToProject(newDataSource);
+    }
+
+    @NotNull
+    public WebConnectionInfo addDataSourceToProject(@NotNull DBPDataSourceContainer newDataSource) throws DBWebException {
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        try {
+            registry.addDataSource(newDataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            registry.removeDataSource(newDataSource);
+            throw new DBWebException("Failed to create connection", e);
+        }
+
+        WebConnectionInfo connectionInfo = addConnection(newDataSource);
+        webSession.addInfoMessage("New connection was created - " + WebDataSourceUtils.getConnectionContainerInfo(
+            newDataSource));
+        log.info(String.format(
+            "New connection was created: [info=%s, user=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(newDataSource),
+            webSession.getUserId()
+        ));
+        return connectionInfo;
+    }
+
+    @NotNull
+    public WebConnectionInfo updateConnection(@Nullable Map<String, Object> configMap) throws DBWebException {
+        WebConnectionConfig config = getConnectionConfigInput(configMap);
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(config.getConnectionId());
+        DataSourceDescriptor dataSource = (DataSourceDescriptor) connectionInfo.getDataSourceContainer();
+        webSession.addInfoMessage("Update connection - " + WebDataSourceUtils.getConnectionContainerInfo(dataSource));
+
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        getInputConfigHandler(config).updateDataSource(dataSource);
+        connectionInfo.setCredentialsSavedInSession(null);
+        try {
+            registry.updateDataSource(dataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            throw new DBWebException("Failed to update connection", e);
+        }
+        return connectionInfo;
+    }
+
+    public boolean deleteConnection(@NotNull String connectionId) throws DBWebException {
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(connectionId);
+        webSession.addInfoMessage("Delete connection - " +
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()));
+        closeAndDeleteConnection(connectionInfo);
+
+        log.info(String.format(
+            "Connection deleted: [info=%s, userId=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()),
+            webSession.getUserId()
+        ));
+        return true;
+    }
+
+    @NotNull
+    private WebConnectionInfo closeAndDeleteConnection(@NotNull WebConnectionInfo connectionInfo) throws DBWebException {
+        DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
+        WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer);
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        registry.removeDataSource(dataSourceContainer);
+        removeConnection(dataSourceContainer);
+        return connectionInfo;
+    }
+
+    @NotNull
+    public DataSourceDescriptor getDataSourceContainerFromInput(@NotNull WebConnectionConfig configInput) throws DBWebException {
+        return getInputConfigHandler(configInput).createDataSourceContainer();
+    }
+
+    @NotNull
+    public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object> configMap) {
+        return new WebConnectionConfig(configMap == null ? Map.of() : configMap);
+    }
+
+    @NotNull
+    protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull WebConnectionConfig configInput) {
+        return new WebConnectionConfigInputHandler<>(webSession, getDataSourceRegistry(), configInput);
+    }
+
+
 }
@@ -69,4 +69,13 @@ public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends
        @NotNull WebUser user,
        boolean selfIdentity) throws DBException;

+    /**
+     * Make some post authentication actions
+     */
+    default void postAuthentication() {}
+
+    @Override
+    default boolean supportsOpeningSessionAsChild() {
+        return true;
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,27 +30,50 @@ import java.util.Map;
 public interface SMAuthProviderFederated extends SMSignOutLinkProvider {

    @NotNull
-    String getSignInLink(String id) throws DBException;
+    String getSignInLink(@NotNull String id, @NotNull String origin) throws DBException;

    @Override
    default String getUserSignOutLink(
        @NotNull SMAuthProviderCustomConfiguration providerConfig,
-        @NotNull Map<String, Object> userCredentials
+        @NotNull Map<String, Object> userCredentials,
+        @NotNull String origin
    ) throws DBException {
-        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters());
+        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters(), origin);
    }

    @Nullable
-    String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getMetadataLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    String getAcsLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getAcsLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    String getEntityIdLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getEntityIdLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    default String getRedirectLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException {
+    default String getRedirectLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
        return null;
    }

--- a/Show More
+++ b/Show More