diff --git a/cvat-ui/src/components/header/header.tsx b/cvat-ui/src/components/header/header.tsx index 0ea4d342..1c114ae9 100644 --- a/cvat-ui/src/components/header/header.tsx +++ b/cvat-ui/src/components/header/header.tsx @@ -4,26 +4,18 @@ import './styles.scss'; import React from 'react'; - import { RouteComponentProps } from 'react-router'; import { withRouter } from 'react-router-dom'; -import { - Layout, - Icon, - Button, - Menu, - Dropdown, - Modal, - Row, - Col, -} from 'antd'; - +import { Row, Col } from 'antd/lib/grid'; +import Layout from 'antd/lib/layout'; +import Icon from 'antd/lib/icon'; +import Button from 'antd/lib/button'; +import Menu from 'antd/lib/menu'; +import Dropdown from 'antd/lib/dropdown'; +import Modal from 'antd/lib/modal'; import Text from 'antd/lib/typography/Text'; -import { - CVATLogo, - AccountIcon, -} from 'icons'; +import { CVATLogo, AccountIcon } from 'icons'; interface HeaderContainerProps { onLogout: () => void; @@ -40,6 +32,7 @@ interface HeaderContainerProps { coreVersion: string; canvasVersion: string; uiVersion: string; + switchSettingsShortcut: string; } type Props = HeaderContainerProps & RouteComponentProps; @@ -60,6 +53,7 @@ function HeaderContainer(props: Props): JSX.Element { uiVersion, onLogout, logoutFetching, + switchSettingsShortcut, } = props; const renderModels = installedAutoAnnotation @@ -131,6 +125,7 @@ function HeaderContainer(props: Props): JSX.Element { const menu = ( props.history.push('/settings') } diff --git a/cvat-ui/src/containers/header/header.tsx b/cvat-ui/src/containers/header/header.tsx index cd0aa412..e42fa30a 100644 --- a/cvat-ui/src/containers/header/header.tsx +++ b/cvat-ui/src/containers/header/header.tsx @@ -4,14 +4,11 @@ import { connect } from 'react-redux'; -import { - SupportedPlugins, - CombinedState, -} from 'reducers/interfaces'; - import getCore from 'cvat-core'; import HeaderComponent from 'components/header/header'; +import { SupportedPlugins, CombinedState } from 'reducers/interfaces'; import { logoutAsync } from 'actions/auth-actions'; +import { formatShortcuts } from 'utils/shortcuts'; const core = getCore(); @@ -29,6 +26,7 @@ interface StateToProps { coreVersion: string; canvasVersion: string; uiVersion: string; + switchSettingsShortcut: string; } interface DispatchToProps { @@ -50,6 +48,9 @@ function mapStateToProps(state: CombinedState): StateToProps { server, packageVersion, }, + shortcuts: { + keyMap, + }, } = state; return { @@ -66,6 +67,7 @@ function mapStateToProps(state: CombinedState): StateToProps { coreVersion: packageVersion.core, canvasVersion: packageVersion.canvas, uiVersion: packageVersion.ui, + switchSettingsShortcut: formatShortcuts(keyMap.OPEN_SETTINGS), }; }