Merge branch 'devel' into CB-4868-syntax-highlight

dbeaver · May 23, 2024 · 5d5f031 · 5d5f031
2 parents 263db0d + f9b8e85
commit 5d5f031
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/deploy/docker/base-java/Dockerfile b/deploy/docker/base-java/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 MAINTAINER DBeaver Corp, [email protected]
 

diff --git a/...es/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java b/...es/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"))
             ))

diff --git 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
@@ -70,6 +70,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(
       placement,
       visible,
       rtl,
+      unstable_fixed: true,
     });
     const styles = useS(style);
 

diff --git a/...ackages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetEditAction.ts b/...ackages/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<IResultSetElementKey
     const prevValue = update.source?.[key.column.index] as any;
 
     if (isResultSetContentValue(prevValue) && !isResultSetComplexValue(value)) {
-      if ('text' in prevValue) {
+      if ('text' in prevValue && !isNull(value)) {
         value = createResultSetContentValue({
           text: String(value),
           contentLength: String(value).length,

diff --git 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 (
     <div className={className}>
       <Code>