mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-09-24 16:04:36 +08:00
Merge remote-tracking branch 'origin/devel' into devel
This commit is contained in:
@@ -39,7 +39,7 @@ export default [
|
||||
['connections_connection_access_grant', 'Grant'],
|
||||
['connections_connection_access_edit', 'Edit'],
|
||||
['connections_connection_access_cloud_placeholder', 'Cloud connections are visible to all users. Access management can be configured in "AWS Management Console".'],
|
||||
['connections_connection_access_empty_table_placeholder', 'There are no items yet. Press edit button to grant role or user.'],
|
||||
['connections_connection_access_empty_table_placeholder', 'There are no items yet. Press Edit button to grant role or user.'],
|
||||
['connections_connection_access_filter_placeholder', 'Search for user or role name'],
|
||||
['connections_connection_access_filter_no_result', 'No results have been found.'],
|
||||
['connections_connection_access_admin_info', 'Administators see all connections.'],
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
* you may not use this file except in compliance with the License.
|
||||
*/
|
||||
|
||||
import { computed } from 'mobx';
|
||||
import { observer } from 'mobx-react-lite';
|
||||
import { useMemo } from 'react';
|
||||
import styled, { css } from 'reshadow';
|
||||
|
||||
import { topMenuStyles } from '@cloudbeaver/core-app';
|
||||
@@ -22,7 +24,6 @@ import { userMenuStyles } from './UserMenu/userMenuStyles';
|
||||
const styles = css`
|
||||
user {
|
||||
height: 100%;
|
||||
padding: 0 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
@@ -41,13 +42,18 @@ export const UserInfo = observer(function UserInfo() {
|
||||
const userMenuService = useService(UserMenuService);
|
||||
const authInfoService = useService(AuthInfoService);
|
||||
const style = useStyles(styles, userMenuStyles);
|
||||
const panel = userMenuService.getMenu();
|
||||
|
||||
const hidden = useMemo(() => computed(
|
||||
() => !panel.menuItems.length || panel.menuItems.every(item => item.isHidden)
|
||||
), [panel]);
|
||||
|
||||
if (!authInfoService.userInfo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return styled(style)(
|
||||
<MenuTrigger panel={userMenuService.getMenu()} style={[topMenuStyles]}>
|
||||
<MenuTrigger panel={panel} style={[topMenuStyles]} disabled={hidden.get()}>
|
||||
<user>
|
||||
<user-icon>
|
||||
<IconOrImage icon='user' viewBox='0 0 28 28' />
|
||||
|
||||
@@ -10,6 +10,7 @@ import { css } from 'reshadow';
|
||||
|
||||
export const userMenuStyles = css`
|
||||
MenuTrigger {
|
||||
opacity: 1;
|
||||
padding: 0 16px !important;
|
||||
height: 48px;
|
||||
cursor: pointer;
|
||||
|
||||
@@ -75,6 +75,10 @@
|
||||
border-left: 1px solid $cursor;
|
||||
}
|
||||
|
||||
.cm-s-material .CodeMirror-scrollbar-filler {
|
||||
@include mdc-theme-prop(background, secondary, false);
|
||||
}
|
||||
|
||||
.cm-s-material :global(div).CodeMirror-selected {
|
||||
background: rgba(128, 203, 196, 0.2);
|
||||
}
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ const styles = composes(
|
||||
}
|
||||
content-type {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
justify-content: center;
|
||||
flex: 0;
|
||||
padding: 0 8px;
|
||||
padding-bottom: 16px;
|
||||
|
||||
Reference in New Issue
Block a user