From e3a859fee7679ee150ef4d8ac50589eb587b8d29 Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Tue, 21 May 2024 10:10:47 +0200 Subject: [PATCH 1/5] Cb 5133 tree expand focus (#2605) * CB-5133 make tree expand focusable * CB-5133 make tree expand clickable * CB-5133 add label for the expand button --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- webapp/packages/core-blocks/src/Menu/Menu.m.css | 8 +++++++- .../src/Tree/TreeNode/TreeNodeExpand.tsx | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/webapp/packages/core-blocks/src/Menu/Menu.m.css b/webapp/packages/core-blocks/src/Menu/Menu.m.css index 851b929b69..63a2520c16 100644 --- a/webapp/packages/core-blocks/src/Menu/Menu.m.css +++ b/webapp/packages/core-blocks/src/Menu/Menu.m.css @@ -1,10 +1,16 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ .menuButton { composes: theme-ripple from global; } .menuButton { background: none; border: none; - outline: none !important; color: inherit; cursor: pointer; diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx index 6ca250ae7a..49b8c15252 100644 --- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx +++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx @@ -10,9 +10,11 @@ import { useContext } from 'react'; import { EventContext } from '@cloudbeaver/core-events'; +import { Clickable } from '../../Clickable'; import { getComputed } from '../../getComputed'; import { Icon } from '../../Icon'; import { Loader } from '../../Loader/Loader'; +import { useTranslate } from '../../localization/useTranslate'; import { s } from '../../s'; import { useS } from '../../useS'; import { useStateDelay } from '../../useStateDelay'; @@ -29,6 +31,7 @@ interface Props { } export const TreeNodeExpand = observer(function TreeNodeExpand({ leaf, big, filterActive, disabled, className }) { + const translate = useTranslate(); const styles = useS(style); const context = useContext(TreeNodeContext); @@ -85,14 +88,22 @@ export const TreeNodeExpand = observer(function TreeNodeExpand({ leaf, bi } } + const title = translate('ui_expand'); + return ( -
{loading && } {expandable && } -
+ ); }); From 77ae1a59d2868f664e7bebe16645bc4ae8e747d0 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Tue, 21 May 2024 17:52:21 +0300 Subject: [PATCH 2/5] CB-4956 restore web session if it expired at login (#2618) Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java index 1d54b4466a..7c01c9610c 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java @@ -56,7 +56,7 @@ public void bindWiring(DBWBindingContext model) throws DBWebException { return true; }) .dataFetcher("authUpdateStatus", env -> getService(env).authUpdateStatus( - getWebSession(env), + getWebSession(env, false), env.getArgument("authId"), CommonUtils.toBoolean(env.getArgument("linkUser")) )) From fac08c1b9346c6d1a0bc064d833e7bfb0f3dbf63 Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Wed, 22 May 2024 09:08:26 +0200 Subject: [PATCH 3/5] CB-5092 Top navigation bar is not visible (#2616) * CB-5092 fix: combobox opens on small screens without eating off a bottom space of the window * CB-5092 does arrow click in separate function * CB-5092 fix: selectors and nodes context menu do not break layout for small screens --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- webapp/packages/core-blocks/src/FormControls/Combobox.tsx | 1 + webapp/packages/core-blocks/src/Menu/Menu.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx index 405d2cf99a..20cb42cd88 100644 --- a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx @@ -106,6 +106,7 @@ export const Combobox: ComboboxType = observer(function Combobox({ placement: 'bottom-end', currentId: null, gutter: 4, + unstable_fixed: true, }); if (readOnly) { diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx index 4188661bdc..90b52d21c9 100644 --- a/webapp/packages/core-blocks/src/Menu/Menu.tsx +++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx @@ -70,6 +70,7 @@ export const Menu = observer( placement, visible, rtl, + unstable_fixed: true, }); const styles = useS(style); From e05dafd71088a17105de5a059dac158d5c7a30cb Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Wed, 22 May 2024 09:08:50 +0200 Subject: [PATCH 4/5] CB-4853 updates docker containerId view in update instruction for CE (#2646) * CB-4853 updates docker containerId view in update instruction for CE * CB-4853 adds const "{your container id}" in the update instruction --- webapp/packages/product-default/src/UpdateInstruction.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/packages/product-default/src/UpdateInstruction.tsx b/webapp/packages/product-default/src/UpdateInstruction.tsx index 5b99641b8a..31a5fcc750 100644 --- a/webapp/packages/product-default/src/UpdateInstruction.tsx +++ b/webapp/packages/product-default/src/UpdateInstruction.tsx @@ -9,7 +9,8 @@ import { Code } from '@cloudbeaver/core-blocks'; import type { InstructionComponent } from '@cloudbeaver/core-version-update'; export const UpdateInstruction: InstructionComponent = function UpdateInstruction({ version, containerId, className }) { - const id = containerId || 'cloudbeaver'; + const id = '{your container id}'; + return (
From 1e599fdd888f7d1d7c7a2b858ac891eb3d1b970e Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Wed, 22 May 2024 09:09:23 +0200 Subject: [PATCH 5/5] CB-5160 adjust set to null behaviour (#2648) Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com> --- .../DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts index f0ecf90b0e..32a8edbc4f 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts @@ -9,6 +9,7 @@ import { action, makeObservable, observable } from 'mobx'; import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor'; import { ResultDataFormat, SqlResultRow, UpdateResultsDataBatchMutationVariables } from '@cloudbeaver/core-sdk'; +import { isNull } from '@cloudbeaver/core-utils'; import type { IDatabaseDataSource } from '../../IDatabaseDataSource'; import type { IDatabaseResultSet } from '../../IDatabaseResultSet'; @@ -142,7 +143,7 @@ export class ResultSetEditAction extends DatabaseEditAction