From 37b8716aee6281f6631f72254804b3c2b2faf35d Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Tue, 23 Sep 2025 18:34:16 +0200 Subject: [PATCH 1/3] dbeaver/pro#6935 replaces sass-embedded with sass (#3771) --- webapp/packages/product-default/package.json | 2 +- .../packages/product-default/vite.config.ts | 6 - webapp/yarn.lock | 256 +----------------- 3 files changed, 14 insertions(+), 250 deletions(-) diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 96c501490f..9cb2ef17ab 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -48,7 +48,7 @@ "@types/react-dom": "^19", "concurrently": "^9", "rimraf": "^6", - "sass-embedded": "^1", + "sass": "^1", "tailwindcss": "4.0.7", "typescript": "^5" } diff --git a/webapp/packages/product-default/vite.config.ts b/webapp/packages/product-default/vite.config.ts index 94a4e3d6d9..289f122b4a 100644 --- a/webapp/packages/product-default/vite.config.ts +++ b/webapp/packages/product-default/vite.config.ts @@ -22,12 +22,6 @@ export default defineConfig( to each file https://vite.dev/guide/build#public-base-path. */ base: './', - resolve: { - // resolves sass to sass-embedded package to avoid issues with builder trying to use incorrect sass package - alias: { - sass: 'sass-embedded', - }, - }, plugins: [baseConfigurationPlugin(mode, packageJson)], }), ); diff --git a/webapp/yarn.lock b/webapp/yarn.lock index cbcf8ab750..d7397eea8c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1352,13 +1352,6 @@ __metadata: languageName: node linkType: hard -"@bufbuild/protobuf@npm:^2.5.0": - version: 2.8.0 - resolution: "@bufbuild/protobuf@npm:2.8.0" - checksum: 10c0/970faf0b58fd10c3c650224fda51f471b0f2005222fb33b43e6f8894478bc905b5a3bc0577cd7539afd7d2493fa6a6e588b89e67bdabd2750acf26cb40da237f - languageName: node - linkType: hard - "@bundled-es-modules/cookie@npm:^2.0.1": version: 2.0.1 resolution: "@bundled-es-modules/cookie@npm:2.0.1" @@ -4379,7 +4372,7 @@ __metadata: react: "npm:^19" react-dom: "npm:^19" rimraf: "npm:^6" - sass-embedded: "npm:^1" + sass: "npm:^1" tailwindcss: "npm:4.0.7" tslib: "npm:^2" typescript: "npm:^5" @@ -9554,13 +9547,6 @@ __metadata: languageName: node linkType: hard -"buffer-builder@npm:^0.2.0": - version: 0.2.0 - resolution: "buffer-builder@npm:0.2.0" - checksum: 10c0/e50c3a379f4acaea75ade1ee3e8c07ed6d7c5dfc3f98adbcf0159bfe1a4ce8ca1fe3689e861fcdb3fcef0012ebd4345a6112a5b8a1185295452bb66d7b6dc8a1 - languageName: node - linkType: hard - "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -10056,13 +10042,6 @@ __metadata: languageName: node linkType: hard -"colorjs.io@npm:^0.5.0": - version: 0.5.2 - resolution: "colorjs.io@npm:0.5.2" - checksum: 10c0/2e6ea43629e325e721b92429239de3a6f42fb6d88ba6e4c2aeff0288c196d876f2f7ee82aea95bd40072d5cdc8cb87f042f4d94c134dcabf0e34a717e4caacb9 - languageName: node - linkType: hard - "combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" @@ -17395,7 +17374,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.2, rxjs@npm:^7, rxjs@npm:^7.4.0, rxjs@npm:^7.5.5": +"rxjs@npm:7.8.2, rxjs@npm:^7, rxjs@npm:^7.5.5": version: 7.8.2 resolution: "rxjs@npm:7.8.2" dependencies: @@ -17452,210 +17431,24 @@ __metadata: languageName: node linkType: hard -"sass-embedded-all-unknown@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-all-unknown@npm:1.92.1" +"sass@npm:^1": + version: 1.93.1 + resolution: "sass@npm:1.93.1" dependencies: - sass: "npm:1.92.1" - conditions: (!cpu=arm | !cpu=arm64 | !cpu=riscv64 | !cpu=x64) - languageName: node - linkType: hard - -"sass-embedded-android-arm64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-android-arm64@npm:1.92.1" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"sass-embedded-android-arm@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-android-arm@npm:1.92.1" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - -"sass-embedded-android-riscv64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-android-riscv64@npm:1.92.1" - conditions: os=android & cpu=riscv64 - languageName: node - linkType: hard - -"sass-embedded-android-x64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-android-x64@npm:1.92.1" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - -"sass-embedded-darwin-arm64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-darwin-arm64@npm:1.92.1" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"sass-embedded-darwin-x64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-darwin-x64@npm:1.92.1" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"sass-embedded-linux-arm64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-arm64@npm:1.92.1" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"sass-embedded-linux-arm@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-arm@npm:1.92.1" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"sass-embedded-linux-musl-arm64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-musl-arm64@npm:1.92.1" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"sass-embedded-linux-musl-arm@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-musl-arm@npm:1.92.1" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"sass-embedded-linux-musl-riscv64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-musl-riscv64@npm:1.92.1" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"sass-embedded-linux-musl-x64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-musl-x64@npm:1.92.1" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"sass-embedded-linux-riscv64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-riscv64@npm:1.92.1" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"sass-embedded-linux-x64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-linux-x64@npm:1.92.1" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"sass-embedded-unknown-all@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-unknown-all@npm:1.92.1" - dependencies: - sass: "npm:1.92.1" - conditions: (!os=android | !os=darwin | !os=linux | !os=win32) - languageName: node - linkType: hard - -"sass-embedded-win32-arm64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-win32-arm64@npm:1.92.1" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"sass-embedded-win32-x64@npm:1.92.1": - version: 1.92.1 - resolution: "sass-embedded-win32-x64@npm:1.92.1" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"sass-embedded@npm:^1": - version: 1.92.1 - resolution: "sass-embedded@npm:1.92.1" - dependencies: - "@bufbuild/protobuf": "npm:^2.5.0" - buffer-builder: "npm:^0.2.0" - colorjs.io: "npm:^0.5.0" + "@parcel/watcher": "npm:^2.4.1" + chokidar: "npm:^4.0.0" immutable: "npm:^5.0.2" - rxjs: "npm:^7.4.0" - sass-embedded-all-unknown: "npm:1.92.1" - sass-embedded-android-arm: "npm:1.92.1" - sass-embedded-android-arm64: "npm:1.92.1" - sass-embedded-android-riscv64: "npm:1.92.1" - sass-embedded-android-x64: "npm:1.92.1" - sass-embedded-darwin-arm64: "npm:1.92.1" - sass-embedded-darwin-x64: "npm:1.92.1" - sass-embedded-linux-arm: "npm:1.92.1" - sass-embedded-linux-arm64: "npm:1.92.1" - sass-embedded-linux-musl-arm: "npm:1.92.1" - sass-embedded-linux-musl-arm64: "npm:1.92.1" - sass-embedded-linux-musl-riscv64: "npm:1.92.1" - sass-embedded-linux-musl-x64: "npm:1.92.1" - sass-embedded-linux-riscv64: "npm:1.92.1" - sass-embedded-linux-x64: "npm:1.92.1" - sass-embedded-unknown-all: "npm:1.92.1" - sass-embedded-win32-arm64: "npm:1.92.1" - sass-embedded-win32-x64: "npm:1.92.1" - supports-color: "npm:^8.1.1" - sync-child-process: "npm:^1.0.2" - varint: "npm:^6.0.0" + source-map-js: "npm:>=0.6.2 <2.0.0" dependenciesMeta: - sass-embedded-all-unknown: - optional: true - sass-embedded-android-arm: - optional: true - sass-embedded-android-arm64: - optional: true - sass-embedded-android-riscv64: - optional: true - sass-embedded-android-x64: - optional: true - sass-embedded-darwin-arm64: - optional: true - sass-embedded-darwin-x64: - optional: true - sass-embedded-linux-arm: - optional: true - sass-embedded-linux-arm64: - optional: true - sass-embedded-linux-musl-arm: - optional: true - sass-embedded-linux-musl-arm64: - optional: true - sass-embedded-linux-musl-riscv64: - optional: true - sass-embedded-linux-musl-x64: - optional: true - sass-embedded-linux-riscv64: - optional: true - sass-embedded-linux-x64: - optional: true - sass-embedded-unknown-all: - optional: true - sass-embedded-win32-arm64: - optional: true - sass-embedded-win32-x64: + "@parcel/watcher": optional: true bin: - sass: dist/bin/sass.js - checksum: 10c0/d93033899f4efe317434eee7959bd00bb4fcec1f43ab60617b49de2ad03f6d6a60a3c0171dc8752b53d3a212dcab63e9c991272f84dabd7df89639bcaa523a43 + sass: sass.js + checksum: 10c0/65b3d001612a3099b6097d70340b9e8524a1213aa0d9b6c0c5ff07a01224946eef144ba2d2bdb9449761950fa395b99034824d7c3bf60b705a377a54cc661703 languageName: node linkType: hard -"sass@npm:1.92.1, sass@npm:^1.70.0": +"sass@npm:^1.70.0": version: 1.92.1 resolution: "sass@npm:1.92.1" dependencies: @@ -18440,7 +18233,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:8.1.1, supports-color@npm:^8.1.1": +"supports-color@npm:8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -18498,15 +18291,6 @@ __metadata: languageName: node linkType: hard -"sync-child-process@npm:^1.0.2": - version: 1.0.2 - resolution: "sync-child-process@npm:1.0.2" - dependencies: - sync-message-port: "npm:^1.0.0" - checksum: 10c0/f73c87251346fba28da8ac5bc8ed4c9474504a5250ab4bd44582beae8e25c230e0a5b7b16076488fee1aed39a1865de5ed4cec19c6fa4efdbb1081c514615170 - languageName: node - linkType: hard - "sync-fetch@npm:0.6.0-2": version: 0.6.0-2 resolution: "sync-fetch@npm:0.6.0-2" @@ -18518,13 +18302,6 @@ __metadata: languageName: node linkType: hard -"sync-message-port@npm:^1.0.0": - version: 1.1.3 - resolution: "sync-message-port@npm:1.1.3" - checksum: 10c0/d259b08ab6da284135ba45bc13724268688b469371259f5978b2905e2c79342032b9240093b2483e83cfeccfd3a5e8300978e67090385f9b6b38941fcce1aec4 - languageName: node - linkType: hard - "tailwindcss@npm:4.0.7": version: 4.0.7 resolution: "tailwindcss@npm:4.0.7" @@ -19315,13 +19092,6 @@ __metadata: languageName: node linkType: hard -"varint@npm:^6.0.0": - version: 6.0.0 - resolution: "varint@npm:6.0.0" - checksum: 10c0/737fc37088a62ed3bd21466e318d21ca7ac4991d0f25546f518f017703be4ed0f9df1c5559f1dd533dddba4435a1b758fd9230e4772c1a930ef72b42f5c750fd - languageName: node - linkType: hard - "vary@npm:^1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" From 97d179a103607e4c62255d123553f2c64d490c4f Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Tue, 23 Sep 2025 19:48:26 +0300 Subject: [PATCH 2/3] dbeaver/pro#6229 execute sql via cli (#3721) * dbeaver/pro#6229 execute sql via cli * dbeaver/pro#6229 review fix * dbeaver/pro#6229 update run scripts --------- Co-authored-by: MashaKorax <84867187+MashaKorax@users.noreply.github.com> --- deploy/scripts/run-server.sh | 2 +- deploy/scripts/server-cli.sh | 7 ++++--- .../cloudbeaver/model/cli/CloudBeaverInstanceServer.java | 6 +++--- .../transfer/impl/WebDataTransferStreamProcessor.java | 4 ++-- .../service/data/transfer/impl/WebDataTransferUtils.java | 9 +++------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh index 86cc8c2e92..1db3dc26ca 100755 --- a/deploy/scripts/run-server.sh +++ b/deploy/scripts/run-server.sh @@ -36,6 +36,6 @@ exec java ${JAVA_OPTS} \ -jar ${launcherJar} \ -product io.cloudbeaver.product.ce.product \ -web-config conf/cloudbeaver.conf \ - ${CLI_OPTS} \ + "$@" \ -nl en \ -registryMultiLanguage diff --git a/deploy/scripts/server-cli.sh b/deploy/scripts/server-cli.sh index 8738ca3638..5311c87663 100755 --- a/deploy/scripts/server-cli.sh +++ b/deploy/scripts/server-cli.sh @@ -1,8 +1,9 @@ #!/bin/bash set -Eeo pipefail -CLI_OPTS="$@" if [[ $# -eq 0 ]] ; then - CLI_OPTS='-help' + set -- "$@" -help fi -source run-server.sh \ No newline at end of file +set -- "$@" -cli-mode + +source run-server.sh "$@" \ No newline at end of file diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java index a65e869b1f..37528b7788 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java @@ -20,7 +20,7 @@ import org.apache.commons.cli.CommandLine; 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 org.jkiss.dbeaver.model.cli.CLIProcessResult; import java.io.IOException; @@ -31,7 +31,7 @@ public class CloudBeaverInstanceServer extends ApplicationInstanceServer processorProperties) { @@ -42,7 +39,7 @@ class WebDataTransferUtils { return CommonUtils.toString(processorProperties.get(EXTENSION), "data"); } - return getProcessorFileExtension(processor); + return processor.getProcessorFileExtension(); } public static String normalizeFileName( From d0e86745f18080e3d0be70fe75da78f3a0ff7deb Mon Sep 17 00:00:00 2001 From: Sychev Andrey <44414066+SychevAndrey@users.noreply.github.com> Date: Wed, 24 Sep 2025 10:30:59 +0200 Subject: [PATCH 3/3] dbeaver/pro#6520 fix: header cell layout (#3759) * dbeaver/pro#6520 fix: header cell layout * dbeaver/pro#6520 refactor: table cell always shows 2 rows * dbeaver/pro#6520 fix: use two rows grid only if a table has any description --------- Co-authored-by: sergeyteleshev Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../src/renderers/HeaderCellContentRenderer.tsx | 12 ++++++++++-- .../TableColumnHeader/TableColumnHeader.tsx | 14 ++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/webapp/common-react/@dbeaver/react-data-grid/src/renderers/HeaderCellContentRenderer.tsx b/webapp/common-react/@dbeaver/react-data-grid/src/renderers/HeaderCellContentRenderer.tsx index 6468c01ca0..02e9659e8f 100644 --- a/webapp/common-react/@dbeaver/react-data-grid/src/renderers/HeaderCellContentRenderer.tsx +++ b/webapp/common-react/@dbeaver/react-data-grid/src/renderers/HeaderCellContentRenderer.tsx @@ -1,3 +1,11 @@ +/* + * 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 { memo, use } from 'react'; import { useDrag, useDrop, type DnDStoreProvider } from '@dbeaver/react-dnd'; import { DataGridCellHeaderContext } from '../DataGridHeaderCellContext.js'; @@ -72,13 +80,13 @@ export const HeaderCellContentRenderer = memo(function HeaderCellContentRenderer return (
- {headerElement ?? getHeaderText ?? ''} + {headerElement ?? getHeaderText ?? ''} {isColumnSortable && onColumnSort && }
); diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx index 5c7625b5bc..e88819f922 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx @@ -7,6 +7,7 @@ */ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; +import { clsx } from '@dbeaver/ui-kit'; import { getComputed, s, StaticImage, useS } from '@cloudbeaver/core-blocks'; @@ -15,7 +16,6 @@ import { DataGridSelectionContext } from '../DataGridSelection/DataGridSelection import { TableDataContext } from '../TableDataContext.js'; import style from './TableColumnHeader.module.css'; import { useTableColumnDnD } from './useTableColumnDnD.js'; -import { HEADER_HEIGHT } from '../DataGridTable.js'; interface Props { colIdx: number; @@ -80,11 +80,13 @@ export const TableColumnHeader = observer(function TableColumnHeader({ co {dataReadonly && colIdx === 0 && (
)} -
-
+
+
{icon && (