Merge branch 'devel' of https://github.com/dbeaver/cloudbeaver into d…

…evel
dbeaver · Jan 31, 2024 · db06622 · db06622
2 parents c90f46b + 11adc7d
commit db06622
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 37 deletions.
diff --git a/javaConfig.json b/javaConfig.json
@@ -1,4 +1,4 @@
 {
-  "projects": ["../dbeaver", "../cloudbeaver/server"],
+  "projects": ["../dbeaver-common", "../dbeaver", "../cloudbeaver/server"],
   "targetPlatform": "./org.jkiss.cloudbeaver.tp.target"
 }
diff --git a/server/drivers/clickhouse/pom.xml b/server/drivers/clickhouse/pom.xml
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
@@ -11,7 +11,6 @@
     </properties>
 
     <modules>
-        <module>clickhouse</module>
         <module>clickhouse_com</module>
         <module>db2</module>
         <module>db2-jt400</module>

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -138,7 +138,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
               state={handlerState}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              required={!keyAuth && handlerState.savePassword}
+              required={!passwordSaved && !keyAuth && handlerState.savePassword}
               description={passwordSaved ? translate('ui_processing_saved') : undefined}
               tiny
               fill

diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css
@@ -1,4 +1,4 @@
-.propertiesTable {
+.container .propertiesTable {
   flex: 1;
   overflow: hidden;
   padding: 12px 0;

diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
@@ -82,7 +82,7 @@ export const ProcessorConfigureDialog = observer<Props>(function ProcessorConfig
   }
 
   return styled(useStyles(UNDERLINE_TAB_STYLES))(
-    <CommonDialogWrapper size="large" fixedSize>
+    <CommonDialogWrapper className={s(styles, { container: true })} size="large" fixedSize>
       <CommonDialogHeader title={title} onReject={onClose} />
       <CommonDialogBody noOverflow noBodyPadding>
         {!processor.isBinary ? (