Merge branch 'devel' into CB-4903-Clickhouse-driver-update

dbeaver · Mar 25, 2024 · f08fb79 · f08fb79
2 parents f049b78 + affbe44
commit f08fb79
Show file tree

Hide file tree

Showing 103 changed files with 1,230 additions and 1,156 deletions.
diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json
@@ -23,30 +23,16 @@
     "@cloudbeaver/core-events": "~0.1.0",
     "@cloudbeaver/core-executor": "~0.1.0",
     "@cloudbeaver/core-localization": "~0.1.0",
-    "@cloudbeaver/core-plugin": "~0.1.0",
     "@cloudbeaver/core-resource": "~0.1.0",
     "@cloudbeaver/core-root": "~0.1.0",
     "@cloudbeaver/core-routing": "~0.1.0",
     "@cloudbeaver/core-sdk": "~0.1.0",
     "@cloudbeaver/core-settings": "~0.1.0",
-    "@cloudbeaver/core-theming": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
     "mobx": "^6.12.0"
   },
   "peerDependencies": {},
   "devDependencies": {
-    "@cloudbeaver/core-browser": "~0.1.0",
-    "@cloudbeaver/core-client-activity": "~0.1.0",
-    "@cloudbeaver/core-events": "~0.1.0",
-    "@cloudbeaver/core-localization": "~0.1.0",
-    "@cloudbeaver/core-plugin": "~0.1.0",
-    "@cloudbeaver/core-product": "~0.1.0",
-    "@cloudbeaver/core-root": "~0.1.0",
-    "@cloudbeaver/core-sdk": "~0.1.0",
-    "@cloudbeaver/core-settings": "~0.1.0",
-    "@cloudbeaver/tests-runner": "~0.1.0",
-    "@testing-library/jest-dom": "^6.4.2",
-    "@types/jest": "^29.5.12",
     "typescript": "^5.3.3"
   }
 }
diff --git a/webapp/packages/core-administration/tsconfig.json b/webapp/packages/core-administration/tsconfig.json
@@ -6,12 +6,6 @@
     "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../core-browser/tsconfig.json"
-    },
-    {
-      "path": "../core-client-activity/tsconfig.json"
-    },
     {
       "path": "../core-data-context/tsconfig.json"
     },
@@ -21,59 +15,29 @@
     {
       "path": "../core-events/tsconfig.json"
     },
-    {
-      "path": "../core-events/tsconfig.json"
-    },
     {
       "path": "../core-executor/tsconfig.json"
     },
     {
       "path": "../core-localization/tsconfig.json"
     },
-    {
-      "path": "../core-localization/tsconfig.json"
-    },
-    {
-      "path": "../core-plugin/tsconfig.json"
-    },
-    {
-      "path": "../core-plugin/tsconfig.json"
-    },
-    {
-      "path": "../core-product/tsconfig.json"
-    },
     {
       "path": "../core-resource/tsconfig.json"
     },
     {
       "path": "../core-root/tsconfig.json"
     },
-    {
-      "path": "../core-root/tsconfig.json"
-    },
     {
       "path": "../core-routing/tsconfig.json"
     },
     {
       "path": "../core-sdk/tsconfig.json"
     },
-    {
-      "path": "../core-sdk/tsconfig.json"
-    },
     {
       "path": "../core-settings/tsconfig.json"
     },
