React UI: Added client versioning (#1448)

* Adjusted antd import

* Wrapped core and canvas

* Added versioning

* Updated changelog, adjusted installation guide a bit

CHANGELOG.md

@@ -6,8 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.0-beta.2] - Unreleased
 ### Added
-- Re-Identification algorithm to merging bounding boxes automatically to the new UI (https://github.com/opencv/cvat/pull/1406)
-- Methods ``import`` and ``export`` to import/export raw annotations for Job and Task in ``cvat-core`` (https://github.com/opencv/cvat/pull/1406)
+- Re-Identification algorithm to merging bounding boxes automatically to the new UI (<https://github.com/opencv/cvat/pull/1406>)
+- Methods ``import`` and ``export`` to import/export raw annotations for Job and Task in ``cvat-core`` (<https://github.com/opencv/cvat/pull/1406>)
+- Versioning of client packages (``cvat-core``, ``cvat-canvas``, ``cvat-ui``). Initial versions are set to 1.0.0  (<https://github.com/opencv/cvat/pull/1448>)
 
 ### Changed
 -

CONTRIBUTING.md

@@ -56,9 +56,7 @@ for development
 
 -   Install npm packages for UI and start UI debug server (run the following command from CVAT root directory):
     ```sh
-    cd cvat-core && npm install && \
-    cd ../cvat-canvas && npm install && \
-    cd ../cvat-data && npm install && \
+    cd cvat-data && npm install && \
     cd ../cvat-ui && npm install && npm start
     ```
 

cvat-canvas/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core.js",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "babel.config.js",
   "scripts": {

cvat-data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-data",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "",
   "main": "src/js/cvat-data.js",
   "devDependencies": {

cvat-ui/index.d.ts

@@ -3,3 +3,4 @@
 // SPDX-License-Identifier: MIT
 
 declare module '*.svg';
+declare module 'cvat-core/src/api';

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
@@ -47,6 +47,8 @@
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
+    "cvat-core": "file:../cvat-core",
+    "cvat-canvas": "file:../cvat-canvas",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
     "@types/react-redux": "^7.1.2",

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

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 

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

@@ -22,9 +22,9 @@ import {
     Workspace,
 } from 'reducers/interfaces';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import logger, { LogType } from 'cvat-logger';
-import { RectDrawingMethod } from 'cvat-canvas';
+import { RectDrawingMethod } from 'cvat-canvas-wrapper';
 import { getCVATStore } from 'cvat-store';
 
 interface AnnotationsParameters {

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

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
 

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

@@ -8,7 +8,7 @@ import {
     ThunkAction,
     ThunkDispatch,
 } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { LogType } from 'cvat-logger';
 import { computeZRange } from './annotation-actions';
 

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

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
 

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

@@ -10,7 +10,7 @@ import {
     ActiveInference,
     CombinedState,
 } from 'reducers/interfaces';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 export enum PreinstalledModels {
     RCNN = 'RCNN Object Detector',

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

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 import { ShareFileInfo } from 'reducers/interfaces';
 

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

@@ -9,7 +9,7 @@ import {
     CombinedState,
 } from 'reducers/interfaces';
 import { getCVATStore } from 'cvat-store';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { getInferenceStatusAsync } from './models-actions';
 
 const cvat = getCore();

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

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 

cvat-ui/src/components/actions-menu/actions-menu.tsx

@@ -4,13 +4,8 @@
 
 import './styles.scss';
 import React from 'react';
-
-import {
-    Menu,
-    Modal,
-} from 'antd';
-
-import { ClickParam } from 'antd/lib/menu/index';
+import Menu, { ClickParam } from 'antd/lib/menu';
+import Modal from 'antd/lib/modal';
 
 import DumpSubmenu from './dump-submenu';
 import LoadSubmenu from './load-submenu';

cvat-ui/src/components/actions-menu/dump-submenu.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
-import {
-    Menu,
-    Icon,
-} from 'antd';
-
+import Menu from 'antd/lib/menu';
+import Icon from 'antd/lib/icon';
 import Text from 'antd/lib/typography/Text';
 
 function isDefaultFormat(dumperName: string, taskMode: string): boolean {

cvat-ui/src/components/actions-menu/export-submenu.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
-import {
-    Menu,
-    Icon,
-} from 'antd';
-
+import Menu from 'antd/lib/menu';
+import Icon from 'antd/lib/icon';
 import Text from 'antd/lib/typography/Text';
 
 interface Props {

cvat-ui/src/components/actions-menu/load-submenu.tsx

@@ -3,14 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
-import {
-    Menu,
-    Icon,
-    Upload,
-    Button,
-} from 'antd';
-
+import Menu from 'antd/lib/menu';
+import Icon from 'antd/lib/icon';
+import Upload from 'antd/lib/upload';
+import Button from 'antd/lib/button';
 import Text from 'antd/lib/typography/Text';
 
 interface Props {

cvat-ui/src/components/annotation-page/annotation-page.tsx

@@ -4,12 +4,9 @@
 
 import './styles.scss';
 import React, { useEffect } from 'react';
-
-import {
-    Layout,
-    Spin,
-    Result,
-} from 'antd';
+import Layout from 'antd/lib/layout';
+import Spin from 'antd/lib/spin';
+import Result from 'antd/lib/result';
 
 import { Workspace } from 'reducers/interfaces';
 import AnnotationTopBarContainer from 'containers/annotation-page/top-bar/top-bar';

cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx

@@ -4,10 +4,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-
-import {
-    Button,
-} from 'antd';
+import Button from 'antd/lib/button';
 
 interface Props {
     activatedStateID: number | null;

cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx

@@ -19,8 +19,8 @@ import {
     ShapeType,
 } from 'reducers/interfaces';
 import { LogType } from 'cvat-logger';
-import { Canvas } from 'cvat-canvas';
-import getCore from 'cvat-core';
+import { Canvas } from 'cvat-canvas-wrapper';
+import getCore from 'cvat-core-wrapper';
 import consts from 'consts';
 
 const cvat = getCore();

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

@@ -7,7 +7,7 @@ import { GlobalHotKeys, ExtendedKeyMapOptions } from 'react-hotkeys';
 import Layout from 'antd/lib/layout';
 
 import { ActiveControl, Rotation } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 import RotateControl from './rotate-control';
 import CursorControl from './cursor-control';

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

@@ -8,7 +8,7 @@ import Tooltip from 'antd/lib/tooltip';
 
 import { CursorIcon } from 'icons';
 import { ActiveControl } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/dextr-plugin.tsx

@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 import Checkbox, { CheckboxChangeEvent } from 'antd/lib/checkbox';
 import Tooltip from 'antd/lib/tooltip';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { CombinedState } from 'reducers/interfaces';
 import { activate as activatePlugin, deactivate as deactivatePlugin } from 'utils/dextr-utils';
 

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

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PointIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

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

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PolygonIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

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

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PolylineIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

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

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { RectangleIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

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

@@ -11,7 +11,7 @@ import Radio, { RadioChangeEvent } from 'antd/lib/radio';
 import Tooltip from 'antd/lib/tooltip';
 import Text from 'antd/lib/typography/Text';
 
-import { RectDrawingMethod } from 'cvat-canvas';
+import { RectDrawingMethod } from 'cvat-canvas-wrapper';
 import { ShapeType } from 'reducers/interfaces';
 import { clamp } from 'utils/math';
 import DEXTRPlugin from './dextr-plugin';

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

@@ -7,7 +7,7 @@ import Icon from 'antd/lib/icon';
 import Tooltip from 'antd/lib/tooltip';
 
 import { FitIcon } from 'icons';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

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

@@ -7,7 +7,7 @@ import Tooltip from 'antd/lib/tooltip';
 import Icon from 'antd/lib/icon';
 
 import { GroupIcon } from 'icons';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { ActiveControl } from 'reducers/interfaces';
 
 interface Props {

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

@@ -3,17 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
+import Tooltip from 'antd/lib/tooltip';
+import Icon from 'antd/lib/icon';
 
-import {
-    Tooltip,
-    Icon,
-} from 'antd';
-
-import {
-    MergeIcon,
-} from 'icons';
-
-import { Canvas } from 'cvat-canvas';
+import { MergeIcon } from 'icons';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { ActiveControl } from 'reducers/interfaces';
 
 interface Props {

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

@@ -8,7 +8,7 @@ import Tooltip from 'antd/lib/tooltip';
 
 import { MoveIcon } from 'icons';
 import { ActiveControl } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;