diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index ab225266..b8e4da04 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -22,7 +22,7 @@ "@types/react-share": "^3.0.3", "@types/redux-logger": "^3.0.9", "@types/resize-observer-browser": "^0.1.6", - "antd": "^4.16.13", + "antd": "^4.17.0", "copy-to-clipboard": "^3.3.1", "cvat-canvas": "file:../cvat-canvas", "cvat-canvas3d": "file:../cvat-canvas3d", @@ -35,7 +35,7 @@ "platform": "^1.3.6", "prop-types": "^15.7.2", "react": "^16.14.0", - "react-awesome-query-builder": "^4.4.2", + "react-awesome-query-builder": "^4.5.1", "react-color": "^2.19.3", "react-cookie": "^4.0.3", "react-dom": "^16.14.0", @@ -854,50 +854,51 @@ } }, "node_modules/antd": { - "version": "4.16.13", - "resolved": "https://registry.npmjs.org/antd/-/antd-4.16.13.tgz", - "integrity": "sha512-EMPD3fzKe7oayx9keD/GA1oKatcx7j5CGlkJj5eLS0/eEDDEkxVj3DFmKOPuHYt4BK7ltTzMFS+quSTmqUXPiw==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/antd/-/antd-4.17.0.tgz", + "integrity": "sha512-V2xBGzBK+s2Iy7Re5JOcOBtAvaZtJ9t7R1fFOP51T6ynfSvJqaRtG4DjBu7i9inhXkCzrt7eGcX3vMqLCqXV8g==", "dependencies": { "@ant-design/colors": "^6.0.0", - "@ant-design/icons": "^4.6.3", + "@ant-design/icons": "^4.7.0", "@ant-design/react-slick": "~0.28.1", "@babel/runtime": "^7.12.5", + "@ctrl/tinycolor": "^3.4.0", "array-tree-filter": "^2.1.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", "lodash": "^4.17.21", "moment": "^2.25.3", - "rc-cascader": "~1.4.0", + "rc-cascader": "~2.1.0", "rc-checkbox": "~2.3.0", "rc-collapse": "~3.1.0", "rc-dialog": "~8.6.0", - "rc-drawer": "~4.3.0", + "rc-drawer": "~4.4.2", "rc-dropdown": "~3.2.0", - "rc-field-form": "~1.20.0", + "rc-field-form": "~1.21.0", "rc-image": "~5.2.5", - "rc-input-number": "~7.1.0", + "rc-input-number": "~7.3.0", "rc-mentions": "~1.6.1", "rc-menu": "~9.0.12", - "rc-motion": "^2.4.0", + "rc-motion": "^2.4.4", "rc-notification": "~4.5.7", "rc-pagination": "~3.1.9", - "rc-picker": "~2.5.10", + "rc-picker": "~2.5.17", "rc-progress": "~3.1.0", "rc-rate": "~2.9.0", "rc-resize-observer": "^1.0.0", - "rc-select": "~12.1.6", - "rc-slider": "~9.7.1", + "rc-select": "~13.1.0-alpha.0", + "rc-slider": "~9.7.4", "rc-steps": "~4.1.0", "rc-switch": "~3.2.0", - "rc-table": "~7.15.1", + "rc-table": "~7.19.0", "rc-tabs": "~11.10.0", "rc-textarea": "~0.3.0", "rc-tooltip": "~5.1.1", - "rc-tree": "~4.2.1", - "rc-tree-select": "~4.3.0", + "rc-tree": "~5.2.0", + "rc-tree-select": "~4.6.0", "rc-trigger": "^5.2.10", "rc-upload": "~4.3.0", - "rc-util": "^5.13.1", + "rc-util": "^5.14.0", "scroll-into-view-if-needed": "^2.2.25" }, "funding": { @@ -925,12 +926,13 @@ } }, "node_modules/antd/node_modules/rc-cascader": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-1.4.3.tgz", - "integrity": "sha512-Q4l9Mv8aaISJ+giVnM9IaXxDeMqHUGLvi4F+LksS6pHlaKlN4awop/L+IMjIXpL+ug/ojaCyv/ixcVopJYYCVA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-2.1.5.tgz", + "integrity": "sha512-FiGPfSxKmSft2CT2XSr6HeKihqcxM+1ozmH6FGXTDthVNNvV0ai82CA6l30iPmMmlflwDfSm/623qkekqNq4BQ==", "dependencies": { "@babel/runtime": "^7.12.5", "array-tree-filter": "^2.1.0", + "rc-tree-select": "~4.6.0", "rc-trigger": "^5.0.4", "rc-util": "^5.0.1", "warning": "^4.0.1" @@ -985,9 +987,9 @@ } }, "node_modules/antd/node_modules/rc-drawer": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.3.1.tgz", - "integrity": "sha512-GMfFy4maqxS9faYXEhQ+0cA1xtkddEQzraf6SAdzWbn444DrrLogwYPk1NXSpdXjLCLxgxOj9MYtyYG42JsfXg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.4.3.tgz", + "integrity": "sha512-FYztwRs3uXnFOIf1hLvFxIQP9MiZJA+0w+Os8dfDh/90X7z/HqP/Yg+noLCIeHEbKln1Tqelv8ymCAN24zPcfQ==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.6", @@ -1013,12 +1015,12 @@ } }, "node_modules/antd/node_modules/rc-field-form": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.20.1.tgz", - "integrity": "sha512-f64KEZop7zSlrG4ef/PLlH12SLn6iHDQ3sTG+RfKBM45hikwV1i8qMf53xoX12NvXXWg1VwchggX/FSso4bWaA==", + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.21.2.tgz", + "integrity": "sha512-LR/bURt/Tf5g39mb0wtMtQuWn42d/7kEzpzlC5fNC7yaRVmLTtlPP4sBBlaViETM9uZQKLoaB0Pt9Mubhm9gow==", "dependencies": { "@babel/runtime": "^7.8.4", - "async-validator": "^3.0.3", + "async-validator": "^4.0.2", "rc-util": "^5.8.0" }, "engines": { @@ -1045,9 +1047,9 @@ } }, "node_modules/antd/node_modules/rc-input-number": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.1.4.tgz", - "integrity": "sha512-EG4iqkqyqzLRu/Dq+fw2od7nlgvXLEatE+J6uhi3HXE1qlM3C7L6a7o/hL9Ly9nimkES2IeQoj3Qda3I0izj3Q==", + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.3.4.tgz", + "integrity": "sha512-W9uqSzuvJUnz8H8vsVY4kx+yK51SsAxNTwr8SNH4G3XqQNocLVmKIibKFRjocnYX1RDHMND9FFbgj2h7E7nvGA==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -1221,9 +1223,9 @@ } }, "node_modules/antd/node_modules/rc-select": { - "version": "12.1.13", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-12.1.13.tgz", - "integrity": "sha512-cPI+aesP6dgCAaey4t4upDbEukJe+XN0DK6oO/6flcCX5o28o7KNZD7JAiVtC/6fCwqwI/kSs7S/43dvHmBl+A==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-13.1.1.tgz", + "integrity": "sha512-Oy4L27x5QgGR8902pw0bJVjrTWFnKPKvdLHzJl5pjiA+jM1hpzDfLGg/bY2ntk5ElxxQKZUwbFKUeqfCQU7SrQ==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -1257,9 +1259,9 @@ } }, "node_modules/antd/node_modules/rc-select/node_modules/rc-virtual-list": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz", - "integrity": "sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz", + "integrity": "sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ==", "dependencies": { "classnames": "^2.2.6", "rc-resize-observer": "^1.0.0", @@ -1274,14 +1276,14 @@ } }, "node_modules/antd/node_modules/rc-slider": { - "version": "9.7.2", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.2.tgz", - "integrity": "sha512-mVaLRpDo6otasBs6yVnG02ykI3K6hIrLTNfT5eyaqduFv95UODI9PDS6fWuVVehVpdS4ENgOSwsTjrPVun+k9g==", + "version": "9.7.5", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.5.tgz", + "integrity": "sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", "rc-tooltip": "^5.0.1", - "rc-util": "^5.0.0", + "rc-util": "^5.16.1", "shallowequal": "^1.1.0" }, "engines": { @@ -1292,6 +1294,20 @@ "react-dom": ">=16.9.0" } }, + "node_modules/antd/node_modules/rc-slider/node_modules/rc-util": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.16.1.tgz", + "integrity": "sha512-kSCyytvdb3aRxQacS/71ta6c+kBWvM1v8/2h9d/HaNWauc3qB8pLnF20PJ8NajkNN8gb+rR1l0eWO+D4Pz+LLQ==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + }, + "peerDependencies": { + "react": ">=16.9.0", + "react-dom": ">=16.9.0" + } + }, "node_modules/antd/node_modules/rc-steps": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-4.1.4.tgz", @@ -1324,14 +1340,14 @@ } }, "node_modules/antd/node_modules/rc-table": { - "version": "7.15.2", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.15.2.tgz", - "integrity": "sha512-TAs7kCpIZwc2mtvD8CMrXSM6TqJDUsy0rUEV1YgRru33T8bjtAtc+9xW/KC1VWROJlHSpU0R0kXjFs9h/6+IzQ==", + "version": "7.19.2", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.19.2.tgz", + "integrity": "sha512-NdpnoM50MK02H5/hGOsObfxCvGFUG5cHB9turE5BKJ81T5Ycbq193w5tLhnpILXe//Oanzr47MdMxkUnVGP+qg==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", "rc-resize-observer": "^1.0.0", - "rc-util": "^5.13.0", + "rc-util": "^5.14.0", "shallowequal": "^1.1.0" }, "engines": { @@ -1391,15 +1407,15 @@ } }, "node_modules/antd/node_modules/rc-tree": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-4.2.2.tgz", - "integrity": "sha512-V1hkJt092VrOVjNyfj5IYbZKRMHxWihZarvA5hPL/eqm7o2+0SNkeidFYm7LVVBrAKBpOpa0l8xt04uiqOd+6w==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.2.2.tgz", + "integrity": "sha512-ZQPGi5rGmipXvSUqeMbh0Rm0Cn2zFVWQFvS3sinH+lis5VNCChkFs2dAFpWZnb9/d/SZPeMfYG/x2XFq/q3UTA==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.0.1", "rc-util": "^5.0.0", - "rc-virtual-list": "^3.0.1" + "rc-virtual-list": "^3.4.1" }, "engines": { "node": ">=10.x" @@ -1410,15 +1426,15 @@ } }, "node_modules/antd/node_modules/rc-tree-select": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.3.3.tgz", - "integrity": "sha512-0tilOHLJA6p+TNg4kD559XnDX3PTEYuoSF7m7ryzFLAYvdEEPtjn0QZc5z6L0sMKBiBlj8a2kf0auw8XyHU3lA==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.6.3.tgz", + "integrity": "sha512-VymfystOnW8EfoWaWehgB8zpYKgRZf4ILu9KHf7FJZVZ/1dnBEHDqg1bBi43/1BYLwYFKSKKSjkYyNYntWJM4A==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", - "rc-select": "^12.0.0", - "rc-tree": "^4.0.0", - "rc-util": "^5.0.5" + "rc-select": "~13.1.0-alpha.0", + "rc-tree": "~5.2.0", + "rc-util": "^5.7.0" }, "peerDependencies": { "react": "*", @@ -1426,9 +1442,9 @@ } }, "node_modules/antd/node_modules/rc-tree/node_modules/rc-virtual-list": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz", - "integrity": "sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz", + "integrity": "sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ==", "dependencies": { "classnames": "^2.2.6", "rc-resize-observer": "^1.0.0", @@ -1632,9 +1648,9 @@ "peer": true }, "node_modules/async-validator": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz", - "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==" + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz", + "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==" }, "node_modules/atob": { "version": "2.1.2", @@ -6675,50 +6691,51 @@ "requires": {} }, "antd": { - "version": "4.16.13", - "resolved": "https://registry.npmjs.org/antd/-/antd-4.16.13.tgz", - "integrity": "sha512-EMPD3fzKe7oayx9keD/GA1oKatcx7j5CGlkJj5eLS0/eEDDEkxVj3DFmKOPuHYt4BK7ltTzMFS+quSTmqUXPiw==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/antd/-/antd-4.17.0.tgz", + "integrity": "sha512-V2xBGzBK+s2Iy7Re5JOcOBtAvaZtJ9t7R1fFOP51T6ynfSvJqaRtG4DjBu7i9inhXkCzrt7eGcX3vMqLCqXV8g==", "requires": { "@ant-design/colors": "^6.0.0", - "@ant-design/icons": "^4.6.3", + "@ant-design/icons": "^4.7.0", "@ant-design/react-slick": "~0.28.1", "@babel/runtime": "^7.12.5", + "@ctrl/tinycolor": "^3.4.0", "array-tree-filter": "^2.1.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", "lodash": "^4.17.21", "moment": "^2.25.3", - "rc-cascader": "~1.4.0", + "rc-cascader": "~2.1.0", "rc-checkbox": "~2.3.0", "rc-collapse": "~3.1.0", "rc-dialog": "~8.6.0", - "rc-drawer": "~4.3.0", + "rc-drawer": "~4.4.2", "rc-dropdown": "~3.2.0", - "rc-field-form": "~1.20.0", + "rc-field-form": "~1.21.0", "rc-image": "~5.2.5", - "rc-input-number": "~7.1.0", + "rc-input-number": "~7.3.0", "rc-mentions": "~1.6.1", "rc-menu": "~9.0.12", - "rc-motion": "^2.4.0", + "rc-motion": "^2.4.4", "rc-notification": "~4.5.7", "rc-pagination": "~3.1.9", - "rc-picker": "~2.5.10", + "rc-picker": "~2.5.17", "rc-progress": "~3.1.0", "rc-rate": "~2.9.0", "rc-resize-observer": "^1.0.0", - "rc-select": "~12.1.6", - "rc-slider": "~9.7.1", + "rc-select": "~13.1.0-alpha.0", + "rc-slider": "~9.7.4", "rc-steps": "~4.1.0", "rc-switch": "~3.2.0", - "rc-table": "~7.15.1", + "rc-table": "~7.19.0", "rc-tabs": "~11.10.0", "rc-textarea": "~0.3.0", "rc-tooltip": "~5.1.1", - "rc-tree": "~4.2.1", - "rc-tree-select": "~4.3.0", + "rc-tree": "~5.2.0", + "rc-tree-select": "~4.6.0", "rc-trigger": "^5.2.10", "rc-upload": "~4.3.0", - "rc-util": "^5.13.1", + "rc-util": "^5.14.0", "scroll-into-view-if-needed": "^2.2.25" }, "dependencies": { @@ -6735,12 +6752,13 @@ } }, "rc-cascader": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-1.4.3.tgz", - "integrity": "sha512-Q4l9Mv8aaISJ+giVnM9IaXxDeMqHUGLvi4F+LksS6pHlaKlN4awop/L+IMjIXpL+ug/ojaCyv/ixcVopJYYCVA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-2.1.5.tgz", + "integrity": "sha512-FiGPfSxKmSft2CT2XSr6HeKihqcxM+1ozmH6FGXTDthVNNvV0ai82CA6l30iPmMmlflwDfSm/623qkekqNq4BQ==", "requires": { "@babel/runtime": "^7.12.5", "array-tree-filter": "^2.1.0", + "rc-tree-select": "~4.6.0", "rc-trigger": "^5.0.4", "rc-util": "^5.0.1", "warning": "^4.0.1" @@ -6779,9 +6797,9 @@ } }, "rc-drawer": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.3.1.tgz", - "integrity": "sha512-GMfFy4maqxS9faYXEhQ+0cA1xtkddEQzraf6SAdzWbn444DrrLogwYPk1NXSpdXjLCLxgxOj9MYtyYG42JsfXg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.4.3.tgz", + "integrity": "sha512-FYztwRs3uXnFOIf1hLvFxIQP9MiZJA+0w+Os8dfDh/90X7z/HqP/Yg+noLCIeHEbKln1Tqelv8ymCAN24zPcfQ==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.6", @@ -6799,12 +6817,12 @@ } }, "rc-field-form": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.20.1.tgz", - "integrity": "sha512-f64KEZop7zSlrG4ef/PLlH12SLn6iHDQ3sTG+RfKBM45hikwV1i8qMf53xoX12NvXXWg1VwchggX/FSso4bWaA==", + "version": "1.21.2", + "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.21.2.tgz", + "integrity": "sha512-LR/bURt/Tf5g39mb0wtMtQuWn42d/7kEzpzlC5fNC7yaRVmLTtlPP4sBBlaViETM9uZQKLoaB0Pt9Mubhm9gow==", "requires": { "@babel/runtime": "^7.8.4", - "async-validator": "^3.0.3", + "async-validator": "^4.0.2", "rc-util": "^5.8.0" } }, @@ -6820,9 +6838,9 @@ } }, "rc-input-number": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.1.4.tgz", - "integrity": "sha512-EG4iqkqyqzLRu/Dq+fw2od7nlgvXLEatE+J6uhi3HXE1qlM3C7L6a7o/hL9Ly9nimkES2IeQoj3Qda3I0izj3Q==", + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.3.4.tgz", + "integrity": "sha512-W9uqSzuvJUnz8H8vsVY4kx+yK51SsAxNTwr8SNH4G3XqQNocLVmKIibKFRjocnYX1RDHMND9FFbgj2h7E7nvGA==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -6945,9 +6963,9 @@ } }, "rc-select": { - "version": "12.1.13", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-12.1.13.tgz", - "integrity": "sha512-cPI+aesP6dgCAaey4t4upDbEukJe+XN0DK6oO/6flcCX5o28o7KNZD7JAiVtC/6fCwqwI/kSs7S/43dvHmBl+A==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-13.1.1.tgz", + "integrity": "sha512-Oy4L27x5QgGR8902pw0bJVjrTWFnKPKvdLHzJl5pjiA+jM1hpzDfLGg/bY2ntk5ElxxQKZUwbFKUeqfCQU7SrQ==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -6970,9 +6988,9 @@ } }, "rc-virtual-list": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz", - "integrity": "sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz", + "integrity": "sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ==", "requires": { "classnames": "^2.2.6", "rc-resize-observer": "^1.0.0", @@ -6982,15 +7000,27 @@ } }, "rc-slider": { - "version": "9.7.2", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.2.tgz", - "integrity": "sha512-mVaLRpDo6otasBs6yVnG02ykI3K6hIrLTNfT5eyaqduFv95UODI9PDS6fWuVVehVpdS4ENgOSwsTjrPVun+k9g==", + "version": "9.7.5", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.5.tgz", + "integrity": "sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", "rc-tooltip": "^5.0.1", - "rc-util": "^5.0.0", + "rc-util": "^5.16.1", "shallowequal": "^1.1.0" + }, + "dependencies": { + "rc-util": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.16.1.tgz", + "integrity": "sha512-kSCyytvdb3aRxQacS/71ta6c+kBWvM1v8/2h9d/HaNWauc3qB8pLnF20PJ8NajkNN8gb+rR1l0eWO+D4Pz+LLQ==", + "requires": { + "@babel/runtime": "^7.12.5", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } } }, "rc-steps": { @@ -7014,14 +7044,14 @@ } }, "rc-table": { - "version": "7.15.2", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.15.2.tgz", - "integrity": "sha512-TAs7kCpIZwc2mtvD8CMrXSM6TqJDUsy0rUEV1YgRru33T8bjtAtc+9xW/KC1VWROJlHSpU0R0kXjFs9h/6+IzQ==", + "version": "7.19.2", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.19.2.tgz", + "integrity": "sha512-NdpnoM50MK02H5/hGOsObfxCvGFUG5cHB9turE5BKJ81T5Ycbq193w5tLhnpILXe//Oanzr47MdMxkUnVGP+qg==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", "rc-resize-observer": "^1.0.0", - "rc-util": "^5.13.0", + "rc-util": "^5.14.0", "shallowequal": "^1.1.0" } }, @@ -7059,21 +7089,21 @@ } }, "rc-tree": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-4.2.2.tgz", - "integrity": "sha512-V1hkJt092VrOVjNyfj5IYbZKRMHxWihZarvA5hPL/eqm7o2+0SNkeidFYm7LVVBrAKBpOpa0l8xt04uiqOd+6w==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.2.2.tgz", + "integrity": "sha512-ZQPGi5rGmipXvSUqeMbh0Rm0Cn2zFVWQFvS3sinH+lis5VNCChkFs2dAFpWZnb9/d/SZPeMfYG/x2XFq/q3UTA==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.0.1", "rc-util": "^5.0.0", - "rc-virtual-list": "^3.0.1" + "rc-virtual-list": "^3.4.1" }, "dependencies": { "rc-virtual-list": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz", - "integrity": "sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz", + "integrity": "sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ==", "requires": { "classnames": "^2.2.6", "rc-resize-observer": "^1.0.0", @@ -7083,15 +7113,15 @@ } }, "rc-tree-select": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.3.3.tgz", - "integrity": "sha512-0tilOHLJA6p+TNg4kD559XnDX3PTEYuoSF7m7ryzFLAYvdEEPtjn0QZc5z6L0sMKBiBlj8a2kf0auw8XyHU3lA==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.6.3.tgz", + "integrity": "sha512-VymfystOnW8EfoWaWehgB8zpYKgRZf4ILu9KHf7FJZVZ/1dnBEHDqg1bBi43/1BYLwYFKSKKSjkYyNYntWJM4A==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", - "rc-select": "^12.0.0", - "rc-tree": "^4.0.0", - "rc-util": "^5.0.5" + "rc-select": "~13.1.0-alpha.0", + "rc-tree": "~5.2.0", + "rc-util": "^5.7.0" } }, "rc-trigger": { @@ -7255,9 +7285,9 @@ "peer": true }, "async-validator": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz", - "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==" + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz", + "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==" }, "atob": { "version": "2.1.2", diff --git a/cvat-ui/package.json b/cvat-ui/package.json index e130cd8c..8fe11e1d 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -34,7 +34,7 @@ "@types/react-share": "^3.0.3", "@types/redux-logger": "^3.0.9", "@types/resize-observer-browser": "^0.1.6", - "antd": "^4.16.13", + "antd": "^4.17.0", "copy-to-clipboard": "^3.3.1", "cvat-canvas": "file:../cvat-canvas", "cvat-canvas3d": "file:../cvat-canvas3d", diff --git a/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js b/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js index 72db133a..ce61672d 100644 --- a/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js +++ b/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -15,7 +15,7 @@ context('Drawing with predefined number of points.', () => { const createPolygonShape = { reDraw: false, type: 'Shape', - labelName: labelName, + labelName, pointsMap: [ { x: 500, y: 100 }, { x: 600, y: 100 }, @@ -25,7 +25,7 @@ context('Drawing with predefined number of points.', () => { }; const createPolylinesShape = { type: 'Shape', - labelName: labelName, + labelName, pointsMap: [ { x: 500, y: 250 }, { x: 600, y: 250 }, @@ -34,7 +34,7 @@ context('Drawing with predefined number of points.', () => { }; const createPointsShape = { type: 'Shape', - labelName: labelName, + labelName, pointsMap: [{ x: 500, y: 200 }], numberOfPoints: 1, }; @@ -51,13 +51,13 @@ context('Drawing with predefined number of points.', () => { cy.get('.cvat-draw-shape-popover-points-selector') .type(`${pointsCount - 1}`) .focused() - .tab(); + .blur(); cy.get('[role="spinbutton"]').should('have.attr', 'aria-valuenow', pointsCount); }); } function tryDeletePoint() { - let svgJsCircleId = []; + const svgJsCircleId = []; cy.get('#cvat_canvas_shape_1').trigger('mousemove', { force: true }).should('have.attr', 'fill-opacity', 0.3); cy.get('circle').then((circle) => { for (let i = 0; i < circle.length; i++) { diff --git a/tests/cypress/integration/actions_objects/case_53_object_propagate.js b/tests/cypress/integration/actions_objects/case_53_object_propagate.js index 4e3d0ffa..4c9b6285 100644 --- a/tests/cypress/integration/actions_objects/case_53_object_propagate.js +++ b/tests/cypress/integration/actions_objects/case_53_object_propagate.js @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -11,7 +11,7 @@ context('Object propagate.', () => { const createCuboidShape2Points = { points: 'From rectangle', type: 'Shape', - labelName: labelName, + labelName, firstX: 250, firstY: 350, secondX: 350, @@ -38,7 +38,7 @@ context('Object propagate.', () => { cy.get('.cvat-propagate-confirm-object-on-frames') // Change value in the "copy of the object on frame" field .find('input') .clear() - .type(propagateOnOneFrame); + .should('have.value', 1); cy.get('.cvat-propagate-confirm-object-up-to-frame') // Value of "up to the frame" field should be same .find('input') .should('have.attr', 'value', propagateOnOneFrame); diff --git a/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js b/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js index cd3da01e..8c86eef6 100644 --- a/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js +++ b/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -18,16 +18,15 @@ context('Settings. "Auto save" option.', () => { cy.openSettings(); cy.contains('Workspace').click(); cy.get('.cvat-workspace-settings-auto-save').within(() => { - cy.get('[type="checkbox"]').check(); - cy.get('.ant-checkbox-checked').should('exist'); - cy.get('[type="checkbox"]').uncheck(); - cy.get('.ant-checkbox-checked').should('not.exist'); + cy.get('[type="checkbox"]').check().should('be.checked'); + cy.get('[type="checkbox"]').uncheck().should('not.be.checked'); }); cy.get('.cvat-workspace-settings-auto-save-interval').within(() => { - cy.get('[role="spinbutton"]').clear().type(0).tab(); - cy.get('[role="spinbutton"]').should('have.value', 1); // Interval should`t be less then 1 - cy.get('[role="spinbutton"]').clear().type(5).tab(); - cy.get('[role="spinbutton"]').should('have.value', 5); + // The absence of a value takes a minimum value + cy.get('[role="spinbutton"]').focus().clear().should('have.value', 1); + // Interval should`t be less then 1 + cy.get('[role="spinbutton"]').focus().clear().type(0).blur().should('have.value', 1); + cy.get('[role="spinbutton"]').focus().clear().type(5).blur().should('have.value', 5); }); }); }); diff --git a/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js b/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js index 85d8cc5c..2424f13c 100644 --- a/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js +++ b/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js @@ -1,4 +1,4 @@ -// Copyright (C) 2021 Intel Corporation +// Copyright (C) 2021-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -76,6 +76,7 @@ context('Filtering, sorting jobs.', () => { cy.get('[type="button"]').contains('OK').should('be.visible').click(); } else { cy.get('[type="button"]').contains('Reset').should('be.visible').click(); + cy.get('[type="button"]').contains('OK').should('be.visible').click(); } }); cy.get('.ant-dropdown').should('be.hidden').and('have.class', 'ant-dropdown-hidden'); diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js index c146c98e..dd649730 100644 --- a/tests/cypress/support/index.js +++ b/tests/cypress/support/index.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2021 Intel Corporation +// Copyright (C) 2020-2022 Intel Corporation // // SPDX-License-Identifier: MIT @@ -10,7 +10,6 @@ require('./commands_filters_feature'); require('./commands_models'); require('./commands_opencv'); require('@cypress/code-coverage/support'); -require('cypress-plugin-tab'); before(() => { if (Cypress.browser.family !== 'chromium') { @@ -27,4 +26,5 @@ Cypress.on('uncaught:exception', (err) => { if (err.message.includes(resizeObserverLoopErr)) { return false; } + return true; }); diff --git a/tests/package-lock.json b/tests/package-lock.json index 64431cc4..0d340a02 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -11,7 +11,6 @@ "cypress": "^8.3.1", "cypress-file-upload": "^5.0.8", "cypress-localstorage-commands": "^1.5.0", - "cypress-plugin-tab": "^1.0.5", "extract-zip": "^2.0.1", "jimp": "^0.16.1" } @@ -1917,15 +1916,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha1-n7fmuljvrE7pExyymqnuO1QLzx4=", - "dependencies": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -3326,11 +3316,6 @@ "node": "*" } }, - "node_modules/css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=" - }, "node_modules/cy-verify-downloads": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/cy-verify-downloads/-/cy-verify-downloads-0.0.5.tgz", @@ -3413,14 +3398,6 @@ "cypress": "^2.1.0 || 3.x || 4.x || 5.x || 6.x || 7.x || 8.x" } }, - "node_modules/cypress-plugin-tab": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/cypress-plugin-tab/-/cypress-plugin-tab-1.0.5.tgz", - "integrity": "sha512-QtTJcifOVwwbeMP3hsOzQOKf3EqKsLyjtg9ZAGlYDntrCRXrsQhe4ZQGIthRMRLKpnP6/tTk6G0gJ2sZUfRliQ==", - "dependencies": { - "ally.js": "^1.4.1" - } - }, "node_modules/cypress/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -6584,11 +6561,6 @@ "node": ">=8" } }, - "node_modules/platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha1-ZGx3ARiZhwtqCQPnXpl+jlHadGE=" - }, "node_modules/pngjs": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", @@ -9706,15 +9678,6 @@ "uri-js": "^4.2.2" } }, - "ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha1-n7fmuljvrE7pExyymqnuO1QLzx4=", - "requires": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -10845,11 +10808,6 @@ "randomfill": "^1.0.3" } }, - "css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=" - }, "cy-verify-downloads": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/cy-verify-downloads/-/cy-verify-downloads-0.0.5.tgz", @@ -11004,14 +10962,6 @@ "integrity": "sha512-gl1uKeviYdyJG4dLcZ9hfoUjLciwkkfbaQ3gvRtmipsPxC612ZBJhSjbunnJcUGwkryaM+82VrY9ij0tLSg7LA==", "requires": {} }, - "cypress-plugin-tab": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/cypress-plugin-tab/-/cypress-plugin-tab-1.0.5.tgz", - "integrity": "sha512-QtTJcifOVwwbeMP3hsOzQOKf3EqKsLyjtg9ZAGlYDntrCRXrsQhe4ZQGIthRMRLKpnP6/tTk6G0gJ2sZUfRliQ==", - "requires": { - "ally.js": "^1.4.1" - } - }, "dash-ast": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", @@ -13353,11 +13303,6 @@ "find-up": "^4.0.0" } }, - "platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha1-ZGx3ARiZhwtqCQPnXpl+jlHadGE=" - }, "pngjs": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", diff --git a/tests/package.json b/tests/package.json index 261142cd..11db8aee 100644 --- a/tests/package.json +++ b/tests/package.json @@ -11,7 +11,6 @@ "cypress": "^8.3.1", "cypress-file-upload": "^5.0.8", "cypress-localstorage-commands": "^1.5.0", - "cypress-plugin-tab": "^1.0.5", "extract-zip": "^2.0.1", "jimp": "^0.16.1" }