diff --git a/cvat-ui/src/assets/exit-fullscreen-icon.svg b/cvat-ui/src/assets/exit-fullscreen-icon.svg deleted file mode 100644 index ac7cc5ec..00000000 --- a/cvat-ui/src/assets/exit-fullscreen-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/menu-icon.svg b/cvat-ui/src/assets/menu-icon.svg deleted file mode 100644 index f6b0c75c..00000000 --- a/cvat-ui/src/assets/menu-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/object-hide-icon.svg b/cvat-ui/src/assets/object-hide-icon.svg deleted file mode 100644 index 7f5c73d1..00000000 --- a/cvat-ui/src/assets/object-hide-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/object-inside-icon.svg b/cvat-ui/src/assets/object-inside-icon.svg deleted file mode 100644 index f7e1236e..00000000 --- a/cvat-ui/src/assets/object-inside-icon.svg +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/cvat-ui/src/assets/object-occlude-icon.svg b/cvat-ui/src/assets/object-occlude-icon.svg deleted file mode 100644 index 1c36005d..00000000 --- a/cvat-ui/src/assets/object-occlude-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/plus-icon.svg b/cvat-ui/src/assets/plus-icon.svg deleted file mode 100644 index 0ef42441..00000000 --- a/cvat-ui/src/assets/plus-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/settings-icon.svg b/cvat-ui/src/assets/settings-icon.svg deleted file mode 100644 index 2b58c359..00000000 --- a/cvat-ui/src/assets/settings-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/show-sidebar-icon.svg b/cvat-ui/src/assets/show-sidebar-icon.svg deleted file mode 100644 index c982adb3..00000000 --- a/cvat-ui/src/assets/show-sidebar-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/assets/side-icon-object-lock.svg b/cvat-ui/src/assets/side-icon-object-lock.svg deleted file mode 100644 index 42d3d4af..00000000 --- a/cvat-ui/src/assets/side-icon-object-lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/cvat-ui/src/components/actions-menu/styles.scss b/cvat-ui/src/components/actions-menu/styles.scss index 1b690922..0d61b453 100644 --- a/cvat-ui/src/components/actions-menu/styles.scss +++ b/cvat-ui/src/components/actions-menu/styles.scss @@ -46,7 +46,9 @@ } .cvat-menu-icon { - transform: scale(0.5); + font-size: 16px; + margin-left: 8px; + align-self: center; } #cvat-export-task-loading { diff --git a/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx b/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx index c9c4b18c..c6989650 100644 --- a/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx +++ b/cvat-ui/src/components/annotation-page/review/hidden-issue-label.tsx @@ -5,7 +5,7 @@ import React, { ReactPortal, useEffect, useRef } from 'react'; import ReactDOM from 'react-dom'; import Tag from 'antd/lib/tag'; -import { CheckOutlined, CloseCircleOutlined } from '@ant-design/icons'; +import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; @@ -60,7 +60,7 @@ export default function HiddenIssueLabel(props: Props): ReactPortal { className='cvat-hidden-issue-label' > {resolved ? ( - + ) : ( )} diff --git a/cvat-ui/src/components/annotation-page/top-bar/left-group.tsx b/cvat-ui/src/components/annotation-page/top-bar/left-group.tsx index 636e7928..474c0697 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/left-group.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/left-group.tsx @@ -1,10 +1,10 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React from 'react'; import { Col } from 'antd/lib/grid'; -import Icon, { StopOutlined, CheckOutlined } from '@ant-design/icons'; +import Icon, { StopOutlined, CheckCircleOutlined } from '@ant-design/icons'; import Modal from 'antd/lib/modal'; import Button from 'antd/lib/button'; import Timeline from 'antd/lib/timeline'; @@ -120,7 +120,7 @@ function LeftGroup(props: Props): JSX.Element { {includesDoneButton ? ( diff --git a/cvat-ui/src/components/cloud-storages-page/cloud-storage-preview.tsx b/cvat-ui/src/components/cloud-storages-page/cloud-storage-preview.tsx index fe45098e..02aa7647 100644 --- a/cvat-ui/src/components/cloud-storages-page/cloud-storage-preview.tsx +++ b/cvat-ui/src/components/cloud-storages-page/cloud-storage-preview.tsx @@ -1,11 +1,11 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React, { useEffect } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { CloudSyncOutlined } from '@ant-design/icons'; +import { PictureOutlined } from '@ant-design/icons'; import Spin from 'antd/lib/spin'; import { getCloudStoragePreviewAsync } from 'actions/cloud-storage-actions'; import { CombinedState, CloudStorage } from 'reducers/interfaces'; @@ -35,7 +35,7 @@ export default function Preview({ cloudStorage }: Props): JSX.Element { if (preview.initialized && !preview.preview) { return (
- +
); } diff --git a/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx b/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx index a620adc4..224afda6 100644 --- a/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx +++ b/cvat-ui/src/components/cloud-storages-page/empty-cloud-storages-list.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -7,7 +7,7 @@ import React from 'react'; import Empty from 'antd/lib/empty'; import { Row, Col } from 'antd/lib/grid'; import Text from 'antd/lib/typography/Text'; -import { CloudTwoTone } from '@ant-design/icons'; +import { CloudOutlined } from '@ant-design/icons'; import { Link } from 'react-router-dom'; interface Props { @@ -45,7 +45,7 @@ export default function EmptyStoragesListComponent(props: Props): JSX.Element { return (
- } /> + } />
); } diff --git a/cvat-ui/src/components/cloud-storages-page/styles.scss b/cvat-ui/src/components/cloud-storages-page/styles.scss index 7fff8751..817f11c7 100644 --- a/cvat-ui/src/components/cloud-storages-page/styles.scss +++ b/cvat-ui/src/components/cloud-storages-page/styles.scss @@ -18,6 +18,7 @@ .cvat-empty-cloud-storages-list-icon { font-size: $grid-unit-size * 14; + opacity: 0.5; } .cvat-cloud-storages-pagination { diff --git a/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx b/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx index dbd0a94a..4c8febc2 100644 --- a/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx +++ b/cvat-ui/src/components/create-cloud-storage-page/manifests-manager.tsx @@ -1,9 +1,9 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React, { useEffect, useRef, useState } from 'react'; -import { MinusCircleOutlined, PlusCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons'; +import { DeleteOutlined, PlusCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import Button from 'antd/lib/button'; import Col from 'antd/lib/col'; import Form from 'antd/lib/form'; @@ -116,7 +116,7 @@ export default function ManifestsManager(props: Props): JSX.Element { diff --git a/cvat-ui/src/components/import-dataset-modal/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset-modal/import-dataset-modal.tsx index b814799d..060a7435 100644 --- a/cvat-ui/src/components/import-dataset-modal/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset-modal/import-dataset-modal.tsx @@ -14,7 +14,7 @@ import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; import { - DownloadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleFilled, + UploadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleOutlined, } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; @@ -74,7 +74,7 @@ function ImportDatasetModal(): JSX.Element { 'Labels from project will be used' } > - + )} @@ -114,7 +114,7 @@ function ImportDatasetModal(): JSX.Element { disabled={disabled} className='cvat-modal-import-dataset-option-item' > - + {importer.name} {pending && } diff --git a/cvat-ui/src/components/labels-editor/constructor-viewer-item.tsx b/cvat-ui/src/components/labels-editor/constructor-viewer-item.tsx index fe436f61..55bf0681 100644 --- a/cvat-ui/src/components/labels-editor/constructor-viewer-item.tsx +++ b/cvat-ui/src/components/labels-editor/constructor-viewer-item.tsx @@ -1,9 +1,9 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React from 'react'; -import { EditOutlined, CloseOutlined } from '@ant-design/icons'; +import { DeleteOutlined, EditOutlined } from '@ant-design/icons'; import Text from 'antd/lib/typography/Text'; import CVATTooltip from 'components/common/cvat-tooltip'; @@ -42,7 +42,7 @@ export default function ConstructorViewerItem(props: ConstructorViewerItemProps) onClick={(): void => onDelete(label)} onKeyPress={(): boolean => false} > - + diff --git a/cvat-ui/src/components/labels-editor/label-form.tsx b/cvat-ui/src/components/labels-editor/label-form.tsx index 165be588..1aadd462 100644 --- a/cvat-ui/src/components/labels-editor/label-form.tsx +++ b/cvat-ui/src/components/labels-editor/label-form.tsx @@ -4,7 +4,7 @@ import React, { RefObject } from 'react'; import { Row, Col } from 'antd/lib/grid'; -import Icon, { CloseCircleOutlined, PlusOutlined } from '@ant-design/icons'; +import Icon, { DeleteOutlined, PlusCircleOutlined } from '@ant-design/icons'; import Input from 'antd/lib/input'; import Button from 'antd/lib/button'; import Checkbox from 'antd/lib/checkbox'; @@ -329,7 +329,7 @@ export default class LabelForm extends React.Component { this.removeAttribute(key); }} > - + @@ -417,7 +417,7 @@ export default class LabelForm extends React.Component { ); @@ -536,7 +536,7 @@ export default class LabelForm extends React.Component { {this.renderChangeColorButton()} - + {this.renderNewAttributeButton()} diff --git a/cvat-ui/src/components/labels-editor/labels-editor.tsx b/cvat-ui/src/components/labels-editor/labels-editor.tsx index 8edd1e18..3ccda668 100644 --- a/cvat-ui/src/components/labels-editor/labels-editor.tsx +++ b/cvat-ui/src/components/labels-editor/labels-editor.tsx @@ -156,8 +156,8 @@ export default class LabelsEditor extends React.PureComponent= 0) { ModalConfirm({ className: 'cvat-modal-delete-label', - title: `Do you want to delete "${label.name}" label?`, icon: , + title: `Do you want to delete "${label.name}" label?`, content: 'This action is irreversible. Annotation corresponding with this label will be deleted.', type: 'warning', okType: 'danger', diff --git a/cvat-ui/src/components/model-runner-modal/detector-runner.tsx b/cvat-ui/src/components/model-runner-modal/detector-runner.tsx index 706f4421..82932810 100644 --- a/cvat-ui/src/components/model-runner-modal/detector-runner.tsx +++ b/cvat-ui/src/components/model-runner-modal/detector-runner.tsx @@ -1,25 +1,21 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT import './styles.scss'; import React, { useState } from 'react'; import { Row, Col } from 'antd/lib/grid'; -import { CloseCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import Select from 'antd/lib/select'; +import { DeleteOutlined, QuestionCircleOutlined } from '@ant-design/icons'; +import Select, { BaseOptionType } from 'antd/lib/select'; import Checkbox, { CheckboxChangeEvent } from 'antd/lib/checkbox'; import Tag from 'antd/lib/tag'; import Text from 'antd/lib/typography/Text'; import InputNumber from 'antd/lib/input-number'; import Button from 'antd/lib/button'; import notification from 'antd/lib/notification'; -// eslint-disable-next-line import/no-extraneous-dependencies -import { OptionData, OptionGroupData } from 'rc-select/lib/interface'; import { Model, StringObject } from 'reducers/interfaces'; - import CVATTooltip from 'components/common/cvat-tooltip'; - import { clamp } from 'utils/math'; import consts from 'consts'; import { DimensionType } from '../../reducers/interfaces'; @@ -101,7 +97,7 @@ function DetectorRunner(props: Props): JSX.Element { onChange={onChange} style={{ width: '100%' }} showSearch - filterOption={(input: string, option?: OptionData | OptionGroupData) => { + filterOption={(input: string, option: BaseOptionType | undefined) => { if (option) { const { children } = option.props; if (typeof children === 'string') { @@ -172,7 +168,7 @@ function DetectorRunner(props: Props): JSX.Element { - { const newmapping = { ...mapping }; diff --git a/cvat-ui/src/components/move-task-modal/move-task-modal.tsx b/cvat-ui/src/components/move-task-modal/move-task-modal.tsx index 18a78d79..209baae8 100644 --- a/cvat-ui/src/components/move-task-modal/move-task-modal.tsx +++ b/cvat-ui/src/components/move-task-modal/move-task-modal.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -9,7 +9,7 @@ import Modal from 'antd/lib/modal'; import { Row, Col } from 'antd/lib/grid'; import Divider from 'antd/lib/divider'; import notification from 'antd/lib/notification'; -import { QuestionCircleFilled } from '@ant-design/icons'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import ProjectSearch from 'components/create-task-page/project-search-field'; import CVATTooltip from 'components/common/cvat-tooltip'; @@ -121,7 +121,7 @@ export default function MoveTaskModal(): JSX.Element { {`Move task ${task?.id} to project`} {/* TODO: replace placeholder */} - + )} diff --git a/cvat-ui/src/components/organization-page/member-item.tsx b/cvat-ui/src/components/organization-page/member-item.tsx index ff00d83c..b5a7eba6 100644 --- a/cvat-ui/src/components/organization-page/member-item.tsx +++ b/cvat-ui/src/components/organization-page/member-item.tsx @@ -7,7 +7,7 @@ import Select from 'antd/lib/select'; import Text from 'antd/lib/typography/Text'; import { Row, Col } from 'antd/lib/grid'; import moment from 'moment'; -import { CloseOutlined } from '@ant-design/icons'; +import { DeleteOutlined } from '@ant-design/icons'; import Modal from 'antd/lib/modal'; export interface Props { @@ -62,7 +62,7 @@ function MemberItem(props: Props): JSX.Element { {role !== 'owner' ? ( - { Modal.confirm({ className: 'cvat-modal-organization-member-remove', diff --git a/cvat-ui/src/components/organization-page/top-bar.tsx b/cvat-ui/src/components/organization-page/top-bar.tsx index ab40483f..f2c84c8c 100644 --- a/cvat-ui/src/components/organization-page/top-bar.tsx +++ b/cvat-ui/src/components/organization-page/top-bar.tsx @@ -16,7 +16,8 @@ import Select from 'antd/lib/select'; import { useForm } from 'antd/lib/form/Form'; import { Store } from 'antd/lib/form/interface'; import { - CloseOutlined, EditTwoTone, EnvironmentOutlined, MailOutlined, PhoneOutlined, PlusCircleOutlined, + EditTwoTone, EnvironmentOutlined, + MailOutlined, PhoneOutlined, PlusCircleOutlined, DeleteOutlined, } from '@ant-design/icons'; import { @@ -324,7 +325,9 @@ function OrganizationTopBar(props: Props): JSX.Element { - {index > 0 ? remove(field.name)} /> : null} + {index > 0 ? ( + remove(field.name)} /> + ) : null} ))} diff --git a/cvat-ui/src/components/project-page/top-bar.tsx b/cvat-ui/src/components/project-page/top-bar.tsx index aa5720a7..73ad19db 100644 --- a/cvat-ui/src/components/project-page/top-bar.tsx +++ b/cvat-ui/src/components/project-page/top-bar.tsx @@ -1,18 +1,17 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React from 'react'; import { useHistory } from 'react-router'; import { Row, Col } from 'antd/lib/grid'; -import Icon, { LeftOutlined } from '@ant-design/icons'; +import { LeftOutlined, MoreOutlined } from '@ant-design/icons'; import Button from 'antd/lib/button'; import Dropdown from 'antd/lib/dropdown'; import Text from 'antd/lib/typography/Text'; import { Project } from 'reducers/interfaces'; import ActionsMenu from 'components/projects-page/actions-menu'; -import { MenuIcon } from 'icons'; interface DetailsComponentProps { projectInstance: Project; @@ -35,7 +34,7 @@ export default function ProjectTopBar(props: DetailsComponentProps): JSX.Element }> diff --git a/cvat-ui/src/components/task-page/details.tsx b/cvat-ui/src/components/task-page/details.tsx index e75bda16..322f3ca6 100644 --- a/cvat-ui/src/components/task-page/details.tsx +++ b/cvat-ui/src/components/task-page/details.tsx @@ -1,11 +1,11 @@ -// Copyright (C) 2019-2021 Intel Corporation +// Copyright (C) 2019-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React from 'react'; import { Row, Col } from 'antd/lib/grid'; import Tag from 'antd/lib/tag'; -import { CheckCircleOutlined, LoadingOutlined, WarningOutlined } from '@ant-design/icons'; +import { CheckCircleOutlined, ExclamationCircleOutlined, LoadingOutlined } from '@ant-design/icons'; import Modal from 'antd/lib/modal'; import notification from 'antd/lib/notification'; import Text from 'antd/lib/typography/Text'; @@ -276,7 +276,7 @@ export default class DetailsComponent extends React.PureComponent }); }} > - + Synchronize )} diff --git a/cvat-ui/src/components/task-page/top-bar.tsx b/cvat-ui/src/components/task-page/top-bar.tsx index a92b25cd..6a50eb0e 100644 --- a/cvat-ui/src/components/task-page/top-bar.tsx +++ b/cvat-ui/src/components/task-page/top-bar.tsx @@ -1,17 +1,16 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT import React from 'react'; import { useHistory } from 'react-router'; import { Row, Col } from 'antd/lib/grid'; -import Icon, { LeftOutlined } from '@ant-design/icons'; +import { LeftOutlined, MoreOutlined } from '@ant-design/icons'; import Button from 'antd/lib/button'; import Dropdown from 'antd/lib/dropdown'; import Text from 'antd/lib/typography/Text'; import ActionsMenuContainer from 'containers/actions-menu/actions-menu'; -import { MenuIcon } from 'icons'; interface DetailsComponentProps { taskInstance: any; @@ -45,7 +44,7 @@ export default function DetailsComponent(props: DetailsComponentProps): JSX.Elem }> diff --git a/cvat-ui/src/components/tasks-page/task-item.tsx b/cvat-ui/src/components/tasks-page/task-item.tsx index 0c0859b7..44755a65 100644 --- a/cvat-ui/src/components/tasks-page/task-item.tsx +++ b/cvat-ui/src/components/tasks-page/task-item.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -8,14 +8,13 @@ import { withRouter } from 'react-router-dom'; import Text from 'antd/lib/typography/Text'; import { Row, Col } from 'antd/lib/grid'; import Button from 'antd/lib/button'; -import Icon from '@ant-design/icons'; +import { MoreOutlined } from '@ant-design/icons'; import Dropdown from 'antd/lib/dropdown'; import Progress from 'antd/lib/progress'; import moment from 'moment'; import ActionsMenuContainer from 'containers/actions-menu/actions-menu'; import { ActiveInference } from 'reducers/interfaces'; -import { MenuIcon } from 'icons'; import AutomaticAnnotationProgress from './automatic-annotation-progress'; export interface TaskItemProps { @@ -162,7 +161,7 @@ class TaskItemComponent extends React.PureComponent Actions }> - + diff --git a/cvat-ui/src/icons.tsx b/cvat-ui/src/icons.tsx index feb319f1..4efd64ad 100644 --- a/cvat-ui/src/icons.tsx +++ b/cvat-ui/src/icons.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -6,7 +6,6 @@ import React from 'react'; import SVGCVATLogo from './assets/cvat-logo.svg'; import SVGEmptyTasksIcon from './assets/empty-tasks-icon.svg'; -import SVGMenuIcon from './assets/menu-icon.svg'; import SVGCursorIcon from './assets/cursor-icon.svg'; import SVGMoveIcon from './assets/move-icon.svg'; import SVGRotateIcon from './assets/rotate-icon.svg'; @@ -40,7 +39,6 @@ import SVGLastIcon from './assets/last-icon.svg'; import SVGInfoIcon from './assets/info-icon.svg'; import SVGFullscreenIcon from './assets/fullscreen-icon.svg'; import SVGObjectOutsideIcon from './assets/object-outside-icon.svg'; -import SVGObjectInsideIcon from './assets/object-inside-icon.svg'; import SVGBackgroundIcon from './assets/background-icon.svg'; import SVGForegroundIcon from './assets/foreground-icon.svg'; import SVGCubeIcon from './assets/cube-icon.svg'; @@ -57,7 +55,6 @@ import SVGOpenVINO from './assets/openvino.svg'; export const CVATLogo = React.memo((): JSX.Element => ); export const EmptyTasksIcon = React.memo((): JSX.Element => ); -export const MenuIcon = React.memo((): JSX.Element => ); export const CursorIcon = React.memo((): JSX.Element => ); export const MoveIcon = React.memo((): JSX.Element => ); export const RotateIcon = React.memo((): JSX.Element => ); @@ -91,7 +88,6 @@ export const LastIcon = React.memo((): JSX.Element => ); export const InfoIcon = React.memo((): JSX.Element => ); export const FullscreenIcon = React.memo((): JSX.Element => ); export const ObjectOutsideIcon = React.memo((): JSX.Element => ); -export const ObjectInsideIcon = React.memo((): JSX.Element => ); export const BackgroundIcon = React.memo((): JSX.Element => ); export const ForegroundIcon = React.memo((): JSX.Element => ); export const CubeIcon = React.memo((): JSX.Element => ); diff --git a/tests/cypress/integration/actions_projects_models/case_103_project_export.js b/tests/cypress/integration/actions_projects_models/case_103_project_export.js index d8062b1f..04be7163 100644 --- a/tests/cypress/integration/actions_projects_models/case_103_project_export.js +++ b/tests/cypress/integration/actions_projects_models/case_103_project_export.js @@ -159,7 +159,7 @@ context('Export project dataset.', { browser: '!firefox' }, () => { // Deleting the label cy.get('.cvat-constructor-viewer-item') .should('have.length', 1) - .find('[aria-label="close"]') + .find('[aria-label="delete"]') .click(); cy.get('.cvat-modal-delete-label') .contains('button', 'OK') diff --git a/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js b/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js index 677bd5c4..e9ebf897 100644 --- a/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js +++ b/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -64,7 +64,7 @@ context('Add/delete labels and attributes.', () => { }); it('Delete the added label. The label removed.', () => { - cy.get('.cvat-constructor-viewer-item').find('[aria-label="close"]').click(); + cy.get('.cvat-constructor-viewer-item').find('[aria-label="delete"]').click(); cy.get('.cvat-constructor-viewer-item').should('not.exist'); }); }); diff --git a/tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js b/tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js index ebd20bee..82f208b2 100644 --- a/tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js +++ b/tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -46,7 +46,7 @@ context('Cloud storage.', () => { .should('have.attr', 'value', '') .type(dummyData.manifest) .should('have.attr', 'value', dummyData.manifest); - cy.get('[data-icon="minus-circle"]').should('be.visible').click(); + cy.get('[data-icon="delete"]').should('be.visible').click(); cy.get('[placeholder="manifest.jsonl"]').should('not.exist'); }); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 110594e5..0b120832 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -663,7 +663,7 @@ Cypress.Commands.add('deleteLabel', (labelName) => { cy.contains('.cvat-constructor-viewer-item', new RegExp(`^${labelName}$`)) .should('exist') .and('be.visible') - .find('[aria-label="close"]') + .find('[aria-label="delete"]') .click(); cy.intercept('PATCH', /\/api\/(tasks|projects)\/.*/).as('deleteLabel'); cy.get('.cvat-modal-delete-label')