merging 2.2 and develop

Author: niqbal996

.bandit

@@ -6,3 +6,4 @@
 # B406 : import_xml_sax
 # B410 : import_lxml
 skips: B101,B102,B320,B404,B406,B410
+exclude: **/tests/**,tests

.coveragerc

@@ -4,7 +4,8 @@ branch = true
 
 source =
     cvat/apps/
-    utils/cli/
+    cvat-sdk/
+    cvat-cli/
     utils/dataset_manifest
 
 omit =

.dockerignore

@@ -7,4 +7,4 @@
 /db.sqlite3
 /keys
 **/node_modules
-
+/static

.eslintrc.js

@@ -1,23 +1,72 @@
-// Copyright (C) 2018-2021 Intel Corporation
+// Copyright (C) 2018-2022 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
 module.exports = {
+    root: true,
     env: {
         node: true,
         browser: true,
-        es6: true,
+        es2020: true,
     },
     parserOptions: {
         sourceType: 'module',
-        ecmaVersion: 2018,
+        parser: '@typescript-eslint/parser',
     },
-    plugins: ['eslint-plugin-header'],
-    extends: ['eslint:recommended', 'prettier'],
+    ignorePatterns: [
+        '.eslintrc.js',
+        'lint-staged.config.js',
+    ],
+    plugins: ['@typescript-eslint', 'security', 'no-unsanitized', 'import'],
+    extends: [
+        'eslint:recommended', 'plugin:security/recommended', 'plugin:no-unsanitized/DOM',
+        'airbnb-base', 'plugin:import/errors', 'plugin:import/warnings',
+        'plugin:import/typescript', 'plugin:@typescript-eslint/recommended', 'airbnb-typescript/base',
+    ],
     rules: {
-        'header/header': [2, 'line', [{
-            pattern: ' {1}Copyright \\(C\\) (?:20\\d{2}-)?2021 Intel Corporation',
-            template: ' Copyright (C) 2021 Intel Corporation'
-        }, '', ' SPDX-License-Identifier: MIT']],
+        // 'header/header': [2, 'line', [{
+        //     pattern: ' {1}Copyright \\(C\\) (?:20\\d{2}-)?2022 Intel Corporation',
+        //     template: ' Copyright (C) 2022 Intel Corporation'
+        // }, '', ' SPDX-License-Identifier: MIT']],
+        'no-plusplus': 0,
+        'no-continue': 0,
+        'no-console': 0,
+        'no-param-reassign': ['error', { 'props': false }],
+        'no-restricted-syntax': [0, { selector: 'ForOfStatement' }],
+        'no-await-in-loop': 0,
+        'indent': ['error', 4, { 'SwitchCase': 1 }],
+        'max-len': ['error', { code: 120, ignoreStrings: true }],
+        'func-names': 0,
+        'valid-typeof': 0,
+        'no-useless-constructor': 0, // sometimes constructor is necessary to generate right documentation in cvat-core
+        'quotes': ['error', 'single'],
+        'lines-between-class-members': 0,
+        'class-methods-use-this': 0,
+        'no-underscore-dangle': ['error', { allowAfterThis: true }],
+        'max-classes-per-file': 0,
+        'operator-linebreak': ['error', 'after'],
+        'newline-per-chained-call': 0,
+        'global-require': 0,
+        'arrow-parens': ['error', 'always'],
+        'security/detect-object-injection': 0, // the rule is relevant for user input data on the node.js environment
+        'import/order': ['error', {'groups': ['builtin', 'external', 'internal']}],
+        'import/prefer-default-export': 0, // works incorrect with interfaces
+
+        '@typescript-eslint/ban-ts-comment': 0,
+        '@typescript-eslint/no-explicit-any': 0,
+        '@typescript-eslint/indent': ['error', 4],
+        '@typescript-eslint/lines-between-class-members': 0,
+        '@typescript-eslint/explicit-function-return-type': ['warn', { allowExpressions: true }],
+        '@typescript-eslint/explicit-module-boundary-types': 'off',
+        '@typescript-eslint/ban-types': [
+            'error',
+            {
+                types: {
+                    '{}': false, // TODO: try to fix with Record<string, unknown>
+                    object: false, // TODO: try to fix with Record<string, unknown>
+                    Function: false, // TODO: try to fix somehow
+                },
+            },
+        ],
     },
 };

