Merge branch 'develop' into zm/add-mots-format

.nycrc

@@ -0,0 +1,19 @@
+{
+    "all": true,
+    "recursive": true,
+    "compact": false,
+    "useInlineSourceMaps": false,
+    "extension": [
+        ".js",
+        ".jsx",
+        ".ts",
+        ".tsx"
+    ],
+    "exclude": [
+        "**/3rdparty/*",
+        "**/tests/*"
+    ],
+    "parser-plugins": [
+        "typescript"
+    ]
+}

.travis.yml

@@ -35,14 +35,26 @@ before_script:
 script:
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'coverage run -a manage.py test cvat/apps utils/cli && mv .coverage ${CONTAINER_COVERAGE_DATA_DIR}'
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-data && npm install && cd ../cvat-core && npm install && npm run test && coveralls-lcov -v -n ./reports/coverage/lcov.info > ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json'
-  # Up all containers
   - docker-compose up -d
   # Create superuser
   - docker exec -it cvat bash -ic "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
-  # Install Cypress and run tests
-  - cd ./tests && npm install
-  - $(npm bin)/cypress run --headless --browser chrome
-  - $(npm bin)/cypress run --headless --browser firefox && cd ..
+  # End-to-end testing
+  - if [[ $TRAVIS_EVENT_TYPE == "cron" && $TRAVIS_BRANCH == "develop" ]];
+    then
+      cd ./tests && npm install &&
+      npm run cypress:run:firefox && cd ..  &&
+      npm install  &&
+      npm run coverage  &&
+      docker-compose up -d --build  &&
+      cd ./tests &&
+      npm run cypress:run:chrome && cd .. &&
+      npm run report:coverage:text &&
+      npm run report:coverage:lcov;
+    else
+      cd ./tests && npm install &&
+      npm run cypress:run:chrome && cd ..;
+    fi;
+
 
 after_success:
   # https://coveralls-python.readthedocs.io/en/latest/usage/multilang.html

cvat-canvas/package.json

@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "svg.draggable.js": "2.2.2",
-    "svg.draw.js": "^2.0.3",
+    "svg.draw.js": "^2.0.4",
     "svg.js": "2.7.1",
     "svg.resize.js": "1.4.3",
     "svg.select.js": "3.0.1"

cvat-core/package.json

@@ -32,7 +32,7 @@
     "webpack-cli": "^3.3.2"
   },
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.20.0",
     "browser-or-node": "^1.2.1",
     "cvat-data": "../cvat-data",
     "detect-browser": "^5.0.0",

cvat-data/package.json

@@ -21,8 +21,8 @@
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
-    "async-mutex": "^0.1.4",
-    "jszip": "3.1.5"
+    "async-mutex": "^0.2.4",
+    "jszip": "3.5.0"
   },
   "scripts": {
     "patch": "cd src/js && patch --dry-run --forward -p0 < 3rdparty_patch.diff >> /dev/null && patch -p0 < 3rdparty_patch.diff; true",

cvat-ui/.eslintrc.js

@@ -3,29 +3,29 @@
 // SPDX-License-Identifier: MIT
 
 module.exports = {
-    'env': {
-        'node': true,
-        'browser': true,
-        'es6': true,
+    env: {
+        node: true,
+        browser: true,
+        es6: true,
     },
-    'parserOptions': {
-        'parser': '@typescript-eslint/parser',
-        'ecmaVersion': 6,
-        'project': './tsconfig.json',
+    parserOptions: {
+        parser: '@typescript-eslint/parser',
+        ecmaVersion: 6,
+        project: './tsconfig.json',
     },
-    'plugins': [
-        '@typescript-eslint',
-        'import',
-    ],
-    'ignorePatterns': ['*.svg', '*.scss'],
-    'extends': [
+    plugins: ['@typescript-eslint', 'import', 'eslint-plugin-header'],
+    ignorePatterns: ['*.svg', '*.scss'],
+    extends: [
         'plugin:@typescript-eslint/recommended',
         'airbnb-typescript',
         'plugin:import/errors',
         'plugin:import/warnings',
         'plugin:import/typescript',
+        'prettier',
+        'prettier/@typescript-eslint',
+        'prettier/react',
     ],
-    'rules': {
+    rules: {
         '@typescript-eslint/indent': ['warn', 4],
         'react/jsx-indent': ['warn', 4],
         'react/jsx-indent-props': ['warn', 4],
@@ -34,16 +34,17 @@ module.exports = {
         'arrow-parens': ['error', 'always'],
         '@typescript-eslint/no-explicit-any': [0],
         '@typescript-eslint/explicit-function-return-type': ['warn', { allowExpressions: true }],
-        'no-restricted-syntax': [0, {'selector': 'ForOfStatement'}],
+        'no-restricted-syntax': [0, { selector: 'ForOfStatement' }],
         'no-plusplus': [0],
         'lines-between-class-members': 0,
         'react/no-did-update-set-state': 0, // https://github.com/airbnb/javascript/issues/1875
+        'header/header': [2, '.header-tpl.ts'],
     },
-    'settings': {
+    settings: {
         'import/resolver': {
-            'typescript': {
-                'directory': './tsconfig.json'
-            }
+            typescript: {
+                directory: './tsconfig.json',
+            },
         },
     },
 };

cvat-ui/.gitignore

@@ -4,4 +4,5 @@
 /dist
 /build
 /yarn.lock
+.eslintcache
 

cvat-ui/.header-tpl.ts

@@ -0,0 +1,3 @@
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT