Merge branch 'devel' into CB-5133-tree-expand-focus

dbeaver · May 16, 2024 · f925e56 · f925e56
2 parents b1f8557 + 494101d
commit f925e56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
@@ -29,6 +29,7 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.server.events,
  io.cloudbeaver.server,
  io.cloudbeaver.server.actions,
+ io.cloudbeaver.server.jobs,
  io.cloudbeaver.server.servlets,
  io.cloudbeaver.service,
  io.cloudbeaver.service.navigator,

diff --git a/webapp/packages/core-blocks/src/ErrorMessage.m.css b/webapp/packages/core-blocks/src/ErrorMessage.m.css
@@ -1,3 +1,10 @@
+/*
+ * 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.
+ */
 .message {
   box-sizing: border-box;
   display: flex;
@@ -23,8 +30,9 @@
   display: -webkit-box;
   -webkit-box-orient: vertical;
   overflow: hidden;
+  white-space: pre-line;
 }
 
 .messageActions {
   margin-left: 16px;
-}
+}
diff --git a/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx b/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx
@@ -18,6 +18,7 @@ interface Props extends ILayoutSizeProps {
   label?: string;
   title?: string;
   content?: React.ReactNode;
+  hidden?: boolean;
   className?: string;
 }