Remove duplicate enums from cvat-ui/src/reducers/index.ts

cvat-ui/src/actions/annotation-actions.ts

@@ -12,7 +12,7 @@ import {
 } from 'cvat-canvas-wrapper';
 import {
     getCore, MLModel, JobType, Job, QualityConflict,
-    ObjectState, JobState, JobValidationLayout,
+    ObjectState, ObjectType, ShapeType, JobState, JobValidationLayout,
 } from 'cvat-core-wrapper';
 import logger, { EventScope } from 'cvat-logger';
 import { getCVATStore } from 'cvat-store';
@@ -23,10 +23,8 @@ import {
     ContextMenuType,
     FrameSpeed,
     NavigationType,
-    ObjectType,
     OpenCVTool,
     Rotation,
-    ShapeType,
     Workspace,
 } from 'reducers';
 import { switchToolsBlockerState } from './settings-actions';

cvat-ui/src/actions/tasks-actions.ts

@@ -4,9 +4,9 @@
 // SPDX-License-Identifier: MIT
 
 import { AnyAction } from 'redux';
-import { TasksQuery, StorageLocation } from 'reducers';
+import { TasksQuery } from 'reducers';
 import {
-    getCore, RQStatus, Storage, Task, UpdateStatusData, Request,
+    getCore, RQStatus, Storage, StorageLocation, Task, UpdateStatusData, Request,
 } from 'cvat-core-wrapper';
 import { filterNull } from 'utils/filter-null';
 import { ThunkDispatch, ThunkAction } from 'utils/redux';

cvat-ui/src/components/annotation-page/attribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx

@@ -10,7 +10,7 @@ import Layout, { SiderProps } from 'antd/lib/layout';
 import Text from 'antd/lib/typography/Text';
 
 import { filterApplicableLabels } from 'utils/filter-applicable-labels';