-    {
-      "path": "../core-settings/tsconfig.json"
-    },
-    {
-      "path": "../core-theming/tsconfig.json"
-    },
     {
       "path": "../core-utils/tsconfig.json"
-    },
-    {
-      "path": "../tests-runner/tsconfig.json"
     }
   ],
   "include": [

diff --git a/webapp/packages/core-blocks/src/Fill.m.css b/webapp/packages/core-blocks/src/Fill.m.css
@@ -1,3 +1,3 @@
 .fill {
-  flex: 1;
+  flex: 1 !important;
 }
diff --git a/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts b/webapp/packages/core-blocks/src/FormControls/BASE_DROPDOWN_STYLES.ts
diff --git a/webapp/packages/core-blocks/src/FormControls/BaseDropdown.m.css b/webapp/packages/core-blocks/src/FormControls/BaseDropdown.m.css
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+.menuItem {
+  composes: theme-ripple from global;
+}
+
+.menu {
+  composes: theme-text-on-surface theme-background-surface theme-typography--caption theme-elevation-z3 from global;
+  display: flex;
+  flex-direction: column;
+  max-height: 300px;
+  overflow: auto;
+  outline: none;
+  z-index: 999;
+  border-radius: var(--theme-form-element-radius);
+
+  & .menuItem {
+    background: transparent;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 8px 12px;
+    text-align: left;
+    outline: none;
+    color: inherit;
+    cursor: pointer;
+    gap: 8px;
+
+    & .itemIcon,
+    & .itemTitle {
+      position: relative;
+    }
+
+    & .itemIcon {
+      width: 16px;
+      height: 16px;
+      overflow: hidden;
+      flex-shrink: 0;
+
+      & .iconOrImage {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
@@ -8,9 +8,8 @@
 import { observer } from 'mobx-react-lite';
 import { useCallback, useEffect, useRef } from 'react';
 import { Menu, MenuButton, MenuItem, useMenuState } from 'reakit/Menu';
-import styled from 'reshadow';
 
-import { BASE_DROPDOWN_STYLES } from '../FormControls/BASE_DROPDOWN_STYLES';
+import { BaseDropdownStyles } from '..';
 import { s } from '../s';
 import { useS } from '../useS';
 import classes from './PropertyValueSelector.m.css';
@@ -33,7 +32,7 @@ export const PropertyValueSelector = observer<React.PropsWithChildren<Props>>(fu
   onSelect,
   onSwitch,
 }) {
-  const styles = useS(classes);
+  const styles = useS(classes, BaseDropdownStyles);
   const menuRef = useRef<HTMLDivElement>(null);
   const menu = useMenuState({
     placement: 'bottom-end',
@@ -70,19 +69,19 @@ export const PropertyValueSelector = observer<React.PropsWithChildren<Props>>(fu
 
   const visible = menu.visible;
 
-  return styled(BASE_DROPDOWN_STYLES)(
+  return (
     <>
       <MenuButton {...menu} className={s(styles, { menuButton: true }, className)} visible={visible}>
         {children}
       </MenuButton>
-      <Menu {...menu} ref={menuRef} visible={visible} aria-label={propertyName} modal>
+      <Menu className={s(styles, { menu: true })} {...menu} ref={menuRef} visible={visible} aria-label={propertyName} modal>
         {visible &&
           values.map(value => (
-            <MenuItem key={value} id={value} type="button" {...menu} onClick={handleMenuSelect}>
+            <MenuItem key={value} className={s(styles, { menuItem: true })} id={value} type="button" {...menu} onClick={handleMenuSelect}>
               {value}
             </MenuItem>
           ))}
       </Menu>
-    </>,
+    </>
   );
 });
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
@@ -128,8 +128,8 @@ export * from './FormControls/Checkboxes/FieldCheckbox';
 export * from './FormControls/Checkboxes/CheckboxMarkup';
 export * from './FormControls/Checkboxes/Switch';
 export * from './FormControls/Checkboxes/useCheckboxState';
-export * from './FormControls/BASE_DROPDOWN_STYLES';
 export * from './FormControls/Filter';
+export { default as BaseDropdownStyles } from './FormControls/BaseDropdown.m.css';
 export { default as FilterStyles } from './FormControls/Filter.m.css';
 export * from './Fill';
 

diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -81,7 +81,7 @@ export const DEFAULT_NAVIGATOR_VIEW_SETTINGS: NavigatorSettingsInput = {
 @injectable()
 export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoParams, Connection, ConnectionInfoIncludes> {
   readonly onConnectionCreate: ISyncExecutor<Connection>;
-  readonly onConnectionClose: ISyncExecutor<Connection>;
+  readonly onConnectionClose: ISyncExecutor<IConnectionInfoParams>;
 
   private sessionUpdate: boolean;
   private readonly nodeIdMap: Map<string, IConnectionInfoParams>;
@@ -445,7 +445,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
     });
 
     const connection = this.get(key)!;
-    this.onConnectionClose.execute(connection);
+    this.onConnectionClose.execute(key);
     return connection;
   }
 

diff --git a/webapp/packages/core-ui/package.json b/webapp/packages/core-ui/package.json
@@ -26,16 +26,14 @@
     "@cloudbeaver/core-executor": "~0.1.0",
     "@cloudbeaver/core-localization": "~0.1.0",
     "@cloudbeaver/core-routing": "~0.1.0",
-    "@cloudbeaver/core-theming": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
     "@cloudbeaver/core-view": "~0.1.0",
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
     "react": "^18.2.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "reakit": "~1.3.11",
-    "reshadow": "^0.0.1"
+    "reakit": "~1.3.11"
   },
   "peerDependencies": {},
   "devDependencies": {