diff --git a/CHANGELOG.md b/CHANGELOG.md index 65fa2ede..2d6f3b2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Dataset importing to a project () - User is able to customize information that text labels show () - Support for uploading manifest with any name () +- Added information about OpenVINO toolkit to login page () ### Changed - Users don't have access to a task object anymore if they are assigneed only on some jobs of the task () diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 06e5bf83..fc7c7325 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "cvat-ui", - "version": "1.32.1", + "version": "1.32.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cvat-ui", - "version": "1.32.1", + "version": "1.32.2", "license": "MIT", "dependencies": { "@ant-design/icons": "^4.6.3", diff --git a/cvat-ui/package.json b/cvat-ui/package.json index 54c7352b..f6cc3c3b 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.32.1", + "version": "1.32.2", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { diff --git a/cvat-ui/src/assets/openvino.svg b/cvat-ui/src/assets/openvino.svg new file mode 100644 index 00000000..c68b4fc3 --- /dev/null +++ b/cvat-ui/src/assets/openvino.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/context-image/context-image.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/context-image/context-image.tsx index 4649d93a..2bb97dc1 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/context-image/context-image.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/context-image/context-image.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT import React, { useEffect, useState } from 'react'; -import { notification } from 'antd'; +import notification from 'antd/lib/notification'; import { useDispatch, useSelector } from 'react-redux'; import { QuestionCircleOutlined, ShrinkOutlined } from '@ant-design/icons'; import Spin from 'antd/lib/spin'; diff --git a/cvat-ui/src/components/annotation-page/top-bar/filters-modal.tsx b/cvat-ui/src/components/annotation-page/top-bar/filters-modal.tsx index e1a76101..3d4bdb8b 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/filters-modal.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/filters-modal.tsx @@ -11,7 +11,8 @@ import AntdWidgets from 'react-awesome-query-builder/lib/components/widgets/antd import AntdConfig from 'react-awesome-query-builder/lib/config/antd'; import 'react-awesome-query-builder/lib/css/styles.css'; import { DownOutlined } from '@ant-design/icons'; -import { Dropdown, Menu } from 'antd'; +import Dropdown from 'antd/lib/dropdown'; +import Menu from 'antd/lib/menu'; import Button from 'antd/lib/button'; import Modal from 'antd/lib/modal'; import { omit } from 'lodash'; @@ -212,8 +213,9 @@ function FiltersModalComponent(): JSX.Element { applyFilters([QbUtils.jsonLogicFormat(state.tree, config).logic]); }; - const isModalConfirmable = (): boolean => - QbUtils.queryString(state.tree, config)?.trim().length > 0 && QbUtils.isValidTree(state.tree); + const isModalConfirmable = (): boolean => ( + (QbUtils.queryString(state.tree, config) || '').trim().length > 0 && QbUtils.isValidTree(state.tree) + ); const renderBuilder = (builderProps: any): JSX.Element => (
diff --git a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx index 9b68bb81..6913130c 100644 --- a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx +++ b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx @@ -19,7 +19,7 @@ import { createCloudStorageAsync, updateCloudStorageAsync } from 'actions/cloud- import { ProviderType, CredentialsType } from 'utils/enums'; import { QuestionCircleOutlined, UploadOutlined } from '@ant-design/icons'; import Upload, { RcFile } from 'antd/lib/upload'; -import { Space } from 'antd'; +import Space from 'antd/lib/space'; import { AzureProvider, S3Provider, GoogleCloudProvider } from '../../icons'; import S3Region from './s3-region'; import GCSLocation from './gcs-locatiion'; diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index 52fac3c4..38c44591 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -7,7 +7,8 @@ import React, { } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router'; -import { Switch, Select } from 'antd'; +import Switch from 'antd/lib/switch'; +import Select from 'antd/lib/select'; import { Col, Row } from 'antd/lib/grid'; import Text from 'antd/lib/typography/Text'; import Form, { FormInstance } from 'antd/lib/form'; diff --git a/cvat-ui/src/components/header/header.tsx b/cvat-ui/src/components/header/header.tsx index 57b56be7..c54732af 100644 --- a/cvat-ui/src/components/header/header.tsx +++ b/cvat-ui/src/components/header/header.tsx @@ -27,6 +27,7 @@ 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 Select from 'antd/lib/select'; import getCore from 'cvat-core-wrapper'; import consts from 'consts'; @@ -37,7 +38,6 @@ import CVATTooltip from 'components/common/cvat-tooltip'; import { switchSettingsDialog as switchSettingsDialogAction } from 'actions/settings-actions'; import { logoutAsync, authActions } from 'actions/auth-actions'; import { CombinedState } from 'reducers/interfaces'; -import { Select } from 'antd'; import SettingsModal from './settings-modal/settings-modal'; const core = getCore(); diff --git a/cvat-ui/src/components/login-page/intel-footer-drawer.tsx b/cvat-ui/src/components/login-page/intel-footer-drawer.tsx index 2d14e457..644115a6 100644 --- a/cvat-ui/src/components/login-page/intel-footer-drawer.tsx +++ b/cvat-ui/src/components/login-page/intel-footer-drawer.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT import React from 'react'; -import { Layout } from 'antd'; +import Layout from 'antd/lib/layout'; import { isPublic } from 'utils/enviroment'; import consts from 'consts'; diff --git a/cvat-ui/src/components/login-page/login-page.tsx b/cvat-ui/src/components/login-page/login-page.tsx index 66505c7f..e0d11fcc 100644 --- a/cvat-ui/src/components/login-page/login-page.tsx +++ b/cvat-ui/src/components/login-page/login-page.tsx @@ -2,16 +2,21 @@ // // SPDX-License-Identifier: MIT +import './styles.scss'; import React from 'react'; import { RouteComponentProps } from 'react-router'; import { Link, withRouter } from 'react-router-dom'; import Title from 'antd/lib/typography/Title'; import Text from 'antd/lib/typography/Text'; import { Row, Col } from 'antd/lib/grid'; -import { Layout } from 'antd'; +import Button from 'antd/lib/button'; +import Divider from 'antd/lib/divider'; +import Layout from 'antd/lib/layout'; import FooterDrawer from 'components/login-page/intel-footer-drawer'; +import consts from 'consts'; +import { OpenVINOIcon } from 'icons'; import LoginForm, { LoginData } from './login-form'; interface LoginPageComponentProps { @@ -22,11 +27,9 @@ interface LoginPageComponentProps { function LoginPageComponent(props: LoginPageComponentProps & RouteComponentProps): JSX.Element { const sizes = { - xs: { span: 14 }, - sm: { span: 14 }, - md: { span: 10 }, - lg: { span: 4 }, - xl: { span: 4 }, + style: { + width: 400, + }, }; const { Content } = Layout; @@ -36,7 +39,8 @@ function LoginPageComponent(props: LoginPageComponentProps & RouteComponentProps return ( - + + Login )} + + + + + + + + Learn more about products of + OpenVINO™ Toolkit + +