.github/ISSUE_TEMPLATE.md

@@ -1,11 +1,5 @@
-<!---
-Copyright (C) 2020 Intel Corporation
-
-SPDX-License-Identifier: MIT
--->
-
 ### My actions before raising this issue
-- [ ] Read/searched [the docs](https://github.com/opencv/cvat/tree/master#documentation)
+- [ ] Read/searched [the docs](https://github.com/cvat-ai/cvat/tree/master#documentation)
 - [ ] Searched [past issues](/issues)
 
 <!--- Provide a general summary of the issue in the Title above -->
@@ -24,7 +18,7 @@ current behavior -->
 to implement the addition or change -->
 
 ### Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to
+<!--- Provide a link to a live example or an unambiguous set of steps to
 reproduce this bug. Include code to reproduce, if relevant -->
 1.
 1.
@@ -49,5 +43,3 @@ the bug in -->
     <summary>Logs from `cvat` container</summary>
     </details>
 
-### Next steps
-You may [join our Gitter](https://gitter.im/opencv-cvat/public) channel for community support.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,7 @@
-<!---
-Copyright (C) 2020-2021 Intel Corporation
-
-SPDX-License-Identifier: MIT
--->
-
-<!-- Raised an issue to propose your change (https://github.com/opencv/cvat/issues).
-It will help avoiding duplication of efforts from multiple independent contributors.
+<!-- Raised an issue to propose your change (https://github.com/cvat-ai/cvat/issues).
+It helps to avoid duplication of efforts from multiple independent contributors.
 Discuss your ideas with maintainers to be sure that changes will be approved and merged.
-Read the [CONTRIBUTION](https://github.com/opencv/cvat/blob/develop/CONTRIBUTING.md)
+Read the [CONTRIBUTION](https://github.com/cvat-ai/cvat/blob/develop/CONTRIBUTING.md)
 guide. -->
 
 <!-- Provide a general summary of your changes in the Title above -->
@@ -25,27 +19,21 @@ see how your change affects other areas of the code, etc. -->
 ### Checklist
 <!-- Go over all the following points, and put an `x` in all the boxes that apply.
 If an item isn't applicable by a reason then ~~explicitly strikethrough~~ the whole
-line. If you don't do that github will show incorrect process for the pull request.
+line. If you don't do that github will show an incorrect process for the pull request.
 If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] I submit my changes into the `develop` branch
-- [ ] I have added description of my changes into [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file
+- [ ] I have added a description of my changes into [CHANGELOG](https://github.com/cvat-ai/cvat/blob/develop/CHANGELOG.md) file
 - [ ] I have updated the [documentation](
-  https://github.com/opencv/cvat/blob/develop/README.md#documentation) accordingly
+  https://github.com/cvat-ai/cvat/blob/develop/README.md#documentation) accordingly
 - [ ] I have added tests to cover my changes
 - [ ] I have linked related issues ([read github docs](
   https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
-- [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),
-[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))
+- [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
+[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
 
 ### License
 
 - [ ] I submit _my code changes_ under the same [MIT License](
-  https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project.
+  https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the project.
   Feel free to contact the maintainers if that's a concern.
-- [ ] I have updated the license header for each file (see an example below)
-
-```python
-# Copyright (C) 2021 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-```
+  

.github/workflows/bandit.yml

@@ -1,41 +1,47 @@
-name: Linter
+name: Bandit
 on: pull_request
 jobs:
-  Bandit:
+  Linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - id: files
+        uses: jitterbit/get-changed-files@v1
+        continue-on-error: true
 
       - name: Run checks
+        env:
+          PR_FILES_AM: ${{ steps.files.outputs.added_modified }}
+          PR_FILES_RENAMED: ${{ steps.files.outputs.renamed }}
         run: |
-          URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
-          PR_FILES=$(curl -s -X GET -G $URL | jq -r '.[] | select(.status != "removed") | .filename')
-          for files in $PR_FILES; do
-            extension="${files##*.}"
-            if [[ $extension == 'py' ]]; then
-              changed_files_bandit+=" ${files}"
-            fi
+          PR_FILES="$PR_FILES_AM $PR_FILES_RENAMED"
+          for FILE in $PR_FILES; do
+              EXTENSION="${FILE##*.}"
+              DIRECTORY="${FILE%%/*}"
+              if [[ "$EXTENSION" == 'py' && "$DIRECTORY" != 'cvat-sdk' ]]; then
+                  CHANGED_FILES+=" $FILE"
+              fi
           done
 
-          if [[ ! -z ${changed_files_bandit} ]]; then
+          if [[ ! -z $CHANGED_FILES ]]; then
             sudo apt-get --no-install-recommends install -y build-essential curl python3-dev python3-pip python3-venv
             python3 -m venv .env
             . .env/bin/activate
             pip install -U pip wheel setuptools
             pip install bandit
             mkdir -p bandit_report
 
-            echo "Bandit version: "`bandit --version | head -1`
-            echo "The files will be checked: "`echo ${changed_files_bandit}`
-            bandit ${changed_files_bandit} --exclude '**/tests/**' -a file --ini ./.bandit -f html -o ./bandit_report/bandit_checks.html
+            echo "Bandit version: "$(bandit --version | head -1)
+            echo "The files will be checked: "$(echo $CHANGED_FILES)
+            bandit -a file --ini .bandit -f html -o ./bandit_report/bandit_checks.html $CHANGED_FILES
             deactivate
           else
             echo "No files with the \"py\" extension found"
           fi
 
       - name: Upload artifacts
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.1
         with:
           name: bandit_report
           path: bandit_report

.github/workflows/black.yml

@@ -0,0 +1,82 @@
+name: Black
+on: pull_request
+jobs:
+  Linter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - id: files
+        uses: jitterbit/get-changed-files@v1
+        continue-on-error: true
+
+      - name: Run checks
+        env:
+          PR_FILES_AM: ${{ steps.files.outputs.added_modified }}
+          PR_FILES_RENAMED: ${{ steps.files.outputs.renamed }}
+        run: |
+          # If different modules use different Black configs,
+          # we need to run Black for each python component group separately.
+          # Otherwise, they all will use the same config.
+          ENABLED_DIRS=("cvat-sdk" "cvat-cli" "tests/python")
+
+          isValueIn () {
+            # Checks if a value is in an array
+            # https://stackoverflow.com/a/8574392
+            # args: value, array
+            local e match="$1"
+            shift
+            for e; do
+              [[ "$e" == "$match" ]] && return 0;
+            done
+            return 1
+          }
+
+          startswith () {
+            # Inspired by https://stackoverflow.com/a/2172367
+            # Checks if the first arg starts with the second one
+            local value="$1"
+            local beginning="$2"
+            return $([[ $value == ${beginning}* ]])
+          }
+
+          PR_FILES="$PR_FILES_AM $PR_FILES_RENAMED"
+          UPDATED_DIRS=""
+          for FILE in $PR_FILES; do
+              EXTENSION="${FILE##*.}"
+              DIRECTORY="$(dirname $FILE)"
+              if [[ "$EXTENSION" == "py" ]]; then
+                  for EDIR in ${ENABLED_DIRS[@]}; do
+                      if startswith "${DIRECTORY}/" "${EDIR}/" && ! isValueIn "${EDIR}" ${UPDATED_DIRS[@]};
+                      then
+                          UPDATED_DIRS+=" ${EDIR}"
+                      fi
+                  done
+              fi
+          done
+
+          if [[ ! -z $UPDATED_DIRS ]]; then
+            sudo apt-get --no-install-recommends install -y build-essential curl python3-dev python3-pip python3-venv
+            python3 -m venv .env
+            . .env/bin/activate
+            pip install -U pip wheel setuptools
+            pip install $(egrep "black.*" ./cvat-cli/requirements/development.txt)
+            mkdir -p black_report
+
+            echo "Black version: "$(black --version)
+            echo "The dirs will be checked: $UPDATED_DIRS"
+            EXIT_CODE=0
+            for DIR in $UPDATED_DIRS; do
+              black --check --diff $DIR >> ./black_report/black_checks.txt || EXIT_CODE=$(($? | $EXIT_CODE)) || true
+            done
+            deactivate
+            exit $EXIT_CODE
+          else
+            echo "No files with the \"py\" extension found"
+          fi
+
+      - name: Upload artifacts
+        if: failure()
+        uses: actions/[email protected]
+        with:
+          name: black_report
+          path: black_report