-import { Label } from 'cvat-core-wrapper';
+import { Label, ObjectType } from 'cvat-core-wrapper';
 import {
     activateObject as activateObjectAction,
     changeFrameAsync,
@@ -21,7 +21,7 @@ import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 import { ThunkDispatch } from 'utils/redux';
 import AppearanceBlock from 'components/annotation-page/appearance-block';
 import ObjectButtonsContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/object-buttons';
-import { CombinedState, ObjectType } from 'reducers';
+import { CombinedState } from 'reducers';
 import { registerComponentShortcuts } from 'actions/shortcuts-actions';
 import { ShortcutScope } from 'utils/enums';
 import { subKeyMap } from 'utils/component-subkeymap';

cvat-ui/src/components/annotation-page/canvas/views/canvas2d/brush-tools.tsx

@@ -14,14 +14,16 @@ import Select from 'antd/lib/select';
 import notification from 'antd/lib/notification';
 
 import { filterApplicableForType } from 'utils/filter-applicable-labels';
-import { getCore, Label, LabelType } from 'cvat-core-wrapper';
+import {
+    getCore, Label, LabelType, ObjectType, ShapeType,
+} from 'cvat-core-wrapper';
 import { Canvas, CanvasMode } from 'cvat-canvas-wrapper';
 import {
     BrushIcon, EraserIcon, PolygonMinusIcon, PolygonPlusIcon,
     PlusIcon, CheckIcon, MoveIcon,
 } from 'icons';
 import CVATTooltip from 'components/common/cvat-tooltip';
-import { CombinedState, ObjectType, ShapeType } from 'reducers';
+import { CombinedState } from 'reducers';
 import LabelSelector from 'components/label-selector/label-selector';
 import { changeHideActiveObjectAsync, rememberObject, updateCanvasBrushTools } from 'actions/annotation-actions';
 import { ShortcutScope } from 'utils/enums';

cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-context-menu.tsx

@@ -11,10 +11,12 @@ import { MenuInfo } from 'rc-menu/lib/interface';
 
 import ObjectItemElementComponent from 'components/annotation-page/standard-workspace/objects-side-bar/object-item-element';
 import ObjectItemContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/object-item';
-import { ShapeType, Workspace } from 'reducers';
+import { Workspace } from 'reducers';
 import { rotatePoint } from 'utils/math';
 import config from 'config';
-import { AnnotationConflict, ObjectState, QualityConflict } from 'cvat-core-wrapper';
+import {
+    AnnotationConflict, ObjectState, ShapeType, QualityConflict,
+} from 'cvat-core-wrapper';
 
 interface Props {
     readonly: boolean;

cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-point-context-menu.tsx

@@ -8,9 +8,10 @@ import Button from 'antd/lib/button';
 import { DeleteOutlined, EnvironmentOutlined } from '@ant-design/icons';
 import { connect } from 'react-redux';
 
-import { CombinedState, ContextMenuType, ShapeType } from 'reducers';
+import { CombinedState, ContextMenuType } from 'reducers';
 import { updateAnnotationsAsync, updateCanvasContextMenu } from 'actions/annotation-actions';
 import CVATTooltip from 'components/common/cvat-tooltip';
+import { ShapeType } from 'cvat-core-wrapper';
 
 interface StateToProps {
     activatedState: any | null;

cvat-ui/src/components/annotation-page/canvas/views/canvas2d/canvas-wrapper.tsx

@@ -16,13 +16,13 @@ import debounce from 'lodash/debounce';
 
 import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 import {
-    ColorBy, GridColor, ObjectType, Workspace, ShapeType, ActiveControl, CombinedState,
+    ColorBy, GridColor, Workspace, ActiveControl, CombinedState,
 } from 'reducers';
 import { EventScope } from 'cvat-logger';
 import { Canvas, HighlightSeverity, CanvasHint } from 'cvat-canvas-wrapper';
 import { Canvas3d } from 'cvat-canvas3d-wrapper';
 import {
-    AnnotationConflict, ObjectState, QualityConflict, getCore,
+    AnnotationConflict, ObjectState, ObjectType, ShapeType, QualityConflict, getCore,
 } from 'cvat-core-wrapper';
 import config from 'config';
 import CVATTooltip from 'components/common/cvat-tooltip';

cvat-ui/src/components/annotation-page/canvas/views/canvas3d/canvas-wrapper3D.tsx

@@ -26,13 +26,15 @@ import {
 } from 'actions/annotation-actions';
 import {
     ActiveControl,
-    ColorBy, CombinedState, ContextMenuType, ObjectType, Workspace,
+    ColorBy, CombinedState, ContextMenuType, Workspace,
 } from 'reducers';
 import { CameraAction, Canvas3d, ViewsDOM } from 'cvat-canvas3d-wrapper';
 
 import CVATTooltip from 'components/common/cvat-tooltip';
 import { EventScope } from 'cvat-logger';
-import { getCore, ObjectState, Job } from 'cvat-core-wrapper';
+import {
+    getCore, ObjectState, ObjectType, Job,
+} from 'cvat-core-wrapper';
 import GlobalHotKeys from 'utils/mousetrap-react';
 import { ShortcutScope } from 'utils/enums';
 import { registerComponentShortcuts } from 'actions/shortcuts-actions';

cvat-ui/src/components/annotation-page/single-shape-workspace/single-shape-sidebar/single-shape-sidebar.tsx

@@ -19,12 +19,12 @@ import Button from 'antd/lib/button';
 import message from 'antd/lib/message';
 
 import {
-    ActiveControl, CombinedState, NavigationType, ObjectType,
+    ActiveControl, CombinedState, NavigationType,
 } from 'reducers';
 import { labelShapeType } from 'reducers/annotation-reducer';
 import { Canvas, CanvasMode } from 'cvat-canvas-wrapper';
 import {
-    Job, Label, LabelType, ShapeType,
+    Job, Label, LabelType, ObjectType, ShapeType,
 } from 'cvat-core-wrapper';
 import { ActionUnion, createAction } from 'utils/redux';
 import {

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-cuboid-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { Canvas3d } from 'cvat-canvas3d-wrapper';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import { CubeIcon } from 'icons';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-ellipse-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { EllipseIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-mask-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { BrushIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-points-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { PointIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-polygon-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { PolygonIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-polyline-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { PolylineIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-rectangle-control.tsx

@@ -8,7 +8,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { RectangleIcon } from 'icons';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import DrawShapePopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 import withVisibilityHandling from './handle-popover-visibility';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover.tsx

@@ -11,11 +11,10 @@ import Radio, { RadioChangeEvent } from 'antd/lib/radio';
 import Text from 'antd/lib/typography/Text';
 import { RectDrawingMethod, CuboidDrawingMethod } from 'cvat-canvas-wrapper';
 
-import { ShapeType } from 'reducers';
+import { ShapeType, Label, DimensionType } from 'cvat-core-wrapper';
 import { clamp } from 'utils/math';
 import LabelSelector from 'components/label-selector/label-selector';
 import CVATTooltip from 'components/common/cvat-tooltip';
-import { Label, DimensionType } from 'cvat-core-wrapper';
 
 interface Props {
     shapeType: ShapeType;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-skeleton-control.tsx

@@ -4,7 +4,7 @@ import Icon from '@ant-design/icons';
 
 import { Canvas } from 'cvat-canvas-wrapper';
 import { Canvas3d } from 'cvat-canvas3d-wrapper';
-import { ShapeType } from 'reducers';
+import { ShapeType } from 'cvat-core-wrapper';
 
 import { SkeletonIcon } from 'icons';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/opencv-control.tsx

@@ -20,11 +20,13 @@ import { throttle } from 'lodash';
 
 import { OpenCVIcon } from 'icons';
 import { Canvas, convertShapesForInteractor } from 'cvat-canvas-wrapper';
-import { getCore, Job, ObjectState } from 'cvat-core-wrapper';
+import {
+    getCore, Job, ObjectState, ObjectType, ShapeType,
+} from 'cvat-core-wrapper';
 import openCVWrapper from 'utils/opencv-wrapper/opencv-wrapper';
 import { IntelligentScissors } from 'utils/opencv-wrapper/intelligent-scissors';
 import {
-    CombinedState, ActiveControl, ObjectType, ShapeType, ToolsBlockerState,
+    CombinedState, ActiveControl, ToolsBlockerState,
 } from 'reducers';
 import {
     interactWithCanvas,

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/tools-control.tsx

@@ -27,12 +27,12 @@ import lodash, { omit } from 'lodash';
 import { AIToolsIcon } from 'icons';
 import { Canvas, convertShapesForInteractor } from 'cvat-canvas-wrapper';
 import {
-    getCore, Label, MLModel, ObjectState, Job,
+    getCore, Label, MLModel, ObjectState, ObjectType, ShapeType, Job,
     LabelType,
 } from 'cvat-core-wrapper';
 import openCVWrapper, { MatType } from 'utils/opencv-wrapper/opencv-wrapper';
 import {
-    CombinedState, ActiveControl, ObjectType, ShapeType, ToolsBlockerState,
+    CombinedState, ActiveControl, ToolsBlockerState,
 } from 'reducers';
 import {
     interactWithCanvas,

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/labels-list.tsx

@@ -7,8 +7,8 @@ import React, { useEffect } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import message from 'antd/lib/message';
 
-import { LabelType, ShapeType } from 'cvat-core-wrapper';
-import { CombinedState, ObjectType } from 'reducers';
+import { LabelType, ObjectType, ShapeType } from 'cvat-core-wrapper';
+import { CombinedState } from 'reducers';
 import { rememberObject, updateAnnotationsAsync } from 'actions/annotation-actions';
 import LabelItemContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/label-item';
 import GlobalHotKeys, { KeyMapItem } from 'utils/mousetrap-react';

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-basics.tsx

@@ -9,9 +9,10 @@ import { MoreOutlined } from '@ant-design/icons';
 import Dropdown from 'antd/lib/dropdown';
 import Text from 'antd/lib/typography/Text';
 
-import { ObjectType, ShapeType, ColorBy } from 'reducers';
+import { ColorBy } from 'reducers';
 import CVATTooltip from 'components/common/cvat-tooltip';
 import LabelSelector from 'components/label-selector/label-selector';
+import { ObjectType, ShapeType } from 'cvat-core-wrapper';
 import ItemMenu from './object-item-menu';
 import ColorPicker from './color-picker';
 

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-buttons.tsx

@@ -20,7 +20,7 @@ import Icon, {
 } from '@ant-design/icons';
 
 import CVATTooltip from 'components/common/cvat-tooltip';
-import { ObjectType, ShapeType } from 'reducers';
+import { ObjectType, ShapeType } from 'cvat-core-wrapper';
 import {
     ObjectOutsideIcon, FirstIcon, LastIcon, PreviousIcon, NextIcon,
 } from 'icons';

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-menu.tsx

@@ -15,8 +15,10 @@ import {
     BackgroundIcon, ForegroundIcon, ResetPerspectiveIcon, ColorizeIcon, SliceIcon,
 } from 'icons';
 import CVATTooltip from 'components/common/cvat-tooltip';
-import { ObjectType, ShapeType, ColorBy } from 'reducers';
-import { DimensionType, Job } from 'cvat-core-wrapper';
+import { ColorBy } from 'reducers';
+import {
+    DimensionType, Job, ObjectType, ShapeType,
+} from 'cvat-core-wrapper';
 
 interface Props {
     readonly: boolean;

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item.tsx

@@ -9,7 +9,8 @@ import Collapse from 'antd/lib/collapse';
 
 import ObjectButtonsContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/object-buttons';
 import ItemDetailsContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/object-item-details';
-import { ObjectType, ShapeType, ColorBy } from 'reducers';
+import { ColorBy } from 'reducers';
+import { ObjectType, ShapeType } from 'cvat-core-wrapper';
 import ObjectItemElementComponent from './object-item-element';
 import ItemBasics from './object-item-basics';
 

cvat-ui/src/components/annotation-page/standard-workspace/remove-confirm.tsx

@@ -5,12 +5,13 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { CombinedState, ObjectType } from 'reducers';
+import { CombinedState } from 'reducers';
 import Text from 'antd/lib/typography/Text';
 import Modal from 'antd/lib/modal';
 
 import config from 'config';
 import { removeObjectAsync, removeObject as removeObjectAction } from 'actions/annotation-actions';
+import { ObjectType } from 'cvat-core-wrapper';
 
 export default function RemoveConfirmComponent(): JSX.Element | null {
     const dispatch = useDispatch();

cvat-ui/src/components/annotation-page/tag-annotation-workspace/frame-tags.tsx

@@ -12,8 +12,8 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import {
     removeObject as removeObjectAction,
 } from 'actions/annotation-actions';
-import { CombinedState, ObjectType } from 'reducers';
-import { ObjectState, AnnotationConflict } from 'cvat-core-wrapper';
+import { CombinedState } from 'reducers';
+import { AnnotationConflict, ObjectState, ObjectType } from 'cvat-core-wrapper';
 import { filterAnnotations } from 'utils/filter-annotations';
 
 function FrameTags(): JSX.Element {

cvat-ui/src/components/annotation-page/tag-annotation-workspace/tag-annotation-sidebar/tag-annotation-sidebar.tsx

@@ -22,8 +22,10 @@ import {
     changeFrameAsync,
     rememberObject,
 } from 'actions/annotation-actions';
-import { getCore, Label, LabelType } from 'cvat-core-wrapper';
-import { CombinedState, ObjectType } from 'reducers';
+import {
+    getCore, Label, LabelType, ObjectType,
+} from 'cvat-core-wrapper';
+import { CombinedState } from 'reducers';
 import { filterApplicableForType } from 'utils/filter-applicable-labels';
 import LabelSelector from 'components/label-selector/label-selector';
 import isAbleToChangeFrame from 'utils/is-able-to-change-frame';

cvat-ui/src/components/create-project-page/create-project-content.tsx

@@ -15,9 +15,8 @@ import Collapse from 'antd/lib/collapse';
 import Button from 'antd/lib/button';
 import Input from 'antd/lib/input';
 import notification from 'antd/lib/notification';
-import { StorageLocation } from 'reducers';
 import { createProjectAsync } from 'actions/projects-actions';
-import { Storage, StorageData } from 'cvat-core-wrapper';
+import { Storage, StorageData, StorageLocation } from 'cvat-core-wrapper';
 import patterns from 'utils/validation-patterns';
 import LabelsEditor from 'components/labels-editor/labels-editor';
 import SourceStorageField from 'components/storage/source-storage-field';

cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx

@@ -18,11 +18,12 @@ import { Store } from 'antd/lib/form/interface';
 import CVATTooltip from 'components/common/cvat-tooltip';
 import patterns from 'utils/validation-patterns';
 import { isInteger } from 'utils/validate-integer';
-import { StorageLocation } from 'reducers';
 import SourceStorageField from 'components/storage/source-storage-field';
 import TargetStorageField from 'components/storage/target-storage-field';
 
-import { getCore, Storage, StorageData } from 'cvat-core-wrapper';
+import {
+    getCore, Storage, StorageData, StorageLocation,
+} from 'cvat-core-wrapper';
 
 const core = getCore();
 

cvat-ui/src/components/create-task-page/create-task-content.tsx

@@ -14,8 +14,7 @@ import Text from 'antd/lib/typography/Text';
 import Alert from 'antd/lib/alert';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { ValidateErrorEntity } from 'rc-field-form/lib/interface';
-import { StorageLocation } from 'reducers';
-import { getCore, Storage } from 'cvat-core-wrapper';
+import { getCore, Storage, StorageLocation } from 'cvat-core-wrapper';
 import LabelsEditor from 'components/labels-editor/labels-editor';
 import FileManagerComponent, { Files } from 'components/file-manager/file-manager';
 import { RemoteFile } from 'components/file-manager/remote-browser';