Share without copying & mount cloud storages

cvat-core/package.json

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

cvat-core/src/session.js

@@ -875,6 +875,7 @@
                 data_original_chunk_type: undefined,
                 use_zip_chunks: undefined,
                 use_cache: undefined,
+                copy_data: undefined,
             };
 
             for (const property in data) {
@@ -1117,6 +1118,22 @@
                             data.use_cache = useCache;
                         },
                     },
+                    /**
+                     * @name copyData
+                     * @type {boolean}
+                     * @memberof module:API.cvat.classes.Task
+                     * @instance
+                     * @throws {module:API.cvat.exceptions.ArgumentError}
+                     */
+                    copyData: {
+                        get: () => data.copy_data,
+                        set: (copyData) => {
+                            if (typeof copyData !== 'boolean') {
+                                throw new ArgumentError('Value must be a boolean');
+                            }
+                            data.copy_data = copyData;
+                        },
+                    },
                     /**
                      * After task has been created value can be appended only.
                      * @name labels
@@ -1695,6 +1712,9 @@
         if (typeof this.dataChunkSize !== 'undefined') {
             taskDataSpec.chunk_size = this.dataChunkSize;
         }
+        if (typeof this.copyData !== 'undefined') {
+            taskDataSpec.copy_data = this.copyData;
+        }
 
         const task = await serverProxy.tasks.createTask(taskSpec, taskDataSpec, onUpdate);
         return new Task(task);

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.9.14",
+  "version": "1.10.0",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

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

@@ -405,6 +405,9 @@ export function createTaskAsync(data: any): ThunkAction<Promise<void>, {}, {}, A
         if (data.advanced.dataChunkSize) {
             description.data_chunk_size = data.advanced.dataChunkSize;
         }
+        if (data.advanced.copyData) {
+            description.copy_data = data.advanced.copyData;
+        }
 
         const taskInstance = new cvat.classes.Task(description);
         taskInstance.clientFiles = data.files.local;

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

@@ -26,11 +26,14 @@ export interface AdvancedConfiguration {
     useZipChunks: boolean;
     dataChunkSize?: number;
     useCache: boolean;
+    activeTab: string;
+    copyData?: boolean;
 }
 
 type Props = FormComponentProps & {
     onSubmit(values: AdvancedConfiguration): void;
     installedGit: boolean;
+    activeTab: string;
 };
 
 function isPositiveInteger(_: any, value: any, callback: any): void {
@@ -78,7 +81,7 @@ function isIntegerRange(min: number, max: number, _: any, value: any, callback:
 class AdvancedConfigurationForm extends React.PureComponent<Props> {
     public submit(): Promise<void> {
         return new Promise((resolve, reject) => {
-            const { form, onSubmit } = this.props;
+            const { form, onSubmit, activeTab } = this.props;
 
             form.validateFields((error, values): void => {
                 if (!error) {
@@ -100,6 +103,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
                     onSubmit({
                         ...values,
                         frameFilter: values.frameStep ? `step=${values.frameStep}` : undefined,
+                        activeTab: activeTab,
                     });
                     resolve();
                 } else {
@@ -114,6 +118,26 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
         form.resetFields();
     }
 
+    renderCopyDataChechbox(): JSX.Element {
+        const { form } = this.props;
+        return (
+            <Row>
+                <Col>
+                    <Form.Item help='If you have a low data transfer rate over the network you can copy data into CVAT to speed up work'>
+                        {form.getFieldDecorator('copyData', {
+                            initialValue: false,
+                            valuePropName: 'checked',
+                        })(
+                            <Checkbox>
+                                <Text className='cvat-text-color'>Copy data into CVAT</Text>
+                            </Checkbox>,
+                        )}
+                    </Form.Item>
+                </Col>
+            </Row>
+        );
+    }
+
     private renderImageQuality(): JSX.Element {
         const { form } = this.props;
 
@@ -386,10 +410,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
     }
 
     public render(): JSX.Element {
-        const { installedGit } = this.props;
-
+        const { installedGit, activeTab } = this.props;
         return (
             <Form>
+
+                {activeTab === 'share' ? this.renderCopyDataChechbox() : null}
+
                 <Row>
                     <Col>{this.renderUzeZipChunks()}</Col>
                 </Row>

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

@@ -42,6 +42,7 @@ const defaultState = {
         lfs: false,
         useZipChunks: true,
         useCache: true,
+        activeTab: 'local',
     },
     labels: [],
     files: {
@@ -114,6 +115,16 @@ class CreateTaskContent extends React.PureComponent<Props & RouteComponentProps,
         });
     };
 
+    private changeFileManagerTab = (key: string): void => {
+        const values = this.state.advanced;
+        this.setState({
+            advanced: {
+                ...values,
+                activeTab: key
+            }
+        });
+    };
+
     private handleSubmitClick = (): void => {
         if (!this.validateLabels()) {
             notification.error({
@@ -192,6 +203,7 @@ class CreateTaskContent extends React.PureComponent<Props & RouteComponentProps,
                 <Text type='danger'>* </Text>
                 <Text className='cvat-text-color'>Select files:</Text>
                 <ConnectedFileManager
+                    onChangeActiveKey={this.changeFileManagerTab}
                     ref={(container: any): void => {
                         this.fileManagerContainer = container;
                     }}
@@ -209,6 +221,7 @@ class CreateTaskContent extends React.PureComponent<Props & RouteComponentProps,
                     <Collapse.Panel key='1' header={<Text className='cvat-title'>Advanced configuration</Text>}>
                         <AdvancedConfigurationForm
                             installedGit={installedGit}
+                            activeTab={this.state.advanced.activeTab}
                             wrappedComponentRef={(component: any): void => {
                                 this.advancedConfigurationComponent = component;
                             }}

cvat-ui/src/components/file-manager/file-manager.tsx

@@ -31,6 +31,7 @@ interface Props {
     withRemote: boolean;
     treeData: TreeNodeNormal[];
     onLoadData: (key: string, success: () => void, failure: () => void) => void;
+    onChangeActiveKey(key: string): void;
 }
 
 export default class FileManager extends React.PureComponent<Props, State> {
@@ -215,7 +216,7 @@ export default class FileManager extends React.PureComponent<Props, State> {
     }
 
     public render(): JSX.Element {
-        const { withRemote } = this.props;
+        const { withRemote, onChangeActiveKey } = this.props;
         const { active } = this.state;
 
         return (
@@ -224,11 +225,12 @@ export default class FileManager extends React.PureComponent<Props, State> {
                     type='card'
                     activeKey={active}
                     tabBarGutter={5}
-                    onChange={(activeKey: string): void =>
+                    onChange={(activeKey: string): void => {
+                        onChangeActiveKey(activeKey);
                         this.setState({
                             active: activeKey as any,
-                        })
-                    }
+                        });
+                    }}
                 >
                     {this.renderLocalSelector()}
                     {this.renderShareSelector()}

cvat-ui/src/containers/file-manager/file-manager.tsx

@@ -14,6 +14,7 @@ import { ShareItem, CombinedState } from 'reducers/interfaces';
 interface OwnProps {
     ref: any;
     withRemote: boolean;
+    onChangeActiveKey(key: string): void;
 }
 
 interface StateToProps {
@@ -68,12 +69,13 @@ export class FileManagerContainer extends React.PureComponent<Props> {
     }
 
     public render(): JSX.Element {
-        const { treeData, getTreeData, withRemote } = this.props;
+        const { treeData, getTreeData, withRemote, onChangeActiveKey } = this.props;
 
         return (
             <FileManagerComponent
                 treeData={treeData}
                 onLoadData={getTreeData}
+                onChangeActiveKey={onChangeActiveKey}
                 withRemote={withRemote}
                 ref={(component): void => {
                     this.managerComponentRef = component;

cvat/apps/documentation/installation.md

@@ -373,6 +373,9 @@ You can change the share device path to your actual share. For user convenience
 we have defined the environment variable \$CVAT_SHARE_URL. This variable
 contains a text (url for example) which is shown in the client-share browser.
 
+You can [mount](/cvat/apps/documentation/mounting_cloud_storages.md)
+your cloud storage as a FUSE and use it later as a share.
+
 ### Email verification
 
 You can enable email verification for newly registered users.